diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 98aa945e..f5ef52d2 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 1343737f..2d2835f0 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 71a6ffaa..ccbac4a6 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1786,7 +1786,7 @@ Quarry Connector Qilin Qilin Shadow Qilin Thrusters -Extended Image #786 +Rotary Connector Extended Image #787 Extended Image #788 Extended Image #789 diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 78e6ea63..0ed94d2c 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index a017d962..1e2287c4 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -8545,7 +8545,7 @@ CovertOpsOverlayDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 293 Machine Shop (terran\machines.grp) +# 293 Palladium (terran\machines.grp) .headerstart IsId 117 Type 24 @@ -8605,7 +8605,7 @@ MachineShopAlmostBuilt: goto MachineShopLanding MachineShopBuilt: - imgul 294 0 0 # Machine Shop Connector + imgul 294 0 0 # Palladium Connector MachineShopWorkingToIdle: playfram 0x00 goto MachineShopLanding @@ -8631,7 +8631,7 @@ MachineShopIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 294 Machine Shop Connector (terran\machineC.grp) +# 294 Palladium Connector (terran\machineC.grp) .headerstart IsId 118 Type 24 @@ -23688,13 +23688,13 @@ QuarryLanding: QuarryIsWorking: playfram 2 - wait 2 + wait 1 playfram 3 - wait 2 + wait 1 playfram 4 - wait 2 + wait 1 playfram 0x00 - wait 2 + wait 1 goto QuarryIsWorking # ----------------------------------------------------------------------------- # @@ -24740,7 +24740,7 @@ Burrow [NONE] ScrapyardInit: imgul 1037 0 0 # Scrapyard Shadow (cm\terran\scrapyard-shad.grp) ScrapyardBuilt: - imgul 294 0 0 # Machine Shop Connector + imgul 294 0 0 # Palladium Connector playfram 0x00 goto InfestedTerranLocal00 @@ -25459,7 +25459,7 @@ RotaryAlmostBuilt: goto InfestedTerranLocal00 RotaryLanding: - imgol 294 0 0 # Machine Shop Connector (terran\machineC.grp) + imgol 1788 0 0 # Rotary Connector (cm\terran\rotary-connector.grp) goto InfestedTerranLocal00 RotaryIsWorking: @@ -27542,7 +27542,7 @@ HadronInit: goto HadronLanding HadronLanding: -# imgol 294 0 0 # Machine Shop Connector (terran\machineC.grp) +# imgol 294 0 0 # Palladium Connector (terran\machineC.grp) goto InfestedTerranLocal00 HadronAlmostBuilt: @@ -35027,28 +35027,27 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # 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 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 VestryConnectorIsWorking: - playfram 3 # Frame set 0, direction 3 + playfram 3 goto InfestedTerranLocal00 VestryConnectorDeath: - wait 1 + wait 1 end VestryConnectorLiftOff: - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 - wait 1 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 3 end # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/cm/terran/rotary-connector.grp b/mpq/unit/cm/terran/rotary-connector.grp new file mode 100644 index 00000000..1917926c Binary files /dev/null and b/mpq/unit/cm/terran/rotary-connector.grp differ diff --git a/mpq/unit/cm/terran/rotary-shadow.grp b/mpq/unit/cm/terran/rotary-shadow.grp index 41d47c2b..df26cd93 100644 Binary files a/mpq/unit/cm/terran/rotary-shadow.grp and b/mpq/unit/cm/terran/rotary-shadow.grp differ diff --git a/mpq/unit/cm/terran/rotary.grp b/mpq/unit/cm/terran/rotary.grp index ab04108c..43b8d641 100644 Binary files a/mpq/unit/cm/terran/rotary.grp and b/mpq/unit/cm/terran/rotary.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index bdad5274..f23d3a97 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 c57ea239..23ca83f3 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index f7ec0b22..45165e9c 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -40,7 +40,7 @@ Patch goals include: ## Audiovisuals - New sprite for: - - Quarry (c. Solstice) + - Quarry, Rotary (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 6f1cce39..487617c8 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ