Skip to content

Commit

Permalink
Royal Guard cleanup
Browse files Browse the repository at this point in the history 
 * Use standard unit info frame for Royal Guards (with XP bar)
 * Unify Energy per rank and regen
 * Fix some bugs
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 17, 2024
1 parent 898cf89 commit 9ecb9f3
Show file tree
Hide file tree
Showing 23 changed files with 1,689 additions and 302 deletions.
33 changes: 24 additions & 9 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Delay" value="2.5"/>
<EffectArray index="Finish" value="AP_ThorMengskWeaponChange"/>
</SectionArray>
</InfoArray>
<!--SectionArray index="Abils">
Expand All @@ -398,7 +399,7 @@
<Flags index="Interruptible" value="0"/>
<InfoArray index="0">
<SectionArray index="Actor">
<EffectArray index="Finish" value="AP_ThorMengskSiegeOrder"/>
<EffectArray index="Finish" value="AP_ThorMengskSiegeOrderSet"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
Expand Down Expand Up @@ -432,6 +433,7 @@
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Delay" value="2.5"/>
<EffectArray index="Finish" value="AP_ThorMengskWeaponChange"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
Expand Down Expand Up @@ -1758,43 +1760,55 @@
<AbilSetId value="AP_LiberatorAATarget"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_LiberatorTargetAAMorphOrderSet"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_MercLiberatorAATarget">
<AbilSetId value="AP_LiberatorAATarget"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_MercLiberatorTargetAAMorphOrderSet"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAAMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAAMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_LiberatorMengskAATarget">
<AbilSetId value="AP_LiberatorAATarget"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_LiberatorMengskTargetAAMorphOrderSet"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectTarget id="AP_LiberatorAGTarget">
<AbilSetId value="AP_LiberatorAGTarget"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<Effect index="0" value="AP_LiberatorTargetMorphOrderInitialSet"/>
<Range value="9"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_MercLiberatorAGTarget">
<AbilSetId value="AP_LiberatorAGTarget"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<Effect index="0" value="AP_MercLiberatorTargetMorphOrderInitialSet"/>
<Range value="9"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_LiberatorMengskAGTarget">
<AbilSetId value="AP_LiberatorAGTarget"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<Effect index="0" value="AP_LiberatorMengskTargetMorphOrderInitialSet"/>
<Range value="9"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilMorph id="AP_LiberatorMorphtoAA">
<AbilSetId value="LiberatorAA"/>
Expand Down Expand Up @@ -13043,7 +13057,7 @@
<InfoArray Unit="AP_ThorMengskSieged">
<SectionArray index="Actor">
<DurationArray index="Duration" value="3"/>
<EffectArray index="Finish" value="AP_ThorMengskSiegeMorphingRB"/>
<EffectArray index="Finish" value="AP_ThorMengskSiegeMorphingRBSet"/>
</SectionArray>
</InfoArray>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_ThorMengskSiege"/>
Expand All @@ -13068,6 +13082,7 @@
<InfoArray Unit="AP_ThorMengsk">
<SectionArray index="Actor">
<DurationArray index="Duration" value="3"/>
<EffectArray index="Finish" value="AP_ThorMengskWeaponChange"/>
</SectionArray>
</InfoArray>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_ThorMengskUnsiege">
Expand All @@ -13081,7 +13096,7 @@
<InfoArray Unit="AP_ThorMengsk">
<SectionArray index="Actor">
<DurationArray index="Duration" value="3"/>
<EffectArray index="Finish" value="AP_ThorMengskContinueMorphingToAP"/>
<EffectArray index="Finish" value="AP_ThorMengskContinueMorphingToAPSet"/>
</SectionArray>
</InfoArray>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_ThorMengskUnsiege" Requirements="AP_HaveThorMorph">
Expand Down
6 changes: 6 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AccumulatorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,10 @@
<BonusPerLevel value="18.75"/>
<PreviousValueFactor value="1"/>
</CAccumulatorVeterancyLevel>
<CAccumulatorVeterancyLevel id="AP_GoliathMengskGDummy">
<MinAccumulation value="0"/>
<Amount value="-6.75"/>
<BonusPerLevel value="6.75"/>
<PreviousValueFactor value="1"/>
</CAccumulatorVeterancyLevel>
</Catalog>
7 changes: 4 additions & 3 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8567,8 +8567,9 @@
<On Terms="Effect.AP_Blink.Start; At Source" Send="Create"/>
<On Terms="Effect.AP_Blink.Start; At Source; ValidateUnit AP_NoDarkProtoss" Send="ModelSwap DarkBlinkOriginModel"/>
<On Terms="Effect.AP_VoidStalkerBlinkShieldRestore.Start; At Source" Send="Create"/>
<On Terms="ActorCreation; ValidateUnit AP_IsSiegeTankMengskAnyMode" Send="SetVisibility"/>
<On Terms="ActorCreation; ValidateUnit AP_IsGoliathMengsk" Send="SetVisibility"/>
<On Terms="ActorCreation; ValidateUnit AP_IsSiegeTankMengskAnyMode" Send="ModelSwap BlinkStopModel"/>
<On Terms="ActorCreation; ValidateUnit AP_IsSiegeTankMengskAnyMode" Send="SetScale 2.000000"/>
<On Terms="ActorCreation; ValidateUnit AP_IsGoliathMengsk" Send="ModelSwap BlinkStopModel"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOriginStationary"/>
<Model value="BlinkOriginModel"/>
Expand Down Expand Up @@ -40502,7 +40503,7 @@
</CActorAction>
<CActorAction id="AP_GoliathMengskLockdownAirAttack" parent="GenericAttack" effectImpact="AP_GoliathMengskAUL4Set" effectLaunch="AP_GoliathMengskALMLockdown">
<Missile value="AP_GoliathAirAttackMissile"/>
<LaunchAttachQuery Methods="AP_AMPatternGoliathMengsk"/>
<LaunchAttachQuery Methods="AP_AMPatternGoliathMengskLockdown"/>
<LaunchAssets Model="AP_GoliathAirAttackLaunch" Sound="VikingFighter_AttackLaunch"/>
<ImpactMap index="None" Model="AP_Goliath_Lockdown_Impact" Sound="VikingFighter_AttackImpact"/>
</CActorAction>
Expand Down
6 changes: 6 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@
<Multiplier value="2"/>
<Driver value="AP_GoliathMengskALM"/>
</CAttachMethodPattern>
<CAttachMethodPattern id="AP_AMPatternGoliathMengskLockdown">
<Keyword value="SetB"/>
<Base value="::RollingIndex"/>
<Multiplier value="2"/>
<Driver value="AP_GoliathMengskALMLockdown"/>
</CAttachMethodPattern>
<CAttachMethodFilter id="AP_AMFilterDRCannons">
<Logic value="OR"/>
<Keys Keyword="Weapon" Index="10"/>
Expand Down
Loading

0 comments on commit 9ecb9f3

Please sign in to comment.