diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 8f6bbcb5..2d44c521 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 58d97211..3dac9260 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -137,9 +137,9 @@ hydra_signify_malice = false bounce_set = Add(bactalisk,129,2) #caustic fission is required for bactalisk's bounce attack if this option is enabled hydra_caustic_fission = true -hydra_indomitable_musculature = true +hydra_indomitable_musculature = false #makes all reavers (including human-owned reavers) autobuild scarabs -reaver_autobuild = true +reaver_autobuild = false #for use with Maelstrom hydra_malediction = true # diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index f35bb359..f93f5681 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -22170,12 +22170,13 @@ GndAttkToIdle CabalistGndAttkToIdle AirAttkToIdle [NONE] Unused2 [NONE] Walking CabalistWalking -WalkingToIdle CabalistInit +WalkingToIdle CabalistGndAttkToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # CabalistInit: + imgul 1617 0 0 # Cabalist Shadow (cm\protoss\cabalist-shadow.grp) playfram 0xdd CabalistGndAttkToIdle: playfram 0xdd @@ -22288,13 +22289,13 @@ CabalistGndAttkInit: nobrkcodeend gotorepeatattk ignorerest - goto CabalistInit + goto CabalistGndAttkToIdle CabalistCastSpell: castspell sigorder 2 gotorepeatattk - goto CabalistInit + goto CabalistGndAttkToIdle CabalistWalking: move 5 @@ -24511,10 +24512,10 @@ PanoptusDeath: end PanoptusGndAttkInit: - playsndbtwn 2020 2023 # Panoptus weaponfire 01, 02, 03, 04 - attackwith 2 playfram 0x20 - wait 1 + playsndbtwn 2020 2023 # Panoptus weaponfire 01, 02, 03, 04 + attack + wait 2 playfram 0x00 gotorepeatattk ignorerest @@ -27622,98 +27623,98 @@ Death MagicSylonDeath # ----------------------------------------------------------------------------- # MagicSylonInit: - playfram 0x00 # Frame set 0 - wait 1 + playfram 0x00 + wait 1 MagicSylonLocal00: - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 - playfram 10 # Frame set 0, direction 10 - wait 1 - playfram 11 # Frame set 0, direction 11 - wait 1 - playfram 12 # Frame set 0, direction 12 - wait 1 - playfram 13 # Frame set 0, direction 13 - wait 1 - playfram 14 # Frame set 0, direction 14 - wait 1 - playfram 15 # Frame set 0, direction 15 - wait 1 - playfram 16 # Frame set 0, direction 16 - wait 1 - playfram 0x11 # Frame set 1 - wait 1 - playfram 18 # Frame set 1, direction 1 - wait 1 - playfram 19 # Frame set 1, direction 2 - wait 1 - playfram 20 # Frame set 1, direction 3 - wait 1 - playfram 21 # Frame set 1, direction 4 - wait 1 - playfram 22 # Frame set 1, direction 5 - wait 1 - playfram 23 # Frame set 1, direction 6 - wait 1 - playfram 24 # Frame set 1, direction 7 - wait 1 - playfram 25 # Frame set 1, direction 8 - wait 1 - playfram 26 # Frame set 1, direction 9 - wait 1 - playfram 27 # Frame set 1, direction 10 - wait 1 - playfram 28 # Frame set 1, direction 11 - wait 1 - playfram 29 # Frame set 1, direction 12 - wait 1 - playfram 30 # Frame set 1, direction 13 - wait 1 - playfram 31 # Frame set 1, direction 14 - wait 1 - playfram 32 # Frame set 1, direction 15 - wait 1 - playfram 33 # Frame set 1, direction 16 - wait 1 - playfram 0x22 # Frame set 2 - wait 1 - playfram 35 # Frame set 2, direction 1 - wait 1 - playfram 36 # Frame set 2, direction 2 - wait 1 - playfram 37 # Frame set 2, direction 3 - wait 1 - playfram 38 # Frame set 2, direction 4 - wait 1 - playfram 39 # Frame set 2, direction 5 - wait 1 - playfram 40 # Frame set 2, direction 6 - wait 1 - playfram 41 # Frame set 2, direction 7 - wait 1 - playfram 42 # Frame set 2, direction 8 - wait 1 - playfram 43 # Frame set 2, direction 9 + 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 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + 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 + playfram 21 + wait 1 + playfram 22 + wait 1 + playfram 23 + wait 1 + playfram 24 + wait 1 + playfram 25 + wait 1 + playfram 26 + wait 1 + playfram 27 + wait 1 + playfram 28 + wait 1 + playfram 29 + wait 1 + playfram 30 + wait 1 + playfram 31 + wait 1 + playfram 32 + wait 1 + playfram 33 + wait 1 + playfram 0x22 + wait 1 + playfram 35 + wait 1 + playfram 36 + wait 1 + playfram 37 + wait 1 + playfram 38 + wait 1 + playfram 39 + wait 1 + playfram 40 + wait 1 + playfram 41 + wait 1 + playfram 42 + wait 1 + playfram 43 goto MagicSylonDeath MagicSylonDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -33078,91 +33079,6 @@ IrolethBirthSpecialState1: nobrkcodeend goto InfestedTerranLocal00 -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1004 Mutation Pit (cm\zerg\mutationpit.grp) -.headerstart -IsId 516 -Type 20 -Init MutationPitInit -Death MutationPitDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] -Walking [NONE] -WalkingToIdle [NONE] -SpecialState1 [NONE] -SpecialState2 [NONE] -AlmostBuilt MutationPitAlmostBuilt -Built MutationPitBuilt -Landing [NONE] -LiftOff [NONE] -IsWorking MutationPitIsWorking -WorkingToIdle MutationPitWorkingToIdle -WarpIn [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -MutationPitInit: - imgul 1226 0 0 # Mutation Pit Shadow (cm\zerg\mutationpit-shad.grp) - playfram 0x00 # Frame set 0 - goto MutationPitWorkingToIdle - -MutationPitWorkingToIdle: - playfram 1 - wait 2 - playfram 2 - waitrand 2 3 - playfram 3 - wait 2 - playfram 4 - waitrand 2 3 - playfram 5 - wait 2 - playfram 0x00 - waitrand 2 3 - goto MutationPitWorkingToIdle - -MutationPitLocal69: - wait 125 - goto MutationPitLocal69 - -MutationPitDeath: - 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 - -MutationPitAlmostBuilt: - imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) -MutationPitBuilt: - playfram 0x00 # Frame set 0 - wait 2 - goto MutationPitWorkingToIdle - -MutationPitIsWorking: - playfram 1 - wait 2 - playfram 2 - waitrand 2 3 - playfram 3 - wait 2 - playfram 4 - waitrand 2 3 - playfram 5 - wait 2 - playfram 0x00 - waitrand 2 3 - goto MutationPitIsWorking - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1227 Gorgral Swamp (cm\zerg\lakizden.grp) @@ -33196,7 +33112,7 @@ WarpIn [NONE] BactaliskDenInit: imgul 1228 0 0 # Bactalisk Den Shadow (cm\zerg\lakizden-shad.grp) - playfram 0x00 # Frame set 0 + playfram 0x00 goto BactaliskDenWorkingToIdle BactaliskDenWorkingToIdle: @@ -33225,7 +33141,7 @@ BactaliskDenDeath: BactaliskDenAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) BactaliskDenBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto BactaliskDenWorkingToIdle @@ -33326,7 +33242,7 @@ Death ObservanceDeath # ----------------------------------------------------------------------------- # ObservanceInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 goto ObservanceLocal00 @@ -33409,7 +33325,7 @@ ObservanceLocal00: goto ObservanceLocal00 ObservanceDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # diff --git a/mpq/unit/protoss/scribe.grp b/mpq/unit/protoss/scribe.grp index da20790e..f75bfbb0 100644 Binary files a/mpq/unit/protoss/scribe.grp and b/mpq/unit/protoss/scribe.grp differ