diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index ce8329e3..ba5e45b3 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 4cac8aba..ed99162e 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -527,8 +527,8 @@ Photon Blasters Green Liiralisk Glave Evigrilisk Tentacle Cyclops (Futurist Federation) -Extended Flingy #321 -Extended Flingy #322 +Zealot (Starbound) +Ecclesiast (Khalendric Knights) Extended Flingy #323 Extended Flingy #324 Extended Flingy #325 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index b976a683..b9cb8d49 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 78442aee..404ee5bc 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1940,10 +1940,10 @@ Savant Remains Evigrilisk Tentacle Cyclops (Futurist Federation) Cyclops Shadow (Futurist Federation) -Extended Image #940 -Extended Image #941 -Extended Image #942 -Extended Image #943 +Zealot (Starbound) +Zealot Shadow (Starbound) +Ecclesiast (Khalendric Knights) +Ecclesiast Shadow (Khalendric Knights) Extended Image #944 Extended Image #945 Extended Image #946 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 3b435ecb..e8801317 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3226,6 +3226,7 @@ Stroluum Under Attack 01 Stroluum Under Attack 02 Stroluum Under Attack 03 Stroluum Under Attack 04 +Zealot (Starbound) Weaponhit 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a71cd93a..30ceffa5 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3225,4 +3225,5 @@ cm\heroes\stroluum\yes-04.wav cm\heroes\stroluum\hlp-01.wav cm\heroes\stroluum\hlp-02.wav cm\heroes\stroluum\hlp-02.wav -cm\heroes\stroluum\hlp-02.wav \ No newline at end of file +cm\heroes\stroluum\hlp-02.wav +cm\f-p\zealot-starbound\wh-01.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2de4b809..143ff3fd 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 1d3e0749..fd44597c 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -951,6 +951,8 @@ Witness Remains Savant Remains Evigrilisk Tentacle Cyclops (Futurist Federation) +Zealot (Starbound) +Ecclesiast (Khalendric Knights) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 061e3adb..1856a369 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 2f9a1aa4..62c57fb9 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -408,9 +408,9 @@ Terran Anchor (Grounded) Zerg Sasyrvoleth Terran Tencendur Ackmed -Cyclops (Futurist Federation) -Extended Unit #184 -Extended Unit #185 +Terran Cyclops (Futurist Federation) +Protoss Zealot (Starbound) +Protoss Ecclesiast (Khalendric Knights) Extended Unit #186 Extended Unit #187 Extended Unit #188 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 8fcce9ad..6688ae7b 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 62f3ad8d..17e59e48 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 72b01bf8..6e8bac16 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index b2974562..ca5469be 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -51955,4 +51955,63 @@ EvigriliskTentacleInit: wait 1 goto SubterraneanTentacleDeath -## Next free IsId: 797 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 151 Zealot (Starbound) (faction-p\zealot-starbound.grp) +.headerstart +IsId 797 +Type 21 +Init ZealotInit +Death ZealotDeath +GndAttkInit ZealotStarboundGndAttkInit +AirAttkInit [NONE] +Unused1 ZealotUnused1 +GndAttkRpt ZealotStarboundGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle ZealotGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking ZealotWalking +WalkingToIdle ZealotWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ZealotWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +ZealotStarboundGndAttkInit: + playfram 0x00 + wait 1 +ZealotStarboundGndAttkRpt: + playsndrand 2 662 663 # Protoss\ZEALOT\pzeAtt00.WAV | Protoss\ZEALOT\pzeAtt01.WAV + playfram 0x11 + wait 1 + nobrkcodestart + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + attackmelee 1 3228 # Protoss\ZEALOT\pzeHit00.WAV + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + attackmelee 1 3228 # Protoss\ZEALOT\pzeHit00.WAV + wait 1 + playfram 0x11 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + ignorerest + goto ZealotGndAttkToIdle + +## Next free IsId: 798 \ No newline at end of file diff --git a/mpq/sound/cm/f-p/zealot-starbound/wh-01.wav b/mpq/sound/cm/f-p/zealot-starbound/wh-01.wav new file mode 100644 index 00000000..6c9787bb Binary files /dev/null and b/mpq/sound/cm/f-p/zealot-starbound/wh-01.wav differ diff --git a/mpq/tileset/Desert.cv5 b/mpq/tileset/Desert.cv5 index 28c284fb..1447b250 100644 Binary files a/mpq/tileset/Desert.cv5 and b/mpq/tileset/Desert.cv5 differ diff --git a/mpq/tileset/Desert.vf4 b/mpq/tileset/Desert.vf4 index d2d978ac..5f06b84f 100644 Binary files a/mpq/tileset/Desert.vf4 and b/mpq/tileset/Desert.vf4 differ diff --git a/mpq/tileset/Desert.vr4 b/mpq/tileset/Desert.vr4 index 4cf79e58..febbeadb 100644 Binary files a/mpq/tileset/Desert.vr4 and b/mpq/tileset/Desert.vr4 differ diff --git a/mpq/tileset/Desert.vx4ex b/mpq/tileset/Desert.vx4ex index 4845d9a4..daca6b94 100644 Binary files a/mpq/tileset/Desert.vx4ex and b/mpq/tileset/Desert.vx4ex differ diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index 3482134c..e76e76c3 100644 Binary files a/mpq/tileset/Jungle.cv5 and b/mpq/tileset/Jungle.cv5 differ diff --git a/mpq/tileset/Jungle.vf4 b/mpq/tileset/Jungle.vf4 index 891abbd9..1ed1cc82 100644 Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ diff --git a/mpq/tileset/Jungle.vr4 b/mpq/tileset/Jungle.vr4 index 659a3fab..1cdb051f 100644 Binary files a/mpq/tileset/Jungle.vr4 and b/mpq/tileset/Jungle.vr4 differ diff --git a/mpq/tileset/Jungle.vx4ex b/mpq/tileset/Jungle.vx4ex index 9664285a..affc680a 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index 07f8f2c5..60a8aca0 100644 Binary files a/mpq/tileset/badlands.cv5 and b/mpq/tileset/badlands.cv5 differ diff --git a/mpq/tileset/badlands.vf4 b/mpq/tileset/badlands.vf4 index bbee88b3..a8caf088 100644 Binary files a/mpq/tileset/badlands.vf4 and b/mpq/tileset/badlands.vf4 differ diff --git a/mpq/tileset/badlands.vr4 b/mpq/tileset/badlands.vr4 index 2ca00952..0fce6118 100644 Binary files a/mpq/tileset/badlands.vr4 and b/mpq/tileset/badlands.vr4 differ diff --git a/mpq/tileset/badlands.vx4ex b/mpq/tileset/badlands.vx4ex index 32fdc45d..c7054512 100644 Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ diff --git a/mpq/tileset/ice.cv5 b/mpq/tileset/ice.cv5 index da6051cf..787c77ef 100644 Binary files a/mpq/tileset/ice.cv5 and b/mpq/tileset/ice.cv5 differ diff --git a/mpq/tileset/ice.vf4 b/mpq/tileset/ice.vf4 index f21ebb4e..08707030 100644 Binary files a/mpq/tileset/ice.vf4 and b/mpq/tileset/ice.vf4 differ diff --git a/mpq/tileset/ice.vr4 b/mpq/tileset/ice.vr4 index 775925c2..f566c36a 100644 Binary files a/mpq/tileset/ice.vr4 and b/mpq/tileset/ice.vr4 differ diff --git a/mpq/tileset/ice.vx4ex b/mpq/tileset/ice.vx4ex index d8a4b456..ce6dcb53 100644 Binary files a/mpq/tileset/ice.vx4ex and b/mpq/tileset/ice.vx4ex differ diff --git a/mpq/tileset/platform.cv5 b/mpq/tileset/platform.cv5 index 8ab4734a..4e0d64b4 100644 Binary files a/mpq/tileset/platform.cv5 and b/mpq/tileset/platform.cv5 differ diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4 index fef826aa..ab5ab794 100644 Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ diff --git a/mpq/tileset/platform.vr4 b/mpq/tileset/platform.vr4 index 1894d0d4..8c34031e 100644 Binary files a/mpq/tileset/platform.vr4 and b/mpq/tileset/platform.vr4 differ diff --git a/mpq/tileset/platform.vx4ex b/mpq/tileset/platform.vx4ex index 7f04dad0..033c5581 100644 Binary files a/mpq/tileset/platform.vx4ex and b/mpq/tileset/platform.vx4ex differ diff --git a/mpq/tileset/twilight.cv5 b/mpq/tileset/twilight.cv5 index 29ad6ecf..bad06746 100644 Binary files a/mpq/tileset/twilight.cv5 and b/mpq/tileset/twilight.cv5 differ diff --git a/mpq/tileset/twilight.vf4 b/mpq/tileset/twilight.vf4 index 677dc897..305fd009 100644 Binary files a/mpq/tileset/twilight.vf4 and b/mpq/tileset/twilight.vf4 differ diff --git a/mpq/tileset/twilight.vr4 b/mpq/tileset/twilight.vr4 index 30e5e170..0ff22274 100644 Binary files a/mpq/tileset/twilight.vr4 and b/mpq/tileset/twilight.vr4 differ diff --git a/mpq/tileset/twilight.vx4ex b/mpq/tileset/twilight.vx4ex index 7fc6081c..3ecf8313 100644 Binary files a/mpq/tileset/twilight.vx4ex and b/mpq/tileset/twilight.vx4ex differ diff --git a/plugins/aize_debug.qdp b/plugins/aize_debug.qdp index 5f68bb01..fd013a4b 100644 Binary files a/plugins/aize_debug.qdp and b/plugins/aize_debug.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 5a6e5b32..7c879b25 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ