diff --git a/CMBW-maps/test/!Cosmonarchy-test.scx b/CMBW-maps/test/!Cosmonarchy-test.scx index 339e7e6b..691103fb 100644 Binary files a/CMBW-maps/test/!Cosmonarchy-test.scx and b/CMBW-maps/test/!Cosmonarchy-test.scx differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index f6be5c61..257825ce 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 67c6b126..1343737f 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 4bda3256..27250cf0 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1782,7 +1782,7 @@ Nathrok Lake Mortothrokor Birth Skithrok Scab Mortothrokor Passive Overlay -Extended Image #782 +Quarry Connector Extended Image #783 Extended Image #784 Extended Image #785 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 887139a2..01afa293 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 c442f1a9..f30cbfc4 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -545,7 +545,7 @@ Irulent Ivoa Othstoleth Grand Library Irol Iris -Sire +Sibraelosk Treasury Madrigal Missile 2 Simulacrum diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 9124e2f9..c0d5fb54 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 abc72dd4..6e7cd290 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -131,14 +131,14 @@ Zerg Bactalisk Zerg Axtoth Axis Zerg Hachirosk Zerg Caphrolosk -Zerg Gathstelosk +Zerg Gathtelosk Zerg Nydus Cesiant Zerg Hydrith Den Zerg Elthisth Mound Terran Olympian Zerg Matravil Nest Zerg Almakis Antre -Zerg Ultrok Cavern +Zerg Ultrav Cavern Zerg Muthrok Spire Zerg Quazeth Pool Zerg Cagrant Colony diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 88085279..a017d962 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -78,6 +78,10 @@ ScourgeLocal00: InfestedTerranWalkingToIdle: playfram 0x00 goto ScourgeLocal00 + +Generic_Wait1End: + wait 1 + end # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7224,7 +7228,7 @@ FountainheadAlmostBuilt: goto InfestedTerranLocal00 FountainheadLanding: -# imgol 1326 0 0 # Medbay connector (cm\terran\medbay-connector.grp) +# imgol 1326 0 0 # Vestry connector (cm\terran\medbay-connector.grp) goto InfestedTerranLocal00 FountainheadLiftOff: @@ -7423,7 +7427,7 @@ AtelierAlmostBuilt: goto InfestedTerranLocal00 AtelierLanding: -# imgol 1326 0 0 # Medbay connector (cm\terran\medbay-connector.grp) +# imgol 1326 0 0 # Vestry connector (cm\terran\medbay-connector.grp) goto InfestedTerranLocal00 AtelierLiftOff: @@ -23640,7 +23644,7 @@ IrolethWalkingToIdle: IsId 415 Type 24 Init QuarryInit -Death QuarryDeath +Death VestryDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -23663,7 +23667,7 @@ WorkingToIdle QuarryBuilt WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable QuarryDisable +Disable InfestedTerranLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # @@ -23679,16 +23683,8 @@ QuarryAlmostBuilt: goto InfestedTerranLocal00 QuarryLanding: - goto InfestedTerranLocal00 - -QuarryDeath: - playsnd 7 # Misc\ExploLrg.wav - imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) - wait 3 - liftoffcondjmp LiftedTerranStructureDeath - lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) - wait 1 - end + imgol 1784 0 0 # Quarry Connector (cm\terran\quarry-connector.grp) + goto ScourgeLocal00 QuarryIsWorking: playfram 2 @@ -23700,9 +23696,6 @@ QuarryIsWorking: playfram 0x00 wait 2 goto QuarryIsWorking - -QuarryDisable: - goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -30199,11 +30192,7 @@ PariahWalking: PariahWarpIn: imgol 125 0 0 # Pariah Warp Flash (protoss\pariah.grp) - goto PariahLocal01 - -PariahLocal01: - wait 125 - goto PariahLocal01 + goto PariahLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -34906,12 +34895,12 @@ MineralFieldType3ChristmasLanding: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1324 Medbay (cm\terran\medbay.grp) +# 1324 Vestry (cm\terran\medbay.grp) .headerstart IsId 559 Type 24 -Init MedbayInit -Death MedbayDeath +Init VestryInit +Death VestryDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -34925,56 +34914,44 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt MedbayAlmostBuilt -Built MedbayBuilt -Landing MedbayLanding -LiftOff MedbayLiftOff -IsWorking MedbayIsWorking -WorkingToIdle MedbayWorkingToIdle +AlmostBuilt VestryAlmostBuilt +Built VestryBuilt +Landing VestryLanding +LiftOff ScourgeLocal00 +IsWorking VestryIsWorking +WorkingToIdle VestryWorkingToIdle WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable MedbayDisable +Disable ScourgeLocal00 Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -MedbayInit: - imgul 1325 0 0 # Medbay Shadow (cm\terran\medbay.grp) -MedbayBuilt: +VestryInit: + imgul 1325 0 0 # Vestry Shadow (cm\terran\medbay.grp) +VestryBuilt: playfram 0x00 - goto MedbayLocal00 + goto ScourgeLocal00 -MedbayLocal00: - wait 125 - goto MedbayLocal00 - -MedbayDeath: +VestryDeath: playsnd 7 # Misc\ExploLrg.wav imgol 334 0 0 # Building Explosion (Large) (thingy\tBangX.grp) wait 3 - liftoffcondjmp MedbayLocal01 + liftoffcondjmp LiftedTerranStructureDeath lowsprul 273 0 0 # Terran Building Rubble (Small) (thingy\RubbleS.grp) wait 1 end -MedbayLocal01: - wait 1 - end - -MedbayAlmostBuilt: +VestryAlmostBuilt: playfram 1 - goto MedbayLocal00 + goto ScourgeLocal00 -MedbayLanding: - imgol 1326 0 0 # Medbay connector (cm\terran\medbay-connector.grp) - goto MedbayLocal00 +VestryLanding: + imgol 1326 0 0 # Vestry connector (cm\terran\medbay-connector.grp) + goto ScourgeLocal00 -MedbayLiftOff: - wait 125 - goto MedbayLiftOff - -MedbayIsWorking: +VestryIsWorking: playfram 2 wait 1 playfram 3 @@ -35007,24 +34984,21 @@ MedbayIsWorking: wait 1 playfram 3 wait 3 - goto MedbayIsWorking + goto VestryIsWorking -MedbayWorkingToIdle: +VestryWorkingToIdle: playfram 2 wait 1 - goto MedbayBuilt - -MedbayDisable: - goto MedbayLiftOff + goto VestryBuilt # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1326 Medbay Connector (cm\terran\medbay-connector.grp) +# 1326 Vestry Connector (cm\terran\medbay-connector.grp) .headerstart IsId 560 Type 24 -Init MedbayConnectorInit -Death MedbayConnectorDeath +Init VestryConnectorInit +Death VestryConnectorDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -35040,9 +35014,9 @@ SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] Built [NONE] -Landing MedbayConnectorDeath -LiftOff MedbayConnectorLiftOff -IsWorking MedbayConnectorIsWorking +Landing VestryConnectorDeath +LiftOff VestryConnectorLiftOff +IsWorking VestryConnectorIsWorking WorkingToIdle InfestedTerranLocal00 WarpIn [NONE] Unused3 [NONE] @@ -35052,22 +35026,22 @@ Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -MedbayConnectorInit: +VestryConnectorInit: playfram 0x00 # Frame set 0 wait 2 playfram 1 # Frame set 0, direction 1 wait 2 playfram 2 # Frame set 0, direction 2 wait 2 -MedbayConnectorIsWorking: +VestryConnectorIsWorking: playfram 3 # Frame set 0, direction 3 goto InfestedTerranLocal00 -MedbayConnectorDeath: +VestryConnectorDeath: wait 1 end -MedbayConnectorLiftOff: +VestryConnectorLiftOff: playfram 2 # Frame set 0, direction 2 wait 2 playfram 1 # Frame set 0, direction 1 @@ -37541,8 +37515,8 @@ CastSpell [NONE] GndAttkToIdle DemiurgeGndAttkToIdle AirAttkToIdle DemiurgeGndAttkToIdle Unused2 [NONE] -Walking DemiurgeWalking -WalkingToIdle DemiurgeWalkingToIdle +Walking PariahWalking +WalkingToIdle PariahWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -37551,18 +37525,13 @@ Landing [NONE] LiftOff [NONE] IsWorking [NONE] WorkingToIdle [NONE] -WarpIn DemiurgeWarpIn +WarpIn PariahWarpIn .headerend # ----------------------------------------------------------------------------- # DemiurgeInit: imgul 1374 0 2 # Demiurge Shadow (cm\protoss\demiurge-shadow.grp) -DemiurgeWalkingToIdle: - playfram 0xdd - wait 1 -DemiurgeLocal00: - wait 125 - goto DemiurgeLocal00 + goto PariahWalkingToIdle DemiurgeDeath: playsndbtwn 1439 1442 # Demiurge death 01, 02, 03, 04 @@ -37583,7 +37552,6 @@ DemiurgeGndAttkInit: playfram 0xff wait 1 playfram 0x110 - playsndbtwn 2525 2527 # Demiurge weapon fire 01, 02, 03 attack wait 1 playfram 0x121 @@ -37601,42 +37569,7 @@ DemiurgeGndAttkInit: DemiurgeGndAttkToIdle: wait 1 - goto DemiurgeWalkingToIdle - -DemiurgeWalking: - move 5 - wait 1 - playfram 0x00 - move 5 - wait 1 - playfram 0x11 - move 5 - wait 1 - playfram 0x22 - move 5 - wait 1 - playfram 0x33 - move 5 - wait 1 - playfram 0x44 - move 5 - wait 1 - playfram 0x55 - move 5 - wait 1 - playfram 0x66 - move 5 - wait 1 - playfram 0x77 - goto DemiurgeWalking - -DemiurgeWarpIn: - imgol 125 0 0 # Demiurge Warp Flash (protoss\pariah.grp) - goto DemiurgeLocal01 - -DemiurgeLocal01: - wait 125 - goto DemiurgeLocal01 + goto PariahWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/protoss/pariah.grp b/mpq/unit/cm/protoss/pariah.grp index 740b5959..0160c767 100644 Binary files a/mpq/unit/cm/protoss/pariah.grp and b/mpq/unit/cm/protoss/pariah.grp differ diff --git a/mpq/unit/cm/terran/quarry-connector.grp b/mpq/unit/cm/terran/quarry-connector.grp new file mode 100644 index 00000000..58caa141 Binary files /dev/null and b/mpq/unit/cm/terran/quarry-connector.grp differ diff --git a/mpq/unit/cm/terran/quarry-shadow.grp b/mpq/unit/cm/terran/quarry-shadow.grp index 5acd4183..106914f2 100644 Binary files a/mpq/unit/cm/terran/quarry-shadow.grp and b/mpq/unit/cm/terran/quarry-shadow.grp differ diff --git a/mpq/unit/cm/terran/quarry.grp b/mpq/unit/cm/terran/quarry.grp index d36a551e..dbe5d411 100644 Binary files a/mpq/unit/cm/terran/quarry.grp and b/mpq/unit/cm/terran/quarry.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index cf4e1300..3371a49a 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index e0a81249..0f98d13a 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/bunker-shad.grp b/mpq/unit/terran/bunker-shad.grp index db365281..08cc9c65 100644 Binary files a/mpq/unit/terran/bunker-shad.grp and b/mpq/unit/terran/bunker-shad.grp differ diff --git a/patchnotes.md b/patchnotes.md index fbe8cb56..9c1d5dfb 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,8 +32,12 @@ Patch goals include: - Audiovisuals: - Lobotomy Mine tooltip no longer displays the Spider Mines tooltip (r. 3crow) - Corrected Star Sovereign Intervention tooltip (r. TheBeaver99) + - Fixed colors on Pariah walk cycle (c. lolrsk8s) + - Fixed Anchor shadow alignment (c. DF) ## Audiovisuals +- New sprite for: + - Quarry (c. Solstice) - Adjusted Mortothrokor selection circle, death animation timing - Adjusted Legionnaire shadow, walk and attack animations - New weapon SFX: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 65dd9b9e..90130845 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ