diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 12a3e711..3efbcc2e 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 a1ca6308..7639d08c 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 4c61b46f..ffde5127 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2389,7 +2389,7 @@ Cybrene Shadow Silversoul Remains Alacyne Engine Elgird Engine -Extended Image #1389 +Histrion Engine Extended Image #1390 Extended Image #1391 Extended Image #1392 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 1c47b1d5..ab47a979 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 15cbe720..f9bcfdac 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 685ee25b..b45c8319 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -354,7 +354,7 @@ e<3><4>Holdout Module <1>(<3>E<1>)<10>Extends the structure outwards with a shel e<3><4>Vision Module <1>(<3>E<1>)<10>Extends the structure skywards, providing +2 vision range and Detector status.<0> s<1><4>Morph into Protathalor <1>(<3>S<1>)<10>Mobile artillery strain.<0> <0> -<0> +ยค<3><4>Hated Reflection <2>(passive)<10>When damaged by hostiles, the Histrion deploys an Egocent at its location. This cannot occur more than once every 2 seconds.<0> z<3><4>Ashbind <1>(<3>Z<1>)<10>Leaps to the target ground enemy within 5 range, applying Scrapworld: Ash Heap to all hostiles within 3 range of the jump target.<0> Puppeteer requires:<10> Recent victim<0> c<3><4>Puppeteer <1>(<3>C<1>)<10>Activates a trap on the most recently-damaged foe, pulling hostiles within 5 range towards the target.<0> diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index d50aab5f..8f27c2b2 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index b4d41f09..5dc40151 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index b1f51024..bac9b567 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -3821,7 +3821,7 @@ Enable [NONE] # ----------------------------------------------------------------------------- # EyeletInit: - imgulnextid 0 -6 # Spider Mine Shadow (cm\a\eyelet-shadow.grp) + imgulnextid 0 -6 # Eyelet Shadow (cm\a\eyelet-shadow.grp) EyeletWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 @@ -6008,6 +6008,193 @@ ElgirdWalking: setvertpos 0 imgol 2303 0 0 # Elgird Engine goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2372 Histrion (cm\a\histrion.grp) +.headerstart +IsId 69 +Type 13 +Init HistrionInit +Death HistrionDeath +GndAttkInit HistrionGndAttkInit +AirAttkInit HistrionGndAttkInit +Unused1 HistrionUnused1 +GndAttkRpt HistrionGndAttkInit +AirAttkRpt HistrionGndAttkInit +CastSpell [NONE] +GndAttkToIdle HistrionGndAttkToIdle +AirAttkToIdle HistrionGndAttkToIdle +Unused2 [NONE] +Walking HistrionWalking +WalkingToIdle HistrionGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HistrionInit: + imgulnextid 0 7 # Histrion Shadow (cm\a\histrion.grp) + playfram 0x00 + goto HistrionGndAttkToIdle + +HistrionGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto HistrionGndAttkToIdle + +HistrionDeath: + playsnd 353 # Terran\Histrion\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + end + +HistrionUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Histrion revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto HistrionGndAttkToIdle + +HistrionGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + goto HistrionGndAttkToIdle + +HistrionWalking: + playfram 0x00 + setvertpos 0 + imgol 2303 0 0 # Histrion Engine + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2374 Egocent (cm\a\egocent.grp) +.headerstart +IsId 70 +Type 26 +Init EgocentInit +Death EgocentDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 EgocentUnused2 +Walking SkryrokorLocal00 +WalkingToIdle EgocentWalkingToIdle +SpecialState1 EgocentSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow EgocentBurrow +UnBurrow EgocentUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EgocentInit: + imgulnextid 0 -6 # Egocent Shadow (cm\a\egocent-shadow.grp) +EgocentWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +EgocentDeath: + playsnd 10 # Misc\Explo1.wav + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + end + +EgocentSpecialState1: + castspell + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EgocentUnused2: + sigorder 32 + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EgocentBurrow: + nobrkcodestart + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + sigorder 4 + nobrkcodeend + goto SkryrokorLocal00 + +EgocentUnBurrow: + nobrkcodestart + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 10 + wait 1 + playfram 9 + wait 1 + playfram 8 + wait 1 + playfram 0x00 + sigorder 4 + nobrkcodeend + goto EgocentWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/a/egocent.grp b/mpq/unit/cm/a/egocent.grp new file mode 100644 index 00000000..26c4bb1f Binary files /dev/null and b/mpq/unit/cm/a/egocent.grp differ diff --git a/mpq/unit/cm/a/histrion-engine.grp b/mpq/unit/cm/a/histrion-engine.grp new file mode 100644 index 00000000..7c7718bb Binary files /dev/null and b/mpq/unit/cm/a/histrion-engine.grp differ diff --git a/mpq/unit/cm/a/histrion.grp b/mpq/unit/cm/a/histrion.grp new file mode 100644 index 00000000..0232bcf4 Binary files /dev/null and b/mpq/unit/cm/a/histrion.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ab39db6a..b4f0f1cc 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 2692027a..19ac4318 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 173054d8..7dd5dbf4 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 36cf0918..2663ca84 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 3e641372..74e84964 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -36,6 +36,7 @@ - Adjusted regeneration code so rare combinations of status effects scale expectedly (c. Veeq7) - **Audiovisuals** - Fixed missing progress bars for **Conduit**, **Bestiary** (r. shopkeeper dog) + - Added missing **Aphorist** wireframes - Corrected **Thaumalogue** corpse graphic ## Audiovisuals diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 4597b53f..914bd167 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ