diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index d836a86c..188d3a98 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 aa4ee148..d3f15bdf 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 fc4ff6a0..ea93e42e 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 96677efe..94a43676 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1881,8 +1881,8 @@ Demiurge Worship Proc Large Demiurge Worship Proc XLarge Demiurge Worship Overlay XLarge Mind Tyrant Tyranny Cast Overlay -Extended Image #881 -Extended Image #882 +Sasyrvoleth +Sasyrvoleth Shadow Extended Image #883 Extended Image #884 Extended Image #885 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 8eaf98f2..d06d5484 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 35ca7b88..3e13a8dc 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -915,7 +915,7 @@ Magnetar Law of Attraction 2 Magnetar Law of Attraction 3 Positron Projectile Binding Plasma Overlay -Extended Sprite #1 +Sasyrvoleth Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 1508c5bc..913edf2c 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 54173d93..0cef6687 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -405,7 +405,7 @@ Zerg Iziralisk Faction Selection Protoss Faction Selection Zerg Terran Anchor (Grounded) -Extended Unit #180 +Zerg Sasyrvoleth Extended Unit #181 Extended Unit #182 Extended Unit #183 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 06ddbd13..140458ca 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 2264e2fd..0e7c8deb 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 67a55767..d36dccbd 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index cc6014ff..f9c2e481 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index ecdb3113..a2e3d069 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 84ae9723..35d3fd9a 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -2,7 +2,7 @@ # This is a PyAI version of UNITDEF.INI made by Gold Dragon, used by ScAIEdit III # Initially modified to include all unit, upgrade, and tech entries. -# Further modified by Veeq7 & Pr0nogo for Cosmonarchy BW +# Further modified by Veeq7 & Pr0nogo for Cosmonarchy # https://www.fraudsclub.com/cosmonarchy-bw/ # AI IDs @@ -248,12 +248,12 @@ building synthetic_synod = 171 # Protoss NGS buildings building artisan = 182 +building prudence = 184 # building automaton_register = 158 building prostration_stage = 159 building rogue_gallery = 161 building argosy = 168 -building astral_omen = 184 building crucible = 201 building ardent_authority = 220 building pennant = 221 @@ -328,6 +328,7 @@ military begrothilisk = 324 military oztukrokor = 325 military kethrostalor = 326 military rakzilisk = 327 +military sasyrvoleth = 407 # Zerg misc military larva = 35 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 3b999822..649480f2 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 02f927e6..73efab21 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -39697,6 +39697,85 @@ ArcliteShockCannonHitDamagelessSilentDeath: playfram 13 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1462 Dermal Accelerant (Small) (cm\zerg\dermalaccelerant-small.grp) +# 1463 Dermal Accelerant (Medium) (cm\zerg\dermalaccelerant-medium.grp) +# 1464 Dermal Accelerant (Large) (cm\zerg\dermalaccelerant-large.grp) +# 1465 Dermal Accelerant (XLarge) (cm\zerg\dermalaccelerant-xlarge.grp) +.headerstart +IsId 634 +Type 1 +Init DermalAccelerantInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +DermalAccelerantInit: + playfram 0x00 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + 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 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + playfram 21 + wait 1 + playfram 22 + wait 1 + playfram 23 + wait 1 + playfram 24 + wait 1 + playfram 25 + wait 1 + playfram 26 + wait 1 + playfram 27 + wait 1 + playfram 28 + wait 1 + playfram 29 + wait 1 + goto DermalAccelerantInit # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51480,7 +51559,97 @@ MindTyrantTyrannyCastOverlayInit: playfram 27 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1883 Sasyrvoleth (cm\zerg\sasyrvoleth.grp) +.headerstart +IsId 789 +Type 12 +Init SasyrvolethInit +Death SasyrvolethDeath +GndAttkInit SasyrvolethGndAttkInit +AirAttkInit SasyrvolethGndAttkInit +Unused1 [NONE] +GndAttkRpt SasyrvolethGndAttkInit +AirAttkRpt SasyrvolethGndAttkInit +CastSpell [NONE] +GndAttkToIdle SasyrvolethWalkingToIdle +AirAttkToIdle SasyrvolethWalkingToIdle +Unused2 [NONE] +Walking SasyrvolethWalking +WalkingToIdle SasyrvolethWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SasyrvolethInit: + imgul 1884 0 42 # Sasyrvoleth Shadow (cm\zerg\sasyrvoleth.grp) + playfram 0x00 + wait 2 +SasyrvolethWalkingToIdle: + playfram 0x20 + wait 2 + playfram 0x40 + wait 2 + playfram 0x60 + wait 2 + playfram 0x80 + wait 2 + playfram 0xA0 + wait 2 + playfram 0xC0 + wait 2 + playfram 0xE0 + wait 2 + goto SasyrvolethWalkingToIdle + +SasyrvolethDeath: + playsnd 852 # Zerg\Guardian\ZGuDth00.WAV + imgol 28 0 0 # Geszithalor Death (zerg\zguDeath.grp) + wait 1 + lowsprul 848 0 42 # Zerg Unit Rubble Medium + wait 1 + end + +SasyrvolethGndAttkInit: + nobrkcodestart + playsndbtwn 1295 1296 # Sasyrvoleth weapon fire 01, 02 + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 + attackwith 1 + playsndbtwn 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 1 + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + nobrkcodeend + gotorepeatattk + goto SasyrvolethWalkingToIdle + +SasyrvolethWalking: + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x60 + wait 1 + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + playfram 0xE0 + wait 1 + goto SasyrvolethWalking -## Next free IsId: 788 - -## Next free IsId: 789 \ No newline at end of file +## Next free IsId: 790 \ No newline at end of file diff --git a/mpq/unit/cm/zerg/sasyrvoleth.grp b/mpq/unit/cm/zerg/sasyrvoleth.grp new file mode 100644 index 00000000..19aff2b9 Binary files /dev/null and b/mpq/unit/cm/zerg/sasyrvoleth.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index f60d59c1..5a12295e 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 baf9b0cc..92e508f3 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 e08f7005..f303eae3 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 fc27f9d5..bde92851 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 6e7f84ed..11517f62 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -234,5 +234,10 @@ Cosmonarchy is firmly in the best spot it's ever been, and we intend to keep pus - Time cost 25 » 20 - Weapon cooldown 0.92 » 0.83 - *This unit received an indirect nerf from the Crushing Tide bugfix, so these changes take that into account, while also improving their accessibility.* +- [Mortothrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mortothrokor): + - Gas and time costs 75/25 » 25/24 +- **NEW:** [Sasyrvoleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sasyrvoleth): + - Sustaining support strain that gives nearby allies lifesteal + - Morphed from Larva; Requires Axtoth Axis - [Vornath Pond](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vornath-pond): - Mineral and gas costs 50/100 » 75/75 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 98232a08..8bd8b194 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ