Skip to content

Commit

Permalink
Merge branch 'radiohead' into sc2-next
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 17, 2024
2 parents b0c06f2 + 3979da8 commit 019bf82
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 10 deletions.
13 changes: 11 additions & 2 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5008,9 +5008,9 @@
<!--Start value="Footprint4x4CreepSourceGrown"/>
<Birth value="Footprint4x4CreepSourceStart"/>
<Grown value="Footprint4x4CreepSourceGrown"/-->
<Start value="Footprint4x4CreepSourceGrownUpgraded"/>
<Start value="AP_Footprint4x4CreepSourceGrownUpgraded"/>
<Birth value="Footprint4x4CreepSourceStart"/>
<Grown value="Footprint4x4CreepSourceGrownUpgraded"/>
<Grown value="AP_Footprint4x4CreepSourceGrownUpgraded"/>
</CBehaviorCreepSource>
<CBehaviorBuff id="AP_QueenBurstHeal">
<Alignment value="Positive"/>
Expand Down Expand Up @@ -7139,4 +7139,13 @@
<MaxStackCount value="65535"/>
<MaxStackCountPerCaster value="1"/>
</CBehaviorBuff>
<CBehaviorCreepSource id="AP_makeCreep4x4">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
<Birth value="Footprint4x4CreepSourceStart"/>
<Start value="Footprint4x4CreepSourceGrown"/>
<Grown value="Footprint4x4CreepSourceGrown"/>
<InfoFlags index="Hidden" value="1"/>
<Period value="0.75"/>
<Requirements value="AP_NotHaveK5CreepBonuses"/>
</CBehaviorCreepSource>
</Catalog>
71 changes: 71 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/FootprintData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,75 @@
<Borders value="0,4,2;1,0,2;2,3,2;3,7,2;4,5,2;5,2,2;6,1,2;7,6,2"/>
</Shape>
</CFootprint>
<CFootprint id="AP_Footprint4x4CreepSourceGrownUpgraded">
<Layers index="Check" Area="-13,-13,14,14">
<Sets Character="o">
<Negative index="NoCreep" value="1"/>
</Sets>
<Rows value="..........................."/>
<Rows value="..........................."/>
<Rows value="..........................."/>
<Rows value="..........................."/>
<Rows value="..........................."/>
<Rows value="..........................."/>
<Rows value="........ooooo.............."/>
<Rows value="......ooooooooo............"/>
<Rows value="....ooooooooooooo.........."/>
<Rows value="...ooooooooooooooo........."/>
<Rows value="..ooooooooooooooooo........"/>
<Rows value="..ooooooooooooooooo........"/>
<Rows value=".ooooooooooooooooooo......."/>
<Rows value=".ooooooooooooooooooo......."/>
<Rows value="ooooooooooooooooooooo......"/>
<Rows value="ooooooooooooooooooooo......"/>
<Rows value="ooooooooooooooooooooo......"/>
<Rows value="ooooooooooooooooooooo......"/>
<Rows value="ooooooooooooooooooooo......"/>
<Rows value=".ooooooooooooooooooo......."/>
<Rows value=".ooooooooooooooooooo......."/>
<Rows value="..ooooooooooooooooo........"/>
<Rows value="..ooooooooooooooooo........"/>
<Rows value="...ooooooooooooooo........."/>
<Rows value="....ooooooooooooo.........."/>
<Rows value="......ooooooooo............"/>
<Rows value="........ooooo.............."/>
</Layers>
<Layers index="Place" Area="-13,-13,14,14">
<Sets Character="o">
<Positive index="Creep" value="1"/>
</Sets>
<Rows value="........ooooooooooo........"/>
<Rows value="......ooooooooooooooo......"/>
<Rows value="....ooooooooooooooooooo...."/>
<Rows value="...ooooooooooooooooooooo..."/>
<Rows value="..ooooooooooooooooooooooo.."/>
<Rows value="..ooooooooooooooooooooooo.."/>
<Rows value=".ooooooooooooooooooooooooo."/>
<Rows value=".ooooooooooooooooooooooooo."/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value="ooooooooooooooooooooooooooo"/>
<Rows value=".ooooooooooooooooooooooooo."/>
<Rows value=".ooooooooooooooooooooooooo."/>
<Rows value="..ooooooooooooooooooooooo.."/>
<Rows value="..ooooooooooooooooooooooo.."/>
<Rows value="...ooooooooooooooooooooo..."/>
<Rows value="....ooooooooooooooooooo...."/>
<Rows value="......ooooooooooooooo......"/>
<Rows value="........ooooooooooo........"/>
</Layers>
<Shape>
<Radius value="7.75"/>
<Offsets value="-13.5,-13.5;13.5,-13.5;-13.5,13.5;13.5,13.5"/>
<Borders value="0,2,2;1,0,2;2,3,2;3,1,2"/>
</Shape>
</CFootprint>
</Catalog>
8 changes: 4 additions & 4 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8232,7 +8232,7 @@
<AbilArray Link="BuildInProgress"/>
<AbilArray Link="AP_BurrowCreepTumorDown"/>
<AbilArray Link="AP_CreepTumorUsed"/>
<BehaviorArray Link="makeCreep4x4"/>
<BehaviorArray Link="AP_makeCreep4x4"/>
<!-- <BehaviorArray Link="QueenofVenomCreepTumorSearch"/>-->
<BehaviorArray Link="AP_makeCreep4x4Enhanced"/>
<BehaviorArray Link="AP_CreepFrenzy13CreepTumor"/>
Expand Down Expand Up @@ -8290,7 +8290,7 @@
<AbilArray Link="AP_CreepTumorBuild"/>
<AbilArray Link="BuildInProgress"/>
<AbilArray Link="AP_CreepTumorUsed"/>
<BehaviorArray Link="makeCreep4x4"/>
<BehaviorArray Link="AP_makeCreep4x4"/>
<BehaviorArray Link="AP_makeCreep4x4Enhanced"/>
<BehaviorArray Link="AP_CreepFrenzy13CreepTumor"/>
<CardLayouts>
Expand Down Expand Up @@ -8347,7 +8347,7 @@
<TurningRate value="719.4726"/>
<Sight value="11"/>
<AttackTargetPriority value="19"/>
<BehaviorArray Link="makeCreep4x4"/>
<BehaviorArray Link="AP_makeCreep4x4"/>
<!-- <BehaviorArray Link="QueenofVenomCreepTumorSearch"/>-->
<BehaviorArray Link="AP_makeCreep4x4Enhanced"/>
<BehaviorArray Link="AP_CreepFrenzy13CreepTumor"/>
Expand Down Expand Up @@ -8404,7 +8404,7 @@
<AttackTargetPriority value="11"/>
<AbilArray Link="BuildInProgress"/>
<AbilArray Link="AP_BurrowCreepTumorDown"/>
<BehaviorArray Link="makeCreep4x4"/>
<BehaviorArray Link="AP_makeCreep4x4"/>
<CardLayouts>
<LayoutButtons Face="CancelBuilding" Type="AbilCmd" AbilCmd="BuildInProgress,Cancel" Row="2" Column="4"/>
</CardLayouts>
Expand Down
8 changes: 4 additions & 4 deletions Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33179,11 +33179,11 @@ Button=AttackWorker,BurrowUp
id=AP_CreepTumorBurrowed
Abil=AP_CreepTumorBuild,AP_CreepTumorUsed,BuildInProgress
Actor=AP_CreepTumor,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodTinyBuilding
Behavior=AP_CreepFrenzy13CreepTumor,AP_makeCreep4x4Enhanced,makeCreep4x4
Behavior=AP_CreepFrenzy13CreepTumor,AP_makeCreep4x4Enhanced,AP_makeCreep4x4
Button=AP_BuildCreepTumorPropagate,AP_CreepTumorPassive,AP_K5CreepBonuses,Cancel
id=AP_CreepTumorUsed
Actor=AP_CreepTumor,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll
Behavior=AP_CreepFrenzy13CreepTumor,AP_CreepTumorExhausted,AP_makeCreep4x4Enhanced,makeCreep4x4
Behavior=AP_CreepFrenzy13CreepTumor,AP_CreepTumorExhausted,AP_makeCreep4x4Enhanced,AP_makeCreep4x4
Button=AP_CreepTumorPassive,AP_K5CreepBonuses
id=AP_QueenBurrowed
Abil=AP_BurrowQueenUp,AP_QueenBuild,stop
Expand Down Expand Up @@ -33799,7 +33799,7 @@ Weapon=AP_Suicide,AP_SuicideBuilding
id=AP_CreepTumorQueen
Abil=AP_BurrowCreepTumorDown,BuildInProgress
Actor=AP_CreepTumor,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodTinyBuilding
Behavior=makeCreep4x4
Behavior=AP_makeCreep4x4
Button=CancelBuilding
Unit=CreepTumor
id=AP_K5KerriganBurrowed
Expand Down Expand Up @@ -34029,7 +34029,7 @@ Effect=HatcheryBirthSet,HatcheryCreateSet
id=AP_CreepTumor
Abil=AP_BurrowCreepTumorDown,##id##Used,BuildInProgress
Actor=##id##,AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll,ZergBloodTinyBuilding
Behavior=AP_CreepFrenzy13CreepTumor,AP_makeCreep4x4Enhanced,makeCreep4x4
Behavior=AP_CreepFrenzy13CreepTumor,AP_makeCreep4x4Enhanced,AP_makeCreep4x4
Button=##id##Passive,AP_K5CreepBonuses,CancelBuilding
id=AP_SpawningPool
Abil=BuildInProgress,que5
Expand Down

0 comments on commit 019bf82

Please sign in to comment.