Sandbags no longer need to be filled, item #1541 has been removed.

Empty sandbags (#1540) are now a 'stack' of bags that can be used to create 100 sandbag structures and it can be merged.

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

gamedir/Data-1.13/APBPConstants.ini

@@ -399,7 +399,6 @@ DEFAULT_AIMSKILL = 80
 ;***********************************************************************
 AP_FORTIFICATION        = 250
 AP_REMOVE_FORTIFICATION = 150
-AP_FILL_SANDBAG         = 200
 
 ;***********************************************************************
 ;* The APs needed to eat                                               *
@@ -512,7 +511,6 @@ BP_JUMPOFFWALL          = 250
 BP_JUMPWALL             = 500
 BP_FORTIFICATION        = 700
 BP_REMOVE_FORTIFICATION = 400
-BP_FILL_SANDBAG         = 500
 BP_HANDCUFF             = 100
 BP_APPLYITEM            =  50
 BP_INVENTORY_ARM        =  10

gamedir/Data-1.13/TableData/Items/Item_Transformations.xml

@@ -204,23 +204,6 @@
 		<szMenuRowText>Remove tripwire</szMenuRowText>
 		<szTooltipText>Remove tripwire from smoke grenade.</szTooltipText>
 	</TRANSFORM>
-	<TRANSFORM>
-		<usItem>1541</usItem>
-		<usResult1>1540</usResult1>
-		<usResult2>0</usResult2>
-		<usResult3>0</usResult3>
-		<usResult4>0</usResult4>
-		<usResult5>0</usResult5>
-		<usResult6>0</usResult6>
-		<usResult7>0</usResult7>
-		<usResult8>0</usResult8>
-		<usResult9>0</usResult9>
-		<usResult10>0</usResult10>
-		<usAPCost>50</usAPCost>
-		<iBPCost>20</iBPCost>
-		<szMenuRowText>Empty sandbag</szMenuRowText>
-		<szTooltipText>Empty sand from sandbag.</szTooltipText>
-	</TRANSFORM>
 	<TRANSFORM>
 		<usItem>1543</usItem>
 		<usResult1>1015</usResult1>

gamedir/Data-1.13/TableData/Items/Items.xml

@@ -46428,10 +46428,10 @@
 		<ItemFlag>1</ItemFlag>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>891</ubGraphicNum>
-		<ubWeight>3</ubWeight>
+		<ubWeight>50</ubWeight>
-		<ubPerPocket>4</ubPerPocket>
+		<ubPerPocket>1</ubPerPocket>
 		<ItemSize>10</ItemSize>
-		<usPrice>2</usPrice>
+		<usPrice>150</usPrice>
 		<ubCoolness>2</ubCoolness>
 		<BR_NewInventory>15</BR_NewInventory>
 		<BR_UsedInventory>10</BR_UsedInventory>
@@ -46443,21 +46443,16 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>1541</uiIndex>
-		<szItemName>Sandbags</szItemName>
+		<szItemName>Nada</szItemName>
-		<szLongItemName>Sandbags, filled</szLongItemName>
+		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Whenever you need fortification, flood control, or cheap weight lifting equipment, these come in handy.</szItemDesc>
+		<szItemDesc>Index 1541</szItemDesc>
-		<szBRName>Sandbags</szBRName>
+		<szBRName>Nothing</szBRName>
-		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>268435456</usItemClass>
+		<usItemClass>1</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
-		<ubGraphicType>1</ubGraphicType>
+		<ItemSize>34</ItemSize>
-		<ubGraphicNum>892</ubGraphicNum>
+		<NotBuyable>1</NotBuyable>
-		<ubWeight>200</ubWeight>
+		<BigGunList>1</BigGunList>
-		<ubPerPocket>1</ubPerPocket>
-		<ItemSize>22</ItemSize>
-		<usPrice>2</usPrice>
-		<ubCoolness>2</ubCoolness>
-		<WaterDamages>1</WaterDamages>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -46496,7 +46491,6 @@
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
-		<ItemFlag>4</ItemFlag>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>197</ubGraphicNum>
 		<ubWeight>20</ubWeight>

gamedir/Data-1.13/TableData/Items/Merges.xml

@@ -5768,6 +5768,14 @@
 		<mergeType>4</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1540</firstItemIndex>
+		<secondItemIndex>1540</secondItemIndex>
+		<firstResultingItemIndex>1540</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>1</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1542</firstItemIndex>
 		<secondItemIndex>1542</secondItemIndex>

gamedir/Data-1.13/TableData/Items/StructureConstruct.xml

@@ -1,7 +1,7 @@
 <STRUCTURESLIST>
 	<STRUCTURE><!--sandbags-->
-		<usCreationItem>1541</usCreationItem>
+		<usCreationItem>1540</usCreationItem>
-		<usItemStatusLoss>100</usItemStatusLoss>
+		<usItemStatusLoss>1</usItemStatusLoss>
 		<szTileSetName>sandbag.sti</szTileSetName>
 		<northfacingtile>3</northfacingtile>
 		<northfacingtile>4</northfacingtile>

gamedir/Data-1.13/TableData/Items/StructureDeconstruct.xml

@@ -1,8 +1,8 @@
 <STRUCTURESLIST>
 	<STRUCTURE><!-- sandbag -->
 		<usDeconstructItem>1543</usDeconstructItem>
-		<usItemToCreate>1541</usItemToCreate>
+		<usItemToCreate>1540</usItemToCreate>
-		<usCreatedItemStatus>100</usCreatedItemStatus>
+		<usCreatedItemStatus>1</usCreatedItemStatus>
 		<szTileSetName>sandbag.sti</szTileSetName>
 		<allowedtile>0</allowedtile>
 		<allowedtile>1</allowedtile>