diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 507bd7a0..88ab5017 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 35334103..5077ddcb 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -488,7 +488,7 @@ Vilgoleth Madrigal Turret (Imperioso) Madrigal (Furia Mode) Madrigal Turret (Furia) -Extended Flingy #282 +Philoc Extended Flingy #283 Extended Flingy #284 Extended Flingy #285 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a6908a4a..640036d2 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 d099e3b7..5dc38841 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 31372f5e..91482e3a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1743,9 +1743,9 @@ Vilgoleth Madrigal Turret (Imperioso) Madrigal Base (Furia) Madrigal Turret (Furia) -Extended Image #743 -Extended Image #744 -Extended Image #745 +Philoc +Philoc Shadow +Philoc Engines Extended Image #746 Extended Image #747 Extended Image #748 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 379e1d39..ebc8d60b 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index cb94476e..a6427411 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 46b1beec..ae9450ec 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -479,16 +479,16 @@ Unknown Desert 10/5 Desert 12/1 Desert Overlay 11/3 Desert -Lurker Egg -Devourer -Devourer Death -Lurker Remnants -Lurker -Dark Archon Energy -Corsair -Dark Templar (Unit) -Medic -Medic Remnants +Lakizilisk Egg (unused) +Vithrilisk +Vithrilisk Death +Lakizilisk Remnants +Lakizilisk +Mind Tyrant Energy +Lanifect +Cabalist +Cleric +Cleric Remnants Valkyrie Scantid (Desert) Kakaru (Twilight) @@ -535,7 +535,7 @@ Ghitorokor Aurora Panoptus Centaur -Southpaw +Unused Centaur Missile Augur Vorval Pond @@ -873,7 +873,7 @@ Vilgoleth Madrigal Turret (Imperioso) Madrigal (Furia Mode) Madrigal Turret (Furia) -Extended Sprite #1 +Philoc Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 72fac280..2b0846c4 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 9c40d06a..1adc458a 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -326,7 +326,7 @@ Zerg Begrothilisk Zerg Oztukrokor Zerg Kethrostalor Zerg Rakzilisk -Unused Unit ID +Terran Philoc Zerg Begrozith Barrow Zerg Chokralgant Chazsal Protoss Bulwark diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 74df5e27..3851b2ae 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 96a74698..91e0e6f6 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -201,7 +201,7 @@ Discoid Railgun (Savant, Piercing) Geometric Rifle (Sevenstep, Piercing) Twinstrike Cannons (Matador) Cylindrical Blaster (Analogue) -Extended Weapon #74 +Heirloom Batteries (Philoc) Extended Weapon #75 Extended Weapon #76 Extended Weapon #77 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index bdcef2b1..94ca8c5d 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 1f3acebd..c4e4dcb1 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 70545270..4ab53d6b 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 e6a4b65e..179abfa8 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 06fb0508..055a7f21 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -28653,16 +28653,16 @@ Type 21 Init GorgonInit Death GorgonDeath GndAttkInit GorgonGndAttkInit -AirAttkInit GorgonAirAttkInit +AirAttkInit GorgonGndAttkInit Unused1 [NONE] GndAttkRpt GorgonGndAttkInit -AirAttkRpt GorgonAirAttkInit +AirAttkRpt GorgonGndAttkInit CastSpell [NONE] GndAttkToIdle GorgonGndAttkToIdle AirAttkToIdle GorgonGndAttkToIdle Unused2 [NONE] Walking GorgonWalking -WalkingToIdle GorgonWalkingToIdle +WalkingToIdle WraithGndAttkToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -28679,21 +28679,10 @@ GorgonInit: imgul 1147 0 42 # Gorgon Shadow (cm\terran\gorgon.grp) GorgonGndAttkToIdle: playfram 0x00 - goto GorgonWalkingToIdle - -GorgonWalkingToIdle: - setvertpos 0 - wait 8 - setvertpos 0 - wait 8 - setvertpos -1 - wait 8 - setvertpos 0 - wait 8 - goto GorgonWalkingToIdle + goto WraithGndAttkToIdle GorgonDeath: - playsndbtwn 1249 1251 + playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 lowsprul 844 0 42 # Terran Unit Rubble Medium @@ -28702,30 +28691,17 @@ GorgonDeath: GorgonGndAttkInit: wait 1 - playsndbtwn 1252 1253 + playsndbtwn 1252 1253 # Gorgon weaponfire 01, 02 attack sigorder 32 - wait 1 + wait 1 gotorepeatattk - goto GorgonWalkingToIdle - -GorgonLocal00: - wait 125 - goto GorgonLocal00 - -GorgonAirAttkInit: - wait 1 - playsndbtwn 1252 1253 - attack - sigorder 32 - wait 1 - gotorepeatattk - goto GorgonWalkingToIdle + goto WraithGndAttkToIdle GorgonWalking: setvertpos 0 imgol 1198 0 0 # Gorgon Engines (cm\terran\gorgon-engine.grp) - goto GorgonLocal00 + goto WraithLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -28745,7 +28721,7 @@ GndAttkToIdle PhobosGndAttkToIdle AirAttkToIdle PhobosGndAttkToIdle Unused2 [NONE] Walking PhobosWalking -WalkingToIdle PhobosWalkingToIdle +WalkingToIdle ScourgeLocal00 SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] @@ -28762,11 +28738,7 @@ PhobosInit: imgul 1151 0 42 # Phobos Shadow (cm\terran\phobos.grp) PhobosGndAttkToIdle: playfram 0x00 - goto PhobosWalkingToIdle - -PhobosWalkingToIdle: - wait 125 - goto PhobosWalkingToIdle + goto ScourgeLocal00 PhobosDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav @@ -28790,20 +28762,16 @@ PhobosGndAttkInit: wait 1 nobrkcodeend gotorepeatattk - goto PhobosWalkingToIdle - -PhobosLocal00: - wait 125 - goto PhobosLocal00 + goto ScourgeLocal00 PhobosWalking: setvertpos 0 imgol 1162 0 0 # Phobos Engines (cm\terran\phobos-engine.grp) - goto PhobosLocal00 + goto ScourgeLocal00 PhobosCastSpell: imgolorig 543 # Yamato Gun Overlay (thingy\eycBlast.grp) - goto PhobosLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -28814,10 +28782,10 @@ Type 12 Init PenumbraInit Death PenumbraDeath GndAttkInit PenumbraGndAttkInit -AirAttkInit PenumbraAirAttkInit +AirAttkInit PenumbraGndAttkInit Unused1 PenumbraUnused1 GndAttkRpt PenumbraGndAttkInit -AirAttkRpt PenumbraAirAttkInit +AirAttkRpt PenumbraGndAttkInit CastSpell [NONE] GndAttkToIdle PenumbraGndAttkToIdle AirAttkToIdle PenumbraGndAttkToIdle @@ -28832,11 +28800,7 @@ PenumbraInit: imgul 1153 0 0 # Penumbra shadow (cm\terran\penumbra-shad.grp) PenumbraWalkingToIdle: playfram 0x110 - goto PenumbraLocal00 - -PenumbraLocal00: - wait 125 - goto PenumbraLocal00 + goto ScourgeLocal00 PenumbraDeath: playsndbtwn 1742 1743 # Penumbra death 01, 02 @@ -28891,29 +28855,6 @@ PenumbraGndAttkToIdle: wait 2 goto PenumbraWalkingToIdle -PenumbraAirAttkInit: - playfram 0x110 - wait 2 - nobrkcodestart - playsndbtwn 1199 1202 - attack - playfram 0x165 - wait 2 - playfram 0x154 - wait 2 - playfram 0x143 - wait 2 - playfram 0x132 - wait 2 - playfram 0x121 - nobrkcodeend - wait 2 - playfram 0x110 - gotorepeatattk - ignorerest - wait 2 - goto PenumbraWalkingToIdle - PenumbraWalking: move 3 wait 1 @@ -47980,17 +47921,27 @@ SouthpawDeath: end SouthpawGndAttkInit: + playfram 0x00 wait 1 nobrkcodestart + playfram 0x20 playsndbtwn 2442 2443 # Southpaw weaponfire 01, 02 attackwith 1 - wait 2 + wait 1 + playfram 0x00 + wait 1 + playfram 0x40 playsndbtwn 2442 2443 # Southpaw weaponfire attackwith 1 - wait 2 + wait 1 + playfram 0x00 + wait 1 + playfram 0x60 playsndbtwn 2442 2443 # Southpaw weaponfire attackwith 1 wait 1 + playfram 0x00 + wait 1 nobrkcodeend gotorepeatattk goto SouthpawLocal00 @@ -51641,6 +51592,57 @@ Type 1 Init SpiderMineExplosionDeath Death ScourgeExplosionDeath .headerend + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1745 Philoc (cm\faction\philoc.grp) +.headerstart +IsId 751 +Type 12 +Init PhilocInit +Death PhilocDeath +GndAttkInit PhilocGndAttkInit +AirAttkInit PhilocGndAttkInit +Unused1 [NONE] +GndAttkRpt PhilocGndAttkInit +AirAttkRpt PhilocGndAttkInit +CastSpell [NONE] +GndAttkToIdle WraithGndAttkToIdle +AirAttkToIdle WraithGndAttkToIdle +Unused2 [NONE] +Walking PhilocWalking +WalkingToIdle WraithGndAttkToIdle +SpecialState1 [NONE] +.headerend # ----------------------------------------------------------------------------- # -# Next free isid: 751 \ No newline at end of file +PhilocInit: + imgulnextid 0 42 # Philoc Shadow (terran\philoc.grp) + playfram 0x00 + goto WraithGndAttkToIdle + +PhilocDeath: + playsnd 257 # Terran\PHOENIX\TPhDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium + end + +PhilocGndAttkInit: + nobrkcodestart + wait 1 + playfram 0x20 + attackwith 1 + playsnd 74 # Bullet\TPhFi100.wav + wait 1 + playfram 0x00 + gotorepeatattk + nobrkcodeend + goto WraithLocal00 + +PhilocWalking: + setvertpos 0 + imgol 1747 0 0 # Philoc Engines (terran\wraith-engine.grp) + goto WraithLocal00 + +# Next free isid: 752 \ No newline at end of file diff --git a/mpq/unit/cm/faction/philoc-engine.grp b/mpq/unit/cm/faction/philoc-engine.grp new file mode 100644 index 00000000..5f34cf32 Binary files /dev/null and b/mpq/unit/cm/faction/philoc-engine.grp differ diff --git a/mpq/unit/cm/faction/philoc.grp b/mpq/unit/cm/faction/philoc.grp new file mode 100644 index 00000000..a52142cb Binary files /dev/null and b/mpq/unit/cm/faction/philoc.grp differ diff --git a/mpq/unit/cm/faction/southpaw-engine.grp b/mpq/unit/cm/faction/southpaw-engine.grp index b278f059..52d38762 100644 Binary files a/mpq/unit/cm/faction/southpaw-engine.grp and b/mpq/unit/cm/faction/southpaw-engine.grp differ diff --git a/mpq/unit/cm/faction/southpaw.grp b/mpq/unit/cm/faction/southpaw.grp index c51bbfd3..31d95b51 100644 Binary files a/mpq/unit/cm/faction/southpaw.grp and b/mpq/unit/cm/faction/southpaw.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 3496aaee..b86018d0 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 35b7445d..4881d97d 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 90232dd6..0bf717f8 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -2,7 +2,7 @@ ## Designer's Notes -Much of this update is targeted at bringing AI back up to snuff, to complement the latest campaign mission developments. Bugfixes and stability improvements are also featured. +Much of this update is targeted at bringing AI back up to snuff, to complement the latest campaign mission developments. Bugfixes and stability improvements are also featured, with the hope of achieving sufficient stability for a 1v1 tournament later this month! ## Bugfixes - More nullsprite crashes have been protected against @@ -13,4 +13,17 @@ Much of this update is targeted at bringing AI back up to snuff, to complement t ## AI - Worker allocation has been better optimized for the new resource model (c. Veeq7) -- AI should now harvest from more than 3 vespene nodes (c. Veeq7) \ No newline at end of file +- AI should now harvest from more than 3 vespene nodes (c. Veeq7) + +## Audiovisuals +- New model for: + - Southpaw + +## Factions +- Futurist Federation now enables: + - Philoc from Starpad (replaces Wraith) +- Golden Republic now enables: + - Aspirant from Fulcrum (replaces Goliath) +- Nydus Trinity now enables: + - Cohort from Barracks (replaces Cyprian) + - Tarasque from Fulcrum with attached Palladium (replaces Phalanx) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index d349b827..5d60b29a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ