From e1e2aee686e761c3350fea972d6c1632ee26e1a5 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 12 Apr 2012 16:49:02 +0000
Subject: [PATCH] - Bugfix: Fixed the problem with the klaxon and flare items
 from ActionItems.xml (by Jazz) o There was the bad numbering of objects in
 tag <BombItem>

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1398 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/MapAction/ActionItems.xml    | 9 +++++----
 .../Data-Files/TableData/MapAction/ActionItems.xml       | 9 +++++----
 gamedir/Data/TableData/MapAction/ActionItems.xml         | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml
index 3fd6bc677..1b3559587 100644
--- a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml
+++ b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml
@@ -43,6 +43,7 @@ ActionID:
 	ACTION_ITEM_SEE_POWER_GEN_FAN		- 29
 
 BombItem:
+	Name					uiIndex (items.xml)
 	STUN_GRENADE 			- 241	
 	TEARGAS_GRENADE			- 242
 	MUSTARD_GRENADE			- 243
@@ -55,8 +56,8 @@ BombItem:
 	MORTAR_SHELL			- 250
 	MINE					- 251
 	C4						- 252
-	TRIP_FLARE				- 253
-	TRIP_KLAXON				- 254
+	TRIP_FLARE				- 143
+	TRIP_KLAXON				- 144
 	SHAPED_CHARGE			- 255
 	BREAK_LIGHT				- 256
 	GL_HE_GRENADE			- 257
@@ -89,14 +90,14 @@ BombItem:
 		<Name>Klaxon Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>144</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>1</uiIndex>
 		<Name>Flare Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>253</BombItem>
+		<BombItem>143</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>2</uiIndex>
diff --git a/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml b/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml
index e783a7f65..a7aab4acc 100644
--- a/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml
+++ b/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml
@@ -3,6 +3,7 @@
 <!--
 
 BombItem :
+	Name					uiIndex (items.xml)
 	STUN_GRENADE 			- 241	
 	TEARGAS_GRENADE			- 242
 	MUSTARD_GRENADE			- 243
@@ -16,8 +17,8 @@ BombItem :
 
 	MINE					- 251
 	C4						- 252
-	TRIP_FLARE				- 253
-	TRIP_KLAXON				- 254
+	TRIP_FLARE				- 143
+	TRIP_KLAXON				- 144
 	SHAPED_CHARGE			- 255
 	BREAK_LIGHT				- 256
 	GL_HE_GRENADE			- 257
@@ -49,14 +50,14 @@ BombItem :
 		<Name>Klaxon Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>144</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>1</uiIndex>
 		<Name>Flare Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>253</BombItem>
+		<BombItem>143</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>2</uiIndex>
diff --git a/gamedir/Data/TableData/MapAction/ActionItems.xml b/gamedir/Data/TableData/MapAction/ActionItems.xml
index 3fd6bc677..1b3559587 100644
--- a/gamedir/Data/TableData/MapAction/ActionItems.xml
+++ b/gamedir/Data/TableData/MapAction/ActionItems.xml
@@ -43,6 +43,7 @@ ActionID:
 	ACTION_ITEM_SEE_POWER_GEN_FAN		- 29
 
 BombItem:
+	Name					uiIndex (items.xml)
 	STUN_GRENADE 			- 241	
 	TEARGAS_GRENADE			- 242
 	MUSTARD_GRENADE			- 243
@@ -55,8 +56,8 @@ BombItem:
 	MORTAR_SHELL			- 250
 	MINE					- 251
 	C4						- 252
-	TRIP_FLARE				- 253
-	TRIP_KLAXON				- 254
+	TRIP_FLARE				- 143
+	TRIP_KLAXON				- 144
 	SHAPED_CHARGE			- 255
 	BREAK_LIGHT				- 256
 	GL_HE_GRENADE			- 257
@@ -89,14 +90,14 @@ BombItem:
 		<Name>Klaxon Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>241</BombItem>
+		<BombItem>144</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>1</uiIndex>
 		<Name>Flare Mine</Name>
 		<ActionID>3</ActionID>
 		<Blow_up>1</Blow_up>
-		<BombItem>253</BombItem>
+		<BombItem>143</BombItem>
 	</ACTION_ITEM>
 	<ACTION_ITEM>
 		<uiIndex>2</uiIndex>