diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index af88ef1a..28ba659a 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 f487d9bc..07cad901 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -25,7 +25,7 @@ Gathtelosk Caphrolosk Surkith Colony Vithrath Haunt -Sovthrath Mound +Rakzogth Roost Matravil Nest Nydus Cesiant Overmind With Shell @@ -634,7 +634,7 @@ Intendent Electricity Askosi Construction (Large) Askosi Construction (Medium) Askosi Construction (Small) -Extended Flingy #428 +Ogroszaleth Extended Flingy #429 Extended Flingy #430 Extended Flingy #431 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index f957cd64..efc217b0 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 0f1b9a7e..de4f4f3f 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 d45aa518..8922c764 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -80,8 +80,8 @@ Mature Chrysalis Mature Chrysalis Shadow Tosvrol Haunt Tosvrol Haunt Shadow -Sovthrath Mound -Sovthrath Mound Shadow +Rakzogth Roost +Rakzogth Roost Shadow Matravil Nest Matravil Nest Shadow Nydus Cesiant @@ -2240,12 +2240,12 @@ Askosi Construction (Medium) Askosi Construction (Medium) Shadow Askosi Construction (Small) Askosi Construction (Small) Shadow -Extended Image #1240 -Extended Image #1241 -Extended Image #1242 -Extended Image #1243 -Extended Image #1244 -Extended Image #1245 +Ogroszaleth +Ogroszaleth Shadow +Impact Dissipation (Small) +Impact Dissipation (Medium) +Impact Dissipation (Large) +Impact Dissipation (XLarge) Extended Image #1246 Extended Image #1247 Extended Image #1248 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 27c8d0ab..4b8be988 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 5b05eb17..d438f416 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -170,7 +170,7 @@ Gathtelosk Caphrolosk Surkith Colony Vithrath Haunt -Sovthrath Mound +Rakzogth Roost Matravil Nest Nydus Cesiant Overmind With Shell @@ -1086,7 +1086,7 @@ Intendent Electricity Askosi Construction (Large) Askosi Construction (Medium) Askosi Construction (Small) -Extended Sprite #572 +Ogroszaleth Extended Sprite #573 Extended Sprite #574 Extended Sprite #575 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 3202f70f..0152b519 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 3101d34a..c1a0a453 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -134,7 +134,7 @@ Zerg Caphrolosk Zerg Gathtelosk Zerg Nydus Cesiant Zerg Hydrith Den -Zerg Elthisth Mound +Zerg Rakzogth Roost Terran Olympian Zerg Matravil Nest Zerg Almakis Antre @@ -301,7 +301,7 @@ Terran Throneroom Terran Emperor Terran Jester Zerg Agrileth -Zerg Rakzogth Roost +unused Protoss Sequestered Icon Protoss Unitary Union Protoss Servitor @@ -546,7 +546,7 @@ Askosi Crematorium Askosi Zylode Askosi Astrolabe Terran Serathiel (Hecaton) -Extended Unit #321 +Zerg Malkothrokor Extended Unit #322 Extended Unit #323 Extended Unit #324 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 68d02d2d..f928cf6e 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 9e332a94..90389a9e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -59,7 +59,7 @@ Twintorch (Dyad) Screaming Venom 2 (Keskathalor) Carapace Swarm (Isthrathaleth ability) Plague (Isthrathaleth ability) -Consume (unused ability) +Acid Barrage (Ogroszaleth) Particle Beam (Scribe) Particle Beam (Harvest) Phase Blades (Zealot) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index c4324bbe..01479e91 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 a5a66874..d321d384 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 588c6362..30e5026d 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -928,10 +928,10 @@ Must target enemy units or allied embedded units.<0> ¤<3>Ultrokors <1>are enabled from Zoryusthaleths.<0> ¤<3>Zobriolisks <1>are enabled from Lakizilisks.<0> ¤<3>Zarcavrokors <1>are enabled from Gorgrokors.<0> -<0> -<0> -<0> -<0> +r<1><4>Morph into Rakzilisk <1>(<3>Q<1>)<10>Ground control strain.<0> +Rakzilisk requires:<10> Rakzogth Roost<0> +r<1><4>Morph into Ogroszaleth <1>(<3>Q<1>)<10>Area-denial strain.<0> +Ogroszaleth requires:<10> Rakzogth Roost<0> <0> <0> <0> @@ -1391,12 +1391,12 @@ Sentinel requires:<10> Atlas<0> ¤<3><4>Kinetic Penetration <2>(passive)<10>This combatant's projectiles travel to maximum range, piercing targets with insufficient armor, and becoming intercepted by targets with more armor. Additional victims take half damage.<0> <0> ¤<3><4>Pulsing Attack <2>(passive)<10>This combatant's attacks radiate out from their own position.<0> -<0> -<0> +s<1><4>Mutate into Rakzogth Roost <1>(<3>S<1>)<10>Crowd control node. Enables Ogroszaleths.<0> +Rakzogth Roost requires:<10> Othstol Oviform<0> ¤<3><4>Prolonged Arms <2>(passive)<10>This combatant's projectiles travel to maximum range, and can be intercepted by hostiles.<0> a<1><4>Mutate into Alkaj Chasm <1>(<3>A<1>)<10>Siege node. Enables Alkajelisks.<0> Geszkath Grotto requires:<10> Othstol Oviform<0> -s<1><4>Mutate into Geszkath Grotto <1>(<3>S<1>)<10>Siege node. Enables Keskathalors, Geszithalors, and Alkajelisks.<0> +s<1><4>Mutate into Geszkath Grotto <1>(<3>S<1>)<10>Siege node. Enables Keskathalors and Geszithalors.<0> Nathrokors Require:<10> Vornath Pond<0> r<1><4>Morph into Nathrokors <1>(<3>R<1>)<10>Swarming fighter strain.<0> ¤<3><4>Module: Entropy Gauntlets <2>(passive)<10>Savants with this module active are mobile, and benefit from Kinetic Penetration.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 6696947b..4e852bfb 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index a346588a..02f30ac9 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2604,4 +2604,38 @@ AskosiConstruction_Small_SpecialState1: AskosiConstruction_Small_SpecialState2: playfram 2 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 976 Optical Flare Hit (Small) (thingy\TmeFlshS.grp) +# 977 Optical Flare Hit (Medium) (thingy\TmeFlshM.grp) +# 978 Optical Flare Hit (Large) (thingy\TmeFlshL.grp) +.headerstart +IsId 32 +Type 1 +Init OpticalFlareHitInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +OpticalFlareHitInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + goto Generic_Wait1End \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index e69ed25b..69d94ae8 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 ca07aadc..1f82f29b 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -3772,12 +3772,12 @@ TosvrolHauntIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 082 ElthisthMound (zerg\Mutapit.grp) +# 082 Rakzogth Roost (zerg\Mutapit.grp) .headerstart IsId 49 Type 20 -Init ElthisthMoundInit -Death ElthisthMoundDeath +Init RakzogthRoostInit +Death RakzogthRoostDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -3791,22 +3791,22 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt ElthisthMoundAlmostBuilt -Built ElthisthMoundBuilt +AlmostBuilt RakzogthRoostAlmostBuilt +Built RakzogthRoostBuilt Landing [NONE] LiftOff [NONE] -IsWorking ElthisthMoundIsWorking -WorkingToIdle ElthisthMoundWorkingToIdle +IsWorking RakzogthRoostIsWorking +WorkingToIdle RakzogthRoostWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -ElthisthMoundInit: - imgul 83 0 0 # Elthisth Mound Shadow (zerg\zmhShad.grp) +RakzogthRoostInit: + imgul 83 0 0 # Rakzogth Roost Shadow (zerg\zmhShad.grp) playfram 0x00 - goto ElthisthMoundWorkingToIdle + goto RakzogthRoostWorkingToIdle -ElthisthMoundWorkingToIdle: +RakzogthRoostWorkingToIdle: playfram 1 wait 2 playfram 2 @@ -3819,9 +3819,9 @@ ElthisthMoundWorkingToIdle: wait 2 playfram 0x00 wait 3 - goto ElthisthMoundWorkingToIdle + goto RakzogthRoostWorkingToIdle -ElthisthMoundDeath: +RakzogthRoostDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) wait 3 @@ -3829,14 +3829,14 @@ ElthisthMoundDeath: wait 1 end -ElthisthMoundAlmostBuilt: +RakzogthRoostAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) -ElthisthMoundBuilt: +RakzogthRoostBuilt: playfram 0x00 wait 2 - goto ElthisthMoundWorkingToIdle + goto RakzogthRoostWorkingToIdle -ElthisthMoundIsWorking: +RakzogthRoostIsWorking: playfram 4 wait 2 playfram 5 @@ -3857,7 +3857,7 @@ ElthisthMoundIsWorking: wait 3 playfram 5 wait 2 - goto ElthisthMoundIsWorking + goto RakzogthRoostIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -7462,7 +7462,6 @@ KeskathalorBurrow: KeskathalorUnBurrow: wait 1 - waitrand 1 2 setfldirect 14 imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) playfram 0x66 @@ -17422,4 +17421,147 @@ AzanthrokorWalking: wait 1 playfram 0x00 wait 1 - goto AzanthrokorWalking \ No newline at end of file + goto AzanthrokorWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2242 Ogroszaleth (cm\zerg\ogroszaleth.grp) +.headerstart +IsId 836 +Type 26 +Init OgroszalethInit +Death OgroszalethDeath +GndAttkInit OgroszalethGndAttkInit +AirAttkInit OgroszalethGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt OgroszalethGndAttkInit +AirAttkRpt OgroszalethGndAttkInit +CastSpell SkryrokorLocal00 +GndAttkToIdle OgroszalethGndAttkToIdle +AirAttkToIdle OgroszalethGndAttkToIdle +Unused2 [NONE] +Walking OgroszalethWalking +WalkingToIdle OgroszalethGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 OgroszalethSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow OgroszalethBurrow +UnBurrow OgroszalethUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +OgroszalethInit: + imgulnextid 0 0 # Ogroszaleth Shadow (cm\zerg\ogroszaleth.grp) + playfram 0x00 + wait 2 + goto SkryrokorLocal00 + +OgroszalethGndAttkToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +OgroszalethDeath: + playsnd 878 # Zerg\Ultra\ZUlDth00.WAV + imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) + wait 1 + lowsprul 186 0 42 # Zerg Building Rubble Small + wait 1 + end + +OgroszalethGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x22 + wait 1 + playfram 0x44 + playsndbtwn 1316 1318 # Kalkalisk attack 01, 02, 03 + attackwith 1 + wait 1 + playfram 0x22 + nobrkcodeend + gotorepeatattk + goto OgroszalethGndAttkToIdle + +OgroszalethWalking: + playfram 0x11 + wait 1 + move 4 + playfram 0x22 + wait 1 + move 4 + playfram 0x33 + wait 1 + move 4 + playfram 0x44 + wait 1 + move 4 + playfram 0x55 + wait 1 + move 4 + playfram 0x66 + wait 1 + move 4 + playfram 0x77 + wait 1 + move 4 + playfram 0x88 + wait 1 + move 4 + playfram 0x00 + wait 1 + move 4 + goto OgroszalethWalking + +OgroszalethSpecialState2: + playfram 0x88 + goto SkryrokorLocal00 + +OgroszalethBurrow: + setfldirect 14 + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x55 + wait 1 + playfram 0x66 + wait 1 + playfram 0x88 + wait 1 + sigorder 4 + goto SkryrokorLocal00 + +OgroszalethUnBurrow: + wait 1 + setfldirect 14 + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playfram 0x66 + wait 1 + playfram 0x55 + wait 1 + playfram 0x44 + wait 1 + playfram 0x33 + wait 1 + playfram 0x22 + wait 1 + playfram 0x11 + wait 1 + sigorder 4 + goto OgroszalethGndAttkToIdle \ No newline at end of file diff --git a/mpq/unit/cm/zerg/ogroszaleth-shadow.grp b/mpq/unit/cm/zerg/ogroszaleth-shadow.grp new file mode 100644 index 00000000..4431b437 Binary files /dev/null and b/mpq/unit/cm/zerg/ogroszaleth-shadow.grp differ diff --git a/mpq/unit/cm/zerg/ogroszaleth.grp b/mpq/unit/cm/zerg/ogroszaleth.grp new file mode 100644 index 00000000..401293f4 Binary files /dev/null and b/mpq/unit/cm/zerg/ogroszaleth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 919b0cc1..c664643c 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 a00df190..88e6e4e2 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/thingy/tileset/platform/Dish02.grp b/mpq/unit/thingy/tileset/platform/Dish02.grp index 2206d9d8..5a6b214e 100644 Binary files a/mpq/unit/thingy/tileset/platform/Dish02.grp and b/mpq/unit/thingy/tileset/platform/Dish02.grp differ diff --git a/mpq/unit/thingy/tileset/platform/Dish03.grp b/mpq/unit/thingy/tileset/platform/Dish03.grp index 41e20d6b..b8241be3 100644 Binary files a/mpq/unit/thingy/tileset/platform/Dish03.grp and b/mpq/unit/thingy/tileset/platform/Dish03.grp differ diff --git a/mpq/unit/thingy/tileset/platform/dish01.grp b/mpq/unit/thingy/tileset/platform/dish01.grp index e3a5d1bb..3ca81872 100644 Binary files a/mpq/unit/thingy/tileset/platform/dish01.grp and b/mpq/unit/thingy/tileset/platform/dish01.grp differ diff --git a/mpq/unit/zerg/elthisth-mound-damage.lof b/mpq/unit/zerg/rakzogth-roost-damage.lof similarity index 100% rename from mpq/unit/zerg/elthisth-mound-damage.lof rename to mpq/unit/zerg/rakzogth-roost-damage.lof diff --git a/mpq/unit/zerg/elthisth-mound-shadow.grp b/mpq/unit/zerg/rakzogth-roost-shadow.grp similarity index 100% rename from mpq/unit/zerg/elthisth-mound-shadow.grp rename to mpq/unit/zerg/rakzogth-roost-shadow.grp diff --git a/mpq/unit/zerg/elthisth-mound.grp b/mpq/unit/zerg/rakzogth-roost.grp similarity index 100% rename from mpq/unit/zerg/elthisth-mound.grp rename to mpq/unit/zerg/rakzogth-roost.grp diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 226f45a7..79f00a10 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ