diff --git a/master changelog.md b/master changelog.md index 125635e5..fab8d9cb 100644 --- a/master changelog.md +++ b/master changelog.md @@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes. See patchnotes.md for info on the most recent patch! # Table of Contents +- [23 February 2026](#23-february-2026) - [17 January 2026](#17-january-2026) - [7 January 2026](#7-january-2026) - [30 November 2025](#30-november-2025) @@ -111,6 +112,163 @@ See patchnotes.md for info on the most recent patch! - [13 August 2020](#13-august-2020) - [12 August 2020](#12-august-2020) +# 23 February 2026 +## Year 4, month 2, patch 1 + +## Patch goals +- Continue balancing for all races +- Continue Askosi development +- Further improve audiovisuals +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! + +### *Notes in italics are from Pr0nogo* + +# Core changes + +## Game Modes +- **Omnipresence:** + - Starting worker count increased from 6 to 8 + - Human players now begin with 2 **Pilgrim**s + - **Pilgrim**s are now trainable from the **Omnivale** + +## Bugfixes +- **Stability:** + - Bandaged a crash that could occur when a Larvae dies while selected (r. shopkeeper dog) + - Bandaged a rare division by zero crash related to Psi Storm (r. ArbuzBudesh) +- **Desyncs:** + - Removed floating point math for: (c. Jesse, some a. Veeq7) + - Weapon cooldown changes + - Weapon & sight ranges + - Structure HP gain (e.g. **Askosi** teambuild cases) + - Lifesteal and shieldsteal + - Morningstar damage + - Clarion Phase Link distribution + - CPU unit / structure requests + - CPU micromanagement +- **Gameplay:** + - Fixed target acquisition range for air weapons (e.g. **Nathrokor**) + - Askosi constructing has been improved (a. DF) + - Hijacked units with more than 100 current HP are no longer set to 100 HP (r. shopkeeper dog) + - Improved attack responsivity for **Akreno** (r. jakulangski) + - Corrected **Phontis** attack damage (r. Hamster) + - Fixed **Apostle - Blood Tithe** range (r. Jesse) + - **Agonists** can no longer attack from mobile **Petracts** (r. Hamster) + - Fixed **Yblyleth** command card while burrowed (r. Vilius) + - Fixed damage reliability for **Quazrokors** (r. Alexhandr) + - **Quazrokors** can now correctly target air units (r. lolrsk8s) + - Resolved unit limit error for maps with more than 1700 preplaced units (c. DF) +- **Audiovisual** + - Fixed missing animation error for **Axitrilisk** (r. Sosij) + - Fixed header too short error for large explosions (r. The Shambler) + - Fixed invalid shield overlay for **Rove** + - Corrected strings for being out of energy as Askosi (r. Sosij) + - Filled in wireframes for **Avatar** and **Phontis** (placeholder) + - Added missing **Multi-Attack III** passive button for **Starbound Manifold** (r. Concealed Organic) + - Lardfix: Civilian (Blackjack) portrait now plays talking animations (r. lolrsks8s) + +## Audiovisuals +- New model for: + - **Autocrat** +- Tweaked model for: + - **Apostle** +- New portraits for: (many c. jun3hong, some c. lolrsk8s) + - **TERRAN:** Maverick (Futurist & Upstart), Arhaun, Blackguard, Blackjack (Golden), Cleric (Futurist), Cyclops (Futurist), Harakan (Golden), Qilin, Tiangou + - **PROTOSS:** Cicatus, Dracadin (Order), Ecclesiast (Khalendric), Extatus, Manifold (Starbound), Renesair, Zealot (Starbound) + - **ZERG:** Quazrokor, Hydralisk (Orkoti) + - **ASKOSI:** Auxine +- New cast SFX for **Seraph Irradiate** +- Added almost built frame for: + - **Landlock**, **Grandstand**, **Radix** +- Added damage overlay for: + - **Landlock** + +# Balance changes + +## Terran +- [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): + - Resource costs 75/200 » 75/150 + - Now has 150 max energy + - Now spends 5 energy every **Blood Tithe** proc + - Now spends 20 energy every **Lazarus Agent** proc + - Prioritizes **Blood Tithe** +- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): + - Resource costs 125/250 » 125/200 + - Now has 100 max energy + - Now spends 25 energy every **Reclamation Fields** proc +- [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): + - Resource costs 250/350 » 250/300 + - Now has 200 max energy + - Now spends 25 energy every **Counter-Proposal** proc +- [Aion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aion): + - Resource costs 450/450 » 450/350 + - Now has 200 max energy + - Now spends 25 energy every **Reclamation Fields** proc + +## Protoss +- [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge): + - Resource costs 200/350 » 200/300 + - Now has 100 max energy + - Now spends 10 energy every **Worship** proc + +## Zerg +- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk): + - **NEW: Avenging Mitosis:** + - Incubates on damage taken, spawning a Skryrokor after a short delay. + +## Askosi +- **Hijack:** + - Now procs when a unit that is being hijacked dies + - Now restores 100 flat HP on proc +- [Pilgrim](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/pilgrim): + - Now has **Scrapworld: Gold Rush** +- [Constituent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/constituent): + - Resource costs 50/25 » 50/50 + - Build time 14 » 18 + - Movement speed 5.8 » 6.6 + - Now trained at Landlock, from Bounty + - Now requires Proscenium OR Zylode +- [Chantry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/chantry): + - **Sermon Salve:** + - Now gives units cloaking until their next attack / notable action +- [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): + - Resource costs 200/300 » 150/250 + - Placement size 4x3 » 3x3 + - Collision size adjusted to better match new graphic + - **NEW: Scrapworld: Gold Rush** + - Salvages one corpse within 8 range every second +- [Proscenium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/proscenium): + - Resource costs 200/50 » 175/50 +- [Zylode](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/zylode): + - Resource costs 350/50 » 250/75 +- [Astrolabe](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/astrolabe): + - Resource costs 200/200 » 200/150 +- [Cosmoscope](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cosmoscope): + - Resource costs 100/150 » 100/100 + +# New units + +## Askosi +- [Zonguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/zonguard): + - Tier 2 mechanized -- durable mechbeast with Preylock ability +- [Paraclete](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/paraclete): + - Tier 2 skybound -- potent skybeast with Remote Hijack ability +- [Dorminge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dorminge): + - Tier 2 infrastructure -- shrine that slows movement speed of nearby hostiles +- [Domain](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/domain) + - Tier 3 infrastructure -- town center that harvests resources passively + +## Futurist Federation +- [Cutlass](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cutlass): + - Matador replacement with Kinetic Penetration and no deployment + +## Upstart Terrans +- [Maverick (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick-upstart): + - Frailer Maverick variant with faster-acting, less intense Stimpack +- [Vulture (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture-upstart): + - Faster Vulture variant that lays [Goremast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goremast)s +- [Broadside](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/broadside): + - Phalanx replacement with Fore Castle and no deployment + # 27 January 2026 ## Year 4, month 1, patch 2 diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index c3d8fb34..6a8f2e41 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 5cb85467..3b297df4 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -673,30 +673,30 @@ Dorminge Domain Panoply Lotiro -Extended Flingy #467 -Extended Flingy #468 -Extended Flingy #469 -Extended Flingy #470 -Extended Flingy #471 -Extended Flingy #472 -Extended Flingy #473 -Extended Flingy #474 -Extended Flingy #475 -Extended Flingy #476 -Extended Flingy #477 -Extended Flingy #478 -Extended Flingy #479 -Extended Flingy #480 -Extended Flingy #481 -Extended Flingy #482 -Extended Flingy #483 -Extended Flingy #484 -Extended Flingy #485 -Extended Flingy #486 -Extended Flingy #487 -Extended Flingy #488 -Extended Flingy #489 -Extended Flingy #490 +Pathlight +Ferrum +Chalyb +Circitor +Exigo +Athla +Vicere +Machinamentum +Big Infested Kerrigan +Lekrot +Hearthshard +Insurant +Silversoul +Ghostwrit +Azjoran +Elgird +Histrion +Egocent +Alacyne +Begolor +Limire +Endbore +Tortare +Cybrene Extended Flingy #491 Extended Flingy #492 Extended Flingy #493 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 32a1140e..46f6e55e 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 002fba99..7639d08c 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 de064018..ffde5127 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2331,65 +2331,65 @@ Panoply Panoply Shadow Lotiro Lotiro Shadow -Extended Image #1331 -Extended Image #1332 -Extended Image #1333 -Extended Image #1334 -Extended Image #1335 -Extended Image #1336 -Extended Image #1337 -Extended Image #1338 -Extended Image #1339 -Extended Image #1340 -Extended Image #1341 -Extended Image #1342 -Extended Image #1343 -Extended Image #1344 -Extended Image #1345 -Extended Image #1346 -Extended Image #1347 -Extended Image #1348 -Extended Image #1349 -Extended Image #1350 -Extended Image #1351 -Extended Image #1352 -Extended Image #1353 -Extended Image #1354 -Extended Image #1355 -Extended Image #1356 -Extended Image #1357 -Extended Image #1358 -Extended Image #1359 -Extended Image #1360 -Extended Image #1361 -Extended Image #1362 -Extended Image #1363 -Extended Image #1364 -Extended Image #1365 -Extended Image #1366 -Extended Image #1367 -Extended Image #1368 -Extended Image #1369 -Extended Image #1370 -Extended Image #1371 -Extended Image #1372 -Extended Image #1373 -Extended Image #1374 -Extended Image #1375 -Extended Image #1376 -Extended Image #1377 -Extended Image #1378 -Extended Image #1379 -Extended Image #1380 -Extended Image #1381 -Extended Image #1382 -Extended Image #1383 -Extended Image #1384 -Extended Image #1385 -Extended Image #1386 -Extended Image #1387 -Extended Image #1388 -Extended Image #1389 +Pathlight +Pathlight Shadow +Ferrum +Ferrum Shadow +Ferrum Warp Flash +Chalyb +Chalyb Shadow +Chalyb Warp Flash +Circitor +Circitor Shadow +Circitor Warp Flash +Exigo +Exigo Shadow +Exigo Warp Flash +Athla +Athla Shadow +Athla Warp Flash +Vicere +Vicere Shadow +Vicere Warp Flash +Machinamentum +Machinamentum Shadow +Machinamentum Warp Flash +Big Infested Kerrigan +Big Infested Kerrigan Shadow +Lekrot +Lekrot Shadow +Hearthshard +Hearthshard Shadow +Insurant +Insurant Shadow +Silversoul +Silversoul Shadow +Ghostwrit +Ghostwrit Shadow +Azjoran +Azjoran Shadow +Elgird +Elgird Shadow +Histrion +Histrion Shadow +Egocent +Egocent Shadow +Alacyne +Alacyne Shadow +Begolor +Begolor Shadow +Limire +Limire Shadow +Endbore +Endbore Shadow +Tortare +Tortare Shadow +Cybrene +Cybrene Shadow +Silversoul Remains +Alacyne Engine +Elgird Engine +Histrion Engine Extended Image #1390 Extended Image #1391 Extended Image #1392 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index bf5b9fcd..48657279 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index 64832c0e..880265aa 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -14,7 +14,7 @@ Use Ability (Rematerialize) Use Ability (Rapid Rendezvous) Attack Move Building Is Being Infested -Nothing 1 (Unused) +Use Ability (Ashbind) Power-Up (Unused) Guard (Building) Attack (Building) diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 0a1c0068..c4fba298 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.tbl b/mpq/arr/portdata.tbl index 354b966f..5f248b1e 100644 Binary files a/mpq/arr/portdata.tbl and b/mpq/arr/portdata.tbl differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index 5dea8953..28abb5e8 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -304,9 +304,9 @@ Hydralisk (Orkoti) Maverick (Golden) Auxine Boyeau -Extended Portrait #197 -Extended Portrait #198 -Extended Portrait #199 +Ferrum +Prophet 1 +Prophet 2 Extended Portrait #200 Extended Portrait #201 Extended Portrait #202 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index b3657489..30e2b677 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4199,38 +4199,38 @@ Warring Winds Proc 01 Warring Winds Proc 02 Warring Winds Proc 03 Warring Winds Proc Final -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Cloak Zerg On +Cloak Zerg Off +Cloak Askosi On +Cloak Askosi Off +Ferrum Weaponfire 01 +Ferrum Weaponfire 02 +Ferrum Weaponfire 03 +Insurant Weaponfire 01 +Insurant Weaponfire 02 +Insurant Weaponfire 03 +Ghostwrit Weaponfire 01 +Ghostwrit Weaponfire 02 +Ghostwrit Weaponfire 03 +Ferrum Death 01 +Ferrum Death 02 +Ferrum Weaponhit 01 +Ferrum Weaponhit 02 +Ferrum Weaponhit 03 +Ferrum Weaponhit 04 +Exigo Weaponfire 01 +Exigo Weaponfire 02 +Exigo Weaponfire 03 +Exigo Weaponfire 04 +Vicere Weaponfire 01 +Vicere Weaponfire 02 +Elgird Weaponfire 01 +Elgird Weaponfire 02 +Elgird Weaponfire 03 +Elgird Weaponfire 04 +Histrion Weaponfire 01 +Histrion Weaponfire 02 +Histrion Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index df6d5c57..a1bca1a2 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4198,4 +4198,42 @@ Zerg\AVENGER\ZAvRdy00.WAV cm\a\phontis\pas-proc-a-01.wav cm\a\phontis\pas-proc-a-02.wav cm\a\phontis\pas-proc-a-03.wav -cm\a\phontis\pas-proc-b-01.wav \ No newline at end of file +cm\a\phontis\pas-proc-b-01.wav +cm\z\cloak-zerg-on.wav +cm\z\cloak-zerg-off.wav +cm\a\cloak-askosi-on.wav +cm\a\cloak-askosi-off.wav +hl\fr\ferrum\wf-01.wav +hl\fr\ferrum\wf-02.wav +hl\fr\ferrum\wf-03.wav +cm\a\insurant\wf-01.wav +cm\a\insurant\wf-02.wav +cm\a\insurant\wf-03.wav +cm\a\ghostwrit\wf-01.wav +cm\a\ghostwrit\wf-02.wav +cm\a\ghostwrit\wf-03.wav +hl\fr\ferrum\dth-01.wav +hl\fr\ferrum\dth-02.wav +hl\fr\ferrum\wh-01.wav +hl\fr\ferrum\wh-02.wav +hl\fr\ferrum\wh-03.wav +hl\fr\ferrum\wh-04.wav +hl\fr\exigo\wf-01.wav +hl\fr\exigo\wf-02.wav +hl\fr\exigo\wf-03.wav +hl\fr\exigo\wf-04.wav +hl\fr\vicere\wf-01.wav +hl\fr\vicere\wf-02.wav +cm\a\elgird\wf-01.wav +cm\a\elgird\wf-02.wav +cm\a\elgird\wf-03.wav +cm\a\elgird\wf-04.wav +cm\a\histrion\wf-01.wav +cm\a\histrion\wf-02.wav +cm\a\histrion\wf-03.wav +cm\a\alacyne\wf-01.wav +cm\a\alacyne\wf-02.wav +cm\a\alacyne\wf-03.wav +cm\a\silversoul\wf-01.wav +cm\a\silversoul\wf-02.wav +cm\a\silversoul\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 76af1c7f..aca22926 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 8897300a..4add0aa3 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1105,8 +1105,8 @@ Crematorium Paraclete Zethalor Scrylyleth -Thaumalogue Remnants -Zethalor Remnants +Thaumalogue Remains +Zethalor Remains Conduit Bestiary Eyelet @@ -1128,31 +1128,31 @@ Dorminge Domain Panoply Lotiro -Extended Sprite #614 -Extended Sprite #615 -Extended Sprite #616 -Extended Sprite #617 -Extended Sprite #618 -Extended Sprite #619 -Extended Sprite #620 -Extended Sprite #621 -Extended Sprite #622 -Extended Sprite #623 -Extended Sprite #624 -Extended Sprite #625 -Extended Sprite #626 -Extended Sprite #627 -Extended Sprite #628 -Extended Sprite #629 -Extended Sprite #630 -Extended Sprite #631 -Extended Sprite #632 -Extended Sprite #633 -Extended Sprite #634 -Extended Sprite #635 -Extended Sprite #636 -Extended Sprite #637 -Extended Sprite #638 +Pathlight +Ferrum +Chalyb +Circitor +Exigo +Athla +Vicere +Machinamentum +Big Infested Kerrigan +Lekrot +Hearthshard +Insurant +Silversoul +Ghostwrit +Azjoran +Elgird +Histrion +Egocent +Alacyne +Begolor +Limire +Endbore +Tortare +Cybrene +Silversoul Remains Extended Sprite #639 Extended Sprite #640 Extended Sprite #641 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 6c67aeb3..a5e90acb 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/techdata.txt b/mpq/arr/techdata.txt index 9bd4043b..2b875df5 100644 --- a/mpq/arr/techdata.txt +++ b/mpq/arr/techdata.txt @@ -1,7 +1,7 @@ Stim Packs (Maverick) Lobotomy Grenade (Francisco Goska) Controlled Demolition (Terran) -Terran Mines (+ Proselyte) +Terran Mines and Askosi Wards Scanner Sweep (Comsat Station) Deployed Mode (Terran) Defensive Matrix (Azazel) @@ -13,13 +13,13 @@ Burrowing (Zerg) Rejoinder of Service (Serathiel) Ensnaring Brood (Matraleth) Carapace Swarm (Isthrathaleth) -Plague (Ogroszaleth) +Plague (Isthrathaleth) Remote Hijack (Askosi) Land Grab (Wyvern) Parasitic Excision (Matraleth) Psionic Storm (Cantavis) Hallucination (Cantavis) -Recall (Didact) +Dimensional Recall (Didact) Stasis Field (Didact) Rematerialize (Askosi) Preylock (Askosi) @@ -33,13 +33,13 @@ Maelstrom (Mind Tyrant) Lazarus Agent (Apostle) Select Swarm (Larva) Healing (Cleric) -Enthralling Assault (Akistrokor) +Blissful Embrace (Zerg) Hijack (Askosi) -Skyfall (Paladin) +Ashbind (Askosi) Select Assault (Larva) Emergency Detonation (Terran) Sublime Shepherd (Azazel) -Salvage (Talos) +Salvage (Askosi) Through the Looking Glass (Hypnagogue) None None @@ -50,7 +50,7 @@ Remote Hijack (Askosi) Preylock (Askosi) Lobotomy Grenade (Goska dupe) Skryspawn (Stroluum) -Extended Tech #9 +Puppeteer (Askosi) Extended Tech #10 Extended Tech #11 Extended Tech #12 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 12ffcb04..69642f34 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 1c15ff7d..a6e4fd1a 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -588,29 +588,29 @@ Askosi Azjoran Askosi Elgird Askosi Histrion Askosi Egocent -Extended Unit #363 +Askosi Alacyne Askosi Begolor -Extended Unit #365 -Extended Unit #366 -Extended Unit #367 -Extended Unit #368 +Askosi Limire +Askosi Endbore +Askosi Tortare +Askosi Cybrene Askosi Lekrot Askosi Hearthshard -Extended Unit #371 -Extended Unit #372 -Extended Unit #373 -Extended Unit #374 -Extended Unit #375 -Extended Unit #376 -Extended Unit #377 -Extended Unit #378 -Extended Unit #379 -Extended Unit #380 -Extended Unit #381 -Extended Unit #382 -Extended Unit #383 -Extended Unit #384 -Extended Unit #385 +Terran Nuriel +Terran Phoenix +Terran Archbishop +Protoss Pathlight +Protoss Saladius +Protoss Garantis +Zerg Zoltorokor +Forerunner Ferrum +Forerunner Chalyb +Forerunner Circitor +Forerunner Exigo +Forerunner Athla +Forerunner Vicere +Forerunner Machinamentum +Big Infested Kerrigan Extended Unit #386 Extended Unit #387 Extended Unit #388 diff --git a/mpq/arr/upgrades.datex b/mpq/arr/upgrades.datex index 7b60f7de..cfcee2aa 100644 Binary files a/mpq/arr/upgrades.datex and b/mpq/arr/upgrades.datex differ diff --git a/mpq/arr/upgrades.txt b/mpq/arr/upgrades.txt index 9df5a2a7..36336578 100644 --- a/mpq/arr/upgrades.txt +++ b/mpq/arr/upgrades.txt @@ -58,4 +58,43 @@ Askosi Structure Bolting Protoss Structure Armor Zerg Structure Armor Terran Structure Armor -Unknown Upgrade60 \ No newline at end of file +GlobalUpgrade60 +Forerunner Alloy +Forerunner Lattice +Extended Upgrade #3 +Extended Upgrade #4 +Extended Upgrade #5 +Extended Upgrade #6 +Extended Upgrade #7 +Extended Upgrade #8 +Extended Upgrade #9 +Extended Upgrade #10 +Extended Upgrade #11 +Extended Upgrade #12 +Extended Upgrade #13 +Extended Upgrade #14 +Extended Upgrade #15 +Extended Upgrade #16 +Extended Upgrade #17 +Extended Upgrade #18 +Extended Upgrade #19 +Extended Upgrade #20 +Extended Upgrade #21 +Extended Upgrade #22 +Extended Upgrade #23 +Extended Upgrade #24 +Extended Upgrade #25 +Extended Upgrade #26 +Extended Upgrade #27 +Extended Upgrade #28 +Extended Upgrade #29 +Extended Upgrade #30 +Extended Upgrade #31 +Extended Upgrade #32 +Extended Upgrade #33 +Extended Upgrade #34 +Extended Upgrade #35 +Extended Upgrade #36 +Extended Upgrade #37 +Extended Upgrade #38 +Extended Upgrade #39 \ No newline at end of file diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index ed91c27e..22aafa60 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 9ad1851c..bc61101a 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 e79046f9..be4965dc 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index e9a49388..61ace05f 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index c203b230..586c6026 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 8a889f00..1fe37232 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/askosi/advisor/fid00.smk b/mpq/portrait/a/advisor/fid00.smk similarity index 100% rename from mpq/portrait/askosi/advisor/fid00.smk rename to mpq/portrait/a/advisor/fid00.smk diff --git a/mpq/portrait/askosi/auxine/fid00.smk b/mpq/portrait/a/auxine/fid00.smk similarity index 100% rename from mpq/portrait/askosi/auxine/fid00.smk rename to mpq/portrait/a/auxine/fid00.smk diff --git a/mpq/portrait/askosi/auxine/tlk00.smk b/mpq/portrait/a/auxine/tlk00.smk similarity index 100% rename from mpq/portrait/askosi/auxine/tlk00.smk rename to mpq/portrait/a/auxine/tlk00.smk diff --git a/mpq/portrait/askosi/avatar/fid00.smk b/mpq/portrait/a/avatar/fid00.smk similarity index 100% rename from mpq/portrait/askosi/avatar/fid00.smk rename to mpq/portrait/a/avatar/fid00.smk diff --git a/mpq/portrait/askosi/avatar/fid01.smk b/mpq/portrait/a/avatar/fid01.smk similarity index 100% rename from mpq/portrait/askosi/avatar/fid01.smk rename to mpq/portrait/a/avatar/fid01.smk diff --git a/mpq/portrait/askosi/avatar/fid02.smk b/mpq/portrait/a/avatar/fid02.smk similarity index 100% rename from mpq/portrait/askosi/avatar/fid02.smk rename to mpq/portrait/a/avatar/fid02.smk diff --git a/mpq/portrait/askosi/avatar/fid03.smk b/mpq/portrait/a/avatar/fid03.smk similarity index 100% rename from mpq/portrait/askosi/avatar/fid03.smk rename to mpq/portrait/a/avatar/fid03.smk diff --git a/mpq/portrait/askosi/avatar/tlk00.smk b/mpq/portrait/a/avatar/tlk00.smk similarity index 100% rename from mpq/portrait/askosi/avatar/tlk00.smk rename to mpq/portrait/a/avatar/tlk00.smk diff --git a/mpq/portrait/askosi/avatar/tlk01.smk b/mpq/portrait/a/avatar/tlk01.smk similarity index 100% rename from mpq/portrait/askosi/avatar/tlk01.smk rename to mpq/portrait/a/avatar/tlk01.smk diff --git a/mpq/portrait/askosi/avatar/tlk02.smk b/mpq/portrait/a/avatar/tlk02.smk similarity index 100% rename from mpq/portrait/askosi/avatar/tlk02.smk rename to mpq/portrait/a/avatar/tlk02.smk diff --git a/mpq/portrait/faction/adherent/fid00.smk b/mpq/portrait/f/adherent/fid00.smk similarity index 100% rename from mpq/portrait/faction/adherent/fid00.smk rename to mpq/portrait/f/adherent/fid00.smk diff --git a/mpq/portrait/faction/adherent/fid01.smk b/mpq/portrait/f/adherent/fid01.smk similarity index 100% rename from mpq/portrait/faction/adherent/fid01.smk rename to mpq/portrait/f/adherent/fid01.smk diff --git a/mpq/portrait/faction/adherent/fid02.smk b/mpq/portrait/f/adherent/fid02.smk similarity index 100% rename from mpq/portrait/faction/adherent/fid02.smk rename to mpq/portrait/f/adherent/fid02.smk diff --git a/mpq/portrait/faction/adherent/tlk00.smk b/mpq/portrait/f/adherent/tlk00.smk similarity index 100% rename from mpq/portrait/faction/adherent/tlk00.smk rename to mpq/portrait/f/adherent/tlk00.smk diff --git a/mpq/portrait/faction/adherent/tlk01.smk b/mpq/portrait/f/adherent/tlk01.smk similarity index 100% rename from mpq/portrait/faction/adherent/tlk01.smk rename to mpq/portrait/f/adherent/tlk01.smk diff --git a/mpq/portrait/faction/advisor_futuristfederation/fid00.smk b/mpq/portrait/f/advisor_futuristfederation/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_futuristfederation/fid00.smk rename to mpq/portrait/f/advisor_futuristfederation/fid00.smk diff --git a/mpq/portrait/faction/advisor_futuristfederation/fid01.smk b/mpq/portrait/f/advisor_futuristfederation/fid01.smk similarity index 100% rename from mpq/portrait/faction/advisor_futuristfederation/fid01.smk rename to mpq/portrait/f/advisor_futuristfederation/fid01.smk diff --git a/mpq/portrait/faction/advisor_futuristfederation/tlk00.smk b/mpq/portrait/f/advisor_futuristfederation/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_futuristfederation/tlk00.smk rename to mpq/portrait/f/advisor_futuristfederation/tlk00.smk diff --git a/mpq/portrait/faction/advisor_goldenrepublic/fid00.smk b/mpq/portrait/f/advisor_goldenrepublic/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_goldenrepublic/fid00.smk rename to mpq/portrait/f/advisor_goldenrepublic/fid00.smk diff --git a/mpq/portrait/faction/advisor_goldenrepublic/tlk00.smk b/mpq/portrait/f/advisor_goldenrepublic/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_goldenrepublic/tlk00.smk rename to mpq/portrait/f/advisor_goldenrepublic/tlk00.smk diff --git a/mpq/portrait/faction/advisor_imicren/fid00.smk b/mpq/portrait/f/advisor_imicren/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_imicren/fid00.smk rename to mpq/portrait/f/advisor_imicren/fid00.smk diff --git a/mpq/portrait/faction/advisor_khalendricknights/fid00.smk b/mpq/portrait/f/advisor_khalendricknights/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_khalendricknights/fid00.smk rename to mpq/portrait/f/advisor_khalendricknights/fid00.smk diff --git a/mpq/portrait/faction/advisor_khalendricknights/fid01.smk b/mpq/portrait/f/advisor_khalendricknights/fid01.smk similarity index 100% rename from mpq/portrait/faction/advisor_khalendricknights/fid01.smk rename to mpq/portrait/f/advisor_khalendricknights/fid01.smk diff --git a/mpq/portrait/faction/advisor_khalendricknights/tlk00.smk b/mpq/portrait/f/advisor_khalendricknights/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_khalendricknights/tlk00.smk rename to mpq/portrait/f/advisor_khalendricknights/tlk00.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid00.smk b/mpq/portrait/f/advisor_nydustrinity/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/fid00.smk rename to mpq/portrait/f/advisor_nydustrinity/fid00.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid01.smk b/mpq/portrait/f/advisor_nydustrinity/fid01.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/fid01.smk rename to mpq/portrait/f/advisor_nydustrinity/fid01.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/fid02.smk b/mpq/portrait/f/advisor_nydustrinity/fid02.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/fid02.smk rename to mpq/portrait/f/advisor_nydustrinity/fid02.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk00.smk b/mpq/portrait/f/advisor_nydustrinity/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/tlk00.smk rename to mpq/portrait/f/advisor_nydustrinity/tlk00.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk01.smk b/mpq/portrait/f/advisor_nydustrinity/tlk01.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/tlk01.smk rename to mpq/portrait/f/advisor_nydustrinity/tlk01.smk diff --git a/mpq/portrait/faction/advisor_nydustrinity/tlk02.smk b/mpq/portrait/f/advisor_nydustrinity/tlk02.smk similarity index 100% rename from mpq/portrait/faction/advisor_nydustrinity/tlk02.smk rename to mpq/portrait/f/advisor_nydustrinity/tlk02.smk diff --git a/mpq/portrait/faction/advisor_orkoti/fid00.smk b/mpq/portrait/f/advisor_orkoti/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_orkoti/fid00.smk rename to mpq/portrait/f/advisor_orkoti/fid00.smk diff --git a/mpq/portrait/faction/advisor_orkoti/fid01.smk b/mpq/portrait/f/advisor_orkoti/fid01.smk similarity index 100% rename from mpq/portrait/faction/advisor_orkoti/fid01.smk rename to mpq/portrait/f/advisor_orkoti/fid01.smk diff --git a/mpq/portrait/faction/advisor_orkoti/fid02.smk b/mpq/portrait/f/advisor_orkoti/fid02.smk similarity index 100% rename from mpq/portrait/faction/advisor_orkoti/fid02.smk rename to mpq/portrait/f/advisor_orkoti/fid02.smk diff --git a/mpq/portrait/faction/advisor_orkoti/tlk00.smk b/mpq/portrait/f/advisor_orkoti/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_orkoti/tlk00.smk rename to mpq/portrait/f/advisor_orkoti/tlk00.smk diff --git a/mpq/portrait/faction/advisor_orkoti/tlk01.smk b/mpq/portrait/f/advisor_orkoti/tlk01.smk similarity index 100% rename from mpq/portrait/faction/advisor_orkoti/tlk01.smk rename to mpq/portrait/f/advisor_orkoti/tlk01.smk diff --git a/mpq/portrait/faction/advisor_starbound/fid00.smk b/mpq/portrait/f/advisor_starbound/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_starbound/fid00.smk rename to mpq/portrait/f/advisor_starbound/fid00.smk diff --git a/mpq/portrait/faction/advisor_upstartterran/fid00.smk b/mpq/portrait/f/advisor_upstartterran/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_upstartterran/fid00.smk rename to mpq/portrait/f/advisor_upstartterran/fid00.smk diff --git a/mpq/portrait/faction/advisor_upstartterran/tlk00.smk b/mpq/portrait/f/advisor_upstartterran/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_upstartterran/tlk00.smk rename to mpq/portrait/f/advisor_upstartterran/tlk00.smk diff --git a/mpq/portrait/faction/advisor_upstartterran/tlk01.smk b/mpq/portrait/f/advisor_upstartterran/tlk01.smk similarity index 100% rename from mpq/portrait/faction/advisor_upstartterran/tlk01.smk rename to mpq/portrait/f/advisor_upstartterran/tlk01.smk diff --git a/mpq/portrait/faction/advisor_zorthos/fid00.smk b/mpq/portrait/f/advisor_zorthos/fid00.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/fid00.smk rename to mpq/portrait/f/advisor_zorthos/fid00.smk diff --git a/mpq/portrait/faction/advisor_zorthos/fid01.smk b/mpq/portrait/f/advisor_zorthos/fid01.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/fid01.smk rename to mpq/portrait/f/advisor_zorthos/fid01.smk diff --git a/mpq/portrait/faction/advisor_zorthos/fid02.smk b/mpq/portrait/f/advisor_zorthos/fid02.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/fid02.smk rename to mpq/portrait/f/advisor_zorthos/fid02.smk diff --git a/mpq/portrait/faction/advisor_zorthos/fid03.smk b/mpq/portrait/f/advisor_zorthos/fid03.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/fid03.smk rename to mpq/portrait/f/advisor_zorthos/fid03.smk diff --git a/mpq/portrait/faction/advisor_zorthos/tlk00.smk b/mpq/portrait/f/advisor_zorthos/tlk00.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/tlk00.smk rename to mpq/portrait/f/advisor_zorthos/tlk00.smk diff --git a/mpq/portrait/faction/advisor_zorthos/tlk01.smk b/mpq/portrait/f/advisor_zorthos/tlk01.smk similarity index 100% rename from mpq/portrait/faction/advisor_zorthos/tlk01.smk rename to mpq/portrait/f/advisor_zorthos/tlk01.smk diff --git a/mpq/portrait/faction/arhaun/fid00.smk b/mpq/portrait/f/arhaun/fid00.smk similarity index 100% rename from mpq/portrait/faction/arhaun/fid00.smk rename to mpq/portrait/f/arhaun/fid00.smk diff --git a/mpq/portrait/faction/arhaun/fid01.smk b/mpq/portrait/f/arhaun/fid01.smk similarity index 100% rename from mpq/portrait/faction/arhaun/fid01.smk rename to mpq/portrait/f/arhaun/fid01.smk diff --git a/mpq/portrait/faction/arhaun/fid02.smk b/mpq/portrait/f/arhaun/fid02.smk similarity index 100% rename from mpq/portrait/faction/arhaun/fid02.smk rename to mpq/portrait/f/arhaun/fid02.smk diff --git a/mpq/portrait/faction/arhaun/tlk00.smk b/mpq/portrait/f/arhaun/tlk00.smk similarity index 100% rename from mpq/portrait/faction/arhaun/tlk00.smk rename to mpq/portrait/f/arhaun/tlk00.smk diff --git a/mpq/portrait/faction/arhaun/tlk01.smk b/mpq/portrait/f/arhaun/tlk01.smk similarity index 100% rename from mpq/portrait/faction/arhaun/tlk01.smk rename to mpq/portrait/f/arhaun/tlk01.smk diff --git a/mpq/portrait/faction/ashguard/fid00.smk b/mpq/portrait/f/ashguard/fid00.smk similarity index 100% rename from mpq/portrait/faction/ashguard/fid00.smk rename to mpq/portrait/f/ashguard/fid00.smk diff --git a/mpq/portrait/faction/ashguard/fid01.smk b/mpq/portrait/f/ashguard/fid01.smk similarity index 100% rename from mpq/portrait/faction/ashguard/fid01.smk rename to mpq/portrait/f/ashguard/fid01.smk diff --git a/mpq/portrait/faction/ashguard/tlk00.smk b/mpq/portrait/f/ashguard/tlk00.smk similarity index 100% rename from mpq/portrait/faction/ashguard/tlk00.smk rename to mpq/portrait/f/ashguard/tlk00.smk diff --git a/mpq/portrait/faction/ashguard/tlk01.smk b/mpq/portrait/f/ashguard/tlk01.smk similarity index 100% rename from mpq/portrait/faction/ashguard/tlk01.smk rename to mpq/portrait/f/ashguard/tlk01.smk diff --git a/mpq/portrait/faction/auriel/fid00.smk b/mpq/portrait/f/auriel/fid00.smk similarity index 100% rename from mpq/portrait/faction/auriel/fid00.smk rename to mpq/portrait/f/auriel/fid00.smk diff --git a/mpq/portrait/faction/auriel/fid01.smk b/mpq/portrait/f/auriel/fid01.smk similarity index 100% rename from mpq/portrait/faction/auriel/fid01.smk rename to mpq/portrait/f/auriel/fid01.smk diff --git a/mpq/portrait/faction/auriel/tlk00.smk b/mpq/portrait/f/auriel/tlk00.smk similarity index 100% rename from mpq/portrait/faction/auriel/tlk00.smk rename to mpq/portrait/f/auriel/tlk00.smk diff --git a/mpq/portrait/faction/auriel/tlk01.smk b/mpq/portrait/f/auriel/tlk01.smk similarity index 100% rename from mpq/portrait/faction/auriel/tlk01.smk rename to mpq/portrait/f/auriel/tlk01.smk diff --git a/mpq/portrait/faction/blackguard/fid00.smk b/mpq/portrait/f/blackguard/fid00.smk similarity index 100% rename from mpq/portrait/faction/blackguard/fid00.smk rename to mpq/portrait/f/blackguard/fid00.smk diff --git a/mpq/portrait/faction/blackguard/fid01.smk b/mpq/portrait/f/blackguard/fid01.smk similarity index 100% rename from mpq/portrait/faction/blackguard/fid01.smk rename to mpq/portrait/f/blackguard/fid01.smk diff --git a/mpq/portrait/faction/blackguard/fid02.smk b/mpq/portrait/f/blackguard/fid02.smk similarity index 100% rename from mpq/portrait/faction/blackguard/fid02.smk rename to mpq/portrait/f/blackguard/fid02.smk diff --git a/mpq/portrait/faction/blackguard/tlk00.smk b/mpq/portrait/f/blackguard/tlk00.smk similarity index 100% rename from mpq/portrait/faction/blackguard/tlk00.smk rename to mpq/portrait/f/blackguard/tlk00.smk diff --git a/mpq/portrait/faction/blackguard/tlk01.smk b/mpq/portrait/f/blackguard/tlk01.smk similarity index 100% rename from mpq/portrait/faction/blackguard/tlk01.smk rename to mpq/portrait/f/blackguard/tlk01.smk diff --git a/mpq/portrait/faction/blackjack_golden/fid00.smk b/mpq/portrait/f/blackjack_golden/fid00.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/fid00.smk rename to mpq/portrait/f/blackjack_golden/fid00.smk diff --git a/mpq/portrait/faction/blackjack_golden/fid01.smk b/mpq/portrait/f/blackjack_golden/fid01.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/fid01.smk rename to mpq/portrait/f/blackjack_golden/fid01.smk diff --git a/mpq/portrait/faction/blackjack_golden/fid02.smk b/mpq/portrait/f/blackjack_golden/fid02.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/fid02.smk rename to mpq/portrait/f/blackjack_golden/fid02.smk diff --git a/mpq/portrait/faction/blackjack_golden/tlk00.smk b/mpq/portrait/f/blackjack_golden/tlk00.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/tlk00.smk rename to mpq/portrait/f/blackjack_golden/tlk00.smk diff --git a/mpq/portrait/faction/blackjack_golden/tlk01.smk b/mpq/portrait/f/blackjack_golden/tlk01.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/tlk01.smk rename to mpq/portrait/f/blackjack_golden/tlk01.smk diff --git a/mpq/portrait/faction/blackjack_golden/tlk02.smk b/mpq/portrait/f/blackjack_golden/tlk02.smk similarity index 100% rename from mpq/portrait/faction/blackjack_golden/tlk02.smk rename to mpq/portrait/f/blackjack_golden/tlk02.smk diff --git a/mpq/portrait/faction/cicatus/fid00.smk b/mpq/portrait/f/cicatus/fid00.smk similarity index 100% rename from mpq/portrait/faction/cicatus/fid00.smk rename to mpq/portrait/f/cicatus/fid00.smk diff --git a/mpq/portrait/faction/cicatus/fid01.smk b/mpq/portrait/f/cicatus/fid01.smk similarity index 100% rename from mpq/portrait/faction/cicatus/fid01.smk rename to mpq/portrait/f/cicatus/fid01.smk diff --git a/mpq/portrait/faction/cicatus/fid02.smk b/mpq/portrait/f/cicatus/fid02.smk similarity index 100% rename from mpq/portrait/faction/cicatus/fid02.smk rename to mpq/portrait/f/cicatus/fid02.smk diff --git a/mpq/portrait/faction/cicatus/fid03.smk b/mpq/portrait/f/cicatus/fid03.smk similarity index 100% rename from mpq/portrait/faction/cicatus/fid03.smk rename to mpq/portrait/f/cicatus/fid03.smk diff --git a/mpq/portrait/faction/cicatus/tlk00.smk b/mpq/portrait/f/cicatus/tlk00.smk similarity index 100% rename from mpq/portrait/faction/cicatus/tlk00.smk rename to mpq/portrait/f/cicatus/tlk00.smk diff --git a/mpq/portrait/faction/cicatus/tlk01.smk b/mpq/portrait/f/cicatus/tlk01.smk similarity index 100% rename from mpq/portrait/faction/cicatus/tlk01.smk rename to mpq/portrait/f/cicatus/tlk01.smk diff --git a/mpq/portrait/faction/cicatus/tlk02.smk b/mpq/portrait/f/cicatus/tlk02.smk similarity index 100% rename from mpq/portrait/faction/cicatus/tlk02.smk rename to mpq/portrait/f/cicatus/tlk02.smk diff --git a/mpq/portrait/faction/cleric_futurist/fid00.smk b/mpq/portrait/f/cleric_futurist/fid00.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/fid00.smk rename to mpq/portrait/f/cleric_futurist/fid00.smk diff --git a/mpq/portrait/faction/cleric_futurist/fid01.smk b/mpq/portrait/f/cleric_futurist/fid01.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/fid01.smk rename to mpq/portrait/f/cleric_futurist/fid01.smk diff --git a/mpq/portrait/faction/cleric_futurist/fid02.smk b/mpq/portrait/f/cleric_futurist/fid02.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/fid02.smk rename to mpq/portrait/f/cleric_futurist/fid02.smk diff --git a/mpq/portrait/faction/cleric_futurist/fid03.smk b/mpq/portrait/f/cleric_futurist/fid03.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/fid03.smk rename to mpq/portrait/f/cleric_futurist/fid03.smk diff --git a/mpq/portrait/faction/cleric_futurist/tlk00.smk b/mpq/portrait/f/cleric_futurist/tlk00.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/tlk00.smk rename to mpq/portrait/f/cleric_futurist/tlk00.smk diff --git a/mpq/portrait/faction/cleric_futurist/tlk01.smk b/mpq/portrait/f/cleric_futurist/tlk01.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/tlk01.smk rename to mpq/portrait/f/cleric_futurist/tlk01.smk diff --git a/mpq/portrait/faction/cleric_futurist/tlk02.smk b/mpq/portrait/f/cleric_futurist/tlk02.smk similarity index 100% rename from mpq/portrait/faction/cleric_futurist/tlk02.smk rename to mpq/portrait/f/cleric_futurist/tlk02.smk diff --git a/mpq/portrait/faction/cyclops_futurist/fid00.smk b/mpq/portrait/f/cyclops_futurist/fid00.smk similarity index 100% rename from mpq/portrait/faction/cyclops_futurist/fid00.smk rename to mpq/portrait/f/cyclops_futurist/fid00.smk diff --git a/mpq/portrait/faction/cyclops_futurist/fid01.smk b/mpq/portrait/f/cyclops_futurist/fid01.smk similarity index 100% rename from mpq/portrait/faction/cyclops_futurist/fid01.smk rename to mpq/portrait/f/cyclops_futurist/fid01.smk diff --git a/mpq/portrait/faction/cyclops_futurist/tlk00.smk b/mpq/portrait/f/cyclops_futurist/tlk00.smk similarity index 100% rename from mpq/portrait/faction/cyclops_futurist/tlk00.smk rename to mpq/portrait/f/cyclops_futurist/tlk00.smk diff --git a/mpq/portrait/faction/cyclops_futurist/tlk01.smk b/mpq/portrait/f/cyclops_futurist/tlk01.smk similarity index 100% rename from mpq/portrait/faction/cyclops_futurist/tlk01.smk rename to mpq/portrait/f/cyclops_futurist/tlk01.smk diff --git a/mpq/portrait/faction/dracadin_order/fid00.smk b/mpq/portrait/f/dracadin_order/fid00.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/fid00.smk rename to mpq/portrait/f/dracadin_order/fid00.smk diff --git a/mpq/portrait/faction/dracadin_order/fid01.smk b/mpq/portrait/f/dracadin_order/fid01.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/fid01.smk rename to mpq/portrait/f/dracadin_order/fid01.smk diff --git a/mpq/portrait/faction/dracadin_order/fid02.smk b/mpq/portrait/f/dracadin_order/fid02.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/fid02.smk rename to mpq/portrait/f/dracadin_order/fid02.smk diff --git a/mpq/portrait/faction/dracadin_order/fid03.smk b/mpq/portrait/f/dracadin_order/fid03.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/fid03.smk rename to mpq/portrait/f/dracadin_order/fid03.smk diff --git a/mpq/portrait/faction/dracadin_order/tlk00.smk b/mpq/portrait/f/dracadin_order/tlk00.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/tlk00.smk rename to mpq/portrait/f/dracadin_order/tlk00.smk diff --git a/mpq/portrait/faction/dracadin_order/tlk01.smk b/mpq/portrait/f/dracadin_order/tlk01.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/tlk01.smk rename to mpq/portrait/f/dracadin_order/tlk01.smk diff --git a/mpq/portrait/faction/dracadin_order/tlk02.smk b/mpq/portrait/f/dracadin_order/tlk02.smk similarity index 100% rename from mpq/portrait/faction/dracadin_order/tlk02.smk rename to mpq/portrait/f/dracadin_order/tlk02.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/fid00.smk b/mpq/portrait/f/ecclesiast_astral/fid00.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/fid00.smk rename to mpq/portrait/f/ecclesiast_astral/fid00.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/fid01.smk b/mpq/portrait/f/ecclesiast_astral/fid01.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/fid01.smk rename to mpq/portrait/f/ecclesiast_astral/fid01.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/fid02.smk b/mpq/portrait/f/ecclesiast_astral/fid02.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/fid02.smk rename to mpq/portrait/f/ecclesiast_astral/fid02.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/fid03.smk b/mpq/portrait/f/ecclesiast_astral/fid03.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/fid03.smk rename to mpq/portrait/f/ecclesiast_astral/fid03.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk00.smk b/mpq/portrait/f/ecclesiast_astral/tlk00.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/tlk00.smk rename to mpq/portrait/f/ecclesiast_astral/tlk00.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk01.smk b/mpq/portrait/f/ecclesiast_astral/tlk01.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/tlk01.smk rename to mpq/portrait/f/ecclesiast_astral/tlk01.smk diff --git a/mpq/portrait/faction/ecclesiast_astral/tlk02.smk b/mpq/portrait/f/ecclesiast_astral/tlk02.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_astral/tlk02.smk rename to mpq/portrait/f/ecclesiast_astral/tlk02.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid00.smk b/mpq/portrait/f/ecclesiast_khalendric/fid00.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/fid00.smk rename to mpq/portrait/f/ecclesiast_khalendric/fid00.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid01.smk b/mpq/portrait/f/ecclesiast_khalendric/fid01.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/fid01.smk rename to mpq/portrait/f/ecclesiast_khalendric/fid01.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid02.smk b/mpq/portrait/f/ecclesiast_khalendric/fid02.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/fid02.smk rename to mpq/portrait/f/ecclesiast_khalendric/fid02.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/fid03.smk b/mpq/portrait/f/ecclesiast_khalendric/fid03.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/fid03.smk rename to mpq/portrait/f/ecclesiast_khalendric/fid03.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk00.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk00.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/tlk00.smk rename to mpq/portrait/f/ecclesiast_khalendric/tlk00.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk01.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk01.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/tlk01.smk rename to mpq/portrait/f/ecclesiast_khalendric/tlk01.smk diff --git a/mpq/portrait/faction/ecclesiast_khalendric/tlk02.smk b/mpq/portrait/f/ecclesiast_khalendric/tlk02.smk similarity index 100% rename from mpq/portrait/faction/ecclesiast_khalendric/tlk02.smk rename to mpq/portrait/f/ecclesiast_khalendric/tlk02.smk diff --git a/mpq/portrait/faction/eidolon_nydus/fid00.smk b/mpq/portrait/f/eidolon_nydus/fid00.smk similarity index 100% rename from mpq/portrait/faction/eidolon_nydus/fid00.smk rename to mpq/portrait/f/eidolon_nydus/fid00.smk diff --git a/mpq/portrait/faction/eidolon_nydus/fid01.smk b/mpq/portrait/f/eidolon_nydus/fid01.smk similarity index 100% rename from mpq/portrait/faction/eidolon_nydus/fid01.smk rename to mpq/portrait/f/eidolon_nydus/fid01.smk diff --git a/mpq/portrait/faction/eidolon_nydus/tlk00.smk b/mpq/portrait/f/eidolon_nydus/tlk00.smk similarity index 100% rename from mpq/portrait/faction/eidolon_nydus/tlk00.smk rename to mpq/portrait/f/eidolon_nydus/tlk00.smk diff --git a/mpq/portrait/faction/extatus/fid00.smk b/mpq/portrait/f/extatus/fid00.smk similarity index 100% rename from mpq/portrait/faction/extatus/fid00.smk rename to mpq/portrait/f/extatus/fid00.smk diff --git a/mpq/portrait/faction/extatus/fid01.smk b/mpq/portrait/f/extatus/fid01.smk similarity index 100% rename from mpq/portrait/faction/extatus/fid01.smk rename to mpq/portrait/f/extatus/fid01.smk diff --git a/mpq/portrait/faction/extatus/fid02.smk b/mpq/portrait/f/extatus/fid02.smk similarity index 100% rename from mpq/portrait/faction/extatus/fid02.smk rename to mpq/portrait/f/extatus/fid02.smk diff --git a/mpq/portrait/faction/extatus/fid03.smk b/mpq/portrait/f/extatus/fid03.smk similarity index 100% rename from mpq/portrait/faction/extatus/fid03.smk rename to mpq/portrait/f/extatus/fid03.smk diff --git a/mpq/portrait/faction/extatus/tlk00.smk b/mpq/portrait/f/extatus/tlk00.smk similarity index 100% rename from mpq/portrait/faction/extatus/tlk00.smk rename to mpq/portrait/f/extatus/tlk00.smk diff --git a/mpq/portrait/faction/extatus/tlk01.smk b/mpq/portrait/f/extatus/tlk01.smk similarity index 100% rename from mpq/portrait/faction/extatus/tlk01.smk rename to mpq/portrait/f/extatus/tlk01.smk diff --git a/mpq/portrait/faction/extatus/tlk02.smk b/mpq/portrait/f/extatus/tlk02.smk similarity index 100% rename from mpq/portrait/faction/extatus/tlk02.smk rename to mpq/portrait/f/extatus/tlk02.smk diff --git a/mpq/portrait/faction/harakan_golden/fid00.smk b/mpq/portrait/f/harakan_golden/fid00.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/fid00.smk rename to mpq/portrait/f/harakan_golden/fid00.smk diff --git a/mpq/portrait/faction/harakan_golden/fid01.smk b/mpq/portrait/f/harakan_golden/fid01.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/fid01.smk rename to mpq/portrait/f/harakan_golden/fid01.smk diff --git a/mpq/portrait/faction/harakan_golden/fid02.smk b/mpq/portrait/f/harakan_golden/fid02.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/fid02.smk rename to mpq/portrait/f/harakan_golden/fid02.smk diff --git a/mpq/portrait/faction/harakan_golden/fid03.smk b/mpq/portrait/f/harakan_golden/fid03.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/fid03.smk rename to mpq/portrait/f/harakan_golden/fid03.smk diff --git a/mpq/portrait/faction/harakan_golden/tlk00.smk b/mpq/portrait/f/harakan_golden/tlk00.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/tlk00.smk rename to mpq/portrait/f/harakan_golden/tlk00.smk diff --git a/mpq/portrait/faction/harakan_golden/tlk01.smk b/mpq/portrait/f/harakan_golden/tlk01.smk similarity index 100% rename from mpq/portrait/faction/harakan_golden/tlk01.smk rename to mpq/portrait/f/harakan_golden/tlk01.smk diff --git a/mpq/portrait/faction/hotshot/fid00.smk b/mpq/portrait/f/hotshot/fid00.smk similarity index 100% rename from mpq/portrait/faction/hotshot/fid00.smk rename to mpq/portrait/f/hotshot/fid00.smk diff --git a/mpq/portrait/faction/hotshot/tlk00.smk b/mpq/portrait/f/hotshot/tlk00.smk similarity index 100% rename from mpq/portrait/faction/hotshot/tlk00.smk rename to mpq/portrait/f/hotshot/tlk00.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid00.smk b/mpq/portrait/f/hydralisk_orkoti/fid00.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/fid00.smk rename to mpq/portrait/f/hydralisk_orkoti/fid00.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid01.smk b/mpq/portrait/f/hydralisk_orkoti/fid01.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/fid01.smk rename to mpq/portrait/f/hydralisk_orkoti/fid01.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid02.smk b/mpq/portrait/f/hydralisk_orkoti/fid02.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/fid02.smk rename to mpq/portrait/f/hydralisk_orkoti/fid02.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/fid03.smk b/mpq/portrait/f/hydralisk_orkoti/fid03.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/fid03.smk rename to mpq/portrait/f/hydralisk_orkoti/fid03.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk00.smk b/mpq/portrait/f/hydralisk_orkoti/tlk00.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/tlk00.smk rename to mpq/portrait/f/hydralisk_orkoti/tlk00.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk01.smk b/mpq/portrait/f/hydralisk_orkoti/tlk01.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/tlk01.smk rename to mpq/portrait/f/hydralisk_orkoti/tlk01.smk diff --git a/mpq/portrait/faction/hydralisk_orkoti/tlk02.smk b/mpq/portrait/f/hydralisk_orkoti/tlk02.smk similarity index 100% rename from mpq/portrait/faction/hydralisk_orkoti/tlk02.smk rename to mpq/portrait/f/hydralisk_orkoti/tlk02.smk diff --git a/mpq/portrait/faction/inzorthrokor/fid00.smk b/mpq/portrait/f/inzorthrokor/fid00.smk similarity index 100% rename from mpq/portrait/faction/inzorthrokor/fid00.smk rename to mpq/portrait/f/inzorthrokor/fid00.smk diff --git a/mpq/portrait/faction/inzorthrokor/tlk00.smk b/mpq/portrait/f/inzorthrokor/tlk00.smk similarity index 100% rename from mpq/portrait/faction/inzorthrokor/tlk00.smk rename to mpq/portrait/f/inzorthrokor/tlk00.smk diff --git a/mpq/portrait/faction/iziralisk/fid00.smk b/mpq/portrait/f/iziralisk/fid00.smk similarity index 100% rename from mpq/portrait/faction/iziralisk/fid00.smk rename to mpq/portrait/f/iziralisk/fid00.smk diff --git a/mpq/portrait/faction/iziralisk/fid01.smk b/mpq/portrait/f/iziralisk/fid01.smk similarity index 100% rename from mpq/portrait/faction/iziralisk/fid01.smk rename to mpq/portrait/f/iziralisk/fid01.smk diff --git a/mpq/portrait/faction/iziralisk/tlk00.smk b/mpq/portrait/f/iziralisk/tlk00.smk similarity index 100% rename from mpq/portrait/faction/iziralisk/tlk00.smk rename to mpq/portrait/f/iziralisk/tlk00.smk diff --git a/mpq/portrait/faction/manifold_starbound/fid00.smk b/mpq/portrait/f/manifold_starbound/fid00.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/fid00.smk rename to mpq/portrait/f/manifold_starbound/fid00.smk diff --git a/mpq/portrait/faction/manifold_starbound/fid01.smk b/mpq/portrait/f/manifold_starbound/fid01.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/fid01.smk rename to mpq/portrait/f/manifold_starbound/fid01.smk diff --git a/mpq/portrait/faction/manifold_starbound/fid02.smk b/mpq/portrait/f/manifold_starbound/fid02.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/fid02.smk rename to mpq/portrait/f/manifold_starbound/fid02.smk diff --git a/mpq/portrait/faction/manifold_starbound/fid03.smk b/mpq/portrait/f/manifold_starbound/fid03.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/fid03.smk rename to mpq/portrait/f/manifold_starbound/fid03.smk diff --git a/mpq/portrait/faction/manifold_starbound/tlk00.smk b/mpq/portrait/f/manifold_starbound/tlk00.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/tlk00.smk rename to mpq/portrait/f/manifold_starbound/tlk00.smk diff --git a/mpq/portrait/faction/manifold_starbound/tlk01.smk b/mpq/portrait/f/manifold_starbound/tlk01.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/tlk01.smk rename to mpq/portrait/f/manifold_starbound/tlk01.smk diff --git a/mpq/portrait/faction/manifold_starbound/tlk02.smk b/mpq/portrait/f/manifold_starbound/tlk02.smk similarity index 100% rename from mpq/portrait/faction/manifold_starbound/tlk02.smk rename to mpq/portrait/f/manifold_starbound/tlk02.smk diff --git a/mpq/portrait/faction/maverick_futurist/fid00.smk b/mpq/portrait/f/maverick_futurist/fid00.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/fid00.smk rename to mpq/portrait/f/maverick_futurist/fid00.smk diff --git a/mpq/portrait/faction/maverick_futurist/fid01.smk b/mpq/portrait/f/maverick_futurist/fid01.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/fid01.smk rename to mpq/portrait/f/maverick_futurist/fid01.smk diff --git a/mpq/portrait/faction/maverick_futurist/fid02.smk b/mpq/portrait/f/maverick_futurist/fid02.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/fid02.smk rename to mpq/portrait/f/maverick_futurist/fid02.smk diff --git a/mpq/portrait/faction/maverick_futurist/fid03.smk b/mpq/portrait/f/maverick_futurist/fid03.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/fid03.smk rename to mpq/portrait/f/maverick_futurist/fid03.smk diff --git a/mpq/portrait/faction/maverick_futurist/tlk00.smk b/mpq/portrait/f/maverick_futurist/tlk00.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/tlk00.smk rename to mpq/portrait/f/maverick_futurist/tlk00.smk diff --git a/mpq/portrait/faction/maverick_futurist/tlk01.smk b/mpq/portrait/f/maverick_futurist/tlk01.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/tlk01.smk rename to mpq/portrait/f/maverick_futurist/tlk01.smk diff --git a/mpq/portrait/faction/maverick_futurist/tlk02.smk b/mpq/portrait/f/maverick_futurist/tlk02.smk similarity index 100% rename from mpq/portrait/faction/maverick_futurist/tlk02.smk rename to mpq/portrait/f/maverick_futurist/tlk02.smk diff --git a/mpq/portrait/faction/maverick_golden/fid00.smk b/mpq/portrait/f/maverick_golden/fid00.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/fid00.smk rename to mpq/portrait/f/maverick_golden/fid00.smk diff --git a/mpq/portrait/faction/maverick_golden/fid01.smk b/mpq/portrait/f/maverick_golden/fid01.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/fid01.smk rename to mpq/portrait/f/maverick_golden/fid01.smk diff --git a/mpq/portrait/faction/maverick_golden/fid02.smk b/mpq/portrait/f/maverick_golden/fid02.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/fid02.smk rename to mpq/portrait/f/maverick_golden/fid02.smk diff --git a/mpq/portrait/faction/maverick_golden/fid03.smk b/mpq/portrait/f/maverick_golden/fid03.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/fid03.smk rename to mpq/portrait/f/maverick_golden/fid03.smk diff --git a/mpq/portrait/faction/maverick_golden/tlk00.smk b/mpq/portrait/f/maverick_golden/tlk00.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/tlk00.smk rename to mpq/portrait/f/maverick_golden/tlk00.smk diff --git a/mpq/portrait/faction/maverick_golden/tlk01.smk b/mpq/portrait/f/maverick_golden/tlk01.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/tlk01.smk rename to mpq/portrait/f/maverick_golden/tlk01.smk diff --git a/mpq/portrait/faction/maverick_golden/tlk02.smk b/mpq/portrait/f/maverick_golden/tlk02.smk similarity index 100% rename from mpq/portrait/faction/maverick_golden/tlk02.smk rename to mpq/portrait/f/maverick_golden/tlk02.smk diff --git a/mpq/portrait/faction/maverick_upstart/fid00.smk b/mpq/portrait/f/maverick_upstart/fid00.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/fid00.smk rename to mpq/portrait/f/maverick_upstart/fid00.smk diff --git a/mpq/portrait/faction/maverick_upstart/fid01.smk b/mpq/portrait/f/maverick_upstart/fid01.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/fid01.smk rename to mpq/portrait/f/maverick_upstart/fid01.smk diff --git a/mpq/portrait/faction/maverick_upstart/fid02.smk b/mpq/portrait/f/maverick_upstart/fid02.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/fid02.smk rename to mpq/portrait/f/maverick_upstart/fid02.smk diff --git a/mpq/portrait/faction/maverick_upstart/fid03.smk b/mpq/portrait/f/maverick_upstart/fid03.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/fid03.smk rename to mpq/portrait/f/maverick_upstart/fid03.smk diff --git a/mpq/portrait/faction/maverick_upstart/tlk00.smk b/mpq/portrait/f/maverick_upstart/tlk00.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/tlk00.smk rename to mpq/portrait/f/maverick_upstart/tlk00.smk diff --git a/mpq/portrait/faction/maverick_upstart/tlk01.smk b/mpq/portrait/f/maverick_upstart/tlk01.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/tlk01.smk rename to mpq/portrait/f/maverick_upstart/tlk01.smk diff --git a/mpq/portrait/faction/maverick_upstart/tlk02.smk b/mpq/portrait/f/maverick_upstart/tlk02.smk similarity index 100% rename from mpq/portrait/faction/maverick_upstart/tlk02.smk rename to mpq/portrait/f/maverick_upstart/tlk02.smk diff --git a/mpq/portrait/faction/nathrelisk/fid00.smk b/mpq/portrait/f/nathrelisk/fid00.smk similarity index 100% rename from mpq/portrait/faction/nathrelisk/fid00.smk rename to mpq/portrait/f/nathrelisk/fid00.smk diff --git a/mpq/portrait/faction/nathrelisk/fid01.smk b/mpq/portrait/f/nathrelisk/fid01.smk similarity index 100% rename from mpq/portrait/faction/nathrelisk/fid01.smk rename to mpq/portrait/f/nathrelisk/fid01.smk diff --git a/mpq/portrait/faction/nathrelisk/fid02.smk b/mpq/portrait/f/nathrelisk/fid02.smk similarity index 100% rename from mpq/portrait/faction/nathrelisk/fid02.smk rename to mpq/portrait/f/nathrelisk/fid02.smk diff --git a/mpq/portrait/faction/nathrelisk/fid03.smk b/mpq/portrait/f/nathrelisk/fid03.smk similarity index 100% rename from mpq/portrait/faction/nathrelisk/fid03.smk rename to mpq/portrait/f/nathrelisk/fid03.smk diff --git a/mpq/portrait/faction/nathrelisk/tlk00.smk b/mpq/portrait/f/nathrelisk/tlk00.smk similarity index 100% rename from mpq/portrait/faction/nathrelisk/tlk00.smk rename to mpq/portrait/f/nathrelisk/tlk00.smk diff --git a/mpq/portrait/faction/philoc/fid00.smk b/mpq/portrait/f/philoc/fid00.smk similarity index 100% rename from mpq/portrait/faction/philoc/fid00.smk rename to mpq/portrait/f/philoc/fid00.smk diff --git a/mpq/portrait/faction/philoc/tlk00.smk b/mpq/portrait/f/philoc/tlk00.smk similarity index 100% rename from mpq/portrait/faction/philoc/tlk00.smk rename to mpq/portrait/f/philoc/tlk00.smk diff --git a/mpq/portrait/faction/qilin/fid00.smk b/mpq/portrait/f/qilin/fid00.smk similarity index 100% rename from mpq/portrait/faction/qilin/fid00.smk rename to mpq/portrait/f/qilin/fid00.smk diff --git a/mpq/portrait/faction/qilin/fid01.smk b/mpq/portrait/f/qilin/fid01.smk similarity index 100% rename from mpq/portrait/faction/qilin/fid01.smk rename to mpq/portrait/f/qilin/fid01.smk diff --git a/mpq/portrait/faction/qilin/fid02.smk b/mpq/portrait/f/qilin/fid02.smk similarity index 100% rename from mpq/portrait/faction/qilin/fid02.smk rename to mpq/portrait/f/qilin/fid02.smk diff --git a/mpq/portrait/faction/qilin/fid03.smk b/mpq/portrait/f/qilin/fid03.smk similarity index 100% rename from mpq/portrait/faction/qilin/fid03.smk rename to mpq/portrait/f/qilin/fid03.smk diff --git a/mpq/portrait/faction/qilin/tlk00.smk b/mpq/portrait/f/qilin/tlk00.smk similarity index 100% rename from mpq/portrait/faction/qilin/tlk00.smk rename to mpq/portrait/f/qilin/tlk00.smk diff --git a/mpq/portrait/faction/qilin/tlk01.smk b/mpq/portrait/f/qilin/tlk01.smk similarity index 100% rename from mpq/portrait/faction/qilin/tlk01.smk rename to mpq/portrait/f/qilin/tlk01.smk diff --git a/mpq/portrait/faction/qilin/tlk02.smk b/mpq/portrait/f/qilin/tlk02.smk similarity index 100% rename from mpq/portrait/faction/qilin/tlk02.smk rename to mpq/portrait/f/qilin/tlk02.smk diff --git a/mpq/portrait/faction/quazrokor/fid00.smk b/mpq/portrait/f/quazrokor/fid00.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/fid00.smk rename to mpq/portrait/f/quazrokor/fid00.smk diff --git a/mpq/portrait/faction/quazrokor/fid01.smk b/mpq/portrait/f/quazrokor/fid01.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/fid01.smk rename to mpq/portrait/f/quazrokor/fid01.smk diff --git a/mpq/portrait/faction/quazrokor/fid02.smk b/mpq/portrait/f/quazrokor/fid02.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/fid02.smk rename to mpq/portrait/f/quazrokor/fid02.smk diff --git a/mpq/portrait/faction/quazrokor/fid03.smk b/mpq/portrait/f/quazrokor/fid03.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/fid03.smk rename to mpq/portrait/f/quazrokor/fid03.smk diff --git a/mpq/portrait/faction/quazrokor/tlk00.smk b/mpq/portrait/f/quazrokor/tlk00.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/tlk00.smk rename to mpq/portrait/f/quazrokor/tlk00.smk diff --git a/mpq/portrait/faction/quazrokor/tlk01.smk b/mpq/portrait/f/quazrokor/tlk01.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/tlk01.smk rename to mpq/portrait/f/quazrokor/tlk01.smk diff --git a/mpq/portrait/faction/quazrokor/tlk02.smk b/mpq/portrait/f/quazrokor/tlk02.smk similarity index 100% rename from mpq/portrait/faction/quazrokor/tlk02.smk rename to mpq/portrait/f/quazrokor/tlk02.smk diff --git a/mpq/portrait/faction/renesair/fid00.smk b/mpq/portrait/f/renesair/fid00.smk similarity index 100% rename from mpq/portrait/faction/renesair/fid00.smk rename to mpq/portrait/f/renesair/fid00.smk diff --git a/mpq/portrait/faction/renesair/fid01.smk b/mpq/portrait/f/renesair/fid01.smk similarity index 100% rename from mpq/portrait/faction/renesair/fid01.smk rename to mpq/portrait/f/renesair/fid01.smk diff --git a/mpq/portrait/faction/renesair/tlk00.smk b/mpq/portrait/f/renesair/tlk00.smk similarity index 100% rename from mpq/portrait/faction/renesair/tlk00.smk rename to mpq/portrait/f/renesair/tlk00.smk diff --git a/mpq/portrait/faction/tarasque/fid00.smk b/mpq/portrait/f/tarasque/fid00.smk similarity index 100% rename from mpq/portrait/faction/tarasque/fid00.smk rename to mpq/portrait/f/tarasque/fid00.smk diff --git a/mpq/portrait/faction/tarasque/tlk00.smk b/mpq/portrait/f/tarasque/tlk00.smk similarity index 100% rename from mpq/portrait/faction/tarasque/tlk00.smk rename to mpq/portrait/f/tarasque/tlk00.smk diff --git a/mpq/portrait/faction/tiangou/fid00.smk b/mpq/portrait/f/tiangou/fid00.smk similarity index 100% rename from mpq/portrait/faction/tiangou/fid00.smk rename to mpq/portrait/f/tiangou/fid00.smk diff --git a/mpq/portrait/faction/tiangou/fid01.smk b/mpq/portrait/f/tiangou/fid01.smk similarity index 100% rename from mpq/portrait/faction/tiangou/fid01.smk rename to mpq/portrait/f/tiangou/fid01.smk diff --git a/mpq/portrait/faction/tiangou/fid02.smk b/mpq/portrait/f/tiangou/fid02.smk similarity index 100% rename from mpq/portrait/faction/tiangou/fid02.smk rename to mpq/portrait/f/tiangou/fid02.smk diff --git a/mpq/portrait/faction/tiangou/fid03.smk b/mpq/portrait/f/tiangou/fid03.smk similarity index 100% rename from mpq/portrait/faction/tiangou/fid03.smk rename to mpq/portrait/f/tiangou/fid03.smk diff --git a/mpq/portrait/faction/tiangou/tlk00.smk b/mpq/portrait/f/tiangou/tlk00.smk similarity index 100% rename from mpq/portrait/faction/tiangou/tlk00.smk rename to mpq/portrait/f/tiangou/tlk00.smk diff --git a/mpq/portrait/faction/tiangou/tlk01.smk b/mpq/portrait/f/tiangou/tlk01.smk similarity index 100% rename from mpq/portrait/faction/tiangou/tlk01.smk rename to mpq/portrait/f/tiangou/tlk01.smk diff --git a/mpq/portrait/faction/tiangou/tlk02.smk b/mpq/portrait/f/tiangou/tlk02.smk similarity index 100% rename from mpq/portrait/faction/tiangou/tlk02.smk rename to mpq/portrait/f/tiangou/tlk02.smk diff --git a/mpq/portrait/faction/wendigo/fid00.smk b/mpq/portrait/f/wendigo/fid00.smk similarity index 100% rename from mpq/portrait/faction/wendigo/fid00.smk rename to mpq/portrait/f/wendigo/fid00.smk diff --git a/mpq/portrait/faction/wendigo/tlk00.smk b/mpq/portrait/f/wendigo/tlk00.smk similarity index 100% rename from mpq/portrait/faction/wendigo/tlk00.smk rename to mpq/portrait/f/wendigo/tlk00.smk diff --git a/mpq/portrait/faction/wendigo/tlk01.smk b/mpq/portrait/f/wendigo/tlk01.smk similarity index 100% rename from mpq/portrait/faction/wendigo/tlk01.smk rename to mpq/portrait/f/wendigo/tlk01.smk diff --git a/mpq/portrait/faction/zealot_starbound/fid00.smk b/mpq/portrait/f/zealot_starbound/fid00.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/fid00.smk rename to mpq/portrait/f/zealot_starbound/fid00.smk diff --git a/mpq/portrait/faction/zealot_starbound/fid01.smk b/mpq/portrait/f/zealot_starbound/fid01.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/fid01.smk rename to mpq/portrait/f/zealot_starbound/fid01.smk diff --git a/mpq/portrait/faction/zealot_starbound/fid02.smk b/mpq/portrait/f/zealot_starbound/fid02.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/fid02.smk rename to mpq/portrait/f/zealot_starbound/fid02.smk diff --git a/mpq/portrait/faction/zealot_starbound/fid03.smk b/mpq/portrait/f/zealot_starbound/fid03.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/fid03.smk rename to mpq/portrait/f/zealot_starbound/fid03.smk diff --git a/mpq/portrait/faction/zealot_starbound/tlk00.smk b/mpq/portrait/f/zealot_starbound/tlk00.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/tlk00.smk rename to mpq/portrait/f/zealot_starbound/tlk00.smk diff --git a/mpq/portrait/faction/zealot_starbound/tlk01.smk b/mpq/portrait/f/zealot_starbound/tlk01.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/tlk01.smk rename to mpq/portrait/f/zealot_starbound/tlk01.smk diff --git a/mpq/portrait/faction/zealot_starbound/tlk02.smk b/mpq/portrait/f/zealot_starbound/tlk02.smk similarity index 100% rename from mpq/portrait/faction/zealot_starbound/tlk02.smk rename to mpq/portrait/f/zealot_starbound/tlk02.smk diff --git a/mpq/portrait/hl/cv/prophet-1/fid00.smk b/mpq/portrait/hl/cv/prophet-1/fid00.smk new file mode 100644 index 00000000..50d70af8 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid00.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/fid01.smk b/mpq/portrait/hl/cv/prophet-1/fid01.smk new file mode 100644 index 00000000..61926cfb Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid01.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/fid02.smk b/mpq/portrait/hl/cv/prophet-1/fid02.smk new file mode 100644 index 00000000..6e2ab0eb Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid02.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/fid03.smk b/mpq/portrait/hl/cv/prophet-1/fid03.smk new file mode 100644 index 00000000..72dcf003 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/fid03.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/tlk00.smk b/mpq/portrait/hl/cv/prophet-1/tlk00.smk new file mode 100644 index 00000000..f85ba480 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk00.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/tlk01.smk b/mpq/portrait/hl/cv/prophet-1/tlk01.smk new file mode 100644 index 00000000..80e37087 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk01.smk differ diff --git a/mpq/portrait/hl/cv/prophet-1/tlk02.smk b/mpq/portrait/hl/cv/prophet-1/tlk02.smk new file mode 100644 index 00000000..e5e07f95 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-1/tlk02.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/fid00.smk b/mpq/portrait/hl/cv/prophet-2/fid00.smk new file mode 100644 index 00000000..0b7b08d3 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid00.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/fid01.smk b/mpq/portrait/hl/cv/prophet-2/fid01.smk new file mode 100644 index 00000000..5c5217c2 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid01.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/fid02.smk b/mpq/portrait/hl/cv/prophet-2/fid02.smk new file mode 100644 index 00000000..020e388c Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid02.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/fid03.smk b/mpq/portrait/hl/cv/prophet-2/fid03.smk new file mode 100644 index 00000000..3d6989a0 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/fid03.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/tlk00.smk b/mpq/portrait/hl/cv/prophet-2/tlk00.smk new file mode 100644 index 00000000..00f338fd Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk00.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/tlk01.smk b/mpq/portrait/hl/cv/prophet-2/tlk01.smk new file mode 100644 index 00000000..17dbdc37 Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk01.smk differ diff --git a/mpq/portrait/hl/cv/prophet-2/tlk02.smk b/mpq/portrait/hl/cv/prophet-2/tlk02.smk new file mode 100644 index 00000000..3754f1fc Binary files /dev/null and b/mpq/portrait/hl/cv/prophet-2/tlk02.smk differ diff --git a/mpq/portrait/hl/fr/ferrum/fid00.smk b/mpq/portrait/hl/fr/ferrum/fid00.smk new file mode 100644 index 00000000..e55c83e2 Binary files /dev/null and b/mpq/portrait/hl/fr/ferrum/fid00.smk differ diff --git a/mpq/portrait/hl/fr/ferrum/fid01.smk b/mpq/portrait/hl/fr/ferrum/fid01.smk new file mode 100644 index 00000000..f7040ced Binary files /dev/null and b/mpq/portrait/hl/fr/ferrum/fid01.smk differ diff --git a/mpq/portrait/hl/fr/ferrum/tlk00.smk b/mpq/portrait/hl/fr/ferrum/tlk00.smk new file mode 100644 index 00000000..c98a816f Binary files /dev/null and b/mpq/portrait/hl/fr/ferrum/tlk00.smk differ diff --git a/mpq/portrait/protoss/amaranth/fid00.smk b/mpq/portrait/p/amaranth/fid00.smk similarity index 100% rename from mpq/portrait/protoss/amaranth/fid00.smk rename to mpq/portrait/p/amaranth/fid00.smk diff --git a/mpq/portrait/protoss/amaranth/fid01.smk b/mpq/portrait/p/amaranth/fid01.smk similarity index 100% rename from mpq/portrait/protoss/amaranth/fid01.smk rename to mpq/portrait/p/amaranth/fid01.smk diff --git a/mpq/portrait/protoss/amaranth/tlk00.smk b/mpq/portrait/p/amaranth/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/amaranth/tlk00.smk rename to mpq/portrait/p/amaranth/tlk00.smk diff --git a/mpq/portrait/protoss/amaranth/tlk01.smk b/mpq/portrait/p/amaranth/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/amaranth/tlk01.smk rename to mpq/portrait/p/amaranth/tlk01.smk diff --git a/mpq/portrait/protoss/analogue/fid00.smk b/mpq/portrait/p/analogue/fid00.smk similarity index 100% rename from mpq/portrait/protoss/analogue/fid00.smk rename to mpq/portrait/p/analogue/fid00.smk diff --git a/mpq/portrait/protoss/analogue/tlk00.smk b/mpq/portrait/p/analogue/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/analogue/tlk00.smk rename to mpq/portrait/p/analogue/tlk00.smk diff --git a/mpq/portrait/protoss/analogue/tlk01.smk b/mpq/portrait/p/analogue/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/analogue/tlk01.smk rename to mpq/portrait/p/analogue/tlk01.smk diff --git a/mpq/portrait/protoss/anthelion/fid00.smk b/mpq/portrait/p/anthelion/fid00.smk similarity index 100% rename from mpq/portrait/protoss/anthelion/fid00.smk rename to mpq/portrait/p/anthelion/fid00.smk diff --git a/mpq/portrait/protoss/anthelion/fid01.smk b/mpq/portrait/p/anthelion/fid01.smk similarity index 100% rename from mpq/portrait/protoss/anthelion/fid01.smk rename to mpq/portrait/p/anthelion/fid01.smk diff --git a/mpq/portrait/protoss/anthelion/tlk00.smk b/mpq/portrait/p/anthelion/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/anthelion/tlk00.smk rename to mpq/portrait/p/anthelion/tlk00.smk diff --git a/mpq/portrait/protoss/anthelion/tlk01.smk b/mpq/portrait/p/anthelion/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/anthelion/tlk01.smk rename to mpq/portrait/p/anthelion/tlk01.smk diff --git a/mpq/portrait/protoss/architect/fid00.smk b/mpq/portrait/p/architect/fid00.smk similarity index 100% rename from mpq/portrait/protoss/architect/fid00.smk rename to mpq/portrait/p/architect/fid00.smk diff --git a/mpq/portrait/protoss/artisan/fid00.smk b/mpq/portrait/p/artisan/fid00.smk similarity index 100% rename from mpq/portrait/protoss/artisan/fid00.smk rename to mpq/portrait/p/artisan/fid00.smk diff --git a/mpq/portrait/protoss/artisan/tlk00.smk b/mpq/portrait/p/artisan/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/artisan/tlk00.smk rename to mpq/portrait/p/artisan/tlk00.smk diff --git a/mpq/portrait/protoss/atreus/fid00.smk b/mpq/portrait/p/atreus/fid00.smk similarity index 100% rename from mpq/portrait/protoss/atreus/fid00.smk rename to mpq/portrait/p/atreus/fid00.smk diff --git a/mpq/portrait/protoss/atreus/tlk00.smk b/mpq/portrait/p/atreus/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/atreus/tlk00.smk rename to mpq/portrait/p/atreus/tlk00.smk diff --git a/mpq/portrait/protoss/atreus/tlk01.smk b/mpq/portrait/p/atreus/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/atreus/tlk01.smk rename to mpq/portrait/p/atreus/tlk01.smk diff --git a/mpq/portrait/protoss/augur/fid00.smk b/mpq/portrait/p/augur/fid00.smk similarity index 100% rename from mpq/portrait/protoss/augur/fid00.smk rename to mpq/portrait/p/augur/fid00.smk diff --git a/mpq/portrait/protoss/augur/fid01.smk b/mpq/portrait/p/augur/fid01.smk similarity index 100% rename from mpq/portrait/protoss/augur/fid01.smk rename to mpq/portrait/p/augur/fid01.smk diff --git a/mpq/portrait/protoss/augur/fid02.smk b/mpq/portrait/p/augur/fid02.smk similarity index 100% rename from mpq/portrait/protoss/augur/fid02.smk rename to mpq/portrait/p/augur/fid02.smk diff --git a/mpq/portrait/protoss/augur/fid03.smk b/mpq/portrait/p/augur/fid03.smk similarity index 100% rename from mpq/portrait/protoss/augur/fid03.smk rename to mpq/portrait/p/augur/fid03.smk diff --git a/mpq/portrait/protoss/augur/tlk00.smk b/mpq/portrait/p/augur/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/augur/tlk00.smk rename to mpq/portrait/p/augur/tlk00.smk diff --git a/mpq/portrait/protoss/augur/tlk01.smk b/mpq/portrait/p/augur/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/augur/tlk01.smk rename to mpq/portrait/p/augur/tlk01.smk diff --git a/mpq/portrait/protoss/augur/tlk02.smk b/mpq/portrait/p/augur/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/augur/tlk02.smk rename to mpq/portrait/p/augur/tlk02.smk diff --git a/mpq/portrait/protoss/aurora/fid00.smk b/mpq/portrait/p/aurora/fid00.smk similarity index 100% rename from mpq/portrait/protoss/aurora/fid00.smk rename to mpq/portrait/p/aurora/fid00.smk diff --git a/mpq/portrait/protoss/aurora/fid01.smk b/mpq/portrait/p/aurora/fid01.smk similarity index 100% rename from mpq/portrait/protoss/aurora/fid01.smk rename to mpq/portrait/p/aurora/fid01.smk diff --git a/mpq/portrait/protoss/aurora/tlk00.smk b/mpq/portrait/p/aurora/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/aurora/tlk00.smk rename to mpq/portrait/p/aurora/tlk00.smk diff --git a/mpq/portrait/protoss/aurora/tlk01.smk b/mpq/portrait/p/aurora/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/aurora/tlk01.smk rename to mpq/portrait/p/aurora/tlk01.smk diff --git a/mpq/portrait/protoss/barghest/fid00.smk b/mpq/portrait/p/barghest/fid00.smk similarity index 100% rename from mpq/portrait/protoss/barghest/fid00.smk rename to mpq/portrait/p/barghest/fid00.smk diff --git a/mpq/portrait/protoss/barghest/tlk00.smk b/mpq/portrait/p/barghest/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/barghest/tlk00.smk rename to mpq/portrait/p/barghest/tlk00.smk diff --git a/mpq/portrait/protoss/charlatan/fid00.smk b/mpq/portrait/p/charlatan/fid00.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/fid00.smk rename to mpq/portrait/p/charlatan/fid00.smk diff --git a/mpq/portrait/protoss/charlatan/fid01.smk b/mpq/portrait/p/charlatan/fid01.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/fid01.smk rename to mpq/portrait/p/charlatan/fid01.smk diff --git a/mpq/portrait/protoss/charlatan/fid02.smk b/mpq/portrait/p/charlatan/fid02.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/fid02.smk rename to mpq/portrait/p/charlatan/fid02.smk diff --git a/mpq/portrait/protoss/charlatan/fid03.smk b/mpq/portrait/p/charlatan/fid03.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/fid03.smk rename to mpq/portrait/p/charlatan/fid03.smk diff --git a/mpq/portrait/protoss/charlatan/tlk00.smk b/mpq/portrait/p/charlatan/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/tlk00.smk rename to mpq/portrait/p/charlatan/tlk00.smk diff --git a/mpq/portrait/protoss/charlatan/tlk01.smk b/mpq/portrait/p/charlatan/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/tlk01.smk rename to mpq/portrait/p/charlatan/tlk01.smk diff --git a/mpq/portrait/protoss/charlatan/tlk02.smk b/mpq/portrait/p/charlatan/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/charlatan/tlk02.smk rename to mpq/portrait/p/charlatan/tlk02.smk diff --git a/mpq/portrait/protoss/clarion/fid00.smk b/mpq/portrait/p/clarion/fid00.smk similarity index 100% rename from mpq/portrait/protoss/clarion/fid00.smk rename to mpq/portrait/p/clarion/fid00.smk diff --git a/mpq/portrait/protoss/clarion/tlk00.smk b/mpq/portrait/p/clarion/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/clarion/tlk00.smk rename to mpq/portrait/p/clarion/tlk00.smk diff --git a/mpq/portrait/protoss/demiurge/fid00.smk b/mpq/portrait/p/demiurge/fid00.smk similarity index 100% rename from mpq/portrait/protoss/demiurge/fid00.smk rename to mpq/portrait/p/demiurge/fid00.smk diff --git a/mpq/portrait/protoss/demiurge/tlk00.smk b/mpq/portrait/p/demiurge/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/demiurge/tlk00.smk rename to mpq/portrait/p/demiurge/tlk00.smk diff --git a/mpq/portrait/protoss/ecclesiast/fid00.smk b/mpq/portrait/p/ecclesiast/fid00.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/fid00.smk rename to mpq/portrait/p/ecclesiast/fid00.smk diff --git a/mpq/portrait/protoss/ecclesiast/fid01.smk b/mpq/portrait/p/ecclesiast/fid01.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/fid01.smk rename to mpq/portrait/p/ecclesiast/fid01.smk diff --git a/mpq/portrait/protoss/ecclesiast/fid02.smk b/mpq/portrait/p/ecclesiast/fid02.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/fid02.smk rename to mpq/portrait/p/ecclesiast/fid02.smk diff --git a/mpq/portrait/protoss/ecclesiast/fid03.smk b/mpq/portrait/p/ecclesiast/fid03.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/fid03.smk rename to mpq/portrait/p/ecclesiast/fid03.smk diff --git a/mpq/portrait/protoss/ecclesiast/tlk00.smk b/mpq/portrait/p/ecclesiast/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/tlk00.smk rename to mpq/portrait/p/ecclesiast/tlk00.smk diff --git a/mpq/portrait/protoss/ecclesiast/tlk01.smk b/mpq/portrait/p/ecclesiast/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/tlk01.smk rename to mpq/portrait/p/ecclesiast/tlk01.smk diff --git a/mpq/portrait/protoss/ecclesiast/tlk02.smk b/mpq/portrait/p/ecclesiast/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/ecclesiast/tlk02.smk rename to mpq/portrait/p/ecclesiast/tlk02.smk diff --git a/mpq/portrait/protoss/empress/fid00.smk b/mpq/portrait/p/empress/fid00.smk similarity index 100% rename from mpq/portrait/protoss/empress/fid00.smk rename to mpq/portrait/p/empress/fid00.smk diff --git a/mpq/portrait/protoss/empress/fid01.smk b/mpq/portrait/p/empress/fid01.smk similarity index 100% rename from mpq/portrait/protoss/empress/fid01.smk rename to mpq/portrait/p/empress/fid01.smk diff --git a/mpq/portrait/protoss/empress/tlk00.smk b/mpq/portrait/p/empress/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/empress/tlk00.smk rename to mpq/portrait/p/empress/tlk00.smk diff --git a/mpq/portrait/protoss/empress/tlk01.smk b/mpq/portrait/p/empress/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/empress/tlk01.smk rename to mpq/portrait/p/empress/tlk01.smk diff --git a/mpq/portrait/protoss/empyrean/fid00.smk b/mpq/portrait/p/empyrean/fid00.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/fid00.smk rename to mpq/portrait/p/empyrean/fid00.smk diff --git a/mpq/portrait/protoss/empyrean/fid01.smk b/mpq/portrait/p/empyrean/fid01.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/fid01.smk rename to mpq/portrait/p/empyrean/fid01.smk diff --git a/mpq/portrait/protoss/empyrean/fid02.smk b/mpq/portrait/p/empyrean/fid02.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/fid02.smk rename to mpq/portrait/p/empyrean/fid02.smk diff --git a/mpq/portrait/protoss/empyrean/fid03.smk b/mpq/portrait/p/empyrean/fid03.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/fid03.smk rename to mpq/portrait/p/empyrean/fid03.smk diff --git a/mpq/portrait/protoss/empyrean/tlk00.smk b/mpq/portrait/p/empyrean/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/tlk00.smk rename to mpq/portrait/p/empyrean/tlk00.smk diff --git a/mpq/portrait/protoss/empyrean/tlk01.smk b/mpq/portrait/p/empyrean/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/tlk01.smk rename to mpq/portrait/p/empyrean/tlk01.smk diff --git a/mpq/portrait/protoss/empyrean/tlk02.smk b/mpq/portrait/p/empyrean/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/empyrean/tlk02.smk rename to mpq/portrait/p/empyrean/tlk02.smk diff --git a/mpq/portrait/protoss/epigraph/fid00.smk b/mpq/portrait/p/epigraph/fid00.smk similarity index 100% rename from mpq/portrait/protoss/epigraph/fid00.smk rename to mpq/portrait/p/epigraph/fid00.smk diff --git a/mpq/portrait/protoss/epigraph/fid01.smk b/mpq/portrait/p/epigraph/fid01.smk similarity index 100% rename from mpq/portrait/protoss/epigraph/fid01.smk rename to mpq/portrait/p/epigraph/fid01.smk diff --git a/mpq/portrait/protoss/epigraph/tlk00.smk b/mpq/portrait/p/epigraph/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/epigraph/tlk00.smk rename to mpq/portrait/p/epigraph/tlk00.smk diff --git a/mpq/portrait/protoss/epigraph/tlk01.smk b/mpq/portrait/p/epigraph/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/epigraph/tlk01.smk rename to mpq/portrait/p/epigraph/tlk01.smk diff --git a/mpq/portrait/protoss/exemplar/fid00.smk b/mpq/portrait/p/exemplar/fid00.smk similarity index 100% rename from mpq/portrait/protoss/exemplar/fid00.smk rename to mpq/portrait/p/exemplar/fid00.smk diff --git a/mpq/portrait/protoss/exemplar/fid01.smk b/mpq/portrait/p/exemplar/fid01.smk similarity index 100% rename from mpq/portrait/protoss/exemplar/fid01.smk rename to mpq/portrait/p/exemplar/fid01.smk diff --git a/mpq/portrait/protoss/exemplar/tlk01.smk b/mpq/portrait/p/exemplar/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/exemplar/tlk01.smk rename to mpq/portrait/p/exemplar/tlk01.smk diff --git a/mpq/portrait/protoss/gladius/fid00.smk b/mpq/portrait/p/gladius/fid00.smk similarity index 100% rename from mpq/portrait/protoss/gladius/fid00.smk rename to mpq/portrait/p/gladius/fid00.smk diff --git a/mpq/portrait/protoss/gladius/fid01.smk b/mpq/portrait/p/gladius/fid01.smk similarity index 100% rename from mpq/portrait/protoss/gladius/fid01.smk rename to mpq/portrait/p/gladius/fid01.smk diff --git a/mpq/portrait/protoss/gladius/fid02.smk b/mpq/portrait/p/gladius/fid02.smk similarity index 100% rename from mpq/portrait/protoss/gladius/fid02.smk rename to mpq/portrait/p/gladius/fid02.smk diff --git a/mpq/portrait/protoss/gladius/tlk00.smk b/mpq/portrait/p/gladius/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/gladius/tlk00.smk rename to mpq/portrait/p/gladius/tlk00.smk diff --git a/mpq/portrait/protoss/gladius/tlk01.smk b/mpq/portrait/p/gladius/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/gladius/tlk01.smk rename to mpq/portrait/p/gladius/tlk01.smk diff --git a/mpq/portrait/protoss/golem/fid00.smk b/mpq/portrait/p/golem/fid00.smk similarity index 100% rename from mpq/portrait/protoss/golem/fid00.smk rename to mpq/portrait/p/golem/fid00.smk diff --git a/mpq/portrait/protoss/golem/fid01.smk b/mpq/portrait/p/golem/fid01.smk similarity index 100% rename from mpq/portrait/protoss/golem/fid01.smk rename to mpq/portrait/p/golem/fid01.smk diff --git a/mpq/portrait/protoss/golem/tlk00.smk b/mpq/portrait/p/golem/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/golem/tlk00.smk rename to mpq/portrait/p/golem/tlk00.smk diff --git a/mpq/portrait/protoss/golem/tlk01.smk b/mpq/portrait/p/golem/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/golem/tlk01.smk rename to mpq/portrait/p/golem/tlk01.smk diff --git a/mpq/portrait/protoss/golem/tlk02.smk b/mpq/portrait/p/golem/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/golem/tlk02.smk rename to mpq/portrait/p/golem/tlk02.smk diff --git a/mpq/portrait/protoss/herald/fid00.smk b/mpq/portrait/p/herald/fid00.smk similarity index 100% rename from mpq/portrait/protoss/herald/fid00.smk rename to mpq/portrait/p/herald/fid00.smk diff --git a/mpq/portrait/protoss/herald/fid01.smk b/mpq/portrait/p/herald/fid01.smk similarity index 100% rename from mpq/portrait/protoss/herald/fid01.smk rename to mpq/portrait/p/herald/fid01.smk diff --git a/mpq/portrait/protoss/herald/fid02.smk b/mpq/portrait/p/herald/fid02.smk similarity index 100% rename from mpq/portrait/protoss/herald/fid02.smk rename to mpq/portrait/p/herald/fid02.smk diff --git a/mpq/portrait/protoss/herald/fid03.smk b/mpq/portrait/p/herald/fid03.smk similarity index 100% rename from mpq/portrait/protoss/herald/fid03.smk rename to mpq/portrait/p/herald/fid03.smk diff --git a/mpq/portrait/protoss/herald/tlk00.smk b/mpq/portrait/p/herald/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/herald/tlk00.smk rename to mpq/portrait/p/herald/tlk00.smk diff --git a/mpq/portrait/protoss/herald/tlk01.smk b/mpq/portrait/p/herald/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/herald/tlk01.smk rename to mpq/portrait/p/herald/tlk01.smk diff --git a/mpq/portrait/protoss/herald/tlk02.smk b/mpq/portrait/p/herald/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/herald/tlk02.smk rename to mpq/portrait/p/herald/tlk02.smk diff --git a/mpq/portrait/protoss/hierophant/fid00.smk b/mpq/portrait/p/hierophant/fid00.smk similarity index 100% rename from mpq/portrait/protoss/hierophant/fid00.smk rename to mpq/portrait/p/hierophant/fid00.smk diff --git a/mpq/portrait/protoss/hierophant/fid01.smk b/mpq/portrait/p/hierophant/fid01.smk similarity index 100% rename from mpq/portrait/protoss/hierophant/fid01.smk rename to mpq/portrait/p/hierophant/fid01.smk diff --git a/mpq/portrait/protoss/hierophant/tlk00.smk b/mpq/portrait/p/hierophant/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/hierophant/tlk00.smk rename to mpq/portrait/p/hierophant/tlk00.smk diff --git a/mpq/portrait/protoss/idol/fid00.smk b/mpq/portrait/p/idol/fid00.smk similarity index 100% rename from mpq/portrait/protoss/idol/fid00.smk rename to mpq/portrait/p/idol/fid00.smk diff --git a/mpq/portrait/protoss/idol/fid01.smk b/mpq/portrait/p/idol/fid01.smk similarity index 100% rename from mpq/portrait/protoss/idol/fid01.smk rename to mpq/portrait/p/idol/fid01.smk diff --git a/mpq/portrait/protoss/idol/fid02.smk b/mpq/portrait/p/idol/fid02.smk similarity index 100% rename from mpq/portrait/protoss/idol/fid02.smk rename to mpq/portrait/p/idol/fid02.smk diff --git a/mpq/portrait/protoss/idol/tlk00.smk b/mpq/portrait/p/idol/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/idol/tlk00.smk rename to mpq/portrait/p/idol/tlk00.smk diff --git a/mpq/portrait/protoss/idol/tlk01.smk b/mpq/portrait/p/idol/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/idol/tlk01.smk rename to mpq/portrait/p/idol/tlk01.smk diff --git a/mpq/portrait/protoss/legionnaire/fid00.smk b/mpq/portrait/p/legionnaire/fid00.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/fid00.smk rename to mpq/portrait/p/legionnaire/fid00.smk diff --git a/mpq/portrait/protoss/legionnaire/fid01.smk b/mpq/portrait/p/legionnaire/fid01.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/fid01.smk rename to mpq/portrait/p/legionnaire/fid01.smk diff --git a/mpq/portrait/protoss/legionnaire/fid02.smk b/mpq/portrait/p/legionnaire/fid02.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/fid02.smk rename to mpq/portrait/p/legionnaire/fid02.smk diff --git a/mpq/portrait/protoss/legionnaire/fid03.smk b/mpq/portrait/p/legionnaire/fid03.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/fid03.smk rename to mpq/portrait/p/legionnaire/fid03.smk diff --git a/mpq/portrait/protoss/legionnaire/tlk00.smk b/mpq/portrait/p/legionnaire/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/tlk00.smk rename to mpq/portrait/p/legionnaire/tlk00.smk diff --git a/mpq/portrait/protoss/legionnaire/tlk01.smk b/mpq/portrait/p/legionnaire/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/tlk01.smk rename to mpq/portrait/p/legionnaire/tlk01.smk diff --git a/mpq/portrait/protoss/legionnaire/tlk02.smk b/mpq/portrait/p/legionnaire/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/legionnaire/tlk02.smk rename to mpq/portrait/p/legionnaire/tlk02.smk diff --git a/mpq/portrait/protoss/magister/fid00.smk b/mpq/portrait/p/magister/fid00.smk similarity index 100% rename from mpq/portrait/protoss/magister/fid00.smk rename to mpq/portrait/p/magister/fid00.smk diff --git a/mpq/portrait/protoss/magister/fid01.smk b/mpq/portrait/p/magister/fid01.smk similarity index 100% rename from mpq/portrait/protoss/magister/fid01.smk rename to mpq/portrait/p/magister/fid01.smk diff --git a/mpq/portrait/protoss/magister/fid02.smk b/mpq/portrait/p/magister/fid02.smk similarity index 100% rename from mpq/portrait/protoss/magister/fid02.smk rename to mpq/portrait/p/magister/fid02.smk diff --git a/mpq/portrait/protoss/magister/tlk00.smk b/mpq/portrait/p/magister/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/magister/tlk00.smk rename to mpq/portrait/p/magister/tlk00.smk diff --git a/mpq/portrait/protoss/magister/tlk01.smk b/mpq/portrait/p/magister/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/magister/tlk01.smk rename to mpq/portrait/p/magister/tlk01.smk diff --git a/mpq/portrait/protoss/optecton/fid00.smk b/mpq/portrait/p/optecton/fid00.smk similarity index 100% rename from mpq/portrait/protoss/optecton/fid00.smk rename to mpq/portrait/p/optecton/fid00.smk diff --git a/mpq/portrait/protoss/optecton/fid01.smk b/mpq/portrait/p/optecton/fid01.smk similarity index 100% rename from mpq/portrait/protoss/optecton/fid01.smk rename to mpq/portrait/p/optecton/fid01.smk diff --git a/mpq/portrait/protoss/optecton/tlk00.smk b/mpq/portrait/p/optecton/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/optecton/tlk00.smk rename to mpq/portrait/p/optecton/tlk00.smk diff --git a/mpq/portrait/protoss/oscilliant/fid00.smk b/mpq/portrait/p/oscilliant/fid00.smk similarity index 100% rename from mpq/portrait/protoss/oscilliant/fid00.smk rename to mpq/portrait/p/oscilliant/fid00.smk diff --git a/mpq/portrait/protoss/oscilliant/fid01.smk b/mpq/portrait/p/oscilliant/fid01.smk similarity index 100% rename from mpq/portrait/protoss/oscilliant/fid01.smk rename to mpq/portrait/p/oscilliant/fid01.smk diff --git a/mpq/portrait/protoss/oscilliant/tlk00.smk b/mpq/portrait/p/oscilliant/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/oscilliant/tlk00.smk rename to mpq/portrait/p/oscilliant/tlk00.smk diff --git a/mpq/portrait/protoss/oscilliant/tlk01.smk b/mpq/portrait/p/oscilliant/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/oscilliant/tlk01.smk rename to mpq/portrait/p/oscilliant/tlk01.smk diff --git a/mpq/portrait/protoss/pariah/fid00.smk b/mpq/portrait/p/pariah/fid00.smk similarity index 100% rename from mpq/portrait/protoss/pariah/fid00.smk rename to mpq/portrait/p/pariah/fid00.smk diff --git a/mpq/portrait/protoss/pariah/fid01.smk b/mpq/portrait/p/pariah/fid01.smk similarity index 100% rename from mpq/portrait/protoss/pariah/fid01.smk rename to mpq/portrait/p/pariah/fid01.smk diff --git a/mpq/portrait/protoss/pariah/tlk00.smk b/mpq/portrait/p/pariah/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/pariah/tlk00.smk rename to mpq/portrait/p/pariah/tlk00.smk diff --git a/mpq/portrait/protoss/patriarch/fid00.smk b/mpq/portrait/p/patriarch/fid00.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/fid00.smk rename to mpq/portrait/p/patriarch/fid00.smk diff --git a/mpq/portrait/protoss/patriarch/fid01.smk b/mpq/portrait/p/patriarch/fid01.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/fid01.smk rename to mpq/portrait/p/patriarch/fid01.smk diff --git a/mpq/portrait/protoss/patriarch/fid02.smk b/mpq/portrait/p/patriarch/fid02.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/fid02.smk rename to mpq/portrait/p/patriarch/fid02.smk diff --git a/mpq/portrait/protoss/patriarch/fid03.smk b/mpq/portrait/p/patriarch/fid03.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/fid03.smk rename to mpq/portrait/p/patriarch/fid03.smk diff --git a/mpq/portrait/protoss/patriarch/tlk00.smk b/mpq/portrait/p/patriarch/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/tlk00.smk rename to mpq/portrait/p/patriarch/tlk00.smk diff --git a/mpq/portrait/protoss/patriarch/tlk01.smk b/mpq/portrait/p/patriarch/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/tlk01.smk rename to mpq/portrait/p/patriarch/tlk01.smk diff --git a/mpq/portrait/protoss/patriarch/tlk02.smk b/mpq/portrait/p/patriarch/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/patriarch/tlk02.smk rename to mpq/portrait/p/patriarch/tlk02.smk diff --git a/mpq/portrait/protoss/positron/fid00.smk b/mpq/portrait/p/positron/fid00.smk similarity index 100% rename from mpq/portrait/protoss/positron/fid00.smk rename to mpq/portrait/p/positron/fid00.smk diff --git a/mpq/portrait/protoss/positron/fid01.smk b/mpq/portrait/p/positron/fid01.smk similarity index 100% rename from mpq/portrait/protoss/positron/fid01.smk rename to mpq/portrait/p/positron/fid01.smk diff --git a/mpq/portrait/protoss/positron/tlk00.smk b/mpq/portrait/p/positron/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/positron/tlk00.smk rename to mpq/portrait/p/positron/tlk00.smk diff --git a/mpq/portrait/protoss/potentate/fid00.smk b/mpq/portrait/p/potentate/fid00.smk similarity index 100% rename from mpq/portrait/protoss/potentate/fid00.smk rename to mpq/portrait/p/potentate/fid00.smk diff --git a/mpq/portrait/protoss/potentate/fid01.smk b/mpq/portrait/p/potentate/fid01.smk similarity index 100% rename from mpq/portrait/protoss/potentate/fid01.smk rename to mpq/portrait/p/potentate/fid01.smk diff --git a/mpq/portrait/protoss/potentate/tlk00.smk b/mpq/portrait/p/potentate/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/potentate/tlk00.smk rename to mpq/portrait/p/potentate/tlk00.smk diff --git a/mpq/portrait/protoss/potentate/tlk01.smk b/mpq/portrait/p/potentate/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/potentate/tlk01.smk rename to mpq/portrait/p/potentate/tlk01.smk diff --git a/mpq/portrait/protoss/servitor/fid00.smk b/mpq/portrait/p/servitor/fid00.smk similarity index 100% rename from mpq/portrait/protoss/servitor/fid00.smk rename to mpq/portrait/p/servitor/fid00.smk diff --git a/mpq/portrait/protoss/servitor/tlk00.smk b/mpq/portrait/p/servitor/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/servitor/tlk00.smk rename to mpq/portrait/p/servitor/tlk00.smk diff --git a/mpq/portrait/protoss/simulacrum-old/fid00.smk b/mpq/portrait/p/simulacrum-old/fid00.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum-old/fid00.smk rename to mpq/portrait/p/simulacrum-old/fid00.smk diff --git a/mpq/portrait/protoss/simulacrum-old/tlk00.smk b/mpq/portrait/p/simulacrum-old/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum-old/tlk00.smk rename to mpq/portrait/p/simulacrum-old/tlk00.smk diff --git a/mpq/portrait/protoss/simulacrum/fid00.smk b/mpq/portrait/p/simulacrum/fid00.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/fid00.smk rename to mpq/portrait/p/simulacrum/fid00.smk diff --git a/mpq/portrait/protoss/simulacrum/fid01.smk b/mpq/portrait/p/simulacrum/fid01.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/fid01.smk rename to mpq/portrait/p/simulacrum/fid01.smk diff --git a/mpq/portrait/protoss/simulacrum/fid02.smk b/mpq/portrait/p/simulacrum/fid02.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/fid02.smk rename to mpq/portrait/p/simulacrum/fid02.smk diff --git a/mpq/portrait/protoss/simulacrum/fid03.smk b/mpq/portrait/p/simulacrum/fid03.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/fid03.smk rename to mpq/portrait/p/simulacrum/fid03.smk diff --git a/mpq/portrait/protoss/simulacrum/tlk00.smk b/mpq/portrait/p/simulacrum/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/tlk00.smk rename to mpq/portrait/p/simulacrum/tlk00.smk diff --git a/mpq/portrait/protoss/simulacrum/tlk01.smk b/mpq/portrait/p/simulacrum/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/tlk01.smk rename to mpq/portrait/p/simulacrum/tlk01.smk diff --git a/mpq/portrait/protoss/simulacrum/tlk02.smk b/mpq/portrait/p/simulacrum/tlk02.smk similarity index 100% rename from mpq/portrait/protoss/simulacrum/tlk02.smk rename to mpq/portrait/p/simulacrum/tlk02.smk diff --git a/mpq/portrait/protoss/starsovereign/fid00.smk b/mpq/portrait/p/starsovereign/fid00.smk similarity index 100% rename from mpq/portrait/protoss/starsovereign/fid00.smk rename to mpq/portrait/p/starsovereign/fid00.smk diff --git a/mpq/portrait/protoss/starsovereign/tlk00.smk b/mpq/portrait/p/starsovereign/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/starsovereign/tlk00.smk rename to mpq/portrait/p/starsovereign/tlk00.smk diff --git a/mpq/portrait/protoss/sycophant/fid00.smk b/mpq/portrait/p/sycophant/fid00.smk similarity index 100% rename from mpq/portrait/protoss/sycophant/fid00.smk rename to mpq/portrait/p/sycophant/fid00.smk diff --git a/mpq/portrait/protoss/sycophant/fid01.smk b/mpq/portrait/p/sycophant/fid01.smk similarity index 100% rename from mpq/portrait/protoss/sycophant/fid01.smk rename to mpq/portrait/p/sycophant/fid01.smk diff --git a/mpq/portrait/protoss/sycophant/tlk00.smk b/mpq/portrait/p/sycophant/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/sycophant/tlk00.smk rename to mpq/portrait/p/sycophant/tlk00.smk diff --git a/mpq/portrait/protoss/sycophant/tlk01.smk b/mpq/portrait/p/sycophant/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/sycophant/tlk01.smk rename to mpq/portrait/p/sycophant/tlk01.smk diff --git a/mpq/portrait/protoss/unar/fid00.smk b/mpq/portrait/p/unar/fid00.smk similarity index 100% rename from mpq/portrait/protoss/unar/fid00.smk rename to mpq/portrait/p/unar/fid00.smk diff --git a/mpq/portrait/protoss/unar/tlk00.smk b/mpq/portrait/p/unar/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/unar/tlk00.smk rename to mpq/portrait/p/unar/tlk00.smk diff --git a/mpq/portrait/protoss/vagrant/fid00.smk b/mpq/portrait/p/vagrant/fid00.smk similarity index 100% rename from mpq/portrait/protoss/vagrant/fid00.smk rename to mpq/portrait/p/vagrant/fid00.smk diff --git a/mpq/portrait/protoss/vagrant/fid01.smk b/mpq/portrait/p/vagrant/fid01.smk similarity index 100% rename from mpq/portrait/protoss/vagrant/fid01.smk rename to mpq/portrait/p/vagrant/fid01.smk diff --git a/mpq/portrait/protoss/vagrant/fid02.smk b/mpq/portrait/p/vagrant/fid02.smk similarity index 100% rename from mpq/portrait/protoss/vagrant/fid02.smk rename to mpq/portrait/p/vagrant/fid02.smk diff --git a/mpq/portrait/protoss/vagrant/tlk00.smk b/mpq/portrait/p/vagrant/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/vagrant/tlk00.smk rename to mpq/portrait/p/vagrant/tlk00.smk diff --git a/mpq/portrait/protoss/vagrant/tlk01.smk b/mpq/portrait/p/vagrant/tlk01.smk similarity index 100% rename from mpq/portrait/protoss/vagrant/tlk01.smk rename to mpq/portrait/p/vagrant/tlk01.smk diff --git a/mpq/portrait/protoss/vassal/fid00.smk b/mpq/portrait/p/vassal/fid00.smk similarity index 100% rename from mpq/portrait/protoss/vassal/fid00.smk rename to mpq/portrait/p/vassal/fid00.smk diff --git a/mpq/portrait/protoss/vassal/fid01.smk b/mpq/portrait/p/vassal/fid01.smk similarity index 100% rename from mpq/portrait/protoss/vassal/fid01.smk rename to mpq/portrait/p/vassal/fid01.smk diff --git a/mpq/portrait/protoss/vassal/tlk00.smk b/mpq/portrait/p/vassal/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/vassal/tlk00.smk rename to mpq/portrait/p/vassal/tlk00.smk diff --git a/mpq/portrait/protoss/vibrance/fid00.smk b/mpq/portrait/p/vibrance/fid00.smk similarity index 100% rename from mpq/portrait/protoss/vibrance/fid00.smk rename to mpq/portrait/p/vibrance/fid00.smk diff --git a/mpq/portrait/protoss/vibrance/tlk00.smk b/mpq/portrait/p/vibrance/tlk00.smk similarity index 100% rename from mpq/portrait/protoss/vibrance/tlk00.smk rename to mpq/portrait/p/vibrance/tlk00.smk diff --git a/mpq/portrait/special/ackmed/fid00.smk b/mpq/portrait/sp/ackmed/fid00.smk similarity index 100% rename from mpq/portrait/special/ackmed/fid00.smk rename to mpq/portrait/sp/ackmed/fid00.smk diff --git a/mpq/portrait/special/ackmed/fid01.smk b/mpq/portrait/sp/ackmed/fid01.smk similarity index 100% rename from mpq/portrait/special/ackmed/fid01.smk rename to mpq/portrait/sp/ackmed/fid01.smk diff --git a/mpq/portrait/special/ackmed/fid02.smk b/mpq/portrait/sp/ackmed/fid02.smk similarity index 100% rename from mpq/portrait/special/ackmed/fid02.smk rename to mpq/portrait/sp/ackmed/fid02.smk diff --git a/mpq/portrait/special/ackmed/fid03.smk b/mpq/portrait/sp/ackmed/fid03.smk similarity index 100% rename from mpq/portrait/special/ackmed/fid03.smk rename to mpq/portrait/sp/ackmed/fid03.smk diff --git a/mpq/portrait/special/ackmed/tlk00.smk b/mpq/portrait/sp/ackmed/tlk00.smk similarity index 100% rename from mpq/portrait/special/ackmed/tlk00.smk rename to mpq/portrait/sp/ackmed/tlk00.smk diff --git a/mpq/portrait/special/ackmed/tlk01.smk b/mpq/portrait/sp/ackmed/tlk01.smk similarity index 100% rename from mpq/portrait/special/ackmed/tlk01.smk rename to mpq/portrait/sp/ackmed/tlk01.smk diff --git a/mpq/portrait/special/ajax/fid00.smk b/mpq/portrait/sp/ajax/fid00.smk similarity index 100% rename from mpq/portrait/special/ajax/fid00.smk rename to mpq/portrait/sp/ajax/fid00.smk diff --git a/mpq/portrait/special/ajax/tlk00.smk b/mpq/portrait/sp/ajax/tlk00.smk similarity index 100% rename from mpq/portrait/special/ajax/tlk00.smk rename to mpq/portrait/sp/ajax/tlk00.smk diff --git a/mpq/portrait/special/ajax/tlk01.smk b/mpq/portrait/sp/ajax/tlk01.smk similarity index 100% rename from mpq/portrait/special/ajax/tlk01.smk rename to mpq/portrait/sp/ajax/tlk01.smk diff --git a/mpq/portrait/special/barlow/fid00.smk b/mpq/portrait/sp/barlow/fid00.smk similarity index 100% rename from mpq/portrait/special/barlow/fid00.smk rename to mpq/portrait/sp/barlow/fid00.smk diff --git a/mpq/portrait/special/barlow/fid01.smk b/mpq/portrait/sp/barlow/fid01.smk similarity index 100% rename from mpq/portrait/special/barlow/fid01.smk rename to mpq/portrait/sp/barlow/fid01.smk diff --git a/mpq/portrait/special/barlow/fid02.smk b/mpq/portrait/sp/barlow/fid02.smk similarity index 100% rename from mpq/portrait/special/barlow/fid02.smk rename to mpq/portrait/sp/barlow/fid02.smk diff --git a/mpq/portrait/special/barlow/tlk00.smk b/mpq/portrait/sp/barlow/tlk00.smk similarity index 100% rename from mpq/portrait/special/barlow/tlk00.smk rename to mpq/portrait/sp/barlow/tlk00.smk diff --git a/mpq/portrait/special/barlow/tlk01.smk b/mpq/portrait/sp/barlow/tlk01.smk similarity index 100% rename from mpq/portrait/special/barlow/tlk01.smk rename to mpq/portrait/sp/barlow/tlk01.smk diff --git a/mpq/portrait/special/boyeau/fid00.smk b/mpq/portrait/sp/boyeau/fid00.smk similarity index 100% rename from mpq/portrait/special/boyeau/fid00.smk rename to mpq/portrait/sp/boyeau/fid00.smk diff --git a/mpq/portrait/special/boyeau/fid01.smk b/mpq/portrait/sp/boyeau/fid01.smk similarity index 100% rename from mpq/portrait/special/boyeau/fid01.smk rename to mpq/portrait/sp/boyeau/fid01.smk diff --git a/mpq/portrait/special/boyeau/fid02.smk b/mpq/portrait/sp/boyeau/fid02.smk similarity index 100% rename from mpq/portrait/special/boyeau/fid02.smk rename to mpq/portrait/sp/boyeau/fid02.smk diff --git a/mpq/portrait/special/boyeau/fid03.smk b/mpq/portrait/sp/boyeau/fid03.smk similarity index 100% rename from mpq/portrait/special/boyeau/fid03.smk rename to mpq/portrait/sp/boyeau/fid03.smk diff --git a/mpq/portrait/special/boyeau/tlk00.smk b/mpq/portrait/sp/boyeau/tlk00.smk similarity index 100% rename from mpq/portrait/special/boyeau/tlk00.smk rename to mpq/portrait/sp/boyeau/tlk00.smk diff --git a/mpq/portrait/special/boyeau/tlk01.smk b/mpq/portrait/sp/boyeau/tlk01.smk similarity index 100% rename from mpq/portrait/special/boyeau/tlk01.smk rename to mpq/portrait/sp/boyeau/tlk01.smk diff --git a/mpq/portrait/special/boyeau/tlk02.smk b/mpq/portrait/sp/boyeau/tlk02.smk similarity index 100% rename from mpq/portrait/special/boyeau/tlk02.smk rename to mpq/portrait/sp/boyeau/tlk02.smk diff --git a/mpq/portrait/special/eritreus/fid00.smk b/mpq/portrait/sp/eritreus/fid00.smk similarity index 100% rename from mpq/portrait/special/eritreus/fid00.smk rename to mpq/portrait/sp/eritreus/fid00.smk diff --git a/mpq/portrait/special/eritreus/tlk00.smk b/mpq/portrait/sp/eritreus/tlk00.smk similarity index 100% rename from mpq/portrait/special/eritreus/tlk00.smk rename to mpq/portrait/sp/eritreus/tlk00.smk diff --git a/mpq/portrait/special/eritreus/tlk01.smk b/mpq/portrait/sp/eritreus/tlk01.smk similarity index 100% rename from mpq/portrait/special/eritreus/tlk01.smk rename to mpq/portrait/sp/eritreus/tlk01.smk diff --git a/mpq/portrait/special/eritreus/tlk02.smk b/mpq/portrait/sp/eritreus/tlk02.smk similarity index 100% rename from mpq/portrait/special/eritreus/tlk02.smk rename to mpq/portrait/sp/eritreus/tlk02.smk diff --git a/mpq/portrait/special/esmond/fid00.smk b/mpq/portrait/sp/esmond/fid00.smk similarity index 100% rename from mpq/portrait/special/esmond/fid00.smk rename to mpq/portrait/sp/esmond/fid00.smk diff --git a/mpq/portrait/special/esmond/fid01.smk b/mpq/portrait/sp/esmond/fid01.smk similarity index 100% rename from mpq/portrait/special/esmond/fid01.smk rename to mpq/portrait/sp/esmond/fid01.smk diff --git a/mpq/portrait/special/esmond/fid02.smk b/mpq/portrait/sp/esmond/fid02.smk similarity index 100% rename from mpq/portrait/special/esmond/fid02.smk rename to mpq/portrait/sp/esmond/fid02.smk diff --git a/mpq/portrait/special/esmond/fid03.smk b/mpq/portrait/sp/esmond/fid03.smk similarity index 100% rename from mpq/portrait/special/esmond/fid03.smk rename to mpq/portrait/sp/esmond/fid03.smk diff --git a/mpq/portrait/special/esmond/tlk00.smk b/mpq/portrait/sp/esmond/tlk00.smk similarity index 100% rename from mpq/portrait/special/esmond/tlk00.smk rename to mpq/portrait/sp/esmond/tlk00.smk diff --git a/mpq/portrait/special/esmond/tlk01.smk b/mpq/portrait/sp/esmond/tlk01.smk similarity index 100% rename from mpq/portrait/special/esmond/tlk01.smk rename to mpq/portrait/sp/esmond/tlk01.smk diff --git a/mpq/portrait/special/esmond/tlk02.smk b/mpq/portrait/sp/esmond/tlk02.smk similarity index 100% rename from mpq/portrait/special/esmond/tlk02.smk rename to mpq/portrait/sp/esmond/tlk02.smk diff --git a/mpq/portrait/special/furen/fid00.smk b/mpq/portrait/sp/furen/fid00.smk similarity index 100% rename from mpq/portrait/special/furen/fid00.smk rename to mpq/portrait/sp/furen/fid00.smk diff --git a/mpq/portrait/special/furen/fid01.smk b/mpq/portrait/sp/furen/fid01.smk similarity index 100% rename from mpq/portrait/special/furen/fid01.smk rename to mpq/portrait/sp/furen/fid01.smk diff --git a/mpq/portrait/special/furen/fid02.smk b/mpq/portrait/sp/furen/fid02.smk similarity index 100% rename from mpq/portrait/special/furen/fid02.smk rename to mpq/portrait/sp/furen/fid02.smk diff --git a/mpq/portrait/special/furen/tlk00.smk b/mpq/portrait/sp/furen/tlk00.smk similarity index 100% rename from mpq/portrait/special/furen/tlk00.smk rename to mpq/portrait/sp/furen/tlk00.smk diff --git a/mpq/portrait/special/furen/tlk01.smk b/mpq/portrait/sp/furen/tlk01.smk similarity index 100% rename from mpq/portrait/special/furen/tlk01.smk rename to mpq/portrait/sp/furen/tlk01.smk diff --git a/mpq/portrait/special/hadral/fid00.smk b/mpq/portrait/sp/hadral/fid00.smk similarity index 100% rename from mpq/portrait/special/hadral/fid00.smk rename to mpq/portrait/sp/hadral/fid00.smk diff --git a/mpq/portrait/special/hadral/fid01.smk b/mpq/portrait/sp/hadral/fid01.smk similarity index 100% rename from mpq/portrait/special/hadral/fid01.smk rename to mpq/portrait/sp/hadral/fid01.smk diff --git a/mpq/portrait/special/hadral/tlk00.smk b/mpq/portrait/sp/hadral/tlk00.smk similarity index 100% rename from mpq/portrait/special/hadral/tlk00.smk rename to mpq/portrait/sp/hadral/tlk00.smk diff --git a/mpq/portrait/special/hadral/tlk01.smk b/mpq/portrait/sp/hadral/tlk01.smk similarity index 100% rename from mpq/portrait/special/hadral/tlk01.smk rename to mpq/portrait/sp/hadral/tlk01.smk diff --git a/mpq/portrait/special/inc/algannor/fid00.smk b/mpq/portrait/sp/inc/algannor/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/fid00.smk rename to mpq/portrait/sp/inc/algannor/fid00.smk diff --git a/mpq/portrait/special/inc/algannor/fid01.smk b/mpq/portrait/sp/inc/algannor/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/fid01.smk rename to mpq/portrait/sp/inc/algannor/fid01.smk diff --git a/mpq/portrait/special/inc/algannor/fid02.smk b/mpq/portrait/sp/inc/algannor/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/fid02.smk rename to mpq/portrait/sp/inc/algannor/fid02.smk diff --git a/mpq/portrait/special/inc/algannor/fid03.smk b/mpq/portrait/sp/inc/algannor/fid03.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/fid03.smk rename to mpq/portrait/sp/inc/algannor/fid03.smk diff --git a/mpq/portrait/special/inc/algannor/tlk00.smk b/mpq/portrait/sp/inc/algannor/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/tlk00.smk rename to mpq/portrait/sp/inc/algannor/tlk00.smk diff --git a/mpq/portrait/special/inc/algannor/tlk01.smk b/mpq/portrait/sp/inc/algannor/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/tlk01.smk rename to mpq/portrait/sp/inc/algannor/tlk01.smk diff --git a/mpq/portrait/special/inc/algannor/tlk02.smk b/mpq/portrait/sp/inc/algannor/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/algannor/tlk02.smk rename to mpq/portrait/sp/inc/algannor/tlk02.smk diff --git a/mpq/portrait/special/inc/gorn/fid00.smk b/mpq/portrait/sp/inc/gorn/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/fid00.smk rename to mpq/portrait/sp/inc/gorn/fid00.smk diff --git a/mpq/portrait/special/inc/gorn/fid01.smk b/mpq/portrait/sp/inc/gorn/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/fid01.smk rename to mpq/portrait/sp/inc/gorn/fid01.smk diff --git a/mpq/portrait/special/inc/gorn/fid02.smk b/mpq/portrait/sp/inc/gorn/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/fid02.smk rename to mpq/portrait/sp/inc/gorn/fid02.smk diff --git a/mpq/portrait/special/inc/gorn/tlk00.smk b/mpq/portrait/sp/inc/gorn/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/tlk00.smk rename to mpq/portrait/sp/inc/gorn/tlk00.smk diff --git a/mpq/portrait/special/inc/gorn/tlk01.smk b/mpq/portrait/sp/inc/gorn/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/tlk01.smk rename to mpq/portrait/sp/inc/gorn/tlk01.smk diff --git a/mpq/portrait/special/inc/gorn/tlk02.smk b/mpq/portrait/sp/inc/gorn/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/gorn/tlk02.smk rename to mpq/portrait/sp/inc/gorn/tlk02.smk diff --git a/mpq/portrait/special/inc/goska/fid00.smk b/mpq/portrait/sp/inc/goska/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/goska/fid00.smk rename to mpq/portrait/sp/inc/goska/fid00.smk diff --git a/mpq/portrait/special/inc/goska/fid01.smk b/mpq/portrait/sp/inc/goska/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/goska/fid01.smk rename to mpq/portrait/sp/inc/goska/fid01.smk diff --git a/mpq/portrait/special/inc/goska/fid02.smk b/mpq/portrait/sp/inc/goska/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/goska/fid02.smk rename to mpq/portrait/sp/inc/goska/fid02.smk diff --git a/mpq/portrait/special/inc/goska/fid03.smk b/mpq/portrait/sp/inc/goska/fid03.smk similarity index 100% rename from mpq/portrait/special/inc/goska/fid03.smk rename to mpq/portrait/sp/inc/goska/fid03.smk diff --git a/mpq/portrait/special/inc/goska/tlk00.smk b/mpq/portrait/sp/inc/goska/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/goska/tlk00.smk rename to mpq/portrait/sp/inc/goska/tlk00.smk diff --git a/mpq/portrait/special/inc/stroluum/fid00.smk b/mpq/portrait/sp/inc/stroluum/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/fid00.smk rename to mpq/portrait/sp/inc/stroluum/fid00.smk diff --git a/mpq/portrait/special/inc/stroluum/fid01.smk b/mpq/portrait/sp/inc/stroluum/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/fid01.smk rename to mpq/portrait/sp/inc/stroluum/fid01.smk diff --git a/mpq/portrait/special/inc/stroluum/fid02.smk b/mpq/portrait/sp/inc/stroluum/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/fid02.smk rename to mpq/portrait/sp/inc/stroluum/fid02.smk diff --git a/mpq/portrait/special/inc/stroluum/fid03.smk b/mpq/portrait/sp/inc/stroluum/fid03.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/fid03.smk rename to mpq/portrait/sp/inc/stroluum/fid03.smk diff --git a/mpq/portrait/special/inc/stroluum/tlk00.smk b/mpq/portrait/sp/inc/stroluum/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/tlk00.smk rename to mpq/portrait/sp/inc/stroluum/tlk00.smk diff --git a/mpq/portrait/special/inc/stroluum/tlk01.smk b/mpq/portrait/sp/inc/stroluum/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/tlk01.smk rename to mpq/portrait/sp/inc/stroluum/tlk01.smk diff --git a/mpq/portrait/special/inc/stroluum/tlk02.smk b/mpq/portrait/sp/inc/stroluum/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/stroluum/tlk02.smk rename to mpq/portrait/sp/inc/stroluum/tlk02.smk diff --git a/mpq/portrait/special/inc/thalazim/fid00.smk b/mpq/portrait/sp/inc/thalazim/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/fid00.smk rename to mpq/portrait/sp/inc/thalazim/fid00.smk diff --git a/mpq/portrait/special/inc/thalazim/fid01.smk b/mpq/portrait/sp/inc/thalazim/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/fid01.smk rename to mpq/portrait/sp/inc/thalazim/fid01.smk diff --git a/mpq/portrait/special/inc/thalazim/fid02.smk b/mpq/portrait/sp/inc/thalazim/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/fid02.smk rename to mpq/portrait/sp/inc/thalazim/fid02.smk diff --git a/mpq/portrait/special/inc/thalazim/tlk00.smk b/mpq/portrait/sp/inc/thalazim/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/tlk00.smk rename to mpq/portrait/sp/inc/thalazim/tlk00.smk diff --git a/mpq/portrait/special/inc/thalazim/tlk01.smk b/mpq/portrait/sp/inc/thalazim/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/tlk01.smk rename to mpq/portrait/sp/inc/thalazim/tlk01.smk diff --git a/mpq/portrait/special/inc/thalazim/tlk02.smk b/mpq/portrait/sp/inc/thalazim/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/thalazim/tlk02.smk rename to mpq/portrait/sp/inc/thalazim/tlk02.smk diff --git a/mpq/portrait/special/inc/tuzor/fid00.smk b/mpq/portrait/sp/inc/tuzor/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/fid00.smk rename to mpq/portrait/sp/inc/tuzor/fid00.smk diff --git a/mpq/portrait/special/inc/tuzor/fid01.smk b/mpq/portrait/sp/inc/tuzor/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/fid01.smk rename to mpq/portrait/sp/inc/tuzor/fid01.smk diff --git a/mpq/portrait/special/inc/tuzor/fid02.smk b/mpq/portrait/sp/inc/tuzor/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/fid02.smk rename to mpq/portrait/sp/inc/tuzor/fid02.smk diff --git a/mpq/portrait/special/inc/tuzor/tlk00.smk b/mpq/portrait/sp/inc/tuzor/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/tlk00.smk rename to mpq/portrait/sp/inc/tuzor/tlk00.smk diff --git a/mpq/portrait/special/inc/tuzor/tlk01.smk b/mpq/portrait/sp/inc/tuzor/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/tlk01.smk rename to mpq/portrait/sp/inc/tuzor/tlk01.smk diff --git a/mpq/portrait/special/inc/tuzor/tlk02.smk b/mpq/portrait/sp/inc/tuzor/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/tuzor/tlk02.smk rename to mpq/portrait/sp/inc/tuzor/tlk02.smk diff --git a/mpq/portrait/special/inc/warmonger/fid00.smk b/mpq/portrait/sp/inc/warmonger/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/fid00.smk rename to mpq/portrait/sp/inc/warmonger/fid00.smk diff --git a/mpq/portrait/special/inc/warmonger/fid01.smk b/mpq/portrait/sp/inc/warmonger/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/fid01.smk rename to mpq/portrait/sp/inc/warmonger/fid01.smk diff --git a/mpq/portrait/special/inc/warmonger/fid02.smk b/mpq/portrait/sp/inc/warmonger/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/fid02.smk rename to mpq/portrait/sp/inc/warmonger/fid02.smk diff --git a/mpq/portrait/special/inc/warmonger/fid03.smk b/mpq/portrait/sp/inc/warmonger/fid03.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/fid03.smk rename to mpq/portrait/sp/inc/warmonger/fid03.smk diff --git a/mpq/portrait/special/inc/warmonger/tlk00.smk b/mpq/portrait/sp/inc/warmonger/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/tlk00.smk rename to mpq/portrait/sp/inc/warmonger/tlk00.smk diff --git a/mpq/portrait/special/inc/warmonger/tlk01.smk b/mpq/portrait/sp/inc/warmonger/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/tlk01.smk rename to mpq/portrait/sp/inc/warmonger/tlk01.smk diff --git a/mpq/portrait/special/inc/warmonger/tlk02.smk b/mpq/portrait/sp/inc/warmonger/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/warmonger/tlk02.smk rename to mpq/portrait/sp/inc/warmonger/tlk02.smk diff --git a/mpq/portrait/special/inc/yggdrasil/fid00.smk b/mpq/portrait/sp/inc/yggdrasil/fid00.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/fid00.smk rename to mpq/portrait/sp/inc/yggdrasil/fid00.smk diff --git a/mpq/portrait/special/inc/yggdrasil/fid01.smk b/mpq/portrait/sp/inc/yggdrasil/fid01.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/fid01.smk rename to mpq/portrait/sp/inc/yggdrasil/fid01.smk diff --git a/mpq/portrait/special/inc/yggdrasil/fid02.smk b/mpq/portrait/sp/inc/yggdrasil/fid02.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/fid02.smk rename to mpq/portrait/sp/inc/yggdrasil/fid02.smk diff --git a/mpq/portrait/special/inc/yggdrasil/tlk00.smk b/mpq/portrait/sp/inc/yggdrasil/tlk00.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/tlk00.smk rename to mpq/portrait/sp/inc/yggdrasil/tlk00.smk diff --git a/mpq/portrait/special/inc/yggdrasil/tlk01.smk b/mpq/portrait/sp/inc/yggdrasil/tlk01.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/tlk01.smk rename to mpq/portrait/sp/inc/yggdrasil/tlk01.smk diff --git a/mpq/portrait/special/inc/yggdrasil/tlk02.smk b/mpq/portrait/sp/inc/yggdrasil/tlk02.smk similarity index 100% rename from mpq/portrait/special/inc/yggdrasil/tlk02.smk rename to mpq/portrait/sp/inc/yggdrasil/tlk02.smk diff --git a/mpq/portrait/special/joran/fid00.smk b/mpq/portrait/sp/joran/fid00.smk similarity index 100% rename from mpq/portrait/special/joran/fid00.smk rename to mpq/portrait/sp/joran/fid00.smk diff --git a/mpq/portrait/special/joran/fid01.smk b/mpq/portrait/sp/joran/fid01.smk similarity index 100% rename from mpq/portrait/special/joran/fid01.smk rename to mpq/portrait/sp/joran/fid01.smk diff --git a/mpq/portrait/special/joran/fid02.smk b/mpq/portrait/sp/joran/fid02.smk similarity index 100% rename from mpq/portrait/special/joran/fid02.smk rename to mpq/portrait/sp/joran/fid02.smk diff --git a/mpq/portrait/special/joran/fid03.smk b/mpq/portrait/sp/joran/fid03.smk similarity index 100% rename from mpq/portrait/special/joran/fid03.smk rename to mpq/portrait/sp/joran/fid03.smk diff --git a/mpq/portrait/special/joran/tlk00.smk b/mpq/portrait/sp/joran/tlk00.smk similarity index 100% rename from mpq/portrait/special/joran/tlk00.smk rename to mpq/portrait/sp/joran/tlk00.smk diff --git a/mpq/portrait/special/kortar/fid00.smk b/mpq/portrait/sp/kortar/fid00.smk similarity index 100% rename from mpq/portrait/special/kortar/fid00.smk rename to mpq/portrait/sp/kortar/fid00.smk diff --git a/mpq/portrait/special/kortar/fid01.smk b/mpq/portrait/sp/kortar/fid01.smk similarity index 100% rename from mpq/portrait/special/kortar/fid01.smk rename to mpq/portrait/sp/kortar/fid01.smk diff --git a/mpq/portrait/special/kortar/fid02.smk b/mpq/portrait/sp/kortar/fid02.smk similarity index 100% rename from mpq/portrait/special/kortar/fid02.smk rename to mpq/portrait/sp/kortar/fid02.smk diff --git a/mpq/portrait/special/kortar/fid03.smk b/mpq/portrait/sp/kortar/fid03.smk similarity index 100% rename from mpq/portrait/special/kortar/fid03.smk rename to mpq/portrait/sp/kortar/fid03.smk diff --git a/mpq/portrait/special/kortar/tlk00.smk b/mpq/portrait/sp/kortar/tlk00.smk similarity index 100% rename from mpq/portrait/special/kortar/tlk00.smk rename to mpq/portrait/sp/kortar/tlk00.smk diff --git a/mpq/portrait/special/kortar/tlk01.smk b/mpq/portrait/sp/kortar/tlk01.smk similarity index 100% rename from mpq/portrait/special/kortar/tlk01.smk rename to mpq/portrait/sp/kortar/tlk01.smk diff --git a/mpq/portrait/special/kortar/tlk02.smk b/mpq/portrait/sp/kortar/tlk02.smk similarity index 100% rename from mpq/portrait/special/kortar/tlk02.smk rename to mpq/portrait/sp/kortar/tlk02.smk diff --git a/mpq/portrait/special/lannigan/fid00.smk b/mpq/portrait/sp/lannigan/fid00.smk similarity index 100% rename from mpq/portrait/special/lannigan/fid00.smk rename to mpq/portrait/sp/lannigan/fid00.smk diff --git a/mpq/portrait/special/lannigan/tlk00.smk b/mpq/portrait/sp/lannigan/tlk00.smk similarity index 100% rename from mpq/portrait/special/lannigan/tlk00.smk rename to mpq/portrait/sp/lannigan/tlk00.smk diff --git a/mpq/portrait/special/lannigan/tlk01.smk b/mpq/portrait/sp/lannigan/tlk01.smk similarity index 100% rename from mpq/portrait/special/lannigan/tlk01.smk rename to mpq/portrait/sp/lannigan/tlk01.smk diff --git a/mpq/portrait/special/mazakel/fid00.smk b/mpq/portrait/sp/mazakel/fid00.smk similarity index 100% rename from mpq/portrait/special/mazakel/fid00.smk rename to mpq/portrait/sp/mazakel/fid00.smk diff --git a/mpq/portrait/special/mazakel/fid01.smk b/mpq/portrait/sp/mazakel/fid01.smk similarity index 100% rename from mpq/portrait/special/mazakel/fid01.smk rename to mpq/portrait/sp/mazakel/fid01.smk diff --git a/mpq/portrait/special/mazakel/tlk00.smk b/mpq/portrait/sp/mazakel/tlk00.smk similarity index 100% rename from mpq/portrait/special/mazakel/tlk00.smk rename to mpq/portrait/sp/mazakel/tlk00.smk diff --git a/mpq/portrait/special/mazakel/tlk01.smk b/mpq/portrait/sp/mazakel/tlk01.smk similarity index 100% rename from mpq/portrait/special/mazakel/tlk01.smk rename to mpq/portrait/sp/mazakel/tlk01.smk diff --git a/mpq/portrait/special/medly/fid00.smk b/mpq/portrait/sp/medly/fid00.smk similarity index 100% rename from mpq/portrait/special/medly/fid00.smk rename to mpq/portrait/sp/medly/fid00.smk diff --git a/mpq/portrait/special/medly/tlk00.smk b/mpq/portrait/sp/medly/tlk00.smk similarity index 100% rename from mpq/portrait/special/medly/tlk00.smk rename to mpq/portrait/sp/medly/tlk00.smk diff --git a/mpq/portrait/special/mephis/fid00.smk b/mpq/portrait/sp/mephis/fid00.smk similarity index 100% rename from mpq/portrait/special/mephis/fid00.smk rename to mpq/portrait/sp/mephis/fid00.smk diff --git a/mpq/portrait/special/mephis/fid01.smk b/mpq/portrait/sp/mephis/fid01.smk similarity index 100% rename from mpq/portrait/special/mephis/fid01.smk rename to mpq/portrait/sp/mephis/fid01.smk diff --git a/mpq/portrait/special/mephis/fid02.smk b/mpq/portrait/sp/mephis/fid02.smk similarity index 100% rename from mpq/portrait/special/mephis/fid02.smk rename to mpq/portrait/sp/mephis/fid02.smk diff --git a/mpq/portrait/special/mephis/tlk00.smk b/mpq/portrait/sp/mephis/tlk00.smk similarity index 100% rename from mpq/portrait/special/mephis/tlk00.smk rename to mpq/portrait/sp/mephis/tlk00.smk diff --git a/mpq/portrait/special/mephis/tlk01.smk b/mpq/portrait/sp/mephis/tlk01.smk similarity index 100% rename from mpq/portrait/special/mephis/tlk01.smk rename to mpq/portrait/sp/mephis/tlk01.smk diff --git a/mpq/portrait/special/mephis/tlk02.smk b/mpq/portrait/sp/mephis/tlk02.smk similarity index 100% rename from mpq/portrait/special/mephis/tlk02.smk rename to mpq/portrait/sp/mephis/tlk02.smk diff --git a/mpq/portrait/special/mirith/fid00.smk b/mpq/portrait/sp/mirith/fid00.smk similarity index 100% rename from mpq/portrait/special/mirith/fid00.smk rename to mpq/portrait/sp/mirith/fid00.smk diff --git a/mpq/portrait/special/mirith/fid01.smk b/mpq/portrait/sp/mirith/fid01.smk similarity index 100% rename from mpq/portrait/special/mirith/fid01.smk rename to mpq/portrait/sp/mirith/fid01.smk diff --git a/mpq/portrait/special/mirith/tlk00.smk b/mpq/portrait/sp/mirith/tlk00.smk similarity index 100% rename from mpq/portrait/special/mirith/tlk00.smk rename to mpq/portrait/sp/mirith/tlk00.smk diff --git a/mpq/portrait/special/mirith/tlk01.smk b/mpq/portrait/sp/mirith/tlk01.smk similarity index 100% rename from mpq/portrait/special/mirith/tlk01.smk rename to mpq/portrait/sp/mirith/tlk01.smk diff --git a/mpq/portrait/special/nekron/fid00.smk b/mpq/portrait/sp/nekron/fid00.smk similarity index 100% rename from mpq/portrait/special/nekron/fid00.smk rename to mpq/portrait/sp/nekron/fid00.smk diff --git a/mpq/portrait/special/nekron/fid01.smk b/mpq/portrait/sp/nekron/fid01.smk similarity index 100% rename from mpq/portrait/special/nekron/fid01.smk rename to mpq/portrait/sp/nekron/fid01.smk diff --git a/mpq/portrait/special/nekron/fid02.smk b/mpq/portrait/sp/nekron/fid02.smk similarity index 100% rename from mpq/portrait/special/nekron/fid02.smk rename to mpq/portrait/sp/nekron/fid02.smk diff --git a/mpq/portrait/special/nekron/fid03.smk b/mpq/portrait/sp/nekron/fid03.smk similarity index 100% rename from mpq/portrait/special/nekron/fid03.smk rename to mpq/portrait/sp/nekron/fid03.smk diff --git a/mpq/portrait/special/nekron/tlk00.smk b/mpq/portrait/sp/nekron/tlk00.smk similarity index 100% rename from mpq/portrait/special/nekron/tlk00.smk rename to mpq/portrait/sp/nekron/tlk00.smk diff --git a/mpq/portrait/special/nekron/tlk01.smk b/mpq/portrait/sp/nekron/tlk01.smk similarity index 100% rename from mpq/portrait/special/nekron/tlk01.smk rename to mpq/portrait/sp/nekron/tlk01.smk diff --git a/mpq/portrait/special/nekron/tlk02.smk b/mpq/portrait/sp/nekron/tlk02.smk similarity index 100% rename from mpq/portrait/special/nekron/tlk02.smk rename to mpq/portrait/sp/nekron/tlk02.smk diff --git a/mpq/portrait/special/organ_senescent/fid00.smk b/mpq/portrait/sp/organ_senescent/fid00.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/fid00.smk rename to mpq/portrait/sp/organ_senescent/fid00.smk diff --git a/mpq/portrait/special/organ_senescent/fid01.smk b/mpq/portrait/sp/organ_senescent/fid01.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/fid01.smk rename to mpq/portrait/sp/organ_senescent/fid01.smk diff --git a/mpq/portrait/special/organ_senescent/fid02.smk b/mpq/portrait/sp/organ_senescent/fid02.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/fid02.smk rename to mpq/portrait/sp/organ_senescent/fid02.smk diff --git a/mpq/portrait/special/organ_senescent/tlk00.smk b/mpq/portrait/sp/organ_senescent/tlk00.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/tlk00.smk rename to mpq/portrait/sp/organ_senescent/tlk00.smk diff --git a/mpq/portrait/special/organ_senescent/tlk01.smk b/mpq/portrait/sp/organ_senescent/tlk01.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/tlk01.smk rename to mpq/portrait/sp/organ_senescent/tlk01.smk diff --git a/mpq/portrait/special/organ_senescent/tlk02.smk b/mpq/portrait/sp/organ_senescent/tlk02.smk similarity index 100% rename from mpq/portrait/special/organ_senescent/tlk02.smk rename to mpq/portrait/sp/organ_senescent/tlk02.smk diff --git a/mpq/portrait/special/osina/fid00.smk b/mpq/portrait/sp/osina/fid00.smk similarity index 100% rename from mpq/portrait/special/osina/fid00.smk rename to mpq/portrait/sp/osina/fid00.smk diff --git a/mpq/portrait/special/osina/fid01.smk b/mpq/portrait/sp/osina/fid01.smk similarity index 100% rename from mpq/portrait/special/osina/fid01.smk rename to mpq/portrait/sp/osina/fid01.smk diff --git a/mpq/portrait/special/osina/fid02.smk b/mpq/portrait/sp/osina/fid02.smk similarity index 100% rename from mpq/portrait/special/osina/fid02.smk rename to mpq/portrait/sp/osina/fid02.smk diff --git a/mpq/portrait/special/osina/tlk00.smk b/mpq/portrait/sp/osina/tlk00.smk similarity index 100% rename from mpq/portrait/special/osina/tlk00.smk rename to mpq/portrait/sp/osina/tlk00.smk diff --git a/mpq/portrait/special/osina/tlk01.smk b/mpq/portrait/sp/osina/tlk01.smk similarity index 100% rename from mpq/portrait/special/osina/tlk01.smk rename to mpq/portrait/sp/osina/tlk01.smk diff --git a/mpq/portrait/special/piler/fid00.smk b/mpq/portrait/sp/piler/fid00.smk similarity index 100% rename from mpq/portrait/special/piler/fid00.smk rename to mpq/portrait/sp/piler/fid00.smk diff --git a/mpq/portrait/special/piler/fid01.smk b/mpq/portrait/sp/piler/fid01.smk similarity index 100% rename from mpq/portrait/special/piler/fid01.smk rename to mpq/portrait/sp/piler/fid01.smk diff --git a/mpq/portrait/special/piler/tlk00.smk b/mpq/portrait/sp/piler/tlk00.smk similarity index 100% rename from mpq/portrait/special/piler/tlk00.smk rename to mpq/portrait/sp/piler/tlk00.smk diff --git a/mpq/portrait/special/piler/tlk01.smk b/mpq/portrait/sp/piler/tlk01.smk similarity index 100% rename from mpq/portrait/special/piler/tlk01.smk rename to mpq/portrait/sp/piler/tlk01.smk diff --git a/mpq/portrait/special/pr0nogo/fid00.smk b/mpq/portrait/sp/pr0nogo/fid00.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/fid00.smk rename to mpq/portrait/sp/pr0nogo/fid00.smk diff --git a/mpq/portrait/special/pr0nogo/fid01.smk b/mpq/portrait/sp/pr0nogo/fid01.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/fid01.smk rename to mpq/portrait/sp/pr0nogo/fid01.smk diff --git a/mpq/portrait/special/pr0nogo/fid02.smk b/mpq/portrait/sp/pr0nogo/fid02.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/fid02.smk rename to mpq/portrait/sp/pr0nogo/fid02.smk diff --git a/mpq/portrait/special/pr0nogo/tlk00.smk b/mpq/portrait/sp/pr0nogo/tlk00.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/tlk00.smk rename to mpq/portrait/sp/pr0nogo/tlk00.smk diff --git a/mpq/portrait/special/pr0nogo/tlk01.smk b/mpq/portrait/sp/pr0nogo/tlk01.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/tlk01.smk rename to mpq/portrait/sp/pr0nogo/tlk01.smk diff --git a/mpq/portrait/special/pr0nogo/tlk02.smk b/mpq/portrait/sp/pr0nogo/tlk02.smk similarity index 100% rename from mpq/portrait/special/pr0nogo/tlk02.smk rename to mpq/portrait/sp/pr0nogo/tlk02.smk diff --git a/mpq/portrait/special/tazarain/fid00.smk b/mpq/portrait/sp/tazarain/fid00.smk similarity index 100% rename from mpq/portrait/special/tazarain/fid00.smk rename to mpq/portrait/sp/tazarain/fid00.smk diff --git a/mpq/portrait/special/tazarain/fid01.smk b/mpq/portrait/sp/tazarain/fid01.smk similarity index 100% rename from mpq/portrait/special/tazarain/fid01.smk rename to mpq/portrait/sp/tazarain/fid01.smk diff --git a/mpq/portrait/special/tazarain/fid02.smk b/mpq/portrait/sp/tazarain/fid02.smk similarity index 100% rename from mpq/portrait/special/tazarain/fid02.smk rename to mpq/portrait/sp/tazarain/fid02.smk diff --git a/mpq/portrait/special/tazarain/fid03.smk b/mpq/portrait/sp/tazarain/fid03.smk similarity index 100% rename from mpq/portrait/special/tazarain/fid03.smk rename to mpq/portrait/sp/tazarain/fid03.smk diff --git a/mpq/portrait/special/tazarain/tlk00.smk b/mpq/portrait/sp/tazarain/tlk00.smk similarity index 100% rename from mpq/portrait/special/tazarain/tlk00.smk rename to mpq/portrait/sp/tazarain/tlk00.smk diff --git a/mpq/portrait/special/tazarain/tlk01.smk b/mpq/portrait/sp/tazarain/tlk01.smk similarity index 100% rename from mpq/portrait/special/tazarain/tlk01.smk rename to mpq/portrait/sp/tazarain/tlk01.smk diff --git a/mpq/portrait/special/tazarain/tlk02.smk b/mpq/portrait/sp/tazarain/tlk02.smk similarity index 100% rename from mpq/portrait/special/tazarain/tlk02.smk rename to mpq/portrait/sp/tazarain/tlk02.smk diff --git a/mpq/portrait/special/terimanok/fid00.smk b/mpq/portrait/sp/terimanok/fid00.smk similarity index 100% rename from mpq/portrait/special/terimanok/fid00.smk rename to mpq/portrait/sp/terimanok/fid00.smk diff --git a/mpq/portrait/special/terimanok/fid01.smk b/mpq/portrait/sp/terimanok/fid01.smk similarity index 100% rename from mpq/portrait/special/terimanok/fid01.smk rename to mpq/portrait/sp/terimanok/fid01.smk diff --git a/mpq/portrait/special/terimanok/fid02.smk b/mpq/portrait/sp/terimanok/fid02.smk similarity index 100% rename from mpq/portrait/special/terimanok/fid02.smk rename to mpq/portrait/sp/terimanok/fid02.smk diff --git a/mpq/portrait/special/terimanok/fid03.smk b/mpq/portrait/sp/terimanok/fid03.smk similarity index 100% rename from mpq/portrait/special/terimanok/fid03.smk rename to mpq/portrait/sp/terimanok/fid03.smk diff --git a/mpq/portrait/special/terimanok/tlk00.smk b/mpq/portrait/sp/terimanok/tlk00.smk similarity index 100% rename from mpq/portrait/special/terimanok/tlk00.smk rename to mpq/portrait/sp/terimanok/tlk00.smk diff --git a/mpq/portrait/special/terimanok/tlk01.smk b/mpq/portrait/sp/terimanok/tlk01.smk similarity index 100% rename from mpq/portrait/special/terimanok/tlk01.smk rename to mpq/portrait/sp/terimanok/tlk01.smk diff --git a/mpq/portrait/special/terimanok/tlk02.smk b/mpq/portrait/sp/terimanok/tlk02.smk similarity index 100% rename from mpq/portrait/special/terimanok/tlk02.smk rename to mpq/portrait/sp/terimanok/tlk02.smk diff --git a/mpq/portrait/special/thyron/fid00.smk b/mpq/portrait/sp/thyron/fid00.smk similarity index 100% rename from mpq/portrait/special/thyron/fid00.smk rename to mpq/portrait/sp/thyron/fid00.smk diff --git a/mpq/portrait/special/thyron/tlk00.smk b/mpq/portrait/sp/thyron/tlk00.smk similarity index 100% rename from mpq/portrait/special/thyron/tlk00.smk rename to mpq/portrait/sp/thyron/tlk00.smk diff --git a/mpq/portrait/special/trodin/fid00.smk b/mpq/portrait/sp/trodin/fid00.smk similarity index 100% rename from mpq/portrait/special/trodin/fid00.smk rename to mpq/portrait/sp/trodin/fid00.smk diff --git a/mpq/portrait/special/trodin/fid01.smk b/mpq/portrait/sp/trodin/fid01.smk similarity index 100% rename from mpq/portrait/special/trodin/fid01.smk rename to mpq/portrait/sp/trodin/fid01.smk diff --git a/mpq/portrait/special/trodin/fid02.smk b/mpq/portrait/sp/trodin/fid02.smk similarity index 100% rename from mpq/portrait/special/trodin/fid02.smk rename to mpq/portrait/sp/trodin/fid02.smk diff --git a/mpq/portrait/special/trodin/tlk00.smk b/mpq/portrait/sp/trodin/tlk00.smk similarity index 100% rename from mpq/portrait/special/trodin/tlk00.smk rename to mpq/portrait/sp/trodin/tlk00.smk diff --git a/mpq/portrait/special/trodin/tlk01.smk b/mpq/portrait/sp/trodin/tlk01.smk similarity index 100% rename from mpq/portrait/special/trodin/tlk01.smk rename to mpq/portrait/sp/trodin/tlk01.smk diff --git a/mpq/portrait/special/trodin/tlk02.smk b/mpq/portrait/sp/trodin/tlk02.smk similarity index 100% rename from mpq/portrait/special/trodin/tlk02.smk rename to mpq/portrait/sp/trodin/tlk02.smk diff --git a/mpq/portrait/special/venammar/fid00.smk b/mpq/portrait/sp/venammar/fid00.smk similarity index 100% rename from mpq/portrait/special/venammar/fid00.smk rename to mpq/portrait/sp/venammar/fid00.smk diff --git a/mpq/portrait/special/venammar/fid01.smk b/mpq/portrait/sp/venammar/fid01.smk similarity index 100% rename from mpq/portrait/special/venammar/fid01.smk rename to mpq/portrait/sp/venammar/fid01.smk diff --git a/mpq/portrait/special/venammar/fid02.smk b/mpq/portrait/sp/venammar/fid02.smk similarity index 100% rename from mpq/portrait/special/venammar/fid02.smk rename to mpq/portrait/sp/venammar/fid02.smk diff --git a/mpq/portrait/special/venammar/fid03.smk b/mpq/portrait/sp/venammar/fid03.smk similarity index 100% rename from mpq/portrait/special/venammar/fid03.smk rename to mpq/portrait/sp/venammar/fid03.smk diff --git a/mpq/portrait/special/venammar/tlk00.smk b/mpq/portrait/sp/venammar/tlk00.smk similarity index 100% rename from mpq/portrait/special/venammar/tlk00.smk rename to mpq/portrait/sp/venammar/tlk00.smk diff --git a/mpq/portrait/special/venammar/tlk01.smk b/mpq/portrait/sp/venammar/tlk01.smk similarity index 100% rename from mpq/portrait/special/venammar/tlk01.smk rename to mpq/portrait/sp/venammar/tlk01.smk diff --git a/mpq/portrait/special/venammar/tlk02.smk b/mpq/portrait/sp/venammar/tlk02.smk similarity index 100% rename from mpq/portrait/special/venammar/tlk02.smk rename to mpq/portrait/sp/venammar/tlk02.smk diff --git a/mpq/portrait/terran/aion/fid00.smk b/mpq/portrait/t/aion/fid00.smk similarity index 100% rename from mpq/portrait/terran/aion/fid00.smk rename to mpq/portrait/t/aion/fid00.smk diff --git a/mpq/portrait/terran/aion/fid01.smk b/mpq/portrait/t/aion/fid01.smk similarity index 100% rename from mpq/portrait/terran/aion/fid01.smk rename to mpq/portrait/t/aion/fid01.smk diff --git a/mpq/portrait/terran/aion/tlk00.smk b/mpq/portrait/t/aion/tlk00.smk similarity index 100% rename from mpq/portrait/terran/aion/tlk00.smk rename to mpq/portrait/t/aion/tlk00.smk diff --git a/mpq/portrait/terran/aion/tlk01.smk b/mpq/portrait/t/aion/tlk01.smk similarity index 100% rename from mpq/portrait/terran/aion/tlk01.smk rename to mpq/portrait/t/aion/tlk01.smk diff --git a/mpq/portrait/terran/aion/tlk02.smk b/mpq/portrait/t/aion/tlk02.smk similarity index 100% rename from mpq/portrait/terran/aion/tlk02.smk rename to mpq/portrait/t/aion/tlk02.smk diff --git a/mpq/portrait/terran/ancile/fid00.smk b/mpq/portrait/t/ancile/fid00.smk similarity index 100% rename from mpq/portrait/terran/ancile/fid00.smk rename to mpq/portrait/t/ancile/fid00.smk diff --git a/mpq/portrait/terran/ancile/fid01.smk b/mpq/portrait/t/ancile/fid01.smk similarity index 100% rename from mpq/portrait/terran/ancile/fid01.smk rename to mpq/portrait/t/ancile/fid01.smk diff --git a/mpq/portrait/terran/ancile/fid02.smk b/mpq/portrait/t/ancile/fid02.smk similarity index 100% rename from mpq/portrait/terran/ancile/fid02.smk rename to mpq/portrait/t/ancile/fid02.smk diff --git a/mpq/portrait/terran/ancile/tlk00.smk b/mpq/portrait/t/ancile/tlk00.smk similarity index 100% rename from mpq/portrait/terran/ancile/tlk00.smk rename to mpq/portrait/t/ancile/tlk00.smk diff --git a/mpq/portrait/terran/ancile/tlk01.smk b/mpq/portrait/t/ancile/tlk01.smk similarity index 100% rename from mpq/portrait/terran/ancile/tlk01.smk rename to mpq/portrait/t/ancile/tlk01.smk diff --git a/mpq/portrait/terran/anticthon/fid00.smk b/mpq/portrait/t/anticthon/fid00.smk similarity index 100% rename from mpq/portrait/terran/anticthon/fid00.smk rename to mpq/portrait/t/anticthon/fid00.smk diff --git a/mpq/portrait/terran/anticthon/tlk00.smk b/mpq/portrait/t/anticthon/tlk00.smk similarity index 100% rename from mpq/portrait/terran/anticthon/tlk00.smk rename to mpq/portrait/t/anticthon/tlk00.smk diff --git a/mpq/portrait/terran/apostle/fid00.smk b/mpq/portrait/t/apostle/fid00.smk similarity index 100% rename from mpq/portrait/terran/apostle/fid00.smk rename to mpq/portrait/t/apostle/fid00.smk diff --git a/mpq/portrait/terran/apostle/fid01.smk b/mpq/portrait/t/apostle/fid01.smk similarity index 100% rename from mpq/portrait/terran/apostle/fid01.smk rename to mpq/portrait/t/apostle/fid01.smk diff --git a/mpq/portrait/terran/apostle/tlk00.smk b/mpq/portrait/t/apostle/tlk00.smk similarity index 100% rename from mpq/portrait/terran/apostle/tlk00.smk rename to mpq/portrait/t/apostle/tlk00.smk diff --git a/mpq/portrait/terran/apostle/tlk01.smk b/mpq/portrait/t/apostle/tlk01.smk similarity index 100% rename from mpq/portrait/terran/apostle/tlk01.smk rename to mpq/portrait/t/apostle/tlk01.smk diff --git a/mpq/portrait/terran/autocrat/fid00.smk b/mpq/portrait/t/autocrat/fid00.smk similarity index 100% rename from mpq/portrait/terran/autocrat/fid00.smk rename to mpq/portrait/t/autocrat/fid00.smk diff --git a/mpq/portrait/terran/autocrat/fid01.smk b/mpq/portrait/t/autocrat/fid01.smk similarity index 100% rename from mpq/portrait/terran/autocrat/fid01.smk rename to mpq/portrait/t/autocrat/fid01.smk diff --git a/mpq/portrait/terran/autocrat/tlk00.smk b/mpq/portrait/t/autocrat/tlk00.smk similarity index 100% rename from mpq/portrait/terran/autocrat/tlk00.smk rename to mpq/portrait/t/autocrat/tlk00.smk diff --git a/mpq/portrait/terran/autocrat/tlk01.smk b/mpq/portrait/t/autocrat/tlk01.smk similarity index 100% rename from mpq/portrait/terran/autocrat/tlk01.smk rename to mpq/portrait/t/autocrat/tlk01.smk diff --git a/mpq/portrait/terran/azazel/fid00.smk b/mpq/portrait/t/azazel/fid00.smk similarity index 100% rename from mpq/portrait/terran/azazel/fid00.smk rename to mpq/portrait/t/azazel/fid00.smk diff --git a/mpq/portrait/terran/azazel/fid01.smk b/mpq/portrait/t/azazel/fid01.smk similarity index 100% rename from mpq/portrait/terran/azazel/fid01.smk rename to mpq/portrait/t/azazel/fid01.smk diff --git a/mpq/portrait/terran/azazel/fid02.smk b/mpq/portrait/t/azazel/fid02.smk similarity index 100% rename from mpq/portrait/terran/azazel/fid02.smk rename to mpq/portrait/t/azazel/fid02.smk diff --git a/mpq/portrait/terran/azazel/tlk00.smk b/mpq/portrait/t/azazel/tlk00.smk similarity index 100% rename from mpq/portrait/terran/azazel/tlk00.smk rename to mpq/portrait/t/azazel/tlk00.smk diff --git a/mpq/portrait/terran/azazel/tlk01.smk b/mpq/portrait/t/azazel/tlk01.smk similarity index 100% rename from mpq/portrait/terran/azazel/tlk01.smk rename to mpq/portrait/t/azazel/tlk01.smk diff --git a/mpq/portrait/terran/cataphract/fid00.smk b/mpq/portrait/t/cataphract/fid00.smk similarity index 100% rename from mpq/portrait/terran/cataphract/fid00.smk rename to mpq/portrait/t/cataphract/fid00.smk diff --git a/mpq/portrait/terran/cataphract/fid01.smk b/mpq/portrait/t/cataphract/fid01.smk similarity index 100% rename from mpq/portrait/terran/cataphract/fid01.smk rename to mpq/portrait/t/cataphract/fid01.smk diff --git a/mpq/portrait/terran/cataphract/tlk00.smk b/mpq/portrait/t/cataphract/tlk00.smk similarity index 100% rename from mpq/portrait/terran/cataphract/tlk00.smk rename to mpq/portrait/t/cataphract/tlk00.smk diff --git a/mpq/portrait/terran/cataphract/tlk01.smk b/mpq/portrait/t/cataphract/tlk01.smk similarity index 100% rename from mpq/portrait/terran/cataphract/tlk01.smk rename to mpq/portrait/t/cataphract/tlk01.smk diff --git a/mpq/portrait/terran/centaur/fid00.smk b/mpq/portrait/t/centaur/fid00.smk similarity index 100% rename from mpq/portrait/terran/centaur/fid00.smk rename to mpq/portrait/t/centaur/fid00.smk diff --git a/mpq/portrait/terran/centaur/fid01.smk b/mpq/portrait/t/centaur/fid01.smk similarity index 100% rename from mpq/portrait/terran/centaur/fid01.smk rename to mpq/portrait/t/centaur/fid01.smk diff --git a/mpq/portrait/terran/centaur/tlk00.smk b/mpq/portrait/t/centaur/tlk00.smk similarity index 100% rename from mpq/portrait/terran/centaur/tlk00.smk rename to mpq/portrait/t/centaur/tlk00.smk diff --git a/mpq/portrait/terran/centaur/tlk01.smk b/mpq/portrait/t/centaur/tlk01.smk similarity index 100% rename from mpq/portrait/terran/centaur/tlk01.smk rename to mpq/portrait/t/centaur/tlk01.smk diff --git a/mpq/portrait/terran/centaur/tlk02.smk b/mpq/portrait/t/centaur/tlk02.smk similarity index 100% rename from mpq/portrait/terran/centaur/tlk02.smk rename to mpq/portrait/t/centaur/tlk02.smk diff --git a/mpq/portrait/terran/claymore/fid00.smk b/mpq/portrait/t/claymore/fid00.smk similarity index 100% rename from mpq/portrait/terran/claymore/fid00.smk rename to mpq/portrait/t/claymore/fid00.smk diff --git a/mpq/portrait/terran/claymore/tlk00.smk b/mpq/portrait/t/claymore/tlk00.smk similarity index 100% rename from mpq/portrait/terran/claymore/tlk00.smk rename to mpq/portrait/t/claymore/tlk00.smk diff --git a/mpq/portrait/terran/cuirass/fid00.smk b/mpq/portrait/t/cuirass/fid00.smk similarity index 100% rename from mpq/portrait/terran/cuirass/fid00.smk rename to mpq/portrait/t/cuirass/fid00.smk diff --git a/mpq/portrait/terran/cuirass/fid01.smk b/mpq/portrait/t/cuirass/fid01.smk similarity index 100% rename from mpq/portrait/terran/cuirass/fid01.smk rename to mpq/portrait/t/cuirass/fid01.smk diff --git a/mpq/portrait/terran/cuirass/tlk00.smk b/mpq/portrait/t/cuirass/tlk00.smk similarity index 100% rename from mpq/portrait/terran/cuirass/tlk00.smk rename to mpq/portrait/t/cuirass/tlk00.smk diff --git a/mpq/portrait/terran/cuirass/tlk01.smk b/mpq/portrait/t/cuirass/tlk01.smk similarity index 100% rename from mpq/portrait/terran/cuirass/tlk01.smk rename to mpq/portrait/t/cuirass/tlk01.smk diff --git a/mpq/portrait/terran/cyclops/fid00.smk b/mpq/portrait/t/cyclops/fid00.smk similarity index 100% rename from mpq/portrait/terran/cyclops/fid00.smk rename to mpq/portrait/t/cyclops/fid00.smk diff --git a/mpq/portrait/terran/cyclops/tlk00.smk b/mpq/portrait/t/cyclops/tlk00.smk similarity index 100% rename from mpq/portrait/terran/cyclops/tlk00.smk rename to mpq/portrait/t/cyclops/tlk00.smk diff --git a/mpq/portrait/terran/cyprian/fid00.smk b/mpq/portrait/t/cyprian/fid00.smk similarity index 100% rename from mpq/portrait/terran/cyprian/fid00.smk rename to mpq/portrait/t/cyprian/fid00.smk diff --git a/mpq/portrait/terran/cyprian/tlk00.smk b/mpq/portrait/t/cyprian/tlk00.smk similarity index 100% rename from mpq/portrait/terran/cyprian/tlk00.smk rename to mpq/portrait/t/cyprian/tlk00.smk diff --git a/mpq/portrait/terran/dilettante/fid00.smk b/mpq/portrait/t/dilettante/fid00.smk similarity index 100% rename from mpq/portrait/terran/dilettante/fid00.smk rename to mpq/portrait/t/dilettante/fid00.smk diff --git a/mpq/portrait/terran/durendal/fid00.smk b/mpq/portrait/t/durendal/fid00.smk similarity index 100% rename from mpq/portrait/terran/durendal/fid00.smk rename to mpq/portrait/t/durendal/fid00.smk diff --git a/mpq/portrait/terran/durendal/fid01.smk b/mpq/portrait/t/durendal/fid01.smk similarity index 100% rename from mpq/portrait/terran/durendal/fid01.smk rename to mpq/portrait/t/durendal/fid01.smk diff --git a/mpq/portrait/terran/durendal/fid02.smk b/mpq/portrait/t/durendal/fid02.smk similarity index 100% rename from mpq/portrait/terran/durendal/fid02.smk rename to mpq/portrait/t/durendal/fid02.smk diff --git a/mpq/portrait/terran/durendal/fid03.smk b/mpq/portrait/t/durendal/fid03.smk similarity index 100% rename from mpq/portrait/terran/durendal/fid03.smk rename to mpq/portrait/t/durendal/fid03.smk diff --git a/mpq/portrait/terran/durendal/tlk00.smk b/mpq/portrait/t/durendal/tlk00.smk similarity index 100% rename from mpq/portrait/terran/durendal/tlk00.smk rename to mpq/portrait/t/durendal/tlk00.smk diff --git a/mpq/portrait/terran/durendal/tlk01.smk b/mpq/portrait/t/durendal/tlk01.smk similarity index 100% rename from mpq/portrait/terran/durendal/tlk01.smk rename to mpq/portrait/t/durendal/tlk01.smk diff --git a/mpq/portrait/terran/durendal/tlk02.smk b/mpq/portrait/t/durendal/tlk02.smk similarity index 100% rename from mpq/portrait/terran/durendal/tlk02.smk rename to mpq/portrait/t/durendal/tlk02.smk diff --git a/mpq/portrait/terran/gorgon/fid00.smk b/mpq/portrait/t/gorgon/fid00.smk similarity index 100% rename from mpq/portrait/terran/gorgon/fid00.smk rename to mpq/portrait/t/gorgon/fid00.smk diff --git a/mpq/portrait/terran/gorgon/fid01.smk b/mpq/portrait/t/gorgon/fid01.smk similarity index 100% rename from mpq/portrait/terran/gorgon/fid01.smk rename to mpq/portrait/t/gorgon/fid01.smk diff --git a/mpq/portrait/terran/gorgon/fid02.smk b/mpq/portrait/t/gorgon/fid02.smk similarity index 100% rename from mpq/portrait/terran/gorgon/fid02.smk rename to mpq/portrait/t/gorgon/fid02.smk diff --git a/mpq/portrait/terran/gorgon/fid03.smk b/mpq/portrait/t/gorgon/fid03.smk similarity index 100% rename from mpq/portrait/terran/gorgon/fid03.smk rename to mpq/portrait/t/gorgon/fid03.smk diff --git a/mpq/portrait/terran/gorgon/tlk00.smk b/mpq/portrait/t/gorgon/tlk00.smk similarity index 100% rename from mpq/portrait/terran/gorgon/tlk00.smk rename to mpq/portrait/t/gorgon/tlk00.smk diff --git a/mpq/portrait/terran/gorgon/tlk01.smk b/mpq/portrait/t/gorgon/tlk01.smk similarity index 100% rename from mpq/portrait/terran/gorgon/tlk01.smk rename to mpq/portrait/t/gorgon/tlk01.smk diff --git a/mpq/portrait/terran/gorgon/tlk02.smk b/mpq/portrait/t/gorgon/tlk02.smk similarity index 100% rename from mpq/portrait/terran/gorgon/tlk02.smk rename to mpq/portrait/t/gorgon/tlk02.smk diff --git a/mpq/portrait/terran/heracles/fid00.smk b/mpq/portrait/t/heracles/fid00.smk similarity index 100% rename from mpq/portrait/terran/heracles/fid00.smk rename to mpq/portrait/t/heracles/fid00.smk diff --git a/mpq/portrait/terran/heracles/fid01.smk b/mpq/portrait/t/heracles/fid01.smk similarity index 100% rename from mpq/portrait/terran/heracles/fid01.smk rename to mpq/portrait/t/heracles/fid01.smk diff --git a/mpq/portrait/terran/heracles/fid02.smk b/mpq/portrait/t/heracles/fid02.smk similarity index 100% rename from mpq/portrait/terran/heracles/fid02.smk rename to mpq/portrait/t/heracles/fid02.smk diff --git a/mpq/portrait/terran/heracles/tlk00.smk b/mpq/portrait/t/heracles/tlk00.smk similarity index 100% rename from mpq/portrait/terran/heracles/tlk00.smk rename to mpq/portrait/t/heracles/tlk00.smk diff --git a/mpq/portrait/terran/heracles/tlk01.smk b/mpq/portrait/t/heracles/tlk01.smk similarity index 100% rename from mpq/portrait/terran/heracles/tlk01.smk rename to mpq/portrait/t/heracles/tlk01.smk diff --git a/mpq/portrait/terran/hippogriff/fid00.smk b/mpq/portrait/t/hippogriff/fid00.smk similarity index 100% rename from mpq/portrait/terran/hippogriff/fid00.smk rename to mpq/portrait/t/hippogriff/fid00.smk diff --git a/mpq/portrait/terran/hippogriff/fid01.smk b/mpq/portrait/t/hippogriff/fid01.smk similarity index 100% rename from mpq/portrait/terran/hippogriff/fid01.smk rename to mpq/portrait/t/hippogriff/fid01.smk diff --git a/mpq/portrait/terran/hippogriff/tlk00.smk b/mpq/portrait/t/hippogriff/tlk00.smk similarity index 100% rename from mpq/portrait/terran/hippogriff/tlk00.smk rename to mpq/portrait/t/hippogriff/tlk00.smk diff --git a/mpq/portrait/terran/hypnagogue/fid00.smk b/mpq/portrait/t/hypnagogue/fid00.smk similarity index 100% rename from mpq/portrait/terran/hypnagogue/fid00.smk rename to mpq/portrait/t/hypnagogue/fid00.smk diff --git a/mpq/portrait/terran/hypnagogue/fid01.smk b/mpq/portrait/t/hypnagogue/fid01.smk similarity index 100% rename from mpq/portrait/terran/hypnagogue/fid01.smk rename to mpq/portrait/t/hypnagogue/fid01.smk diff --git a/mpq/portrait/terran/hypnagogue/tlk00.smk b/mpq/portrait/t/hypnagogue/tlk00.smk similarity index 100% rename from mpq/portrait/terran/hypnagogue/tlk00.smk rename to mpq/portrait/t/hypnagogue/tlk00.smk diff --git a/mpq/portrait/terran/hypnagogue/tlk01.smk b/mpq/portrait/t/hypnagogue/tlk01.smk similarity index 100% rename from mpq/portrait/terran/hypnagogue/tlk01.smk rename to mpq/portrait/t/hypnagogue/tlk01.smk diff --git a/mpq/portrait/terran/hypnagogue/tlk02.smk b/mpq/portrait/t/hypnagogue/tlk02.smk similarity index 100% rename from mpq/portrait/terran/hypnagogue/tlk02.smk rename to mpq/portrait/t/hypnagogue/tlk02.smk diff --git a/mpq/portrait/terran/madcap/fid00.smk b/mpq/portrait/t/madcap/fid00.smk similarity index 100% rename from mpq/portrait/terran/madcap/fid00.smk rename to mpq/portrait/t/madcap/fid00.smk diff --git a/mpq/portrait/terran/madcap/fid01.smk b/mpq/portrait/t/madcap/fid01.smk similarity index 100% rename from mpq/portrait/terran/madcap/fid01.smk rename to mpq/portrait/t/madcap/fid01.smk diff --git a/mpq/portrait/terran/madcap/tlk00.smk b/mpq/portrait/t/madcap/tlk00.smk similarity index 100% rename from mpq/portrait/terran/madcap/tlk00.smk rename to mpq/portrait/t/madcap/tlk00.smk diff --git a/mpq/portrait/terran/madcap/tlk01.smk b/mpq/portrait/t/madcap/tlk01.smk similarity index 100% rename from mpq/portrait/terran/madcap/tlk01.smk rename to mpq/portrait/t/madcap/tlk01.smk diff --git a/mpq/portrait/terran/madrigal/fid00.smk b/mpq/portrait/t/madrigal/fid00.smk similarity index 100% rename from mpq/portrait/terran/madrigal/fid00.smk rename to mpq/portrait/t/madrigal/fid00.smk diff --git a/mpq/portrait/terran/madrigal/tlk00.smk b/mpq/portrait/t/madrigal/tlk00.smk similarity index 100% rename from mpq/portrait/terran/madrigal/tlk00.smk rename to mpq/portrait/t/madrigal/tlk00.smk diff --git a/mpq/portrait/terran/matador/fid00.smk b/mpq/portrait/t/matador/fid00.smk similarity index 100% rename from mpq/portrait/terran/matador/fid00.smk rename to mpq/portrait/t/matador/fid00.smk diff --git a/mpq/portrait/terran/matador/tlk00.smk b/mpq/portrait/t/matador/tlk00.smk similarity index 100% rename from mpq/portrait/terran/matador/tlk00.smk rename to mpq/portrait/t/matador/tlk00.smk diff --git a/mpq/portrait/terran/olympian/fid00.smk b/mpq/portrait/t/olympian/fid00.smk similarity index 100% rename from mpq/portrait/terran/olympian/fid00.smk rename to mpq/portrait/t/olympian/fid00.smk diff --git a/mpq/portrait/terran/olympian/tlk00.smk b/mpq/portrait/t/olympian/tlk00.smk similarity index 100% rename from mpq/portrait/terran/olympian/tlk00.smk rename to mpq/portrait/t/olympian/tlk00.smk diff --git a/mpq/portrait/terran/paladin/fid00.smk b/mpq/portrait/t/paladin/fid00.smk similarity index 100% rename from mpq/portrait/terran/paladin/fid00.smk rename to mpq/portrait/t/paladin/fid00.smk diff --git a/mpq/portrait/terran/paladin/fid01.smk b/mpq/portrait/t/paladin/fid01.smk similarity index 100% rename from mpq/portrait/terran/paladin/fid01.smk rename to mpq/portrait/t/paladin/fid01.smk diff --git a/mpq/portrait/terran/paladin/fid02.smk b/mpq/portrait/t/paladin/fid02.smk similarity index 100% rename from mpq/portrait/terran/paladin/fid02.smk rename to mpq/portrait/t/paladin/fid02.smk diff --git a/mpq/portrait/terran/paladin/tlk00.smk b/mpq/portrait/t/paladin/tlk00.smk similarity index 100% rename from mpq/portrait/terran/paladin/tlk00.smk rename to mpq/portrait/t/paladin/tlk00.smk diff --git a/mpq/portrait/terran/paladin/tlk01.smk b/mpq/portrait/t/paladin/tlk01.smk similarity index 100% rename from mpq/portrait/terran/paladin/tlk01.smk rename to mpq/portrait/t/paladin/tlk01.smk diff --git a/mpq/portrait/terran/pazuzu/fid00.smk b/mpq/portrait/t/pazuzu/fid00.smk similarity index 100% rename from mpq/portrait/terran/pazuzu/fid00.smk rename to mpq/portrait/t/pazuzu/fid00.smk diff --git a/mpq/portrait/terran/pazuzu/fid01.smk b/mpq/portrait/t/pazuzu/fid01.smk similarity index 100% rename from mpq/portrait/terran/pazuzu/fid01.smk rename to mpq/portrait/t/pazuzu/fid01.smk diff --git a/mpq/portrait/terran/pazuzu/fid02.smk b/mpq/portrait/t/pazuzu/fid02.smk similarity index 100% rename from mpq/portrait/terran/pazuzu/fid02.smk rename to mpq/portrait/t/pazuzu/fid02.smk diff --git a/mpq/portrait/terran/pazuzu/tlk00.smk b/mpq/portrait/t/pazuzu/tlk00.smk similarity index 100% rename from mpq/portrait/terran/pazuzu/tlk00.smk rename to mpq/portrait/t/pazuzu/tlk00.smk diff --git a/mpq/portrait/terran/pazuzu/tlk01.smk b/mpq/portrait/t/pazuzu/tlk01.smk similarity index 100% rename from mpq/portrait/terran/pazuzu/tlk01.smk rename to mpq/portrait/t/pazuzu/tlk01.smk diff --git a/mpq/portrait/terran/phobos/fid00.smk b/mpq/portrait/t/phobos/fid00.smk similarity index 100% rename from mpq/portrait/terran/phobos/fid00.smk rename to mpq/portrait/t/phobos/fid00.smk diff --git a/mpq/portrait/terran/phobos/fid01.smk b/mpq/portrait/t/phobos/fid01.smk similarity index 100% rename from mpq/portrait/terran/phobos/fid01.smk rename to mpq/portrait/t/phobos/fid01.smk diff --git a/mpq/portrait/terran/phobos/fid02.smk b/mpq/portrait/t/phobos/fid02.smk similarity index 100% rename from mpq/portrait/terran/phobos/fid02.smk rename to mpq/portrait/t/phobos/fid02.smk diff --git a/mpq/portrait/terran/phobos/fid03.smk b/mpq/portrait/t/phobos/fid03.smk similarity index 100% rename from mpq/portrait/terran/phobos/fid03.smk rename to mpq/portrait/t/phobos/fid03.smk diff --git a/mpq/portrait/terran/phobos/tlk00.smk b/mpq/portrait/t/phobos/tlk00.smk similarity index 100% rename from mpq/portrait/terran/phobos/tlk00.smk rename to mpq/portrait/t/phobos/tlk00.smk diff --git a/mpq/portrait/terran/phobos/tlk01.smk b/mpq/portrait/t/phobos/tlk01.smk similarity index 100% rename from mpq/portrait/terran/phobos/tlk01.smk rename to mpq/portrait/t/phobos/tlk01.smk diff --git a/mpq/portrait/terran/phobos/tlk02.smk b/mpq/portrait/t/phobos/tlk02.smk similarity index 100% rename from mpq/portrait/terran/phobos/tlk02.smk rename to mpq/portrait/t/phobos/tlk02.smk diff --git a/mpq/portrait/terran/pythean/fid00.smk b/mpq/portrait/t/pythean/fid00.smk similarity index 100% rename from mpq/portrait/terran/pythean/fid00.smk rename to mpq/portrait/t/pythean/fid00.smk diff --git a/mpq/portrait/terran/pythean/fid01.smk b/mpq/portrait/t/pythean/fid01.smk similarity index 100% rename from mpq/portrait/terran/pythean/fid01.smk rename to mpq/portrait/t/pythean/fid01.smk diff --git a/mpq/portrait/terran/pythean/fid02.smk b/mpq/portrait/t/pythean/fid02.smk similarity index 100% rename from mpq/portrait/terran/pythean/fid02.smk rename to mpq/portrait/t/pythean/fid02.smk diff --git a/mpq/portrait/terran/pythean/fid03.smk b/mpq/portrait/t/pythean/fid03.smk similarity index 100% rename from mpq/portrait/terran/pythean/fid03.smk rename to mpq/portrait/t/pythean/fid03.smk diff --git a/mpq/portrait/terran/pythean/tlk00.smk b/mpq/portrait/t/pythean/tlk00.smk similarity index 100% rename from mpq/portrait/terran/pythean/tlk00.smk rename to mpq/portrait/t/pythean/tlk00.smk diff --git a/mpq/portrait/terran/pythean/tlk01.smk b/mpq/portrait/t/pythean/tlk01.smk similarity index 100% rename from mpq/portrait/terran/pythean/tlk01.smk rename to mpq/portrait/t/pythean/tlk01.smk diff --git a/mpq/portrait/terran/pythean/tlk02.smk b/mpq/portrait/t/pythean/tlk02.smk similarity index 100% rename from mpq/portrait/terran/pythean/tlk02.smk rename to mpq/portrait/t/pythean/tlk02.smk diff --git a/mpq/portrait/terran/ramesses/fid00.smk b/mpq/portrait/t/ramesses/fid00.smk similarity index 100% rename from mpq/portrait/terran/ramesses/fid00.smk rename to mpq/portrait/t/ramesses/fid00.smk diff --git a/mpq/portrait/terran/ramesses/fid01.smk b/mpq/portrait/t/ramesses/fid01.smk similarity index 100% rename from mpq/portrait/terran/ramesses/fid01.smk rename to mpq/portrait/t/ramesses/fid01.smk diff --git a/mpq/portrait/terran/ramesses/fid02.smk b/mpq/portrait/t/ramesses/fid02.smk similarity index 100% rename from mpq/portrait/terran/ramesses/fid02.smk rename to mpq/portrait/t/ramesses/fid02.smk diff --git a/mpq/portrait/terran/ramesses/tlk00.smk b/mpq/portrait/t/ramesses/tlk00.smk similarity index 100% rename from mpq/portrait/terran/ramesses/tlk00.smk rename to mpq/portrait/t/ramesses/tlk00.smk diff --git a/mpq/portrait/terran/ramesses/tlk01.smk b/mpq/portrait/t/ramesses/tlk01.smk similarity index 100% rename from mpq/portrait/terran/ramesses/tlk01.smk rename to mpq/portrait/t/ramesses/tlk01.smk diff --git a/mpq/portrait/terran/salamander/fid00.smk b/mpq/portrait/t/salamander/fid00.smk similarity index 100% rename from mpq/portrait/terran/salamander/fid00.smk rename to mpq/portrait/t/salamander/fid00.smk diff --git a/mpq/portrait/terran/salamander/fid01.smk b/mpq/portrait/t/salamander/fid01.smk similarity index 100% rename from mpq/portrait/terran/salamander/fid01.smk rename to mpq/portrait/t/salamander/fid01.smk diff --git a/mpq/portrait/terran/salamander/fid02.smk b/mpq/portrait/t/salamander/fid02.smk similarity index 100% rename from mpq/portrait/terran/salamander/fid02.smk rename to mpq/portrait/t/salamander/fid02.smk diff --git a/mpq/portrait/terran/salamander/fid03.smk b/mpq/portrait/t/salamander/fid03.smk similarity index 100% rename from mpq/portrait/terran/salamander/fid03.smk rename to mpq/portrait/t/salamander/fid03.smk diff --git a/mpq/portrait/terran/salamander/tlk00.smk b/mpq/portrait/t/salamander/tlk00.smk similarity index 100% rename from mpq/portrait/terran/salamander/tlk00.smk rename to mpq/portrait/t/salamander/tlk00.smk diff --git a/mpq/portrait/terran/salamander/tlk01.smk b/mpq/portrait/t/salamander/tlk01.smk similarity index 100% rename from mpq/portrait/terran/salamander/tlk01.smk rename to mpq/portrait/t/salamander/tlk01.smk diff --git a/mpq/portrait/terran/salamander/tlk02.smk b/mpq/portrait/t/salamander/tlk02.smk similarity index 100% rename from mpq/portrait/terran/salamander/tlk02.smk rename to mpq/portrait/t/salamander/tlk02.smk diff --git a/mpq/portrait/terran/savant/fid00.smk b/mpq/portrait/t/savant/fid00.smk similarity index 100% rename from mpq/portrait/terran/savant/fid00.smk rename to mpq/portrait/t/savant/fid00.smk diff --git a/mpq/portrait/terran/savant/fid01.smk b/mpq/portrait/t/savant/fid01.smk similarity index 100% rename from mpq/portrait/terran/savant/fid01.smk rename to mpq/portrait/t/savant/fid01.smk diff --git a/mpq/portrait/terran/savant/tlk00.smk b/mpq/portrait/t/savant/tlk00.smk similarity index 100% rename from mpq/portrait/terran/savant/tlk00.smk rename to mpq/portrait/t/savant/tlk00.smk diff --git a/mpq/portrait/terran/sevenstep/fid00.smk b/mpq/portrait/t/sevenstep/fid00.smk similarity index 100% rename from mpq/portrait/terran/sevenstep/fid00.smk rename to mpq/portrait/t/sevenstep/fid00.smk diff --git a/mpq/portrait/terran/sevenstep/tlk00.smk b/mpq/portrait/t/sevenstep/tlk00.smk similarity index 100% rename from mpq/portrait/terran/sevenstep/tlk00.smk rename to mpq/portrait/t/sevenstep/tlk00.smk diff --git a/mpq/portrait/terran/shaman/fid00.smk b/mpq/portrait/t/shaman/fid00.smk similarity index 100% rename from mpq/portrait/terran/shaman/fid00.smk rename to mpq/portrait/t/shaman/fid00.smk diff --git a/mpq/portrait/terran/shaman/tlk00.smk b/mpq/portrait/t/shaman/tlk00.smk similarity index 100% rename from mpq/portrait/terran/shaman/tlk00.smk rename to mpq/portrait/t/shaman/tlk00.smk diff --git a/mpq/portrait/terran/silvertongue/fid00.smk b/mpq/portrait/t/silvertongue/fid00.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/fid00.smk rename to mpq/portrait/t/silvertongue/fid00.smk diff --git a/mpq/portrait/terran/silvertongue/fid01.smk b/mpq/portrait/t/silvertongue/fid01.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/fid01.smk rename to mpq/portrait/t/silvertongue/fid01.smk diff --git a/mpq/portrait/terran/silvertongue/fid02.smk b/mpq/portrait/t/silvertongue/fid02.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/fid02.smk rename to mpq/portrait/t/silvertongue/fid02.smk diff --git a/mpq/portrait/terran/silvertongue/fid03.smk b/mpq/portrait/t/silvertongue/fid03.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/fid03.smk rename to mpq/portrait/t/silvertongue/fid03.smk diff --git a/mpq/portrait/terran/silvertongue/tlk00.smk b/mpq/portrait/t/silvertongue/tlk00.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/tlk00.smk rename to mpq/portrait/t/silvertongue/tlk00.smk diff --git a/mpq/portrait/terran/silvertongue/tlk01.smk b/mpq/portrait/t/silvertongue/tlk01.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/tlk01.smk rename to mpq/portrait/t/silvertongue/tlk01.smk diff --git a/mpq/portrait/terran/silvertongue/tlk02.smk b/mpq/portrait/t/silvertongue/tlk02.smk similarity index 100% rename from mpq/portrait/terran/silvertongue/tlk02.smk rename to mpq/portrait/t/silvertongue/tlk02.smk diff --git a/mpq/portrait/terran/siren/fid00.smk b/mpq/portrait/t/siren/fid00.smk similarity index 100% rename from mpq/portrait/terran/siren/fid00.smk rename to mpq/portrait/t/siren/fid00.smk diff --git a/mpq/portrait/terran/siren/fid01.smk b/mpq/portrait/t/siren/fid01.smk similarity index 100% rename from mpq/portrait/terran/siren/fid01.smk rename to mpq/portrait/t/siren/fid01.smk diff --git a/mpq/portrait/terran/siren/fid02.smk b/mpq/portrait/t/siren/fid02.smk similarity index 100% rename from mpq/portrait/terran/siren/fid02.smk rename to mpq/portrait/t/siren/fid02.smk diff --git a/mpq/portrait/terran/siren/tlk00.smk b/mpq/portrait/t/siren/tlk00.smk similarity index 100% rename from mpq/portrait/terran/siren/tlk00.smk rename to mpq/portrait/t/siren/tlk00.smk diff --git a/mpq/portrait/terran/striga/fid00.smk b/mpq/portrait/t/striga/fid00.smk similarity index 100% rename from mpq/portrait/terran/striga/fid00.smk rename to mpq/portrait/t/striga/fid00.smk diff --git a/mpq/portrait/terran/striga/tlk00.smk b/mpq/portrait/t/striga/tlk00.smk similarity index 100% rename from mpq/portrait/terran/striga/tlk00.smk rename to mpq/portrait/t/striga/tlk00.smk diff --git a/mpq/portrait/terran/sundog/fid00.smk b/mpq/portrait/t/sundog/fid00.smk similarity index 100% rename from mpq/portrait/terran/sundog/fid00.smk rename to mpq/portrait/t/sundog/fid00.smk diff --git a/mpq/portrait/terran/sundog/fid01.smk b/mpq/portrait/t/sundog/fid01.smk similarity index 100% rename from mpq/portrait/terran/sundog/fid01.smk rename to mpq/portrait/t/sundog/fid01.smk diff --git a/mpq/portrait/terran/sundog/tlk00.smk b/mpq/portrait/t/sundog/tlk00.smk similarity index 100% rename from mpq/portrait/terran/sundog/tlk00.smk rename to mpq/portrait/t/sundog/tlk00.smk diff --git a/mpq/portrait/terran/talos/fid00.smk b/mpq/portrait/t/talos/fid00.smk similarity index 100% rename from mpq/portrait/terran/talos/fid00.smk rename to mpq/portrait/t/talos/fid00.smk diff --git a/mpq/portrait/terran/talos/tlk00.smk b/mpq/portrait/t/talos/tlk00.smk similarity index 100% rename from mpq/portrait/terran/talos/tlk00.smk rename to mpq/portrait/t/talos/tlk00.smk diff --git a/mpq/portrait/terran/talos/tlk01.smk b/mpq/portrait/t/talos/tlk01.smk similarity index 100% rename from mpq/portrait/terran/talos/tlk01.smk rename to mpq/portrait/t/talos/tlk01.smk diff --git a/mpq/portrait/terran/talos/tlk02.smk b/mpq/portrait/t/talos/tlk02.smk similarity index 100% rename from mpq/portrait/terran/talos/tlk02.smk rename to mpq/portrait/t/talos/tlk02.smk diff --git a/mpq/portrait/terran/wyvern/fid00.smk b/mpq/portrait/t/wyvern/fid00.smk similarity index 100% rename from mpq/portrait/terran/wyvern/fid00.smk rename to mpq/portrait/t/wyvern/fid00.smk diff --git a/mpq/portrait/terran/wyvern/tlk00.smk b/mpq/portrait/t/wyvern/tlk00.smk similarity index 100% rename from mpq/portrait/terran/wyvern/tlk00.smk rename to mpq/portrait/t/wyvern/tlk00.smk diff --git a/mpq/portrait/zerg/akistrokor/fid00.smk b/mpq/portrait/z/akistrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/fid00.smk rename to mpq/portrait/z/akistrokor/fid00.smk diff --git a/mpq/portrait/zerg/akistrokor/fid01.smk b/mpq/portrait/z/akistrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/fid01.smk rename to mpq/portrait/z/akistrokor/fid01.smk diff --git a/mpq/portrait/zerg/akistrokor/fid02.smk b/mpq/portrait/z/akistrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/fid02.smk rename to mpq/portrait/z/akistrokor/fid02.smk diff --git a/mpq/portrait/zerg/akistrokor/fid03.smk b/mpq/portrait/z/akistrokor/fid03.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/fid03.smk rename to mpq/portrait/z/akistrokor/fid03.smk diff --git a/mpq/portrait/zerg/akistrokor/tlk00.smk b/mpq/portrait/z/akistrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/tlk00.smk rename to mpq/portrait/z/akistrokor/tlk00.smk diff --git a/mpq/portrait/zerg/akistrokor/tlk01.smk b/mpq/portrait/z/akistrokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/akistrokor/tlk01.smk rename to mpq/portrait/z/akistrokor/tlk01.smk diff --git a/mpq/portrait/zerg/algoztalisk/fid00.smk b/mpq/portrait/z/algoztalisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/algoztalisk/fid00.smk rename to mpq/portrait/z/algoztalisk/fid00.smk diff --git a/mpq/portrait/zerg/algoztalisk/fid01.smk b/mpq/portrait/z/algoztalisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/algoztalisk/fid01.smk rename to mpq/portrait/z/algoztalisk/fid01.smk diff --git a/mpq/portrait/zerg/algoztalisk/fid02.smk b/mpq/portrait/z/algoztalisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/algoztalisk/fid02.smk rename to mpq/portrait/z/algoztalisk/fid02.smk diff --git a/mpq/portrait/zerg/algoztalisk/tlk00.smk b/mpq/portrait/z/algoztalisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/algoztalisk/tlk00.smk rename to mpq/portrait/z/algoztalisk/tlk00.smk diff --git a/mpq/portrait/zerg/alkajelisk/fid00.smk b/mpq/portrait/z/alkajelisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/alkajelisk/fid00.smk rename to mpq/portrait/z/alkajelisk/fid00.smk diff --git a/mpq/portrait/zerg/alkajelisk/tlk00.smk b/mpq/portrait/z/alkajelisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/alkajelisk/tlk00.smk rename to mpq/portrait/z/alkajelisk/tlk00.smk diff --git a/mpq/portrait/zerg/almaksalisk/fid00.smk b/mpq/portrait/z/almaksalisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/almaksalisk/fid00.smk rename to mpq/portrait/z/almaksalisk/fid00.smk diff --git a/mpq/portrait/zerg/almaksalisk/tlk00.smk b/mpq/portrait/z/almaksalisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/almaksalisk/tlk00.smk rename to mpq/portrait/z/almaksalisk/tlk00.smk diff --git a/mpq/portrait/zerg/axitrilisk/fid00.smk b/mpq/portrait/z/axitrilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/axitrilisk/fid00.smk rename to mpq/portrait/z/axitrilisk/fid00.smk diff --git a/mpq/portrait/zerg/axitrilisk/fid01.smk b/mpq/portrait/z/axitrilisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/axitrilisk/fid01.smk rename to mpq/portrait/z/axitrilisk/fid01.smk diff --git a/mpq/portrait/zerg/axitrilisk/fid02.smk b/mpq/portrait/z/axitrilisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/axitrilisk/fid02.smk rename to mpq/portrait/z/axitrilisk/fid02.smk diff --git a/mpq/portrait/zerg/axitrilisk/tlk00.smk b/mpq/portrait/z/axitrilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/axitrilisk/tlk00.smk rename to mpq/portrait/z/axitrilisk/tlk00.smk diff --git a/mpq/portrait/zerg/bactalisk/fid00.smk b/mpq/portrait/z/bactalisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/bactalisk/fid00.smk rename to mpq/portrait/z/bactalisk/fid00.smk diff --git a/mpq/portrait/zerg/bactalisk/fid01.smk b/mpq/portrait/z/bactalisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/bactalisk/fid01.smk rename to mpq/portrait/z/bactalisk/fid01.smk diff --git a/mpq/portrait/zerg/bactalisk/fid02.smk b/mpq/portrait/z/bactalisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/bactalisk/fid02.smk rename to mpq/portrait/z/bactalisk/fid02.smk diff --git a/mpq/portrait/zerg/bactalisk/tlk00.smk b/mpq/portrait/z/bactalisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/bactalisk/tlk00.smk rename to mpq/portrait/z/bactalisk/tlk00.smk diff --git a/mpq/portrait/zerg/bactalisk/tlk01.smk b/mpq/portrait/z/bactalisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/bactalisk/tlk01.smk rename to mpq/portrait/z/bactalisk/tlk01.smk diff --git a/mpq/portrait/zerg/cherbrathalor/fid00.smk b/mpq/portrait/z/cherbrathalor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/cherbrathalor/fid00.smk rename to mpq/portrait/z/cherbrathalor/fid00.smk diff --git a/mpq/portrait/zerg/cherbrathalor/fid01.smk b/mpq/portrait/z/cherbrathalor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/cherbrathalor/fid01.smk rename to mpq/portrait/z/cherbrathalor/fid01.smk diff --git a/mpq/portrait/zerg/cherbrathalor/tlk00.smk b/mpq/portrait/z/cherbrathalor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/cherbrathalor/tlk00.smk rename to mpq/portrait/z/cherbrathalor/tlk00.smk diff --git a/mpq/portrait/zerg/cikralisk/fid00.smk b/mpq/portrait/z/cikralisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/cikralisk/fid00.smk rename to mpq/portrait/z/cikralisk/fid00.smk diff --git a/mpq/portrait/zerg/cikralisk/fid01.smk b/mpq/portrait/z/cikralisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/cikralisk/fid01.smk rename to mpq/portrait/z/cikralisk/fid01.smk diff --git a/mpq/portrait/zerg/cikralisk/tlk00.smk b/mpq/portrait/z/cikralisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/cikralisk/tlk00.smk rename to mpq/portrait/z/cikralisk/tlk00.smk diff --git a/mpq/portrait/zerg/evigrilisk/fid00.smk b/mpq/portrait/z/evigrilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/evigrilisk/fid00.smk rename to mpq/portrait/z/evigrilisk/fid00.smk diff --git a/mpq/portrait/zerg/evigrilisk/fid01.smk b/mpq/portrait/z/evigrilisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/evigrilisk/fid01.smk rename to mpq/portrait/z/evigrilisk/fid01.smk diff --git a/mpq/portrait/zerg/evigrilisk/fid02.smk b/mpq/portrait/z/evigrilisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/evigrilisk/fid02.smk rename to mpq/portrait/z/evigrilisk/fid02.smk diff --git a/mpq/portrait/zerg/evigrilisk/tlk00.smk b/mpq/portrait/z/evigrilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/evigrilisk/tlk00.smk rename to mpq/portrait/z/evigrilisk/tlk00.smk diff --git a/mpq/portrait/zerg/ghitorokor/fid00.smk b/mpq/portrait/z/ghitorokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/ghitorokor/fid00.smk rename to mpq/portrait/z/ghitorokor/fid00.smk diff --git a/mpq/portrait/zerg/ghitorokor/fid01.smk b/mpq/portrait/z/ghitorokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/ghitorokor/fid01.smk rename to mpq/portrait/z/ghitorokor/fid01.smk diff --git a/mpq/portrait/zerg/ghitorokor/tlk00.smk b/mpq/portrait/z/ghitorokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/ghitorokor/tlk00.smk rename to mpq/portrait/z/ghitorokor/tlk00.smk diff --git a/mpq/portrait/zerg/gorgrokor/fid00.smk b/mpq/portrait/z/gorgrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/gorgrokor/fid00.smk rename to mpq/portrait/z/gorgrokor/fid00.smk diff --git a/mpq/portrait/zerg/gorgrokor/fid01.smk b/mpq/portrait/z/gorgrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/gorgrokor/fid01.smk rename to mpq/portrait/z/gorgrokor/fid01.smk diff --git a/mpq/portrait/zerg/gorgrokor/fid02.smk b/mpq/portrait/z/gorgrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/gorgrokor/fid02.smk rename to mpq/portrait/z/gorgrokor/fid02.smk diff --git a/mpq/portrait/zerg/gorgrokor/tlk00.smk b/mpq/portrait/z/gorgrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/gorgrokor/tlk00.smk rename to mpq/portrait/z/gorgrokor/tlk00.smk diff --git a/mpq/portrait/zerg/gosvileth/fid00.smk b/mpq/portrait/z/gosvileth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/gosvileth/fid00.smk rename to mpq/portrait/z/gosvileth/fid00.smk diff --git a/mpq/portrait/zerg/gosvileth/fid01.smk b/mpq/portrait/z/gosvileth/fid01.smk similarity index 100% rename from mpq/portrait/zerg/gosvileth/fid01.smk rename to mpq/portrait/z/gosvileth/fid01.smk diff --git a/mpq/portrait/zerg/gosvileth/tlk00.smk b/mpq/portrait/z/gosvileth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/gosvileth/tlk00.smk rename to mpq/portrait/z/gosvileth/tlk00.smk diff --git a/mpq/portrait/zerg/gosvileth/tlk01.smk b/mpq/portrait/z/gosvileth/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/gosvileth/tlk01.smk rename to mpq/portrait/z/gosvileth/tlk01.smk diff --git a/mpq/portrait/zerg/iroleth/fid00.smk b/mpq/portrait/z/iroleth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/iroleth/fid00.smk rename to mpq/portrait/z/iroleth/fid00.smk diff --git a/mpq/portrait/zerg/iroleth/fid01.smk b/mpq/portrait/z/iroleth/fid01.smk similarity index 100% rename from mpq/portrait/zerg/iroleth/fid01.smk rename to mpq/portrait/z/iroleth/fid01.smk diff --git a/mpq/portrait/zerg/iroleth/fid02.smk b/mpq/portrait/z/iroleth/fid02.smk similarity index 100% rename from mpq/portrait/zerg/iroleth/fid02.smk rename to mpq/portrait/z/iroleth/fid02.smk diff --git a/mpq/portrait/zerg/iroleth/tlk00.smk b/mpq/portrait/z/iroleth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/iroleth/tlk00.smk rename to mpq/portrait/z/iroleth/tlk00.smk diff --git a/mpq/portrait/zerg/iroleth/tlk01.smk b/mpq/portrait/z/iroleth/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/iroleth/tlk01.smk rename to mpq/portrait/z/iroleth/tlk01.smk diff --git a/mpq/portrait/zerg/izirokor/fid00.smk b/mpq/portrait/z/izirokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/fid00.smk rename to mpq/portrait/z/izirokor/fid00.smk diff --git a/mpq/portrait/zerg/izirokor/fid01.smk b/mpq/portrait/z/izirokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/fid01.smk rename to mpq/portrait/z/izirokor/fid01.smk diff --git a/mpq/portrait/zerg/izirokor/fid02.smk b/mpq/portrait/z/izirokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/fid02.smk rename to mpq/portrait/z/izirokor/fid02.smk diff --git a/mpq/portrait/zerg/izirokor/tlk00.smk b/mpq/portrait/z/izirokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/tlk00.smk rename to mpq/portrait/z/izirokor/tlk00.smk diff --git a/mpq/portrait/zerg/izirokor/tlk01.smk b/mpq/portrait/z/izirokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/tlk01.smk rename to mpq/portrait/z/izirokor/tlk01.smk diff --git a/mpq/portrait/zerg/izirokor/tlk02.smk b/mpq/portrait/z/izirokor/tlk02.smk similarity index 100% rename from mpq/portrait/zerg/izirokor/tlk02.smk rename to mpq/portrait/z/izirokor/tlk02.smk diff --git a/mpq/portrait/zerg/kagralisk/fid00.smk b/mpq/portrait/z/kagralisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/kagralisk/fid00.smk rename to mpq/portrait/z/kagralisk/fid00.smk diff --git a/mpq/portrait/zerg/kagralisk/fid01.smk b/mpq/portrait/z/kagralisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/kagralisk/fid01.smk rename to mpq/portrait/z/kagralisk/fid01.smk diff --git a/mpq/portrait/zerg/kagralisk/tlk00.smk b/mpq/portrait/z/kagralisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/kagralisk/tlk00.smk rename to mpq/portrait/z/kagralisk/tlk00.smk diff --git a/mpq/portrait/zerg/kalkalisk/fid00.smk b/mpq/portrait/z/kalkalisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/kalkalisk/fid00.smk rename to mpq/portrait/z/kalkalisk/fid00.smk diff --git a/mpq/portrait/zerg/kalkalisk/fid01.smk b/mpq/portrait/z/kalkalisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/kalkalisk/fid01.smk rename to mpq/portrait/z/kalkalisk/fid01.smk diff --git a/mpq/portrait/zerg/kalkalisk/fid02.smk b/mpq/portrait/z/kalkalisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/kalkalisk/fid02.smk rename to mpq/portrait/z/kalkalisk/fid02.smk diff --git a/mpq/portrait/zerg/kalkalisk/tlk00.smk b/mpq/portrait/z/kalkalisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/kalkalisk/tlk00.smk rename to mpq/portrait/z/kalkalisk/tlk00.smk diff --git a/mpq/portrait/zerg/kalkalisk/tlk01.smk b/mpq/portrait/z/kalkalisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/kalkalisk/tlk01.smk rename to mpq/portrait/z/kalkalisk/tlk01.smk diff --git a/mpq/portrait/zerg/keskathalor/fid00.smk b/mpq/portrait/z/keskathalor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/keskathalor/fid00.smk rename to mpq/portrait/z/keskathalor/fid00.smk diff --git a/mpq/portrait/zerg/keskathalor/tlk00.smk b/mpq/portrait/z/keskathalor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/keskathalor/tlk00.smk rename to mpq/portrait/z/keskathalor/tlk00.smk diff --git a/mpq/portrait/zerg/keskathalor/tlk01.smk b/mpq/portrait/z/keskathalor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/keskathalor/tlk01.smk rename to mpq/portrait/z/keskathalor/tlk01.smk diff --git a/mpq/portrait/zerg/konvilisk/fid00.smk b/mpq/portrait/z/konvilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/konvilisk/fid00.smk rename to mpq/portrait/z/konvilisk/fid00.smk diff --git a/mpq/portrait/zerg/konvilisk/fid01.smk b/mpq/portrait/z/konvilisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/konvilisk/fid01.smk rename to mpq/portrait/z/konvilisk/fid01.smk diff --git a/mpq/portrait/zerg/konvilisk/fid02.smk b/mpq/portrait/z/konvilisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/konvilisk/fid02.smk rename to mpq/portrait/z/konvilisk/fid02.smk diff --git a/mpq/portrait/zerg/konvilisk/tlk00.smk b/mpq/portrait/z/konvilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/konvilisk/tlk00.smk rename to mpq/portrait/z/konvilisk/tlk00.smk diff --git a/mpq/portrait/zerg/liiralisk/fid00.smk b/mpq/portrait/z/liiralisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/liiralisk/fid00.smk rename to mpq/portrait/z/liiralisk/fid00.smk diff --git a/mpq/portrait/zerg/liiralisk/fid01.smk b/mpq/portrait/z/liiralisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/liiralisk/fid01.smk rename to mpq/portrait/z/liiralisk/fid01.smk diff --git a/mpq/portrait/zerg/liiralisk/fid02.smk b/mpq/portrait/z/liiralisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/liiralisk/fid02.smk rename to mpq/portrait/z/liiralisk/fid02.smk diff --git a/mpq/portrait/zerg/liiralisk/tlk00.smk b/mpq/portrait/z/liiralisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/liiralisk/tlk00.smk rename to mpq/portrait/z/liiralisk/tlk00.smk diff --git a/mpq/portrait/zerg/liiralisk/tlk01.smk b/mpq/portrait/z/liiralisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/liiralisk/tlk01.smk rename to mpq/portrait/z/liiralisk/tlk01.smk diff --git a/mpq/portrait/zerg/mortothrokor/fid00.smk b/mpq/portrait/z/mortothrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/mortothrokor/fid00.smk rename to mpq/portrait/z/mortothrokor/fid00.smk diff --git a/mpq/portrait/zerg/mortothrokor/fid01.smk b/mpq/portrait/z/mortothrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/mortothrokor/fid01.smk rename to mpq/portrait/z/mortothrokor/fid01.smk diff --git a/mpq/portrait/zerg/mortothrokor/fid02.smk b/mpq/portrait/z/mortothrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/mortothrokor/fid02.smk rename to mpq/portrait/z/mortothrokor/fid02.smk diff --git a/mpq/portrait/zerg/mortothrokor/tlk00.smk b/mpq/portrait/z/mortothrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/mortothrokor/tlk00.smk rename to mpq/portrait/z/mortothrokor/tlk00.smk diff --git a/mpq/portrait/zerg/mortothrokor/tlk01.smk b/mpq/portrait/z/mortothrokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/mortothrokor/tlk01.smk rename to mpq/portrait/z/mortothrokor/tlk01.smk diff --git a/mpq/portrait/zerg/nathrokor/fid00.smk b/mpq/portrait/z/nathrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/nathrokor/fid00.smk rename to mpq/portrait/z/nathrokor/fid00.smk diff --git a/mpq/portrait/zerg/nathrokor/fid01.smk b/mpq/portrait/z/nathrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/nathrokor/fid01.smk rename to mpq/portrait/z/nathrokor/fid01.smk diff --git a/mpq/portrait/zerg/nathrokor/fid02.smk b/mpq/portrait/z/nathrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/nathrokor/fid02.smk rename to mpq/portrait/z/nathrokor/fid02.smk diff --git a/mpq/portrait/zerg/nathrokor/tlk00.smk b/mpq/portrait/z/nathrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/nathrokor/tlk00.smk rename to mpq/portrait/z/nathrokor/tlk00.smk diff --git a/mpq/portrait/zerg/okrimnilisk/fid00.smk b/mpq/portrait/z/okrimnilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/okrimnilisk/fid00.smk rename to mpq/portrait/z/okrimnilisk/fid00.smk diff --git a/mpq/portrait/zerg/okrimnilisk/tlk00.smk b/mpq/portrait/z/okrimnilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/okrimnilisk/tlk00.smk rename to mpq/portrait/z/okrimnilisk/tlk00.smk diff --git a/mpq/portrait/zerg/othstoleth/fid00.smk b/mpq/portrait/z/othstoleth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/othstoleth/fid00.smk rename to mpq/portrait/z/othstoleth/fid00.smk diff --git a/mpq/portrait/zerg/othstoleth/tlk00.smk b/mpq/portrait/z/othstoleth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/othstoleth/tlk00.smk rename to mpq/portrait/z/othstoleth/tlk00.smk diff --git a/mpq/portrait/zerg/protathalor/fid00.smk b/mpq/portrait/z/protathalor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/protathalor/fid00.smk rename to mpq/portrait/z/protathalor/fid00.smk diff --git a/mpq/portrait/zerg/protathalor/fid01.smk b/mpq/portrait/z/protathalor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/protathalor/fid01.smk rename to mpq/portrait/z/protathalor/fid01.smk diff --git a/mpq/portrait/zerg/protathalor/tlk00.smk b/mpq/portrait/z/protathalor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/protathalor/tlk00.smk rename to mpq/portrait/z/protathalor/tlk00.smk diff --git a/mpq/portrait/zerg/quazilisk/fid00.smk b/mpq/portrait/z/quazilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/quazilisk/fid00.smk rename to mpq/portrait/z/quazilisk/fid00.smk diff --git a/mpq/portrait/zerg/quazilisk/fid01.smk b/mpq/portrait/z/quazilisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/quazilisk/fid01.smk rename to mpq/portrait/z/quazilisk/fid01.smk diff --git a/mpq/portrait/zerg/quazilisk/tlk00.smk b/mpq/portrait/z/quazilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/quazilisk/tlk00.smk rename to mpq/portrait/z/quazilisk/tlk00.smk diff --git a/mpq/portrait/zerg/rililisk/fid00.smk b/mpq/portrait/z/rililisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/rililisk/fid00.smk rename to mpq/portrait/z/rililisk/fid00.smk diff --git a/mpq/portrait/zerg/rililisk/fid01.smk b/mpq/portrait/z/rililisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/rililisk/fid01.smk rename to mpq/portrait/z/rililisk/fid01.smk diff --git a/mpq/portrait/zerg/rililisk/tlk00.smk b/mpq/portrait/z/rililisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/rililisk/tlk00.smk rename to mpq/portrait/z/rililisk/tlk00.smk diff --git a/mpq/portrait/zerg/rililisk/tlk01.smk b/mpq/portrait/z/rililisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/rililisk/tlk01.smk rename to mpq/portrait/z/rililisk/tlk01.smk diff --git a/mpq/portrait/zerg/sasyrvoleth/fid00.smk b/mpq/portrait/z/sasyrvoleth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/sasyrvoleth/fid00.smk rename to mpq/portrait/z/sasyrvoleth/fid00.smk diff --git a/mpq/portrait/zerg/sasyrvoleth/fid01.smk b/mpq/portrait/z/sasyrvoleth/fid01.smk similarity index 100% rename from mpq/portrait/zerg/sasyrvoleth/fid01.smk rename to mpq/portrait/z/sasyrvoleth/fid01.smk diff --git a/mpq/portrait/zerg/sasyrvoleth/tlk00.smk b/mpq/portrait/z/sasyrvoleth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/sasyrvoleth/tlk00.smk rename to mpq/portrait/z/sasyrvoleth/tlk00.smk diff --git a/mpq/portrait/zerg/skithrokor/fid00.smk b/mpq/portrait/z/skithrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/skithrokor/fid00.smk rename to mpq/portrait/z/skithrokor/fid00.smk diff --git a/mpq/portrait/zerg/skithrokor/fid01.smk b/mpq/portrait/z/skithrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/skithrokor/fid01.smk rename to mpq/portrait/z/skithrokor/fid01.smk diff --git a/mpq/portrait/zerg/skithrokor/fid02.smk b/mpq/portrait/z/skithrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/skithrokor/fid02.smk rename to mpq/portrait/z/skithrokor/fid02.smk diff --git a/mpq/portrait/zerg/skithrokor/tlk00.smk b/mpq/portrait/z/skithrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/skithrokor/tlk00.smk rename to mpq/portrait/z/skithrokor/tlk00.smk diff --git a/mpq/portrait/zerg/skithrokor/tlk01.smk b/mpq/portrait/z/skithrokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/skithrokor/tlk01.smk rename to mpq/portrait/z/skithrokor/tlk01.smk diff --git a/mpq/portrait/zerg/sovroleth/fid00.smk b/mpq/portrait/z/sovroleth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/sovroleth/fid00.smk rename to mpq/portrait/z/sovroleth/fid00.smk diff --git a/mpq/portrait/zerg/sovroleth/fid01.smk b/mpq/portrait/z/sovroleth/fid01.smk similarity index 100% rename from mpq/portrait/zerg/sovroleth/fid01.smk rename to mpq/portrait/z/sovroleth/fid01.smk diff --git a/mpq/portrait/zerg/sovroleth/tlk00.smk b/mpq/portrait/z/sovroleth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/sovroleth/tlk00.smk rename to mpq/portrait/z/sovroleth/tlk00.smk diff --git a/mpq/portrait/zerg/sovroleth/tlk01.smk b/mpq/portrait/z/sovroleth/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/sovroleth/tlk01.smk rename to mpq/portrait/z/sovroleth/tlk01.smk diff --git a/mpq/portrait/zerg/tetcaerokor/fid00.smk b/mpq/portrait/z/tetcaerokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/tetcaerokor/fid00.smk rename to mpq/portrait/z/tetcaerokor/fid00.smk diff --git a/mpq/portrait/zerg/tetcaerokor/tlk00.smk b/mpq/portrait/z/tetcaerokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/tetcaerokor/tlk00.smk rename to mpq/portrait/z/tetcaerokor/tlk00.smk diff --git a/mpq/portrait/zerg/tethzorokor/fid00.smk b/mpq/portrait/z/tethzorokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/tethzorokor/fid00.smk rename to mpq/portrait/z/tethzorokor/fid00.smk diff --git a/mpq/portrait/zerg/tethzorokor/fid01.smk b/mpq/portrait/z/tethzorokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/tethzorokor/fid01.smk rename to mpq/portrait/z/tethzorokor/fid01.smk diff --git a/mpq/portrait/zerg/tethzorokor/fid02.smk b/mpq/portrait/z/tethzorokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/tethzorokor/fid02.smk rename to mpq/portrait/z/tethzorokor/fid02.smk diff --git a/mpq/portrait/zerg/tethzorokor/tlk00.smk b/mpq/portrait/z/tethzorokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/tethzorokor/tlk00.smk rename to mpq/portrait/z/tethzorokor/tlk00.smk diff --git a/mpq/portrait/zerg/tethzorokor/tlk01.smk b/mpq/portrait/z/tethzorokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/tethzorokor/tlk01.smk rename to mpq/portrait/z/tethzorokor/tlk01.smk diff --git a/mpq/portrait/zerg/tosgrilisk/fid00.smk b/mpq/portrait/z/tosgrilisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/tosgrilisk/fid00.smk rename to mpq/portrait/z/tosgrilisk/fid00.smk diff --git a/mpq/portrait/zerg/tosgrilisk/fid01.smk b/mpq/portrait/z/tosgrilisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/tosgrilisk/fid01.smk rename to mpq/portrait/z/tosgrilisk/fid01.smk diff --git a/mpq/portrait/zerg/tosgrilisk/fid02.smk b/mpq/portrait/z/tosgrilisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/tosgrilisk/fid02.smk rename to mpq/portrait/z/tosgrilisk/fid02.smk diff --git a/mpq/portrait/zerg/tosgrilisk/tlk00.smk b/mpq/portrait/z/tosgrilisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/tosgrilisk/tlk00.smk rename to mpq/portrait/z/tosgrilisk/tlk00.smk diff --git a/mpq/portrait/zerg/tosgrilisk/tlk01.smk b/mpq/portrait/z/tosgrilisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/tosgrilisk/tlk01.smk rename to mpq/portrait/z/tosgrilisk/tlk01.smk diff --git a/mpq/portrait/zerg/vilgorokor/fid00.smk b/mpq/portrait/z/vilgorokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/vilgorokor/fid00.smk rename to mpq/portrait/z/vilgorokor/fid00.smk diff --git a/mpq/portrait/zerg/vilgorokor/fid01.smk b/mpq/portrait/z/vilgorokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/vilgorokor/fid01.smk rename to mpq/portrait/z/vilgorokor/fid01.smk diff --git a/mpq/portrait/zerg/vilgorokor/tlk00.smk b/mpq/portrait/z/vilgorokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/vilgorokor/tlk00.smk rename to mpq/portrait/z/vilgorokor/tlk00.smk diff --git a/mpq/portrait/zerg/vorvrokor/fid00.smk b/mpq/portrait/z/vorvrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/fid00.smk rename to mpq/portrait/z/vorvrokor/fid00.smk diff --git a/mpq/portrait/zerg/vorvrokor/fid01.smk b/mpq/portrait/z/vorvrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/fid01.smk rename to mpq/portrait/z/vorvrokor/fid01.smk diff --git a/mpq/portrait/zerg/vorvrokor/fid02.smk b/mpq/portrait/z/vorvrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/fid02.smk rename to mpq/portrait/z/vorvrokor/fid02.smk diff --git a/mpq/portrait/zerg/vorvrokor/fid03.smk b/mpq/portrait/z/vorvrokor/fid03.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/fid03.smk rename to mpq/portrait/z/vorvrokor/fid03.smk diff --git a/mpq/portrait/zerg/vorvrokor/tlk00.smk b/mpq/portrait/z/vorvrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/tlk00.smk rename to mpq/portrait/z/vorvrokor/tlk00.smk diff --git a/mpq/portrait/zerg/vorvrokor/tlk01.smk b/mpq/portrait/z/vorvrokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/tlk01.smk rename to mpq/portrait/z/vorvrokor/tlk01.smk diff --git a/mpq/portrait/zerg/vorvrokor/tlk02.smk b/mpq/portrait/z/vorvrokor/tlk02.smk similarity index 100% rename from mpq/portrait/zerg/vorvrokor/tlk02.smk rename to mpq/portrait/z/vorvrokor/tlk02.smk diff --git a/mpq/portrait/zerg/zarcavrokor/fid00.smk b/mpq/portrait/z/zarcavrokor/fid00.smk similarity index 100% rename from mpq/portrait/zerg/zarcavrokor/fid00.smk rename to mpq/portrait/z/zarcavrokor/fid00.smk diff --git a/mpq/portrait/zerg/zarcavrokor/fid01.smk b/mpq/portrait/z/zarcavrokor/fid01.smk similarity index 100% rename from mpq/portrait/zerg/zarcavrokor/fid01.smk rename to mpq/portrait/z/zarcavrokor/fid01.smk diff --git a/mpq/portrait/zerg/zarcavrokor/fid02.smk b/mpq/portrait/z/zarcavrokor/fid02.smk similarity index 100% rename from mpq/portrait/zerg/zarcavrokor/fid02.smk rename to mpq/portrait/z/zarcavrokor/fid02.smk diff --git a/mpq/portrait/zerg/zarcavrokor/tlk00.smk b/mpq/portrait/z/zarcavrokor/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/zarcavrokor/tlk00.smk rename to mpq/portrait/z/zarcavrokor/tlk00.smk diff --git a/mpq/portrait/zerg/zarcavrokor/tlk01.smk b/mpq/portrait/z/zarcavrokor/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/zarcavrokor/tlk01.smk rename to mpq/portrait/z/zarcavrokor/tlk01.smk diff --git a/mpq/portrait/zerg/zobriolisk/fid00.smk b/mpq/portrait/z/zobriolisk/fid00.smk similarity index 100% rename from mpq/portrait/zerg/zobriolisk/fid00.smk rename to mpq/portrait/z/zobriolisk/fid00.smk diff --git a/mpq/portrait/zerg/zobriolisk/fid01.smk b/mpq/portrait/z/zobriolisk/fid01.smk similarity index 100% rename from mpq/portrait/zerg/zobriolisk/fid01.smk rename to mpq/portrait/z/zobriolisk/fid01.smk diff --git a/mpq/portrait/zerg/zobriolisk/fid02.smk b/mpq/portrait/z/zobriolisk/fid02.smk similarity index 100% rename from mpq/portrait/zerg/zobriolisk/fid02.smk rename to mpq/portrait/z/zobriolisk/fid02.smk diff --git a/mpq/portrait/zerg/zobriolisk/tlk00.smk b/mpq/portrait/z/zobriolisk/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/zobriolisk/tlk00.smk rename to mpq/portrait/z/zobriolisk/tlk00.smk diff --git a/mpq/portrait/zerg/zobriolisk/tlk01.smk b/mpq/portrait/z/zobriolisk/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/zobriolisk/tlk01.smk rename to mpq/portrait/z/zobriolisk/tlk01.smk diff --git a/mpq/portrait/zerg/zoryusthaleth/fid00.smk b/mpq/portrait/z/zoryusthaleth/fid00.smk similarity index 100% rename from mpq/portrait/zerg/zoryusthaleth/fid00.smk rename to mpq/portrait/z/zoryusthaleth/fid00.smk diff --git a/mpq/portrait/zerg/zoryusthaleth/fid01.smk b/mpq/portrait/z/zoryusthaleth/fid01.smk similarity index 100% rename from mpq/portrait/zerg/zoryusthaleth/fid01.smk rename to mpq/portrait/z/zoryusthaleth/fid01.smk diff --git a/mpq/portrait/zerg/zoryusthaleth/tlk00.smk b/mpq/portrait/z/zoryusthaleth/tlk00.smk similarity index 100% rename from mpq/portrait/zerg/zoryusthaleth/tlk00.smk rename to mpq/portrait/z/zoryusthaleth/tlk00.smk diff --git a/mpq/portrait/zerg/zoryusthaleth/tlk01.smk b/mpq/portrait/z/zoryusthaleth/tlk01.smk similarity index 100% rename from mpq/portrait/zerg/zoryusthaleth/tlk01.smk rename to mpq/portrait/z/zoryusthaleth/tlk01.smk diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index c943840b..2c58eb4d 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -354,10 +354,10 @@ e<3><4>Holdout Module <1>(<3>E<1>)<10>Extends the structure outwards with a shel e<3><4>Vision Module <1>(<3>E<1>)<10>Extends the structure skywards, providing +2 vision range and Detector status.<0> s<1><4>Morph into Protathalor <1>(<3>S<1>)<10>Mobile artillery strain.<0> <0> -<0> -<0> -<0> -<0> +¤<3><4>Hated Reflection <2>(passive)<10>When damaged by hostiles, the Histrion deploys an Egocent at its location. This cannot occur more than once every 2 seconds.<0> +z<3><4>Ashbind <1>(<3>Z<1>)<10>Leaps to the target ground enemy within 5 range, applying Scrapworld: Ash Heap to all hostiles within 3 range of the jump target.<0> +Puppeteer requires:<10> Recent victim<0> +c<3><4>Puppeteer <1>(<3>C<1>)<10>Activates a trap on the most recently-damaged foe, pulling hostiles within 5 range towards the target.<0> ¤<3><4>Scrapworld: Gold Vein <2>(passive)<10>This structure salvages one corpse within 8 range every second, securing 25% of the corpses's resource cost.<0> ¤<3><4>Crushing Delivery <2>(passive)<10>Enemy combatants within 8 range of the Dorminge find their movement speed slowed by 33%.<0> c<3><4>Preylock <1>(<3>C<1>)<10>Pulls the target enemy within 5 range to the combatant's location, and afflicts it with Booming Blast.<0> @@ -392,7 +392,7 @@ c<1><4>Raise Constituent <1>(<3>C<1>)<10>Skybound worker.<0> e<3><4>Salvage <1>(<3>E<1>)<10>Orders the builder to deconstruct the target mechanical unit or structure, returning up to 33% of its resource cost during the channel.<0> e<3><4>Rapid Rendezvous <1>(<3>E<1>)<10>Leaps to the target ground ally within 5 range, activating Impact Dissipation for all allies within 3 range of the jump target.<0> c<3><4>Hijack <1>(<3>C<1>)<10>Leaps to the target hostile, attaching to the victim and slowing their movement speed by 50%.<10><10>After 5 seconds, the Askosi combatant becomes the target.<0> -e<3><4>Rematerialize <1>(<3>E<1>)<10>Pulls the target ally within 5 range to the combatant's location, and grants them Impact Dissipation.<0> +e<3><4>Rematerialize <1>(<3>E<1>)<10>Pulls allies within 3 range of the target to the combatant's location, and grants them Impact Dissipation.<0> e<1><4>Mutate into Kalkiir Lake <1>(<3>E<1>)<10>Swarm node. Enables Liiralisks and Kalkalisks.<0> Terran Structure Armor<0> Zerg Structure Carapace<0> @@ -722,10 +722,10 @@ c<1><4>Build Tencendur <1>(<3>C<1>)<10>Heavy garrison.<0> Tencendur requires:<10> Atlas<0> f<1><4>Build Facade <1>(<3>F<1>)<10>Cloaking outpost.<0> r<1><4>Warp in Herald <1>(<3>R<1>)<10>Frontline instigator.<0> -s<1><4>Install Cosmoscope <1>(<3>S<1>)<10>Skyborne production.<0> +s<1><4>Install Cosmoscope <1>(<3>S<1>)<10>skybound production.<0> e<1><4>Install Cipher <1>(<3>E<1>)<10>Combat control relay.<0> g<1><4>Install Gauntlet <1>(<3>G<1>)<10>Assault relay.<0> -c<1><4>Install Chantry <1>(<3>C<1>)<10>Sustaining shrine.<0> +t<1><4>Install Chantry <1>(<3>T<1>)<10>Sustaining shrine.<0> b<1><4>Meld Object <1>(<3>B<1>)<10>Imposing crawler.<0> c<1><4>Meld Scepter <1>(<3>C<1>)<10>Commanding armor.<0> t<1><4>Meld Intendent <1>(<3>T<1>)<10>Assault crawler.<0> @@ -947,8 +947,8 @@ z<1><4>Raise Zonguard <1>(<3>Z<1>)<10>Ravenous mechbeast.<0> Phontis requires:<10> Conduit<0> Zonguard requires:<10> Bestiary<0> a<1><4>Raise Akreno <1>(<3>A<1>)<10>Light skybeast.<0> -s<1><4>Meld Meld Iconoclast <1>(<3>S<1>)<10>Crowd-controlling frigate.<0> -c<1><4>Meld Meld Crematorium <1>(<3>C<1>)<10>Assault cruiser.<0> +s<1><4>Meld Iconoclast <1>(<3>S<1>)<10>Crowd-controlling frigate.<0> +c<1><4>Meld Crematorium <1>(<3>C<1>)<10>Assault cruiser.<0> r<1><4>Raise Paraclete <1>(<3>R<1>)<10>Interdicting skybeast.<0> Crematorium requires:<10> Conduit<0> Paraclete requires:<10> Bestiary<0> @@ -956,13 +956,13 @@ 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> Scrylyl Aspect requires:<10> Irol Iris<0> -b<1><4>Install Conduit <1>(<3>B<1>)<10>Ashen relay.<0> +c<1><4>Install Conduit <1>(<3>C<1>)<10>Ashen relay.<0> Conduit Requires<10> Proscenium OR Zylode<0> -b<1><4>Install Bestiary <1>(<3>B<1>)<10>Beast relay.<0> +t<1><4>Install Bestiary <1>(<3>T<1>)<10>Beast relay.<0> Bestiary Requires<10> Proscenium OR Zylode<0> -b<1><4>Install Zylode <1>(<3>B<1>)<10>Advanced mechanized production.<0> +z<1><4>Install Zylode <1>(<3>Z<1>)<10>Advanced mechanized production.<0> Zylode Requires<10> Cipher AND Gauntlet<0> -b<1><4>Install Astrolabe <1>(<3>B<1>)<10>Advanced skyborne production.<0> +s<1><4>Install Astrolabe <1>(<3>S<1>)<10>Advanced skybound production.<0> Astrolabe Requires<10> Proscenium OR Zylode<0> Must target enemy units.<0> Must target allied units.<0> @@ -972,9 +972,38 @@ Must target units with no hijackers.<0> ¤<3><4>Avenging Mitosis <2>(passive)<10>Upon taking damage, this strain incubates, spawning one Skryrokor after a two-second delay.<10>This status cannot be applied if the strain is already incubating.<0> w<1><4>Install Dorminge <1>(<3>W<1>)<10>Impeding shrine.<0> Dorminge requires:<10> Cipher AND Gauntlet<0> -w<1><4>Install Domain <1>(<3>C<1>)<10>Encompassing town center.<0> +c<1><4>Install Domain <1>(<3>C<1>)<10>Encompassing town center.<0> Domain requires:<10> Conduit AND Bestiary<0> ¤<3><4>Earthly Profusion <2>(passive)<10>Every 10 seconds, the Domain harvests all available resource nodes within 12 range. This does not interrupt active mining efforts.<0> +r<1><4>Install Panoply <1>(<3>R<1>)<10>Superb biotic production.<0> +Panoply Requires<10> Conduit AND Bestiary<0> +z<1><4>Install Lotiro <1>(<3>Z<1>)<10>Superb mechanized production.<0> +Lotiro Requires<10> Conduit AND Bestiary<0> +s<1><4>Install Obelisk <1>(<3>S<1>)<10>Superb skybound production.<0> +Obelisk Requires<10> Panoply OR Lotiro<0> +¤<3><4>Spirited Assembly <2>(passive)<10>While mobile, Silversouls cloak allies within 6 range until their next attack.<10>Upon taking fatal damage while mobile, Silversouls embed themselves into the surface, becoming immobile and more heavily-armored. During this time, they apply Impact Dissipation to allies within 8 range.<0> +a<1><4>Raise Insurant <1>(<3>A<1>)<10>Discerning trooper.<0> +t<1><4>Raise Silversoul <1>(<3>T<1>)<10>Quieting trooper.<0> +v<1><4>Raise Ghostwrit <1>(<3>V<1>)<10>Vengeful specialist.<0> +d<1><4>Raise Azjoran <1>(<3>D<1>)<10>Unstoppable trooper.<0> +Ghostwrit requires:<10> Lekrot<0> +Azjoran requires:<10> Hearthshard<0> +a<1><4>Meld Elgird <1>(<3>A<1>)<10>Interceding vehicle.<0> +t<1><4>Meld Histrion <1>(<3>T<1>)<10>Aggrandizing vehicle.<0> +v<1><4>Meld Alacyne <1>(<3>V<1>)<10>Overpowering vehicle.<0> +d<1><4>Meld Begolor <1>(<3>D<1>)<10>Earthshaking mechbeast.<0> +Alacyne requires:<10> Lekrot<0> +Begolor requires:<10> Hearthshard<0> +a<1><4>Meld Limire <1>(<3>A<1>)<10>Anti-ship craft.<0> +t<1><4>Meld Endbore <1>(<3>T<1>)<10>Precision gunboat.<0> +v<1><4>Meld Tortare <1>(<3>V<1>)<10>Heavy corvette.<0> +d<1><4>Meld Cybrene <1>(<3>D<1>)<10>Flagship.<0> +Tortare requires:<10> Lekrot<0> +Cybrene requires:<10> Hearthshard<0> +c<1><4>Install Lekrot <1>(<3>S<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> +Hearthshard Requires<10> Panoply OR Lotiro<0> <0> <0> <0> @@ -992,43 +1021,14 @@ Domain requires:<10> Conduit AND Bestiary<0> <0> <0> <0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> +a<1><4>Construct Athla <1>(<3>A<1>)<10>Constructor model.<0> +f<1><4>Construct Ferrum <1>(<3>F<1>)<10>Aggressor model.<0> +c<1><4>Construct Chalyb <1>(<3>C<1>)<10>Defender model.<0> +t<1><4>Construct Circitor <1>(<3>T<1>)<10>Pursuit model.<0> +x<1><4>Construct Exigo <1>(<3>X<1>)<10>Defense platform.<0> +v<1><4>Construct Vicere <1>(<3>V<1>)<10>Assault platform.<0> +Forerunner Alloy<0> +Forerunner Lattice<0> Hive Tissues:<10> Must not have a hive tissue.<0> Intestinal Infinity:<10> Must be burrowed.<0> c<0><4>Hive Tissues <1>(<3>C<1>)<0> @@ -1066,7 +1066,7 @@ g<1><4>Warp in Magister <1>(<3>G<1>)<10>Battle platform.<0> z<0><4>Advanced Warp <1>(<3>Z<1>)<0> b<0><4>Basic Warp <1>(<3>B<1>)<0> g<1><4>Warp in Gladius <1>(<3>G<1>)<10>Crowd-controlling corvette.<0> -<0> +¤<3><4>Impact Prevarication <2>(passive)<10>Each time this combatant is attacked by a hostile, it gains 33% increased movement and attack speeds for 3 seconds, and regenerates 30 HP over time.<0> Eyelet<0> g<1><4>Build Monogram <1>(<3>G<1>)<10>Reinforcing hovercraft.<0> g<1><4>Build Gorgon <1>(<3>G<1>)<10>All-purpose corvette.<0> @@ -1412,7 +1412,7 @@ s<1><4>Warp in Atreus <1>(<3>S<1>)<10>Stalwart strider.<0> ¤<3><4>Autovitality <2>(passive)<10>4 seconds after taking hull damage from an enemy, this combatant creates a clone of itself, inheriting shields, life, and statuses.<0> ¤<3><4>Petrification <2>(passive)<10>Gorgon's attacks slow victims by 10% per stack. Stacks expire after 2 seconds.<0> ¤<3><4>Adrenal Implant <2>(passive)<10>While Trinity Eidolons are cloaked, they move 33% faster and regenerate life twice as fast.<0> -¤<3><4>Reclamation <1>(Cornerstone)<10>This combatant is a Reclaimer, capable of raising the dead. Reclaimed combatants move 25% slower, and restore half of all damage taken when out of combat.<0> +¤<3><4>Reclamation <1>(Cornerstone)<2><10>This combatant is a Reclaimer, capable of raising the dead. Reclaimed combatants move 25% slower, and restore half of all damage taken when out of combat.<0> ¤<3><4>Parasitic Spores <2>(passive)<10>Targets killed by the Alkajelisk spawn a spore that seeks out nearby hostiles and explodes, dealing 15 damage to all hostiles within 1.5 range.<0> Babylon Plating requires:<10> Tank Mode<0> ¤<3><4>Furia Salvo <2>(passive)<10>While deployed, the Madrigal fires a staggered salvo of missiles at all targets within weapon range.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 63a99ef3..dad652e6 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index d61c2c08..281aa68e 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -16,7 +16,7 @@ building left_upper_door = 205 building right_upper_door = 206 # Special -building special_control_node = 192 +building town_center_marker = 192 building crashed_minotaur = 335 building psi_disruptor = 336 building power_generator = 337 @@ -435,6 +435,91 @@ building skibact_scab = 397 building eskigant = 421 building zozarc_gorge = 493 +# Askosi units +military proselyte = 443 +military missionary = 445 +military cardinal = 446 +military mimic = 447 +military vicar = 448 +military rove = 449 +military object = 450 +military scepter = 451 +military intendent = 452 +military helion = 453 +military emissary = 454 +military inkblot = 455 +military tirade = 456 +military avatar = 538 +military thaumalogue = 542 +military petract = 543 +military crematorium = 544 +military aphorist = 551 +military doronin = 552 +military agonist = 553 +military phontis = 554 +military zonguard = 555 +military akreno = 556 +military iconoclast = 557 +military paraclete = 558 +military eyelet = 564 +military auxine = 565 +military insurant = 583 +military silversoul = 584 +military ghostwrit = 585 +military azjoran = 586 +military histrion = 587 +military elgird = 588 +military egocent = 589 +military alacyne = 590 +military begolor = 591 +military limire = 592 +military endbore = 593 +military tortare = 594 +military cybrene = 595 + +# Askosi buildings +building pilgrim = 439 +building dyad = 444 +building constituent = 566 +# +building landlock = 429 +building arch = 457 +building grandstand = 458 +building chantry = 459 +building radix = 460 +building cipher = 461 +building function = 462 +building gauntlet = 463 +building cosmoscope = 464 +building Bounty = 510 +building grandstand_holdout = 532 +building grandstand_vision = 533 +building abutment = 539 +building proscenium = 540 +building zylode = 545 +building astrolabe = 546 +building panoply = 550 +building bestiary = 561 +building conduit = 562 +building obelisk = 563 +building dorminge = 577 +building lotiro = 578 +building domain = 579 +building lekrot = 596 +building hearthshard = 597 + +# Forerunner units +military ferrum = 605 +military chalyb = 606 +military circitor = 607 +military exigo = 608 +military vicere = 610 + +# Forerunner buildings +building athla = 609 +# +building machinamentum = 611 + # Misc units military goliath_turret = 4 military t_tank_turret = 6 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index d50aab5f..04489df9 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index ad3d277f..5767e1bc 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index 46eaf94b..509e976c 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1997 Landlock (cm\askosi\landlock.grp) +# 1997 Landlock (cm\a\landlock.grp) .headerstart IsId 1 Type 21 @@ -30,7 +30,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # LandlockInit: - imgul 1998 0 0 # Landlock Shadow (cm\askosi\landlock-shadow.grp) + imgul 1998 0 0 # Landlock Shadow (cm\a\landlock-shadow.grp) LandlockWorkingToIdle: playfram 0x00 goto SkryrokorLocal00 @@ -39,7 +39,7 @@ LandlockDeath: playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\a\a-rubble-large.grp) wait 1 end @@ -106,7 +106,7 @@ Generic_Wait1End: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2040 Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) +# 2040 Askosi Structure Rubble (Large) (cm\a\a-rubble-large.grp) .headerstart IsId 145 Type 1 @@ -192,7 +192,7 @@ AskosiBuildingRubbleHeaderDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2041 Pilgrim (cm\askosi\pilgrim.grp) +# 2041 Pilgrim (cm\a\pilgrim.grp) .headerstart IsId 2 Type 21 @@ -222,16 +222,16 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # PilgrimInit: - imgul 2042 0 0 # Pilgrim Shadow (cm\askosi\pilgrim-shadow.grp) + imgul 2042 0 0 # Pilgrim Shadow (cm\a\pilgrim-shadow.grp) goto PilgrimWalkingToIdle PilgrimDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 wait 8 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -317,7 +317,7 @@ PilgrimLocal00: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2069 Arch (cm\askosi\arch.grp) +# 2069 Arch (cm\a\arch.grp) .headerstart IsId 3 Type 20 @@ -396,7 +396,7 @@ ArchLocal01: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2075 Radix (cm\askosi\radix.grp) +# 2075 Radix (cm\a\radix.grp) .headerstart IsId 6 Type 24 @@ -431,7 +431,7 @@ Burrow [NONE] RadixInit: playfram 0x00 - imgul 2076 0 0 # Radix Shadow (cm\askosi\radix-shadow.grp) + imgul 2076 0 0 # Radix Shadow (cm\a\radix-shadow.grp) goto SkryrokorLocal00 RadixSpecialState1: @@ -458,7 +458,7 @@ RadixDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2071 Chantry (cm\askosi\chantry.grp) +# 2071 Chantry (cm\a\chantry.grp) .headerstart IsId 4 Type 24 @@ -493,14 +493,14 @@ Burrow [NONE] ChantryInit: playfram 0x00 - imgul 2072 0 0 # Chantry Shadow (cm\askosi\chantry-shadow.grp) + imgul 2072 0 0 # Chantry Shadow (cm\a\chantry-shadow.grp) goto ChantryIsWorking ChantryDeath: playsndbtwn 4145 4147 # Askosi explosion medium 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp) + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp) wait 1 end @@ -532,7 +532,7 @@ ChantryDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2073 Function (cm\askosi\function.grp) +# 2073 Function (cm\a\function.grp) .headerstart IsId 5 Type 24 @@ -567,7 +567,7 @@ Burrow [NONE] FunctionInit: playfram 0x00 - imgul 2074 0 0 # Function Shadow (cm\askosi\function-shadow.grp) + imgul 2074 0 0 # Function Shadow (cm\a\function-shadow.grp) goto SkryrokorLocal00 FunctionSpecialState1: @@ -594,7 +594,7 @@ FunctionDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2083 Missionary (cm\askosi\missionary.grp) +# 2083 Missionary (cm\a\missionary.grp) .headerstart IsId 7 Type 12 @@ -616,7 +616,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # MissionaryInit: - imgul 2084 0 0 # Missionary Shadow (cm\askosi\missionary-shadow.grp) + imgulnextid 0 0 # Missionary Shadow (cm\a\missionary-shadow.grp) MissionaryWalkingToIdle: playfram 0x00 MissionaryLocal00: @@ -676,11 +676,11 @@ MissionaryLocal02: MissionaryDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 wait 8 - lowsprul 1031 0 0 # Missionary Remnants (cm\askosi\missionary-remnants.grp) + lowsprul 1031 0 0 # Missionary Remnants (cm\a\missionary-remnants.grp) wait 1 end @@ -758,7 +758,7 @@ MissionaryWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2077 Cardinal (cm\askosi\cardinal.grp) +# 2077 Cardinal (cm\a\cardinal.grp) .headerstart IsId 8 Type 12 @@ -780,18 +780,18 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # CardinalInit: - imgul 2078 0 0 # Cardinal Shadow (cm\askosi\cardinal-shadow.grp) + imgul 2078 0 0 # Cardinal Shadow (cm\a\cardinal-shadow.grp) CardinalWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 CardinalDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 wait 8 - lowsprul 1027 0 0 # Cardinal Remnants (cm\askosi\cardinal-remnants.grp) + lowsprul 1027 0 0 # Cardinal Remnants (cm\a\cardinal-remnants.grp) wait 1 end @@ -861,7 +861,7 @@ CardinalWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2080 Vicar (cm\askosi\vicar.grp) +# 2080 Vicar (cm\a\vicar.grp) .headerstart IsId 9 Type 12 @@ -872,7 +872,7 @@ AirAttkInit VicarGndAttkInit Unused1 VicarUnused1 GndAttkRpt VicarGndAttkRpt AirAttkRpt VicarGndAttkRpt -CastSpell VicarCastSpell +CastSpell [NONE] GndAttkToIdle VicarGndAttkToIdle AirAttkToIdle VicarGndAttkToIdle Unused2 [NONE] @@ -883,18 +883,71 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # VicarInit: - imgul 2081 0 0 # Vicar Shadow (cm\askosi\vicar-shadow.grp) + imgulnextid 0 0 # Vicar Shadow (cm\a\vicar-shadow.grp) VicarWalkingToIdle: - playfram 0x77 - goto SkryrokorLocal00 + playfram 0x00 +VicarLocal00: + wait 63 + randcondjmp 25 VicarLocal01 + randcondjmp 128 VicarLocal02 + goto VicarLocal00 + +VicarLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 VicarLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto VicarWalkingToIdle + +VicarLocal03: + wait 13 + goto VicarWalkingToIdle + +VicarLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto VicarWalkingToIdle VicarDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 - wait 8 - lowsprul 1029 0 0 # Vicar Remnants (cm\askosi\vicar-remnants.grp) + wait 8 + lowsprul 1031 0 0 # Vicar Remnants (cm\a\vicar-remnants.grp) wait 1 end @@ -904,29 +957,38 @@ VicarUnused1: setfldirect 0 playsndbtwn 1163 1165 sprol 742 0 0 # Explosion Small Reversed - wait 10 +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 setfldirect 12 nobrkcodeend goto VicarWalkingToIdle VicarGndAttkInit: - playfram 0x88 + playfram 0x20 VicarGndAttkRpt: wait 1 nobrkcodestart - playfram 0xbb + playfram 0x40 attackwith 1 wait 1 - playfram 0xcc + playfram 0x20 wait 1 - playfram 0xbb + playfram 0x40 attackwith 1 wait 1 - playfram 0xcc - wait 1 - playfram 0xaa - wait 1 - playfram 0x99 + playfram 0x20 wait 1 nobrkcodeend gotorepeatattk @@ -934,47 +996,36 @@ VicarGndAttkRpt: VicarGndAttkToIdle: goto VicarWalkingToIdle -VicarCastSpell: - playfram 0x88 - wait 1 - nobrkcodestart - playfram 0xbb - wait 1 - playfram 0xcc - wait 1 - castspell - nobrkcodeend - sigorder 2 - gotorepeatattk - goto VicarWalkingToIdle - VicarWalking: move 4 wait 1 - playfram 0x22 + playfram 0x80 move 4 wait 1 - playfram 0x33 + playfram 0xA0 move 4 wait 1 - playfram 0x44 + playfram 0xC0 move 4 wait 1 - playfram 0x55 + playfram 0xE0 move 4 wait 1 - playfram 0x66 + playfram 0x100 move 4 wait 1 - playfram 0x00 + playfram 0x120 move 4 wait 1 - playfram 0x11 + playfram 0x140 + move 4 + wait 1 + playfram 0x60 goto VicarWalking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2092 Emissary (cm\askosi\emissary.grp) +# 2092 Emissary (cm\a\emissary.grp) .headerstart IsId 10 Type 12 @@ -996,7 +1047,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # EmissaryInit: - imgul 2093 0 42 # Emissary Shadow (cm\askosi\emissary.grp) + imgul 2093 0 42 # Emissary Shadow (cm\a\emissary.grp) playfram 0x00 EmissaryLocal00: setvertpos 0 @@ -1013,7 +1064,7 @@ EmissaryDeath: playsnd 210 # Terran\DROPSHIP\TDrDth00.wav imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1033,7 +1084,7 @@ EmissaryWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2095 Inkblot (cm\askosi\inkblot.grp) +# 2095 Inkblot (cm\a\inkblot.grp) .headerstart IsId 11 Type 12 @@ -1055,7 +1106,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # InkblotInit: - imgul 2096 0 42 # Inkblot Shadow (cm\askosi\inkblot.grp) + imgul 2096 0 42 # Inkblot Shadow (cm\a\inkblot.grp) playfram 0x00 InkblotLocal00: setvertpos 0 @@ -1072,7 +1123,7 @@ InkblotDeath: playsnd 210 # Terran\DROPSHIP\TDrDth00.wav imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1083,7 +1134,7 @@ InkblotWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2108 Rove (cm\askosi\rove.grp) +# 2108 Rove (cm\a\rove.grp) .headerstart IsId 12 Type 13 @@ -1105,7 +1156,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # RoveInit: - imgulnextid 0 7 # Rove Shadow (cm\askosi\rove.grp) + imgulnextid 0 7 # Rove Shadow (cm\a\rove.grp) playfram 0x00 goto RoveGndAttkToIdle @@ -1124,7 +1175,7 @@ RoveDeath: playsnd 353 # Terran\Rove\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end RoveUnused1: @@ -1159,7 +1210,7 @@ RoveWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2168 Dyad (cm\askosi\dyad.grp) +# 2168 Dyad (cm\a\dyad.grp) .headerstart IsId 13 Type 21 @@ -1189,7 +1240,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # DyadInit: - imgul 2169 0 7 # Dyad Shadow (cm\askosi\dyad-shadow.grp) + imgul 2169 0 7 # Dyad Shadow (cm\a\dyad-shadow.grp) playfram 0x00 DyadLocal00: setvertpos 0 @@ -1206,7 +1257,7 @@ DyadDeath: playsnd 353 # Terran\VULTURE\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1253,7 +1304,7 @@ DyadLocal01: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2170 Cipher (cm\askosi\cipher.grp) +# 2170 Cipher (cm\a\cipher.grp) .headerstart IsId 14 Type 24 @@ -1287,7 +1338,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # CipherInit: - imgul 2171 0 0 # Cipher Shadow (cm\askosi\cipher-shadow.grp) + imgul 2171 0 0 # Cipher Shadow (cm\a\cipher-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -1315,7 +1366,7 @@ CipherDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2172 Gauntlet (cm\askosi\gauntlet.grp) +# 2172 Gauntlet (cm\a\gauntlet.grp) .headerstart IsId 15 Type 24 @@ -1349,7 +1400,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # GauntletInit: - imgul 2173 0 0 # Gauntlet Shadow (cm\askosi\gauntlet-shadow.grp) + imgul 2173 0 0 # Gauntlet Shadow (cm\a\gauntlet-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -1377,7 +1428,7 @@ GauntletDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2174 Cosmoscope (cm\askosi\cosmoscope.grp) +# 2174 Cosmoscope (cm\a\cosmoscope.grp) .headerstart IsId 16 Type 24 @@ -1411,7 +1462,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # CosmoscopeInit: - imgul 2175 0 0 # Cosmoscope Shadow (cm\askosi\cosmoscope-shadow.grp) + imgul 2175 0 0 # Cosmoscope Shadow (cm\a\cosmoscope-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -1447,7 +1498,7 @@ CosmoscopeDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2176 Helion (cm\askosi\helion.grp) +# 2176 Helion (cm\a\helion.grp) .headerstart IsId 17 Type 21 @@ -1469,7 +1520,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # HelionInit: - imgulnextid 0 42 # Helion Shadow (cm\askosi\helion.grp) + imgulnextid 0 42 # Helion Shadow (cm\a\helion.grp) HelionGndAttkToIdle: playfram 0x00 HelionLocal00: @@ -1487,7 +1538,7 @@ HelionDeath: playsnd 257 # Terran\PHOENIX\TPhDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1506,12 +1557,12 @@ HelionGndAttkInit: HelionWalking: setvertpos 0 - imgol 2194 0 0 # Helion Engines (cm\askosi\helion-engine.grp) + imgol 2194 0 0 # Helion Engines (cm\a\helion-engine.grp) goto SkryrokorLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2178 Tirade (cm\askosi\tirade.grp) +# 2178 Tirade (cm\a\tirade.grp) .headerstart IsId 18 Type 21 @@ -1533,7 +1584,7 @@ SpecialState1 TiradeSpecialState1 # ----------------------------------------------------------------------------- # TiradeInit: - imgulnextid 0 42 # Tirade Shadow (cm\askosi\tirade.grp) + imgulnextid 0 42 # Tirade Shadow (cm\a\tirade.grp) TiradeGndAttkToIdle: playfram 0x00 TiradeLocal00: @@ -1551,7 +1602,7 @@ TiradeDeath: playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1579,7 +1630,7 @@ TiradeSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2180 Scepter (cm\askosi\scepter.grp) +# 2180 Scepter (cm\a\scepter.grp) .headerstart IsId 19 Type 21 @@ -1601,7 +1652,7 @@ SpecialState1 ScepterSpecialState1 # ----------------------------------------------------------------------------- # ScepterInit: - imgul 2181 0 7 # Scepter Shadow (cm\askosi\scepter.grp) + imgul 2181 0 7 # Scepter Shadow (cm\a\scepter.grp) ScepterGndAttkToIdle: playfram 0x00 ScepterLocal00: @@ -1619,7 +1670,7 @@ ScepterDeath: playsndbtwn 1385 1386 # Matador death 01, 02 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -1644,7 +1695,7 @@ ScepterSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2189 Proselyte (cm\askosi\proselyte.grp) +# 2189 Proselyte (cm\a\proselyte.grp) .headerstart IsId 20 Type 12 @@ -1666,7 +1717,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # ProselyteInit: - imgul 2190 0 0 # Proselyte Shadow (cm\askosi\proselyte-shadow.grp) + imgul 2190 0 0 # Proselyte Shadow (cm\a\proselyte-shadow.grp) ProselyteWalkingToIdle: playfram 0x00 ProselyteLocal00: @@ -1726,11 +1777,11 @@ ProselyteLocal02: ProselyteDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) setfldirect 0 wait 8 - lowsprul 1064 0 0 # Proselyte Remnants (cm\askosi\proselyte-remnants.grp) + lowsprul 1064 0 0 # Proselyte Remnants (cm\a\proselyte-remnants.grp) wait 1 end @@ -1807,7 +1858,7 @@ ProselyteWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2194 Helion Engines (cm\askosi\helion-engine.grp) +# 2194 Helion Engines (cm\a\helion-engine.grp) .headerstart IsId 730 Type 15 @@ -1869,7 +1920,7 @@ GenericRemnantsFiveDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2210 Grandstand (Cannon) (cm\askosi\grandstand.grp) +# 2210 Grandstand (Cannon) (cm\a\grandstand.grp) .headerstart IsId 21 Type 27 @@ -1905,7 +1956,7 @@ Enable [NONE] # ----------------------------------------------------------------------------- # GrandstandInit: - imgul 2211 0 0 # Grandstand (Cannon) Shadow (cm\askosi\grandstand-shadow.grp) + imgul 2211 0 0 # Grandstand (Cannon) Shadow (cm\a\grandstand-shadow.grp) wait 1 playsnd 2430 # Matador Tank Transform wait 14 @@ -1941,7 +1992,7 @@ GrandstandSpecialState2: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2216 Mimic (cm\askosi\mimic.grp) +# 2216 Mimic (cm\a\mimic.grp) .headerstart IsId 22 Type 23 @@ -1973,7 +2024,7 @@ StarEditInit [NONE] # ----------------------------------------------------------------------------- # MimicInit: - imgulnextid 0 0 # Mimic Shadow (cm\askosi\mimic-shadow.grp) + imgulnextid 0 0 # Mimic Shadow (cm\a\mimic-shadow.grp) MimicWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 @@ -1982,7 +2033,7 @@ MimicDeath: playsnd 2820 # Goliath death 01 imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end MimicUnused1: @@ -2036,7 +2087,7 @@ MimicWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2218 Intendent (cm\askosi\intendent.grp) +# 2218 Intendent (cm\a\intendent.grp) .headerstart IsId 23 Type 21 @@ -2066,7 +2117,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # IntendentInit: - imgulnextid 0 0 # Intendent Shadow (cm\askosi\intendent-shadow.grp) + imgulnextid 0 0 # Intendent Shadow (cm\a\intendent-shadow.grp) goto IntendentGndAttkToIdle IntendentGndAttkToIdle: @@ -2077,7 +2128,7 @@ IntendentDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -2149,7 +2200,7 @@ IntendentWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2184 Bounty (cm\askosi\bounty.grp) +# 2184 Bounty (cm\a\bounty.grp) .headerstart IsId 24 Type 24 @@ -2183,7 +2234,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # BountyInit: - imgulnextid 0 0 # Bounty Shadow (cm\askosi\bounty-shadow.grp) + imgulnextid 0 0 # Bounty Shadow (cm\a\bounty-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -2215,20 +2266,20 @@ BountyDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2220 Object (cm\askosi\object.grp) +# 2220 Object (cm\a\object.grp) .headerstart IsId 25 Type 21 Init ObjectInit Death ObjectDeath GndAttkInit ObjectGndAttkInit -AirAttkInit [NONE] +AirAttkInit SkryrokorLocal00 Unused1 SkryrokorLocal00 GndAttkRpt ObjectGndAttkInit -AirAttkRpt [NONE] -CastSpell [NONE] +AirAttkRpt SkryrokorLocal00 +CastSpell SkryrokorLocal00 GndAttkToIdle ObjectGndAttkToIdle -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking ObjectWalking WalkingToIdle ObjectWalkingToIdle @@ -2245,7 +2296,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # ObjectInit: - imgulnextid 0 0 # Object Shadow (cm\askosi\object-shad.grp) + imgulnextid 0 0 # Object Shadow (cm\a\object-shad.grp) playfram 0x20 goto SkryrokorLocal00 @@ -2253,7 +2304,7 @@ ObjectDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -2313,7 +2364,7 @@ ObjectSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2222 Abutment (cm\askosi\abutment.grp) +# 2222 Abutment (cm\a\abutment.grp) .headerstart IsId 26 Type 24 @@ -2343,7 +2394,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # AbutmentInit: - imgulnextid 0 0 # Abutment Shadow (cm\askosi\abutment-shadow.grp) + imgulnextid 0 0 # Abutment Shadow (cm\a\abutment-shadow.grp) playfram 1 AbutmentLocal00: wait 5 @@ -2392,7 +2443,7 @@ AbutmentLocal01: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2224 Proscenium (cm\askosi\proscenium.grp) +# 2224 Proscenium (cm\a\proscenium.grp) .headerstart IsId 27 Type 24 @@ -2427,7 +2478,7 @@ Burrow [NONE] ProsceniumInit: playfram 0x00 - imgulnextid 0 0 # Proscenium Shadow (cm\askosi\proscenium-shadow.grp) + imgulnextid 0 0 # Proscenium Shadow (cm\a\proscenium-shadow.grp) goto SkryrokorLocal00 ProsceniumSpecialState1: @@ -2508,7 +2559,7 @@ ElectroballSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2236 Askosi Construction (Large) (cm\askosi\a-construction-large.grp) +# 2236 Askosi Construction (Large) (cm\a\a-construction-large.grp) .headerstart IsId 29 Type 14 @@ -2533,7 +2584,7 @@ AlmostBuilt [NONE] AskosiConstruction_Large_Init: playfram 0x00 - imgulnextid 0 0 # Askosi Construction (Large) Shadow (cm\askosi\a-construction-large-shadow.grp) + imgulnextid 0 0 # Askosi Construction (Large) Shadow (cm\a\a-construction-large-shadow.grp) goto SkryrokorLocal00 AskosiConstruction_Large_SpecialState1: @@ -2546,7 +2597,7 @@ AskosiConstruction_Large_SpecialState2: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2237 Askosi Construction (Medium) (cm\askosi\a-construction-medium.grp) +# 2237 Askosi Construction (Medium) (cm\a\a-construction-medium.grp) .headerstart IsId 30 Type 14 @@ -2571,7 +2622,7 @@ AlmostBuilt [NONE] AskosiConstruction_Medium_Init: playfram 0x00 - imgulnextid 0 0 # Askosi Construction (Medium) Shadow (cm\askosi\a-construction-medium-shadow.grp) + imgulnextid 0 0 # Askosi Construction (Medium) Shadow (cm\a\a-construction-medium-shadow.grp) goto SkryrokorLocal00 AskosiConstruction_Medium_SpecialState1: @@ -2584,7 +2635,7 @@ AskosiConstruction_Medium_SpecialState2: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2238 Askosi Construction (Small) (cm\askosi\a-construction-small.grp) +# 2238 Askosi Construction (Small) (cm\a\a-construction-small.grp) .headerstart IsId 31 Type 14 @@ -2609,7 +2660,7 @@ AlmostBuilt [NONE] AskosiConstruction_Small_Init: playfram 0x00 - imgulnextid 0 0 # Askosi Construction (Small) Shadow (cm\askosi\a-construction-small-shadow.grp) + imgulnextid 0 0 # Askosi Construction (Small) Shadow (cm\a\a-construction-small-shadow.grp) goto SkryrokorLocal00 AskosiConstruction_Small_SpecialState1: @@ -2656,7 +2707,7 @@ OpticalFlareHitInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2253 Aphorist (cm\askosi\aphorist.grp) +# 2253 Aphorist (cm\a\aphorist.grp) .headerstart IsId 33 Type 21 @@ -2686,7 +2737,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # AphoristInit: - imgulnextid 0 0 # Aphorist Shadow (cm\askosi\aphorist-shadow.grp) + imgulnextid 0 0 # Aphorist Shadow (cm\a\aphorist-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -2777,7 +2828,7 @@ AphoristWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 239 Thaumalogue (cm\askosi\thaumalogue.grp) +# 2255 Thaumalogue (cm\a\thaumalogue.grp) .headerstart IsId 34 Type 21 @@ -2807,7 +2858,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # ThaumalogueInit: - imgulnextid 0 0 # Thaumalogue Shadow (cm\askosi\thaumalogue-shadow.grp) + imgulnextid 0 0 # Thaumalogue Shadow (cm\a\thaumalogue-shadow.grp) ThaumalogueWalkingToIdle: playfram 0x80 ThaumalogueLocal00: @@ -2881,7 +2932,7 @@ ThaumalogueLocal02: ThaumalogueDeath: playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV - imgol 2089 0 0 # Askosi Death Explosion Small (cm\askosi\a-death-small.grp) + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) setfldirect 0 playfram 416 wait 2 @@ -2899,7 +2950,7 @@ ThaumalogueDeath: wait 2 playfram 423 wait 2 - lowsprul 236 0 0 # Thaumalogue Remnants (terran\thaumalogue-death.grp) + lowsprul 1107 0 0 # Thaumalogue Remnants (terran\thaumalogue-death.grp) wait 1 end @@ -2986,7 +3037,7 @@ ThaumalogueWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2269 Conduit (cm\askosi\conduit.grp) +# 2269 Conduit (cm\a\conduit.grp) .headerstart IsId 35 Type 24 @@ -3020,7 +3071,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # ConduitInit: - imgulnextid 0 0 # Conduit Shadow (cm\askosi\conduit-shadow.grp) + imgulnextid 0 0 # Conduit Shadow (cm\a\conduit-shadow.grp) playfram 0 goto SkryrokorLocal00 @@ -3048,7 +3099,7 @@ ConduitDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2271 Bestiary (cm\askosi\bestiary.grp) +# 2271 Bestiary (cm\a\bestiary.grp) .headerstart IsId 36 Type 24 @@ -3082,7 +3133,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # BestiaryInit: - imgulnextid 0 0 # Bestiary Shadow (cm\askosi\conduit-shadow.grp) + imgulnextid 0 0 # Bestiary Shadow (cm\a\conduit-shadow.grp) playfram 0 goto SkryrokorLocal00 @@ -3110,7 +3161,7 @@ BestiaryDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2273 Zylode (cm\askosi\zylode.grp) +# 2273 Zylode (cm\a\zylode.grp) .headerstart IsId 37 Type 24 @@ -3144,7 +3195,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # ZylodeInit: - imgulnextid 0 0 # Zylode Shadow (cm\askosi\zylode-shadow.grp) + imgulnextid 0 0 # Zylode Shadow (cm\a\zylode-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -3184,7 +3235,7 @@ ZylodeDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2275 Astrolabe (cm\askosi\astrolabe.grp) +# 2275 Astrolabe (cm\a\astrolabe.grp) .headerstart IsId 38 Type 24 @@ -3218,7 +3269,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # AstrolabeInit: - imgulnextid 0 0 # Astrolabe Shadow (cm\askosi\astrolabe-shadow.grp) + imgulnextid 0 0 # Astrolabe Shadow (cm\a\astrolabe-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -3276,7 +3327,7 @@ AstrolabeDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2258 Avatar (cm\askosi\avatar.grp) +# 2258 Avatar (cm\a\avatar.grp) .headerstart IsId 39 Type 12 @@ -3298,7 +3349,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # AvatarInit: - imgulnextid 0 0 # Avatar Shadow (cm\askosi\avatar-shadow.grp) + imgulnextid 0 0 # Avatar Shadow (cm\a\avatar-shadow.grp) AvatarGndAttkToIdle: playfram 0x00 goto AvatarLocal00 @@ -3410,7 +3461,7 @@ AvatarWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2260 Doronin (cm\askosi\doronin.grp) +# 2260 Doronin (cm\a\doronin.grp) .headerstart IsId 40 Type 26 @@ -3446,7 +3497,7 @@ Enable [NONE] # ----------------------------------------------------------------------------- # DoroninInit: - imgulnextid 0 -3 # Doronin Shadow (cm\askosi\doronin-shadow.grp) + imgulnextid 0 -3 # Doronin Shadow (cm\a\doronin-shadow.grp) goto DoroninLocal42 DoroninLocal42: playfram 0x00 @@ -3585,7 +3636,7 @@ DoroninWalkingToIdle: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2257 Thaumalogue Remains (cm\askosi\thaumalogue-remains.grp) +# 2257 Thaumalogue Remains (cm\a\thaumalogue-remains.grp) .headerstart IsId 41 Type 1 @@ -3612,7 +3663,7 @@ GenericRemnantsThreeDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2277 Ash Heap Overlay (cm\askosi\a-fire-v.grp) +# 2277 Ash Heap Overlay (cm\a\a-fire-v.grp) .headerstart IsId 42 Type 1 @@ -3654,7 +3705,7 @@ Flames_Small_Death: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2178 Crematorium (cm\askosi\crematorium.grp) +# 2178 Crematorium (cm\a\crematorium.grp) .headerstart IsId 43 Type 21 @@ -3676,7 +3727,7 @@ SpecialState1 CrematoriumSpecialState1 # ----------------------------------------------------------------------------- # CrematoriumInit: - imgulnextid 0 42 # Crematorium Shadow (cm\askosi\crematorium.grp) + imgulnextid 0 42 # Crematorium Shadow (cm\a\crematorium.grp) CrematoriumGndAttkToIdle: playfram 0x00 CrematoriumLocal00: @@ -3694,7 +3745,7 @@ CrematoriumDeath: playsnd 177 # Terran\BATTLE\tbaDth00.wav imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -3734,7 +3785,7 @@ CrematoriumSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2280 Eyelet (cm\askosi\eyelet.grp) +# 2280 Eyelet (cm\a\eyelet.grp) .headerstart IsId 44 Type 26 @@ -3770,7 +3821,7 @@ Enable [NONE] # ----------------------------------------------------------------------------- # EyeletInit: - imgulnextid 0 -6 # Spider Mine Shadow (cm\askosi\eyelet-shadow.grp) + imgulnextid 0 -6 # Eyelet Shadow (cm\a\eyelet-shadow.grp) EyeletWalkingToIdle: playfram 0x00 goto SkryrokorLocal00 @@ -3844,7 +3895,7 @@ EyeletUnBurrow: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2282 Obelisk (cm\askosi\obelisk.grp) +# 2282 Obelisk (cm\a\obelisk.grp) .headerstart IsId 45 Type 24 @@ -3878,7 +3929,7 @@ Burrow [NONE] # ----------------------------------------------------------------------------- # ObeliskInit: - imgulnextid 0 0 # Obelisk Shadow (cm\askosi\obelisk-shadow.grp) + imgulnextid 0 0 # Obelisk Shadow (cm\a\obelisk-shadow.grp) playfram 0x00 goto SkryrokorLocal00 @@ -3934,7 +3985,7 @@ ObeliskDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2284 Agonist (cm\askosi\agonist.grp) +# 2284 Agonist (cm\a\agonist.grp) .headerstart IsId 46 Type 13 @@ -3956,7 +4007,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # AgonistInit: - imgulnextid 0 7 # Agonist Shadow (cm\askosi\agonist.grp) + imgulnextid 0 7 # Agonist Shadow (cm\a\agonist.grp) playfram 0x00 goto AgonistGndAttkToIdle @@ -3975,7 +4026,7 @@ AgonistDeath: playsnd 353 # Terran\Agonist\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end AgonistUnused1: @@ -4003,7 +4054,7 @@ AgonistWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2292 Akreno (cm\askosi\akreno.grp) +# 2292 Akreno (cm\a\akreno.grp) .headerstart IsId 47 Type 21 @@ -4025,7 +4076,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # AkrenoInit: - imgulnextid 0 42 # Akreno Shadow (cm\askosi\akreno.grp) + imgulnextid 0 42 # Akreno Shadow (cm\a\akreno.grp) AkrenoGndAttkToIdle: playfram 0x00 wait 2 @@ -4050,7 +4101,7 @@ AkrenoDeath: playsnd 942 # Zerg\Mutalid\ZMuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -4089,7 +4140,7 @@ AkrenoWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2178 Iconoclast (cm\askosi\iconoclast.grp) +# 2178 Iconoclast (cm\a\iconoclast.grp) .headerstart IsId 48 Type 21 @@ -4111,7 +4162,7 @@ SpecialState1 IconoclastSpecialState1 # ----------------------------------------------------------------------------- # IconoclastInit: - imgulnextid 0 42 # Iconoclast Shadow (cm\askosi\iconoclast.grp) + imgulnextid 0 42 # Iconoclast Shadow (cm\a\iconoclast.grp) IconoclastGndAttkToIdle: playfram 0x00 IconoclastLocal00: @@ -4129,7 +4180,7 @@ IconoclastDeath: playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -4158,7 +4209,7 @@ IconoclastSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2178 Constituent (cm\askosi\constituent.grp) +# 2178 Constituent (cm\a\constituent.grp) .headerstart IsId 49 Type 15 @@ -4182,7 +4233,7 @@ AlmostBuilt ConstituentAlmostBuilt # ----------------------------------------------------------------------------- # ConstituentInit: - imgulnextid 0 42 # Constituent Shadow (cm\askosi\constituent.grp) + imgulnextid 0 42 # Constituent Shadow (cm\a\constituent.grp) ConstituentGndAttkToIdle: playfram 0x00 ConstituentLocal00: @@ -4200,7 +4251,7 @@ ConstituentDeath: playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -4244,7 +4295,7 @@ ConstituentLocal01: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2290 Zonguard (cm\askosi\zonguard.grp) +# 2290 Zonguard (cm\a\zonguard.grp) .headerstart IsId 50 Type 13 @@ -4266,7 +4317,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # ZonguardInit: - imgulnextid 0 7 # Zonguard Shadow (cm\askosi\zonguard.grp) + imgulnextid 0 7 # Zonguard Shadow (cm\a\zonguard.grp) playfram 0x00 goto ZonguardGndAttkToIdle @@ -4285,7 +4336,7 @@ ZonguardDeath: playsnd 353 # Terran\Zonguard\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end ZonguardUnused1: @@ -4322,7 +4373,7 @@ ZonguardWalkingLoop: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2286 Petract (cm\askosi\petract.grp) +# 2286 Petract (cm\a\petract.grp) .headerstart IsId 51 Type 21 @@ -4352,7 +4403,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # PetractInit: - imgulnextid 0 0 # Petract Shadow (cm\askosi\petract-shadow.grp) + imgulnextid 0 0 # Petract Shadow (cm\a\petract-shadow.grp) playfram 0x00 goto PetractGndAttkToIdle @@ -4371,7 +4422,7 @@ PetractDeath: playsnd 353 # Terran\Petract\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end PetractUnused1: @@ -4400,7 +4451,7 @@ PetractWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2288 Phontis (cm\askosi\phontis.grp) +# 2288 Phontis (cm\a\phontis.grp) .headerstart IsId 52 Type 21 @@ -4430,7 +4481,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # PhontisInit: - imgulnextid 0 0 # Phontis Shadow (cm\askosi\phontis-shadow.grp) + imgulnextid 0 0 # Phontis Shadow (cm\a\phontis-shadow.grp) goto PhontisGndAttkToIdle PhontisGndAttkToIdle: @@ -4441,7 +4492,7 @@ PhontisDeath: playsnd 533 # Protoss\Scout\PScDth00.WAV imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 2 - lowsprul 1065 0 0 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -4518,7 +4569,7 @@ PhontisWalking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2302 Electric Impact Small (cm\askosi\lightning-hit-small.grp) +# 2302 Electric Impact Small (cm\a\lightning-hit-small.grp) .headerstart IsId 53 Type 2 @@ -4549,7 +4600,7 @@ LightningImpactSmallDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2296 Paraclete (cm\askosi\paraclete.grp) +# 2296 Paraclete (cm\a\paraclete.grp) .headerstart IsId 54 Type 21 @@ -4571,7 +4622,7 @@ SpecialState1 ParacleteSpecialState1 # ----------------------------------------------------------------------------- # ParacleteInit: - imgulnextid 0 42 # Paraclete Shadow (cm\askosi\paraclete.grp) + imgulnextid 0 42 # Paraclete Shadow (cm\a\paraclete.grp) ParacleteGndAttkToIdle: playfram 0x00 ParacleteLocal00: @@ -4589,7 +4640,7 @@ ParacleteDeath: playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) wait 1 end @@ -4618,7 +4669,7 @@ ParacleteSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2298 Auxine (cm\askosi\auxine.grp) +# 2298 Auxine (cm\a\auxine.grp) .headerstart IsId 55 Type 21 @@ -4640,7 +4691,7 @@ SpecialState1 AuxineSpecialState1 # ----------------------------------------------------------------------------- # AuxineInit: - imgulnextid 0 42 # Auxine Shadow (cm\askosi\paraclete.grp) + imgulnextid 0 42 # Auxine Shadow (cm\a\paraclete.grp) AuxineGndAttkToIdle: playfram 0x00 AuxineLocal00: @@ -4658,7 +4709,7 @@ AuxineDeath: playsnd 353 # Terran\Rove\TVuDth00.WAV imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) wait 3 - lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) end AuxineGndAttkInit: @@ -4684,7 +4735,7 @@ AuxineSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2324 Dorminge (cm\askosi\dorminge.grp) +# 2324 Dorminge (cm\a\dorminge.grp) .headerstart IsId 56 Type 24 @@ -4719,14 +4770,14 @@ Burrow [NONE] DormingeInit: playfram 0x00 - imgulnextid 0 0 # Dorminge Shadow (cm\askosi\dorminge-shadow.grp) + imgulnextid 0 0 # Dorminge Shadow (cm\a\dorminge-shadow.grp) goto DormingeIsWorking DormingeDeath: playsndbtwn 4145 4147 # Askosi explosion medium 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\askosi\a-rubble-small.grp) + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp) wait 1 end @@ -4766,7 +4817,7 @@ DormingeDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2326 Warring Winds Overlay (cm\askosi\warringwinds-overlay.grp) +# 2326 Warring Winds Overlay (cm\a\warringwinds-overlay.grp) .headerstart IsId 57 Type 1 @@ -4859,7 +4910,7 @@ WarringWindsDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2327 Domain (cm\askosi\domain.grp) +# 2327 Domain (cm\a\domain.grp) .headerstart IsId 58 Type 21 @@ -4889,7 +4940,7 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # DomainInit: - imgulnextid 0 0 # Domain Shadow (cm\askosi\domain-shadow.grp) + imgulnextid 0 0 # Domain Shadow (cm\a\domain-shadow.grp) DomainWorkingToIdle: playfram 0x00 goto SkryrokorLocal00 @@ -4898,7 +4949,7 @@ DomainDeath: playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\a\a-rubble-large.grp) wait 1 end @@ -4913,7 +4964,7 @@ DomainIsWorking: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2075 Panoply (cm\askosi\panoply.grp) +# 2075 Panoply (cm\a\panoply.grp) .headerstart IsId 59 Type 24 @@ -4948,7 +4999,7 @@ Burrow [NONE] PanoplyInit: playfram 0x00 - imgulnextid 0 0 # Panoply Shadow (cm\askosi\panoply-shadow.grp) + imgulnextid 0 0 # Panoply Shadow (cm\a\panoply-shadow.grp) goto SkryrokorLocal00 PanoplySpecialState1: @@ -4983,7 +5034,7 @@ PanoplyDisable: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2075 Lotiro (cm\askosi\lotiro.grp) +# 2075 Lotiro (cm\a\lotiro.grp) .headerstart IsId 60 Type 24 @@ -5018,7 +5069,7 @@ Burrow [NONE] LotiroInit: playfram 0x00 - imgulnextid 0 0 # Lotiro Shadow (cm\askosi\lotiro-shadow.grp) + imgulnextid 0 0 # Lotiro Shadow (cm\a\lotiro-shadow.grp) goto SkryrokorLocal00 LotiroSpecialState1: @@ -5050,6 +5101,1100 @@ LotiroIsWorking: LotiroDisable: goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2358 Lekrot (cm\a\lekrot.grp) +.headerstart +IsId 61 +Type 24 +Init LekrotInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 LekrotSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt LekrotAlmostBuilt +Built LekrotBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking LekrotIsWorking +WorkingToIdle LekrotBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable LekrotDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +LekrotInit: + imgulnextid 0 0 # Lekrot Shadow (cm\a\lekrot-shadow.grp) + playfram 0 + goto SkryrokorLocal00 + +LekrotSpecialState1: + playfram 1 + goto SkryrokorLocal00 + +LekrotAlmostBuilt: + playfram 1 + goto SkryrokorLocal00 + +LekrotBuilt: + playfram 0 + goto SkryrokorLocal00 + +LekrotIsWorking: + 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 + wait 2 + playfram 12 + wait 2 + playfram 0 + wait 2 + goto LekrotIsWorking + +LekrotDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2360 Hearthshard (cm\a\hearthshard.grp) +.headerstart +IsId 62 +Type 24 +Init HearthshardInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 HearthshardSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt HearthshardAlmostBuilt +Built HearthshardBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking HearthshardIsWorking +WorkingToIdle HearthshardBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable HearthshardDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HearthshardInit: + imgulnextid 0 0 # Hearthshard Shadow (cm\a\hearthshard-shadow.grp) + playfram 0 + goto SkryrokorLocal00 + +HearthshardSpecialState1: + playfram 1 + goto SkryrokorLocal00 + +HearthshardAlmostBuilt: + playfram 1 + goto SkryrokorLocal00 + +HearthshardBuilt: + playfram 0 + goto SkryrokorLocal00 + +HearthshardIsWorking: + playfram 0x00 + wait 2 + goto HearthshardIsWorking + +HearthshardDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2362 Insurant (cm\a\insurant.grp) +.headerstart +IsId 63 +Type 12 +Init InsurantInit +Death InsurantDeath +GndAttkInit InsurantGndAttkInit +AirAttkInit InsurantGndAttkInit +Unused1 InsurantUnused1 +GndAttkRpt InsurantGndAttkRpt +AirAttkRpt InsurantGndAttkRpt +CastSpell [NONE] +GndAttkToIdle InsurantGndAttkToIdle +AirAttkToIdle InsurantGndAttkToIdle +Unused2 [NONE] +Walking InsurantWalking +WalkingToIdle InsurantWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +InsurantInit: + imgulnextid 0 0 # Insurant Shadow (cm\a\insurant-shadow.grp) +InsurantWalkingToIdle: + playfram 0x00 +InsurantLocal00: + wait 63 + randcondjmp 25 InsurantLocal01 + randcondjmp 128 InsurantLocal02 + goto InsurantLocal00 + +InsurantLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 InsurantLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto InsurantWalkingToIdle + +InsurantLocal03: + wait 13 + goto InsurantWalkingToIdle + +InsurantLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto InsurantWalkingToIdle + +InsurantDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1031 0 0 # Insurant Remnants (cm\a\insurant-remnants.grp) + wait 1 + end + +InsurantUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto InsurantWalkingToIdle + +InsurantGndAttkInit: + playfram 0x20 +InsurantGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x40 + attackwith 1 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +InsurantGndAttkToIdle: + goto InsurantWalkingToIdle + +InsurantWalking: + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x60 + goto InsurantWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2364 Silversoul (cm\a\silversoul.grp) +.headerstart +IsId 64 +Type 21 +Init SilversoulInit +Death SilversoulDeath +GndAttkInit SilversoulGndAttkInit +AirAttkInit SilversoulGndAttkInit +Unused1 SilversoulUnused1 +GndAttkRpt SilversoulGndAttkRpt +AirAttkRpt SilversoulGndAttkRpt +CastSpell [NONE] +GndAttkToIdle SilversoulGndAttkToIdle +AirAttkToIdle SilversoulGndAttkToIdle +Unused2 [NONE] +Walking SilversoulWalking +WalkingToIdle SilversoulWalkingToIdle +SpecialState1 ObjectSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +SilversoulInit: + imgulnextid 0 0 # Silversoul Shadow (cm\a\silversoul-shadow.grp) +SilversoulWalkingToIdle: + playfram 0x80 +SilversoulLocal00: + wait 63 + randcondjmp 25 SilversoulLocal01 + randcondjmp 128 SilversoulLocal02 + goto SilversoulLocal00 + +SilversoulLocal01: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + randcondjmp 192 SilversoulLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto SilversoulLocal04 + +SilversoulLocal04: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulLocal03: + wait 13 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulLocal02: + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + turnrand 3 + wait 1 + playfram 0xA0 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) + setfldirect 0 + playfram 416 + wait 2 + playfram 417 + wait 2 + playfram 418 + wait 2 + playfram 419 + wait 2 + playfram 420 + wait 2 + playfram 421 + wait 2 + playfram 422 + wait 2 + playfram 423 + wait 2 + lowsprul 1154 0 0 # Silversoul Remnants (terran\silversoul-death.grp) + wait 1 + end + +SilversoulUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1161 1162 + playfram 422 + wait 2 + playfram 421 + wait 2 + playfram 420 + wait 2 + playfram 419 + wait 2 + playfram 418 + wait 2 + playfram 417 + wait 2 + playfram 416 + wait 2 + setfldirect 12 + nobrkcodeend + goto SilversoulWalkingToIdle + +SilversoulGndAttkInit: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 +SilversoulGndAttkRpt: + wait 1 + nobrkcodestart + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 4 + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 4 + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +SilversoulGndAttkToIdle: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto SilversoulWalkingToIdle + +SilversoulWalking: + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x160 + move 4 + wait 1 + playfram 0x180 + move 4 + wait 1 + playfram 0x80 + goto SilversoulWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2366 Ghostwrit (cm\a\ghostwrit.grp) +.headerstart +IsId 65 +Type 21 +Init GhostwritInit +Death GhostwritDeath +GndAttkInit GhostwritGndAttkInit +AirAttkInit GhostwritGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt GhostwritGndAttkRpt +AirAttkRpt GhostwritGndAttkRpt +CastSpell [NONE] +GndAttkToIdle GhostwritGndAttkToIdle +AirAttkToIdle GhostwritGndAttkToIdle +Unused2 [NONE] +Walking GhostwritWalking +WalkingToIdle GhostwritGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +GhostwritInit: + imgulnextid 0 0 # Ghostwrit Shadow (cm\a\ghostwrit-shadow.grp) + playfram 0x00 + goto SkryrokorLocal00 + +GhostwritGndAttkToIdle: + playfram 0x40 + wait 1 + playfram 0x00 + goto SkryrokorLocal00 + +GhostwritDeath: + playsndbtwn 3053 3056 # Ghostwrit death 01, 02, 03, 04 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 947 0 0 # Ghostwrit remains (cm\protoss\ghostwrit-death.grp) + wait 1 + end + +GhostwritGndAttkInit: + playfram 0x40 + wait 1 + playfram 0x60 +GhostwritGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x80 + attack + wait 1 + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto GhostwritGndAttkToIdle + +GhostwritWalking: + move 5 + wait 1 + playfram 0x1E0 + move 5 + wait 1 + playfram 0x200 + move 5 + wait 1 + playfram 0x220 + move 5 + wait 1 + playfram 0x240 + move 5 + wait 1 + playfram 0x260 + move 5 + wait 1 + playfram 0x280 + move 5 + wait 1 + playfram 0x2A0 + move 5 + wait 1 + playfram 0x2C0 + move 5 + wait 1 + playfram 0x2E0 + move 5 + wait 1 + playfram 0x300 + move 5 + wait 1 + playfram 0x320 + move 5 + wait 1 + playfram 0x340 + goto GhostwritWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2178 Endbore (cm\a\endbore.grp) +.headerstart +IsId 66 +Type 21 +Init EndboreInit +Death EndboreDeath +GndAttkInit EndboreGndAttkInit +AirAttkInit EndboreGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt EndboreGndAttkInit +AirAttkRpt EndboreGndAttkInit +CastSpell [NONE] +GndAttkToIdle EndboreGndAttkToIdle +AirAttkToIdle EndboreGndAttkToIdle +Unused2 [NONE] +Walking EndboreWalking +WalkingToIdle EndboreLocal00 +SpecialState1 EndboreSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +EndboreInit: + imgulnextid 0 42 # Endbore Shadow (cm\a\endbore.grp) +EndboreGndAttkToIdle: + playfram 0x00 +EndboreLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto EndboreLocal00 + +EndboreDeath: + playsnd 177 # Terran\BATTLE\tbaDth00.wav + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + wait 1 + end + +EndboreGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 1 + nobrkcodeend + gotorepeatattk + goto EndboreGndAttkToIdle + +EndboreWalking: + setvertpos 0 +# imgol 225 0 5 # Endbore Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +EndboreSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2389 Alacyne (cm\a\alacyne.grp) +.headerstart +IsId 67 +Type 13 +Init AlacyneInit +Death AlacyneDeath +GndAttkInit AlacyneGndAttkInit +AirAttkInit AlacyneGndAttkInit +Unused1 AlacyneUnused1 +GndAttkRpt AlacyneGndAttkInit +AirAttkRpt AlacyneGndAttkInit +CastSpell [NONE] +GndAttkToIdle AlacyneGndAttkToIdle +AirAttkToIdle AlacyneGndAttkToIdle +Unused2 [NONE] +Walking AlacyneWalking +WalkingToIdle AlacyneGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AlacyneInit: + imgulnextid 0 7 # Alacyne Shadow (cm\a\alacyne.grp) + playfram 0x00 + goto AlacyneGndAttkToIdle + +AlacyneGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto AlacyneGndAttkToIdle + +AlacyneDeath: + playsnd 353 # Terran\Alacyne\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + end + +AlacyneUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Alacyne revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto AlacyneGndAttkToIdle + +AlacyneGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x20 + attackwith 1 + attackwith 1 + attackwith 1 + attackwith 1 + attackwith 1 + attackwith 1 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto AlacyneGndAttkToIdle + +AlacyneWalking: + playfram 0x00 + setvertpos 0 + imgol 2303 0 0 # Alacyne Engine + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2370 Elgird (cm\a\elgird.grp) +.headerstart +IsId 68 +Type 13 +Init ElgirdInit +Death ElgirdDeath +GndAttkInit ElgirdGndAttkInit +AirAttkInit ElgirdGndAttkInit +Unused1 ElgirdUnused1 +GndAttkRpt ElgirdGndAttkInit +AirAttkRpt ElgirdGndAttkInit +CastSpell [NONE] +GndAttkToIdle ElgirdGndAttkToIdle +AirAttkToIdle ElgirdGndAttkToIdle +Unused2 [NONE] +Walking ElgirdWalking +WalkingToIdle ElgirdGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ElgirdInit: + imgulnextid 0 7 # Elgird Shadow (cm\a\elgird.grp) + playfram 0x00 + goto ElgirdGndAttkToIdle + +ElgirdGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ElgirdGndAttkToIdle + +ElgirdDeath: + playsnd 353 # Terran\Elgird\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + end + +ElgirdUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Elgird revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto ElgirdGndAttkToIdle + +ElgirdGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + wait 3 + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + wait 3 + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto ElgirdGndAttkToIdle + +ElgirdWalking: + playfram 0x00 + setvertpos 0 + imgol 2303 0 0 # Elgird Engine + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2372 Histrion (cm\a\histrion.grp) +.headerstart +IsId 69 +Type 13 +Init HistrionInit +Death HistrionDeath +GndAttkInit HistrionGndAttkInit +AirAttkInit HistrionGndAttkInit +Unused1 HistrionUnused1 +GndAttkRpt HistrionGndAttkInit +AirAttkRpt HistrionGndAttkInit +CastSpell [NONE] +GndAttkToIdle HistrionGndAttkToIdle +AirAttkToIdle HistrionGndAttkToIdle +Unused2 [NONE] +Walking HistrionWalking +WalkingToIdle HistrionGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HistrionInit: + imgulnextid 0 7 # Histrion Shadow (cm\a\histrion.grp) + playfram 0x00 + goto HistrionGndAttkToIdle + +HistrionGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto HistrionGndAttkToIdle + +HistrionDeath: + playsnd 353 # Terran\Histrion\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 0 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + end + +HistrionUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Histrion revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto HistrionGndAttkToIdle + +HistrionGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x20 + attackwith 1 + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + goto HistrionGndAttkToIdle + +HistrionWalking: + playfram 0x00 + setvertpos 0 + imgol 2303 0 0 # Histrion Engine + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2374 Egocent (cm\a\egocent.grp) +.headerstart +IsId 70 +Type 26 +Init EgocentInit +Death EgocentDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 EgocentUnused2 +Walking SkryrokorLocal00 +WalkingToIdle EgocentWalkingToIdle +SpecialState1 EgocentSpecialState1 +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow EgocentBurrow +UnBurrow EgocentUnBurrow +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EgocentInit: + imgulnextid 0 -6 # Egocent Shadow (cm\a\egocent-shadow.grp) +EgocentWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +EgocentDeath: + playsnd 10 # Misc\Explo1.wav + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 0x11 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + end + +EgocentSpecialState1: + castspell + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EgocentUnused2: + sigorder 32 + sigorder 1 + playsnd 10 # Misc\Explo1.wav + imgol 429 0 0 # Spider Mine Death (thingy\tmnExplo.grp) + goto SkryrokorLocal00 + +EgocentBurrow: + nobrkcodestart + imgol 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + sigorder 4 + nobrkcodeend + goto SkryrokorLocal00 + +EgocentUnBurrow: + nobrkcodestart + imgul 423 0 0 # Burrowing Dust (thingy\bDust.grp) + playsnd 354 # Terran\VULTURE\TVuMin01.WAV + playfram 10 + wait 1 + playfram 9 + wait 1 + playfram 8 + wait 1 + playfram 0x00 + sigorder 4 + nobrkcodeend + goto EgocentWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index 865496a1..f53b6eec 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 4ebbbc35..173123e4 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -4619,4 +4619,577 @@ YoungChrysalisDeath: wait 3 end -## Next free IsId: 829 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2335 Ferrum (hl\fr\ferrum.grp) +.headerstart +IsId 378 +Type 21 +Init FerrumInit +Death FerrumDeath +GndAttkInit FerrumGndAttkInit +AirAttkInit FerrumGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt FerrumGndAttkInit +AirAttkRpt FerrumGndAttkInit +CastSpell [NONE] +GndAttkToIdle FerrumGndAttkToIdle +AirAttkToIdle FerrumGndAttkToIdle +Unused2 [NONE] +Walking FerrumWalking +WalkingToIdle FerrumWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn FerrumWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +FerrumInit: + imgulnextid 0 42 # Ferrum Shadow (hl\fr\ferrum.grp) +FerrumGndAttkToIdle: + playfram 0x00 + goto FerrumWalkingToIdle + +FerrumWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto FerrumWalkingToIdle + +FerrumDeath: + playsndbtwn 4214 4215 # Ferrum death 01, 02 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +FerrumGndAttkInit: + wait 1 + attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +FerrumWalking: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Ferrum Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +FerrumWarpIn: + imgol 2337 0 0 # Ferrum Warp Flash (hl\fr\ferrum.grp) + goto FerrumWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2338 Chalyb (hl\fr\chalyb.grp) +.headerstart +IsId 379 +Type 21 +Init ChalybInit +Death ChalybDeath +GndAttkInit ChalybGndAttkInit +AirAttkInit ChalybGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ChalybGndAttkInit +AirAttkRpt ChalybGndAttkInit +CastSpell [NONE] +GndAttkToIdle ChalybGndAttkToIdle +AirAttkToIdle ChalybGndAttkToIdle +Unused2 [NONE] +Walking ChalybWalking +WalkingToIdle ChalybWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ChalybWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +ChalybInit: + imgulnextid 0 42 # Chalyb Shadow (hl\fr\chalyb.grp) +ChalybGndAttkToIdle: + playfram 0x00 + goto ChalybWalkingToIdle + +ChalybWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ChalybWalkingToIdle + +ChalybDeath: + playsndbtwn 4214 4215 # Ferrum death 01, 02 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +ChalybGndAttkInit: + wait 1 + attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +ChalybWalking: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Chalyb Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +ChalybWarpIn: + imgol 2340 0 0 # Chalyb Warp Flash (hl\fr\chalyb.grp) + goto ChalybWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2341 Circitor (hl\fr\circitor.grp) +.headerstart +IsId 380 +Type 21 +Init CircitorInit +Death CircitorDeath +GndAttkInit CircitorGndAttkInit +AirAttkInit CircitorGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt CircitorGndAttkInit +AirAttkRpt CircitorGndAttkInit +CastSpell [NONE] +GndAttkToIdle CircitorGndAttkToIdle +AirAttkToIdle CircitorGndAttkToIdle +Unused2 [NONE] +Walking CircitorWalking +WalkingToIdle CircitorWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn CircitorWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +CircitorInit: + imgulnextid 0 42 # Circitor Shadow (hl\fr\circitor.grp) +CircitorGndAttkToIdle: + playfram 0x00 + goto CircitorWalkingToIdle + +CircitorWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto CircitorWalkingToIdle + +CircitorDeath: + playsndbtwn 4214 4215 # Ferrum death 01, 02 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +CircitorGndAttkInit: + wait 1 + attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +CircitorWalking: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Circitor Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +CircitorWarpIn: + imgol 2343 0 0 # Circitor Warp Flash (hl\fr\circitor.grp) + goto CircitorWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2344 Exigo (hl\fr\exigo.grp) +.headerstart +IsId 381 +Type 21 +Init ExigoInit +Death ExigoDeath +GndAttkInit ExigoGndAttkInit +AirAttkInit ExigoGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ExigoGndAttkInit +AirAttkRpt ExigoGndAttkInit +CastSpell [NONE] +GndAttkToIdle ExigoGndAttkToIdle +AirAttkToIdle ExigoGndAttkToIdle +Unused2 [NONE] +Walking ExigoWalking +WalkingToIdle ExigoWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn ExigoWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +ExigoInit: + imgulnextid 0 42 # Exigo Shadow (hl\fr\exigo.grp) +ExigoGndAttkToIdle: + playfram 0x00 + goto ExigoWalkingToIdle + +ExigoWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ExigoWalkingToIdle + +ExigoDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp) + wait 1 + end + +ExigoGndAttkInit: + wait 1 + nobrkcodestart + attack + wait 6 + attack + wait 6 + attack + wait 6 + attack + wait 6 + attack + wait 2 + nobrkcodeend + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +ExigoWalking: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Exigo Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +ExigoWarpIn: + imgol 2346 0 0 # Exigo Warp Flash (hl\fr\exigo.grp) + goto ExigoWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2350 Vicere (hl\fr\vicere.grp) +.headerstart +IsId 382 +Type 21 +Init VicereInit +Death VicereDeath +GndAttkInit VicereGndAttkInit +AirAttkInit VicereGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt VicereGndAttkInit +AirAttkRpt VicereGndAttkInit +CastSpell [NONE] +GndAttkToIdle VicereGndAttkToIdle +AirAttkToIdle VicereGndAttkToIdle +Unused2 [NONE] +Walking VicereWalking +WalkingToIdle VicereWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn VicereWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +VicereInit: + imgulnextid 0 42 # Vicere Shadow (hl\fr\vicere.grp) +VicereGndAttkToIdle: + playfram 0x00 + goto VicereWalkingToIdle + +VicereWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto VicereWalkingToIdle + +VicereDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1007 0 0 # Askosi Structure Rubble (Small) (cm\a\a-rubble-small.grp) + wait 1 + end + +VicereGndAttkInit: + wait 1 + attack + attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +VicereWalking: + playfram 0x00 + setvertpos 0 +# imgol 142 0 0 # Vicere Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +VicereWarpIn: + imgol 2352 0 0 # Vicere Warp Flash (hl\fr\vicere.grp) + goto VicereWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2347 Athla (hl\fr\athla.grp) +.headerstart +IsId 383 +Type 15 +Init AthlaInit +Death AthlaDeath +GndAttkInit AthlaGndAttkInit +AirAttkInit AthlaGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt AthlaGndAttkInit +AirAttkRpt AthlaGndAttkInit +CastSpell [NONE] +GndAttkToIdle AthlaGndAttkToIdle +AirAttkToIdle AthlaGndAttkToIdle +Unused2 [NONE] +Walking AthlaWalking +WalkingToIdle AthlaGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt AthlaAlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +AthlaInit: + imgulnextid 0 42 # Athla Shadow (hl\fr\athla.grp) + playfram 0x00 + wait 2 +AthlaGndAttkToIdle: + playfram 0x00 + goto AthlaLocal69 +AthlaLocal69: + setvertpos 0 + wait 8 + setvertpos 1 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + goto AthlaLocal69 + +AthlaDeath: + playsndbtwn 4214 4215 # Ferrum death 01, 02 + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +AthlaGndAttkInit: + wait 1 +# attack + wait 2 + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +AthlaWalking: + setvertpos 0 + playfram 0x00 +# imgol 142 0 0 # Athla Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +AthlaWalkingToIdle: + playfram 0x00 + setvertpos 0 + goto SkryrokorLocal00 + +AthlaAlmostBuilt: + setvertpos 0 + playfram 0x00 + wait 1 +AthlaLocal00: + playfram 0x00 + useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) + sigorder 32 + wait 1 + playfram 0x00 + wait 1 + playfram 0x00 + wait 10 + playfram 0x00 + wait 1 + goto AthlaLocal00 + +AthlaWarpIn: + imgol 2349 0 0 # Athla Warp Flash (hl\fr\athla.grp) + goto AthlaGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2353 Machinamentum (hl\fr\machinamentum.grp) +.headerstart +IsId 384 +Type 27 +Init MachinamentumInit +Death MachinamentumDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 MachinamentumSpecialState1 +SpecialState2 MachinamentumSpecialState2 +AlmostBuilt MachinamentumAlmostBuilt +Built SkryrokorLocal00 +Landing [NONE] +LiftOff [NONE] +IsWorking MachinamentumIsWorking +WorkingToIdle MachinamentumWorkingToIdle +WarpIn MachinamentumAlmostBuilt +Unused3 [NONE] +StarEditInit [NONE] +Disable MachinamentumDisable +Burrow [NONE] +UnBurrow [NONE] +Enable MachinamentumEnable +.headerend +# ----------------------------------------------------------------------------- # + +MachinamentumInit: + imgulnextid 0 0 # Machinamentum Shadow (hl\fr\machinamentum-shadow.grp) + playfram 0 + wait 2 + goto SkryrokorLocal00 + +MachinamentumDeath: + playsndbtwn 4148 4150 # Askosi explosion large 01, 02, 03 + imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) + wait 3 + lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp) + wait 1 + end + +MachinamentumSpecialState1: + playsnd 528 # Protoss\SHUTTLE\pshBld00.wav + wait 1 + goto MachinamentumLocal00 + +MachinamentumLocal00: + wait 255 + goto MachinamentumLocal00 + +MachinamentumSpecialState2: + wait 1 + goto MachinamentumWorkingToIdle + +MachinamentumWorkingToIdle: + playfram 0 + goto SkryrokorLocal00 + +MachinamentumAlmostBuilt: + imgol 2355 0 0 # Machinamentum Warp Flash (hl\fr\machinamentum.grp) + goto SkryrokorLocal00 + +MachinamentumIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 0 + wait 3 + goto MachinamentumIsWorking + +MachinamentumDisable: + playfram 0 + wait 1 + goto SkryrokorLocal00 + +MachinamentumEnable: + playfram 0 + wait 1 + goto MachinamentumWorkingToIdle \ No newline at end of file diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index c36c4346..e39363c6 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 762fdf3e..fde9c1e0 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -15702,7 +15702,6 @@ AshguardWarpIn: imgol 2161 0 0 # Ashguard Warp Flash (cm\faction-p\ashguard.grp) goto AshguardWalkingToIdle - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 449 Herald Glow (cm\protoss\herald-glow.grp) @@ -15723,4 +15722,91 @@ HeraldGlowInit: wait 1 playfram 0x60 wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2333 Pathlight (protoss\panoptus.grp) +.headerstart +IsId 735 +Type 21 +Init PathlightInit +Death PathlightDeath +GndAttkInit PathlightGndAttkInit +AirAttkInit PathlightGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt PathlightGndAttkInit +AirAttkRpt PathlightGndAttkInit +CastSpell [NONE] +GndAttkToIdle PathlightGndAttkToIdle +AirAttkToIdle PathlightGndAttkToIdle +Unused2 [NONE] +Walking PathlightWalking +WalkingToIdle PathlightWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn PathlightWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +PathlightInit: + imgulnextid 0 42 # Pathlight Shadow (cm\protoss\panoptus.grp) +PathlightGndAttkToIdle: + playfram 0x00 + goto PathlightWalkingToIdle + +PathlightWalkingToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto PathlightWalkingToIdle + +PathlightDeath: + playsnd 533 # Protoss\Pathlight\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 846 0 42 # Protoss Unit Rubble Medium + wait 1 + end + +PathlightGndAttkInit: + wait 1 + nobrkcodestart + wait 1 + playfram 0x20 + playsndbtwn 2020 2023 # Pathlight weaponfire 01, 02, 03, 04 + attack + wait 2 + playfram 0x00 + wait 4 + playfram 0x20 + playsndbtwn 2020 2023 # Pathlight weaponfire 01, 02, 03, 04 + attack + wait 2 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SkryrokorLocal00 + +PathlightWalking: + playfram 0x00 + setvertpos 0 + imgol 142 0 0 # Pathlight Engines (thingy\pscGlow.grp) + goto SkryrokorLocal00 + +PathlightWarpIn: + imgol 143 0 0 # Pathlight Warp Flash (cm\protoss\panoptus.grp) + goto PathlightWalkingToIdle \ No newline at end of file diff --git a/mpq/sound/cm/a/alacyne/wf-01.wav b/mpq/sound/cm/a/alacyne/wf-01.wav new file mode 100644 index 00000000..b8c6b3f6 Binary files /dev/null and b/mpq/sound/cm/a/alacyne/wf-01.wav differ diff --git a/mpq/sound/cm/a/alacyne/wf-02.wav b/mpq/sound/cm/a/alacyne/wf-02.wav new file mode 100644 index 00000000..39c70148 Binary files /dev/null and b/mpq/sound/cm/a/alacyne/wf-02.wav differ diff --git a/mpq/sound/cm/a/alacyne/wf-03.wav b/mpq/sound/cm/a/alacyne/wf-03.wav new file mode 100644 index 00000000..3f6aa1c0 Binary files /dev/null and b/mpq/sound/cm/a/alacyne/wf-03.wav differ diff --git a/mpq/sound/cm/a/cloak-askosi-off.wav b/mpq/sound/cm/a/cloak-askosi-off.wav new file mode 100644 index 00000000..54248160 Binary files /dev/null and b/mpq/sound/cm/a/cloak-askosi-off.wav differ diff --git a/mpq/sound/cm/a/cloak-askosi-on.wav b/mpq/sound/cm/a/cloak-askosi-on.wav new file mode 100644 index 00000000..e69bfeff Binary files /dev/null and b/mpq/sound/cm/a/cloak-askosi-on.wav differ diff --git a/mpq/sound/cm/a/elgird/wf-01.wav b/mpq/sound/cm/a/elgird/wf-01.wav new file mode 100644 index 00000000..e86e8bc4 Binary files /dev/null and b/mpq/sound/cm/a/elgird/wf-01.wav differ diff --git a/mpq/sound/cm/a/elgird/wf-02.wav b/mpq/sound/cm/a/elgird/wf-02.wav new file mode 100644 index 00000000..a46614c3 Binary files /dev/null and b/mpq/sound/cm/a/elgird/wf-02.wav differ diff --git a/mpq/sound/cm/a/elgird/wf-03.wav b/mpq/sound/cm/a/elgird/wf-03.wav new file mode 100644 index 00000000..c9a91cd9 Binary files /dev/null and b/mpq/sound/cm/a/elgird/wf-03.wav differ diff --git a/mpq/sound/cm/a/elgird/wf-04.wav b/mpq/sound/cm/a/elgird/wf-04.wav new file mode 100644 index 00000000..297ee6c2 Binary files /dev/null and b/mpq/sound/cm/a/elgird/wf-04.wav differ diff --git a/mpq/sound/cm/a/ghostwrit/wf-01.wav b/mpq/sound/cm/a/ghostwrit/wf-01.wav new file mode 100644 index 00000000..a0c66a20 Binary files /dev/null and b/mpq/sound/cm/a/ghostwrit/wf-01.wav differ diff --git a/mpq/sound/cm/a/ghostwrit/wf-02.wav b/mpq/sound/cm/a/ghostwrit/wf-02.wav new file mode 100644 index 00000000..7bf106f6 Binary files /dev/null and b/mpq/sound/cm/a/ghostwrit/wf-02.wav differ diff --git a/mpq/sound/cm/a/ghostwrit/wf-03.wav b/mpq/sound/cm/a/ghostwrit/wf-03.wav new file mode 100644 index 00000000..c7d286d0 Binary files /dev/null and b/mpq/sound/cm/a/ghostwrit/wf-03.wav differ diff --git a/mpq/sound/cm/a/histrion/wf-01.wav b/mpq/sound/cm/a/histrion/wf-01.wav new file mode 100644 index 00000000..7579f1b5 Binary files /dev/null and b/mpq/sound/cm/a/histrion/wf-01.wav differ diff --git a/mpq/sound/cm/a/histrion/wf-02.wav b/mpq/sound/cm/a/histrion/wf-02.wav new file mode 100644 index 00000000..f9f198d1 Binary files /dev/null and b/mpq/sound/cm/a/histrion/wf-02.wav differ diff --git a/mpq/sound/cm/a/histrion/wf-03.wav b/mpq/sound/cm/a/histrion/wf-03.wav new file mode 100644 index 00000000..709c053e Binary files /dev/null and b/mpq/sound/cm/a/histrion/wf-03.wav differ diff --git a/mpq/sound/cm/a/insurant/wf-01.wav b/mpq/sound/cm/a/insurant/wf-01.wav new file mode 100644 index 00000000..0f625aa7 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-01.wav differ diff --git a/mpq/sound/cm/a/insurant/wf-02.wav b/mpq/sound/cm/a/insurant/wf-02.wav new file mode 100644 index 00000000..e9357f81 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-02.wav differ diff --git a/mpq/sound/cm/a/insurant/wf-03.wav b/mpq/sound/cm/a/insurant/wf-03.wav new file mode 100644 index 00000000..73e4fc63 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-03.wav differ diff --git a/mpq/sound/cm/a/silversoul/wf-01.wav b/mpq/sound/cm/a/silversoul/wf-01.wav new file mode 100644 index 00000000..9d9489ea Binary files /dev/null and b/mpq/sound/cm/a/silversoul/wf-01.wav differ diff --git a/mpq/sound/cm/a/silversoul/wf-02.wav b/mpq/sound/cm/a/silversoul/wf-02.wav new file mode 100644 index 00000000..2f1a849b Binary files /dev/null and b/mpq/sound/cm/a/silversoul/wf-02.wav differ diff --git a/mpq/sound/cm/a/silversoul/wf-03.wav b/mpq/sound/cm/a/silversoul/wf-03.wav new file mode 100644 index 00000000..ecaab339 Binary files /dev/null and b/mpq/sound/cm/a/silversoul/wf-03.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-01.wav b/mpq/sound/cm/t/eidolon/windup-01.wav index 0065a801..5a5424ba 100644 Binary files a/mpq/sound/cm/t/eidolon/windup-01.wav and b/mpq/sound/cm/t/eidolon/windup-01.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-02.wav b/mpq/sound/cm/t/eidolon/windup-02.wav index 09fe0376..94b60be3 100644 Binary files a/mpq/sound/cm/t/eidolon/windup-02.wav and b/mpq/sound/cm/t/eidolon/windup-02.wav differ diff --git a/mpq/sound/cm/t/eidolon/windup-03.wav b/mpq/sound/cm/t/eidolon/windup-03.wav index 16267883..24021806 100644 Binary files a/mpq/sound/cm/t/eidolon/windup-03.wav and b/mpq/sound/cm/t/eidolon/windup-03.wav differ diff --git a/mpq/sound/cm/z/cloak-zerg-off.wav b/mpq/sound/cm/z/cloak-zerg-off.wav new file mode 100644 index 00000000..e51004ce Binary files /dev/null and b/mpq/sound/cm/z/cloak-zerg-off.wav differ diff --git a/mpq/sound/cm/z/cloak-zerg-on.wav b/mpq/sound/cm/z/cloak-zerg-on.wav new file mode 100644 index 00000000..c804782d Binary files /dev/null and b/mpq/sound/cm/z/cloak-zerg-on.wav differ diff --git a/mpq/sound/hl/fr/exigo/wf-01.wav b/mpq/sound/hl/fr/exigo/wf-01.wav new file mode 100644 index 00000000..d8b3b3dc Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-01.wav differ diff --git a/mpq/sound/hl/fr/exigo/wf-02.wav b/mpq/sound/hl/fr/exigo/wf-02.wav new file mode 100644 index 00000000..a5400198 Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-02.wav differ diff --git a/mpq/sound/hl/fr/exigo/wf-03.wav b/mpq/sound/hl/fr/exigo/wf-03.wav new file mode 100644 index 00000000..d995e749 Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-03.wav differ diff --git a/mpq/sound/hl/fr/exigo/wf-04.wav b/mpq/sound/hl/fr/exigo/wf-04.wav new file mode 100644 index 00000000..fd96ed3a Binary files /dev/null and b/mpq/sound/hl/fr/exigo/wf-04.wav differ diff --git a/mpq/sound/hl/fr/ferrum/dth-01.wav b/mpq/sound/hl/fr/ferrum/dth-01.wav new file mode 100644 index 00000000..23f1d96f Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/dth-01.wav differ diff --git a/mpq/sound/hl/fr/ferrum/dth-02.wav b/mpq/sound/hl/fr/ferrum/dth-02.wav new file mode 100644 index 00000000..4a8c6d76 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/dth-02.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wf-01.wav b/mpq/sound/hl/fr/ferrum/wf-01.wav new file mode 100644 index 00000000..7165c369 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wf-01.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wf-02.wav b/mpq/sound/hl/fr/ferrum/wf-02.wav new file mode 100644 index 00000000..fe3d4e56 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wf-02.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wf-03.wav b/mpq/sound/hl/fr/ferrum/wf-03.wav new file mode 100644 index 00000000..b8144005 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wf-03.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wh-01.wav b/mpq/sound/hl/fr/ferrum/wh-01.wav new file mode 100644 index 00000000..d6f3cb80 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-01.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wh-02.wav b/mpq/sound/hl/fr/ferrum/wh-02.wav new file mode 100644 index 00000000..e15e2bd0 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-02.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wh-03.wav b/mpq/sound/hl/fr/ferrum/wh-03.wav new file mode 100644 index 00000000..c8ffc852 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-03.wav differ diff --git a/mpq/sound/hl/fr/ferrum/wh-04.wav b/mpq/sound/hl/fr/ferrum/wh-04.wav new file mode 100644 index 00000000..ed67bb77 Binary files /dev/null and b/mpq/sound/hl/fr/ferrum/wh-04.wav differ diff --git a/mpq/sound/hl/fr/vicere/wf-01.wav b/mpq/sound/hl/fr/vicere/wf-01.wav new file mode 100644 index 00000000..4b9d2d71 Binary files /dev/null and b/mpq/sound/hl/fr/vicere/wf-01.wav differ diff --git a/mpq/sound/hl/fr/vicere/wf-02.wav b/mpq/sound/hl/fr/vicere/wf-02.wav new file mode 100644 index 00000000..5cd3b146 Binary files /dev/null and b/mpq/sound/hl/fr/vicere/wf-02.wav differ diff --git a/mpq/unit/cm/a/alacyne-engine.grp b/mpq/unit/cm/a/alacyne-engine.grp new file mode 100644 index 00000000..3cc44546 Binary files /dev/null and b/mpq/unit/cm/a/alacyne-engine.grp differ diff --git a/mpq/unit/cm/a/alacyne.grp b/mpq/unit/cm/a/alacyne.grp new file mode 100644 index 00000000..19746db6 Binary files /dev/null and b/mpq/unit/cm/a/alacyne.grp differ diff --git a/mpq/unit/cm/a/egocent.grp b/mpq/unit/cm/a/egocent.grp new file mode 100644 index 00000000..26c4bb1f Binary files /dev/null and b/mpq/unit/cm/a/egocent.grp differ diff --git a/mpq/unit/cm/a/elgird-engine.grp b/mpq/unit/cm/a/elgird-engine.grp new file mode 100644 index 00000000..f5a4bea8 Binary files /dev/null and b/mpq/unit/cm/a/elgird-engine.grp differ diff --git a/mpq/unit/cm/a/elgird.grp b/mpq/unit/cm/a/elgird.grp new file mode 100644 index 00000000..c9062559 Binary files /dev/null and b/mpq/unit/cm/a/elgird.grp differ diff --git a/mpq/unit/cm/a/ghostwrit-attack.lol b/mpq/unit/cm/a/ghostwrit-attack.lol new file mode 100644 index 00000000..a161c9a2 Binary files /dev/null and b/mpq/unit/cm/a/ghostwrit-attack.lol differ diff --git a/mpq/unit/cm/a/ghostwrit-shadow.grp b/mpq/unit/cm/a/ghostwrit-shadow.grp new file mode 100644 index 00000000..754ba191 Binary files /dev/null and b/mpq/unit/cm/a/ghostwrit-shadow.grp differ diff --git a/mpq/unit/cm/a/ghostwrit.grp b/mpq/unit/cm/a/ghostwrit.grp new file mode 100644 index 00000000..7d5755b6 Binary files /dev/null and b/mpq/unit/cm/a/ghostwrit.grp differ diff --git a/mpq/unit/cm/a/hearthshard-damage.lof b/mpq/unit/cm/a/hearthshard-damage.lof new file mode 100644 index 00000000..379d24aa Binary files /dev/null and b/mpq/unit/cm/a/hearthshard-damage.lof differ diff --git a/mpq/unit/cm/a/hearthshard-shadow.grp b/mpq/unit/cm/a/hearthshard-shadow.grp new file mode 100644 index 00000000..c6fa5d4f Binary files /dev/null and b/mpq/unit/cm/a/hearthshard-shadow.grp differ diff --git a/mpq/unit/cm/a/hearthshard.grp b/mpq/unit/cm/a/hearthshard.grp new file mode 100644 index 00000000..c1b5c7d0 Binary files /dev/null and b/mpq/unit/cm/a/hearthshard.grp differ diff --git a/mpq/unit/cm/a/histrion-engine.grp b/mpq/unit/cm/a/histrion-engine.grp new file mode 100644 index 00000000..7c7718bb Binary files /dev/null and b/mpq/unit/cm/a/histrion-engine.grp differ diff --git a/mpq/unit/cm/a/histrion.grp b/mpq/unit/cm/a/histrion.grp new file mode 100644 index 00000000..0232bcf4 Binary files /dev/null and b/mpq/unit/cm/a/histrion.grp differ diff --git a/mpq/unit/cm/a/insurant-shadow.grp b/mpq/unit/cm/a/insurant-shadow.grp new file mode 100644 index 00000000..195495d8 Binary files /dev/null and b/mpq/unit/cm/a/insurant-shadow.grp differ diff --git a/mpq/unit/cm/a/insurant.grp b/mpq/unit/cm/a/insurant.grp new file mode 100644 index 00000000..4f6adfb5 Binary files /dev/null and b/mpq/unit/cm/a/insurant.grp differ diff --git a/mpq/unit/cm/a/lekrot-damage.lof b/mpq/unit/cm/a/lekrot-damage.lof new file mode 100644 index 00000000..0028e287 Binary files /dev/null and b/mpq/unit/cm/a/lekrot-damage.lof differ diff --git a/mpq/unit/cm/a/lekrot-shadow.grp b/mpq/unit/cm/a/lekrot-shadow.grp new file mode 100644 index 00000000..3681ecc2 Binary files /dev/null and b/mpq/unit/cm/a/lekrot-shadow.grp differ diff --git a/mpq/unit/cm/a/lekrot.grp b/mpq/unit/cm/a/lekrot.grp index 3e36ce02..802663bf 100644 Binary files a/mpq/unit/cm/a/lekrot.grp and b/mpq/unit/cm/a/lekrot.grp differ diff --git a/mpq/unit/cm/a/missionary.grp b/mpq/unit/cm/a/missionary.grp index 4361ce32..4e093426 100644 Binary files a/mpq/unit/cm/a/missionary.grp and b/mpq/unit/cm/a/missionary.grp differ diff --git a/mpq/unit/cm/a/silversoul-attack.lol b/mpq/unit/cm/a/silversoul-attack.lol new file mode 100644 index 00000000..7719b777 Binary files /dev/null and b/mpq/unit/cm/a/silversoul-attack.lol differ diff --git a/mpq/unit/cm/a/silversoul-remains.grp b/mpq/unit/cm/a/silversoul-remains.grp new file mode 100644 index 00000000..df630496 Binary files /dev/null and b/mpq/unit/cm/a/silversoul-remains.grp differ diff --git a/mpq/unit/cm/a/silversoul-shadow.grp b/mpq/unit/cm/a/silversoul-shadow.grp new file mode 100644 index 00000000..cc08bc5c Binary files /dev/null and b/mpq/unit/cm/a/silversoul-shadow.grp differ diff --git a/mpq/unit/cm/a/silversoul.grp b/mpq/unit/cm/a/silversoul.grp new file mode 100644 index 00000000..c2e3af72 Binary files /dev/null and b/mpq/unit/cm/a/silversoul.grp differ diff --git a/mpq/unit/cm/a/vicar-attack.lol b/mpq/unit/cm/a/vicar-attack.lol index f3993117..1a4a38d6 100644 Binary files a/mpq/unit/cm/a/vicar-attack.lol and b/mpq/unit/cm/a/vicar-attack.lol differ diff --git a/mpq/unit/cm/a/vicar-shadow.grp b/mpq/unit/cm/a/vicar-shadow.grp index 71559904..19d6bb30 100644 Binary files a/mpq/unit/cm/a/vicar-shadow.grp and b/mpq/unit/cm/a/vicar-shadow.grp differ diff --git a/mpq/unit/cm/a/vicar.grp b/mpq/unit/cm/a/vicar.grp index 1a3bc24f..6f83fdb8 100644 Binary files a/mpq/unit/cm/a/vicar.grp and b/mpq/unit/cm/a/vicar.grp differ diff --git a/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp b/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp new file mode 100644 index 00000000..149d0258 Binary files /dev/null and b/mpq/unit/cm/n/big-infested-kerrigan-shadow.grp differ diff --git a/mpq/unit/cm/n/big-infested-kerrigan.grp b/mpq/unit/cm/n/big-infested-kerrigan.grp new file mode 100644 index 00000000..757434fc Binary files /dev/null and b/mpq/unit/cm/n/big-infested-kerrigan.grp differ diff --git a/mpq/unit/cm/t/autocrat-shadow.grp b/mpq/unit/cm/t/autocrat-shadow.grp index 3b9b7f4e..24684d47 100644 Binary files a/mpq/unit/cm/t/autocrat-shadow.grp and b/mpq/unit/cm/t/autocrat-shadow.grp differ diff --git a/mpq/unit/cm/t/autocrat.grp b/mpq/unit/cm/t/autocrat.grp index f54503b7..b2e48356 100644 Binary files a/mpq/unit/cm/t/autocrat.grp and b/mpq/unit/cm/t/autocrat.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 8b79a3b7..a8a1092c 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 d0b0abf3..0e6a1da2 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/hl/fr/athla-special.loo b/mpq/unit/hl/fr/athla-special.loo new file mode 100644 index 00000000..d5a92432 Binary files /dev/null and b/mpq/unit/hl/fr/athla-special.loo differ diff --git a/mpq/unit/hl/fr/athla.grp b/mpq/unit/hl/fr/athla.grp new file mode 100644 index 00000000..f05a9d09 Binary files /dev/null and b/mpq/unit/hl/fr/athla.grp differ diff --git a/mpq/unit/hl/fr/chalyb-attack.lol b/mpq/unit/hl/fr/chalyb-attack.lol new file mode 100644 index 00000000..fd115a17 Binary files /dev/null and b/mpq/unit/hl/fr/chalyb-attack.lol differ diff --git a/mpq/unit/hl/fr/chalyb.grp b/mpq/unit/hl/fr/chalyb.grp new file mode 100644 index 00000000..625491fb Binary files /dev/null and b/mpq/unit/hl/fr/chalyb.grp differ diff --git a/mpq/unit/hl/fr/circitor-attack.lol b/mpq/unit/hl/fr/circitor-attack.lol new file mode 100644 index 00000000..cd3b83d9 Binary files /dev/null and b/mpq/unit/hl/fr/circitor-attack.lol differ diff --git a/mpq/unit/hl/fr/circitor.grp b/mpq/unit/hl/fr/circitor.grp new file mode 100644 index 00000000..bc798524 Binary files /dev/null and b/mpq/unit/hl/fr/circitor.grp differ diff --git a/mpq/unit/hl/fr/exigo-attack1.lol b/mpq/unit/hl/fr/exigo-attack1.lol new file mode 100644 index 00000000..6a020fda Binary files /dev/null and b/mpq/unit/hl/fr/exigo-attack1.lol differ diff --git a/mpq/unit/hl/fr/exigo-attack2.lol b/mpq/unit/hl/fr/exigo-attack2.lol new file mode 100644 index 00000000..c3cef8c9 Binary files /dev/null and b/mpq/unit/hl/fr/exigo-attack2.lol differ diff --git a/mpq/unit/hl/fr/exigo.grp b/mpq/unit/hl/fr/exigo.grp new file mode 100644 index 00000000..7cf0dc52 Binary files /dev/null and b/mpq/unit/hl/fr/exigo.grp differ diff --git a/mpq/unit/hl/fr/ferrum-attack.lol b/mpq/unit/hl/fr/ferrum-attack.lol new file mode 100644 index 00000000..4f276141 Binary files /dev/null and b/mpq/unit/hl/fr/ferrum-attack.lol differ diff --git a/mpq/unit/hl/fr/ferrum.grp b/mpq/unit/hl/fr/ferrum.grp new file mode 100644 index 00000000..9ccae6f2 Binary files /dev/null and b/mpq/unit/hl/fr/ferrum.grp differ diff --git a/mpq/unit/hl/fr/machinamentum-damage.lof b/mpq/unit/hl/fr/machinamentum-damage.lof new file mode 100644 index 00000000..a800f3a5 Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum-damage.lof differ diff --git a/mpq/unit/hl/fr/machinamentum-shadow.grp b/mpq/unit/hl/fr/machinamentum-shadow.grp new file mode 100644 index 00000000..15ef31ac Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum-shadow.grp differ diff --git a/mpq/unit/hl/fr/machinamentum.grp b/mpq/unit/hl/fr/machinamentum.grp new file mode 100644 index 00000000..112f51b8 Binary files /dev/null and b/mpq/unit/hl/fr/machinamentum.grp differ diff --git a/mpq/unit/hl/fr/vicere-attack1.lol b/mpq/unit/hl/fr/vicere-attack1.lol new file mode 100644 index 00000000..75f51655 Binary files /dev/null and b/mpq/unit/hl/fr/vicere-attack1.lol differ diff --git a/mpq/unit/hl/fr/vicere-attack2.lol b/mpq/unit/hl/fr/vicere-attack2.lol new file mode 100644 index 00000000..ff65f1f4 Binary files /dev/null and b/mpq/unit/hl/fr/vicere-attack2.lol differ diff --git a/mpq/unit/hl/fr/vicere.grp b/mpq/unit/hl/fr/vicere.grp new file mode 100644 index 00000000..9977f80d Binary files /dev/null and b/mpq/unit/hl/fr/vicere.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index ce80835d..7dd5dbf4 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 4177121a..2663ca84 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 2d987565..34d42df8 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,156 +1,161 @@ -# 23 February 2026 -## Year 4, month 2, patch 1 +# 1 April 2026 +## Year 4, month 4, patch 1 ## Patch goals - Continue balancing for all races - Continue Askosi development - Further improve audiovisuals +- Tweak balance for all factions +- Deploy new singleplayer content - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! ### *Notes in italics are from Pr0nogo* +# Singleplayer content +- **Sovereign Saga:** + - vterran01 "Boot Camp" is now available in the campaign directory! + - [Read more about Sovereign Saga here!]() + +# Editor improvements + +## Custom resource areas: (c. DF) +- You can now override default resource areas via this tech from DF! Instructions are below. + - Draw locations around resources. + - Name the locations `RESAREA_#`, where `#` is a number between `1` and `249`. + - You can use multiple locations with the same name for the same resarea id. + - When using multiple locations, append `+` at the end of the location you intend to use for the resarea's center. If not appended, the game will choose the earliest-created location as the center. + +## Triggers +- Custom triggers which accept `unit_id` bitsets now accept a new `military` keyword that filters out workers and non-military units (e.g. traps, missiles, Stewards, etc) +- **unit_count** now accepts an additional parameter **completed** (defaults to false) for exclusively tracking completed units +- Functionality has been restored to **player_type** (r. Kenoli) +- **NEW:** `tyrannize`: + - Applies the effects of the Protoss Tyranny of the Sun cornerstone to designated units +- **NEW:** `highlight_unit`: + - Causes selection circle flickers akin to unit transmissions for designated units. + # Core changes +## Detection +- The following status effects now reveal hidden units: + - **Apollyoid Adhesive** + - **Signify** and **Hallucination** + - **Corrosive Touch** + - **Booming Blast** and **Ash Heap** + ## Game Modes -- **Omnipresence:** - - Starting worker count increased from 6 to 8 - - Human players now begin with 2 **Pilgrim**s - - **Pilgrim**s are now trainable from the **Omnivale** +- **Brotherhood:** + - Ground unit split time now 50% of training time + - Air unit split time now 100% of training time + - Shielded units now begin splitting on any damage taken ## Bugfixes -- **Stability:** - - Bandaged a crash that could occur when a Larvae dies while selected (r. shopkeeper dog) - - Bandaged a rare division by zero crash related to Psi Storm (r. ArbuzBudesh) -- **Desyncs:** - - Removed floating point math for: (c. Jesse, some a. Veeq7) - - Weapon cooldown changes - - Weapon & sight ranges - - Structure HP gain (e.g. **Askosi** teambuild cases) - - Lifesteal and shieldsteal - - Morningstar damage - - Clarion Phase Link distribution - - CPU unit / structure requests - - CPU micromanagement - **Gameplay:** - - Fixed target acquisition range for air weapons (e.g. **Nathrokor**) - - Askosi constructing has been improved (a. DF) - - Hijacked units with more than 100 current HP are no longer set to 100 HP (r. shopkeeper dog) - - Improved attack responsivity for **Akreno** (r. jakulangski) - - Corrected **Phontis** attack damage (r. Hamster) - - Fixed **Apostle - Blood Tithe** range (r. Jesse) - - **Agonists** can no longer attack from mobile **Petracts** (r. Hamster) - - Fixed **Yblyleth** command card while burrowed (r. Vilius) - - Fixed damage reliability for **Quazrokors** (r. Alexhandr) - - **Quazrokors** can now correctly target air units (r. lolrsk8s) - - Resolved unit limit error for maps with more than 1700 preplaced units (c. DF) -- **Audiovisual** - - Fixed missing animation error for **Axitrilisk** (r. Sosij) - - Fixed header too short error for large explosions (r. The Shambler) - - Fixed invalid shield overlay for **Rove** - - Corrected strings for being out of energy as Askosi (r. Sosij) - - Filled in wireframes for **Avatar** and **Phontis** (placeholder) - - Added missing **Multi-Attack III** passive button for **Starbound Manifold** (r. Concealed Organic) - - Lardfix: Civilian (Blackjack) portrait now plays talking animations (r. lolrsks8s) + - Resolved many actions that should have cancelled passive cloak, but didn't (r. shopkeeper dog) + - Fixed **Zonguard** not applying Booming Blast with Preylock (r. shopkeeper dog) + - Fixed various mnemonic hotkey conflicts for Askosi structures (r. Neblime) + - Adjusted regeneration code so rare combinations of status effects scale expectedly (c. Veeq7) +- **Audiovisuals** + - Fixed missing progress bars for **Conduit**, **Bestiary** (r. shopkeeper dog) + - Added missing **Aphorist** wireframes + - Corrected **Thaumalogue** corpse graphic ## Audiovisuals - New model for: + - Vicar +- New SFX for: + - Zerg and Askosi cloaking / decloaking (c. lolrsk8s) +- Modified SFX for: + - Eidolon windup +- New wireframe for: (c. jun3hong) - **Autocrat** -- Tweaked model for: - - **Apostle** -- New portraits for: (many c. jun3hong, some c. lolrsk8s) - - **TERRAN:** Maverick (Futurist & Upstart), Arhaun, Blackguard, Blackjack (Golden), Cleric (Futurist), Cyclops (Futurist), Harakan (Golden), Qilin, Tiangou - - **PROTOSS:** Cicatus, Dracadin (Order), Ecclesiast (Khalendric), Extatus, Manifold (Starbound), Renesair, Zealot (Starbound) - - **ZERG:** Quazrokor, Hydralisk (Orkoti) - - **ASKOSI:** Auxine -- New cast SFX for **Seraph Irradiate** -- Added almost built frame for: - - **Landlock**, **Grandstand**, **Radix** -- Added damage overlay for: - - **Landlock** # Balance changes ## Terran -- [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): - - Resource costs 75/200 » 75/150 - - Now has 150 max energy - - Now spends 5 energy every **Blood Tithe** proc - - Now spends 20 energy every **Lazarus Agent** proc - - Prioritizes **Blood Tithe** -- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): - - Resource costs 125/250 » 125/200 - - Now has 100 max energy - - Now spends 25 energy every **Reclamation Fields** proc -- [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): - - Resource costs 250/350 » 250/300 - - Now has 200 max energy - - Now spends 25 energy every **Counter-Proposal** proc -- [Aion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aion): - - Resource costs 450/450 » 450/350 - - Now has 200 max energy - - Now spends 25 energy every **Reclamation Fields** proc +- [Anvil](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anvil): + - Resource costs 200/200 » 150/150 +- [Starpad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/starpad): + - Vision range 10 » 9 ## Protoss -- [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge): - - Resource costs 200/350 » 200/300 - - Now has 100 max energy - - Now spends 10 energy every **Worship** proc +- [Zealot (Starbound)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot-starbound): + - Shields 60 » 70 +- [Cicatus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cicatus): + - HP 60 » 70 + - Shields 35 » 45 ## Zerg -- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk): - - **NEW: Avenging Mitosis:** - - Incubates on damage taken, spawning a Skryrokor after a short delay. +- [Almaksalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/almaksalisk): + - Resource costs 150/125 » 150/100 + - **Piercing Spines:** + - Armor penetration 3 » 4 + - Cooldown 0.83 » 0.75 +- [Alkag Iteth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/alkag-iteth): + - Resource costs 300/150 » 250/150 +- [Chokral Chazsal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/chokral-chazsal): + - Resource costs 750/400 » 750/500 ## Askosi -- **Hijack:** - - Now procs when a unit that is being hijacked dies - - Now restores 100 flat HP on proc -- [Pilgrim](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/pilgrim): - - Now has **Scrapworld: Gold Rush** -- [Constituent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/constituent): - - Resource costs 50/25 » 50/50 - - Build time 14 » 18 - - Movement speed 5.8 » 6.6 - - Now trained at Landlock, from Bounty - - Now requires Proscenium OR Zylode +- **Rematerialize:** + - *Used by: Eyelet (Proselyte), Vicar, Emissary* + - Now pulls allies within 3 range of the target unit +- [Proselyte](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/proselyte): + - HP 65 » 80 + - **Dispatch Pistols:** + - Armor penetration 1 » 3 +- [Cardinal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cardinal): + - Resource costs 75/50 » 75/25 +- [Mimic](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/mimic): + - Resource costs 50/100 » 50/75 +- [Thaumalogue](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/thaumalogue): + - Resource costs 100/25 » 75/25 +- [Aphorist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/aphorist): + - HP 80 » 90 +- [Doronin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/doronin): + - Resource costs 250/0 » 225/0 + - Transport weight 2 » 6 +- [Object](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/object): + - Resource costs 175/50 » 125/50 +- [Scepter](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/scepter): + - Resource costs 200/75 » 150/75 +- [Agonist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/agonist): + - HP 95 » 125 +- [Petract](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/petract): + - Resource costs 200/0 » 150/0 +- [Tirade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tirade): + - Resource costs 150/100 » 150/75 +- [Crematorium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/crematorium): + - HP 200 » 300 +- [Landlock](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/landlock): + - Resource costs 300/0 250/0 + - HP 1400 » 1250 - [Chantry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/chantry): - - **Sermon Salve:** - - Now gives units cloaking until their next attack / notable action + - Build time 35 » 45 - [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): - - Resource costs 200/300 » 150/250 - - Placement size 4x3 » 3x3 - - Collision size adjusted to better match new graphic - - **NEW: Scrapworld: Gold Rush** - - Salvages one corpse within 8 range every second -- [Proscenium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/proscenium): - - Resource costs 200/50 » 175/50 -- [Zylode](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/zylode): - - Resource costs 350/50 » 250/75 -- [Astrolabe](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/astrolabe): - - Resource costs 200/200 » 200/150 -- [Cosmoscope](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cosmoscope): - - Resource costs 100/150 » 100/100 + - HP 1200 » 800 + - Armor 4 » 3 +- [Bestiary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bestiary): + - Resource costs 500/250 » 350/250 # New units ## Askosi -- [Zonguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/zonguard): - - Tier 2 mechanized -- durable mechbeast with Preylock ability -- [Paraclete](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/paraclete): - - Tier 2 skybound -- potent skybeast with Remote Hijack ability -- [Dorminge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dorminge): - - Tier 2 infrastructure -- shrine that slows movement speed of nearby hostiles -- [Domain](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/domain) - - Tier 3 infrastructure -- town center that harvests resources passively - -## Futurist Federation -- [Cutlass](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cutlass): - - Matador replacement with Kinetic Penetration and no deployment - -## Upstart Terrans -- [Maverick (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick-upstart): - - Frailer Maverick variant with faster-acting, less intense Stimpack -- [Vulture (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture-upstart): - - Faster Vulture variant that lays [Goremast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goremast)s -- [Broadside](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/broadside): - - Phalanx replacement with Fore Castle and no deployment \ No newline at end of file +- [Insurant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/insurant) + - Tier 3 biotic -- Discerning trooper with Impact Dissipation and Scrapworld: Gold Rush +- [Silversoul](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/silversoul): + - Tier 3 biotic -- Quieting trooper with Booming Blast and cloaking field +- [Ghostwrit](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/ghostwrit): + - Tier 3 biotic -- Vengeful specialist with Puppeteer ability +- [Elgird](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/elgird): + - Tier 3 mechanized -- Interceding vehicle with Ashbind ability and Scrapworld: Implosion +- [Histrion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/histrion): + - Tier 3 mechanized -- Aggrandizing vehicle with Rematerialize; creates [Egocents](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/egocent) when taking damage +- [Alacyne](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/alacyne): + - Tier 3 mechanized -- Overpowering vehicle with Power Overload and Impact Prevarication +- [Panoply](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/panoply): + - Tier 3 biotic -- Superb production +- [Lotiro](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/lotiro): + - Tier 3 mechanized -- Superb production +- [Lekrot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/lekrot): + - Tier 3 technology -- Manipulation relay \ No newline at end of file diff --git a/plugins/aise.qdp b/plugins/aise.qdp index e4378d43..d9991fd8 100644 Binary files a/plugins/aise.qdp and b/plugins/aise.qdp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 1cb64953..0b73ccf8 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ