Implement per-type damage modifiers

Author: ZivDero

CREDITS.md

@@ -221,3 +221,4 @@ This page lists all the individual contributions to the project by their author.
   - Implement `CellSpread` and `PercentAtMax`.
   - Implement `ScorchChance`, `CraterChance` and `CellAnimChance`.
   - Implement `Explosive` for animations.
+  - Implement `InfantryMultiplier`, `VehicleMultiplier`, `AircraftMultiplier`, `BuildingMultiplier`, `TerrainMultiplier`.

docs/New-Features-and-Enhancements.md

@@ -1221,6 +1221,20 @@ CellAnimChance=0  ; % or float, the chance that an affected cell will contain a
 CellAnim=         ; list of AnimTypes, the list of animation to pick from when a random animation is spawned. Defaults to `[AudioVisual]->OnFire`.
 ```
 
+### Damage Modifier against types of objects
+
+- Vinifera allows specified a broad multiplier to damage against infantry, vehicles, aircraft, buildings and terrain objects.
+
+In `RULES.INI`:
+```ini
+[SOMEWARHEAD]            ; WarheadType
+InfantryMultiplier=100%  ; % or float, modifier applied to damage dealt to infantry by this warhead.
+VehicleMultiplier=100%   ; % or float, modifier applied to damage dealt to vehicles by this warhead.
+AircraftMultiplier=100%  ; % or float, modifier applied to damage dealt to aircraft by this warhead.
+BuildingMultiplier=100%  ; % or float, modifier applied to damage dealt to buildings by this warhead.
+TerrainMultiplier=100%   ; % or float, modifier applied to damage dealt to terrain objects by this warhead.
+```
+
 ### MinDamage
 
 - Vinifera allows customizing the minimum damage dealt using a specific warhead.

docs/Whats-New.md

@@ -172,6 +172,7 @@ New:
 - Implement `CellSpread` and `PercentAtMax` (by ZivDero)
 - Implement `ScorchChance`, `CraterChance` and `CellAnimChance` (by ZivDero)
 - Implement `Explosive` for animations (by ZivDero, Rampastring)
+- Implement `InfantryMultiplier`, `VehicleMultiplier`, `AircraftMultiplier`, `BuildingMultiplier`, `TerrainMultiplier` (by ZivDero)
 
 
 Vanilla fixes:

src/extensions/combat/combatext_hooks.cpp

@@ -73,8 +73,12 @@
  *           01/01/1995 JLB - Takes into account distance from damage source.          
  *           04/11/1996 JLB - Changed damage fall-off formula for less damage fall-off.
  *           ZivDero : Adjustments for Tiberian Sun
+ *
+ *  @note: Originally, the function took `ArmorType armor` instead of `ObjectClass * target`.
+ *  The single vanilla call site has been patched to take this into account.
+ * 
  */
-int Vinifera_Modify_Damage(int damage, WarheadTypeClass* warhead, ArmorType armor, int distance)
+int Vinifera_Modify_Damage(int damage, WarheadTypeClass* warhead, ObjectClass * target, int distance)
 {
     /**
      *	If there is no raw damage value to start with, then
@@ -83,6 +87,8 @@ int Vinifera_Modify_Damage(int damage, WarheadTypeClass* warhead, ArmorType armo
     if (!damage || Scen->SpecialFlags.IsInert || warhead == nullptr)
         return 0;
 
+    ArmorType armor = target->Class_Of()->Armor;
+
     /**
      *	Negative damage (i.e., heal) is always applied full strength, but only if the heal
      *	effect is close enough.
@@ -104,15 +110,42 @@ int Vinifera_Modify_Damage(int damage, WarheadTypeClass* warhead, ArmorType armo
      */
     if (warhead_ext->CellSpread < 0.0)
     {
-
         /**
-         *  Apply the warhead's modifier to the damage and ensure it's at least MinDamage.
+         *  Apply the warhead's modifier to the damage.
          */
         damage *= Verses::Get_Modifier(armor, warhead);
+
+        /**
+         *  Apply an extra modifier based on the object's type.
+         */
+        switch (target->RTTI)
+        {
+        case RTTI_INFANTRY:
+            damage *= warhead_ext->InfantryMultiplier;
+            break;
+        case RTTI_UNIT:
+            damage *= warhead_ext->VehicleMultiplier;
+            break;
+        case RTTI_AIRCRAFT:
+            damage *= warhead_ext->AircraftMultiplier;
+            break;
+        case RTTI_BUILDING:
+            damage *= warhead_ext->BuildingMultiplier;
+            break;
+        case RTTI_TERRAIN:
+            damage *= warhead_ext->TerrainMultiplier;
+            break;
+        default:
+            break;
+        }
+
+        /**
+         *  Ensure that the damage is at least MinDamage.
+         */
         damage = std::max(min_damage, damage);
 
         /**
-         *	Reduce damage according to the distance from the impact point.
+         *  Reduce damage according to the distance from the impact point.
          */
         if (damage)
         {
@@ -164,9 +197,37 @@ int Vinifera_Modify_Damage(int damage, WarheadTypeClass* warhead, ArmorType armo
         damage = std::max(0, damage);
 
         /**
-         *  Apply the warhead's modifier to the damage and ensure it's at least MinDamage.
+         *  Apply the warhead's modifier to the damage.
          */
         damage *= Verses::Get_Modifier(armor, warhead);
+
+        /**
+         *  Apply an extra modifier based on the object's type.
+         */
+        switch (target->RTTI)
+        {
+        case RTTI_INFANTRY:
+            damage *= warhead_ext->InfantryMultiplier;
+            break;
+        case RTTI_UNIT:
+            damage *= warhead_ext->VehicleMultiplier;
+            break;
+        case RTTI_AIRCRAFT:
+            damage *= warhead_ext->AircraftMultiplier;
+            break;
+        case RTTI_BUILDING:
+            damage *= warhead_ext->BuildingMultiplier;
+            break;
+        case RTTI_TERRAIN:
+            damage *= warhead_ext->TerrainMultiplier;
+            break;
+        default:
+            break;
+        }
+
+        /**
+         *  Ensure that the damage is at least MinDamage.
+         */
         damage = std::max(min_damage, damage);
     }
 
@@ -717,6 +778,8 @@ DECLARE_PATCH(_Do_Flash_CombatLightSize_Patch)
  */
 void CombatExtension_Hooks()
 {
+    Patch_Byte(0x0058604A, 0x56); // push eax -> push esi; Modify_Damage originally takes ArmorType as its argument, we instead pass the target object
+
     Patch_Jump(0x00460477, &_Do_Flash_CombatLightSize_Patch);
     Patch_Jump(0x0045EB60, &Vinifera_Modify_Damage);
     Patch_Jump(0x0045EEB0, &Vinifera_Explosion_Damage);

src/extensions/warheadtype/warheadtypeext.cpp

@@ -61,7 +61,12 @@ WarheadTypeClassExtension::WarheadTypeClassExtension(const WarheadTypeClass *thi
     ScorchChance(0.0f),
     CraterChance(0.0f),
     CellAnimChance(0.0f),
-    CellAnim()
+    CellAnim(),
+    InfantryMultiplier(1.0f),
+    VehicleMultiplier(1.0f),
+    AircraftMultiplier(1.0f),
+    BuildingMultiplier(1.0f),
+    TerrainMultiplier(1.0f)
 {
     //if (this_ptr) EXT_DEBUG_TRACE("WarheadTypeClassExtension::WarheadTypeClassExtension - Name: %s (0x%08X)\n", Name(), (uintptr_t)(This()));
 
@@ -202,6 +207,15 @@ void WarheadTypeClassExtension::Compute_CRC(WWCRCEngine &crc) const
     crc(ShakePixelXLo);
     crc(CellSpread);
     crc(PercentAtMax);
+    crc(ScorchChance);
+    crc(CraterChance);
+    crc(CellAnimChance);
+    crc(CellAnim.Count());
+    crc(InfantryMultiplier);
+    crc(VehicleMultiplier);
+    crc(AircraftMultiplier);
+    crc(BuildingMultiplier);
+    crc(TerrainMultiplier);
 }
 
 
@@ -318,6 +332,12 @@ bool WarheadTypeClassExtension::Read_INI(CCINIClass &ini)
     CellAnimChance = std::clamp(CellAnimChance, 0.0f, 1.0f);
     CellAnim = ini.Get_Anims(ini_name, "CellAnim", CellAnim);
 
+    InfantryMultiplier = ini.Get_Float(ini_name, "InfantryMultiplier", InfantryMultiplier);
+    VehicleMultiplier = ini.Get_Float(ini_name, "VehicleMultiplier", VehicleMultiplier);
+    AircraftMultiplier = ini.Get_Float(ini_name, "AircraftMultiplier", AircraftMultiplier);
+    BuildingMultiplier = ini.Get_Float(ini_name, "BuildingMultiplier", BuildingMultiplier);
+    TerrainMultiplier = ini.Get_Float(ini_name, "TerrainMultiplier", TerrainMultiplier);
+
     IsInitialized = true;
 
     return true;

src/extensions/warheadtype/warheadtypeext.h

@@ -119,4 +119,13 @@ WarheadTypeClassExtension final : public AbstractTypeClassExtension
          *  The list of anims to pick from when CellAnimChance is triggered.
          */
         TypeList<AnimTypeClass*> CellAnim;
+
+        /**
+         *  Damage multipliers against various object types.
+         */
+        float InfantryMultiplier;
+        float VehicleMultiplier;
+        float AircraftMultiplier;
+        float BuildingMultiplier;
+        float TerrainMultiplier;
 };