diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 3c342851..16acec61 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 ce2f8236..2d11a1b2 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -703,7 +703,7 @@ Endbore Electricity Rozirokor Zytryleth Camazotz -Extended Flingy #497 +Grimoire Extended Flingy #498 Extended Flingy #499 Extended Flingy #500 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 843229c3..9023ed1d 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 8d3d4c55..604e972e 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 482de530..005635d7 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2413,14 +2413,14 @@ Zytryleth Shadow Inzorthrokor Mutate Camazotz Camazotz Shadow -Extended Image #1413 -Extended Image #1414 -Extended Image #1415 -Extended Image #1416 -Extended Image #1417 -Extended Image #1418 -Extended Image #1419 -Extended Image #1420 +Grimoire +Grimoire Shadow +Bloodsummon Building Rubble Small +Bloodsummon Building Rubble Large +Bloodsummon Unit Rubble Tiny +Bloodsummon Unit Rubble Small +Bloodsummon Unit Rubble Medium +Bloodsummon Ritual Extended Image #1421 Extended Image #1422 Extended Image #1423 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index c4fba298..09673abf 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 5f248b1e..00eaee39 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 28abb5e8..1bfd920b 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -307,7 +307,7 @@ Boyeau Ferrum Prophet 1 Prophet 2 -Extended Portrait #200 +Bloodsummon Advisor Extended Portrait #201 Extended Portrait #202 Extended Portrait #203 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 93eee172..b92cdb51 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 8558fa30..db5e2037 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4267,10 +4267,10 @@ Rozirokor Weaponfire 02 Rozirokor Weaponhit 01 Rozirokor Weaponhit 02 Rozirokor Weaponhit 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Bloodsummon Load 01 +Bloodsummon Unload 01 +Grimoire Selected 01 +Grimoire Passive 01 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 19040c0b..e98e5322 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4266,4 +4266,8 @@ cm\f-z\rozirokor\wf-01.wav cm\f-z\rozirokor\wf-02.wav cm\f-z\rozirokor\wh-01.wav cm\f-z\rozirokor\wh-02.wav -cm\f-z\rozirokor\wh-03.wav \ No newline at end of file +cm\f-z\rozirokor\wh-03.wav +cm\b\b-load-01.wav +cm\b\b-unload-01.wav +cm\b\grimoire\wht-01.wav +cm\b\grimoire\pas-proc-01.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 6496a2c2..c83feea6 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 a04eb597..8644561f 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1162,12 +1162,12 @@ Rozirokor Rozirokor Remains Zytryleth Camazotz -Extended Sprite #648 -Extended Sprite #649 -Extended Sprite #650 -Extended Sprite #651 -Extended Sprite #652 -Extended Sprite #653 +Grimoire +Bloodsummon Rubble Small +Bloodsummon Rubble Large +Bloodsummon Unit Rubble Tiny +Bloodsummon Unit Rubble Small +Bloodsummon Unit Rubble Medium Extended Sprite #654 Extended Sprite #655 Extended Sprite #656 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 7e43aae5..14efdef1 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/upgrades.datex b/mpq/arr/upgrades.datex index cfcee2aa..dd8670fc 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 36336578..df07e731 100644 --- a/mpq/arr/upgrades.txt +++ b/mpq/arr/upgrades.txt @@ -61,9 +61,9 @@ Terran Structure Armor GlobalUpgrade60 Forerunner Alloy Forerunner Lattice -Extended Upgrade #3 -Extended Upgrade #4 -Extended Upgrade #5 +Bloodsummon Stigmata +Bloodsummon Atar +Bloodsummon Sacrament Extended Upgrade #6 Extended Upgrade #7 Extended Upgrade #8 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 6568ceaf..1d44c461 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/portrait/b/advisor/fid00.smk b/mpq/portrait/b/advisor/fid00.smk new file mode 100644 index 00000000..4ca4c045 Binary files /dev/null and b/mpq/portrait/b/advisor/fid00.smk differ diff --git a/mpq/portrait/b/advisor/fid01.smk b/mpq/portrait/b/advisor/fid01.smk new file mode 100644 index 00000000..b26267cc Binary files /dev/null and b/mpq/portrait/b/advisor/fid01.smk differ diff --git a/mpq/portrait/b/advisor/tlk00.smk b/mpq/portrait/b/advisor/tlk00.smk new file mode 100644 index 00000000..b8d1feca Binary files /dev/null and b/mpq/portrait/b/advisor/tlk00.smk differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 73ca8446..d52f886b 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -1017,9 +1017,9 @@ Zytryleth Requires:<10> Othstol Oviform<0> <0> <0> <0> +Bloodsummon Stigmata<0> <0> -<0> -<0> +Bloodsummon Sacrament<0> ¤<3><4>Ambush Agent <2>(passive)<10>While burrowed, Scrylyleths act as garrisons, allowing its cargo to attack with bonus weapon range.<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> @@ -1335,7 +1335,7 @@ Must target units with energy.<0> <0> <0> <0> -<0> +¤<3><4>Necromastery <2>(passive)<10>The Grimoire can pay host to a single allied combatant. When other combatants of the same type die, a new one begins training at the Grimoire, free of cost.<0> ¤<3><4>Tragyle's Coagulants <2>(passive)<10>Victims of the Camazotz's attacks react favorably to the serum within, and bleed a miasma that restores 3 HP to allies of the Harakan within 2 range.<0> f<1><4>Train Camazotz <1>(<3>F<1>)<10>Sustaining infantry.<0> ¤<3><4>Seething Dominion <2>(passive)<10>Zytryleths cannot move once hatched, and launch their Omnispores at all targets within their weapon range.<0> diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 778d1e76..f7e4aba8 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_bloodsummon.bin b/mpq/scripts/iscript_bloodsummon.bin index 1d2d2798..b8164922 100644 Binary files a/mpq/scripts/iscript_bloodsummon.bin and b/mpq/scripts/iscript_bloodsummon.bin differ diff --git a/mpq/scripts/iscript_bloodsummon.txt b/mpq/scripts/iscript_bloodsummon.txt index 2f5fc391..0ec3187f 100644 --- a/mpq/scripts/iscript_bloodsummon.txt +++ b/mpq/scripts/iscript_bloodsummon.txt @@ -173,4 +173,512 @@ Engines_GlowHeaderInit: wait 1 engset 1 wait 1 - goto Engines_GlowHeaderInit \ No newline at end of file + goto Engines_GlowHeaderInit + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 110 Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) +# 111 Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) +# 216 Protoss Building Rubble (Small) (thingy\PRubbleS.grp) +# 217 Protoss Building Rubble (Large) (thingy\PRubbleL.grp) +# 335 Terran Building Rubble (Small) (thingy\RubbleS.grp) +# 336 Terran Building Rubble (Large) (thingy\RubbleL.grp) +# 1707 Terran Unit Rubble (Medium) (cm\terran\rubble-unit-medium.grp) +# 1708 Terran Unit Rubble (Small) (cm\terran\rubble-unit-small.grp) +# 1709 Protoss Unit Rubble (Medium) (cm\protoss\rubble-unit-medium.grp) +# 1710 Protoss Unit Rubble (Small) (cm\protoss\rubble-unit-small.grp) +# 1711 Zerg Unit Rubble (Medium) (cm\zerg\rubble-unit-medium.grp) +# 1712 Zerg Unit Rubble (Small) (cm\zerg\rubble-unit-small.grp) +# 1713 Zerg Unit Rubble (Tiny) (cm\zerg\rubble-unit-tiny.grp) +.headerstart +IsId 145 +Type 1 +Init BuildingRubbleHeaderInit +Death BuildingRubbleHeaderDeath +.headerend +# ----------------------------------------------------------------------------- # + +BuildingRubbleHeaderInit: + playfram 0x00 + wait 239 +BuildingRubbleHeaderDeath: + wait 1 + playfram 1 + wait 255 + wait 24 + playfram 2 + wait 255 + wait 24 + playfram 3 + wait 255 + wait 24 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 105 Bloodsummon Ritual (Small) (b\ritual.grp) +.headerstart +IsId 61 +Type 15 +Init BloodsummonRitual_Small_Init +Death CerebrateDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 BloodsummonRitual_Small_SpecialState1 +SpecialState2 BloodsummonRitual_Small_SpecialState1 +AlmostBuilt BloodsummonRitual_Small_AlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +BloodsummonRitual_Small_Init: + imgul 106 0 0 # Bloodsummon Ritual Shadow (b\ritual-shadow.grp) + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 +BloodsummonRitual_Small_SpecialState1: + 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 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + goto BloodsummonRitual_Small_SpecialState1 + +BloodsummonRitual_Small_AlmostBuilt: + playfram 10 + wait 2 + playfram 11 + wait 2 + playfram 12 + wait 2 + sigorder 4 + goto SkryrokorLocal00 + +CerebrateDeath: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) + wait 1 + end + +OvermindRemnantsDeath: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 104 Bloodsummon Ritual (Medium) (b\ritual.grp) +.headerstart +IsId 62 +Type 15 +Init BloodsummonRitual_Medium_Init +Death BloodsummonRitual_Medium_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 BloodsummonRitual_Medium_SpecialState1 +SpecialState2 BloodsummonRitual_Medium_SpecialState1 +AlmostBuilt BloodsummonRitual_Medium_AlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +BloodsummonRitual_Medium_Init: + imgul 106 0 0 # Bloodsummon Ritual Shadow (b\ritual-shadow.grp) + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 +BloodsummonRitual_Medium_Local00: + 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 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + goto BloodsummonRitual_Medium_Local00 + +BloodsummonRitual_Medium_Death: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 186 0 0 # Zerg Building Rubble (Small) (thingy\ZRubbleS.grp) + wait 1 + end + +BloodsummonRitual_Medium_SpecialState1: + playfram 13 + wait 2 + playfram 14 + wait 2 + playfram 15 + wait 2 + playfram 16 + wait 2 + playfram 0x11 + wait 2 + playfram 18 + wait 2 + playfram 0x11 + wait 2 + playfram 16 + wait 2 + playfram 15 + wait 2 + playfram 14 + wait 2 + goto BloodsummonRitual_Medium_SpecialState1 + +BloodsummonRitual_Medium_AlmostBuilt: + sigorder 32 + playfram 19 + wait 2 + playfram 20 + wait 2 + playfram 21 + wait 2 + sigorder 4 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 103 Bloodsummon Ritual Transmutation (b\ritual.grp) +.headerstart +IsId 63 +Type 15 +Init RitualTransmutationInit +Death OvermindRemnantsDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 RitualTransmutationSpecialState1 +SpecialState2 RitualTransmutationSpecialState2 +AlmostBuilt RitualTransmutationAlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +RitualTransmutationInit: + imgul 106 0 0 # Bloodsummon Ritual Shadow (b\ritual-shadow.grp) + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 +RitualTransmutationLocal00: + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 5 + wait 2 + goto RitualTransmutationLocal00 + +RitualTransmutationSpecialState1: + playfram 13 + wait 2 + playfram 14 + wait 2 + playfram 15 + wait 2 + playfram 16 + wait 2 + playfram 0x11 + wait 2 + playfram 18 + wait 2 + playfram 0x11 + wait 2 + playfram 16 + wait 2 + playfram 15 + wait 2 + playfram 14 + wait 2 + goto RitualTransmutationSpecialState1 + +RitualTransmutationSpecialState2: + playfram 22 + wait 2 + playfram 23 + wait 2 + playfram 24 + wait 2 + playfram 25 + wait 2 + playfram 26 + wait 2 + playfram 27 + wait 2 + playfram 26 + wait 2 + playfram 25 + wait 2 + playfram 24 + wait 2 + playfram 23 + wait 2 + goto RitualTransmutationSpecialState2 + +RitualTransmutationAlmostBuilt: + playfram 28 + wait 2 + playfram 29 + wait 2 + playfram 30 + wait 2 + sigorder 4 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 102 Bloodsummon Ritual (Large) (b\ritual.grp) +.headerstart +IsId 64 +Type 15 +Init BloodsummonRitual_Large_Init +Death BloodsummonRitual_Large_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 RitualTransmutationSpecialState2 +SpecialState2 RitualTransmutationSpecialState2 +AlmostBuilt RitualTransmutationAlmostBuilt +.headerend +# ----------------------------------------------------------------------------- # + +BloodsummonRitual_Large_Init: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + goto RitualTransmutationSpecialState2 + +BloodsummonRitual_Large_Death: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + sprol 185 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 107 Bloodsummon Ritual Completion (Small) (zerg\zSpawn01.grp) +# 108 Bloodsummon Ritual Completion (Medium) (zerg\zSpawn02.grp) +# 109 Bloodsummon Ritual Completion (Large) (zerg\zSpawn03.grp) +.headerstart +IsId 65 +Type 1 +Init ZergBuildingSpawnInit +Death Generic_Wait1End +.headerend +# ----------------------------------------------------------------------------- # + +ZergBuildingSpawnInit: + playfram 0x00 + wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1619 Grimoire (cm\bloodsummon\grimoire.grp) +.headerstart +IsId 0 +Type 20 +Init GrimoireInit +Death GrimoireDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 GrimoireSpecialState1 +SpecialState2 [NONE] +AlmostBuilt GrimoireAlmostBuilt +Built GrimoireBuilt +Landing GrimoireLanding +LiftOff GrimoireLiftOff +IsWorking GrimoireIsWorking +WorkingToIdle GrimoireBuilt +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +GrimoireInit: + imgulnextid 0 0 # Grimoire Shadow (cm\bloodsummon\grimoire-shadow.grp) +GrimoireBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +GrimoireDeath: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 1166 0 0 # Bloodsummon building rubble (large) + wait 1 + end + +GrimoireSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +GrimoireAlmostBuilt: + playfram 5 + goto SkryrokorLocal00 + +GrimoireLanding: + nobrkcodestart + wait 20 + playsnd 472 # Misc\Land.WAV +# playfram 3 + wait 5 +# playfram 2 + wait 5 +# playfram 1 + wait 5 +# playfram 4 + wait 5 + playfram 0x00 + sigorder 16 + nobrkcodeend + goto SkryrokorLocal00 + +GrimoireLiftOff: + nobrkcodestart + playsnd 471 # Misc\LiftOff.WAV +# playfram 4 + wait 5 +# playfram 1 + wait 5 +# playfram 2 + wait 5 +# playfram 3 + sigorder 16 + nobrkcodeend + goto SkryrokorLocal00 + +GrimoireIsWorking: + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 3 + wait 1 + playfram 2 + wait 1 + playfram 1 + wait 1 + playfram 0 + wait 1 + goto GrimoireIsWorking + +InfestedTerranWalkingToIdle: + playfram 0x00 +SkryrokorLocal00: + wait 125 + goto SkryrokorLocal00 + +LiftedTerranStructureDeath: + lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp) + wait 1 + end + +LiftedTerranStructureDeath_Small: + lowsprul 273 0 42 # Terran Building Rubble (Small) (thingy\RubbleS.grp) + wait 1 + end \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index dc45ec7e..77a8712d 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index e7fa94e5..6a329cde 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -101,7 +101,7 @@ Init CivilianInit Death CivilianDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 [NONE] +Unused1 SkryrokorLocal00 GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] diff --git a/mpq/sound/cm/b/b-load-01.wav b/mpq/sound/cm/b/b-load-01.wav new file mode 100644 index 00000000..683b2c1d Binary files /dev/null and b/mpq/sound/cm/b/b-load-01.wav differ diff --git a/mpq/sound/cm/b/b-unload-01.wav b/mpq/sound/cm/b/b-unload-01.wav new file mode 100644 index 00000000..02cec669 Binary files /dev/null and b/mpq/sound/cm/b/b-unload-01.wav differ diff --git a/mpq/sound/cm/b/grimoire/pas-proc-01.wav b/mpq/sound/cm/b/grimoire/pas-proc-01.wav new file mode 100644 index 00000000..0e85c2f2 Binary files /dev/null and b/mpq/sound/cm/b/grimoire/pas-proc-01.wav differ diff --git a/mpq/sound/cm/b/grimoire/wht-01.wav b/mpq/sound/cm/b/grimoire/wht-01.wav new file mode 100644 index 00000000..73c79b25 Binary files /dev/null and b/mpq/sound/cm/b/grimoire/wht-01.wav differ diff --git a/mpq/unit/cm/b/grimoire-damage.lof b/mpq/unit/cm/b/grimoire-damage.lof new file mode 100644 index 00000000..1dd256ca Binary files /dev/null and b/mpq/unit/cm/b/grimoire-damage.lof differ diff --git a/mpq/unit/cm/b/grimoire-shadow.grp b/mpq/unit/cm/b/grimoire-shadow.grp new file mode 100644 index 00000000..bcd7135f Binary files /dev/null and b/mpq/unit/cm/b/grimoire-shadow.grp differ diff --git a/mpq/unit/cm/b/grimoire.grp b/mpq/unit/cm/b/grimoire.grp new file mode 100644 index 00000000..02338778 Binary files /dev/null and b/mpq/unit/cm/b/grimoire.grp differ diff --git a/mpq/unit/cm/b/ritual-shadow.grp b/mpq/unit/cm/b/ritual-shadow.grp new file mode 100644 index 00000000..1b75cc35 Binary files /dev/null and b/mpq/unit/cm/b/ritual-shadow.grp differ diff --git a/mpq/unit/cm/b/ritual-spawn-large.grp b/mpq/unit/cm/b/ritual-spawn-large.grp new file mode 100644 index 00000000..ad8ec50c Binary files /dev/null and b/mpq/unit/cm/b/ritual-spawn-large.grp differ diff --git a/mpq/unit/cm/b/ritual-spawn-medium.grp b/mpq/unit/cm/b/ritual-spawn-medium.grp new file mode 100644 index 00000000..ae7dee9c Binary files /dev/null and b/mpq/unit/cm/b/ritual-spawn-medium.grp differ diff --git a/mpq/unit/cm/b/ritual-spawn-small.grp b/mpq/unit/cm/b/ritual-spawn-small.grp new file mode 100644 index 00000000..1b686d5b Binary files /dev/null and b/mpq/unit/cm/b/ritual-spawn-small.grp differ diff --git a/mpq/unit/cm/b/ritual.grp b/mpq/unit/cm/b/ritual.grp new file mode 100644 index 00000000..666f6cad Binary files /dev/null and b/mpq/unit/cm/b/ritual.grp differ diff --git a/mpq/unit/cm/b/rubble-b-large.grp b/mpq/unit/cm/b/rubble-b-large.grp new file mode 100644 index 00000000..0386ee64 Binary files /dev/null and b/mpq/unit/cm/b/rubble-b-large.grp differ diff --git a/mpq/unit/cm/b/rubble-b-small.grp b/mpq/unit/cm/b/rubble-b-small.grp new file mode 100644 index 00000000..338c84af Binary files /dev/null and b/mpq/unit/cm/b/rubble-b-small.grp differ diff --git a/mpq/unit/cm/b/rubble-u-medium.grp b/mpq/unit/cm/b/rubble-u-medium.grp new file mode 100644 index 00000000..310033b7 Binary files /dev/null and b/mpq/unit/cm/b/rubble-u-medium.grp differ diff --git a/mpq/unit/cm/b/rubble-u-small.grp b/mpq/unit/cm/b/rubble-u-small.grp new file mode 100644 index 00000000..80876d5f Binary files /dev/null and b/mpq/unit/cm/b/rubble-u-small.grp differ diff --git a/mpq/unit/cm/b/rubble-u-tiny.grp b/mpq/unit/cm/b/rubble-u-tiny.grp new file mode 100644 index 00000000..42c8b187 Binary files /dev/null and b/mpq/unit/cm/b/rubble-u-tiny.grp differ diff --git a/mpq/unit/cm/z/rubble-unit-medium.grp b/mpq/unit/cm/z/rubble-u-medium.grp similarity index 100% rename from mpq/unit/cm/z/rubble-unit-medium.grp rename to mpq/unit/cm/z/rubble-u-medium.grp diff --git a/mpq/unit/cm/z/rubble-unit-small.grp b/mpq/unit/cm/z/rubble-u-small.grp similarity index 100% rename from mpq/unit/cm/z/rubble-unit-small.grp rename to mpq/unit/cm/z/rubble-u-small.grp diff --git a/mpq/unit/cm/z/rubble-unit-tiny.grp b/mpq/unit/cm/z/rubble-u-tiny.grp similarity index 100% rename from mpq/unit/cm/z/rubble-unit-tiny.grp rename to mpq/unit/cm/z/rubble-u-tiny.grp diff --git a/mpq/unit/cm/z/unit-rubble-medium.grp b/mpq/unit/cm/z/unit-rubble-medium.grp deleted file mode 100644 index d3d61fc1..00000000 Binary files a/mpq/unit/cm/z/unit-rubble-medium.grp and /dev/null differ diff --git a/mpq/unit/cm/z/unit-rubble-small.grp b/mpq/unit/cm/z/unit-rubble-small.grp deleted file mode 100644 index 592f5b2f..00000000 Binary files a/mpq/unit/cm/z/unit-rubble-small.grp and /dev/null differ diff --git a/mpq/unit/cm/z/unit-rubble-tiny.grp b/mpq/unit/cm/z/unit-rubble-tiny.grp deleted file mode 100644 index bcf0b86d..00000000 Binary files a/mpq/unit/cm/z/unit-rubble-tiny.grp and /dev/null differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 22e5dda7..bda23e49 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 6c4478e2..6c1456e0 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 6bac97d0..b4e4202a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ