diff --git a/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx b/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx index 7d494cf2..a618912f 100644 Binary files a/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx and b/CMBW-maps/melee/FFA Solo/(5)Magmaticus.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 7957ebf7..71f5d5fb 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 e235fe31..6824871c 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 904eb082..6e8691f2 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 3078af7e..e81a99ab 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1752,7 +1752,7 @@ Radial Explosion (Green) Quazilisk Mutate Quazilisk Attack Overlay Sevenstep Rail -Extended Image #752 +Nathrokor Mutate Extended Image #753 Extended Image #754 Extended Image #755 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 01af7ea2..0c18aa32 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 6f596281..b54f3988 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -366,7 +366,7 @@ Zerg Ezigrisant Terran Wellbore Protoss Pennant Police Intern -BTN Police Structure - Basic +BTN Mixed Scribe Training BTN Police Structure - Advanced Police Dugout Terran Matador (Cinder Mode) diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index c694b91d..d58012c1 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 8df2d059..b7ac2cb5 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 89e53615..b0fb46bb 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -312,7 +312,7 @@ Unused1 ZergCocoonUnused1 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell ZergCocoonCastSpell -GndAttkToIdle [NONE] +GndAttkToIdle ZergCocoonGndAttkToIdle AirAttkToIdle [NONE] Unused2 ZergCocoonUnused2 Walking ZergCocoonWalking @@ -385,6 +385,10 @@ ZergCocoonSpecialState2: sigorder 4 goto InfestedTerranLocal00 +ZergCocoonGndAttkToIdle: + wait 1 + goto ZergCocoonWalking + ZergCocoonUnused1: # Nathrokor mutate playfram 23 @@ -51769,10 +51773,6 @@ ZergMutateInit: playfram 0x00 goto InfestedTerranLocal00 -ZergMutateDeath: - wait 1 - end - ZergMutateUnused: wait 1 nobrkcodestart @@ -51865,5 +51865,68 @@ SevenstepRailDeath: domissiledmg wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1754 Nathrokor Mutate (cm\zerg\nathrokor-mutate.grp) +.headerstart +IsId 757 +Type 13 +Init ZergMutateAirInit +Death EggDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 ZergMutateAirUnused +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 ZergMutateAirSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +ZergMutateAirInit: + playfram 0x00 + goto InfestedTerranLocal00 + +ZergMutateAirUnused: + wait 1 + nobrkcodestart + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0 + wait 2 + sigorder 4 + wait 2 + nobrkcodeend + goto InfestedTerranLocal00 + +ZergMutateAirSpecialState1: + playfram 0 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + waitrand 1 3 + sigorder 8 + goto InfestedTerranLocal00 -# Next free isid: 757 \ No newline at end of file +# Next free isid: 758 \ No newline at end of file diff --git a/mpq/unit/cm/zerg/nathrokor-birth.grp b/mpq/unit/cm/zerg/nathrokor-birth.grp index 8c3e7225..df86a890 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 new file mode 100644 index 00000000..ed94e4d9 Binary files /dev/null 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 54660d1e..ed85b98f 100644 Binary files a/mpq/unit/cm/zerg/nathrokor.grp and b/mpq/unit/cm/zerg/nathrokor.grp differ diff --git a/patchnotes.md b/patchnotes.md index 20767689..9f1fc6e1 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,21 +1,30 @@ -# 5 August 2023 -- prospective patch notes +# 6 August 2023 -- prospective patch notes ## Designer's Notes -TBD +More rebalancings, more new sprites, more bugfixes, and a more useful patch description when I'm not sleepy! ## Latest content -TBD +- [Pr0totype #17 - Wiggle No Longer](https://youtu.be/vzT1jlksd4o) +- [Daily castovers continue...](https://www.youtube.com/playlist?list=PLACFHAM2MlxPpMqYiRo1XyklxcrWWUhnl) + - [Alexhandr vs benno](https://youtu.be/tLUDuxJJvZs) + - [The Shambler vs benno](https://youtu.be/F2pvUWRELfE) + - [Solstice vs The Shambler](https://youtu.be/0r-8BohFFhs) + - [neblime vs Alexhandr](https://youtu.be/_UNjFIOP0AU) + - [DF vs neblime](https://youtu.be/EFKu20RjFTM) + - Btyb88 vs Alexhandr, [part 1](https://youtu.be/_tstnApmDb0) and [part 2](https://youtu.be/fg18cMzKVIs) +- [Fraudarchy 5 August 2023](https://youtube.com/live/e0Eim1Vve_Q) ## UI - Added a new config option for always showing condensed selections (c. DF) - When holding shift (or when config - always_show_extended_tooltips is set to true), weapon tooltips now display approximate ranges with a circle - This is **not** 100% consistent with weapon ranges; we will improve this feature in time! +- It is now possible to train Scribes when selecting Nexuses and Embassies together ## Audiovisuals: - New sprite: - - Liiralisk (c. Solstice) + - Nathrokor, Liiralisk (c. Solstice) - Updated sprite: - Quazilisk (c. Solstice) - Updated icon: @@ -26,12 +35,13 @@ TBD ## Bugfixes - Stability: - Fixed another nullsprite crash (r. Alexhandr) - - Scenarios: Fixed a trigger-related crash when removing units (r. StratosTygo) + - Fixed a few crashes related to removing units via triggers (r. StratosTygo) - Gameplay: - Structures can no longer spawn trained units on different height levels based on rally point (c. Veeq7) - Attacks with the "go to max range" behavior now calculate max ranges more accurately (c. Veeq7) - Hippogriffs no longer miss their target while at max range (c. Veeq7) - Anciles no longer protect against friendly "go to max range" projectiles when those projectiles kill their target + - Anthelions can no longer damage undetected hidden enemies (r. IskatuMesk) - Fixed Sevenstep projectile movement being slower than intended - Town centers are no longer placeable near Vespene Ridges in quasifog (r. Mystery Meat) - Audiovisuals: @@ -55,6 +65,10 @@ TBD - [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): - HP now 160, from 180 - Armor now 3, from 2 +- [Hippogriff](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/hippogriff): + - Weapon cooldown now 2.5, from 2.25 + - Weapon range now 13, from 15 + - Turn rate now 6, from 12 (matches Minotaur) - [Quarry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/quarry): - Collision size adjusted to make right-side resource returns more elegant - [Treasury](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/treasury): @@ -78,4 +92,8 @@ TBD - [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor): - Armor penetration now 0, from 1 - Weapon cooldown now 0.5, from 0.42 - - Weapon splash radii now 20/30/40, from 30/37/45 (pixels) \ No newline at end of file + - Weapon splash radii now 20/30/40, from 30/37/45 (pixels) +- [Alkajelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkajelisk): + - Turn rate now 8, from 12 +- [Alkaj Chasm](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkaj-chasm): + - Mineral and gas costs now 500/700, from 400/800 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f6e56c58..d406e6cb 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ