diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 7f3fe862..7f17c9ff 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 1b59c3f5..271e2c5a 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 243f3a9f..2ab4885f 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index bcd30612..19d20e52 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 1c18c687..6d1db72e 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -616,7 +616,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # MissionaryInit: - imgul 2084 0 0 # Missionary Shadow (cm\a\missionary-shadow.grp) + imgulnextid 0 0 # Missionary Shadow (cm\a\missionary-shadow.grp) MissionaryWalkingToIdle: playfram 0x00 MissionaryLocal00: @@ -872,7 +872,7 @@ AirAttkInit VicarGndAttkInit Unused1 VicarUnused1 GndAttkRpt VicarGndAttkRpt AirAttkRpt VicarGndAttkRpt -CastSpell VicarCastSpell +CastSpell [NONE] GndAttkToIdle VicarGndAttkToIdle AirAttkToIdle VicarGndAttkToIdle Unused2 [NONE] @@ -883,18 +883,71 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # VicarInit: - imgul 2081 0 0 # Vicar Shadow (cm\a\vicar-shadow.grp) + imgulnextid 0 0 # Vicar Shadow (cm\a\vicar-shadow.grp) VicarWalkingToIdle: - playfram 0x77 - goto SkryrokorLocal00 + playfram 0x00 +VicarLocal00: + wait 63 + randcondjmp 25 VicarLocal01 + randcondjmp 128 VicarLocal02 + goto VicarLocal00 + +VicarLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 VicarLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto VicarWalkingToIdle + +VicarLocal03: + wait 13 + goto VicarWalkingToIdle + +VicarLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto VicarWalkingToIdle VicarDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 - wait 8 - lowsprul 1029 0 0 # Vicar Remnants (cm\a\vicar-remnants.grp) + wait 8 + lowsprul 1031 0 0 # Vicar Remnants (cm\a\vicar-remnants.grp) wait 1 end @@ -904,29 +957,38 @@ VicarUnused1: setfldirect 0 playsndbtwn 1163 1165 sprol 742 0 0 # Explosion Small Reversed - wait 10 +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 setfldirect 12 nobrkcodeend goto VicarWalkingToIdle VicarGndAttkInit: - playfram 0x88 + playfram 0x20 VicarGndAttkRpt: wait 1 nobrkcodestart - playfram 0xbb + playfram 0x40 attackwith 1 wait 1 - playfram 0xcc + playfram 0x20 wait 1 - playfram 0xbb + playfram 0x40 attackwith 1 wait 1 - playfram 0xcc - wait 1 - playfram 0xaa - wait 1 - playfram 0x99 + playfram 0x20 wait 1 nobrkcodeend gotorepeatattk @@ -934,42 +996,31 @@ VicarGndAttkRpt: VicarGndAttkToIdle: goto VicarWalkingToIdle -VicarCastSpell: - playfram 0x88 - wait 1 - nobrkcodestart - playfram 0xbb - wait 1 - playfram 0xcc - wait 1 - castspell - nobrkcodeend - sigorder 2 - gotorepeatattk - goto VicarWalkingToIdle - VicarWalking: move 4 wait 1 - playfram 0x22 + playfram 0x80 move 4 wait 1 - playfram 0x33 + playfram 0xA0 move 4 wait 1 - playfram 0x44 + playfram 0xC0 move 4 wait 1 - playfram 0x55 + playfram 0xE0 move 4 wait 1 - playfram 0x66 + playfram 0x100 move 4 wait 1 - playfram 0x00 + playfram 0x120 move 4 wait 1 - playfram 0x11 + playfram 0x140 + move 4 + wait 1 + playfram 0x60 goto VicarWalking # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/cm/a/vicar-attack.lol b/mpq/unit/cm/a/vicar-attack.lol index f3993117..1a4a38d6 100644 Binary files a/mpq/unit/cm/a/vicar-attack.lol and b/mpq/unit/cm/a/vicar-attack.lol differ diff --git a/mpq/unit/cm/a/vicar-shadow.grp b/mpq/unit/cm/a/vicar-shadow.grp index 71559904..19d6bb30 100644 Binary files a/mpq/unit/cm/a/vicar-shadow.grp and b/mpq/unit/cm/a/vicar-shadow.grp differ diff --git a/mpq/unit/cm/a/vicar.grp b/mpq/unit/cm/a/vicar.grp index 1a3bc24f..6f83fdb8 100644 Binary files a/mpq/unit/cm/a/vicar.grp and b/mpq/unit/cm/a/vicar.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 30613f64..04d0047a 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 a6bd4828..9a4a1ef1 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 021b11bb..0ff12d69 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -24,9 +24,12 @@ - Fixed various mnemonic hotkey conflicts for Askosi structures (r. Neblime) - Adjusted regeneration code so rare combinations of status effects scale expectedly (c. Veeq7) - **Audiovisuals** + - Fixed missing progress bars for **Conduit**, **Bestiary** (r. shopkeeper dog) - Corrected **Thaumalogue** corpse graphic ## Audiovisuals +- New model for: + - Vicar - New SFX for: - Zerg and Askosi cloaking / decloaking (c. lolrsk8s) - New wireframe for: (c. jun3hong) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index d7f74fb6..27b2038f 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ