Skip to content

Commit

Permalink
Merge pull request #209 from EnvyDragon/junk-in-the-bunk
Browse files Browse the repository at this point in the history 
Adding Infested Marines and Infested Bunkers (and a little more)
  • Loading branch information
@Ziktofel
Ziktofel authored Jul 26, 2024
2 parents 71033b1 + ef808b6 commit 30cdf39
Show file tree
Hide file tree
Showing 104 changed files with 6,465 additions and 73 deletions.
324 changes: 324 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file

Large diffs are not rendered by default.

833 changes: 795 additions & 38 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file

Large diffs are not rendered by default.

128 changes: 128 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4842,6 +4842,92 @@
<Chance value="1"/>
</DamageResponse>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIBarracksTrainTimedLife">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:InfestedTerran,AbilityorEffectType:Units"/>
<DisplayDuration index="Self" value="1"/>
<DisplayDuration index="Ally" value="1"/>
<DisplayDuration index="Enemy" value="1"/>
<Duration value="90"/>
<InitialEffect value="AP_SIBarracksTrainTimedLifeHasBeenAppliedAB"/>
<FinalEffect value="AP_SIBarracksTrainTimedLifeExpireSet"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIBarracksTrainTimedLifeHasBeenApplied">
<BehaviorFlags index="Permanent" value="1"/>
<InfoFlags index="Hidden" value="1"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerAutoSpawner">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<DisableValidatorArray value="IsNotConstructing"/>
<DisableValidatorArray value="AP_IsInfestedBunkerRooted"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerTimedLifeDisabler">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<Modification>
<BehaviorLinkDisableArray value="AP_SIBarracksTrainTimedLife"/>
<BehaviorLinkDisableArray value="AP_SIInfestedBunkerTrainTimedLife"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerTrainTimedLife">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
<DisplayDuration index="Self" value="1"/>
<DisplayDuration index="Ally" value="1"/>
<DisplayDuration index="Enemy" value="1"/>
<Duration value="30"/>
<InitialEffect value="AP_SIBarracksTrainTimedLifeHasBeenAppliedAB"/>
<FinalEffect value="AP_SIBarracksTrainTimedLifeExpireSet"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerUprootedGroundFarForcePush">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<RemoveValidatorArray value="UnitHasMoveOrder"/>
<RemoveValidatorArray value="UnitHasHoldPosition"/>
<Duration value="1.6574"/>
<Period value="0.0625"/>
<PeriodicEffect value="AP_SIInfestedBunkerUprootedGroundFarForcePush"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerUprootedRangedFarForcePush">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<RemoveValidatorArray value="UnitHasMoveOrder"/>
<RemoveValidatorArray value="UnitHasHoldPosition"/>
<Duration value="1.6574"/>
<Period value="0.0625"/>
<PeriodicEffect value="AP_SIInfestedBunkerUprootedRangedFarForcePush"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedBunkerWeaponRangeBonus">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<DisableValidatorArray value="AP_TransportIsInfestedBunkerRooted"/>
<Modification WeaponRange="1">
<AbilLinkEnableArray value="stop"/>
<AbilLinkEnableArray value="HoldFire"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SIInfestedTrooperMarinePlaguedMunitions">
<Alignment value="Negative"/>
<InfoIcon value="Assets\Textures\btn-ability-zerg-plague.dds"/>
<TimeScaleSource Value="Global"/>
<Duration value="15"/>
<Period value="0.3"/>
<PeriodicEffect value="AP_SIInfestedTrooperMarinePlaguedMunitionsDamage"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PopStun">
<InfoFlags index="Hidden" value="1"/>
<BehaviorCategories index="Stun" value="1"/>
<Duration value="0.01"/>
<DurationRandomMax value="0.3"/>
<Modification>
<StateFlags index="Stun" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PreventKnockback">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="AbilityorEffectType:Units"/>
</CBehaviorBuff>
<CBehaviorSpawn id="SpawnLarva">
<!-- Override -->
<InfoArray>
Expand Down Expand Up @@ -7159,6 +7245,48 @@
<InfoFlags index="Hidden" value="1"/>
<Duration value="0.6"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_StukovInfestedBunkerMarines">
<InfoFlags index="Hidden" value="1"/>
<MaxStackCount value="6"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_StukovInfestedBunkerMeleeDisable">
<InfoFlags index="Hidden" value="1"/>
<Duration value="1"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_DisableRedirect">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:InfestedTerran,AbilityorEffectType:Units"/>
<Modification>
<AbilClassDisableArray index="CAbilRedirect" value="1"/>
<AbilClassDisableArray index="CAbilRedirectInstant" value="1"/>
<AbilClassDisableArray index="CAbilRedirectTarget" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PrecursorCocoon">
<InfoFlags index="Hidden" value="1"/>
<Modification>
<StateFlags index="Invulnerable" value="1"/>
<StateFlags index="NoDraw" value="1"/>
<RateMultiplierArray index="Progress" value="0.1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_StukovInfestedPopStun">
<InfoFlags index="Hidden" value="1"/>
<!-- <RemoveValidatorArray value="IsStukovInfestedBanshee"/>-->
<TimeScaleSource Value="Global"/>
<Duration value="0.75"/>
<FinalEffect value="Pop"/>
<Modification TimeScale="0.01">
<StateFlags index="Stun" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_SISCVBuildChargeUpgradeIndicator">
<!-- Indicator of passive upgrade -->
<Alignment value="Positive"/>
<BehaviorFlags index="Permanent" value="1"/>
<InfoIcon value="Assets\Textures\btn-upgrade-swann-scvdoublerepair.dds"/>
<DisableValidatorArray value="AP_HaveSISCVBuildChargeUpgrade"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_VoidRayPurifierBeamDamageField">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="AbilityorEffectType:Units"/>
Expand Down
142 changes: 142 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5591,4 +5591,146 @@
<AlertIcon value="Assets\Textures\btn-ability-protoss-firebeam.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_SIBunkerMarinesinBunker">
<Icon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
<HidesForSimpleText value="0"/>
<ChargeText value="Button/ChargeText/AP_SIBunkerMarinesinBunker"/>
</CButton>
<CButton id="AP_SIBunkerRegenerativePlating">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerformliferegenupgraded.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerformliferegenupgraded.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SIInfestedBunker">
<Icon value="Assets\Textures\btn-building-stukov-infestedbunker.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedbunker.dds"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIInfestedBunkerInfestedMarineSpawner">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerformliferegen.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerformliferegen.dds"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIInfestedBunkerRoot">
<Icon value="Assets\Textures\btn-ability-zerg-root-color.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-root-color.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_SIInfestedBunkerSpawnInfestedMarine">
<Icon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-terran-marine.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SIInfestedBunkerUproot">
<Icon value="Assets\Textures\btn-ability-zerg-uproot-color.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-uproot-color.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_SIStukovPlaceHordeRally">
<Icon value="Assets\Textures\btn-ability-zerg-stukov-summonpsiemitter.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-stukov-summonpsiemitter.dds"/>
<EditorCategories value="Race:Neutral"/>
</CButton>
<CButton id="AP_SIArmory">
<Icon value="Assets\Textures\btn-building-stukov-infestedarmory.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedarmory.dds"/>
<Hotkey value="Button/Hotkey/Armory"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIBarracks">
<Icon value="Assets\Textures\btn-building-stukov-infestedbarracks.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedbarracks.dds"/>
<Hotkey value="Button/Hotkey/Barracks"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SICivilianStructure">
<Icon value="Assets\Textures\btn-building-stukov-infestedcolonisthut.dds"/>
<AlertIcon value="Assets\Textures\btn-missing-kaeo.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_SICommandCenter">
<Icon value="Assets\Textures\btn-building-stukov-infestedcommandcenter.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedcommandcenter.dds"/>
<Hotkey value="Button/Hotkey/CommandCenter"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIEngineeringBay">
<Icon value="Assets\Textures\btn-building-stukov-infestedengineeringbay.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedengineeringbay.dds"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIFactory">
<Icon value="Assets\Textures\btn-building-stukov-infestedfactory.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedfactory.dds"/>
<Hotkey value="Button/Hotkey/Factory"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIMarineTrooperImprovedRange">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-infestedmarinerangeupgrade.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-infestedmarinerangeupgrade.dds"/>
<EditorCategories value="Race:Zerg"/>
<HotkeyAlias value="EvolveSIDiamondbackSnailTrail"/>
</CButton>
<CButton id="AP_SIMissileTurret">
<Icon value="Assets\Textures\BTN-Building-Stukov-InfestedTurret.dds"/>
<AlertIcon value="Assets\Textures\BTN-Building-Stukov-InfestedTurret.dds"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIPlaguedMunitions">
<Icon value="Assets\Textures\btn-ability-stukov-plaugedmunitions.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-stukov-plaugedmunitions.dds"/>
<EditorCategories value="Race:Zerg"/>
<HotkeyAlias value="EvolveSIDiamondbackSnailTrail"/>
</CButton>
<CButton id="AP_SIRefinery">
<Icon value="Assets\Textures\btn-building-stukov-infestedrefinery.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedrefinery.dds"/>
<Hotkey value="Button/Hotkey/Refinery"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SISCV">
<TooltipTimeOverrideAbilCmd AbilCmd="AP_SIMorphtoInfestedSCV,Train1"/>
<Icon value="Assets\Textures\btn-unit-zerg-infestedscv.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-zerg-infestedscv.dds"/>
<EditorCategories value="Race:Terran"/>
<Universal value="1"/>
</CButton>
<CButton id="AP_SIStarport">
<Icon value="Assets\Textures\btn-building-stukov-infestedstarport.dds"/>
<AlertIcon value="Assets\Textures\btn-building-stukov-infestedstarport.dds"/>
<Hotkey value="Button/Hotkey/Starport"/>
<EditorCategories value="Race:Terran"/>
</CButton>
<CButton id="AP_SIInfestedMarine">
<Icon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-zerg-infestedmarine.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
<TooltipTimeOverrideAbilCmd AbilCmd="AP_SIMorphtoInfestedMarine,Train1"/>
</CButton>
<CButton id="AP_SIRoot">
<Icon value="Assets\Textures\btn-ability-zerg-root-color.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-root-color.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SIUproot">
<Icon value="Assets\Textures\btn-ability-zerg-uproot-color.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-uproot-color.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SIInfestedBunkerImprovedCargo">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerupgradeii_14.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-bunkerupgradeii_14.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SIBunkerArmor">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-infestedbunkermorelife.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-infestedbunkermorelife.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
<CButton id="AP_SISCVBuildChargeCount">
<Icon value="Assets\Textures\btn-upgrade-swann-scvdoublerepair.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-swann-scvdoublerepair.dds"/>
<EditorCategories value="Race:InfestedTerran"/>
</CButton>
</Catalog>
Loading

0 comments on commit 30cdf39

Please sign in to comment.