diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 71f5d5fb..11e0a3d9 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 6824871c..10223ff9 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 6e8691f2..68919ab1 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 e81a99ab..beabe89f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1753,7 +1753,7 @@ Quazilisk Mutate Quazilisk Attack Overlay Sevenstep Rail Nathrokor Mutate -Extended Image #753 +Quazilisk April Fools Extended Image #754 Extended Image #755 Extended Image #756 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 7187eca6..cd9c46dd 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 212c20fd..026cfcd6 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -877,7 +877,7 @@ Philoc Quazilisk Attack Overlay Cyclops Passive Arming Overlay Sevenstep Rail -Extended Sprite #1 +Quazilisk (April Fools) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 1fb54084..d0c143c7 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 bbf4646c..16201a2d 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 91e0e6f6..a7e9abb6 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -35,7 +35,7 @@ EMP Shockwave (unused) Irradiate (Seraph ability) Claws (Zethrokor) Claws (Vorvrokor) -Plasmid Breath (Nathrokor) +Vestigial Strike (Nathrokor) Needle Spines (Hydralisk) Erebol Shock Cannon (Penumbra) Kaiser Blades (Ultrokor) @@ -202,7 +202,7 @@ Geometric Rifle (Sevenstep, Piercing) Twinstrike Cannons (Matador) Cylindrical Blaster (Analogue) Heirloom Batteries (Philoc) -Extended Weapon #75 +Nathrok Claws (Nathrokor) Extended Weapon #76 Extended Weapon #77 Extended Weapon #78 diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 655061c9..6dba4981 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 229151bf..3d5d221f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -390,7 +390,7 @@ ZergCocoonGndAttkToIdle: goto ZergCocoonWalking ZergCocoonUnused1: - # Nathrokor mutate + # unused playfram 23 wait 2 playfram 24 @@ -406,7 +406,7 @@ ZergCocoonUnused1: goto ZergCocoonWalking ZergCocoonUnused2: - # Nathrokor cancel + # unused playfram 27 wait 2 playfram 26 @@ -26273,10 +26273,10 @@ Type 12 Init NathrokorInit Death NathrokorDeath GndAttkInit NathrokorGndAttkInit -AirAttkInit NathrokorGndAttkInit +AirAttkInit NathrokorAirAttkInit Unused1 [NONE] GndAttkRpt NathrokorGndAttkInit -AirAttkRpt NathrokorGndAttkInit +AirAttkRpt NathrokorAirAttkInit CastSpell [NONE] GndAttkToIdle NathrokorGndAttkToIdle AirAttkToIdle NathrokorGndAttkToIdle @@ -26317,8 +26317,30 @@ NathrokorDeath: end NathrokorGndAttkInit: + playfram 0x100 + wait 1 + nobrkcodestart + attackmelee 3 1326 1327 1328 # Nathrokor attack 01, 02, 03 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 2 + playfram 0x140 + wait 2 + playfram 0x120 + wait 2 + playfram 0x100 + wait 1 + nobrkcodeend + gotorepeatattk + goto NathrokorGndAttkToIdle + +NathrokorAirAttkInit: playsndbtwn 1326 1328 # Nathrokor attack 01, 02, 03 - attackwith 1 + attackwith 2 + attackwith 2 wait 2 gotorepeatattk goto NathrokorGndAttkToIdle @@ -34267,45 +34289,45 @@ QuaziliskLocal00: goto QuaziliskLocal00 QuaziliskLocal01: - playfram 0x88 + playfram 0x100 wait 1 turnccwise 1 - playfram 0x77 + playfram 0xE0 wait 1 turnccwise 1 - playfram 0x66 + playfram 0xC0 wait 1 turnccwise 1 - playfram 0x77 + playfram 0xE0 wait 1 turnccwise 1 - playfram 0x88 + playfram 0x100 wait 1 turnccwise 1 goto QuaziliskGndAttkToIdle QuaziliskLocal02: - playfram 0x88 + playfram 0x100 wait 1 turncwise 1 - playfram 0x77 + playfram 0xE0 wait 1 turncwise 1 - playfram 0x66 + playfram 0xC0 wait 1 turncwise 1 - playfram 0x77 + playfram 0xE0 wait 1 turncwise 1 - playfram 0x88 + playfram 0x100 wait 1 turncwise 1 goto QuaziliskGndAttkToIdle QuaziliskLocal03: - playfram 0x88 + playfram 0x100 wait 1 - playfram 0x77 + playfram 0xE0 randcondjmp 85 QuaziliskLocal04 goto QuaziliskLocal06 @@ -34350,26 +34372,26 @@ QuaziliskLocal05: QuaziliskLocal06: waitrand 8 20 - playfram 0x88 + playfram 0x100 wait 1 goto QuaziliskGndAttkToIdle QuaziliskDeath: playsndbtwn 1707 1708 # Quazilisk death 01, 02 setfldirect 0 - playfram 357 + playfram 672 wait 2 - playfram 358 + playfram 673 wait 2 - playfram 359 + playfram 674 wait 2 - playfram 360 + playfram 675 wait 2 - playfram 361 + playfram 676 wait 2 - playfram 362 + playfram 677 wait 2 - playfram 363 + playfram 678 wait 2 lowsprul 814 0 0 # Quazilisk Remains wait 1 @@ -34390,24 +34412,22 @@ QuaziliskUnused1: goto QuaziliskGndAttkToIdle QuaziliskGndAttkInit: - playfram 0x110 + playfram 0x200 QuaziliskGndAttkRpt: wait 1 nobrkcodestart - playfram 0x121 + playfram 0x200 playsndbtwn 1329 1331 # Quazilisk attack 01, 02, 03 imgol 1752 0 0 # Quazilisk Attack Overlay attack wait 1 - playfram 0x132 + playfram 0x220 wait 1 - playfram 0x143 + playfram 0x240 wait 1 - playfram 0x132 + playfram 0x220 wait 1 - playfram 0x121 - wait 1 - playfram 0x110 + playfram 0x200 nobrkcodeend gotorepeatattk goto QuaziliskGndAttkToIdle @@ -34415,32 +34435,32 @@ QuaziliskGndAttkRpt: QuaziliskWalking: move 5 wait 1 - playfram 0x11 + playfram 0x20 move 5 wait 1 - playfram 0x22 + playfram 0x40 move 5 wait 1 - playfram 0x33 + playfram 0x60 move 5 wait 1 - playfram 0x44 + playfram 0x80 move 5 wait 1 - playfram 0x55 + playfram 0xA0 move 5 wait 1 - playfram 0x66 + playfram 0xC0 move 5 wait 1 - playfram 0x77 + playfram 0xE0 move 5 wait 1 - playfram 0x88 + playfram 0x100 goto QuaziliskWalking QuaziliskSpecialState2: - playfram 0xff + playfram 0x1E0 goto QuaziliskLocal07 QuaziliskLocal07: @@ -34449,17 +34469,17 @@ QuaziliskLocal07: QuaziliskBurrow: imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0x99 + playfram 0x140 wait 1 - playfram 0xaa + playfram 0x160 wait 1 - playfram 0xbb + playfram 0x180 wait 1 - playfram 0xdd + playfram 0x1A0 wait 1 - playfram 0xee + playfram 0x1C0 wait 1 - playfram 0xff + playfram 0x1E0 sigorder 4 goto QuaziliskLocal07 @@ -34467,15 +34487,15 @@ QuaziliskUnBurrow: wait 1 waitrand 1 4 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) - playfram 0xee + playfram 0x1C0 wait 1 - playfram 0xdd + playfram 0x1A0 wait 1 - playfram 0xbb + playfram 0x180 wait 1 - playfram 0xaa + playfram 0x160 wait 1 - playfram 0x99 + playfram 0x140 wait 1 sigorder 4 goto QuaziliskGndAttkToIdle @@ -45398,11 +45418,9 @@ SundogGndAttkInit: nobrkcodestart playsndbtwn 1148 1153 # Sundog weapon fire 01, 02, 03, 04, 05, 06 attackwith 1 - attackwith 1 wait 4 playsndbtwn 1148 1153 # Sundog weapon fire 01, 02, 03, 04, 05, 06 attackwith 1 - attackwith 1 nobrkcodeend gotorepeatattk goto SundogLocal00 @@ -51829,13 +51847,13 @@ Death ScourgeExplosionDeath QuaziliskAttackOverlayInit: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 wait 1 - playfram 0x33 + playfram 0x60 wait 1 - playfram 0x44 + playfram 0x80 wait 1 end diff --git a/mpq/unit/cm/celebrations/aprilfools/quazilisk.grp b/mpq/unit/cm/celebrations/aprilfools/quazilisk.grp new file mode 100644 index 00000000..87eb9cf1 Binary files /dev/null and b/mpq/unit/cm/celebrations/aprilfools/quazilisk.grp differ diff --git a/mpq/unit/cm/zerg/nathrokor-birth.grp b/mpq/unit/cm/zerg/nathrokor-birth.grp index df86a890..9d52c8da 100644 Binary files a/mpq/unit/cm/zerg/nathrokor-birth.grp and b/mpq/unit/cm/zerg/nathrokor-birth.grp differ diff --git a/mpq/unit/cm/zerg/nathrokor-mutate.grp b/mpq/unit/cm/zerg/nathrokor-mutate.grp index ed94e4d9..702d17fa 100644 Binary files a/mpq/unit/cm/zerg/nathrokor-mutate.grp and b/mpq/unit/cm/zerg/nathrokor-mutate.grp differ diff --git a/mpq/unit/cm/zerg/nathrokor.grp b/mpq/unit/cm/zerg/nathrokor.grp index ed85b98f..13dd4acd 100644 Binary files a/mpq/unit/cm/zerg/nathrokor.grp and b/mpq/unit/cm/zerg/nathrokor.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-attack.grp b/mpq/unit/cm/zerg/quazilisk-attack.grp index 63ffe75c..3a38f1ba 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-attack.grp and b/mpq/unit/cm/zerg/quazilisk-attack.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk-shadow.grp b/mpq/unit/cm/zerg/quazilisk-shadow.grp index c6b92b92..4d50f42b 100644 Binary files a/mpq/unit/cm/zerg/quazilisk-shadow.grp and b/mpq/unit/cm/zerg/quazilisk-shadow.grp differ diff --git a/mpq/unit/cm/zerg/quazilisk.grp b/mpq/unit/cm/zerg/quazilisk.grp index 150dba67..157d1cba 100644 Binary files a/mpq/unit/cm/zerg/quazilisk.grp and b/mpq/unit/cm/zerg/quazilisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 820d2e57..ac1b3445 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 7c7afc90..b75d6250 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 acc3639e..a1ed1797 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 8dbb48eb..bc70a9a6 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 9cbd4084..27f6560b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ