diff --git a/CMBW-maps/co-op/HYDRA refurbished/vt02.scx b/CMBW-maps/co-op/HYDRA refurbished/vt02.scx index c8a90d0c..4de57509 100644 Binary files a/CMBW-maps/co-op/HYDRA refurbished/vt02.scx and b/CMBW-maps/co-op/HYDRA refurbished/vt02.scx differ diff --git a/CMBW-maps/test/!Cosmonarchy-test.scx b/CMBW-maps/test/!Cosmonarchy-test.scx index d4d58159..339e7e6b 100644 Binary files a/CMBW-maps/test/!Cosmonarchy-test.scx and b/CMBW-maps/test/!Cosmonarchy-test.scx differ diff --git a/CMBW-maps/test/(2)The Underwood_AI.scx b/CMBW-maps/test/(2)The Underwood_AI.scx deleted file mode 100644 index b1dbb07e..00000000 Binary files a/CMBW-maps/test/(2)The Underwood_AI.scx and /dev/null differ diff --git a/CMBW-maps/test/(4)Dead Ringer_AI.scx b/CMBW-maps/test/(4)Dead Ringer_AI.scx deleted file mode 100644 index b4abf5e8..00000000 Binary files a/CMBW-maps/test/(4)Dead Ringer_AI.scx and /dev/null differ diff --git a/CMBW-maps/test/(4)Parabola_AI.scx b/CMBW-maps/test/(4)Parabola_AI.scx deleted file mode 100644 index 042eee6c..00000000 Binary files a/CMBW-maps/test/(4)Parabola_AI.scx and /dev/null differ diff --git a/CMBW-maps/test/(6)Mouth of Bathala_AI.scx b/CMBW-maps/test/(6)Mouth of Bathala_AI.scx deleted file mode 100644 index 7d457d04..00000000 Binary files a/CMBW-maps/test/(6)Mouth of Bathala_AI.scx and /dev/null differ diff --git a/CMBW-maps/test/(6)Tectonic Kingdom_AI.scx b/CMBW-maps/test/(6)Tectonic Kingdom_AI.scx deleted file mode 100644 index f3e3eb08..00000000 Binary files a/CMBW-maps/test/(6)Tectonic Kingdom_AI.scx and /dev/null differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d84442cb..b032aa42 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 4289a510..f273ade6 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1607,8 +1607,8 @@ Heir Shadow Heir Remains Horseman Horseman Shadow -Iron Council -Iron Council Shadow +unused (was Iron Council) +unused (was Iron Council shadow) Amphitheater Amphitheater Shadow Thespian @@ -1619,9 +1619,9 @@ Cabalist Shadow Starpad Overlay Apothecary Apothecary Shadow -Sequestered Icon -Sequestered Icon Shadow -Sequestered Icon Warp Flash +unused (was Sequestered Icon) +unused (was Sequestered Icon shadow) +unused (was Sequestered Icon warp) Optecton Optecton Shadow Patriarch diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index be852561..5684ad21 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 8f40c285..db199654 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 53c1715b..15d9ddfe 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -48469,88 +48469,6 @@ ApothecaryIsWorking: playfram 0 wait 1 goto ApothecaryIsWorking - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1621 Sequestered Icon (cm\protoss\sequestered-icon.grp) -.headerstart -IsId 712 -Type 27 -Init SequesteredIconInit -Death SequesteredIconDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt [NONE] -Built SequesteredIconBuilt -Landing SequesteredIconLanding -LiftOff SequesteredIconLanding -IsWorking SequesteredIconIsWorking -WorkingToIdle SequesteredIconBuilt -WarpIn SequesteredIconWarpIn -Unused3 [NONE] -StarEditInit [NONE] -Disable SequesteredIconDisable -Burrow [NONE] -UnBurrow [NONE] -Enable SequesteredIconEnable -.headerend -# ----------------------------------------------------------------------------- # - -SequesteredIconInit: - playfram 0x00 - imgul 1622 0 0 # Sequestered Icon Shadow (cm\protoss\sequestered-icon-shadow.grp) - goto SequesteredIconLanding - -SequesteredIconLanding: - wait 125 - goto SequesteredIconLanding - -SequesteredIconDeath: - playsnd 7 # Misc\ExploLrg.wav - imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) - wait 3 - lowsprul 223 0 0 # Protoss Building Rubble (Small) (thingy\PRubbleS.grp) - wait 1 - end - -SequesteredIconBuilt: - playfram 0x00 - goto SequesteredIconLanding - -SequesteredIconIsWorking: - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 1 - wait 2 - playfram 0 - goto SequesteredIconIsWorking - -SequesteredIconWarpIn: - imgol 1623 0 0 # Sequestered Icon Warp Flash (cm\protoss\sequestered-icon.grp) - goto SequesteredIconLanding - -SequesteredIconDisable: - playfram 3 - wait 1 - goto SequesteredIconBuilt - -SequesteredIconEnable: - playfram 0x00 - wait 1 - goto SequesteredIconBuilt # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/patchnotes.md b/patchnotes.md index ee6d39c0..50c5a212 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -21,6 +21,10 @@ Patch goals include: - Shuffled Protoss structure buttons in construction submenus to improve organization - Added more debug info to help investigate desyncs, c. DF. Please screenshot and report if you encounter them! +## AI +- Mappers can now set Mineral Field type 1 deaths to control the faction of AI. This is preliminary support as factions continue to receive development. + - See [this page](https://www.fraudsclub.com/cosmonarchy-bw/sites/scenario-setup/#gameplay-commands) for specific info. + ## Bugfixes - Gameplay: - Fixed burrowed units not transforming/regressing properly (c. DF) @@ -33,6 +37,7 @@ Patch goals include: - Multiselecting Terran workers now correctly hides the building submenus - Burrowed Vorvrokors now correctly display the burrow mound graphic (c. DF) - Added an additional sanity check to prevent displaying passive icons in mixed selections + - Witness and replay modes now show Nydus Cesiant connections - Fix 1-frame delay in Phalanx deployment animation (r. DF) - Corrected group wireframe for Hydrith Den (r. Enozlliks) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c2465c97..8d631343 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ