diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index bf82e731..0766148b 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a2b8ac61..47f57172 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 a13992fb..7ee5af2d 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 91696946..ea0f764c 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2084,11 +2084,11 @@ Vicar Remains Missionary Missionary Shadow Missionary Remains -Extended Image #1084 -Extended Image #1085 -Extended Image #1086 -Extended Image #1087 -Extended Image #1088 +Power Siphon Hit (Small) +Power Siphon Hit (Medium) +Power Siphon Hit (Large) +Askosi Death Explosion Small +Askosi Death Explosion Large Extended Image #1089 Extended Image #1090 Extended Image #1091 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 994dc350..54c90714 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 2223fa3f..cddd8a3a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1030,9 +1030,9 @@ Vicar Vicar Remains Missionary Missionary Remains -Extended Sprite #516 -Extended Sprite #517 -Extended Sprite #518 +Power Siphon (Small) +Power Siphon (Medium) +Power Siphon (Large) Extended Sprite #519 Extended Sprite #520 Extended Sprite #521 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 737de549..c159d0ca 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index bf018e7a..5f9d6a69 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index 921ba5bb..15a51db3 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -120,7 +120,7 @@ Phase Blaster (Manifold) Dispersive Salvo (Architect) Harpoon Railgun (Claymore) Aural Assault (Luminary ability) -Observance (Seraph ability) +Ospo Twinshard (Vicar) Titan's Fist (Olympian) Mountain Gun (Olympian) Jackson Cannon (Wyvern) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index b727d5aa..b67a80dd 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 1e77d734..83b21209 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 297d4728..e2bfe3c6 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 0bb531dd..182ce51d 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -391,7 +391,7 @@ Unused2 [NONE] Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 RadixSpecialState1 -SpecialState2 [NONE] +SpecialState2 SkryrokorLocal00 AlmostBuilt RadixAlmostBuilt Built RadixBuilt Landing [NONE] @@ -453,7 +453,7 @@ Unused2 [NONE] Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 FunctionSpecialState1 -SpecialState2 [NONE] +SpecialState2 SkryrokorLocal00 AlmostBuilt FunctionAlmostBuilt Built FunctionBuilt Landing [NONE] @@ -579,26 +579,11 @@ MissionaryLocal02: MissionaryDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) - imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 -# playfram 170 - wait 2 -# playfram 171 - wait 2 -# playfram 172 - wait 2 -# playfram 173 - wait 2 -# playfram 174 -# wait 2 -# playfram 175 -# wait 2 -# playfram 176 -# wait 2 -# playfram 177 -# wait 2 - lowsprul 615 0 0 # Missionary Remnants (cm\terran\harakan-remnants.grp) + wait 8 + lowsprul 2085 0 0 # Missionary Remnants (cm\askosi\missionary-remnants.grp) wait 1 end @@ -633,7 +618,6 @@ MissionaryGndAttkRpt: nobrkcodestart playfram 0x40 attackwith 1 - attackwith 1 wait 1 playfram 0x20 wait 1 @@ -672,4 +656,202 @@ MissionaryWalking: move 4 wait 1 playfram 0x60 - goto MissionaryWalking \ No newline at end of file + goto MissionaryWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2077 Cardinal (cm\askosi\cardinal.grp) +.headerstart +IsId 497 +Type 12 +Init CardinalInit +Death CardinalDeath +GndAttkInit CardinalGndAttkInit +AirAttkInit [NONE] +Unused1 CardinalUnused1 +GndAttkRpt CardinalGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle CardinalGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking CardinalWalking +WalkingToIdle CardinalWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CardinalInit: + imgul 2078 0 0 # Cardinal Shadow (cm\askosi\cardinal-shadow.grp) +CardinalWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +CardinalDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1027 0 0 # Cardinal Remnants (cm\askosi\cardinal-remnants.grp) + wait 1 + end + +CardinalUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 # + sprol 742 0 0 # Explosion Small Reversed + wait 10 + setfldirect 12 + nobrkcodeend + goto CardinalWalkingToIdle + +CardinalGndAttkInit: + playfram 0xaa +CardinalGndAttkRpt: + wait 1 + playsndbtwn 1937 1938 # Golem weaponfire 01, 02 + nobrkcodestart + playfram 0xbb + wait 1 + playfram 0xcc + attackwith 1 + playsnd 664 # Protoss\ZEALOT\pzeHit00.WAV + wait 1 + playfram 0xee + wait 1 + playfram 0xff + sigorder 32 + attackwith 1 + playsnd 664 # Protoss\ZEALOT\pzeHit00.WAV + wait 1 + playfram 0x110 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +CardinalGndAttkToIdle: + goto CardinalWalkingToIdle + +CardinalWalking: + move 4 + wait 1 + playfram 0x11 + move 4 + wait 1 + playfram 0x22 + move 4 + wait 1 + playfram 0x33 + move 4 + wait 1 + playfram 0x44 + move 4 + wait 1 + playfram 0x55 + move 4 + wait 1 + playfram 0x66 + move 4 + wait 1 + playfram 0x77 + move 4 + wait 1 + playfram 0x88 + goto CardinalWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2080 Vicar (cm\askosi\vicar.grp) +.headerstart +IsId 498 +Type 12 +Init VicarInit +Death VicarDeath +GndAttkInit VicarGndAttkInit +AirAttkInit [NONE] +Unused1 VicarUnused1 +GndAttkRpt VicarGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle VicarGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking VicarWalking +WalkingToIdle VicarWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +VicarInit: + imgul 2081 0 0 # Vicar Shadow (cm\askosi\vicar-shadow.grp) +VicarWalkingToIdle: + playfram 0x77 + goto SkryrokorLocal00 + +VicarDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1029 0 0 # Vicar Remnants (cm\askosi\vicar-remnants.grp) + wait 1 + end + +VicarUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed + wait 10 + setfldirect 12 + nobrkcodeend + goto VicarWalkingToIdle + +VicarGndAttkInit: + playfram 0x88 +VicarGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0xbb + attackwith 1 + wait 1 + playfram 0xcc + wait 1 + nobrkcodeend + playfram 0xaa + wait 1 + playfram 0x99 + wait 1 + gotorepeatattk + ignorerest +VicarGndAttkToIdle: + goto VicarWalkingToIdle + +VicarWalking: + move 4 + wait 1 + playfram 0x22 + move 4 + wait 1 + playfram 0x33 + move 4 + wait 1 + playfram 0x44 + move 4 + wait 1 + playfram 0x55 + move 4 + wait 1 + playfram 0x66 + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x11 + goto VicarWalking \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 399121d3..bbd4816c 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 8d00a5d2..8efc4f5f 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -19269,4 +19269,38 @@ OgunSmithyModeSpecialState2: playfram 0x00 wait 6 sigorder 1 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2086 Power Siphon (Small) (thingy\PDaPsySm.grp) +# 2087 Power Siphon (Medium) (thingy\PDaPsyMd.grp) +# 2088 Power Siphon (Large) (thingy\PDaPsyLg.grp) +.headerstart +IsId 392 +Type 1 +Init PowerSiphonInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +PowerSiphonInit: + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 5 + wait 1 + playfram 4 + wait 1 + playfram 3 + wait 1 + playfram 2 + goto Generic_Wait1End + \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index f7034886..aeec9b91 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 6d17a344..6245bca3 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -11024,7 +11024,7 @@ IzirokorLocal01: playfram 0xBB wait 1 playfram 0xCC - wait 1 + wait 4 randcondjmp 34 IzirokorLocal02 playfram 0xBB wait 1 @@ -11038,7 +11038,7 @@ IzirokorLocal02: playfram 0xBB wait 1 playfram 0xAA - wait 1 + wait 3 randcondjmp 62 IzirokorLocal03 randcondjmp 51 IzirokorLocal04 playfram 0xBB diff --git a/mpq/unit/cm/askosi/a-death-large.grp b/mpq/unit/cm/askosi/a-death-large.grp new file mode 100644 index 00000000..6efe6f7c Binary files /dev/null and b/mpq/unit/cm/askosi/a-death-large.grp differ diff --git a/mpq/unit/cm/askosi/a-death-small.grp b/mpq/unit/cm/askosi/a-death-small.grp new file mode 100644 index 00000000..3cfb18d0 Binary files /dev/null and b/mpq/unit/cm/askosi/a-death-small.grp differ diff --git a/mpq/unit/cm/zerg/kethrostalor-shadow.grp b/mpq/unit/cm/zerg/kethrostalor-shadow.grp new file mode 100644 index 00000000..e09ea934 Binary files /dev/null and b/mpq/unit/cm/zerg/kethrostalor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/kethrostalor.grp b/mpq/unit/cm/zerg/kethrostalor.grp new file mode 100644 index 00000000..e09ea934 Binary files /dev/null and b/mpq/unit/cm/zerg/kethrostalor.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index d82cf65c..950b40f0 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 7d8ff2cc..a3a63971 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 e1c675c0..112b4299 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,6 +32,8 @@ - **Izirokor** - New portrait for: - **Legionnaire** *(c. Solstice)* +- Improved overlay visuals for: + - **Savant - Power Siphon** ## Triggers - Added the following behaviors to the `set_unit_behavior` crig action: @@ -43,11 +45,14 @@ - **Fusion Sealers** removed - [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant): - Resource costs 100/50 » 125/50 + - **Discoid Rifle:** + - **Power Siphon** attack cooldown 0.75 » 0.83 (matches **Entropy Gauntlets**) - [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack): - Build time 18 » 16 - [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx): - Build time 28 » 30 - [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): + - Build time 30 » 25 - **Halo Rockets:** - Weapon cooldown 1.08 » 0.92 - Weapon range 6 » 7 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index ce2c5a80..8c964df4 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ