diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index adb3058c..357ccfec 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh b/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh index 931740cc..58db93bd 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 89d45e9d..61ebcc6d 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 ea4d69e7..52d2cac8 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -160,7 +160,7 @@ Yamato Gun Phase Disruptor STA/STS Cannon Overlay Sunken Colony Tentacle -Venom (Unused Zerg Weapon) +Venom Acid Spore Plasma Drip Hit (Unused) Glave Wurm @@ -472,7 +472,7 @@ Hammerfall Beacon Zarcavrokor Bone Cyprian Rail Sentinel Rail -Extended Flingy #266 +Bactalisk Acid Extended Flingy #267 Extended Flingy #268 Extended Flingy #269 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3453c0a9..b35aba20 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 cc7379ea..fbd6ebe0 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 4e9dbc57..51a51308 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1718,7 +1718,7 @@ Hammerfall Beacon Zarcavrokor Bone Cyprian Rail Sentinel Rail -Extended Image #718 +Bactalisk Acid Extended Image #719 Extended Image #720 Extended Image #721 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a5d7fb0e..41ab682a 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 7f05af4b..94c9d2e4 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -854,7 +854,7 @@ Hammerfall Beacon Zarcavrokor Bone Cyprian Rail Sentinel Rail -Extended Sprite #1 +Bactalisk Acid Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 8fe0847e..aca2cd12 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 df2f4515..82531c4f 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 77057833..67f51dba 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -51972,6 +51972,7 @@ ZarcavrokorBoneDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1718 Cyprian Rail (cm\terran\cyprian-rail.grp) +# 1719 Sentinel Rail (cm\terran\sentinel-rail.grp) .headerstart IsId 733 Type 2 @@ -52003,4 +52004,57 @@ OmniBulletOneBlueDeath: imgol 1249 0 0 # Burst Lasers Blue Impact (thingy\elbHit.grp) domissiledmg wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1720 Bactalisk Acid (cm\zerg\bactalisk-acid.grp) +.headerstart +IsId 734 +Type 13 +Init BactaliskAcidInit +Death BactaliskAcidDeath +GndAttkInit BactaliskAcidGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 BactaliskAcidSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +BactaliskAcidInit: + playfram 0x00 + wait 1 + sigorder 1 + playfram 0x20 + wait 1 +BactaliskAcidGndAttkInit: + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + goto BactaliskAcidGndAttkInit + +BactaliskAcidDeath: + playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) + domissiledmg + wait 1 + end + +BactaliskAcidSpecialState1: + playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav + sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) + domissiledmg + goto Venom_Unused_GndAttkInit \ No newline at end of file diff --git a/mpq/unit/cm/zerg/bactalisk-acid.grp b/mpq/unit/cm/zerg/bactalisk-acid.grp new file mode 100644 index 00000000..321d1fa0 Binary files /dev/null and b/mpq/unit/cm/zerg/bactalisk-acid.grp differ diff --git a/patchnotes.md b/patchnotes.md index 9127e4d1..838eeb6a 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,11 +1,31 @@ # 15 April 2023 - prospective patch notes ## Designer's Notes -We will revise reclamation (and other corpse interactions), as well as Vulture mine-laying. Stay tuned! +We will revise reclamation (and other corpse interactions), as well as Vulture mine-laying. + +We have also increased worker training times as another means of testing a slower scaling for the early-game. It should also help to leave more room for "flow" inside early build orders, while increasing the value of parallel worker queues. ## Gameplay - During construction, Masons and Taloses now move in a predictable pattern (c. DarkenedFantasies) ## Bugfixes +- Many wandering corner cases have been found and fixed (c. Veeq7) +- Range changes now correctly apply to attacks which go to max range (c. Veeq7) +- Ground workers now use ground distance when returning resources (c. Veeq7) - While using cncdraw, screen hotkeys will no longer sometimes fail to recall the screen position (c. Veeq7) -- Taloses now correctly return to their initial construction position, just like Masons (c. DarkenedFantasies) \ No newline at end of file +- Terran workers that halt construction and then go on to complete a different construction no longer return to the halted structure (c. DarkenedFantasies) +- Taloses now correctly return to their initial construction position, just like Masons (c. DarkenedFantasies) +- Crucible collision size has been updated, fixing issues where it would fail to build on the edges of the map +- Team UI now has a config option for showing your own stats in the same style, defaulting to off (c. Veeq7) + +## Terran +- Mason: + - Time cost now 15, from 12 + +## Protoss +- Scribe: + - Time cost now 15, from 12 + +## Zerg +- Droleth: + - Time cost now 12, from 10 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8152f170..cd2cd9ec 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ