diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 14b173df..228f4806 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 c8875e73..5172f924 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index ce79f996..02e57037 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 9324f478..3d46018b 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -532,10 +532,10 @@ Scenario Unit 7 Scenario Unit 8 Askosi Grandstand (Holdout) Askosi Grandstand (Vision) -Extended Unit #307 -Extended Unit #308 -Extended Unit #309 -Extended Unit #310 +Protoss Warp Gate (The Fall) +Zerg Cerebrate (The Fall) +Zerg Overmind (With Shell, The Fall) +Zerg Overmind (The Fall) Extended Unit #311 Extended Unit #312 Extended Unit #313 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 967a436d..39a5276f 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index ef856588..57914737 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index a8ac408a..1d9c9121 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/protoss/simulacrum-old/fid00.smk b/mpq/portrait/protoss/simulacrum-old/fid00.smk new file mode 100644 index 00000000..17b1fd4c Binary files /dev/null and b/mpq/portrait/protoss/simulacrum-old/fid00.smk differ diff --git a/mpq/portrait/protoss/simulacrum-old/tlk00.smk b/mpq/portrait/protoss/simulacrum-old/tlk00.smk new file mode 100644 index 00000000..2d6f8467 Binary files /dev/null and b/mpq/portrait/protoss/simulacrum-old/tlk00.smk differ diff --git a/mpq/portrait/protoss/simulacrum/fid00.smk b/mpq/portrait/protoss/simulacrum/fid00.smk index 17b1fd4c..2bc2c7af 100644 Binary files a/mpq/portrait/protoss/simulacrum/fid00.smk and b/mpq/portrait/protoss/simulacrum/fid00.smk differ diff --git a/mpq/portrait/protoss/simulacrum/fid01.smk b/mpq/portrait/protoss/simulacrum/fid01.smk new file mode 100644 index 00000000..710d9a33 Binary files /dev/null and b/mpq/portrait/protoss/simulacrum/fid01.smk differ diff --git a/mpq/portrait/protoss/simulacrum/fid02.smk b/mpq/portrait/protoss/simulacrum/fid02.smk new file mode 100644 index 00000000..36fb2ee7 Binary files /dev/null and b/mpq/portrait/protoss/simulacrum/fid02.smk differ diff --git a/mpq/portrait/protoss/simulacrum/fid03.smk b/mpq/portrait/protoss/simulacrum/fid03.smk new file mode 100644 index 00000000..77b0ba22 Binary files /dev/null and b/mpq/portrait/protoss/simulacrum/fid03.smk differ diff --git a/mpq/portrait/protoss/simulacrum/tlk00.smk b/mpq/portrait/protoss/simulacrum/tlk00.smk index 2d6f8467..3305fc57 100644 Binary files a/mpq/portrait/protoss/simulacrum/tlk00.smk and b/mpq/portrait/protoss/simulacrum/tlk00.smk differ diff --git a/mpq/portrait/protoss/simulacrum/tlk01.smk b/mpq/portrait/protoss/simulacrum/tlk01.smk new file mode 100644 index 00000000..44c79ec4 Binary files /dev/null and b/mpq/portrait/protoss/simulacrum/tlk01.smk differ diff --git a/mpq/portrait/protoss/simulacrum/tlk02.smk b/mpq/portrait/protoss/simulacrum/tlk02.smk new file mode 100644 index 00000000..bfd2839e Binary files /dev/null and b/mpq/portrait/protoss/simulacrum/tlk02.smk differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 7907da6e..1dfd3d5a 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index ffc798bc..de913e4a 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 79346c80..e2e7f46d 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -6186,9 +6186,9 @@ WarpIn SimulacrumWarpIn # ----------------------------------------------------------------------------- # SimulacrumInit: - imgul 1072 0 0 # Simulacrum Shadow (protoss\pdrShad.grp) + imgulnextid 0 0 SimulacrumWalkingToIdle: - playfram 0x33 + playfram 0x00 goto SkryrokorLocal00 SimulacrumDeath: @@ -6200,19 +6200,15 @@ SimulacrumDeath: end SimulacrumGndAttkInit: - playfram 0x33 + playfram 0x140 wait 1 nobrkcodestart playsndbtwn 1427 1434 # Simulacrum weapon fire 01, 02, 03, 04, 05, 06, 07, 08 attackwith 1 - playfram 0x00 - wait 1 - playfram 0x11 - wait 1 - playfram 0x22 - wait 1 - playfram 0x33 + playfram 0x180 wait 1 + playfram 0x1A0 + wait 1 nobrkcodeend gotorepeatattk ignorerest @@ -6221,34 +6217,31 @@ SimulacrumGndAttkInit: SimulacrumWalking: move 4 wait 1 - playfram 0x44 + playfram 0x20 move 5 wait 1 - playfram 0x55 + playfram 0x40 move 4 wait 1 - playfram 0x66 + playfram 0x60 move 5 wait 1 - playfram 0x77 + playfram 0x80 move 4 wait 1 - playfram 0x88 + playfram 0xA0 move 5 wait 1 - playfram 0x99 + playfram 0xC0 move 4 wait 1 - playfram 0xaa + playfram 0xE0 move 5 wait 1 - playfram 0xbb + playfram 0x100 move 4 wait 1 - playfram 0xcc - move 5 - wait 1 - playfram 0xdd + playfram 0x120 goto SimulacrumWalking SimulacrumWarpIn: diff --git a/mpq/unit/cm/faction-p/simulacrum-astral-shadow.grp b/mpq/unit/cm/faction-p/simulacrum-astral-shadow.grp new file mode 100644 index 00000000..60afb0d5 Binary files /dev/null and b/mpq/unit/cm/faction-p/simulacrum-astral-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/simulacrum-astral.grp b/mpq/unit/cm/faction-p/simulacrum-astral.grp index dd7d0833..95919274 100644 Binary files a/mpq/unit/cm/faction-p/simulacrum-astral.grp and b/mpq/unit/cm/faction-p/simulacrum-astral.grp differ diff --git a/mpq/unit/cm/protoss/simulacrum-shadow.grp b/mpq/unit/cm/protoss/simulacrum-shadow.grp index 9e3387b2..a2259cbd 100644 Binary files a/mpq/unit/cm/protoss/simulacrum-shadow.grp and b/mpq/unit/cm/protoss/simulacrum-shadow.grp differ diff --git a/mpq/unit/cm/protoss/simulacrum.grp b/mpq/unit/cm/protoss/simulacrum.grp index 21422b86..a1002bf4 100644 Binary files a/mpq/unit/cm/protoss/simulacrum.grp and b/mpq/unit/cm/protoss/simulacrum.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 0e575cbb..99e0ee4e 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 a065e632..1f23d39e 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 c396a9b4..520917c9 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 52da9af9..58c9c365 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 0aa2944a..162fae5e 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ