diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Ascension/(2)Boskevine.scx new file mode 100644 index 00000000..37815b19 Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Boskevine.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Ascension/(2)Death Spiral.scx new file mode 100644 index 00000000..069b102e Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Death Spiral.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Ex Situ.scx b/CMBW-maps/melee/1v1/Ascension/(2)Ex Situ.scx new file mode 100644 index 00000000..68c6cc27 Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Ex Situ.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Ascension/(2)Infinite Velocity.scx new file mode 100644 index 00000000..7983778e Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Infinite Velocity.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Nightfall.scx b/CMBW-maps/melee/1v1/Ascension/(2)Nightfall.scx new file mode 100644 index 00000000..272d17fc Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Nightfall.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Otherworld.scx b/CMBW-maps/melee/1v1/Ascension/(2)Otherworld.scx new file mode 100644 index 00000000..430d9d33 Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Otherworld.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(2)Repulsion.scx b/CMBW-maps/melee/1v1/Ascension/(2)Repulsion.scx new file mode 100644 index 00000000..9c05e28a Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(2)Repulsion.scx differ diff --git a/CMBW-maps/melee/1v1/Ascension/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Ascension/(4)Nitro Valley.scx new file mode 100644 index 00000000..38ae04fc Binary files /dev/null and b/CMBW-maps/melee/1v1/Ascension/(4)Nitro Valley.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx index 37815b19..11415591 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Boskevine.scx differ diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx index 70ea69b0..f8fbb956 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx and b/CMBW-maps/melee/1v1/Nonstandard/(2)Wild Whirlwind.scx differ diff --git a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx index 28ecde6a..4ee693dd 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx and b/CMBW-maps/melee/1v1/Nonstandard/Retired/(2)Rest in Paradise.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx index 7e84417c..7c60cdd8 100644 Binary files a/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx and b/CMBW-maps/melee/1v1/Work in Progress/(2)Cocytus.scx differ diff --git a/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx b/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx new file mode 100644 index 00000000..b2f618fe Binary files /dev/null and b/CMBW-maps/melee/1v1/Work in Progress/(4)Hills of Tyche.scx differ diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Toony Moony.scx b/CMBW-maps/melee/2v2/(4)Toony Moony.scx similarity index 100% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Toony Moony.scx rename to CMBW-maps/melee/2v2/(4)Toony Moony.scx diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx b/CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx deleted file mode 100644 index 4c108025..00000000 Binary files a/CMBW-maps/melee/2v2/Needs Testing/(4)Bloodstone Battleground.scx and /dev/null differ diff --git a/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx index 630b6a72..efa7afe5 100644 Binary files a/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx and b/CMBW-maps/melee/2v2/Nonstandard/(4)Bloodstone Battleground.scx differ diff --git a/CMBW-maps/melee/2v2/Nonstandard/(4)Midnight Outskirts.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Midnight Outskirts.scx new file mode 100644 index 00000000..78f3ac2a Binary files /dev/null and b/CMBW-maps/melee/2v2/Nonstandard/(4)Midnight Outskirts.scx differ diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Moonlit Rivulet.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Moonlit Rivulet.scx similarity index 100% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Moonlit Rivulet.scx rename to CMBW-maps/melee/2v2/Nonstandard/(4)Moonlit Rivulet.scx diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Cold Crevice Conflict.scx b/CMBW-maps/melee/2v2/Work in Progress/(4)Cold Crevice Conflict.scx similarity index 100% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Cold Crevice Conflict.scx rename to CMBW-maps/melee/2v2/Work in Progress/(4)Cold Crevice Conflict.scx diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Tandem Tropics.scx b/CMBW-maps/melee/2v2/Work in Progress/(4)Tandem Tropics.scx similarity index 100% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Tandem Tropics.scx rename to CMBW-maps/melee/2v2/Work in Progress/(4)Tandem Tropics.scx diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Tomb World.scx b/CMBW-maps/melee/2v2/Work in Progress/(4)Tomb World.scx similarity index 100% rename from CMBW-maps/melee/2v2/Needs Testing/(4)Tomb World.scx rename to CMBW-maps/melee/2v2/Work in Progress/(4)Tomb World.scx diff --git a/patchnotes.md b/patchnotes.md index 49a093f7..7c754325 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -62,7 +62,7 @@ Patch goals include: - Timer now 10 seconds, from 30 - Heal now 10 HP per second, from 5 - [Magnetar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/magnetar): - - Max energy now 150, from 250 + - Max energy now 200, from 250 - [Fountainhead](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/fountainhead): - Mineral, gas, and time costs now 250/500/45, from 200/400/30 - [Tinkerer's Tower](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tinkerers-tower): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fc0f7d1b..3c2a6239 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ