diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index a7414f0d..ac604ebe 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index eb78af14..23d16b38 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -728,7 +728,7 @@ Memphis (Flak Mode) Memphis Turret (Tank Mode) Memphis Turret (Flak Mode) Fragmentary Shells (with damage) -Extended Flingy #522 +Floor Flame Trap Extended Flingy #523 Extended Flingy #524 Extended Flingy #525 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d9d7bd4d..874237a3 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index 1d36a2ff..1685338d 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 20edb8d7..a7a7222b 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2502,8 +2502,8 @@ Memphis (Tank Mode) Shadow Memphis (Flak Mode) Memphis Turret (Flak Mode) Fragmentary Shells (with damage) -Extended Image #1502 -Extended Image #1503 +Floor Flame Trap +Floor Flame Trap Turret Extended Image #1504 Extended Image #1505 Extended Image #1506 diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 2741b884..07d27932 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index e488a36d..33b6126d 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index ffc6a7d6..16c0a55a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1204,7 +1204,7 @@ Memphis (Flak Mode) Memphis Turret (Tank Mode) Memphis Turret (Flak Mode) Fragmentary Shells (with damage) -Extended Sprite #690 +Floor Flame Trap Extended Sprite #691 Extended Sprite #692 Extended Sprite #693 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index faec56da..2eb1176d 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 c4fe4886..f637443e 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -201,17 +201,17 @@ Terran Captaincy Terran Scrapyard Protoss Crucible Carapace Swarm -Terran Nanite Assembly +Floor Missile Trap Zerg Kalkiir Lake Left Upper Level Door Right Upper Level Door Left Pit Door Right Pit Door -Terran Sentinel -Terran Tarasque (Nydus) -Terran Anticthon -Zerg Kethraj Keep -Terran Atelier +Floor Gun Trap +Wall Missile Trap (Left) +Wall Flame Trap (Left) +Wall Missile Trap (Right) +Wall Flame Trap (Right) Start Location Terran Treasury Zerg Larvosk Cesiant @@ -258,10 +258,10 @@ Terran Matador (Tank Mode) Terran Future Station Zerg Zarcavrokor Terran Cestus -Terran Aerie (unused) -Terran Pegasus (unused) +Terran Sentinel +Terran Nanite Assembly Terran Hippogriff -Terran Oberon (unused) +Terran Tarasque (Nydus) Terran Aion Protoss Herald Protoss Epigraph @@ -287,7 +287,7 @@ Terran Dilettante Terran Sevenstep Terran Hypnagogue Terran Parthenon -Terran Armistice +Terran Anticthon Terran Pythean Zerg Ogroszaleth Zerg Spirtith Cesiant @@ -301,7 +301,7 @@ Terran Throneroom Terran Emperor Terran Jester Zerg Agrileth -unused +Zerg Kethraj Keep Protoss Sequestered Icon Protoss Unitary Union Protoss Servitor @@ -547,7 +547,7 @@ Askosi Zylode Askosi Astrolabe Terran Serathiel (Hecaton) Zerg Malkothrokor -unused +Zerg Kalkiir Lake Askosi Panoply Askosi Aphorist Askosi Doronin @@ -647,13 +647,13 @@ Terran Memphis (Flak, Turret) Forerunner Processus Forerunner Aestuarius Forerunner Corcillum -Extended Unit #422 -Extended Unit #423 -Extended Unit #424 -Extended Unit #425 -Extended Unit #426 -Extended Unit #427 -Extended Unit #428 +Floor Flame Trap +Forerunner Bastilius +Forerunner Molaris +Forerunner Insignis +Forerunner Incaendium +Forerunner Ossum +Forerunner Voluntatis Extended Unit #429 Extended Unit #430 Extended Unit #431 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index b7444084..fe19d3c3 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index be3eae3e..858b75b8 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -312,9 +312,9 @@ Gauss Launcher (Raynor Maverick) Boreal Railguns (Cyprian Hecaton) Twinstrike Cannons (Memphis) Twinflak Cannons (Memphis) -Extended Weapon #185 -Extended Weapon #186 -Extended Weapon #187 +Hellfire Missile Pack (Missile Trap) +Vigil Autocannon (Gun Trap) +Flamethrower (Flame Trap) Extended Weapon #188 Extended Weapon #189 Extended Weapon #190 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 64485084..2fbd6f37 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 8e2b8d9f..fcaeb5cc 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 7eb3ca1d..be143b19 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 51cf036e..c940c443 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/f/memphis/fid00.smk b/mpq/portrait/f/memphis/fid00.smk new file mode 100644 index 00000000..30c4784f Binary files /dev/null and b/mpq/portrait/f/memphis/fid00.smk differ diff --git a/mpq/portrait/f/memphis/fid01.smk b/mpq/portrait/f/memphis/fid01.smk new file mode 100644 index 00000000..0bc55868 Binary files /dev/null and b/mpq/portrait/f/memphis/fid01.smk differ diff --git a/mpq/portrait/f/memphis/fid02.smk b/mpq/portrait/f/memphis/fid02.smk new file mode 100644 index 00000000..f0c54760 Binary files /dev/null and b/mpq/portrait/f/memphis/fid02.smk differ diff --git a/mpq/portrait/f/memphis/fid03.smk b/mpq/portrait/f/memphis/fid03.smk new file mode 100644 index 00000000..88ecd6ec Binary files /dev/null and b/mpq/portrait/f/memphis/fid03.smk differ diff --git a/mpq/portrait/f/memphis/tlk00.smk b/mpq/portrait/f/memphis/tlk00.smk new file mode 100644 index 00000000..b4cb1be1 Binary files /dev/null and b/mpq/portrait/f/memphis/tlk00.smk differ diff --git a/mpq/portrait/f/memphis/tlk01.smk b/mpq/portrait/f/memphis/tlk01.smk new file mode 100644 index 00000000..f5b828a9 Binary files /dev/null and b/mpq/portrait/f/memphis/tlk01.smk differ diff --git a/mpq/portrait/f/memphis/tlk02.smk b/mpq/portrait/f/memphis/tlk02.smk new file mode 100644 index 00000000..40c9c039 Binary files /dev/null and b/mpq/portrait/f/memphis/tlk02.smk differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 24b25610..d7f1a695 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -317,9 +317,9 @@ Spider Mines<0> Goremasts<0> Piety Wards<0> Morrigan Requires:<10> Covenant<0> -f<1><4>Train Morrigan <1>(<3>G<1>)<10>Crowd-control infantry.<0> +g<1><4>Train Morrigan <1>(<3>G<1>)<10>Crowd-control infantry.<0> ¤<3><4>Dampening Field <2>(passive)<10>This combatant becomes cloaked for 2 seconds after attacking.<0> -a<1><4>Bestow Maverick <1>(<3>F<1>)<10>Disciplined infantry.<0> +a<1><4>Bestow Maverick <1>(<3>A<1>)<10>Disciplined infantry.<0> ¤<3><4>Accelerated Speech <2>(passive)<10>While the Missionary is within 2 range of its target, it gains +2 armor penetration.<0> ¤<3><4>Flanking Spines <2>(passive)<10>When targeting debuffed enemies, Almaksalisk attacks ignore armor.<0> Anchor Attack requires:<10> Loaded ranged combatant<0> @@ -496,7 +496,7 @@ r<3><4>Aural Assault <1>(<3>R<1>)<10>Fires a projectile that blinds all targets Okrimnil Aspect requires:<10> Chokral Chazsal<0> ¤<3><4>Fleeting Focus <2>(passive)<10>When struck by a mobile hostile within 2 range, Strigas repulse their attacker backwards by 1 range.<0> z<3><4>Lobotomize <1>(<3>Z<1>)<10>Detonates the Lobotomy Mine immediately, applying its slow effects to all combatants within 2 range.<0> -c<3><4>Conflagrate <1>(<3>Z<1>)<10>Detonates the Tartarus Mine immediately, applying its armor rend to all combatants within 2 range.<0> +c<3><4>Conflagrate <1>(<3>C<1>)<10>Detonates the Tartarus Mine immediately, applying its armor rend to all combatants within 2 range.<0> c<3><4>Controlled Demolition <1>(<3>C<1>)<10>After 10 seconds, the structure explodes in a controlled demolition, dealing no damage to nearby targets. This process can be cancelled.<0> e<3><4>Emergency Detonation <1>(<3>E<1>)<10>After 3 seconds, the structure self-destructs violently, dealing up to 250 damage to all targets within 3 range.<0> ¤<3><4>Scrapworld: Gold Rush <2>(passive)<10>This combatant's attacks debuff hostiles for 2 seconds. If a victim dies during this time, its corpse is salvaged, granting this combatant's owner 25% of their victim's resource cost.<0> @@ -817,7 +817,7 @@ Game Menu (<3>F10<1>)<0> ¤<3><4>Astral Splendor <2>(passive)<10>Once every 2 seconds, this core restores 10 shields to allies within 8 range. Allies can only be restored once every 2 seconds.<0> x<1><4>Build Cestus <1>(<3>X<1>)<10>Warding outpost.<0> b<1><4>Warp in Bulwark <1>(<3>B<1>)<10>Protective core.<0> -v<1><4>Morph into Yblyleth <1>(<3>V<1>)<10>Expanding strain.<0> +g<1><4>Morph into Yblyleth <1>(<3>G<1>)<10>Expanding strain.<0> ¤<3><4>Cagra Autophagy <2>(passive)<10>Every 2 seconds while burrowed, Yblyleths consume the closest corpse within 5 range, spawning 2 Rilirokors.<0> ¤<3><4>Cagragenesis <2>(passive)<10>While burrowed, this strain generates cagra in an 8-tile radius.<0> ¤<3><4>Corrosive Touch <2>(passive)<10>This strain's air attacks debuff enemies, increasing attack cooldown by 25% and reducing armor by 1 for 3 seconds.<0> @@ -954,7 +954,7 @@ Crematorium requires:<10> Conduit<0> Paraclete requires:<10> Bestiary<0> v<1><4>Morph into Zethalor <1>(<3>V<1>)<10>Swarming artillery strain.<0> Zethar Aspect requires:<10> Vornath Pond<0> -r<1><4>Morph into Scrylyleth <1>(<3>V<1>)<10>Territorial strain.<0> +g<1><4>Morph into Scrylyleth <1>(<3>G<1>)<10>Territorial strain.<0> Scrylyl Aspect requires:<10> Irol Iris<0> c<1><4>Install Conduit <1>(<3>C<1>)<10>Ashen relay.<0> Conduit Requires<10> Proscenium OR Zylode<0> @@ -1000,16 +1000,16 @@ v<1><4>Meld Tortare <1>(<3>V<1>)<10>Heavy corvette.<0> d<1><4>Meld Cybrene <1>(<3>D<1>)<10>Supreme cruiser.<0> Tortare requires:<10> Lekrot<0> Cybrene requires:<10> Hearthshard<0> -c<1><4>Install Lekrot <1>(<3>S<1>)<10>Manipulation relay.<0> +c<1><4>Install Lekrot <1>(<3>C<1>)<10>Manipulation relay.<0> Lekrot Requires<10> Panoply OR Lotiro<0> -t<1><4>Install Hearthshard <1>(<3>S<1>)<10>Immortal relay.<0> +t<1><4>Install Hearthshard <1>(<3>T<1>)<10>Immortal relay.<0> Hearthshard Requires<10> Panoply OR Lotiro<0> Zytryleth Requires:<10> Othstol Oviform<0> t<1><4>Bleed Thrombocyte <1>(<3>T<1>)<10>Regenerative biode.<0> b<3><4>Bloody Burst <1>(<3>B<1>)<10>Bursts the Thrombocyte, releasing a pulse that heals allies within 3 range for the Thrombocyte's current health.<0> ¤<3><4>Coagulation <2>(passive)<10>This combatant's attacks heal allies equal to damage dealt.<0> ¤<3><4>Portents <2>(passive)<10>When this combatant receives damage, it becomes cloaked, and decloaks after 2 seconds of not taking damage.<0> -t<1><4>Build Arquebus <1>(<3>C<1>)<10>Incendiary platform.<0> +c<1><4>Build Arquebus <1>(<3>C<1>)<10>Incendiary platform.<0> ¤<3><4>Forlorn Haste <2>(passive)<10>While isolated within 3 range, this combatant gains 200% movement speed.<0> t<1><4>Morph into Alzurokor <1>(<3>T<1>)<10>Subjugation strain.<0> Alzur Aspect requires:<10> Ulgorg Cavern<0> @@ -1380,7 +1380,7 @@ s<1><4>Build Treasury <1>(<3>S<1>)<10>Frontier town center.<0> ¤<3><4>Tranquility Array <2>(passive)<10>Upon taking shield damage, the Golem radiates energy, restoring 2 shields for allies within 3 range.<0> <0> ¤<3><4>Interception <2>(passive)<10>This combatant's projectiles can be intercepted by hostiles.<0> -t<3><4>Nanite Field <2>(passive)<10>Every second, Shamans release a pulse that heals allies within 3 range for 8 HP.<10>An ally cannot be healed by a Shaman more than once per second.<0> +¤<3><4>Nanite Field <2>(passive)<10>Every second, Shamans release a pulse that heals allies within 3 range for 8 HP.<10>An ally cannot be healed by a Shaman more than once per second.<0> ¤<3><4>Virile Coating <2>(passive)<10>Victims of the Tetcaerokor's attacks begin incubating, birthing 1 Rililisk if they survive for 2 seconds.<10><10>This status cannot be applied if the target is already incubating.<0> r<1><4>Warp in Automaton Register <1>(<3>R<1>)<10>Heavy robotic production.<0> z<1><4>Mutate into Alkag Iteth <1>(<3>Z<1>)<10>Assault node. Enables Kagralisks, Evigrilisks, and Almaksalisks.<0> @@ -1804,7 +1804,7 @@ Algoz Aspect requires:<10> Chokral Chazsal<0> ¤<3><4>Fan of Teeth <2>(passive)<10>Upon taking damage, this strain launches a retaliatory bone in the direction of their attacker that travels up to 3 range, piercing any hostiles in its path.<0> Cherbrath Aspect requires:<10> Chokral Chazsal<0> c<1><4>Morph into Cherbrathalor <1>(<3>C<1>)<10>Crowd-controlling artillery strain.<0> -e<3><4>Sublime Shepherd <2>(passive)<10>All allies within 6 range of the source gain +2 armor when facing incoming attacks.<0> +¤<3><4>Sublime Shepherd <2>(passive)<10>All allies within 6 range of the source gain +2 armor when facing incoming attacks.<0> ¤<3><4>Ocsal Gestation <2>(passive)<10>This cell generates one Ocsal Larva every 14 seconds. Ocsal Larvae morph directly into mutated strains.<0> ¤<3><4>Swarmhold <2>(passive)<10>This cell generates one Larva every 14 seconds. Larvae generated by this cell create twice as many Zerg.<0> ¤<3><4>Recursion Rounds <2>(passive)<10>Each Cyclops attack leaves behind a dangerous shell that detonates after 2 seconds, damaging all combatants within 2 range.<0> @@ -2311,9 +2311,9 @@ Gauss Launcher<0> Boreal Railguns<0> Twinstrike Cannons<0> Twinflak Cannons<0> -<0> -<0> -<0> +Hellfire Missile Pack<0> +Vigil Autocannon<0> +Flamethrower<0> <0> <0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 1a36dd08..483b4f52 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/rez/unitnames.txt b/mpq/rez/unitnames.txt index 2a1bd86f..044cd151 100644 --- a/mpq/rez/unitnames.txt +++ b/mpq/rez/unitnames.txt @@ -201,17 +201,17 @@ Terran Captaincy<0>*<0>Buildings<0> Terran Scrapyard<0>*<0>Buildings<0> Protoss Crucible<0>*<0>Buildings<0> Dark Swarm<0>*<0>Special<0> -Terran Nanite Assembly<0>*<0>Buildings<0> +Floor Missile Trap<0>*<0>Special<0> Zerg Kalkiir Lake<0>*<0>Buildings<0> Left Upper Level Door<0>*<0>Doors<0> Right Upper Level Door<0>*<0>Doors<0> Left Pit Door<0>*<0>Doors<0> Right Pit Door<0>*<0>Doors<0> -Terran Sentinel<0>*<0>Buildings<0> -Terran Tarasque<0>*<0>Factional Units<0> -Terran Anticthon<0>*<0>Ground Units<0> -Zerg Kethraj Keep<0>*<0>Buildings<0> -Terran Atelier<0>*<0>Buildings<0> +Floor Gun Trap<0>*<0>Special<0> +Left Wall Missile Trap<0>*<0>Special<0> +Left Wall Flame Trap<0>*<0>Special<0> +Right Wall Missile Trap<0>*<0>Special<0> +Right Wall Flame Trap<0>*<0>Special<0> Start Location<0>*<0>U<0> Terran Treasury<0>*<0>Buildings<0> Zerg Larvosk Cesiant<0>*<0>Buildings<0> @@ -258,10 +258,10 @@ Terran Matador<0>*<0>Ground Units<0> Terran Future Station<0>*<0>Addons<0> Zerg Zarcavrokor<0>*<0>Air Units<0> Terran Cestus<0>*<0>Buildings<0> -Terran Aerie<0>*<0>Addons<0> -Terran Pegasus<0>*<0>Air Units<0> +Terran Sentinel<0>*<0>Buildings<0> +Terran Nanite Assembly<0>*<0>Buildings<0> Terran Hippogriff<0>*<0>Air Units<0> -Terran Oberon<0>*<0>Air Units<0> +Terran Tarasque<0>*<0>Factional Units<0> Terran Aion<0>*<0>Ground Units<0> Protoss Herald<0>*<0>Ground Units<0> Protoss Epigraph<0>*<0>Air Units<0> @@ -287,7 +287,7 @@ Terran Dilettante<0>*<0>Ground Units<0> Terran Sevenstep<0>*<0>Ground Units<0> Terran Hypnagogue<0>*<0>Ground Units<0> Terran Parthenon<0>*<0>Buildings<0> -Terran Armistice<0>*<0>Ground Units<0> +Terran Anticthon<0>*<0>Ground Units<0> Terran Pythean<0>*<0>Air Units<0> Zerg Ogroszaleth<0>*<0>Ground Units<0> Zerg Spirtith Cesiant<0>*<0>Buildings<0> @@ -301,7 +301,7 @@ Terran Throneroom<0>*<0>Addons<0> Terran Emperor<0>*<0>Ground Units<0> Terran Jester<0>*<0>Ground Units<0> Zerg Agrileth<0>*<0>Ground Units<0> -unused<0>*<0>Buildings<0> +Zerg Kethraj Keep<0>*<0>Buildings<0> Protoss Sequestered Icon<0>*<0>Buildings<0> Protoss Unitary Union<0>*<0>Buildings<0> Protoss Servitor<0>*<0>Ground Units<0> diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index bafe69d1..ef658bbf 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -89,13 +89,10 @@ military paladin = 186 military savant = 187 military blackjack = 195 military claymore = 196 -military anticthon = 211 military sundog = 253 military ancile = 255 military matador = 256 -military pegasus = 261 military hippogriff = 262 -military oberon = 263 military aion = 264 military wendigo = 275 military southpaw = 276 @@ -105,7 +102,7 @@ military cataphract = 283 military dilettante = 285 military sevenstep = 286 military hypnagogue = 287 -military armistice = 289 +military anticthon = 289 military pythean = 290 military heir = 293 military horseman = 294 @@ -120,7 +117,7 @@ military triton = 512 military cohort = 50 military luminary = 150 military aspirant = 194 -military tarasque = 210 +military tarasque = 263 military philoc = 328 military hotshot = 395 military qilin = 398 @@ -190,14 +187,12 @@ building biotic_bastion = 190 building iron_foundry = 198 building captaincy = 199 building scrapyard = 200 -building nanite_assembly = 203 -building sentinel = 209 -building atelier = 213 building treasury = 215 building starpad = 254 building future_station = 257 building quantum_institute = 259 -building aerie = 260 +building sentinel = 260 +building nanite_assembly = 261 building mantle = 280 building apothecary = 284 building parthenon = 288 @@ -445,7 +440,6 @@ building alkag_iteth = 170 building irulent_ivoa = 181 building zorkiz_shroud = 193 building tosvrol_haunt = 197 -building kalkiir_lake = 204 building alkaj_chasm = 212 building larvosk_cesiant = 216 building geszkath_grotto = 219 @@ -453,7 +447,7 @@ building irol_iris = 224 building sibraelosk = 227 building spirtith_cesiant = 292 building skortrith_cesiant = 293 -building rakzogth_roost = 303 +building kethraj_keep = 303 building begrozith_barrow = 329 building chokral_chazsal = 330 building nephrilosk = 350 @@ -464,6 +458,7 @@ building vornath_pond = 396 building skibact_scab = 397 building eskigant = 421 building zozarc_gorge = 493 +building kalkiir_lake = 549 # Askosi units military proselyte = 443 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 6f17d194..dffc57cd 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 65264e6c..c6cd4108 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index bf86ba12..bd667089 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -2166,13 +2166,13 @@ Type 27 Init FloorMissileTrapInit Death FloorMissileTrapDeath GndAttkInit FloorMissileTrapGndAttkInit -AirAttkInit [NONE] +AirAttkInit FloorMissileTrapGndAttkInit Unused1 [NONE] GndAttkRpt FloorMissileTrapGndAttkInit -AirAttkRpt [NONE] +AirAttkRpt FloorMissileTrapGndAttkInit CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] @@ -2205,7 +2205,7 @@ FloorMissileTrapDeath: FloorMissileTrapGndAttkInit: wait 1 - attackwith 1 + attack gotorepeatattk ignorerest goto SkryrokorLocal00 @@ -2277,13 +2277,13 @@ Type 24 Init FloorMissileTrapTurretInit Death Generic_Wait1End GndAttkInit SkryrokorLocal00 -AirAttkInit [NONE] +AirAttkInit SkryrokorLocal00 Unused1 [NONE] GndAttkRpt SkryrokorLocal00 -AirAttkRpt [NONE] +AirAttkRpt SkryrokorLocal00 CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] @@ -2325,13 +2325,13 @@ Type 27 Init FloorGunTrapInit Death FloorGunTrapDeath GndAttkInit FloorGunTrapGndAttkInit -AirAttkInit [NONE] +AirAttkInit FloorGunTrapGndAttkInit Unused1 [NONE] -GndAttkRpt FloorGunTrapGndAttkInit -AirAttkRpt [NONE] +GndAttkRpt FloorGunTrapGndAttkRpt +AirAttkRpt FloorGunTrapGndAttkRpt CastSpell [NONE] GndAttkToIdle FloorGunTrapGndAttkToIdle -AirAttkToIdle [NONE] +AirAttkToIdle FloorGunTrapGndAttkToIdle Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] @@ -2363,6 +2363,10 @@ FloorGunTrapDeath: end FloorGunTrapGndAttkInit: + wait 1 + sigorder 32 + wait 4 +FloorGunTrapGndAttkRpt: wait 1 nobrkcodestart playsnd 70 # Bullet\TGoFir00.wav @@ -2371,14 +2375,6 @@ FloorGunTrapGndAttkInit: wait 1 playfram 10 wait 1 - playfram 11 - wait 1 - playfram 10 - wait 1 - playfram 11 - wait 1 - playfram 10 - wait 1 nobrkcodeend gotorepeatattk ignorerest @@ -2654,10 +2650,13 @@ WallFlameTrapType1GndAttkInit: imgoluselo 421 0 0 # FlameThrower (thingy\flamer.grp) setfldirect 12 attkshiftproj 24 + sigorder 32 wait 2 attkshiftproj 52 + sigorder 32 wait 1 attkshiftproj 80 + sigorder 32 wait 10 ignorerest goto SkryrokorLocal00 @@ -2762,10 +2761,13 @@ WallFlameTrapType2GndAttkInit: imgoluselo 421 0 0 # FlameThrower (thingy\flamer.grp) setfldirect 20 attkshiftproj 24 + sigorder 32 wait 2 attkshiftproj 52 + sigorder 32 wait 1 attkshiftproj 80 + sigorder 32 wait 10 ignorerest goto SkryrokorLocal00 @@ -4988,7 +4990,6 @@ VicereDeath: VicereGndAttkInit: wait 1 attack - attack wait 2 gotorepeatattk ignorerest @@ -5416,4 +5417,125 @@ UpperDoor2Disable: wait 2 playfram 9 sigorder 32 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2504 Floor Flame Trap (cm\n\floor-flame-trap.grp) +.headerstart +IsId 390 +Type 27 +Init FloorFlameTrapInit +Death FloorFlameTrapDeath +GndAttkInit FloorFlameTrapGndAttkInit +AirAttkInit FloorFlameTrapGndAttkInit +Unused1 [NONE] +GndAttkRpt FloorFlameTrapGndAttkInit +AirAttkRpt FloorFlameTrapGndAttkInit +CastSpell [NONE] +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 FloorFlameTrapSpecialState1 +SpecialState2 FloorFlameTrapSpecialState2 +AlmostBuilt SkryrokorLocal00 +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable FloorFlameTrapSpecialState2 +Burrow [NONE] +UnBurrow [NONE] +Enable SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +FloorFlameTrapInit: + playfram 1 + goto SkryrokorLocal00 + +FloorFlameTrapDeath: + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 1 + end + +FloorFlameTrapGndAttkInit: + wait 1 + nobrkcodestart + imgol 421 0 0 # FlameThrower (thingy\flamer.grp) + attkshiftproj 24 + sigorder 32 + wait 2 + attkshiftproj 52 + sigorder 32 + wait 1 + attkshiftproj 80 + sigorder 32 + wait 5 + nobrkcodeend + ignorerest + goto SkryrokorLocal00 + +FloorFlameTrapSpecialState1: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 10 + wait 2 + playfram 11 + imgol 2505 0 0 # Floor Flame Trap Turret (cm\n\floor-flame-trap-turret.grp) + sigorder 1 + goto SkryrokorLocal00 + +FloorFlameTrapSpecialState2: + setspawnframe 20 + wait 1 +FloorFlameTrapLocal00: + curdirectcondjmp 160 10 FloorFlameTrapLocal01 + wait 2 + goto FloorFlameTrapLocal00 + +FloorFlameTrapLocal01: + wait 1 + playfram 10 + wait 2 + playfram 9 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 1 + sigorder 1 goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 89ae4a4a..c46ec686 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index 0a9a0692..2481b557 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -11266,11 +11266,11 @@ CaptaincyInit: goto SkryrokorLocal00 CaptaincySpecialState1: - playfram 4 + playfram 10 goto SkryrokorLocal00 CaptaincyAlmostBuilt: - playfram 11 + playfram 1 goto SkryrokorLocal00 CaptaincyBuilt: @@ -11281,14 +11281,15 @@ CaptaincyLanding: nobrkcodestart wait 15 playsnd 472 # Misc\Land.WAV -# playfram 4 - wait 8 -# playfram 3 - wait 8 -# playfram 2 - wait 8 -# playfram 5 - wait 8 + wait 6 + playfram 9 + wait 3 + playfram 8 + wait 3 + playfram 7 + wait 3 + playfram 6 + wait 3 playfram 0x00 sigorder 16 nobrkcodeend @@ -11299,40 +11300,35 @@ CaptaincyLiftOff: playsnd 471 # Misc\LiftOff.WAV playfram 0x00 wait 1 -# playfram 5 - wait 8 -# playfram 2 - wait 8 -# playfram 3 - wait 8 -# playfram 4 + playfram 6 + wait 3 + playfram 7 + wait 3 + playfram 8 + wait 3 + playfram 9 + wait 3 + playfram 10 sigorder 16 nobrkcodeend goto SkryrokorLocal00 CaptaincyIsWorking: - playfram 1 - wait 2 - playfram 2 - wait 2 - playfram 3 - wait 2 - playfram 4 - wait 2 - playfram 5 - wait 2 - playfram 6 - wait 2 - playfram 7 - wait 2 - playfram 8 - wait 2 - playfram 9 - wait 2 - playfram 10 - wait 2 - playfram 0x00 + playfram 2 wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 4 + wait 2 + playfram 3 + wait 2 + playfram 2 + wait 2 + playfram 0 goto CaptaincyIsWorking CaptaincyDisable: @@ -22847,7 +22843,7 @@ MemphisFlakModeStarEditInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1523 Memphis Tank Mode Turret (cm\terran\memphis-turret.grp) +# 2499 Memphis Tank Mode Turret (cm\f-t\memphis-turret.grp) .headerstart IsId 863 Type 13 @@ -22870,7 +22866,7 @@ SpecialState1 SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1726 Memphis Turret Flak Mode (cm\terran\memphis-turret.grp) +# 2502 Memphis Turret Flak Mode (cm\f-t\memphis-turret.grp) .headerstart IsId 864 Type 14 @@ -22942,6 +22938,9 @@ CyclopsFragmentaryExplosionDamageInit: playfram 19 wait 1 playfram 20 + wait 1 + end + CyclopsFragmentaryExplosionDamageDeath: wait 1 end \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 45857c1e..897703e2 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index e22aefcb..1580f711 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -17936,7 +17936,7 @@ ZethalorGndAttkInit: ZethalorGndAttkRpt: wait 1 nobrkcodestart - playsndbtwn 3467 3469 # Zethalor weaponfire 01, 02, 03 + playsndbtwn 4367 4369 # Zethalor weaponfire 01, 02, 03 playfram 0x1A0 wait 1 playfram 0x1E0 diff --git a/mpq/unit/cm/n/floor-flame-trap-turret.grp b/mpq/unit/cm/n/floor-flame-trap-turret.grp new file mode 100644 index 00000000..20aba29d Binary files /dev/null and b/mpq/unit/cm/n/floor-flame-trap-turret.grp differ diff --git a/mpq/unit/cm/n/floor-flame-trap.grp b/mpq/unit/cm/n/floor-flame-trap.grp new file mode 100644 index 00000000..f2083f30 Binary files /dev/null and b/mpq/unit/cm/n/floor-flame-trap.grp differ diff --git a/mpq/unit/cm/t/captaincy-damage.lof b/mpq/unit/cm/t/captaincy-damage.lof index 5f3131d6..f607e670 100644 Binary files a/mpq/unit/cm/t/captaincy-damage.lof and b/mpq/unit/cm/t/captaincy-damage.lof differ diff --git a/mpq/unit/cm/t/captaincy-shadow.grp b/mpq/unit/cm/t/captaincy-shadow.grp index d837a79b..48e202d6 100644 Binary files a/mpq/unit/cm/t/captaincy-shadow.grp and b/mpq/unit/cm/t/captaincy-shadow.grp differ diff --git a/mpq/unit/cm/t/captaincy.grp b/mpq/unit/cm/t/captaincy.grp index 9836a892..f53c9fbe 100644 Binary files a/mpq/unit/cm/t/captaincy.grp and b/mpq/unit/cm/t/captaincy.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ff82bbd9..0fe61487 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index 3ad1d863..709a9f57 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 2970bff5..771479bf 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 9cb110dc..12d8c625 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 19036d4c..91766252 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -9,7 +9,9 @@ ## Core - **User Interface:** - The HUD can now be toggled with F11! (c. Jesse, b. Londier) - - *Send us your screenshots...* + - *Send us your screenshots...* + - Shift-tab now correctly sets minimap colors to red, blue, etc for replay/witness (a. Jesse & DF) + - *Additional functionality forthcoming...* - **Triggers:** - New custom trigger actions: (c. Jesse) - `set_hud` - accepts racial names for racial HUDs @@ -23,6 +25,16 @@ - Select the resource nodes you wish to assign to a specific resarea - Tick **burrowed** (bottom-left-most status flag) in the unit property panel - Set the **HP** field to the intended resarea id (a number between 1 and 255) +- **Editor / UMS:** + - Installation traps have been reimplemented! + - The following unit ids are deprecated and should be updated to the new versions in maps (unit layer and triggers): + - **Unit id: old id -> new id** + - Nanite Assembly: 203 -> 261 + - Kalkiir Lake: 204 -> 549 + - Sentinel: 209 -> 260 + - Tarasque: 210 -> 263 + - Anticthon: 211 -> 289 + - Kethraj Keep: 212 -> 303 ## Bugfixes - **Gameplay:** @@ -36,7 +48,7 @@ ## Audiovisuals - New models for: - - Ministry (c. Solstice & fasswawds) + - Ministry, Captaincy (c. Solstice & fasswawds) - Tweaked models for: - Cyprian, Eidolon, Hippogriff, Watchdog, Treasury, Quarry, Starpad, Rotary, Zethrokor, Quazilisk (c. Solstice) - Modified weapon VFX for Okrimnilisk diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a4785358..d49c9dcb 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ