diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 6e9e29a6..ad02297e 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/brush/Cosmonarchy-ice.scmdbrh b/CMBW-editor/brush/Cosmonarchy-ice.scmdbrh index bd88b942..eadef816 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-ice.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-ice.scmdbrh differ diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt index 20c388e5..3781868d 100644 --- a/CMBW-editor/grafting/Buttons.txt +++ b/CMBW-editor/grafting/Buttons.txt @@ -1094,7 +1094,7 @@ 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0) 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0) 7, 391, 23, 57, 34, 0, 1391, 1391 # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0) - 8, 307, 23, 57, 34, 0, 1518, 1518 # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0) + 8, 307, 23, 57, 34, 0, 1518, 1518 # Phantasmal Passage, Spell Researched ([34] Healing - Cleric), Cancel (0) 171: # Phobos 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -1144,9 +1144,9 @@ 1, 228, 58, 9, 0, 0, 664, 0 # Move, Move (Mason) (0), Move (0) 2, 229, 59, 10, 0, 0, 665, 0 # Stop, Stop (Mason) (0), Stop (0) 3, 230, 60, 11, 0, 0, 666, 0 # Attack, Attack (Mason) (0), Attack (0) - 4, 232, 61, 37, 0, 0, 677, 0 # Repair, Repair (Mason) (0), Repair (0) - 5, 231, 62, 39, 0, 0, 675, 0 # Gather, Gather (Mason) (0), Gather (0) - 5, 233, 63, 40, 0, 0, 676, 0 # Return Resources, Return Cargo (Mason) (0), Return Cargo (0) + 4, 231, 62, 39, 0, 0, 675, 0 # Gather, Gather (Mason) (0), Gather (0) + 4, 233, 63, 40, 0, 0, 676, 0 # Return Resources, Return Cargo (Mason) (0), Return Cargo (0) + 5, 232, 61, 37, 0, 0, 677, 0 # Repair, Repair (Mason) (0), Repair (0) 6, 329, 23, 57, 34, 0, 1251, 1251 # Fusion Cutter, Spell Researched ([34] Healing - Cleric), Cancel (0) 7, 234, 64, 59, 0, 239, 678, 0 # Terran Basic Buildings, Terran Basic Buildings (0), Change Displayed Buttons ([239] Basic Terran Buildings) 8, 235, 65, 59, 0, 242, 679, 0 # Terran Advanced Buildings, Terran Advanced Buildings (0), Change Displayed Buttons ([242] Advanced Terran Buildings) @@ -1616,7 +1616,8 @@ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0) 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0) 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0) - 7, 249, 23, 57, 34, 0, 489, 489 # Controlled Opposition, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 391, 23, 57, 34, 0, 1391, 1391 # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0) + 8, 249, 23, 57, 34, 0, 489, 489 # Controlled Opposition, Spell Researched ([34] Healing - Cleric), Cancel (0) 232: # Luminary 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -1858,9 +1859,9 @@ 1, 228, 58, 9, 0, 0, 664, 0 # Move, Move (Mason) (0), Move (0) 2, 229, 59, 10, 0, 0, 665, 0 # Stop, Stop (Mason) (0), Stop (0) 3, 230, 60, 11, 0, 0, 666, 0 # Attack, Attack (Mason) (0), Attack (0) - 4, 232, 61, 37, 0, 0, 677, 0 # Repair, Repair (Mason) (0), Repair (0) - 5, 231, 62, 39, 0, 0, 675, 0 # Gather, Gather (Mason) (0), Gather (0) - 5, 233, 63, 40, 0, 0, 676, 0 # Return Resources, Return Cargo (Mason) (0), Return Cargo (0) + 4, 231, 62, 39, 0, 0, 675, 0 # Gather, Gather (Mason) (0), Gather (0) + 4, 233, 63, 40, 0, 0, 676, 0 # Return Resources, Return Cargo (Mason) (0), Return Cargo (0) + 5, 232, 61, 37, 0, 0, 677, 0 # Repair, Repair (Mason) (0), Repair (0) 7, 234, 64, 59, 0, 239, 678, 0 # Terran Basic Buildings, Terran Basic Buildings (0), Change Displayed Buttons ([239] Basic Terran Buildings) 8, 235, 65, 59, 0, 242, 679, 0 # Terran Advanced Buildings, Terran Advanced Buildings (0), Change Displayed Buttons ([242] Advanced Terran Buildings) 9, 234, 47, 59, 0, 250, 1434, 0 # Terran Supreme Buildings, Terran Supreme Buildings (0), Change Displayed Buttons ([250] Supreme Terran Buildings) @@ -2244,7 +2245,7 @@ 3, 230, 9, 13, 0, 0, 666, 0 # Attack, Attacking Building (0), Attack (Building) (0) 7, 359, 23, 57, 34, 0, 1382, 1382 # Interception, Spell Researched ([34] Healing - Cleric), Cancel (0) -312: # Grounded Garrison +312: # Grounded Garrison + Self-destruct 2, 229, 9, 10, 0, 0, 665, 0 # Stop, Attacking Building (0), Stop (0) 3, 230, 9, 13, 0, 0, 666, 325 # Attack, Attacking Building (0), Attack (Building) (0) 4, 314, 23, 24, 2, 2, 500, 500 # Scarab Damage, Spell Researched ([2] Controlled Demolition - Terran Structure), Use Technology ([2] Controlled Demolition - Terran Structure) @@ -2284,7 +2285,22 @@ 4, 254, 3, 20, 0, 0, 667, 0 # Patrol, Always (0), Patrol (0) 5, 255, 3, 21, 0, 0, 668, 0 # Hold Position, Always (0), Hold Position (0) 7, 310, 23, 57, 34, 0, 1380, 1380 # Tranquility Array, Spell Researched ([34] Healing - Cleric), Cancel (0) - + +317: # Mixed Repairmen + 1, 228, 58, 9, 0, 0, 664, 0 # Move, Move (Mason) (0), Move (0) + 2, 229, 59, 10, 0, 0, 665, 0 # Stop, Stop (Mason) (0), Stop (0) + 3, 230, 60, 11, 0, 0, 666, 0 # Attack, Attack (Mason) (0), Attack (0) + 4, 231, 62, 39, 0, 0, 675, 0 # Gather, Gather (Mason) (0), Gather (0) + 4, 233, 63, 40, 0, 0, 676, 0 # Return Resources, Return Cargo (Mason) (0), Return Cargo (0) + 5, 232, 61, 37, 0, 0, 677, 0 # Repair, Repair (Mason) (0), Repair (0) + +318: # Grounded Garrison + 2, 229, 9, 10, 0, 0, 665, 0 # Stop, Attacking Building (0), Stop (0) + 3, 230, 9, 13, 0, 0, 666, 325 # Attack, Attacking Building (0), Attack (Building) (0) + 9, 236, 23, 24, 26, 26, 1792, 1792 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability) + 7, 309, 20, 46, 0, 0, 683, 0 # Load (into Transport), Unit's Capacity Has Not Been Met (0), Load (0) + 8, 312, 21, 47, 0, 0, 684, 0 # Unload All (from Transport), Carrying Some Units (0), Unload (0) + #### Buttonsets END #### #### Unit Settings START #### @@ -3442,8 +3458,8 @@ Unit 368: # [368] Mixed Scribe Training 307, 65535, 0, 8 # Button Set: Mixed Scribe Training # Stat Preset: Unselectable -Unit 369: # [369] Police Structures - Advanced - 291, 65535, 0, 8 # Button Set: Police Structures - Advanced +Unit 369: # [369] Mixed Repairmen + 317, 65535, 0, 8 # Button Set: Mixed Repairmen # Stat Preset: Unselectable Unit 370: # [370] Dugout @@ -3483,5 +3499,9 @@ Unit 383: # [383] Omnivale # Stat Preset: Building Unit 384: # [384] Lodestone - 312, 65535, 3, 2 # Button Set: [312] Grounded Garrison + 312, 65535, 3, 2 # Button Set: [312] Grounded Garrison + Self-destruct + # Stat Preset: Transport + +Unit 387: # [387] Lodestone (Standalone) + 318, 65535, 3, 2 # Button Set: [318] Grounded Garrison # Stat Preset: Transport \ No newline at end of file diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx index 4b5136cc..c7aa8d94 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Derelict.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx index 7d94f60a..5da0ba07 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Otherworld.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx index 2681e514..30ed5a2b 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx index 3f4c3f55..f69567d6 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Highwater.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx index b4fcfa96..a656277e 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Nitro Valley.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx index e5e31cb0..e47a0890 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(4)Victory Square.scx differ diff --git a/CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx b/CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx index 8a87db55..903a5375 100644 Binary files a/CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx and b/CMBW-maps/melee/1v1/Nonstandard/(2)Death Spiral.scx differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 29bd5fea..104fd5f7 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 a37b7a06..5f141a7c 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -385,7 +385,7 @@ Omnivale Terran Lodestone Floor Hatch Terran Treasury -Extended Unit #160 +Terran Lodestone (Standalone) Extended Unit #161 Extended Unit #162 Extended Unit #163 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index de08149c..a2335f5d 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 8ef46246..fd513d11 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/tileset/AshWorld.cv5 b/mpq/tileset/AshWorld.cv5 index 60cfb551..c3e600bc 100644 Binary files a/mpq/tileset/AshWorld.cv5 and b/mpq/tileset/AshWorld.cv5 differ diff --git a/mpq/tileset/AshWorld.vf4 b/mpq/tileset/AshWorld.vf4 index 50ce3622..9d2b6507 100644 Binary files a/mpq/tileset/AshWorld.vf4 and b/mpq/tileset/AshWorld.vf4 differ diff --git a/mpq/tileset/AshWorld.vr4 b/mpq/tileset/AshWorld.vr4 index 93130ad0..91e1b733 100644 Binary files a/mpq/tileset/AshWorld.vr4 and b/mpq/tileset/AshWorld.vr4 differ diff --git a/mpq/tileset/AshWorld.vx4ex b/mpq/tileset/AshWorld.vx4ex index 07193459..b84c52a0 100644 Binary files a/mpq/tileset/AshWorld.vx4ex and b/mpq/tileset/AshWorld.vx4ex differ diff --git a/mpq/tileset/Desert.cv5 b/mpq/tileset/Desert.cv5 index 39f36bbd..1627872b 100644 Binary files a/mpq/tileset/Desert.cv5 and b/mpq/tileset/Desert.cv5 differ diff --git a/mpq/tileset/Desert.vf4 b/mpq/tileset/Desert.vf4 index c9adb880..981f258b 100644 Binary files a/mpq/tileset/Desert.vf4 and b/mpq/tileset/Desert.vf4 differ diff --git a/mpq/tileset/Desert.vr4 b/mpq/tileset/Desert.vr4 index 0f4f4776..4cf79e58 100644 Binary files a/mpq/tileset/Desert.vr4 and b/mpq/tileset/Desert.vr4 differ diff --git a/mpq/tileset/Desert.vx4ex b/mpq/tileset/Desert.vx4ex index 5ebfd20a..4845d9a4 100644 Binary files a/mpq/tileset/Desert.vx4ex and b/mpq/tileset/Desert.vx4ex differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 8632a574..76bc48d6 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 a42846c6..cec96236 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 ab584ff0..a71fa61a 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -255,6 +255,7 @@ Patch goals include: - *Helping the Golem live up to its intended combat role.* - [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron): - Armor now 2, from 3 + - Transport size now 4, from 2 - No longer has Interception - *Providing missile interception to the Positron was an experiment that wound up failing. Reverting that change and dropping its armor will keep the unit reliant on a proper backline and good target selection.* - [Accantor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/accantor): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 73d73b1c..93972b5a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ