- Bugfix ActionItems.xml (by Jazz)

o Fixed wrong item indexes for <BombItem>
o Removed UB specific LUA code from the ExplosionControl.lua (Data and Data-1.13)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1406 4f8fa57e-7814-0410-bad4-adc449f26b7c

gamedir/Data-1.13/Scripts/ExplosionControl.lua

@@ -318,64 +318,4 @@ if ActionID == 24 then
 		end
 end
 
--- UB Action
-
--- BIGGENS BOMBS
-if ActionID == 25 then
-
-	if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then
-			
-		HavePersonAtGridnoStop( sGridNo )
-				
-		-- Make Biggens run for cover and then detonate the explosives
-		TriggerNPCRecord( Profil.BIGGENS , 17 )
-			
-	end
-	
-end
-
--- BIGGENS WARNING
-if ActionID == 26 then
-
-	if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then
-			
-		HavePersonAtGridnoStop( sGridNo )
-				
-		-- Make Biggens run for cover and then detonate the explosives
-		TriggerNPCRecord( Profil.BIGGENS , 16 )
-			
-	end
-
-end
-
--- SEE FORTIFIED DOOR
-if ActionID == 27 then
-
-	HandleSeeingFortifiedDoor( sGridNo )
-
-end
-
--- OPEN FORTIFED DOOR
-if ActionID == 28 then
-
-	HandleSwitchToOpenFortifiedDoor( sGridNo )
-
-end
-
--- SEE POWER GEN FAN
-if ActionID == 29 then
-
-	-- if the player is in the power plant
-		if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then
-		
-				HandleSeeingPowerGenFan( sGridNo )	
-				
-		elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then
-				
-				-- The player is hitting the switch to launch the missles
-				HandlePlayerHittingSwitchToLaunchMissles()
-		end
-
-end
-
 end

gamedir/Data-1.13/TableData/MapAction/ActionItems.xml

@@ -44,36 +44,17 @@ ActionID:
 
 BombItem:
 	Name					uiIndex (items.xml)
-	STUN_GRENADE 			- 241	
+	STUN_GRENADE 			- 131	
-	TEARGAS_GRENADE			- 242
+	TEARGAS_GRENADE			- 132
-	MUSTARD_GRENADE			- 243
+	MUSTARD_GRENADE			- 133
-	MINI_GRENADE			- 244
+	MINI_GRENADE			- 134
-	HAND_GRENADE   			- 245
+	HAND_GRENADE   			- 135
-	RDX						- 246
+	TNT						- 137
-	TNT						- 247
+	MINE					- 141
-	HMX						- 248
+	C4						- 142
-	C1						- 249
-	MORTAR_SHELL			- 250
-	MINE					- 251
-	C4						- 252
 	TRIP_FLARE				- 143
 	TRIP_KLAXON				- 144
-	SHAPED_CHARGE			- 255
+	SMOKE_GRENADE 			- 151
-	BREAK_LIGHT				- 256
-	GL_HE_GRENADE			- 257
-	GL_TEARGAS_GRENADE		- 258
-	GL_STUN_GRENADE			- 259
-	GL_SMOKE_GRENADE		- 260
-	SMOKE_GRENADE 			- 261
-	TANK_SHELL				- 262
-	STRUCTURE_IGNITE		- 263
-	CREATURE_COCKTAIL		- 264
-	STRUCTURE_EXPLOSION		- 265
-	GREAT_BIG_EXPLOSION		- 266
-	BIG_TEAR_GAS			- 267
-	SMALL_CREATURE_GAS		- 268
-	LARGE_CREATURE_GAS		- 269
-	VERY_SMALL_CREATURE_GAS - 270
 	
 Blow_up:
 	Set to 1 if it should trigger an explosion, otherwise 0
@@ -104,35 +85,35 @@ BombItem:
 		<Name>Teargas Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>242</BombItem>
+		<BombItem>132</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>3</uiIndex>
 		<Name>Stun Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>131</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>4</uiIndex>
 		<Name>Smoke Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>261</BombItem>
+		<BombItem>151</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>5</uiIndex>
 		<Name>Mustard Gas</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>243</BombItem>
+		<BombItem>133</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>6</uiIndex>
 		<Name>Land Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>251</BombItem>
+		<BombItem>141</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>7</uiIndex>
@@ -163,18 +144,21 @@ BombItem:
 		<Name>Small Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>135</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>12</uiIndex>
 		<Name>Medium Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>137</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>13</uiIndex>
 		<Name>Large Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>142</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>14</uiIndex>
@@ -297,38 +281,36 @@ BombItem:
 		<Blow_up>1</Blow_up>
 		<BombItem>267</BombItem>
 	</ACTION_ITEM>
-	<!-- UB -->
 	<ACTION_ITEM>
 		<uiIndex>34</uiIndex>
-		<Name>BIGGENS BOMBS</Name>
+		<Name>Empty action</Name>
-		<ActionID>25</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>35</uiIndex>
-		<Name>BIGGENS WARNING</Name>
+		<Name>Empty action</Name>
-		<ActionID>26</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>36</uiIndex>
-		<Name>SEE FORTIFIED DOOR</Name>
+		<Name>Empty action</Name>
-		<ActionID>27</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>37</uiIndex>
-		<Name>OPEN FORTIFED DOOR</Name>
+		<Name>Empty action</Name>
-		<ActionID>28</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>38</uiIndex>
-		<Name>SEE POWER GEN FAN</Name>
+		<Name>Empty action</Name>
-		<ActionID>29</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
-	<!-- End UB -->
 	<ACTION_ITEM>
 		<uiIndex>38</uiIndex>
 		<Name>Empty action</Name>

gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml

@@ -2,48 +2,69 @@
 
 <!--
 
-BombItem :
+This file defines the different action items from JA2 and UB.
-	Name					uiIndex (items.xml)
+The actions for those action items are triggered in the LUA script file "Scripts\ExplosionControl.lua"
-	STUN_GRENADE 			- 241	
-	TEARGAS_GRENADE			- 242
-	MUSTARD_GRENADE			- 243
-	MINI_GRENADE			- 244
-	HAND_GRENADE   			- 245
-	RDX						- 246
-	TNT						- 247
-	HMX						- 248
-	C1						- 249
-	MORTAR_SHELL			- 250
 
-	MINE					- 251
+Name:
-	C4						- 252
+	The name of the action which is displayed in the Map Editor.
+	Max. 29 characters.
+
+ActionID:
+	*** JA2-Actions ***
+	ACTION_ITEM_OPEN_DOOR 				- 1
+	ACTION_ITEM_CLOSE_DOOR				- 2
+	ACTION_ITEM_BLOW_UP					- 3
+	ACTION_ITEM_SMALL_PIT				- 4
+	ACTION_ITEM_LARGE_PIT				- 5
+	ACTION_ITEM_TOGGLE_DOOR				- 6
+	ACTION_ITEM_TOGGLE_ACTION1			- 7
+	ACTION_ITEM_TOGGLE_ACTION2			- 8
+	ACTION_ITEM_TOGGLE_ACTION3			- 9
+	ACTION_ITEM_TOGGLE_ACTION4			- 10
+	ACTION_ITEM_ENTER_BROTHEL			- 11
+	ACTION_ITEM_EXIT_BROTHEL			- 12
+	ACTION_ITEM_KINGPIN_ALARM			- 13
+	ACTION_ITEM_SEX						- 14
+	ACTION_ITEM_REVEAL_ROOM				- 15
+	ACTION_ITEM_LOCAL_ALARM				- 16
+	ACTION_ITEM_GLOBAL_ALARM			- 17
+	ACTION_ITEM_KLAXON					- 18
+	ACTION_ITEM_UNLOCK_DOOR				- 19
+	ACTION_ITEM_TOGGLE_LOCK				- 20
+	ACTION_ITEM_UNTRAP_DOOR				- 21
+	ACTION_ITEM_TOGGLE_PRESSURE_ITEMS	- 22
+	ACTION_ITEM_MUSEUM_ALARM,			- 23
+	ACTION_ITEM_BLOODCAT_ALARM			- 24
+	*** UB-Actions ***
+	ACTION_ITEM_BIGGENS_BOMBS			- 25
+	ACTION_ITEM_BIGGENS_WARNING			- 26
+	ACTION_ITEM_SEE_FORTIFIED_DOOR		- 27
+	ACTION_ITEM_OPEN_FORTIFED_DOOR		- 28
+	ACTION_ITEM_SEE_POWER_GEN_FAN		- 29
+
+BombItem:
+	Name					uiIndex (items.xml)
+	STUN_GRENADE 			- 131	
+	TEARGAS_GRENADE			- 132
+	MUSTARD_GRENADE			- 133
+	MINI_GRENADE			- 134
+	HAND_GRENADE   			- 135
+	TNT						- 137
+	MINE					- 141
+	C4						- 142
 	TRIP_FLARE				- 143
 	TRIP_KLAXON				- 144
-	SHAPED_CHARGE			- 255
+	SMOKE_GRENADE 			- 151
-	BREAK_LIGHT				- 256
-	GL_HE_GRENADE			- 257
-	GL_TEARGAS_GRENADE		- 258
-	GL_STUN_GRENADE			- 259
-	GL_SMOKE_GRENADE		- 260
 	
-	SMOKE_GRENADE 			- 261
+Blow_up:
-	TANK_SHELL				- 262
+	Set to 1 if it should trigger an explosion, otherwise 0
-	STRUCTURE_IGNITE		- 263
-	CREATURE_COCKTAIL		- 264
-	STRUCTURE_EXPLOSION		- 265
-	GREAT_BIG_EXPLOSION		- 266
-	BIG_TEAR_GAS			- 267
-	SMALL_CREATURE_GAS		- 268
-	LARGE_CREATURE_GAS		- 269
-	VERY_SMALL_CREATURE_GAS - 270
 
-	BombItem używamy tylko w połączeniu z Blow_up = 1. 
+BombItem:
-	
+	If you set Blow_up to 1, you also have to set the bomb item type.
-	Blow_up - 1/0. Jeżeli ustawimy Blow_up = 1 to parametr ActionID ustawiamy na 3.
+	If you set Blow_up to 0, you can delete the <BombItem> tag.
-	ActionID - 1 -255
-	Name - Nazwa
 	
 !-->
+
 <ACTION_ITEM_LIST>
 	<ACTION_ITEM>
 		<uiIndex>0</uiIndex>
@@ -64,35 +85,35 @@ BombItem :
 		<Name>Teargas Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>242</BombItem>
+		<BombItem>132</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>3</uiIndex>
 		<Name>Stun Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>131</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>4</uiIndex>
 		<Name>Smoke Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>261</BombItem>
+		<BombItem>151</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>5</uiIndex>
 		<Name>Mustard Gas</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>243</BombItem>
+		<BombItem>133</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>6</uiIndex>
 		<Name>Land Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>251</BombItem>
+		<BombItem>141</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>7</uiIndex>
@@ -123,18 +144,21 @@ BombItem :
 		<Name>Small Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>135</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>12</uiIndex>
 		<Name>Medium Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>137</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>13</uiIndex>
 		<Name>Large Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>142</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>14</uiIndex>

gamedir/Data/Scripts/ExplosionControl.lua

@@ -318,64 +318,4 @@ if ActionID == 24 then
 		end
 end
 
--- UB Action
-
--- BIGGENS BOMBS
-if ActionID == 25 then
-
-	if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then
-			
-		HavePersonAtGridnoStop( sGridNo )
-				
-		-- Make Biggens run for cover and then detonate the explosives
-		TriggerNPCRecord( Profil.BIGGENS , 17 )
-			
-	end
-	
-end
-
--- BIGGENS WARNING
-if ActionID == 26 then
-
-	if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then
-			
-		HavePersonAtGridnoStop( sGridNo )
-				
-		-- Make Biggens run for cover and then detonate the explosives
-		TriggerNPCRecord( Profil.BIGGENS , 16 )
-			
-	end
-
-end
-
--- SEE FORTIFIED DOOR
-if ActionID == 27 then
-
-	HandleSeeingFortifiedDoor( sGridNo )
-
-end
-
--- OPEN FORTIFED DOOR
-if ActionID == 28 then
-
-	HandleSwitchToOpenFortifiedDoor( sGridNo )
-
-end
-
--- SEE POWER GEN FAN
-if ActionID == 29 then
-
-	-- if the player is in the power plant
-		if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then
-		
-				HandleSeeingPowerGenFan( sGridNo )	
-				
-		elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then
-				
-				-- The player is hitting the switch to launch the missles
-				HandlePlayerHittingSwitchToLaunchMissles()
-		end
-
-end
-
 end

gamedir/Data/TableData/MapAction/ActionItems.xml

@@ -44,36 +44,17 @@ ActionID:
 
 BombItem:
 	Name					uiIndex (items.xml)
-	STUN_GRENADE 			- 241	
+	STUN_GRENADE 			- 131	
-	TEARGAS_GRENADE			- 242
+	TEARGAS_GRENADE			- 132
-	MUSTARD_GRENADE			- 243
+	MUSTARD_GRENADE			- 133
-	MINI_GRENADE			- 244
+	MINI_GRENADE			- 134
-	HAND_GRENADE   			- 245
+	HAND_GRENADE   			- 135
-	RDX						- 246
+	TNT						- 137
-	TNT						- 247
+	MINE					- 141
-	HMX						- 248
+	C4						- 142
-	C1						- 249
-	MORTAR_SHELL			- 250
-	MINE					- 251
-	C4						- 252
 	TRIP_FLARE				- 143
 	TRIP_KLAXON				- 144
-	SHAPED_CHARGE			- 255
+	SMOKE_GRENADE 			- 151
-	BREAK_LIGHT				- 256
-	GL_HE_GRENADE			- 257
-	GL_TEARGAS_GRENADE		- 258
-	GL_STUN_GRENADE			- 259
-	GL_SMOKE_GRENADE		- 260
-	SMOKE_GRENADE 			- 261
-	TANK_SHELL				- 262
-	STRUCTURE_IGNITE		- 263
-	CREATURE_COCKTAIL		- 264
-	STRUCTURE_EXPLOSION		- 265
-	GREAT_BIG_EXPLOSION		- 266
-	BIG_TEAR_GAS			- 267
-	SMALL_CREATURE_GAS		- 268
-	LARGE_CREATURE_GAS		- 269
-	VERY_SMALL_CREATURE_GAS - 270
 	
 Blow_up:
 	Set to 1 if it should trigger an explosion, otherwise 0
@@ -104,35 +85,35 @@ BombItem:
 		<Name>Teargas Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>242</BombItem>
+		<BombItem>132</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>3</uiIndex>
 		<Name>Stun Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>131</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>4</uiIndex>
 		<Name>Smoke Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>261</BombItem>
+		<BombItem>151</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>5</uiIndex>
 		<Name>Mustard Gas</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>243</BombItem>
+		<BombItem>133</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>6</uiIndex>
 		<Name>Land Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>251</BombItem>
+		<BombItem>141</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>7</uiIndex>
@@ -163,18 +144,21 @@ BombItem:
 		<Name>Small Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>135</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>12</uiIndex>
 		<Name>Medium Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>137</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>13</uiIndex>
 		<Name>Large Explosion</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
+		<BombItem>142</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>14</uiIndex>
@@ -297,38 +281,36 @@ BombItem:
 		<Blow_up>1</Blow_up>
 		<BombItem>267</BombItem>
 	</ACTION_ITEM>
-	<!-- UB -->
 	<ACTION_ITEM>
 		<uiIndex>34</uiIndex>
-		<Name>BIGGENS BOMBS</Name>
+		<Name>Empty action</Name>
-		<ActionID>25</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>35</uiIndex>
-		<Name>BIGGENS WARNING</Name>
+		<Name>Empty action</Name>
-		<ActionID>26</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>36</uiIndex>
-		<Name>SEE FORTIFIED DOOR</Name>
+		<Name>Empty action</Name>
-		<ActionID>27</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>37</uiIndex>
-		<Name>OPEN FORTIFED DOOR</Name>
+		<Name>Empty action</Name>
-		<ActionID>28</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>38</uiIndex>
-		<Name>SEE POWER GEN FAN</Name>
+		<Name>Empty action</Name>
-		<ActionID>29</ActionID>
+		<ActionID>0</ActionID>
-		<Blow_up>0</Blow_up>
+		<Blow_Up>0</Blow_Up>
 	</ACTION_ITEM>
-	<!-- End UB -->
 	<ACTION_ITEM>
 		<uiIndex>38</uiIndex>
 		<Name>Empty action</Name>