diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 5077ddcb..439f9a19 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -127,7 +127,7 @@ Dark Swarm Flag Young Chrysalis Psi Emitter -Data Disc +Large Protoss Laser Khaydarin Crystal Mineral Chunk Type1 Mineral Chunk Type2 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 640036d2..cc4817e2 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 91482e3a..5f9c496a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1746,7 +1746,7 @@ Madrigal Turret (Furia) Philoc Philoc Shadow Philoc Engines -Extended Image #746 +Engram Warp Flash Extended Image #747 Extended Image #748 Extended Image #749 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a6427411..efddd08b 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 2b0846c4..bdd7a023 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 3851b2ae..a9823ef3 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 94ca8c5d..7c813653 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 762b94a0..d8e57732 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index c4e4dcb1..35fc26a9 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index d643ba47..cfb87633 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -238,6 +238,7 @@ building grand_library = 226 building matrix = 252 building strident_stratum = 278 building auxiliary_oasis = 279 +building engram = 294 building sequestered_icon = 304 building unitary_union = 305 building hall_of_heretics = 349 diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 6a6e8224..589fd5e4 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 055a7f21..8ae61c05 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -12601,15 +12601,15 @@ WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt [NONE] -Built WardenBuilt +Built ScourgeLocal00 Landing [NONE] LiftOff [NONE] -IsWorking WardenBuilt -WorkingToIdle WardenBuilt +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 WarpIn WardenWarpIn Unused3 [NONE] StarEditInit [NONE] -Disable WardenBuilt +Disable ScourgeLocal00 Burrow [NONE] UnBurrow [NONE] Enable WardenEnable @@ -12620,18 +12620,14 @@ WardenInit: imgul 184 0 0 # Warden Shadow (protoss\ppbShad.grp) WardenLocal00: playfram 0x00 - goto WardenBuilt - -WardenBuilt: - wait 125 - goto WardenBuilt + goto ScourgeLocal00 WardenDeath: playsnd 7 # Misc\ExploLrg.wav imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) - wait 3 + wait 3 lowsprul 223 0 0 # Protoss Building Rubble (Small) (thingy\PRubbleS.grp) - wait 1 + wait 1 end WardenGndAttkInit: @@ -12657,11 +12653,11 @@ WardenGndAttkToIdle: WardenEnable: playfram 0x00 - goto WardenBuilt + goto ScourgeLocal00 WardenWarpIn: imgol 185 0 0 # Warden Warp Flash (protoss\photon.grp) - goto WardenBuilt + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51645,4 +51641,60 @@ PhilocWalking: imgol 1747 0 0 # Philoc Engines (terran\wraith-engine.grp) goto WraithLocal00 -# Next free isid: 752 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1714 Engram (cm\protoss\engram.grp) +.headerstart +IsId 752 +Type 27 +Init EngramInit +Death NexusDeath +GndAttkInit EngramGndAttkInit +AirAttkInit EngramGndAttkInit +Unused1 [NONE] +GndAttkRpt EngramGndAttkInit +AirAttkRpt EngramGndAttkInit +CastSpell [NONE] +GndAttkToIdle EngramGndAttkToIdle +AirAttkToIdle EngramGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built ScourgeLocal00 +Landing [NONE] +LiftOff [NONE] +IsWorking ScourgeLocal00 +WorkingToIdle ScourgeLocal00 +WarpIn EngramWarpIn +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +EngramInit: + imgul 1715 0 0 # Engram Shadow (cm\protoss\engram-shad.grp) + playfram 0x00 + goto ScourgeLocal00 + +EngramGndAttkInit: + wait 1 + attack + playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 + imgol 1163 0 -20 # Warden impact + gotorepeatattk + ignorerest +EngramGndAttkToIdle: + goto ScourgeLocal00 + +EngramWarpIn: + imgol 185 0 0 # Engram Warp Flash (cm\protoss\engram.grp) + goto ScourgeLocal00 + +# Next free isid: 753 + +# ----------------------------------------------------------------------------- # \ No newline at end of file diff --git a/mpq/unit/cm/protoss/engram-damage.lof b/mpq/unit/cm/protoss/engram-damage.lof index 5910d8bf..964bf149 100644 Binary files a/mpq/unit/cm/protoss/engram-damage.lof and b/mpq/unit/cm/protoss/engram-damage.lof differ diff --git a/mpq/unit/cm/protoss/engram-shadow.grp b/mpq/unit/cm/protoss/engram-shadow.grp index 74d97919..790e747d 100644 Binary files a/mpq/unit/cm/protoss/engram-shadow.grp and b/mpq/unit/cm/protoss/engram-shadow.grp differ diff --git a/mpq/unit/cm/protoss/engram.grp b/mpq/unit/cm/protoss/engram.grp index 94fabe1e..0b3b2c48 100644 Binary files a/mpq/unit/cm/protoss/engram.grp and b/mpq/unit/cm/protoss/engram.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index b86018d0..c3371c4f 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 4881d97d..84821783 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 5d60b29a..cf280a1c 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ