From a9333dc5a57d7a5d7c17fd00c7508e9575c8765f Mon Sep 17 00:00:00 2001 From: Flugente 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 -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 ++++++++++-------- gamedir/Data-1.13/TableData/Items/Items.xml | 4 +-- .../Data/Interface/ItemInfoSecondaryIcons.sti | Bin 0 -> 16491 bytes 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 gamedir/Data/Interface/ItemInfoSecondaryIcons.sti diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml index 2818f9392..43e65aa58 100644 --- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml +++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml @@ -42,9 +42,12 @@ additive modifier for temperature generation. 1.0 means +100% additive modifier for dirt generation. 1.0 means +100% 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 + multiplier for damage to health multiplier for damage to breath additional multiplier for damage to health if target is a tank @@ -537,9 +540,9 @@ 12 Flame - 137 - 137 - 137 + 255 + 128 + 40 1 1 1 @@ -554,8 +557,8 @@ 1 1 1 - 0 - 0 + 979 + 4 0 0 0 @@ -566,7 +569,7 @@ 0.5 0.8 - 0 + 16 1.0 1.0 0.0 @@ -1445,7 +1448,7 @@ 1.0 0.8 - 0 + 8 1.0 1.0 0.0 diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index 19c4708cd..1cc40e7f7 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -198,7 +198,6 @@ 0 0 0 - 0 0 0 @@ -52284,7 +52283,7 @@ 1761 Extinguisher Fire Extinguisher - Not as useful as one would think in an actual fire fight. Though we see why you made that error. + Not as useful as one would think in an actual fire fight. Though we can see why you made that error. Fire Extinguisher A standard fire extinguisher. Remember to P.A.S.S.. 2 @@ -52306,7 +52305,6 @@ 4 12 1 - 1 100.0 10 20.0 diff --git a/gamedir/Data/Interface/ItemInfoSecondaryIcons.sti b/gamedir/Data/Interface/ItemInfoSecondaryIcons.sti new file mode 100644 index 0000000000000000000000000000000000000000..add912bee5b2096026b90a523339e6f8a1725839 GIT binary patch literal 16491 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 literal 0 HcmV?d00001