Skip to content

Commit

Permalink
Merge pull request #2744 from albertbokor-unideb/Standardized-Cannon-…
Browse files Browse the repository at this point in the history
…Ammo

standardized cannon ammo textures
  • Loading branch information
N7Huntsman authored Sep 21, 2023
2 parents 997cb51 + b57b3a3 commit 796e4e5
Show file tree
Hide file tree
Showing 61 changed files with 45 additions and 45 deletions.
6 changes: 3 additions & 3 deletions Defs/Ammo/Shell/100x695mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<defName>Ammo_100x695mmRCannonShell_HEAT</defName>
<label>100x695mmR cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -58,7 +58,7 @@
<defName>Ammo_100x695mmRCannonShell_HE</defName>
<label>100x695mmR cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down Expand Up @@ -88,7 +88,7 @@
<defName>Bullet_100x695mmRCannonShell_HEAT</defName>
<label>100x695mmR cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/HEAT</texPath>
<texPath>Things/Projectile/Cannon/HEATFS</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Shell/105mmHowitzer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<defName>Ammo_105mmHowitzerShell_HEAT</defName>
<label>105mm Howitzer shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Shell/105x607mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<defName>Ammo_105x607mmRCannonShell_HEAT</defName>
<label>105x607mmR cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -58,7 +58,7 @@
<defName>Ammo_105x607mmRCannonShell_HE</defName>
<label>105x607mmR cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down
12 changes: 6 additions & 6 deletions Defs/Ammo/Shell/105x617mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<defName>Ammo_105x617mmRCannonShell_HEAT</defName>
<label>105x617mmR cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>142.42</MarketValue>
Expand All @@ -58,8 +58,8 @@
<defName>Ammo_105x617mmRCannonShell_HE</defName>
<label>105x617mmR cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>156.72</MarketValue>
Expand Down Expand Up @@ -88,7 +88,7 @@
<defName>Bullet_105x617mmRCannonShell_HEAT</defName>
<label>105x617mmR cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/HEAT</texPath>
<texPath>Things/Projectile/Cannon/HEATFS</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down Expand Up @@ -120,7 +120,7 @@
<label>105x617mmR cannon shell (HE)</label>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<graphicData>
<texPath>Things/Projectile/Cannon/HE</texPath>
<texPath>Things/Projectile/Cannon/HEFS</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down
14 changes: 7 additions & 7 deletions Defs/Ammo/Shell/120mmCannon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<defName>Ammo120mmCannonShells</defName>
<label>120mm cannon shell</label>
<parent>AmmoShells</parent>
<iconPath>Things/Ammo/Cannon/120mmTank/HE</iconPath>
<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->
Expand Down Expand Up @@ -44,8 +44,8 @@
<defName>Ammo_120mmCannonShell_HEAT</defName>
<label>120mm cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/120mmTank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Ammo/Cannon/Tank/HEATFS</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>149.17</MarketValue>
Expand All @@ -58,8 +58,8 @@
<defName>Ammo_120mmCannonShell_HE</defName>
<label>120mm cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/120mmTank/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>172.67</MarketValue>
Expand Down Expand Up @@ -87,7 +87,7 @@
<defName>Bullet_120mmCannonShell_HEAT</defName>
<label>120mm cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
<texPath>Things/Projectile/Cannon/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down Expand Up @@ -118,7 +118,7 @@
<label>120mm cannon shell (HE)</label>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
<texPath>Things/Projectile/Cannon/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Shell/57x307mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<defName>Ammo_57x307mmR_AP</defName>
<label>57x307mmR cartridge (AP)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -57,7 +57,7 @@
<defName>Ammo_57x307mmR_HE</defName>
<label>57x307mmR cartridge (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Shell/75x350mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<defName>Ammo_75x350mmR_AP</defName>
<label>75x350mmR cartridge (AP)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/APHE</texPath>
<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -57,7 +57,7 @@
<defName>Ammo_75x350mmR_HE</defName>
<label>75x350mmR cartridge (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down
14 changes: 7 additions & 7 deletions Defs/Ammo/Shell/762x385mmRCannon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<defName>Ammo762x385mmRCannonShells</defName>
<label>76.2x385mmR Cannon shell</label>
<parent>AmmoShells</parent>
<iconPath>Things/Ammo/Cannon/762x385mmR/HE</iconPath>
<iconPath>Things/Ammo/Cannon/HE</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->
Expand Down Expand Up @@ -45,7 +45,7 @@
<defName>Ammo_762x385mmRCannonShell_HEAT</defName>
<label>76.2x385mmR Cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/762x385mmR/HEAT</texPath>
<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand All @@ -59,7 +59,7 @@
<defName>Ammo_762x385mmRCannonShell_HE</defName>
<label>76.2x385mmR Cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/762x385mmR/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand All @@ -73,7 +73,7 @@
<defName>Ammo_762x385mmRCannonShell_EMP</defName>
<label>76.2x385mmR Cannon shell (EMP)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/762x385mmR/EMP</texPath>
<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand Down Expand Up @@ -102,7 +102,7 @@
<defName>Bullet_762x385mmRCannonShell_HEAT</defName>
<label>76.2x385mmR Cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
<texPath>Things/Projectile/Cannon/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down Expand Up @@ -133,7 +133,7 @@
<label>76.2x385mmR Cannon shell (HE)</label>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<graphicData>
<texPath>Things/Projectile/Cannon/762x385mmR/HE</texPath>
<texPath>Things/Projectile/Cannon/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand All @@ -158,7 +158,7 @@
<label>76.2x385mmR Cannon shell (EMP)</label>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<graphicData>
<texPath>Things/Projectile/Cannon/762x385mmR/EMP</texPath>
<texPath>Things/Projectile/Cannon/EMP</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down
8 changes: 4 additions & 4 deletions Defs/Ammo/Shell/90mmCannon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<defName>Ammo_90mmCannonShell_HEAT</defName>
<label>90mm cannon shell (HEAT)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HEAT</texPath>
<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -63,7 +63,7 @@
<defName>Ammo_90mmCannonShell_HE</defName>
<label>90mm cannon shell (HE)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -77,7 +77,7 @@
<defName>Ammo_90mmCannonShell_HE_TFuzed</defName>
<label>90mm cannon shell (HE Time-Fuzed)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/HE</texPath>
<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand All @@ -91,7 +91,7 @@
<defName>Ammo_90mmCannonShell_EMP</defName>
<label>90mm cannon shell (EMP)</label>
<graphicData>
<texPath>Things/Ammo/Cannon/Flak/EMP</texPath>
<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
Expand Down
2 changes: 1 addition & 1 deletion Patches/O21 Outer Rim Galaxies/Patch_OuterRim_Ammo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
<defName>Bullet_OR_WristRocket</defName>
<label>wrist rocket</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
<texPath>Things/Projectile/Cannon/Sabot</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
Expand Down
20 changes: 10 additions & 10 deletions Patches/Orassans/Ammo/MissileAmmo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<defName>AmmoOrassanMissileShells</defName>
<label>orassan missile shell</label>
<parent>AmmoShells</parent>
<iconPath>Things/Projectile/Cannon/120mmTank/HE</iconPath>
<iconPath>Things/Projectile/Cannon/HE</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->
Expand Down Expand Up @@ -53,7 +53,7 @@
<defName>Ammo_OrassanMissileShell_HEAT</defName>
<label>Orassan Missile shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand All @@ -67,7 +67,7 @@
<defName>Ammo_OrassanMissileShell_HE</defName>
<label>Orassan Missile shell (HE)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand All @@ -81,7 +81,7 @@
<defName>Ammo_OrassanMissileShell_APSabot</defName>
<label>Orassan Missile shell (AP Sabot)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
Expand Down Expand Up @@ -111,8 +111,8 @@
<defName>Bullet_OrassanMissileShell_HEAT</defName>
<label>Orassan Missile shell (HEAT)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HEAT</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Projectile/Cannon/Tank/HEAT</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
Expand Down Expand Up @@ -141,8 +141,8 @@
<defName>Bullet_OrassanMissileShell_APSabot</defName>
<label>Orassan Missile shell (AP Sabot)</label>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/Sabot</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Projectile/Cannon/Tank/Sabot</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
Expand Down Expand Up @@ -172,8 +172,8 @@
<label>Orassan Missile shell (HE)</label>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<graphicData>
<texPath>Things/Projectile/Cannon/120mmTank/HE</texPath>
<graphicClass>Graphic_Single</graphicClass>
<texPath>Things/Projectile/Cannon/Tank/HE</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
Expand Down
Binary file removed Textures/Things/Ammo/Cannon/120mmTank/Canister.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/120mmTank/HE.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/120mmTank/HEAT.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/120mmTank/Sabot.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/762x385mmR/EMP.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/762x385mmR/HE.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/762x385mmR/HEAT.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/APHE/APHE_a.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/APHE/APHE_b.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/APHE/APHE_c.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/EMP/EMP_a.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/EMP/EMP_b.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/EMP/EMP_c.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HE/HE_a.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HE/HE_b.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HE/HE_c.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_a.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_b.png
Binary file not shown.
Binary file removed Textures/Things/Ammo/Cannon/Flak/HEAT/HEAT_c.png
Binary file not shown.
Binary file added Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png
Binary file added Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png
Binary file added Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png
Binary file added Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png
Binary file removed Textures/Things/Projectile/Cannon/120mmTank/HE.png
Diff not rendered.
Binary file removed Textures/Things/Projectile/Cannon/120mmTank/HEAT.png
Diff not rendered.
Binary file removed Textures/Things/Projectile/Cannon/120mmTank/Sabot.png
Diff not rendered.
Binary file modified Textures/Things/Projectile/Cannon/APHE.png
Binary file modified Textures/Things/Projectile/Cannon/EMP.png
Binary file added Textures/Things/Projectile/Cannon/EMPFS.png
Binary file modified Textures/Things/Projectile/Cannon/HEAT.png
Binary file added Textures/Things/Projectile/Cannon/HEATFS.png
Binary file added Textures/Things/Projectile/Cannon/HEFS.png
Binary file added Textures/Things/Projectile/Cannon/Sabot.png

0 comments on commit 796e4e5

Please sign in to comment.