diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index f9397a41..fd843d70 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/brush/Cosmonarchy-ashworld.scmdbrh b/CMBW-editor/brush/Cosmonarchy-ashworld.scmdbrh index dafa9ae6..1c745ecd 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-ashworld.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-ashworld.scmdbrh differ diff --git a/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh b/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh index 4e771d45..227663bf 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-desert.scmdbrh differ diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt index 03032ad0..da55f11a 100644 --- a/CMBW-editor/grafting/Buttons.txt +++ b/CMBW-editor/grafting/Buttons.txt @@ -246,8 +246,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, 252, 23, 57, 34, 0, 716, 716 # Cloak, Spell Researched ([34] Healing - Cleric), Cancel (0) - 8, 305, 23, 57, 34, 0, 1587, 1587 # Ground Weapons, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 395, 23, 57, 34, 0, 717, 717 # Steady Shroud, Spell Researched ([34] Healing - Cleric), Cancel (0) + 8, 305, 23, 57, 34, 0, 1587, 1587 # Silent Strides, Spell Researched ([34] Healing - Cleric), Cancel (0) 49: # Solarion 1, 228, 3, 14, 0, 0, 664, 0 # Move, Always (0), Move (Carrier\Reaver) (0) @@ -263,10 +263,10 @@ 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) - 6, 395, 23, 57, 34, 0, 528, 528 # Shroud of Adun, Spell Researched ([34] Healing - Cleric), Cancel (0) - 7, 278, 23, 24, 22, 22, 403, 408 # Stasis Field, Spell Researched ([22] Stasis Field - Didact), Use Technology ([22] Stasis Field - Didact) - 8, 280, 23, 24, 21, 21, 402, 407 # Recall, Spell Researched ([21] Recall - Didact), Use Technology ([21] Recall - Didact) - 9, 236, 23, 24, 26, 26, 475, 475 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability) + 7, 280, 23, 24, 21, 21, 402, 407 # Recall, Spell Researched ([21] Recall - Didact), Use Technology ([21] Recall - Didact) + 7, 236, 23, 24, 26, 26, 475, 475 # Cancel, Spell Researched ([26] Cancel New Ability), Use Technology ([26] Cancel New Ability) + 8, 278, 23, 24, 22, 22, 403, 408 # Stasis Field, Spell Researched ([22] Stasis Field - Didact), Use Technology ([22] Stasis Field - Didact) + 9, 395, 23, 57, 34, 0, 528, 528 # Shroud of Adun, Spell Researched ([34] Healing - Cleric), Cancel (0) 54: # Mind Tyrant 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -364,7 +364,7 @@ 72: # Advanced Terran Buildings 1, 122, 4, 29, 122, 122, 650, 715 # Atlas, Can Create Unit\Building ([122] Atlas), Create Building - Terran ([122] Atlas) - 2, 209, 4, 29, 209, 209, 1387, 1389 # Sentinel, Can Create Unit\Building ([209] Sentinel), Create Building - Terran ([209] Sentinel) + 2, 209, 4, 29, 209, 209, 1387, 1390 # Sentinel, Can Create Unit\Building ([209] Sentinel), Create Building - Terran ([209] Sentinel) 3, 110, 4, 29, 110, 110, 648, 1378 # Reservoir, Can Create Unit\Building ([110] Reservoir), Create Building - Terran ([110] Reservoir) 4, 199, 4, 29, 199, 199, 1088, 720 # Captaincy, Can Create Unit\Building ([199] Captaincy), Create Building - Terran ([199] Captaincy) 5, 430, 4, 29, 280, 280, 1090, 1114 # Mantle, Can Create Unit\Building ([280] Mantle), Create Building - Terran ([280] Mantle) @@ -376,7 +376,7 @@ 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, 252, 23, 57, 34, 0, 716, 716 # Permanent Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 317, 23, 57, 34, 0, 716, 716 # Proximity Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0) 9, 311, 33, 51, 0, 0, 685, 761 # Nuclear Strike, Nuke Available (0), Nuclear Strike (0) 76: # Phalanx @@ -756,7 +756,7 @@ 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, 252, 23, 57, 34, 0, 757, 757 # Cloak, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 395, 23, 57, 34, 0, 717, 717 # Steady Shroud, Spell Researched ([34] Healing - Cleric), Cancel (0) 125: # Ultrokor 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -1092,7 +1092,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, 332, 23, 57, 34, 0, 1101, 1101 # Shroud Piercer, 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, 307, 23, 57, 34, 0, 1518, 1518 # Kinetic Penetration, Spell Researched ([34] Healing - Cleric), Cancel (0) 171: # Phobos 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -1175,7 +1176,7 @@ 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, 252, 23, 57, 34, 0, 716, 716 # Permanent Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 395, 23, 57, 34, 0, 717, 717 # Steady Shroud, Spell Researched ([34] Healing - Cleric), Cancel (0) 8, 319, 23, 57, 34, 0, 540, 540 # Multi-Attack III, Spell Researched ([34] Healing - Cleric), Cancel (0) 181: # Magister @@ -1402,13 +1403,13 @@ 9, 283, 36, 36, 0, 199, 670, 0 # Land, Building Has Lifted Off (0), Land ([199] Captaincy) 9, 282, 37, 45, 0, 0, 671, 0 # Lift off, Building Has Landed (0), Lift Off (0) -207: # Basic commands + permacloak +207: # Basic commands + Proximity Cloak 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) 2, 229, 3, 10, 0, 0, 665, 0 # Stop, Always (0), Stop (0) 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, 252, 23, 57, 34, 0, 716, 716 # Permanent Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0) + 7, 317, 23, 57, 34, 0, 716, 716 # Proximity Cloaking, Spell Researched ([34] Healing - Cleric), Cancel (0) 208: # Pazuzu 1, 228, 3, 9, 0, 0, 664, 0 # Move, Always (0), Move (0) @@ -1550,6 +1551,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) 6, 62, 4, 38, 62, 62, 1288, 1297 # Vithrilisk, Can Create Unit\Building ([62] Vithrilisk), Unit Morph ([62] Vithrilisk) + 7, 344, 23, 57, 34, 0, 1377, 1377 # Ablative Return, Spell Researched ([34] Healing - Cleric), Cancel (0) 225: # Larva - Swarm 1, 37, 4, 38, 37, 37, 575, 738 # Zethrokor, Can Create Unit\Building ([37] Zethrokor), Unit Morph ([37] Zethrokor) @@ -1920,7 +1922,7 @@ 268: # Ocsal Larva 1, 47, 4, 38, 47, 47, 466, 469 # Scourge, Can Create Unit\Building ([47] Gosvileth), Unit Morph ([47] Gosvileth) - 2, 222, 4, 38, 222, 222, 1140, 1050 # Iroleth, Can Create Unit\Building ([222] Iroleth), Unit Morph ([222] Iroleth) + 2, 222, 4, 38, 222, 222, 1140, 1060 # Iroleth, Can Create Unit\Building ([222] Iroleth), Unit Morph ([222] Iroleth) 5, 286, 13, 1, 0, 0, 672, 0 # Set Rally Point, Rally Point (0), Rally Point (0) 6, 236, 3, 8, 0, 0, 695, 0 # Cancel, Always (0), Cancel Morph (0) 7, 128, 47, 59, 0, 356, 485, 0 # Swarm Strains, Zerg Basic Buildings (0), Change Displayed Buttons ([206] Right Upper Level Door) 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 323575cd..6c672e17 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/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 666d4606..2709ace5 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/tileset/Desert.cv5 b/mpq/tileset/Desert.cv5 index 9c9c947b..7e4680c6 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 7150f9e3..d4f93d45 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 3a333507..a9b3e451 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 6ceb772b..3980889d 100644 Binary files a/mpq/tileset/Desert.vx4ex and b/mpq/tileset/Desert.vx4ex differ diff --git a/patchnotes.md b/patchnotes.md index 63b144f4..33e15863 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -81,6 +81,7 @@ Patch goals include: - Hide decaying overlays on reclaimed units while they're cloaked (r. GreenEggs'NSpam) - Removed the Attack button on garrisons, since it currently does nothing (r. neblime) - Reset animations correctly for Protoss structures that re-gain power while in the middle of training a unit (r. The Shambler, c. DF) + - Correctly show cast range for Eidolon Missile Strike (r. GreenEggs'NSpam) - Improved sync between Golem attack animation and actual damage (r. TheBeaver99) - Added placeholder liftoff and landing dust overlays for Mantle and Starpad (r. TheBeaver99) - Siren weapon tooltip now displays the full potential damage of its attack diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 7db36845..81d95c3b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ