diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 92ea0bda..df80e140 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 a805de5e..389fb798 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 0c66a8ea..4d859f81 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 7ebcffc5..fc16aa02 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index b09e2d0d..319ae4d2 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 41ca8da5..b27883e8 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -2662,7 +2662,7 @@ LodestoneOverlayIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 275 Ministry (terran\control.grp) +# 275 Ministry (terran\ministry.grp) .headerstart IsId 102 Type 20 @@ -2692,7 +2692,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # MinistryInit: - imgul 277 0 0 # Ministry Shadow (terran\tccShad.grp) + imgul 277 0 0 # Ministry Shadow (terran\ministry-shadow.grp) MinistryBuilt: playfram 0x00 goto SkryrokorLocal00 @@ -2707,7 +2707,7 @@ MinistryDeath: end MinistrySpecialState1: - playfram 4 + playfram 9 goto SkryrokorLocal00 MinistryAlmostBuilt: @@ -2718,14 +2718,16 @@ MinistryLanding: nobrkcodestart wait 18 playsnd 472 # Misc\Land.WAV - playfram 4 - wait 5 - playfram 3 - wait 5 - playfram 2 - wait 5 + playfram 8 + wait 4 + playfram 7 + wait 4 + playfram 6 + wait 4 playfram 5 - wait 5 + wait 4 + playfram 4 + wait 4 playfram 0x00 sigorder 16 nobrkcodeend @@ -2734,33 +2736,37 @@ MinistryLanding: MinistryLiftOff: nobrkcodestart playsnd 471 # Misc\LiftOff.WAV - playfram 5 - wait 5 - playfram 2 - wait 5 - playfram 3 - wait 5 playfram 4 + wait 3 + playfram 5 + wait 3 + playfram 6 + wait 3 + playfram 7 + wait 3 + playfram 8 + wait 4 + playfram 9 sigorder 16 nobrkcodeend goto SkryrokorLocal00 MinistryIsWorking: - playfram 6 + playfram 2 wait 4 - playfram 0x00 + playfram 3 wait 1 - playfram 6 + playfram 2 wait 1 - playfram 0x00 + playfram 3 wait 1 - playfram 6 + playfram 2 wait 3 - playfram 0x00 + playfram 3 wait 1 - playfram 6 + playfram 2 wait 3 - playfram 0x00 + playfram 3 wait 1 goto MinistryIsWorking diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 1ceb72de..9327838f 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 21adf007..1dc6e887 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/protoss/nexus-damage.lof b/mpq/unit/protoss/nexus-damage.lof new file mode 100644 index 00000000..59b7ddd9 Binary files /dev/null and b/mpq/unit/protoss/nexus-damage.lof differ diff --git a/mpq/unit/protoss/nexus-shadow.grp b/mpq/unit/protoss/nexus-shadow.grp new file mode 100644 index 00000000..0b68ccad Binary files /dev/null and b/mpq/unit/protoss/nexus-shadow.grp differ diff --git a/mpq/unit/cm/p/photoncannon-attack.lol b/mpq/unit/protoss/warden-attack.lol similarity index 100% rename from mpq/unit/cm/p/photoncannon-attack.lol rename to mpq/unit/protoss/warden-attack.lol diff --git a/mpq/unit/protoss/photon.lof b/mpq/unit/protoss/warden-damage.lof similarity index 100% rename from mpq/unit/protoss/photon.lof rename to mpq/unit/protoss/warden-damage.lof diff --git a/mpq/unit/protoss/ppbshad.grp b/mpq/unit/protoss/warden-shadow.grp similarity index 100% rename from mpq/unit/protoss/ppbshad.grp rename to mpq/unit/protoss/warden-shadow.grp diff --git a/mpq/unit/protoss/photon.grp b/mpq/unit/protoss/warden.grp similarity index 100% rename from mpq/unit/protoss/photon.grp rename to mpq/unit/protoss/warden.grp diff --git a/mpq/unit/terran/ministry-damage.lof b/mpq/unit/terran/ministry-damage.lof new file mode 100644 index 00000000..23cd0ca8 Binary files /dev/null and b/mpq/unit/terran/ministry-damage.lof differ diff --git a/mpq/unit/terran/ministry-shadow.grp b/mpq/unit/terran/ministry-shadow.grp new file mode 100644 index 00000000..1b940a61 Binary files /dev/null and b/mpq/unit/terran/ministry-shadow.grp differ diff --git a/mpq/unit/terran/ministry.grp b/mpq/unit/terran/ministry.grp new file mode 100644 index 00000000..39fdb311 Binary files /dev/null and b/mpq/unit/terran/ministry.grp differ diff --git a/patchnotes.md b/patchnotes.md index 23b279a7..49e17e6d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -34,7 +34,9 @@ - Allowed **set_player_color** to apply to player 12 (r. 3crow, c. Veeq7) ## Audiovisuals -- Modified shaders for the following unit sprites: +- New models for: + - Ministry (c. Solstice & fasswawds) +- Modified shaders for the following units: - Eidolon, Hippogriff, Watchdog, Treasury, Quarry, Starpad, Rotary (c. Solstice) - Modified weapon VFX for Okrimnilisk - Updated wireframes for Savant, Tarasque, Rotary, Witness, Simulacrum, Vestige (c. jun3hong) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8c2aa7f3..bd5decbe 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ