rename tag

Author: Coronia

docs/New-or-Enhanced-Logics.md

@@ -305,7 +305,7 @@ Laser trails are very resource intensive! Due to the game not utilizing GPU havi
 In `rulesmd.ini`:
 ```ini
 [CombatDamage]
-ShieldApplyArmorMultiplier=false            ; boolean
+ShieldApplyArmorMult=false                  ; boolean
 
 [AudioVisual]
 Shield.ConditionYellow=                     ; floating point value, percents or absolute
@@ -327,7 +327,7 @@ Armor=none                                  ; ArmorType
 InheritArmorFromTechno=false                ; boolean
 InheritArmor.Allowed=                       ; List of TechnoTypes
 InheritArmor.Disallowed=                    ; List of TechnoTypes
-ApplyArmorMultiplier=                       ; boolean, default to [CombatDamage] -> ShieldApplyArmorMultiplier
+ApplyArmorMult=                             ; boolean, default to [CombatDamage] -> ShieldApplyArmorMult
 Powered=false                               ; boolean
 AbsorbOverDamage=false                      ; boolean
 SelfHealing=0.0                             ; floating point value, percents or absolute
@@ -428,7 +428,7 @@ Shield.InheritStateOnReplace=false          ; boolean
     - `InheritArmorFromTechno` can be set to true to override this so that `[TechnoType] -> Armor` is used even if shield is active and `[ShieldType] -> Armor` is ignored.
     - `InheritArmor.Allowed` lists TechnoTypes whose armor can be overridden. If empty, any TechnoType not listed in `InheritArmor.Disallowed` is okay.
     - `InheritArmor.Disallowed` lists TechnoTypes whose armor can't be overridden. If empty, any TechnoTypes are okay as long as `InheritArmor.Allowed` is empty or they are listed on it.
-    - `ApplyArmorMultiplier` can be set to true to allow the shield to benefit from the armor multiplier.
+    - `ApplyArmorMult` can be set to true to allow the shield to benefit from the armor multiplier.
   - `InitialStrength` can be used to set a different initial strength value from maximum.
   - `ConditionYellow` and `ConditionRed` can be used to set the thresholds for shield damage states, defaulting to `[AudioVisual] -> Shield.ConditionYellow & Shield.ConditionRed` respectively which in turn default to just `ConditionYellow & ConditionRed`.
 - When executing `DeploysInto` or `UndeploysInto`, if both of the TechnoTypes have shields, the transformed unit/building would keep relative shield health (in percents), same as with `Strength`. If one of the TechnoTypes doesn't have shields, it's shield's state on conversion will be preserved until converted back.

src/Ext/Rules/Body.cpp

@@ -104,7 +104,7 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->RadSiteWarhead_Detonate_Full.Read(exINI, GameStrings::Radiation, "RadSiteWarhead.Detonate.Full");
 	this->RadHasOwner.Read(exINI, GameStrings::Radiation, "RadHasOwner");
 	this->RadHasInvoker.Read(exINI, GameStrings::Radiation, "RadHasInvoker");
-	this->ShieldApplyArmorMultiplier.Read(exINI, GameStrings::CombatDamage, "ShieldApplyArmorMultiplier");
+	this->ShieldApplyArmorMult.Read(exINI, GameStrings::CombatDamage, "ShieldApplyArmorMult");
 	this->VeinholeWarhead.Read<true>(exINI, GameStrings::CombatDamage, "VeinholeWarhead");
 	this->MissingCameo.Read(pINI, GameStrings::AudioVisual, "MissingCameo");
 
@@ -469,7 +469,7 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		.Process(this->RadSiteWarhead_Detonate_Full)
 		.Process(this->RadHasOwner)
 		.Process(this->RadHasInvoker)
-		.Process(this->ShieldApplyArmorMultiplier)
+		.Process(this->ShieldApplyArmorMult)
 		.Process(this->JumpjetCrash)
 		.Process(this->JumpjetNoWobbles)
 		.Process(this->VeinholeWarhead)

src/Ext/Rules/Body.h

@@ -51,7 +51,7 @@ class RulesExt
 		Valueable<bool> RadSiteWarhead_Detonate_Full;
 		Valueable<bool> RadHasOwner;
 		Valueable<bool> RadHasInvoker;
-		Valueable<bool> ShieldApplyArmorMultiplier;
+		Valueable<bool> ShieldApplyArmorMult;
 		Valueable<double> JumpjetCrash;
 		Valueable<bool> JumpjetNoWobbles;
 
@@ -347,7 +347,7 @@ class RulesExt
 			, RadSiteWarhead_Detonate_Full { true }
 			, RadHasOwner { false }
 			, RadHasInvoker { false }
-			, ShieldApplyArmorMultiplier { false }
+			, ShieldApplyArmorMult { false }
 			, JumpjetCrash { 5.0 }
 			, JumpjetNoWobbles { false }
 			, VeinholeWarhead {}

src/New/Entity/ShieldClass.cpp

@@ -203,7 +203,7 @@ int ShieldClass::ReceiveDamage(args_ReceiveDamage* args)
 		{
 			nDamage = damage;
 
-			if (pType->ApplyArmorMultiplier.Get(RulesExt::Global()->ShieldApplyArmorMultiplier))
+			if (pType->ApplyArmorMult.Get(RulesExt::Global()->ShieldApplyArmorMult))
 			{
 				armorMultiplier = pTechno->Owner->GetArmorMultiplier(pTechnoType) * pTechno->ArmorMultiplier;
 

src/New/Type/ShieldTypeClass.cpp

@@ -23,7 +23,7 @@ void ShieldTypeClass::LoadFromINI(CCINIClass* pINI)
 	this->InheritArmorFromTechno.Read(exINI, pSection, "InheritArmorFromTechno");
 	this->InheritArmor_Allowed.Read(exINI, pSection, "InheritArmor.Allowed");
 	this->InheritArmor_Disallowed.Read(exINI, pSection, "InheritArmor.Disallowed");
-	this->ApplyArmorMultiplier.Read(exINI, pSection, "ApplyArmorMultiplier");
+	this->ApplyArmorMult.Read(exINI, pSection, "ApplyArmorMult");
 	this->Powered.Read(exINI, pSection, "Powered");
 
 	this->Respawn.Read(exINI, pSection, "Respawn");
@@ -100,7 +100,7 @@ void ShieldTypeClass::Serialize(T& Stm)
 		.Process(this->InheritArmorFromTechno)
 		.Process(this->InheritArmor_Allowed)
 		.Process(this->InheritArmor_Disallowed)
-		.Process(this->ApplyArmorMultiplier)
+		.Process(this->ApplyArmorMult)
 		.Process(this->Powered)
 		.Process(this->Respawn)
 		.Process(this->Respawn_Rate)

src/New/Type/ShieldTypeClass.h

@@ -15,7 +15,7 @@ class ShieldTypeClass final : public Enumerable<ShieldTypeClass>
 	Valueable<bool> InheritArmorFromTechno;
 	ValueableVector<TechnoTypeClass*> InheritArmor_Allowed;
 	ValueableVector<TechnoTypeClass*> InheritArmor_Disallowed;
-	Nullable<bool> ApplyArmorMultiplier;
+	Nullable<bool> ApplyArmorMult;
 	Valueable<bool> Powered;
 	Valueable<double> Respawn;
 	Valueable<int> Respawn_Rate;
@@ -73,7 +73,7 @@ class ShieldTypeClass final : public Enumerable<ShieldTypeClass>
 		, InheritArmorFromTechno { false }
 		, InheritArmor_Allowed { }
 		, InheritArmor_Disallowed { }
-		, ApplyArmorMultiplier {}
+		, ApplyArmorMult {}
 		, Powered { false }
 		, Respawn { 0.0 }
 		, Respawn_Rate { 0 }