diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 873dead7..20cf0e06 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 4b8951f5..3edbfa69 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -123,7 +123,7 @@ Aerie Zerg Beacon Terran Beacon Protoss Beacon -Dark Swarm +Carapace Swarm Flag Young Chrysalis Psi Emitter @@ -508,7 +508,7 @@ Extatus Nathrelisk Iziralisk Anchor (Grounded) -Extended Flingy #302 +Carapace Swarm (Small) Extended Flingy #303 Extended Flingy #304 Extended Flingy #305 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3549d602..5856acf0 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 b4a336e9..ad3a93d3 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 97e25329..e33397b2 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -335,7 +335,7 @@ Explosion2 (Medium) Building Explosion (Large) Terran Building Rubble (Small) Terran Building Rubble (Large) -Dark Swarm +Carapace Swarm Ragnasaur (Ash) Ragnasaur (Ash) Shadow Rhynadon (Badlands) @@ -1804,7 +1804,7 @@ Iziralisk Birth Iziralisk Remains Anchor (Grounded) Anchor (Grounded) Shadow -Extended Image #804 +Carapace Swarm (Small) Extended Image #805 Extended Image #806 Extended Image #807 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 796163fd..8e39b4d9 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 5081aa72..74d19928 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 869cab85..fd4037f1 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -284,7 +284,7 @@ Aerie Zerg Beacon Terran Beacon Protoss Beacon -Dark Swarm +Carapace Swarm Flag Young Chrysalis Psi Emitter @@ -898,7 +898,7 @@ Extatus Nathrelisk Iziralisk Anchor (Grounded) -Extended Sprite #1 +Carapace Swarm (Small) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 3736bab8..ffaf40d3 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 8ecece4a..3f5ee8fb 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -103,7 +103,7 @@ Map Revealer Protoss Augur Zerg Lakizilisk Protoss Barghest -Disruption Field +Carapace Swarm (Small) Terran Ministry Terran Comsat Station Terran Anvil @@ -200,7 +200,7 @@ Terran Iron Foundry Terran Captaincy Terran Scrapyard Protoss Crucible -Dark Swarm +Carapace Swarm Terran Nanite Assembly Zerg Kalkiir Lake Left Upper Level Door diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 87b14347..c59ae6a2 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 9937cf8a..4bf330d0 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 5068ad43..488ba4f7 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index b8469e46..e754570b 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 44b9ba35..41f2a485 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -52,7 +52,7 @@ unit_morph_prerequisites = Add(izirokor, tethzorokor, 1) unit_morph_prerequisites = Add(skithrokor, vithrilisk, 1) unit_morph_prerequisites = Add(geszithalor, alkajelisk, 1) unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1) -unit_morph_prerequisites = Add(vilgorokor, selkerilisk, 1) +unit_morph_prerequisites = Add(vilgorokor, isthrathaleth, 1) unit_morph_prerequisites = Add(matraleth, akistrokor, 1) unit_morph_prerequisites = Add(zoryusthaleth, ultrokor, 1) unit_morph_prerequisites = Add(lakizilisk, zobriolisk, 1) @@ -97,7 +97,7 @@ morph_train_ai = Add(izirokor, tethzorokor) morph_train_ai = Add(skithrokor, vithrilisk) morph_train_ai = Add(geszithalor, alkajelisk) morph_train_ai = Add(konvilisk, tetcaerokor) -morph_train_ai = Add(vilgorokor, selkerilisk) +morph_train_ai = Add(vilgorokor, isthrathaleth) morph_train_ai = Add(matraleth, akistrokor) morph_train_ai = Add(zoryusthaleth, ultrokor) morph_train_ai = Add(lakizilisk, zobriolisk) diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 3f6f490c..250c4bdf 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 03adc385..77993d6f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -1954,7 +1954,7 @@ AirAttkRpt [NONE] CastSpell MatralethCastSpell GndAttkToIdle [NONE] AirAttkToIdle [NONE] -Unused2 [NONE] +Unused2 MatralethUnused2 Walking MatralethWalking WalkingToIdle MatralethGndAttkToIdle SpecialState1 [NONE] @@ -2000,6 +2000,60 @@ MatralethUnused1: goto MatralethGndAttkToIdle MatralethCastSpell: + setvertpos 0 + playfram 0x55 + nobrkcodestart + wait 3 + playfram 0x66 + wait 3 + playfram 0x77 + playsnd 1276 # Blissful Embrace Channel + wait 3 + playfram 0x88 + wait 3 + playfram 0x77 + wait 3 + playfram 0x66 + wait 3 + playfram 0x55 + wait 3 + playfram 0x66 + wait 3 + playfram 0x77 + wait 3 + playfram 0x88 + wait 3 + playfram 0x77 + wait 3 + playfram 0x66 + wait 3 + playfram 0x55 + wait 3 + playfram 0x66 + wait 3 + playfram 0x77 + wait 3 + playfram 0x88 + wait 3 + playfram 0x77 + wait 3 + playfram 0x66 + wait 3 + playfram 0x55 + wait 3 + playfram 0x66 + wait 3 + playfram 0x77 + wait 3 + playfram 0x88 + wait 3 + castspell + sigorder 2 + nobrkcodeend + gotorepeatattk + goto MatralethGndAttkToIdle + +MatralethUnused2: setvertpos 0 playfram 0x55 nobrkcodestart @@ -36715,41 +36769,41 @@ AkistrokorCastSpell: nobrkcodestart playsnd 1276 # Blissful Embrace Channel playfram 0x100 - wait 1 + wait 3 playfram 0x120 - wait 1 + wait 3 playfram 0x140 - wait 1 + wait 3 playfram 0x160 - wait 1 + wait 3 playfram 0x180 - wait 1 + wait 3 playfram 0x1A0 - wait 1 + wait 3 playfram 0x100 - wait 1 + wait 3 playfram 0x120 - wait 1 + wait 3 playfram 0x140 - wait 1 + wait 3 playfram 0x160 - wait 1 + wait 3 playfram 0x180 - wait 1 + wait 3 playfram 0x1A0 - wait 1 + wait 3 playfram 0x100 - wait 1 + wait 3 playfram 0x120 - wait 1 + wait 3 playfram 0x140 - wait 1 + wait 3 playfram 0x160 - wait 1 + wait 3 playfram 0x180 - wait 1 + wait 3 playfram 0x1A0 - wait 1 + wait 3 castspell sigorder 2 nobrkcodeend diff --git a/mpq/unit/cm/zerg/carapace-swarm-small.grp b/mpq/unit/cm/zerg/carapace-swarm-small.grp new file mode 100644 index 00000000..b637e627 Binary files /dev/null and b/mpq/unit/cm/zerg/carapace-swarm-small.grp differ diff --git a/patchnotes.md b/patchnotes.md index 7c67959c..7ef198b9 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -345,10 +345,27 @@ Patch goals include: - Mineral and gas costs now 125/100, from 150/75 - [Konvilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/konvilisk): - Mineral and gas costs now 100/175, from 200/125 +- [Vilgorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vilgorokor): + - Mineral and gas costs now 200/75, from 250/50 + - **NEW: Reconstitution:** + - When taking direct damage, the Vilgorokor emits a small Carapace Swarm field that lasts for 5 seconds and absorbs up to 100 damage. + - Now mutates into the Isthrathaleth - [Matraleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/matraleth): - Gas cost now 125, from 100 - HP now 140, from 120 - Now moves ~15% slower + - **NEW: Blissful Embrace:** + - Now also casts this ability +- [Isthrathaleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/isthrathaleth): + - Mineral, gas, and time costs now 50/200/30, from 75/150/25 + - HP now 140, from 120 + - Armor now 3, from 4 + - Now mutates from the Vilgorokor and Ocsal Larva + - Now requires Almakis Antre, from Elthisth Mound +- [Akistrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/akistrokor): + - Gas and time costs now 175/35, from 200/40 + - Blissful Embrace: + - Channel time now 3 seconds, from 1 second - [Skortrith Cesiant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skortrith-cesiant): - Mineral, gas, and time costs now 50/50/20, from 100/0/12 - Weapon damage now 32, from 40 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index b6aaba8e..79229227 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ