diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e0ecd462..f4c0f351 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index cbf58fde..1e8c724f 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -619,9 +619,9 @@ Sovrokor Valkyrie (Hecaton) Garvrokor Simulacrum (Astral) -Extended Flingy #413 -Extended Flingy #414 -Extended Flingy #415 +Grandstand (Cannon) +Grandstand (Holdout) +Grandstand (Vision) Extended Flingy #416 Extended Flingy #417 Extended Flingy #418 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 764a4dad..14b173df 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 5b5784ea..c8875e73 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 65c3cd86..f8bf13bd 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2208,12 +2208,12 @@ Simulacrum (Astral) Shadow Herald Glow Maverick Remains (Futurist) Vulture (Hecaton) Engines -Extended Image #1208 -Extended Image #1209 -Extended Image #1210 -Extended Image #1211 -Extended Image #1212 -Extended Image #1213 +Grandstand (Cannon) +Grandstand (Cannon) shadow +Grandstand (Holdout) +Grandstand (Holdout) shadow +Grandstand (Vision) +Grandstand (Vision) shadow Extended Image #1214 Extended Image #1215 Extended Image #1216 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 25c667c1..fea046eb 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 90e48ef7..9e2e4eb4 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1070,9 +1070,9 @@ Garvrokor Simulacrum (Astral) Herald Glow Maverick Remains (Futurist) -Extended Sprite #556 -Extended Sprite #557 -Extended Sprite #558 +Grandstand (Cannon) +Grandstand (Holdout) +Grandstand (Vision) Extended Sprite #559 Extended Sprite #560 Extended Sprite #561 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index ec07d513..fb13de58 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 19aa35c2..b9c26829 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -456,7 +456,7 @@ Askosi Emissary Askosi Inkblot Askosi Tirade Askosi Arch -Askosi Grandstand +Askosi Grandstand (Cannon) Askosi Chantry Askosi Radix Askosi Cipher @@ -530,8 +530,8 @@ Scenario Unit 5 Scenario Unit 6 Scenario Unit 7 Scenario Unit 8 -Extended Unit #305 -Extended Unit #306 +Askosi Grandstand (Holdout) +Askosi Grandstand (Vision) Extended Unit #307 Extended Unit #308 Extended Unit #309 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 74107f54..086952a7 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 a58c50d6..d143e2a6 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -180,7 +180,7 @@ Spirtith Spores (Spirtith Colony) Usko Scrapray (Helion) Skortra Tendril (Skortrith Colony) Ikta Driver (Tirade) -Reforming Carbine (Avatar) +Arte Driver (Grandstand) Through the Looking Glass (Hypnagogue) Wordsmith Railgun (Silvertongue) Sunsplit Beam (Optecton) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 04cac9c6..ef82f66f 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 5aebe5e6..a2c58524 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 8b5fb0cc..964227d9 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 a33e2023..02723a51 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 12ad0437..8e7d56ca 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -218,7 +218,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # PilgrimInit: - imgul 2042 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp) + imgul 2042 0 0 # Pilgrim Shadow (cm\askosi\pilgrim-shadow.grp) goto PilgrimWalkingToIdle PilgrimDeath: @@ -459,7 +459,7 @@ RadixDisable: IsId 4 Type 24 Init ChantryInit -Death LandlockDeath +Death ChantryDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -491,6 +491,14 @@ ChantryInit: playfram 0x00 imgul 2072 0 0 # Chantry Shadow (cm\askosi\chantry-shadow.grp) goto ChantryIsWorking + +ChantryDeath: + playsnd 7 # Misc\ExploLrg.wav + imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) + wait 3 + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp) + wait 1 + end ChantrySpecialState1: playfram 0 @@ -1829,4 +1837,61 @@ GenericRemnantsFiveDeath: playfram 4 wait 255 wait 24 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2210 Grandstand (Cannon) (cm\askosi\grandstand.grp) +.headerstart +IsId 21 +Type 27 +Init GrandstandInit +Death ChantryDeath +GndAttkInit GrandstandGndAttkInit +AirAttkInit GrandstandGndAttkInit +Unused1 [NONE] +GndAttkRpt GrandstandGndAttkInit +AirAttkRpt GrandstandGndAttkInit +CastSpell [NONE] +GndAttkToIdle GrandstandBuilt +AirAttkToIdle GrandstandBuilt +Unused2 [NONE] +Walking [NONE] +WalkingToIdle SkryrokorLocal00 +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built GrandstandBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking GrandstandBuilt +WorkingToIdle GrandstandBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable SkryrokorLocal00 +Burrow [NONE] +UnBurrow [NONE] +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +GrandstandInit: + imgul 2211 0 0 # Grandstand (Cannon) Shadow (cm\askosi\grandstand-shadow.grp) + goto GrandstandBuilt + +GrandstandBuilt: + playfram 0x00 + wait 255 + goto GrandstandBuilt + +GrandstandGndAttkInit: + playfram 0 + wait 1 + attack + playsndbtwn 1157 1159 # Grandstand weaponfire 01, 02, 03 + imgol 1163 0 -52 # Grandstand muzzle flash + wait 2 + gotorepeatattk + ignorerest + goto GrandstandBuilt \ No newline at end of file diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 1965d1b4..04db8943 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index 4c1d3028..0746238d 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -3630,9 +3630,33 @@ EnergyRegenOverlayDeath: # 1676 Santa Hat - Extra Large - 17 .headerstart IsId 722 -Type 1 +Type 24 Init SantaHatInit Death SantaHatDeath +GndAttkInit SantaHatLocal00 +AirAttkInit SantaHatLocal00 +Unused1 SantaHatLocal00 +GndAttkRpt SantaHatLocal00 +AirAttkRpt SantaHatLocal00 +CastSpell SantaHatLocal00 +GndAttkToIdle SantaHatLocal00 +AirAttkToIdle SantaHatLocal00 +Unused2 SantaHatLocal00 +Walking SantaHatLocal00 +WalkingToIdle SantaHatLocal00 +SpecialState1 SantaHatLocal00 +SpecialState2 SantaHatLocal00 +AlmostBuilt SantaHatLocal00 +Built SantaHatLocal00 +Landing SantaHatLocal00 +LiftOff SantaHatLocal00 +IsWorking SantaHatLocal00 +WorkingToIdle SantaHatLocal00 +WarpIn SantaHatLocal00 +Unused3 SantaHatLocal00 +StarEditInit SantaHatLocal00 +Disable SantaHatLocal00 +Burrow SantaHatLocal00 .headerend # ----------------------------------------------------------------------------- # diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index cdb99d9a..ffc798bc 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 1304cf34..79346c80 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -1148,14 +1148,14 @@ IsId 158 Type 21 Init CantavisInit Death CantavisDeath -GndAttkInit [NONE] -AirAttkInit [NONE] +GndAttkInit CantavisGndAttkInit +AirAttkInit CantavisGndAttkInit Unused1 CantavisUnused1 -GndAttkRpt [NONE] -AirAttkRpt [NONE] +GndAttkRpt CantavisGndAttkInit +AirAttkRpt CantavisGndAttkInit CastSpell CantavisCastSpell GndAttkToIdle CantavisGndAttkToIdle -AirAttkToIdle [NONE] +AirAttkToIdle CantavisGndAttkToIdle Unused2 CantavisUnused2 Walking CantavisWalking WalkingToIdle CantavisWalkingToIdle @@ -1235,6 +1235,25 @@ CantavisUnused1: setfldirect 12 nobrkcodeend goto CantavisWalkingToIdle + +CantavisGndAttkInit: + playsnd 101 # Bullet\LaserB.wav + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + attackwith 1 + playfram 0x44 + wait 1 + nobrkcodeend + gotorepeatattk + playfram 0x66 + goto CantavisGndAttkToIdle CantavisCastSpell: playfram 0x00 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 354d4314..43417b34 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 d9a00c68..7807e663 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1503,11 +1503,11 @@ MasonUnused1: MasonGndAttkInit: setvertpos 0 wait 1 - playfram 0x22 + playfram 0x40 attackwith 1 playsndbtwn 35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav wait 1 - playfram 0x11 + playfram 0x20 wait 1 gotorepeatattk goto SkryrokorLocal00 @@ -1531,11 +1531,11 @@ MasonAlmostBuilt: setvertpos 0 wait 1 MasonLocal00: - playfram 0x22 + playfram 0x40 useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) sigorder 32 wait 1 - playfram 0x11 + playfram 0x20 wait 12 goto MasonLocal00 diff --git a/mpq/unit/cm/askosi/grandstand-damage.lof b/mpq/unit/cm/askosi/grandstand-damage.lof new file mode 100644 index 00000000..f976962e Binary files /dev/null and b/mpq/unit/cm/askosi/grandstand-damage.lof differ diff --git a/mpq/unit/cm/askosi/grandstand-shadow.grp b/mpq/unit/cm/askosi/grandstand-shadow.grp new file mode 100644 index 00000000..f2d791b7 Binary files /dev/null and b/mpq/unit/cm/askosi/grandstand-shadow.grp differ diff --git a/mpq/unit/cm/askosi/grandstand.grp b/mpq/unit/cm/askosi/grandstand.grp new file mode 100644 index 00000000..441f05c4 Binary files /dev/null and b/mpq/unit/cm/askosi/grandstand.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index d1670b6a..0f9503db 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 8ba4d99e..524d797b 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/mason-engine.grp b/mpq/unit/terran/mason-engine.grp new file mode 100644 index 00000000..ae69d046 Binary files /dev/null and b/mpq/unit/terran/mason-engine.grp differ diff --git a/mpq/unit/terran/mason.grp b/mpq/unit/terran/mason.grp index 3834df93..67e07643 100644 Binary files a/mpq/unit/terran/mason.grp and b/mpq/unit/terran/mason.grp differ diff --git a/mpq/unit/terran/mason.loo b/mpq/unit/terran/mason.loo index 933daeb3..f59850d6 100644 Binary files a/mpq/unit/terran/mason.loo and b/mpq/unit/terran/mason.loo differ diff --git a/patchnotes.md b/patchnotes.md index 95bbe973..cdf5772b 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,7 +13,7 @@ ## Audiovisuals - New model for: (c. Solstice) - - **Maverick** (incl. Futurist variant), **Vulture** (incl. Hecaton variant), **Herald** + - **Mason**, **Maverick** (incl. Futurist variant), **Vulture** (incl. Hecaton variant), **Herald** - New portrait for: (c. Solstice) - **Herald** - Modified models for: (c. Solstice) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 605d4f78..165a4b7c 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ