diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 88ab5017..169dfaa0 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 88fd432d..a596e347 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -106,8 +106,8 @@ Anchor Reservoir Immobile Barracks Daedala -Missile Silo -Nuclear Missile +Anvil +Morningstar Starport Atlas Terran Construction (Large) diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index cfaa33cc..3434e1e6 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index c6d584aa..692f2848 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -310,12 +310,12 @@ Reservoir Shadow Daedala Daedala Overlay Daedala Shadow -Missile Silo -Missile Silo Connector -Missile Silo Overlay -Missile Silo Shadow -Nuclear Missile -Nuclear Missile Shadow +Anvil +Anvil Connector +Anvil Overlay +Anvil Shadow +Morningstar +Morningstar Shadow Nuke Hit Starport Starport Overlay @@ -426,7 +426,7 @@ Shield Overlay Energy Pulse Underlay Double Explosion Phase Disruptor Hit -Nuclear Missile Death +Morningstar Explosion Spider Mine Death Vespene Geyser Smoke1 Vespene Geyser Smoke2 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index efddd08b..b0e642d8 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 8cf86274..68aa998b 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -263,8 +263,8 @@ Physics Lab Anchor Reservoir Daedala -Nuclear Silo -Nuclear Missile +Anvil +Morningstar Nuke Hit Starport Atlas diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 75846b9e..1cdd0843 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -12,7 +12,7 @@ Terran Apostle Terran Trojan Terran Minotaur Spider Mine -Nuclear Missile +Terran Morningstar Terran Shaman (Support Mode) Protoss Manifold Protoss Architect @@ -106,7 +106,7 @@ Protoss Barghest Disruption Field Terran Ministry Terran Comsat Station -Terran Missile Silo +Terran Anvil Terran Supply Depot Terran Reservoir Terran Stockade diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 6982aeb2..f355b054 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 aafb1557..7b979425 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 d314d0eb..8871d034 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -11271,7 +11271,7 @@ CantavisWalking: setvertpos 0 CantavisLocal00: wait 3 - spruluselo 320 0 0 # High Templar Glow (thingy\pteglow.grp) + spruluselo 320 0 0 # Cantavis Glow (thingy\pteglow.grp) goto CantavisLocal00 CantavisWalkingToIdle: @@ -11284,7 +11284,7 @@ CantavisWalkingToIdle: goto CantavisGndAttkToIdle CantavisWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -13432,7 +13432,7 @@ WarpAnchorLocal01: # 115 Carrier Warp Flash (protoss\carrier.grp) # 121 Envoy Warp Flash (protoss\shuttle.grp) # 125 Dracadin Warp Flash (protoss\dragoon.grp) -# 128 High Templar Warp Flash (protoss\templar.grp) +# 128 Cantavis Warp Flash (protoss\templar.grp) # 133 Didact Warp Flash (protoss\didact.grp) # 139 Scribe Warp Flash (protoss\probe.grp) # 143 Scout Warp Flash (protoss\scout.grp) @@ -29678,7 +29678,7 @@ AtreusWalkingToIdle: goto AtreusLocal00 AtreusWarpIn: - imgol 125 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto AtreusLocal00 # ----------------------------------------------------------------------------- # @@ -29825,7 +29825,7 @@ AmaranthWalkingToIdle: goto AmaranthLocal69 AmaranthWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -30235,7 +30235,7 @@ EcclesiastWalkingToIdle: goto EcclesiastLocal69 EcclesiastWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -31692,7 +31692,7 @@ AirAttkInit ManifoldGndAttkInit Unused1 [NONE] GndAttkRpt ManifoldGndAttkInit AirAttkRpt ManifoldGndAttkInit -CastSpell ManifoldCastSpell +CastSpell [NONE] GndAttkToIdle ManifoldGndAttkToIdle AirAttkToIdle ManifoldGndAttkToIdle Unused2 [NONE] @@ -31711,28 +31711,15 @@ WarpIn ManifoldWarpIn # ----------------------------------------------------------------------------- # ManifoldInit: - imgul 1218 0 0 # Manifold Shadow (cm\protoss\manifold-shad.grp) + imgul 1218 0 -1 # Manifold Shadow (cm\protoss\manifold-shad.grp) playfram 0x00 - wait 2 -ManifoldLocal00: - playfram 0x11 - wait 2 - playfram 0x22 - waitrand 2 3 - playfram 0x33 - wait 2 - playfram 0x22 - waitrand 2 3 - playfram 0x11 - wait 2 - playfram 0x00 - waitrand 2 3 - goto ManifoldLocal00 + wait 1 + goto DidactGndAttkToIdle ManifoldGndAttkToIdle: playfram 0x00 - wait 2 - goto ManifoldLocal00 + wait 1 + goto DidactGndAttkToIdle ManifoldDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV @@ -31744,70 +31731,29 @@ ManifoldDeath: ManifoldGndAttkInit: playfram 0x00 - wait 1 - playfram 0x11 -ManifoldGndAttkRpt: wait 1 nobrkcodestart - playfram 0x22 - wait 1 - playfram 0xcc + playfram 0x20 playsndbtwn 1310 1312 # Manifold weaponfire 01, 02, 03 attackwith 1 wait 1 - playfram 0x33 - wait 1 - playfram 0x22 - wait 1 - playfram 0x11 + playfram 0x00 nobrkcodeend gotorepeatattk ignorerest goto ManifoldGndAttkToIdle - - -ManifoldCastSpell: - playsnd 101 # Bullet\LaserB.wav - attackwith 1 - wait 1 - nobrkcodeend - gotorepeatattk - goto ManifoldGndAttkToIdle ManifoldWalking: - move 5 - wait 1 - playfram 0x44 - move 5 - wait 1 - playfram 0x55 - move 5 - wait 1 - playfram 0x66 - move 5 - wait 1 - playfram 0x77 - move 5 - wait 1 - playfram 0x88 - move 5 - wait 1 - playfram 0x99 - move 5 - wait 1 - playfram 0xaa - move 5 - wait 1 - playfram 0xbb - goto ManifoldWalking + playfram 0x00 + goto ManifoldGndAttkToIdle ManifoldWalkingToIdle: playfram 0x00 - goto ManifoldLocal00 + goto ManifoldGndAttkToIdle ManifoldWarpIn: - imgol 125 0 0 # High Templar Warp Flash (protoss\templar.grp) - goto ManifoldLocal00 + imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) + goto ManifoldGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -38663,7 +38609,7 @@ CharlatanWalkingToIdle: goto CharlatanLocal69 CharlatanWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -46120,7 +46066,7 @@ VagrantWalkingToIdle: goto VagrantLocal69 VagrantWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -46319,7 +46265,7 @@ HeraldWalkingToIdle: goto HeraldLocal00 HeraldWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -50378,7 +50324,7 @@ OptectonWalkingToIdle: goto OptectonLocal00 OptectonWarpIn: - imgol 125 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 125 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto OptectonLocal00 # ----------------------------------------------------------------------------- # @@ -50550,7 +50496,7 @@ PatriarchWalkingToIdle: goto PatriarchLocal00 PatriarchWarpIn: - imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) + imgol 128 0 0 # Cantavis Warp Flash (protoss\templar.grp) goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/cm/protoss/aurora.grp b/mpq/unit/cm/protoss/aurora.grp index 3b8f26c8..3b7301f9 100644 Binary files a/mpq/unit/cm/protoss/aurora.grp and b/mpq/unit/cm/protoss/aurora.grp differ diff --git a/mpq/unit/cm/protoss/epigraph-engine.grp b/mpq/unit/cm/protoss/epigraph-engine.grp index 00afa12c..1c924895 100644 Binary files a/mpq/unit/cm/protoss/epigraph-engine.grp and b/mpq/unit/cm/protoss/epigraph-engine.grp differ diff --git a/mpq/unit/cm/protoss/epigraph.grp b/mpq/unit/cm/protoss/epigraph.grp index a73a7b05..2b4d4e62 100644 Binary files a/mpq/unit/cm/protoss/epigraph.grp and b/mpq/unit/cm/protoss/epigraph.grp differ diff --git a/mpq/unit/cm/protoss/gladius-engine.grp b/mpq/unit/cm/protoss/gladius-engine.grp index 6d936216..029cf568 100644 Binary files a/mpq/unit/cm/protoss/gladius-engine.grp and b/mpq/unit/cm/protoss/gladius-engine.grp differ diff --git a/mpq/unit/cm/protoss/gladius.grp b/mpq/unit/cm/protoss/gladius.grp index a0929d0c..6db291ee 100644 Binary files a/mpq/unit/cm/protoss/gladius.grp and b/mpq/unit/cm/protoss/gladius.grp differ diff --git a/mpq/unit/cm/protoss/legionnaire.grp b/mpq/unit/cm/protoss/legionnaire.grp index 5690f4ae..dafa7d55 100644 Binary files a/mpq/unit/cm/protoss/legionnaire.grp and b/mpq/unit/cm/protoss/legionnaire.grp differ diff --git a/mpq/unit/cm/protoss/manifold-shad.grp b/mpq/unit/cm/protoss/manifold-shad.grp index 1274b031..147221eb 100644 Binary files a/mpq/unit/cm/protoss/manifold-shad.grp and b/mpq/unit/cm/protoss/manifold-shad.grp differ diff --git a/mpq/unit/cm/protoss/manifold.grp b/mpq/unit/cm/protoss/manifold.grp index de2cb289..b6a153ac 100644 Binary files a/mpq/unit/cm/protoss/manifold.grp and b/mpq/unit/cm/protoss/manifold.grp differ diff --git a/mpq/unit/cm/protoss/panoptus.grp b/mpq/unit/cm/protoss/panoptus.grp index c3c312e9..60707d7b 100644 Binary files a/mpq/unit/cm/protoss/panoptus.grp and b/mpq/unit/cm/protoss/panoptus.grp differ diff --git a/mpq/unit/cm/protoss/vassal-engine.grp b/mpq/unit/cm/protoss/vassal-engine.grp index 54f278a5..3308fc8c 100644 Binary files a/mpq/unit/cm/protoss/vassal-engine.grp and b/mpq/unit/cm/protoss/vassal-engine.grp differ diff --git a/mpq/unit/cm/protoss/vassal.grp b/mpq/unit/cm/protoss/vassal.grp index 52986b56..243d798b 100644 Binary files a/mpq/unit/cm/protoss/vassal.grp and b/mpq/unit/cm/protoss/vassal.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 751debbe..68234c05 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 7827e8fd..2beaf485 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/protoss/scribe.grp b/mpq/unit/protoss/scribe.grp index f75bfbb0..925eb563 100644 Binary files a/mpq/unit/protoss/scribe.grp and b/mpq/unit/protoss/scribe.grp differ diff --git a/mpq/unit/thingy/pscglow.grp b/mpq/unit/thingy/pscglow.grp index c488a1a5..b9e0bf2e 100644 Binary files a/mpq/unit/thingy/pscglow.grp and b/mpq/unit/thingy/pscglow.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 7b2944d3..bab3f8ac 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 403aa8d5..de293aa8 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 89ec9320..643d8d90 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,4 +1,4 @@ -# 10 June 2023 - prospective patch notes +# 18 June 2023 - prospective patch notes ## Designer's Notes @@ -24,6 +24,7 @@ Much of this update is targeted at bringing AI back up to snuff, to complement t ## Audiovisuals - New model for: - Southpaw + - Manifold - Gladius (c. Solstice) - Adjusted visuals for: - Cyprian (shadow moved up visually)