diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 8e448e57..6e154b10 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/grafting/Buttons.txt b/CMBW-editor/grafting/Buttons.txt index 4635b4d4..fb62ab29 100644 --- a/CMBW-editor/grafting/Buttons.txt +++ b/CMBW-editor/grafting/Buttons.txt @@ -212,9 +212,9 @@ 3, 230, 8, 11, 0, 0, 666, 0 # Attack, Unit Has A Weapon (0), Attack (0) 4, 231, 18, 39, 0, 0, 675, 0 # Gather, Unit Is Carrying Nothing (Gather - Probe) (0), Gather (0) 4, 233, 19, 40, 0, 0, 676, 0 # Return Resources, Unit Is Carrying Something(Return Cargo - Probe) (0), Return Cargo (0) - 7, 160, 55, 59, 0, 240, 1067, 0 # Gateway, Basic Protoss Buildings (0), Change Displayed Buttons ([240] Core Protoss Buildings) - 8, 226, 56, 59, 0, 243, 1066, 0 # Grand Library, Advanced Protoss Buildings (0), Change Displayed Buttons ([243] Basic Protoss Buildings) - 9, 165, 56, 59, 0, 33, 1352, 0 # Ancestral Archives, Supreme Protoss Buildings (0), Change Displayed Buttons ([33] Advanced Protoss Buildings) + 7, 272, 55, 59, 0, 240, 1067, 0 # Basic Warp, Basic Protoss Buildings (0), Change Displayed Buttons ([240] Core Protoss Buildings) + 8, 273, 56, 59, 0, 243, 1066, 0 # Advanced Warp, Advanced Protoss Buildings (0), Change Displayed Buttons ([243] Basic Protoss Buildings) + 9, 564, 56, 59, 0, 33, 1352, 0 # Supreme Warp, Supreme Protoss Buildings (0), Change Displayed Buttons ([33] Advanced Protoss Buildings) 45: # Basic Protoss Structures 1, 154, 4, 31, 154, 154, 630, 0 # Nexus, Can Create Unit\Building ([154] Nexus), Create Building - Protoss ([154] Nexus) @@ -1152,7 +1152,7 @@ 6, 329, 23, 57, 34, 0, 1251, 1251 # Fusion Sealers, Spell Researched ([34] Passive), 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) - 9, 234, 47, 59, 0, 250, 1434, 0 # Terran Supreme Buildings, Terran Supreme Buildings (0), Change Displayed Buttons ([250] Supreme Terran Buildings) + 9, 563, 47, 59, 0, 250, 1434, 0 # Terran Supreme Buildings, Terran Supreme Buildings (0), Change Displayed Buttons ([250] Supreme Terran Buildings) 9, 236, 57, 10, 0, 0, 700, 0 # Cancel, Is Constructing (Halt - Mason) (0), Stop (0) 178: # Pariah @@ -1878,7 +1878,7 @@ 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) + 9, 563, 47, 59, 0, 250, 1434, 0 # Terran Supreme Buildings, Terran Supreme Buildings (0), Change Displayed Buttons ([250] Supreme Terran Buildings) 9, 236, 57, 10, 0, 0, 700, 0 # Cancel, Is Constructing (Halt - Mason) (0), Stop (0) 261: # Dilettante @@ -3114,9 +3114,9 @@ Unit 183: # [183] Empress 237, 65535, 1, 0 # Button Set: Empress # Stat Preset: Normal Unit -Unit 184: # [184] Astral Omen - 58, 65535, 2, 1 # Button Set: [58] Astral Omen - # Stat Preset: Building +Unit 184: # [184] Prudence + 44, 65535, 1, 0 # Button Set: [44] Scribe + # Stat Preset: Normal Unit Unit 185: # [185] Skithrokor 224, 65535, 1, 0 # Button Set: Skithrokor diff --git a/CMBW-editor/grafting/Orders.txt b/CMBW-editor/grafting/Orders.txt index 0551afca..12561ddc 100644 --- a/CMBW-editor/grafting/Orders.txt +++ b/CMBW-editor/grafting/Orders.txt @@ -215,7 +215,7 @@ 64 # [64] Scribe 0xFF01 # Or 0xFF02 # Current unit is... - 182 # [182] Artisan + 184 # [184] Prudence 0xFFFF # ==End of List== 32: # [32] Build3 @@ -223,7 +223,7 @@ 64 # [64] Scribe 0xFF01 # Or 0xFF02 # Current unit is... - 182 # [182] Artisan + 184 # [184] Prudence 0xFFFF # ==End of List== 33: # [33] Build4 diff --git a/CMBW-editor/grafting/Tech.txt b/CMBW-editor/grafting/Tech.txt index 9ff3cf8e..57839431 100644 --- a/CMBW-editor/grafting/Tech.txt +++ b/CMBW-editor/grafting/Tech.txt @@ -207,10 +207,10 @@ 319 # [319] Mortothrokor 0xFF01 # Or 0xFF02 # Current unit is... - 319 # [320] Cherbrathalor + 320 # [320] Cherbrathalor 0xFF01 # Or 0xFF02 # Current unit is... - 319 # [321] Okrimnilisk + 321 # [321] Okrimnilisk 0xFF01 # Or 0xFF02 # Current unit is... 377 # [377] Axitrilisk (Weaponless) diff --git a/CMBW-editor/grafting/Units.txt b/CMBW-editor/grafting/Units.txt index 1d821f61..7687f202 100644 --- a/CMBW-editor/grafting/Units.txt +++ b/CMBW-editor/grafting/Units.txt @@ -1084,46 +1084,73 @@ 154: # [154] Nexus 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 155: # [155] Lattice 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 156: # [156] Pylon 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== -157: # [157] Assimilator +157: # [157] Aquifer 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 158: # [158] Automaton Register 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 159: # [159] Prostration Stage 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 160: # [160] Gateway 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 161: # [161] Rogue Gallery 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 162: # [162] Warden 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 163: # [163] Fountainhead @@ -1136,31 +1163,49 @@ 164: # [164] Cenotaph 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 165: # [165] Ancestral Archives 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 166: # [166] Embassy 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 167: # [167] Stargate 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 168: # [168] Argosy 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 169: # [169] Fleet Beacon 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 170: # [170] Alkag Iteth @@ -1179,6 +1224,9 @@ 171: # [171] Synthetic Synod 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF01 # Or + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 172: # [172] Vagrant @@ -1245,9 +1293,9 @@ 171 # [171] Synthetic Synod 0xFFFF # ==End of List== -184: # [184] Astral Omen +184: # [184] Prudence 0xFF02 # Current unit is... - 64 # [64] Scribe + 166 # [166] Embassy 0xFFFF # ==End of List== 185: # [185] Skithrokor @@ -1374,7 +1422,9 @@ 201: # [201] Crucible 0xFF02 # Current unit is... - 64 # [64] Scribe + 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 203: # [203] Nanite Assembly @@ -1486,6 +1536,8 @@ 220: # [220] Ardent Authority 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 221: # [221] Vespene Ridge @@ -1508,6 +1560,8 @@ 223: # [223] Monument of Sin 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 224: # [224] Irol Iris @@ -1522,11 +1576,15 @@ 225: # [225] Sanctum of Sorrow 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 226: # [226] Grand Library 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 227: # [227] Sibraelosk @@ -1538,6 +1596,8 @@ 252: # [252] Matrix 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 253: # [253] Sundog @@ -1655,11 +1715,15 @@ 278: # [278] Strident Stratum 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 279: # [279] Auxiliary Oasis 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 267: # [267] Tethzorokor @@ -1867,6 +1931,8 @@ 294: # [294] Engram 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 295: # [295] Iron Council @@ -1913,11 +1979,15 @@ 304: # [304] Sequestered Icon 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 305: # [305] Unitary Union 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 306: # [306] Servitor @@ -2078,6 +2148,8 @@ 349: # [349] Hall of Heretics 0xFF02 # Current unit is... 64 # [64] Scribe + 0xFF02 # Current unit is... + 184 # [184] Prudence 0xFFFF # ==End of List== 350: # [350] Nephrilosk