diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index e2357c7d..314987c9 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index 4bd0d934..4120d481 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 5085cf53..1f4ae4c0 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2038,9 +2038,9 @@ Healing Pulse Underlay Terran Heavy Missile Aion Corrosive Touch Explosion Skryrokor Death Reversed -Extended Image #1038 -Extended Image #1039 -Extended Image #1040 +Askosi Structure Rubble (Large) +Pilgrim +Pilgrim Shadow Extended Image #1041 Extended Image #1042 Extended Image #1043 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a8c106cd..68e7fec9 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index d5c4c16f..0d5c6695 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -999,10 +999,10 @@ Manifold (Starbound) Yblyleth Corrosive Touch Explosion Terran Heavy Missile Aion -Extended Sprite #1 +Pilgrim Francisco Goska Stroluum -Extended Sprite #1 +Askosi Structure Rubble (Large) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index dc0240f1..d219d279 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 2355f632..81799496 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -438,9 +438,9 @@ Zerg Hydralisk (Orkoti) Protoss Manifold (Starbound) Zerg Yblyleth (Zorthos) Askosi Pilgrim -Extended Unit #213 -Extended Unit #214 -Extended Unit #215 +Basic Askosi Facilities +Advanced Askosi Facilities +Supreme Askosi Facilities Extended Unit #216 Extended Unit #217 Extended Unit #218 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 4ac461cb..831508cc 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index d22ccf94..f90eaeed 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -237,7 +237,7 @@ Revenant Rifle (Nydus Eidolon) Gauss Slugger (Maverick Futurist) Needle Spores (Hydralisk Orkoti) Inzor Reflux (Inzorthrokor) -Extended Weapon #110 +Mining Saber (Pilgrim) Extended Weapon #111 Extended Weapon #112 Extended Weapon #113 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 72e085ab..88f8491e 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 857e632a..e004b5a2 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 28d05952..3bbcdaaf 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 4b799605..511f92aa 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 661689d5..866028a0 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index c256d7fe..06279e8b 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index 992a2381..c04e00d1 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -19,7 +19,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt [NONE] +AlmostBuilt SkryrokorLocal00 Built LandlockBuilt Landing [NONE] LiftOff [NONE] @@ -39,9 +39,8 @@ LandlockDeath: playsnd 7 # Misc\ExploLrg.wav imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) - # REPLACE RUBBLE - wait 1 + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + wait 1 end LandlockBuilt: @@ -99,4 +98,51 @@ ShadowHeaderInit: Generic_Wait1End: wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2040 Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) +.headerstart +IsId 145 +Type 1 +Init AskosiBuildingRubbleHeaderInit +Death AskosiBuildingRubbleHeaderDeath +.headerend +# ----------------------------------------------------------------------------- # + +AskosiBuildingRubbleHeaderInit: + playfram 0x00 +AskosiBuildingRubbleHeaderLocal00: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 +AskosiBuildingRubbleHeaderDeath: + playfram 4 + wait 239 + wait 1 + playfram 5 + wait 255 + wait 24 + playfram 6 + wait 255 + wait 24 + playfram 7 + wait 255 + wait 24 end \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 727061c5..2b2ebb41 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 9f56bc63..0fe20595 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -7915,7 +7915,7 @@ Init GolemInit Death GolemDeath GndAttkInit GolemGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt GolemGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 989410c5..baaccda9 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index 0c905b01..af104a7a 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -81,10 +81,6 @@ SkryrokorLocal00: wait 125 goto SkryrokorLocal00 -Generic_Wait1End: - wait 1 - end - LiftedTerranStructureDeath: lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp) wait 1 @@ -627,6 +623,10 @@ EidolonDeathInit: wait 1 end +Generic_Wait1End: + wait 1 + end + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 232 Nuke Beam (thingy\NukeBeam.grp) @@ -1820,7 +1820,7 @@ Init Phalanx_Tank_BaseInit Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -1868,7 +1868,7 @@ Init InfestedTerranWalkingToIdle Death Generic_Wait1End GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt Phalanx_Tank_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -1906,7 +1906,7 @@ Init Phalanx_Siege_BaseInit Death Phalanx_Siege_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -2000,7 +2000,7 @@ Init Phalanx_Siege_TurretInit Death Generic_Wait1End GndAttkInit Phalanx_Siege_TurretGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt Phalanx_Siege_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -3456,7 +3456,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt [NONE] +AlmostBuilt SkryrokorLocal00 Built SkryrokorLocal00 Landing PalladiumConnectorLanding LiftOff PalladiumConnectorLiftOff @@ -3602,8 +3602,8 @@ CastSpell [NONE] GndAttkToIdle Watchdog_Turret_GndAttkToIdle AirAttkToIdle Watchdog_Turret_GndAttkToIdle Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt SkryrokorLocal00 @@ -4152,7 +4152,7 @@ AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] -Unused2 [NONE] +Unused2 SkryrokorLocal00 Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] @@ -7298,7 +7298,7 @@ GndAttkRpt MadrigalImperiosoTurretGndAttkInit AirAttkRpt MadrigalImperiosoTurretGndAttkInit CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 @@ -7899,7 +7899,7 @@ Init SavantPowerSiphonInit Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] @@ -7932,7 +7932,7 @@ Init SavantInit Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] @@ -13719,14 +13719,14 @@ CastSpell [NONE] GndAttkToIdle IonCannonAttackAInit AirAttkToIdle IonCannonAttackAInit Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing [NONE] -LiftOff [NONE] +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] @@ -14495,7 +14495,7 @@ FusionCutterHitDamagelessDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 296 Sentinel (Base) +# 1544 Sentinel (Base) (cm\terran\sentinel-base.grp) .headerstart IsId 666 Type 20 @@ -14567,14 +14567,14 @@ Sentinel_Base_Landing: goto SkryrokorLocal00 Sentinel_Base_Built: - imgol 1545 0 0 # Sentinel (Turret) + imgol 1545 0 0 # Sentinel (Turret) (cm\terran\sentinel-turret.grp) Sentinel_Base_WorkingToIdle: playfram 2 goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 297 Sentinel (Turret) +# 1545 Sentinel (Turret) (cm\terran\sentinel-turret.grp) .headerstart IsId 667 Type 24 @@ -14589,8 +14589,8 @@ CastSpell [NONE] GndAttkToIdle Sentinel_Turret_GndAttkToIdle AirAttkToIdle Sentinel_Turret_GndAttkToIdle Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt SkryrokorLocal00 @@ -17166,7 +17166,7 @@ MatadorCinderModeSpecialState2: # 1523 Matador Tank Mode Turret (cm\terran\matador-turret.grp) .headerstart IsId 738 -Type 12 +Type 13 Init InfestedTerranWalkingToIdle Death Generic_Wait1End GndAttkInit MatadorGndAttkInit @@ -17180,7 +17180,7 @@ AirAttkToIdle InfestedTerranWalkingToIdle Unused2 [NONE] Walking MatadorWalking WalkingToIdle InfestedTerranWalkingToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 .headerend # ----------------------------------------------------------------------------- # diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 46c5fa39..552c8d5a 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 14c34fd7..ee40b298 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -271,7 +271,7 @@ InfestedTerranExplosionInit: # 011 Zerg Cocoon (zerg\cocoon.grp) .headerstart IsId 8 -Type 14 +Type 21 Init ZergCocoonInit Death ZergCocoonDeath GndAttkInit [NONE] @@ -288,6 +288,12 @@ WalkingToIdle [NONE] SpecialState1 ZergCocoonSpecialState1 SpecialState2 ZergCocoonSpecialState2 AlmostBuilt ZergCocoonAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -4931,7 +4937,7 @@ Init VorvrokorInit Death VorvrokorDeath GndAttkInit VorvrokorGndAttkInit AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt VorvrokorGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] @@ -14855,11 +14861,11 @@ IsId 773 Type 26 Init OkrimniliskInit Death CherbrathalorDeath -GndAttkInit [NONE] -AirAttkInit [NONE] +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 Unused1 OkrimniliskUnused1 -GndAttkRpt [NONE] -AirAttkRpt [NONE] +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 CastSpell [NONE] GndAttkToIdle OkrimniliskGndAttkToIdle AirAttkToIdle OkrimniliskGndAttkToIdle diff --git a/mpq/unit/cm/askosi/a-rubble-large.grp b/mpq/unit/cm/askosi/a-rubble-large.grp new file mode 100644 index 00000000..5df8b0ee Binary files /dev/null and b/mpq/unit/cm/askosi/a-rubble-large.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 1e28d03e..b11bdce8 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ