From 55259933f8c490a795e42bb43cccfb58c5ea80a1 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 15 Jul 2021 18:18:33 +0000
Subject: [PATCH] Whether a gun shoots fire or fire retardant is now set on the
 ammo with the <ammoflag>-tag, not the gun.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2604 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/TableData/Items/AmmoTypes.xml   |  23 ++++++++++++----------
 Data-1.13/TableData/Items/Items.xml       |   4 +---
 Data/Interface/ItemInfoSecondaryIcons.sti | Bin 15853 -> 16491 bytes
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Data-1.13/TableData/Items/AmmoTypes.xml b/Data-1.13/TableData/Items/AmmoTypes.xml
index 2818f9392..43e65aa58 100644
--- a/Data-1.13/TableData/Items/AmmoTypes.xml
+++ b/Data-1.13/TableData/Items/AmmoTypes.xml
@@ -42,9 +42,12 @@
 	<temperatureModificator>	additive modifier for temperature generation. 1.0 means +100%
 	<dirtModificator>			additive modifier for dirt generation. 1.0 means +100%
 	<ammoflag>			flagmask for various ammo properties:
-							AMMO_CRYO			1			this ammo shock-freezes target (scifi)
-							AMMO_BLIND			2			this ammo will blind if it hits the head
-							AMMO_ANTIMATERIEL	4			this ammo is anti-materiel, bullets can destroy structures
+							AMMO_CRYO				1			this ammo shock-freezes target (scifi)
+							AMMO_BLIND				2			this ammo will blind if it hits the head
+							AMMO_ANTIMATERIEL		4			this ammo is anti-materiel, bullets can destroy structures
+							AMMO_TRAIL_WHITESMOKE	8			this ammo leaves a trail of white smoke
+							AMMO_TRAIL_FIRE			16			this ammo leaves a trail of fire
+
 	<dDamageModifierLife>					multiplier for damage to health
 	<dDamageModifierBreath>					multiplier for damage to breath
 	<dDamageModifierTank>					additional multiplier for damage to health if target is a tank
@@ -537,9 +540,9 @@
 	<AMMOTYPE>
 		<uiIndex>12</uiIndex>
 		<name>Flame</name>
-		<red>137</red>
-		<green>137</green>
-		<blue>137</blue>
+		<red>255</red>
+		<green>128</green>
+		<blue>40</blue>
 		<structureImpactReductionMultiplier>1</structureImpactReductionMultiplier>
 		<structureImpactReductionDivisor>1</structureImpactReductionDivisor>
 		<armourImpactReductionMultiplier>1</armourImpactReductionMultiplier>
@@ -554,8 +557,8 @@
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
-		<highExplosive>0</highExplosive>
-		<explosionSize>0</explosionSize>
+		<highExplosive>979</highExplosive>
+		<explosionSize>4</explosionSize>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -566,7 +569,7 @@
 		<spreadPattern />
 		<temperatureModificator>0.5</temperatureModificator>
 		<dirtModificator>0.8</dirtModificator>
-		<ammoflag>0</ammoflag>
+		<ammoflag>16</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
 		<dDamageModifierTank>0.0</dDamageModifierTank>
@@ -1445,7 +1448,7 @@
 		<spreadPattern />
 		<temperatureModificator>1.0</temperatureModificator>
 		<dirtModificator>0.8</dirtModificator>
-		<ammoflag>0</ammoflag>
+		<ammoflag>8</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
 		<dDamageModifierTank>0.0</dDamageModifierTank>
diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml
index 19c4708cd..1cc40e7f7 100644
--- a/Data-1.13/TableData/Items/Items.xml
+++ b/Data-1.13/TableData/Items/Items.xml
@@ -198,7 +198,6 @@
 		<bloodbag>0</bloodbag>
 		<emptybloodbag>0</emptybloodbag>
 		<medicalsplint>0</medicalsplint>
-		<fireextinguisher>0</fireextinguisher>
 		<sFireResistance>0</sFireResistance>
 		<STAND_MODIFIERS>
 			<FlatBase>0</FlatBase>
@@ -52284,7 +52283,7 @@
 		<uiIndex>1761</uiIndex>
 		<szItemName>Extinguisher</szItemName>
 		<szLongItemName>Fire Extinguisher</szLongItemName>
-		<szItemDesc>Not as useful as one would think in an actual fire fight. Though we see why you made that error.</szItemDesc>
+		<szItemDesc>Not as useful as one would think in an actual fire fight. Though we can see why you made that error.</szItemDesc>
 		<szBRName>Fire Extinguisher</szBRName>
 		<szBRDesc>A standard fire extinguisher. Remember to P.A.S.S..</szBRDesc>
 		<usItemClass>2</usItemClass>
@@ -52306,7 +52305,6 @@
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_ROF>12</BR_ROF>
 		<GrenadeLauncher>1</GrenadeLauncher>
-		<fireextinguisher>1</fireextinguisher>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<DamageChance>10</DamageChance>
 		<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
diff --git a/Data/Interface/ItemInfoSecondaryIcons.sti b/Data/Interface/ItemInfoSecondaryIcons.sti
index 8f306173c27fca75b0ba4c1fdede03595f6f2ecd..add912bee5b2096026b90a523339e6f8a1725839 100644
GIT binary patch
delta 1157
zcmaiyJ#Q015Qg7%Yzu^g6UUa7BBDhHg&{yflnx;giRwZR5~4x6iq#@SaXH_I?bxBu
z&p`eU)HD=`h90G$r{JBrjn6Iu<LoN?%*V~VyB8mSotT~D7f+5ryK^8raGUF=IjO+_
zgU>tf8}V!YC)Py|#{*#BpSQ7%={?|E=|-CoukHgM{JDi2_|Ef%KW{Pr%kJuV{s1^y
zs`uw1@Z6t!jDNO=yBPZd>)68AJ>cz9!og$UxA(K5`K{*DK|M7tnZJ4Tt{!KtZnN*L
z(U?HaJz8JZf6s}rBV_I66dTzB*+x~h->^|+b7hOlM9SjLDwixI&5*6YFbJ=Po#pf}
zkkAx)na>eyMD`C@9BS_}EJH*6P;pIa3QDANX>-&hBAH=a=U}}vOlsZ!r+Me_hl$T2
zze&@nonlmTuHYI&_K9&L<aP0-#^%OR93PsjQ7e)hypG{@O_%Qt4gXvwG;JwmUzV|n
zP`c7}8+jf@u_U-u`ArUSS%!reuY9;EI)s{2YP`xdM`bQ~(ox;0M<CTizZC~14b&r!
zI7QlVnxI@AQQ3a7L4Il47%!Jkk9{tTI0sdji8O_Ary^LTVWn%SbG6Tmong8bQ<y2n
z#`@c$ddzQ;%BZRv>ryeA%t+${EkvpXkUP$$SNhAC@*!5tJM?kttRhYz>m@%TPgZHE
Y0Qak5-ezQF@@e0lv_@lh)sW}-3nZT`{Qv*}

delta 443
zcmaFe!1%UWHaNuDlK}|MnuACN1`Qy7z}UdVz{tR$w^6p7wLSsJ0s#>QQHB5m1_lc#
zUy?zRp~H}Y;VML$fgh+M)`)?j63XXc;AXf6<iCaTg@O7H8>8|!m@qJSBANHol!3tq
z$`=KycQt3=Vd#Jwz{?=K*`CeSfU$LRhgmVp<WL^D$rpG9K)Ak<v80osiC=_G6bQsY
zn6)Igq=TVJK!i;k27p4jCGB7_xH6y+SWFP16(|%06l`N?LJ<to3c@Lv+9ZUmKS&Ft
yww0k7VgS%RCAmN`Jc2D?r-K|0R2c-esD%S$BuJ<c<Zz%XCwKG8Z?>_y!UzB!#!^`T