diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 6edcde4c..a7414f0d 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 19531f57..eb78af14 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -723,11 +723,11 @@ Battery Cell Okrimnilisk Spore Raynor (Maverick) Cyprian (Hecaton) -Extended Flingy #517 -Extended Flingy #518 -Extended Flingy #519 -Extended Flingy #520 -Extended Flingy #521 +Memphis (Tank Mode) +Memphis (Flak Mode) +Memphis Turret (Tank Mode) +Memphis Turret (Flak Mode) +Fragmentary Shells (with damage) Extended Flingy #522 Extended Flingy #523 Extended Flingy #524 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index cc6a0f67..d9d7bd4d 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 389fb798..1d36a2ff 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 9203731c..20edb8d7 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2496,12 +2496,12 @@ Raynor (Maverick) Shadow Raynor (Maverick) Remains Cyprian (Hecaton) Cyprian (Hecaton) Shadow -Extended Image #1496 -Extended Image #1497 -Extended Image #1498 -Extended Image #1499 -Extended Image #1500 -Extended Image #1501 +Memphis (Tank Mode) +Memphis Turret (Tank Mode) +Memphis (Tank Mode) Shadow +Memphis (Flak Mode) +Memphis Turret (Flak Mode) +Fragmentary Shells (with damage) Extended Image #1502 Extended Image #1503 Extended Image #1504 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 3ba1a630..631f5fd9 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4391,21 +4391,21 @@ Intendent Under Attack 01 Intendent Under Attack 02 Intendent Under Attack 03 Intendent Under Attack 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Pit Door Open 01 +Pit Door Open 02 +Pit Door Close 01 +Pit Door Close 02 +Upper Door Open 01 +Upper Door Open 02 +Upper Door Close 01 +Upper Door Close 02 +Memphis Weaponfire 01 +Memphis Weaponfire 02 +Memphis Weaponfire 03 +Memphis Weaponhit 2 01 +Memphis Weaponhit 2 02 +Memphis Weaponhit 2 03 +Memphis Weaponhit 2 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 7e6179a6..918611d3 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4390,4 +4390,19 @@ cm\a\intendent\agg-04.wav cm\a\intendent\hlp-01.wav cm\a\intendent\hlp-02.wav cm\a\intendent\hlp-03.wav -cm\a\intendent\hlp-04.wav \ No newline at end of file +cm\a\intendent\hlp-04.wav +cm\n\doors\pit-open-01.wav +cm\n\doors\pit-open-02.wav +cm\n\doors\pit-close-01.wav +cm\n\doors\pit-close-02.wav +cm\n\doors\upper-open-01.wav +cm\n\doors\upper-open-02.wav +cm\n\doors\upper-close-01.wav +cm\n\doors\upper-close-02.wav +cm\f-t\memphis\wf-01.wav +cm\f-t\memphis\wf-02.wav +cm\f-t\memphis\wf-03.wav +cm\f-t\memphis\wh-2-01.wav +cm\f-t\memphis\wh-2-02.wav +cm\f-t\memphis\wh-2-03.wav +cm\f-t\memphis\wh-2-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 7781edfe..e488a36d 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 163467fa..ffc6a7d6 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1199,11 +1199,11 @@ Spore Trail (White) Raynor (Maverick) Raynor (Maverick) Remains Cyprian (Hecaton) -Extended Sprite #685 -Extended Sprite #686 -Extended Sprite #687 -Extended Sprite #688 -Extended Sprite #689 +Memphis (Tank Mode) +Memphis (Flak Mode) +Memphis Turret (Tank Mode) +Memphis Turret (Flak Mode) +Fragmentary Shells (with damage) Extended Sprite #690 Extended Sprite #691 Extended Sprite #692 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index caf4e1f9..faec56da 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 0001f7d7..c4fe4886 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -640,10 +640,10 @@ Forerunner Buildings Terran Eveningstar Raynor (Maverick) Terran Cyprian (Hecaton) -Terran Matador (Tank, Upstart) -Matador Turret (Tank, Upstart) -Terran Matador (Flak, Upstart) -Matador Turret (Flak, Upstart) +Terran Memphis (Tank) +Terran Memphis (Tank, Turret) +Terran Memphis (Flak) +Terran Memphis (Flak, Turret) Forerunner Processus Forerunner Aestuarius Forerunner Corcillum diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 07d20b68..b7444084 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 a252146d..be3eae3e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -310,8 +310,8 @@ Plasmathrower (Harakan Golden) High-Tonnage Payload (Eveningstar) Gauss Launcher (Raynor Maverick) Boreal Railguns (Cyprian Hecaton) -Extended Weapon #183 -Extended Weapon #184 +Twinstrike Cannons (Memphis) +Twinflak Cannons (Memphis) Extended Weapon #185 Extended Weapon #186 Extended Weapon #187 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index d682f262..64485084 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 2436d151..23cc30da 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index ef523fad..7eb3ca1d 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index fc16aa02..51cf036e 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index e994d1cc..24b25610 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -309,10 +309,10 @@ <0> <0> <0> -<0> -<0> -<0> -<0> +a<1><4>Build Memphis <1>(<3>A<1>)<10>Flak microtank.<0> +Memphis Requires:<10> Scrapyard<0> +e<3><4>Flak Mode <1>(<3>E<1>)<10>Switches forms, gaining splash radius and targeting only airborne hostiles, while disabling movement.<0> +e<0><4>Tank Mode <1>(<3>E<1>)<10>Returns the Memphis's weapon and mobility to normal.<0> Spider Mines<0> Goremasts<0> Piety Wards<0> @@ -2309,8 +2309,8 @@ Plasmathrower<0> High-Tonnage Payload<0> Gauss Launcher<0> Boreal Railguns<0> -<0> -<0> +Twinstrike Cannons<0> +Twinflak Cannons<0> <0> <0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 88344023..1a36dd08 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/rez/unitnames.txt b/mpq/rez/unitnames.txt index 857beea1..2a1bd86f 100644 --- a/mpq/rez/unitnames.txt +++ b/mpq/rez/unitnames.txt @@ -638,12 +638,12 @@ Medkit<0>*<0>Powerups<0> Battery Cell<0>*<0>Powerups<0> Forerunner Buildings<0>Buttonset<0>Unused<0> Terran Eveningstar<0>*<0>*<0> -<0> -<0> -<0> -<0> -<0> -<0> +Jim Raynor<0>Maverick<0>Heroes<0> +Terran Cyprian<0>Hecaton Coalition<0>Factional Units<0> +Terran Memphis<0>Tank<0>Factional Units<0> +Memphis Turret<0>Tank<0>Factional Units<0> +Terran Memphis<0>Flak<0>Factional Units<0> +Memphis Turret<0>Flak<0>Factional Units<0> <0> <0> <0> diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 1a8ae079..bafe69d1 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -155,6 +155,7 @@ military archbishop = 600 military camazotz = 620 military arquebus = 624 military cyprian_hecaton = 641 +military memphis = 642 @spellcaster(serathiel) # Terran buildings diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index b3e086d6..6f17d194 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 8fd4413f..65264e6c 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 b20df879..bf86ba12 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -1924,6 +1924,7 @@ InstallationDoodadAlmostBuilt: goto SkryrokorLocal00 InstallationDoodadStarEditInit: + playsndbtwn 4395 4396 # Pit Door close 01, 02 playfram 9 wait 2 playfram 8 @@ -1943,10 +1944,11 @@ InstallationDoodadStarEditInit: playfram 1 wait 2 playfram 0x00 - sigorder 1 + sigorder 64 goto SkryrokorLocal00 InstallationDoodadDisable: + playsndbtwn 4393 4394 # Pit Door open 01, 02 playfram 0x00 wait 2 playfram 1 @@ -1966,7 +1968,7 @@ InstallationDoodadDisable: playfram 8 wait 2 playfram 9 - sigorder 1 + sigorder 32 goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # @@ -2018,6 +2020,7 @@ InstallationDoodad2AlmostBuilt: goto SkryrokorLocal00 InstallationDoodad2Enable: + playsndbtwn 4395 4396 # Pit Door close 01, 02 playfram 9 setflipstate 1 wait 2 @@ -2038,10 +2041,11 @@ InstallationDoodad2Enable: playfram 1 wait 2 playfram 0x00 - sigorder 1 + sigorder 64 goto SkryrokorLocal00 InstallationDoodad2Disable: + playsndbtwn 4393 4394 # Pit Door open 01, 02 playfram 1 wait 2 playfram 2 @@ -2059,7 +2063,7 @@ InstallationDoodad2Disable: playfram 8 wait 2 playfram 9 - sigorder 1 + sigorder 32 goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # @@ -5225,4 +5229,191 @@ AmmoCrateLocal00: AmmoCrateDeath: imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 742 Left Upper Level Door (thingy\tileset\install\CRDoor1.grp) +.headerstart +IsId 386 +Type 27 +Init UpperDoorInit +Death Generic_Wait1End +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt UpperDoorAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit UpperDoorStarEditInit +Disable UpperDoorDisable +Burrow [NONE] +UnBurrow [NONE] +Enable UpperDoorStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +UpperDoorInit: + playfram 0x00 + goto SkryrokorLocal00 + +UpperDoorAlmostBuilt: + playfram 9 + goto SkryrokorLocal00 + +UpperDoorStarEditInit: + playsndbtwn 4399 4400 # Upper Door close 01, 02 + playfram 9 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + sigorder 64 + goto SkryrokorLocal00 + +UpperDoorDisable: + playsndbtwn 4397 4398 # Upper Door open 01, 02 + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 4 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + sigorder 32 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 743 Right Upper Level Door (thingy\tileset\install\CRDoor1.grp) +.headerstart +IsId 389 +Type 27 +Init UpperDoor2Init +Death Generic_Wait1End +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt UpperDoor2AlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable UpperDoor2Disable +Burrow [NONE] +UnBurrow [NONE] +Enable UpperDoor2Enable +.headerend +# ----------------------------------------------------------------------------- # + +UpperDoor2Init: + playfram 0x00 + setflipstate 1 + goto SkryrokorLocal00 + +UpperDoor2AlmostBuilt: + playfram 9 + setflipstate 1 + goto SkryrokorLocal00 + +UpperDoor2Enable: + playsndbtwn 4399 4400 # Upper Door close 01, 02 + playfram 9 + setflipstate 1 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + sigorder 64 + goto SkryrokorLocal00 + +UpperDoor2Disable: + playsndbtwn 4397 4398 # Upper Door open 01, 02 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + sigorder 32 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 319ae4d2..89ae4a4a 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 84c19958..0a9a0692 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -22625,4 +22625,323 @@ CyprianHecatonWalking: move 3 wait 1 playfram 0x60 - goto CyprianHecatonWalking \ No newline at end of file + goto CyprianHecatonWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2498 Memphis Tank Mode (cm\f-t\memphis.grp) +.headerstart +IsId 861 +Type 23 +Init MemphisInit +Death MemphisDeath +GndAttkInit MemphisGndAttkInit +AirAttkInit MemphisGndAttkInit +Unused1 MemphisUnused1 +GndAttkRpt MemphisGndAttkInit +AirAttkRpt MemphisGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking MemphisWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit Memphis_Tank_BaseStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +MemphisInit: + imgul 2500 0 0 # Memphis Shadow (cm\f-t\memphis-shadow.grp) + playfram 0x00 + goto InfestedTerranWalkingToIdle + +MemphisDeath: + playsndbtwn 1385 1386 # Memphis death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +MemphisUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto InfestedTerranWalkingToIdle + +MemphisGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x100 + playsndbtwn 4401 4403 # Memphis weaponfire 01, 02, 03 + attack + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + goto InfestedTerranWalkingToIdle + +MemphisWalking: + playfram 0x20 + move 4 + wait 1 + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + goto MemphisWalking + +Memphis_Tank_BaseStarEditInit: + setfldirect 12 + imgoluselo 2499 2 0 # Memphis (Tank) Turret (cm\f-t\memphis-turret.grp) + wait 1 + imgul 2500 0 0 # Memphis (Tank) Base Shadow (cm\f-t\memphis-shadow.grp) + setfldirect 12 + playfram 0x00 + goto InfestedTerranWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2501 Memphis Flak Mode (cm\f-t\memphis.grp) +.headerstart +IsId 862 +Type 23 +Init MemphisFlakModeInit +Death MemphisFlakModeDeath +GndAttkInit MemphisFlakModeGndAttkInit +AirAttkInit MemphisFlakModeGndAttkInit +Unused1 MemphisFlakModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle MemphisFlakModeGndAttkToIdle +AirAttkToIdle MemphisFlakModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle SkryrokorLocal00 +SpecialState1 MemphisFlakModeSpecialState2 +SpecialState2 MemphisFlakModeSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit MemphisFlakModeStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +MemphisFlakModeInit: + imgul 2500 0 0 # Memphis Shadow (cm\f-t\memphis-shadow.grp) + wait 1 + playsnd 2429 # Memphis Flak Transform + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 6 + sigorder 1 + goto MemphisFlakModeGndAttkToIdle + +MemphisFlakModeGndAttkToIdle: + playfram 0x180 + goto SkryrokorLocal00 + +MemphisFlakModeDeath: + playsndbtwn 1385 1386 # Memphis death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +MemphisFlakModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto MemphisFlakModeGndAttkToIdle + +MemphisFlakModeGndAttkInit: + playfram 0x180 + wait 1 + nobrkcodestart + playfram 0x1A0 + playsndbtwn 4401 4403 # Memphis weaponfire 01, 02, 03 + attack + wait 1 + playfram 0x180 + wait 1 + nobrkcodeend + gotorepeatattk + goto MemphisFlakModeGndAttkToIdle + +MemphisFlakModeSpecialState2: + playsnd 2430 # Memphis Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 6 + sigorder 1 + goto SkryrokorLocal00 + +MemphisFlakModeStarEditInit: + imgoluselo 2501 2 0 # Memphis Flak Turret (terran\memphis-turret.grp) + imgul 2500 0 0 # Memphis Flak Base Shadow (terran\memphis-shadow.grp) + wait 1 + setflspeed 0 + playsnd 2430 # Memphis Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 6 + sigorder 1 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1523 Memphis Tank Mode Turret (cm\terran\memphis-turret.grp) +.headerstart +IsId 863 +Type 13 +Init InfestedTerranWalkingToIdle +Death Generic_Wait1End +GndAttkInit MemphisGndAttkInit +AirAttkInit MemphisGndAttkInit +Unused1 [NONE] +GndAttkRpt MemphisGndAttkInit +AirAttkRpt MemphisGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking MemphisWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1726 Memphis Turret Flak Mode (cm\terran\memphis-turret.grp) +.headerstart +IsId 864 +Type 14 +Init MemphisFlakModeTurretInit +Death Generic_Wait1End +GndAttkInit MemphisFlakModeGndAttkInit +AirAttkInit MemphisFlakModeGndAttkInit +Unused1 [NONE] +GndAttkRpt MemphisFlakModeGndAttkInit +AirAttkRpt MemphisFlakModeGndAttkInit +CastSpell [NONE] +GndAttkToIdle MemphisFlakModeGndAttkToIdle +AirAttkToIdle MemphisFlakModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 MemphisFlakModeSpecialState2 +SpecialState2 MemphisFlakModeSpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MemphisFlakModeTurretInit: + wait 1 + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 6 + sigorder 1 + goto MemphisFlakModeGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1477 Cyclops Fragmentary Explosion with Damage (cm\t\cyclops-fragmentary-shells.grp) +.headerstart +IsId 865 +Type 1 +Init CyclopsFragmentaryExplosionDamageInit +Death CyclopsFragmentaryExplosionDamageDeath +.headerend +# ----------------------------------------------------------------------------- # + +CyclopsFragmentaryExplosionDamageInit: + playfram 10 + wait 1 + playsndbtwn 4404 4407 # Memphis weaponhit 01, 02, 03, 04 + domissiledmg + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 +CyclopsFragmentaryExplosionDamageDeath: + wait 1 + end \ No newline at end of file diff --git a/mpq/sound/cm/f-t/memphis/wf-01.wav b/mpq/sound/cm/f-t/memphis/wf-01.wav new file mode 100644 index 00000000..ba9e330c Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wf-02.wav b/mpq/sound/cm/f-t/memphis/wf-02.wav new file mode 100644 index 00000000..bfd47fd5 Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wf-03.wav b/mpq/sound/cm/f-t/memphis/wf-03.wav new file mode 100644 index 00000000..7b5fc6b1 Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wh-2-01.wav b/mpq/sound/cm/f-t/memphis/wh-2-01.wav new file mode 100644 index 00000000..932aeb9f Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wh-2-01.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wh-2-02.wav b/mpq/sound/cm/f-t/memphis/wh-2-02.wav new file mode 100644 index 00000000..fe541747 Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wh-2-02.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wh-2-03.wav b/mpq/sound/cm/f-t/memphis/wh-2-03.wav new file mode 100644 index 00000000..24ac5c74 Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wh-2-03.wav differ diff --git a/mpq/sound/cm/f-t/memphis/wh-2-04.wav b/mpq/sound/cm/f-t/memphis/wh-2-04.wav new file mode 100644 index 00000000..41f52f9c Binary files /dev/null and b/mpq/sound/cm/f-t/memphis/wh-2-04.wav differ diff --git a/mpq/sound/cm/n/doors/pit-close-01.wav b/mpq/sound/cm/n/doors/pit-close-01.wav new file mode 100644 index 00000000..23237336 Binary files /dev/null and b/mpq/sound/cm/n/doors/pit-close-01.wav differ diff --git a/mpq/sound/cm/n/doors/pit-close-02.wav b/mpq/sound/cm/n/doors/pit-close-02.wav new file mode 100644 index 00000000..0eed1184 Binary files /dev/null and b/mpq/sound/cm/n/doors/pit-close-02.wav differ diff --git a/mpq/sound/cm/n/doors/pit-open-01.wav b/mpq/sound/cm/n/doors/pit-open-01.wav new file mode 100644 index 00000000..5abbd47a Binary files /dev/null and b/mpq/sound/cm/n/doors/pit-open-01.wav differ diff --git a/mpq/sound/cm/n/doors/pit-open-02.wav b/mpq/sound/cm/n/doors/pit-open-02.wav new file mode 100644 index 00000000..807a4c31 Binary files /dev/null and b/mpq/sound/cm/n/doors/pit-open-02.wav differ diff --git a/mpq/sound/cm/n/doors/upper-close-01.wav b/mpq/sound/cm/n/doors/upper-close-01.wav new file mode 100644 index 00000000..ac7fff52 Binary files /dev/null and b/mpq/sound/cm/n/doors/upper-close-01.wav differ diff --git a/mpq/sound/cm/n/doors/upper-close-02.wav b/mpq/sound/cm/n/doors/upper-close-02.wav new file mode 100644 index 00000000..38f5d172 Binary files /dev/null and b/mpq/sound/cm/n/doors/upper-close-02.wav differ diff --git a/mpq/sound/cm/n/doors/upper-open-01.wav b/mpq/sound/cm/n/doors/upper-open-01.wav new file mode 100644 index 00000000..33628228 Binary files /dev/null and b/mpq/sound/cm/n/doors/upper-open-01.wav differ diff --git a/mpq/sound/cm/n/doors/upper-open-02.wav b/mpq/sound/cm/n/doors/upper-open-02.wav new file mode 100644 index 00000000..c8e3eda6 Binary files /dev/null and b/mpq/sound/cm/n/doors/upper-open-02.wav differ diff --git a/mpq/tileset/install.cv5 b/mpq/tileset/install.cv5 index fd54b62c..1f4de05f 100644 Binary files a/mpq/tileset/install.cv5 and b/mpq/tileset/install.cv5 differ diff --git a/mpq/tileset/install.vf4 b/mpq/tileset/install.vf4 index eb10f1c9..bd413a88 100644 Binary files a/mpq/tileset/install.vf4 and b/mpq/tileset/install.vf4 differ diff --git a/mpq/tileset/install.vr4 b/mpq/tileset/install.vr4 index c7098d0b..ec6175e2 100644 Binary files a/mpq/tileset/install.vr4 and b/mpq/tileset/install.vr4 differ diff --git a/mpq/tileset/install.vx4ex b/mpq/tileset/install.vx4ex index ef1eafc4..3431d633 100644 Binary files a/mpq/tileset/install.vx4ex and b/mpq/tileset/install.vx4ex differ diff --git a/mpq/unit/cm/f-t/memphis-shadow.grp b/mpq/unit/cm/f-t/memphis-shadow.grp new file mode 100644 index 00000000..da8ffea7 Binary files /dev/null and b/mpq/unit/cm/f-t/memphis-shadow.grp differ diff --git a/mpq/unit/cm/f-t/memphis-turret.grp b/mpq/unit/cm/f-t/memphis-turret.grp new file mode 100644 index 00000000..86d2116e Binary files /dev/null and b/mpq/unit/cm/f-t/memphis-turret.grp differ diff --git a/mpq/unit/cm/f-t/memphis-turret.lol b/mpq/unit/cm/f-t/memphis-turret.lol new file mode 100644 index 00000000..e6892c94 Binary files /dev/null and b/mpq/unit/cm/f-t/memphis-turret.lol differ diff --git a/mpq/unit/cm/f-t/memphis.grp b/mpq/unit/cm/f-t/memphis.grp new file mode 100644 index 00000000..fc20b108 Binary files /dev/null and b/mpq/unit/cm/f-t/memphis.grp differ diff --git a/mpq/unit/cm/t/blackjack.grp b/mpq/unit/cm/t/blackjack.grp index 26e36187..5c790915 100644 Binary files a/mpq/unit/cm/t/blackjack.grp and b/mpq/unit/cm/t/blackjack.grp differ diff --git a/mpq/unit/cm/t/cyprian-remains.grp b/mpq/unit/cm/t/cyprian-remains.grp index 5214a54a..49848dbe 100644 Binary files a/mpq/unit/cm/t/cyprian-remains.grp and b/mpq/unit/cm/t/cyprian-remains.grp differ diff --git a/mpq/unit/cm/t/cyprian-shadow.grp b/mpq/unit/cm/t/cyprian-shadow.grp index 28c9de68..2fdc3570 100644 Binary files a/mpq/unit/cm/t/cyprian-shadow.grp and b/mpq/unit/cm/t/cyprian-shadow.grp differ diff --git a/mpq/unit/cm/t/cyprian.grp b/mpq/unit/cm/t/cyprian.grp index 0f214502..a6f103f4 100644 Binary files a/mpq/unit/cm/t/cyprian.grp and b/mpq/unit/cm/t/cyprian.grp differ diff --git a/mpq/unit/cm/z/quazilisk-birth.grp b/mpq/unit/cm/z/quazilisk-birth.grp index 6d27c5ba..2a298695 100644 Binary files a/mpq/unit/cm/z/quazilisk-birth.grp and b/mpq/unit/cm/z/quazilisk-birth.grp differ diff --git a/mpq/unit/cm/z/quazilisk-mutate.grp b/mpq/unit/cm/z/quazilisk-mutate.grp index a4b6e368..395e3801 100644 Binary files a/mpq/unit/cm/z/quazilisk-mutate.grp and b/mpq/unit/cm/z/quazilisk-mutate.grp differ diff --git a/mpq/unit/cm/z/quazilisk-remains.grp b/mpq/unit/cm/z/quazilisk-remains.grp index c215a9e3..6d76878c 100644 Binary files a/mpq/unit/cm/z/quazilisk-remains.grp and b/mpq/unit/cm/z/quazilisk-remains.grp differ diff --git a/mpq/unit/cm/z/quazilisk.grp b/mpq/unit/cm/z/quazilisk.grp index b54034fb..ab23b811 100644 Binary files a/mpq/unit/cm/z/quazilisk.grp and b/mpq/unit/cm/z/quazilisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 9327838f..ff82bbd9 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 1dc6e887..3ad1d863 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index acb414b1..2970bff5 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 6aa976ef..9cb110dc 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/mpq/unit/zerg/zethrokor-birth.grp b/mpq/unit/zerg/zethrokor-birth.grp index 53657efc..193c700c 100644 Binary files a/mpq/unit/zerg/zethrokor-birth.grp and b/mpq/unit/zerg/zethrokor-birth.grp differ diff --git a/mpq/unit/zerg/zethrokor-mutate.grp b/mpq/unit/zerg/zethrokor-mutate.grp index ae2d3644..90ea9213 100644 Binary files a/mpq/unit/zerg/zethrokor-mutate.grp and b/mpq/unit/zerg/zethrokor-mutate.grp differ diff --git a/mpq/unit/zerg/zethrokor-remains.grp b/mpq/unit/zerg/zethrokor-remains.grp index d0dc69df..0edef2a5 100644 Binary files a/mpq/unit/zerg/zethrokor-remains.grp and b/mpq/unit/zerg/zethrokor-remains.grp differ diff --git a/mpq/unit/zerg/zethrokor.grp b/mpq/unit/zerg/zethrokor.grp index d7aa6786..be842a85 100644 Binary files a/mpq/unit/zerg/zethrokor.grp and b/mpq/unit/zerg/zethrokor.grp differ diff --git a/patchnotes.md b/patchnotes.md index e078ffd2..19036d4c 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -27,6 +27,7 @@ ## Bugfixes - **Gameplay:** - Fixed **Arquebus** attempting to attack air units (r. Londier) + - Installation doors can once again be disabled and enabled via triggers - **Audiovisual:** - Resolved error printout when loading recently-repowered **Engram**s (r. Concealed Organic) - Corrected **Maverick (Golden)** weaponfire SFX (r. lolrsk8s) @@ -36,8 +37,8 @@ ## Audiovisuals - New models for: - Ministry (c. Solstice & fasswawds) -- Modified shaders for the following units: - - Eidolon, Hippogriff, Watchdog, Treasury, Quarry, Starpad, Rotary (c. Solstice) +- Tweaked models for: + - Cyprian, Eidolon, Hippogriff, Watchdog, Treasury, Quarry, Starpad, Rotary, Zethrokor, Quazilisk (c. Solstice) - Modified weapon VFX for Okrimnilisk - Updated wireframes for Savant, Vulture (Upstart), Tartarus Mine, Piety Ward, Tarasque, Rotary, Witness, Cicatus, Vestige, Simulacrum, Phontis (c. jun3hong) - Added placeholder portrait for Vespene nodes (c. jun3hong) @@ -45,4 +46,6 @@ ## Terran factions - **NEW:** [Cyprian (Hecaton)](https://cosmonarchy.com/terran/cyprian-hecaton): - - Factional Cyprian variant for Hecaton Coalition; Has Kelvin Munitions \ No newline at end of file + - Factional Cyprian variant for Hecaton Coalition; Has Kelvin Munitions +- **NEW:** [Memphis](https://cosmonarchy.com/terran/memphis): + - Factional Matador replacement for Upstarts; Has anti-air Flak Mode \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f72b9e21..a4785358 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ