Skip to content

Improve our existing tag name and discuss clear standards for it #1984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DeathFishAtEase wants to merge 8 commits into
base: develop
Choose a base branch
from
+160 −138
Draft

Improve our existing tag name and discuss clear standards for it #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa6bcd3
Crit: `Affect`Percent→`Affects`Percent
DeathFishAtEase Dec 3, 2025
eec9416
DetonateOnAllMapObjects: `AffectHouses`→`AffectsHouses`
DeathFishAtEase Dec 5, 2025
2bf0837
Convert: `AffectedHouses`→`AffectsHouses`
DeathFishAtEase Dec 10, 2025
27f2f57
LimboKill: `Affected`→`AffectsHouse`
DeathFishAtEase Dec 10, 2025
bcbe4f8
Crit: `Affects=`→`AffectsTarget=`
DeathFishAtEase Dec 10, 2025
620b82b
`AffectsHouses`→`AffectsHouse`
DeathFishAtEase Dec 20, 2025
0da2d1a
`AffectTargets`→`AffectsTarget`
DeathFishAtEase Dec 20, 2025
503a27c
`AutoFire`→`AutoTargetOwnPosition`
DeathFishAtEase Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions docs/New-or-Enhanced-Logics.md
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions docs/Whats-New.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,29 @@ You can use the migration utility (can be found on [Phobos supplementaries repo]

- Key `rulesmd.ini -> [TechnoType] -> Deployed.RememberTarget` is deprecated and can be removed now, the bugfix for `DeployToFire` deployers is now always on.

### Changed tags<!-- This is only a temporary solution; what method to use afterwards has not been determined yet. -->

- To standardize tag names for similar functions, prevent typos, or avoid misunderstandings, replace them with new tag names.

#### From 0.4

- `[WarheadType] -> Crit.AffectBelowPercent` -> `[WarheadType] -> Crit.AffectsBelowPercent`.
- `[WarheadType] -> DetonateOnAllMapObjects.AffectHouses` -> `[WarheadType] -> DetonateOnAllMapObjects.AffectsHouse`
- `[WarheadType/SuperWeaponType] -> Convert(N).AffectedHouses` -> `[WarheadType/SuperWeaponType] -> Convert(N).AffectsHouse`
- `[SuperWeaponType] -> LimboKill.Affected` -> `[SuperWeaponType] -> LimboKill.AffectsHouse`
- `[WarheadType] -> Crit.Affects` -> `[WarheadType] -> Crit.AffectsTarget`
- `[AttachEffectType/TechnoType] -> RevengeWeapon.AffectsHouses` -> `[AttachEffectType/TechnoType] -> RevengeWeapon.AffectsHouse`
- `[AttachEffectType] -> ReflectDamage.AffectsHouses` -> `[AttachEffectType] -> ReflectDamage.AffectsHouse`
- `[WarheadType] -> Crit.AffectsHouses` -> `[WarheadType] -> Crit.AffectsHouse`
- `[WarheadType] -> KillWeapon.AffectsHouses` -> `[WarheadType] -> KillWeapon.AffectsHouse`
- `[WarheadType] -> KillWeapon.OnFirer.AffectsHouses` -> `[WarheadType] -> KillWeapon.OnFirer.AffectsHouse`
- `[AttachEffectType] -> AffectTargets` -> `[AttachEffectType] -> AffectsTarget`
- `[WarheadType] -> DetonateOnAllMapObjects.AffectTargets` -> `[WarheadType] -> DetonateOnAllMapObjects.AffectsTarget`

#### From ???

- `[WarheadType] -> Crit.AffectAbovePercent` -> `[WarheadType] -> Crit.AffectsAbovePercent`.

### New user settings in RA2MD.INI

- These are new user setting keys added by various features in Phobos. Most of them can be found in either in [user inteface](User-Interface.md) or [miscellaneous](Miscellanous.md) sections. Search functionality can be used to find them quickly if needed.
Expand Down
161 changes: 80 additions & 81 deletions docs/locale/zh_CN/LC_MESSAGES/New-or-Enhanced-Logics.po
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Ext/SWType/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void SWTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->LimboDelivery_Types.Read(exINI, pSection, "LimboDelivery.Types");
this->LimboDelivery_IDs.Read(exINI, pSection, "LimboDelivery.IDs");
this->LimboDelivery_RollChances.Read(exINI, pSection, "LimboDelivery.RollChances");
this->LimboKill_Affected.Read(exINI, pSection, "LimboKill.Affected");
this->LimboKill_Affected.Read(exINI, pSection, "LimboKill.AffectsHouse");
this->LimboKill_IDs.Read(exINI, pSection, "LimboKill.IDs");
this->SW_Next.Read(exINI, pSection, "SW.Next");
this->SW_Next_RealLaunch.Read(exINI, pSection, "SW.Next.RealLaunch");
Expand Down
6 changes: 3 additions & 3 deletions src/Ext/TechnoType/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,8 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->OpenTransport_RangeBonus.Read(exINI, pSection, "OpenTransport.RangeBonus");
this->OpenTransport_DamageMultiplier.Read(exINI, pSection, "OpenTransport.DamageMultiplier");

this->AutoFire.Read(exINI, pSection, "AutoFire");
this->AutoFire_TargetSelf.Read(exINI, pSection, "AutoFire.TargetSelf");
this->AutoFire.Read(exINI, pSection, "AutoTargetOwnPosition");
this->AutoFire_TargetSelf.Read(exINI, pSection, "AutoTargetOwnPosition.Self");

this->NoSecondaryWeaponFallback.Read(exINI, pSection, "NoSecondaryWeaponFallback");
this->NoSecondaryWeaponFallback_AllowAA.Read(exINI, pSection, "NoSecondaryWeaponFallback.AllowAA");
Expand Down Expand Up @@ -981,7 +981,7 @@ void TechnoTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->Tint_VisibleToHouses.Read(exINI, pSection, "Tint.VisibleToHouses");

this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouses");
this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouse");

this->RecountBurst.Read(exINI, pSection, "RecountBurst");

Expand Down
18 changes: 9 additions & 9 deletions src/Ext/WarheadType/Body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,19 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->Crit_ExtraDamage_ApplyFirepowerMult.Read(exINI, pSection, "Crit.ExtraDamage.ApplyFirepowerMult");
this->Crit_Warhead.Read<true>(exINI, pSection, "Crit.Warhead");
this->Crit_Warhead_FullDetonation.Read(exINI, pSection, "Crit.Warhead.FullDetonation");
this->Crit_Affects.Read(exINI, pSection, "Crit.Affects");
this->Crit_AffectsHouses.Read(exINI, pSection, "Crit.AffectsHouses");
this->Crit_Affects.Read(exINI, pSection, "Crit.AffectsTarget");
this->Crit_AffectsHouses.Read(exINI, pSection, "Crit.AffectsHouse");
this->Crit_AnimList.Read(exINI, pSection, "Crit.AnimList");
this->Crit_AnimList_PickRandom.Read(exINI, pSection, "Crit.AnimList.PickRandom");
this->Crit_AnimList_CreateAll.Read(exINI, pSection, "Crit.AnimList.CreateAll");
this->Crit_ActiveChanceAnims.Read(exINI, pSection, "Crit.ActiveChanceAnims");
this->Crit_AnimOnAffectedTargets.Read(exINI, pSection, "Crit.AnimOnAffectedTargets");
this->Crit_AffectBelowPercent.Read(exINI, pSection, "Crit.AffectBelowPercent");
this->Crit_AffectAbovePercent.Read(exINI, pSection, "Crit.AffectAbovePercent");
this->Crit_AffectBelowPercent.Read(exINI, pSection, "Crit.AffectsBelowPercent");
this->Crit_AffectAbovePercent.Read(exINI, pSection, "Crit.AffectsAbovePercent");
this->Crit_SuppressWhenIntercepted.Read(exINI, pSection, "Crit.SuppressWhenIntercepted");

if (this->Crit_AffectAbovePercent > this->Crit_AffectBelowPercent)
Debug::Log("[Developer warning][%s] Crit.AffectAbovePercent is bigger than Crit.AffectBelowPercent, crit will never activate!\n", pSection);
Debug::Log("[Developer warning][%s] Crit.AffectsAbovePercent is bigger than Crit.AffectsBelowPercent, crit will never activate!\n", pSection);

this->MindControl_Anim.Read(exINI, pSection, "MindControl.Anim");
this->MindControl_ThreatDelay.Read(exINI, pSection, "MindControl.ThreatDelay");
Expand Down Expand Up @@ -234,8 +234,8 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
this->DetonateOnAllMapObjects.Read(exINI, pSection, "DetonateOnAllMapObjects");
this->DetonateOnAllMapObjects_Full.Read(exINI, pSection, "DetonateOnAllMapObjects.Full");
this->DetonateOnAllMapObjects_RequireVerses.Read(exINI, pSection, "DetonateOnAllMapObjects.RequireVerses");
this->DetonateOnAllMapObjects_AffectTargets.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectTargets");
this->DetonateOnAllMapObjects_AffectHouses.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectHouses");
this->DetonateOnAllMapObjects_AffectTargets.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectsTarget");
this->DetonateOnAllMapObjects_AffectHouses.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectsHouse");
this->DetonateOnAllMapObjects_AffectTypes.Read(exINI, pSection, "DetonateOnAllMapObjects.AffectTypes");
this->DetonateOnAllMapObjects_IgnoreTypes.Read(exINI, pSection, "DetonateOnAllMapObjects.IgnoreTypes");

Expand Down Expand Up @@ -275,8 +275,8 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)

this->KillWeapon.Read(exINI, pSection, "KillWeapon");
this->KillWeapon_OnFirer.Read(exINI, pSection, "KillWeapon.OnFirer");
this->KillWeapon_AffectsHouses.Read(exINI, pSection, "KillWeapon.AffectsHouses");
this->KillWeapon_OnFirer_AffectsHouses.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsHouses");
this->KillWeapon_AffectsHouses.Read(exINI, pSection, "KillWeapon.AffectsHouse");
this->KillWeapon_OnFirer_AffectsHouses.Read(exINI, pSection, "KillWeapon.OnFirer.AffectsHouse");
this->KillWeapon_Affects.Read(exINI, pSection, "KillWeapon.Affects");
this->KillWeapon_OnFirer_Affects.Read(exINI, pSection, "KillWeapon.OnFirer.Affects");

Expand Down
4 changes: 2 additions & 2 deletions src/New/Type/Affiliated/TypeConvertGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void TypeConvertGroup::Parse(std::vector<TypeConvertGroup>& list, INI_EX& exINI,
convertFrom.Read(exINI, pSection, tempBuffer);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.To", i);
convertTo.Read(exINI, pSection, tempBuffer);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.AffectedHouses", i);
_snprintf_s(tempBuffer, sizeof(tempBuffer), "Convert%d.AffectsHouse", i);
convertAffectedHouses.Read(exINI, pSection, tempBuffer);

if (!convertTo.isset())
Expand All @@ -72,7 +72,7 @@ void TypeConvertGroup::Parse(std::vector<TypeConvertGroup>& list, INI_EX& exINI,
Nullable<AffectedHouse> convertAffectedHouses;
convertFrom.Read(exINI, pSection, "Convert.From");
convertTo.Read(exINI, pSection, "Convert.To");
convertAffectedHouses.Read(exINI, pSection, "Convert.AffectedHouses");
convertAffectedHouses.Read(exINI, pSection, "Convert.AffectsHouse");
if (convertTo.isset())
{
if (!convertAffectedHouses.isset())
Expand Down
6 changes: 3 additions & 3 deletions src/New/Type/AttachEffectTypeClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
this->PenetratesForceShield.Read(exINI, pSection, "PenetratesForceShield");
this->AffectTypes.Read(exINI, pSection, "AffectTypes");
this->IgnoreTypes.Read(exINI, pSection, "IgnoreTypes");
this->AffectTargets.Read(exINI, pSection, "AffectTargets");
this->AffectTargets.Read(exINI, pSection, "AffectsTarget");

this->Animation.Read(exINI, pSection, "Animation");
this->CumulativeAnimations.Read(exINI, pSection, "CumulativeAnimations");
Expand Down Expand Up @@ -145,14 +145,14 @@ void AttachEffectTypeClass::LoadFromINI(CCINIClass* pINI)
this->Crit_DisallowWarheads.Read(exINI, pSection, "Crit.DisallowWarheads");

this->RevengeWeapon.Read<true>(exINI, pSection, "RevengeWeapon");
this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouses");
this->RevengeWeapon_AffectsHouses.Read(exINI, pSection, "RevengeWeapon.AffectsHouse");
this->RevengeWeapon_UseInvokerAsOwner.Read(exINI, pSection, "RevengeWeapon.UseInvokerAsOwner");

this->ReflectDamage.Read(exINI, pSection, "ReflectDamage");
this->ReflectDamage_Warhead.Read(exINI, pSection, "ReflectDamage.Warhead");
this->ReflectDamage_Warhead_Detonate.Read(exINI, pSection, "ReflectDamage.Warhead.Detonate");
this->ReflectDamage_Multiplier.Read(exINI, pSection, "ReflectDamage.Multiplier");
this->ReflectDamage_AffectsHouses.Read(exINI, pSection, "ReflectDamage.AffectsHouses");
this->ReflectDamage_AffectsHouses.Read(exINI, pSection, "ReflectDamage.AffectsHouse");
this->ReflectDamage_Chance.Read(exINI, pSection, "ReflectDamage.Chance");
this->ReflectDamage_Override.Read(exINI, pSection, "ReflectDamage.Override");
this->ReflectDamage_UseInvokerAsOwner.Read(exINI, pSection, "ReflectDamage.UseInvokerAsOwner");
Expand Down