diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3682a52b..702f81a6 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 a1bacaa7..265f1538 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 5a41687d..b360a74b 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2206,7 +2206,7 @@ Garvrokor Simulacrum (Astral) Simulacrum (Astral) Shadow Herald Glow -Extended Image #1206 +Maverick Remains (Futurist) Extended Image #1207 Extended Image #1208 Extended Image #1209 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index a9b745a6..f1771ba2 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 0fb8607b..a53431d2 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3865,44 +3865,44 @@ Optecton Winddown 03 Autocrat Windup 01 Autocrat Windup 02 Autocrat Windup 03 -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 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Dilettante Ready 01 +Dilettante Ready 02 +Dilettante Ready 03 +Dilettante Selected 01 +Dilettante Selected 02 +Dilettante Selected 03 +Dilettante Selected 04 +Dilettante Order Passive 01 +Dilettante Order Passive 02 +Dilettante Order Passive 03 +Dilettante Order Passive 04 +Dilettante Order Aggressive 01 +Dilettante Order Aggressive 02 +Dilettante Order Aggressive 03 +Dilettante Order Aggressive 04 +Dilettante Under Attack 01 +Dilettante Under Attack 02 +Dilettante Under Attack 03 +Dilettante Under Attack 04 +Missionary Ready 01 +Missionary Ready 02 +Missionary Ready 03 +Missionary Selected 01 +Missionary Selected 02 +Missionary Selected 03 +Missionary Selected 04 +Missionary Order Passive 01 +Missionary Order Passive 02 +Missionary Order Passive 03 +Missionary Order Passive 04 +Missionary Order Aggressive 01 +Missionary Order Aggressive 02 +Missionary Order Aggressive 03 +Missionary Order Aggressive 04 +Missionary Under Attack 01 +Missionary Under Attack 02 +Missionary Under Attack 03 +Missionary Under Attack 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index ea714acd..75d72438 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3864,4 +3864,42 @@ cm\p\optecton\winddown-02.wav cm\p\optecton\winddown-03.wav cm\t\autocrat\windup-01.wav cm\t\autocrat\windup-02.wav -cm\t\autocrat\windup-03.wav \ No newline at end of file +cm\t\autocrat\windup-03.wav +cm\t\dilettante\rdy-01.wav +cm\t\dilettante\rdy-02.wav +cm\t\dilettante\rdy-03.wav +cm\t\dilettante\wht-01.wav +cm\t\dilettante\wht-02.wav +cm\t\dilettante\wht-03.wav +cm\t\dilettante\wht-04.wav +cm\t\dilettante\yes-01.wav +cm\t\dilettante\yes-02.wav +cm\t\dilettante\yes-03.wav +cm\t\dilettante\yes-04.wav +cm\t\dilettante\agg-01.wav +cm\t\dilettante\agg-02.wav +cm\t\dilettante\agg-03.wav +cm\t\dilettante\agg-04.wav +cm\t\dilettante\hlp-01.wav +cm\t\dilettante\hlp-02.wav +cm\t\dilettante\hlp-03.wav +cm\t\dilettante\hlp-04.wav +cm\a\missionary\rdy-01.wav +cm\a\missionary\rdy-02.wav +cm\a\missionary\rdy-03.wav +cm\a\missionary\wht-01.wav +cm\a\missionary\wht-02.wav +cm\a\missionary\wht-03.wav +cm\a\missionary\wht-04.wav +cm\a\missionary\yes-01.wav +cm\a\missionary\yes-02.wav +cm\a\missionary\yes-03.wav +cm\a\missionary\yes-04.wav +cm\a\missionary\agg-01.wav +cm\a\missionary\agg-02.wav +cm\a\missionary\agg-03.wav +cm\a\missionary\agg-04.wav +cm\a\missionary\hlp-01.wav +cm\a\missionary\hlp-02.wav +cm\a\missionary\hlp-03.wav +cm\a\missionary\hlp-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 85970d45..25c667c1 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 0fdc1f81..90e48ef7 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1069,7 +1069,7 @@ Valkyrie (Hecaton) Garvrokor Simulacrum (Astral) Herald Glow -Extended Sprite #555 +Maverick Remains (Futurist) Extended Sprite #556 Extended Sprite #557 Extended Sprite #558 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 379aa410..aac4e3ef 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 6bf1047d..5a2a3988 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index f97e16e6..f1b8e22e 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 e53754f1..69d7b7a1 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -816,18 +816,22 @@ Goliath_Turret_GndAttkInit: sigorder 32 wait 4 Goliath_Turret_GndAttkRpt: - wait 1 - nobrkcodestart - playfram 0xdd - playsnd 70 # Bullet\TGoFir00.wav - attackwith 1 - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk - ignorerest - goto Goliath_Turret_Init + wait 1 + nobrkcodestart + playfram 0xdd + playsnd 70 # Bullet\TGoFir00.wav + attackwith 1 + wait 1 + playfram 0xff + wait 1 + nobrkcodeend + gotorepeatattk + playfram 0xee + wait 1 + playfram 0x00 + wait 1 + ignorerest + goto Goliath_Turret_Init Goliath_Turret_AirAttkInit: wait 1 @@ -1056,7 +1060,7 @@ SarahKerriganSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 239 Maverick (terran\marine.grp) +# 239 Maverick (terran\maverick.grp) .headerstart IsId 78 Type 12 @@ -1078,9 +1082,9 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # MaverickInit: - imgul 240 0 0 # Maverick Shadow (cm\terran\Maverick-shadow.grp) + imgul 240 0 0 # Maverick Shadow (cm\terran\maverick-shadow.grp) MaverickWalkingToIdle: - playfram 0x44 + playfram 0x80 MaverickLocal00: wait 63 randcondjmp 25 MaverickLocal01 @@ -1090,9 +1094,9 @@ MaverickLocal00: MaverickLocal01: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 randcondjmp 192 MaverickLocal03 turnccwise 2 wait 3 @@ -1125,7 +1129,7 @@ MaverickLocal01: goto MaverickLocal04 MaverickLocal04: - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 @@ -1133,43 +1137,43 @@ MaverickLocal04: MaverickLocal03: wait 13 - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 goto MaverickWalkingToIdle MaverickLocal02: - playfram 0x55 + playfram 0xA0 wait 1 - playfram 0x66 + playfram 0xC0 wait 1 turnrand 3 wait 1 - playfram 0x55 + playfram 0xA0 wait 1 goto MaverickWalkingToIdle MaverickDeath: playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV setfldirect 0 - playfram 221 + playfram 416 wait 2 - playfram 222 + playfram 417 wait 2 - playfram 223 + playfram 418 wait 2 - playfram 224 + playfram 419 wait 2 - playfram 225 + playfram 420 wait 2 - playfram 226 + playfram 421 wait 2 - playfram 227 + playfram 422 wait 2 - playfram 228 + playfram 423 wait 2 - lowsprul 236 0 0 # Maverick Remnants (terran\tmaDeath.grp) + lowsprul 236 0 0 # Maverick Remnants (terran\maverick-death.grp) wait 1 end @@ -1178,19 +1182,19 @@ MaverickUnused1: nobrkcodestart setfldirect 0 playsndbtwn 1161 1162 - playfram 227 + playfram 422 wait 2 - playfram 226 + playfram 421 wait 2 - playfram 225 + playfram 420 wait 2 - playfram 224 + playfram 419 wait 2 - playfram 223 + playfram 418 wait 2 - playfram 222 + playfram 417 wait 2 - playfram 221 + playfram 416 wait 2 setfldirect 12 nobrkcodeend @@ -1199,30 +1203,30 @@ MaverickUnused1: MaverickGndAttkInit: playfram 0x00 wait 1 - playfram 0x11 + playfram 0x20 wait 1 - playfram 0x22 + playfram 0x40 MaverickGndAttkRpt: wait 1 nobrkcodestart attackwith 1 - playfram 0x33 + playfram 0x60 wait 1 - playfram 0x22 + playfram 0x40 wait 1 - playfram 0x33 + playfram 0x60 wait 1 - playfram 0x22 + playfram 0x40 wait 1 - playfram 0x33 + playfram 0x60 wait 1 - playfram 0x22 + playfram 0x40 wait 1 nobrkcodeend gotorepeatattk ignorerest MaverickGndAttkToIdle: - playfram 0x11 + playfram 0x20 wait 1 playfram 0x00 wait 1 @@ -1231,31 +1235,31 @@ MaverickGndAttkToIdle: MaverickWalking: move 4 wait 1 - playfram 0x55 + playfram 0xA0 move 4 wait 1 - playfram 0x66 + playfram 0xC0 move 4 wait 1 - playfram 0x77 + playfram 0xE0 move 4 wait 1 - playfram 0x88 + playfram 0x100 move 4 wait 1 - playfram 0x99 + playfram 0x120 move 4 wait 1 - playfram 0xaa + playfram 0x140 move 4 wait 1 - playfram 0xbb + playfram 0x160 move 4 wait 1 - playfram 0xcc + playfram 0x180 move 4 wait 1 - playfram 0x44 + playfram 0x80 goto MaverickWalking # ----------------------------------------------------------------------------- # @@ -9953,15 +9957,24 @@ TalosGndAttkRpt: goto TalosGndAttkToIdle TalosWalking: - setvertpos 0 - playfram 0x20 - wait 1 - playfram 0x40 - wait 1 - playfram 0x60 - wait 1 - imgol 1079 0 0 # Talos Engines (cm\terran\talos-engine.grp) - goto SkryrokorLocal00 + setvertpos 0 + playfram 0x20 + wait 2 + playfram 0x40 + wait 2 + playfram 0x60 + wait 2 + imgol 1079 0 0 # Talos Engines (cm\terran\talos-engine.grp) + goto SkryrokorLocal00 + +TalosWalkingToIdle: + playfram 0x60 + wait 2 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + goto TalosGndAttkToIdle TalosAlmostBuilt: setvertpos 0 @@ -20127,4 +20140,200 @@ Triton_Turret_Walking: move 0 wait 1 playfram 0x88 - goto Triton_Turret_Walking \ No newline at end of file + goto Triton_Turret_Walking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2013 Maverick (Futurist) (cm\faction-t\\maverick-futurist.grp) +.headerstart +IsId 838 +Type 12 +Init MaverickFuturistInit +Death MaverickFuturistDeath +GndAttkInit MaverickFuturistGndAttkInit +AirAttkInit MaverickFuturistGndAttkInit +Unused1 MaverickFuturistUnused1 +GndAttkRpt MaverickFuturistGndAttkRpt +AirAttkRpt MaverickFuturistGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MaverickFuturistGndAttkToIdle +AirAttkToIdle MaverickFuturistGndAttkToIdle +Unused2 [NONE] +Walking MaverickFuturistWalking +WalkingToIdle MaverickFuturistWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MaverickFuturistInit: + imgul 2014 0 0 # Maverick Futurist Shadow (cm\faction-t\maverick-futurist-shadow.grp) +MaverickFuturistWalkingToIdle: + playfram 0x80 +MaverickFuturistLocal00: + wait 63 + randcondjmp 25 MaverickFuturistLocal01 + randcondjmp 128 MaverickFuturistLocal02 + goto MaverickFuturistLocal00 + +MaverickFuturistLocal01: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + randcondjmp 192 MaverickFuturistLocal03 + 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 MaverickFuturistLocal04 + +MaverickFuturistLocal04: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto MaverickFuturistWalkingToIdle + +MaverickFuturistLocal03: + wait 13 + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto MaverickFuturistWalkingToIdle + +MaverickFuturistLocal02: + playfram 0xA0 + wait 1 + playfram 0xC0 + wait 1 + turnrand 3 + wait 1 + playfram 0xA0 + wait 1 + goto MaverickFuturistWalkingToIdle + +MaverickFuturistDeath: + playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV + 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 1071 0 0 # Maverick Futurist Remnants (cm\faction-t\maverick-futurist-death.grp) + wait 1 + end + +MaverickFuturistUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1161 1162 # Maverick revive 01, 02 + 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 MaverickFuturistWalkingToIdle + +MaverickFuturistGndAttkInit: + playfram 0x00 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 +MaverickFuturistGndAttkRpt: + wait 1 + nobrkcodestart + attackwith 1 + playfram 0x60 + wait 1 + playfram 0x40 + wait 3 + nobrkcodeend + gotorepeatattk + ignorerest +MaverickFuturistGndAttkToIdle: + playfram 0x20 + wait 1 + playfram 0x00 + wait 1 + goto MaverickFuturistWalkingToIdle + +MaverickFuturistWalking: + 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 MaverickFuturistWalking \ No newline at end of file diff --git a/mpq/sound/cm/a/missionary/agg-01.wav b/mpq/sound/cm/a/missionary/agg-01.wav new file mode 100644 index 00000000..a8b73f63 Binary files /dev/null and b/mpq/sound/cm/a/missionary/agg-01.wav differ diff --git a/mpq/sound/cm/a/missionary/agg-02.wav b/mpq/sound/cm/a/missionary/agg-02.wav new file mode 100644 index 00000000..7c920251 Binary files /dev/null and b/mpq/sound/cm/a/missionary/agg-02.wav differ diff --git a/mpq/sound/cm/a/missionary/agg-03.wav b/mpq/sound/cm/a/missionary/agg-03.wav new file mode 100644 index 00000000..fbeac3be Binary files /dev/null and b/mpq/sound/cm/a/missionary/agg-03.wav differ diff --git a/mpq/sound/cm/a/missionary/agg-04.wav b/mpq/sound/cm/a/missionary/agg-04.wav new file mode 100644 index 00000000..a58a16ff Binary files /dev/null and b/mpq/sound/cm/a/missionary/agg-04.wav differ diff --git a/mpq/sound/cm/a/missionary/hlp-01.wav b/mpq/sound/cm/a/missionary/hlp-01.wav new file mode 100644 index 00000000..ffd3ba50 Binary files /dev/null and b/mpq/sound/cm/a/missionary/hlp-01.wav differ diff --git a/mpq/sound/cm/a/missionary/hlp-02.wav b/mpq/sound/cm/a/missionary/hlp-02.wav new file mode 100644 index 00000000..e975295a Binary files /dev/null and b/mpq/sound/cm/a/missionary/hlp-02.wav differ diff --git a/mpq/sound/cm/a/missionary/hlp-03.wav b/mpq/sound/cm/a/missionary/hlp-03.wav new file mode 100644 index 00000000..8273e3bc Binary files /dev/null and b/mpq/sound/cm/a/missionary/hlp-03.wav differ diff --git a/mpq/sound/cm/a/missionary/hlp-04.wav b/mpq/sound/cm/a/missionary/hlp-04.wav new file mode 100644 index 00000000..90f0a117 Binary files /dev/null and b/mpq/sound/cm/a/missionary/hlp-04.wav differ diff --git a/mpq/sound/cm/a/missionary/rdy-01.wav b/mpq/sound/cm/a/missionary/rdy-01.wav new file mode 100644 index 00000000..1ad6ce9c Binary files /dev/null and b/mpq/sound/cm/a/missionary/rdy-01.wav differ diff --git a/mpq/sound/cm/a/missionary/rdy-02.wav b/mpq/sound/cm/a/missionary/rdy-02.wav new file mode 100644 index 00000000..92ca4548 Binary files /dev/null and b/mpq/sound/cm/a/missionary/rdy-02.wav differ diff --git a/mpq/sound/cm/a/missionary/rdy-03.wav b/mpq/sound/cm/a/missionary/rdy-03.wav new file mode 100644 index 00000000..ef8507b3 Binary files /dev/null and b/mpq/sound/cm/a/missionary/rdy-03.wav differ diff --git a/mpq/sound/cm/a/missionary/wht-01.wav b/mpq/sound/cm/a/missionary/wht-01.wav new file mode 100644 index 00000000..5a61c268 Binary files /dev/null and b/mpq/sound/cm/a/missionary/wht-01.wav differ diff --git a/mpq/sound/cm/a/missionary/wht-02.wav b/mpq/sound/cm/a/missionary/wht-02.wav new file mode 100644 index 00000000..cd56e762 Binary files /dev/null and b/mpq/sound/cm/a/missionary/wht-02.wav differ diff --git a/mpq/sound/cm/a/missionary/wht-03.wav b/mpq/sound/cm/a/missionary/wht-03.wav new file mode 100644 index 00000000..0919a549 Binary files /dev/null and b/mpq/sound/cm/a/missionary/wht-03.wav differ diff --git a/mpq/sound/cm/a/missionary/wht-04.wav b/mpq/sound/cm/a/missionary/wht-04.wav new file mode 100644 index 00000000..26d84a2b Binary files /dev/null and b/mpq/sound/cm/a/missionary/wht-04.wav differ diff --git a/mpq/sound/cm/a/missionary/yes-01.wav b/mpq/sound/cm/a/missionary/yes-01.wav new file mode 100644 index 00000000..1810925b Binary files /dev/null and b/mpq/sound/cm/a/missionary/yes-01.wav differ diff --git a/mpq/sound/cm/a/missionary/yes-02.wav b/mpq/sound/cm/a/missionary/yes-02.wav new file mode 100644 index 00000000..6d9e2107 Binary files /dev/null and b/mpq/sound/cm/a/missionary/yes-02.wav differ diff --git a/mpq/sound/cm/a/missionary/yes-03.wav b/mpq/sound/cm/a/missionary/yes-03.wav new file mode 100644 index 00000000..cacf2209 Binary files /dev/null and b/mpq/sound/cm/a/missionary/yes-03.wav differ diff --git a/mpq/sound/cm/a/missionary/yes-04.wav b/mpq/sound/cm/a/missionary/yes-04.wav new file mode 100644 index 00000000..f51f37a5 Binary files /dev/null and b/mpq/sound/cm/a/missionary/yes-04.wav differ diff --git a/mpq/sound/cm/t/dilettante/agg-01.wav b/mpq/sound/cm/t/dilettante/agg-01.wav new file mode 100644 index 00000000..61035470 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/agg-01.wav differ diff --git a/mpq/sound/cm/t/dilettante/agg-02.wav b/mpq/sound/cm/t/dilettante/agg-02.wav new file mode 100644 index 00000000..60418a0b Binary files /dev/null and b/mpq/sound/cm/t/dilettante/agg-02.wav differ diff --git a/mpq/sound/cm/t/dilettante/agg-03.wav b/mpq/sound/cm/t/dilettante/agg-03.wav new file mode 100644 index 00000000..1e01c5dd Binary files /dev/null and b/mpq/sound/cm/t/dilettante/agg-03.wav differ diff --git a/mpq/sound/cm/t/dilettante/agg-04.wav b/mpq/sound/cm/t/dilettante/agg-04.wav new file mode 100644 index 00000000..c3848897 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/agg-04.wav differ diff --git a/mpq/sound/cm/t/dilettante/hlp-01.wav b/mpq/sound/cm/t/dilettante/hlp-01.wav new file mode 100644 index 00000000..52586078 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/hlp-01.wav differ diff --git a/mpq/sound/cm/t/dilettante/hlp-02.wav b/mpq/sound/cm/t/dilettante/hlp-02.wav new file mode 100644 index 00000000..744864e8 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/hlp-02.wav differ diff --git a/mpq/sound/cm/t/dilettante/hlp-03.wav b/mpq/sound/cm/t/dilettante/hlp-03.wav new file mode 100644 index 00000000..45ebdadf Binary files /dev/null and b/mpq/sound/cm/t/dilettante/hlp-03.wav differ diff --git a/mpq/sound/cm/t/dilettante/hlp-04.wav b/mpq/sound/cm/t/dilettante/hlp-04.wav new file mode 100644 index 00000000..44d43d21 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/hlp-04.wav differ diff --git a/mpq/sound/cm/t/dilettante/rdy-01.wav b/mpq/sound/cm/t/dilettante/rdy-01.wav new file mode 100644 index 00000000..cfc3a987 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/rdy-01.wav differ diff --git a/mpq/sound/cm/t/dilettante/rdy-02.wav b/mpq/sound/cm/t/dilettante/rdy-02.wav new file mode 100644 index 00000000..775c76b8 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/rdy-02.wav differ diff --git a/mpq/sound/cm/t/dilettante/rdy-03.wav b/mpq/sound/cm/t/dilettante/rdy-03.wav new file mode 100644 index 00000000..e106ce0e Binary files /dev/null and b/mpq/sound/cm/t/dilettante/rdy-03.wav differ diff --git a/mpq/sound/cm/t/dilettante/wht-01.wav b/mpq/sound/cm/t/dilettante/wht-01.wav new file mode 100644 index 00000000..fb758b92 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/wht-01.wav differ diff --git a/mpq/sound/cm/t/dilettante/wht-02.wav b/mpq/sound/cm/t/dilettante/wht-02.wav new file mode 100644 index 00000000..3a452c84 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/wht-02.wav differ diff --git a/mpq/sound/cm/t/dilettante/wht-03.wav b/mpq/sound/cm/t/dilettante/wht-03.wav new file mode 100644 index 00000000..96cf3df3 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/wht-03.wav differ diff --git a/mpq/sound/cm/t/dilettante/wht-04.wav b/mpq/sound/cm/t/dilettante/wht-04.wav new file mode 100644 index 00000000..f6dad2e4 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/wht-04.wav differ diff --git a/mpq/sound/cm/t/dilettante/yes-01.wav b/mpq/sound/cm/t/dilettante/yes-01.wav new file mode 100644 index 00000000..2ec8697a Binary files /dev/null and b/mpq/sound/cm/t/dilettante/yes-01.wav differ diff --git a/mpq/sound/cm/t/dilettante/yes-02.wav b/mpq/sound/cm/t/dilettante/yes-02.wav new file mode 100644 index 00000000..3f7a2950 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/yes-02.wav differ diff --git a/mpq/sound/cm/t/dilettante/yes-03.wav b/mpq/sound/cm/t/dilettante/yes-03.wav new file mode 100644 index 00000000..bb348131 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/yes-03.wav differ diff --git a/mpq/sound/cm/t/dilettante/yes-04.wav b/mpq/sound/cm/t/dilettante/yes-04.wav new file mode 100644 index 00000000..19ca8829 Binary files /dev/null and b/mpq/sound/cm/t/dilettante/yes-04.wav differ diff --git a/mpq/tileset/ice.vf4 b/mpq/tileset/ice.vf4 index af1a81c6..cc03bf66 100644 Binary files a/mpq/tileset/ice.vf4 and b/mpq/tileset/ice.vf4 differ diff --git a/mpq/unit/cm/faction-t/maverick-futurist-death.grp b/mpq/unit/cm/faction-t/maverick-futurist-death.grp new file mode 100644 index 00000000..6ba2376e Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-futurist-death.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-futurist-shadow.grp b/mpq/unit/cm/faction-t/maverick-futurist-shadow.grp new file mode 100644 index 00000000..5fc29cb4 Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-futurist-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-futurist.grp b/mpq/unit/cm/faction-t/maverick-futurist.grp index df5aa947..62eaa5dc 100644 Binary files a/mpq/unit/cm/faction-t/maverick-futurist.grp and b/mpq/unit/cm/faction-t/maverick-futurist.grp differ diff --git a/mpq/unit/cm/terran/aion-attack.lol b/mpq/unit/cm/terran/aion-attack.lol index 2c456395..c467a4db 100644 Binary files a/mpq/unit/cm/terran/aion-attack.lol and b/mpq/unit/cm/terran/aion-attack.lol differ diff --git a/mpq/unit/cm/terran/aion.grp b/mpq/unit/cm/terran/aion.grp index 17b01434..e703c5c8 100644 Binary files a/mpq/unit/cm/terran/aion.grp and b/mpq/unit/cm/terran/aion.grp differ diff --git a/mpq/unit/cm/terran/ancile-engines.grp b/mpq/unit/cm/terran/ancile-engines.grp index 6eb8f95d..0b65741e 100644 Binary files a/mpq/unit/cm/terran/ancile-engines.grp and b/mpq/unit/cm/terran/ancile-engines.grp differ diff --git a/mpq/unit/cm/terran/ancile.grp b/mpq/unit/cm/terran/ancile.grp index 3c50a207..8ceebd09 100644 Binary files a/mpq/unit/cm/terran/ancile.grp and b/mpq/unit/cm/terran/ancile.grp differ diff --git a/mpq/unit/cm/terran/blackjack-shadow.grp b/mpq/unit/cm/terran/blackjack-shadow.grp index ffea8cae..7ab3e5f8 100644 Binary files a/mpq/unit/cm/terran/blackjack-shadow.grp and b/mpq/unit/cm/terran/blackjack-shadow.grp differ diff --git a/mpq/unit/cm/terran/blackjack.grp b/mpq/unit/cm/terran/blackjack.grp index f63ee4ff..26e36187 100644 Binary files a/mpq/unit/cm/terran/blackjack.grp and b/mpq/unit/cm/terran/blackjack.grp differ diff --git a/mpq/unit/cm/terran/cataphract-attack.lol b/mpq/unit/cm/terran/cataphract-attack.lol index bd32dba8..5671867e 100644 Binary files a/mpq/unit/cm/terran/cataphract-attack.lol and b/mpq/unit/cm/terran/cataphract-attack.lol differ diff --git a/mpq/unit/cm/terran/cataphract-shadow.grp b/mpq/unit/cm/terran/cataphract-shadow.grp index 3d1035df..94fce135 100644 Binary files a/mpq/unit/cm/terran/cataphract-shadow.grp and b/mpq/unit/cm/terran/cataphract-shadow.grp differ diff --git a/mpq/unit/cm/terran/cataphract.grp b/mpq/unit/cm/terran/cataphract.grp index aabd61af..ce7cc534 100644 Binary files a/mpq/unit/cm/terran/cataphract.grp and b/mpq/unit/cm/terran/cataphract.grp differ diff --git a/mpq/unit/cm/terran/cyclops-shadow.grp b/mpq/unit/cm/terran/cyclops-shadow.grp index 6e0d3b93..204a5433 100644 Binary files a/mpq/unit/cm/terran/cyclops-shadow.grp and b/mpq/unit/cm/terran/cyclops-shadow.grp differ diff --git a/mpq/unit/cm/terran/cyclops.grp b/mpq/unit/cm/terran/cyclops.grp index 3b8392ff..236bfba4 100644 Binary files a/mpq/unit/cm/terran/cyclops.grp and b/mpq/unit/cm/terran/cyclops.grp differ diff --git a/mpq/unit/cm/terran/cyprian-shadow.grp b/mpq/unit/cm/terran/cyprian-shadow.grp index c4a9d1cc..bd05e7d8 100644 Binary files a/mpq/unit/cm/terran/cyprian-shadow.grp and b/mpq/unit/cm/terran/cyprian-shadow.grp differ diff --git a/mpq/unit/cm/terran/cyprian.grp b/mpq/unit/cm/terran/cyprian.grp index 89065ea8..fe357f33 100644 Binary files a/mpq/unit/cm/terran/cyprian.grp and b/mpq/unit/cm/terran/cyprian.grp differ diff --git a/mpq/unit/cm/terran/goliath-attack.lol b/mpq/unit/cm/terran/goliath-attack.lol index 9e83b5ac..e5141897 100644 Binary files a/mpq/unit/cm/terran/goliath-attack.lol and b/mpq/unit/cm/terran/goliath-attack.lol differ diff --git a/mpq/unit/cm/terran/hippogriff-attack1.lol b/mpq/unit/cm/terran/hippogriff-attack1.lol index 80c29915..446afc8b 100644 Binary files a/mpq/unit/cm/terran/hippogriff-attack1.lol and b/mpq/unit/cm/terran/hippogriff-attack1.lol differ diff --git a/mpq/unit/cm/terran/hippogriff-attack2.lol b/mpq/unit/cm/terran/hippogriff-attack2.lol index b543607d..8e9a5827 100644 Binary files a/mpq/unit/cm/terran/hippogriff-attack2.lol and b/mpq/unit/cm/terran/hippogriff-attack2.lol differ diff --git a/mpq/unit/cm/terran/hippogriff-engines.grp b/mpq/unit/cm/terran/hippogriff-engines.grp index b3898c36..f008e157 100644 Binary files a/mpq/unit/cm/terran/hippogriff-engines.grp and b/mpq/unit/cm/terran/hippogriff-engines.grp differ diff --git a/mpq/unit/cm/terran/hippogriff.grp b/mpq/unit/cm/terran/hippogriff.grp index 55f9667a..e487d954 100644 Binary files a/mpq/unit/cm/terran/hippogriff.grp and b/mpq/unit/cm/terran/hippogriff.grp differ diff --git a/mpq/unit/cm/terran/madcap-shadow.grp b/mpq/unit/cm/terran/madcap-shadow.grp index 9b7342b5..bb7a2d71 100644 Binary files a/mpq/unit/cm/terran/madcap-shadow.grp and b/mpq/unit/cm/terran/madcap-shadow.grp differ diff --git a/mpq/unit/cm/terran/madcap.grp b/mpq/unit/cm/terran/madcap.grp index 21b2cf34..9855b5e3 100644 Binary files a/mpq/unit/cm/terran/madcap.grp and b/mpq/unit/cm/terran/madcap.grp differ diff --git a/mpq/unit/cm/terran/madrigal-base.grp b/mpq/unit/cm/terran/madrigal-base.grp index aee36612..9968cddb 100644 Binary files a/mpq/unit/cm/terran/madrigal-base.grp and b/mpq/unit/cm/terran/madrigal-base.grp differ diff --git a/mpq/unit/cm/terran/madrigal-turret.grp b/mpq/unit/cm/terran/madrigal-turret.grp index df3844b4..5a99b6fe 100644 Binary files a/mpq/unit/cm/terran/madrigal-turret.grp and b/mpq/unit/cm/terran/madrigal-turret.grp differ diff --git a/mpq/unit/cm/terran/matador-shadow.grp b/mpq/unit/cm/terran/matador-shadow.grp index f71385cd..e6156ed3 100644 Binary files a/mpq/unit/cm/terran/matador-shadow.grp and b/mpq/unit/cm/terran/matador-shadow.grp differ diff --git a/mpq/unit/cm/terran/matador-turret.grp b/mpq/unit/cm/terran/matador-turret.grp index fbad4518..ad839dbf 100644 Binary files a/mpq/unit/cm/terran/matador-turret.grp and b/mpq/unit/cm/terran/matador-turret.grp differ diff --git a/mpq/unit/cm/terran/matador.grp b/mpq/unit/cm/terran/matador.grp index a35a6d1f..c6f0cef8 100644 Binary files a/mpq/unit/cm/terran/matador.grp and b/mpq/unit/cm/terran/matador.grp differ diff --git a/mpq/unit/cm/terran/pythean-engine.grp b/mpq/unit/cm/terran/pythean-engine.grp index f7ec293c..f55dcd7f 100644 Binary files a/mpq/unit/cm/terran/pythean-engine.grp and b/mpq/unit/cm/terran/pythean-engine.grp differ diff --git a/mpq/unit/cm/terran/pythean.grp b/mpq/unit/cm/terran/pythean.grp index e9f02097..162741cd 100644 Binary files a/mpq/unit/cm/terran/pythean.grp and b/mpq/unit/cm/terran/pythean.grp differ diff --git a/mpq/unit/cm/terran/sundog-attack.lol b/mpq/unit/cm/terran/sundog-attack.lol index 859dd5ec..ba5480a4 100644 Binary files a/mpq/unit/cm/terran/sundog-attack.lol and b/mpq/unit/cm/terran/sundog-attack.lol differ diff --git a/mpq/unit/cm/terran/sundog.grp b/mpq/unit/cm/terran/sundog.grp index 972ca67a..1a8191c5 100644 Binary files a/mpq/unit/cm/terran/sundog.grp and b/mpq/unit/cm/terran/sundog.grp differ diff --git a/mpq/unit/cm/terran/talos-engine.grp b/mpq/unit/cm/terran/talos-engine.grp index c2d8eccb..525598f0 100644 Binary files a/mpq/unit/cm/terran/talos-engine.grp and b/mpq/unit/cm/terran/talos-engine.grp differ diff --git a/mpq/unit/cm/terran/talos-resource.loo b/mpq/unit/cm/terran/talos-resource.loo index 17a5858e..a76c6a20 100644 Binary files a/mpq/unit/cm/terran/talos-resource.loo and b/mpq/unit/cm/terran/talos-resource.loo differ diff --git a/mpq/unit/cm/terran/talos.grp b/mpq/unit/cm/terran/talos.grp index b47a9300..308edd99 100644 Binary files a/mpq/unit/cm/terran/talos.grp and b/mpq/unit/cm/terran/talos.grp differ diff --git a/mpq/unit/cm/terran/vulture-attack.lol b/mpq/unit/cm/terran/vulture-attack.lol index fa069801..784c3ba3 100644 Binary files a/mpq/unit/cm/terran/vulture-attack.lol and b/mpq/unit/cm/terran/vulture-attack.lol differ diff --git a/mpq/unit/cm/terran/vulture-engine.grp b/mpq/unit/cm/terran/vulture-engine.grp index fadcee67..41a49c25 100644 Binary files a/mpq/unit/cm/terran/vulture-engine.grp and b/mpq/unit/cm/terran/vulture-engine.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index d5e9113f..a2f1f8d4 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 8537b32f..4afc99cd 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/firebat.grp b/mpq/unit/terran/firebat.grp index dd4822d9..36c43e4e 100644 Binary files a/mpq/unit/terran/firebat.grp and b/mpq/unit/terran/firebat.grp differ diff --git a/mpq/unit/terran/goliath.grp b/mpq/unit/terran/goliath.grp index 904f75e5..c8ede525 100644 Binary files a/mpq/unit/terran/goliath.grp and b/mpq/unit/terran/goliath.grp differ diff --git a/mpq/unit/terran/goliathT.grp b/mpq/unit/terran/goliathT.grp index 0307b110..7dfc45e6 100644 Binary files a/mpq/unit/terran/goliathT.grp and b/mpq/unit/terran/goliathT.grp differ diff --git a/mpq/unit/terran/marine.grp b/mpq/unit/terran/marine.grp deleted file mode 100644 index fa4e0a48..00000000 Binary files a/mpq/unit/terran/marine.grp and /dev/null differ diff --git a/mpq/unit/terran/maverick-death.grp b/mpq/unit/terran/maverick-death.grp new file mode 100644 index 00000000..8d3a5dd1 Binary files /dev/null and b/mpq/unit/terran/maverick-death.grp differ diff --git a/mpq/unit/terran/maverick-shadow.grp b/mpq/unit/terran/maverick-shadow.grp new file mode 100644 index 00000000..349df8fe Binary files /dev/null and b/mpq/unit/terran/maverick-shadow.grp differ diff --git a/mpq/unit/terran/maverick.grp b/mpq/unit/terran/maverick.grp new file mode 100644 index 00000000..89a1aa36 Binary files /dev/null and b/mpq/unit/terran/maverick.grp differ diff --git a/mpq/unit/terran/tfbShad.grp b/mpq/unit/terran/tfbShad.grp index 7b363d03..e09f8204 100644 Binary files a/mpq/unit/terran/tfbShad.grp and b/mpq/unit/terran/tfbShad.grp differ diff --git a/mpq/unit/terran/tgoShad.grp b/mpq/unit/terran/tgoShad.grp index 1d9c421c..0afa7573 100644 Binary files a/mpq/unit/terran/tgoShad.grp and b/mpq/unit/terran/tgoShad.grp differ diff --git a/mpq/unit/terran/tmadeath.grp b/mpq/unit/terran/tmadeath.grp deleted file mode 100644 index 68c00795..00000000 Binary files a/mpq/unit/terran/tmadeath.grp and /dev/null differ diff --git a/mpq/unit/terran/tmashad.grp b/mpq/unit/terran/tmashad.grp deleted file mode 100644 index 97ca8383..00000000 Binary files a/mpq/unit/terran/tmashad.grp and /dev/null differ diff --git a/mpq/unit/terran/vulture.grp b/mpq/unit/terran/vulture.grp index 29c18ca4..3502db6b 100644 Binary files a/mpq/unit/terran/vulture.grp and b/mpq/unit/terran/vulture.grp differ diff --git a/mpq/unit/terran/wraith.grp b/mpq/unit/terran/wraith.grp index 7cec2a7f..1d8b7b89 100644 Binary files a/mpq/unit/terran/wraith.grp and b/mpq/unit/terran/wraith.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 8591c147..60e1ca21 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 b35ae4f7..6596256c 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 c614a250..b04b9027 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -12,13 +12,15 @@ - Reinstated weaponhit VFX for **Cyclops - Brontes Payload** ## Audiovisuals -- New model for: - - **Herald** (c. Solstice) -- New portrait for: - - **Herald** (c. Solstice) +- New model for: (c. Solstice) + - **Maverick** (incl. Futurist), **Vulture**, **Herald** +- New portrait for: (c. Solstice) + - **Herald** +- Modified models for: (c. Solstice) + - Talos, Harakan, Cyprian, Cyclops, Goliath, Blackjack, Matador, Madrigal, Wraith, Ancile, Madcap, Cataphract, Pythean, Sundog, Aion, Hippogriff - New unit responses for: - **Azazel** (c. GreenEggs'NSpam) - - **Herald** + - **Dilettante**, **Herald** ## Terran - [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): @@ -26,6 +28,7 @@ - Now has an attack windup of 1 second - Weapon damage 15 » 8 - Weapon factor 1 » 2 + - Weapon range 5 » 6 - **Kinetic Penetration** replaced with **Prolonged Arms** (interception without penetration) ## Protoss diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 79a16f9a..960dd523 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ