diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index ba57909..0b71882 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 b2c6834..52a7990 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 001ebf0..3510f45 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2486,8 +2486,8 @@ Battery Cell Battery Cell Shadow Battery Cell Shadow (Carried) Flamethrower (Blue) -Extended Image #1486 -Extended Image #1487 +Watchdog Engine +Watchdog Engine Idle Extended Image #1488 Extended Image #1489 Extended Image #1490 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 20c3d7d..a704d25 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 b8d0997..3ba1a63 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4372,25 +4372,25 @@ Zethalisk Weaponfire 01 Zethalisk Weaponfire 02 Zethalisk Weaponfire 03 Bloodsummon Structure Placement 01 -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 +Intendent Ready 01 +Intendent Ready 02 +Intendent Ready 03 +Intendent Selected 01 +Intendent Selected 02 +Intendent Selected 03 +Intendent Selected 04 +Intendent Order Passive 01 +Intendent Order Passive 02 +Intendent Order Passive 03 +Intendent Order Passive 04 +Intendent Order Aggressive 01 +Intendent Order Aggressive 02 +Intendent Order Aggressive 03 +Intendent Order Aggressive 04 +Intendent Under Attack 01 +Intendent Under Attack 02 +Intendent Under Attack 03 +Intendent 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 87ea5b9..7e6179a 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4371,4 +4371,23 @@ cm\f-z\zethalor\wf-03.wav cm\f-z\zethalisk\wf-01.wav cm\f-z\zethalisk\wf-02.wav cm\f-z\zethalisk\wf-03.wav -cm\b\placement-01.wav \ No newline at end of file +cm\b\placement-01.wav +cm\a\intendent\rdy-01.wav +cm\a\intendent\rdy-02.wav +cm\a\intendent\rdy-03.wav +cm\a\intendent\wht-01.wav +cm\a\intendent\wht-02.wav +cm\a\intendent\wht-03.wav +cm\a\intendent\wht-04.wav +cm\a\intendent\yes-01.wav +cm\a\intendent\yes-02.wav +cm\a\intendent\yes-03.wav +cm\a\intendent\yes-04.wav +cm\a\intendent\agg-01.wav +cm\a\intendent\agg-02.wav +cm\a\intendent\agg-03.wav +cm\a\intendent\agg-04.wav +cm\a\intendent\hlp-01.wav +cm\a\intendent\hlp-02.wav +cm\a\intendent\hlp-03.wav +cm\a\intendent\hlp-04.wav \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 49d0851..33808f8 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 6c9ff0d..044d963 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index d5f36b7..4f210f4 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/glue/dynamic/checked_listbox_back.pcx b/mpq/glue/dynamic/checked_listbox_back.pcx new file mode 100644 index 0000000..910394b Binary files /dev/null and b/mpq/glue/dynamic/checked_listbox_back.pcx differ diff --git a/mpq/glue/dynamic/fullscreen_tab_block.pcx b/mpq/glue/dynamic/fullscreen_tab_block.pcx new file mode 100644 index 0000000..d0e4ef1 Binary files /dev/null and b/mpq/glue/dynamic/fullscreen_tab_block.pcx differ diff --git a/mpq/glue/dynamic/fullscreen_tabs.pcx b/mpq/glue/dynamic/fullscreen_tabs.pcx new file mode 100644 index 0000000..a88e195 Binary files /dev/null and b/mpq/glue/dynamic/fullscreen_tabs.pcx differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index decdf78..ab5bbd2 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -319,7 +319,7 @@ Piety Wards<0> Morrigan Requires:<10> Covenant<0> f<1><4>Train Morrigan <1>(<3>G<1>)<10>Crowd-control infantry.<0> ¤<3><4>Dampening Field <2>(passive)<10>This combatant becomes cloaked for 2 seconds after attacking.<0> -f<1><4>Bestow Maverick <1>(<3>F<1>)<10>Disciplined infantry.<0> +a<1><4>Bestow Maverick <1>(<3>F<1>)<10>Disciplined infantry.<0> ¤<3><4>Accelerated Speech <2>(passive)<10>While the Missionary is within 2 range of its target, it gains +2 armor penetration.<0> ¤<3><4>Flanking Spines <2>(passive)<10>When targeting debuffed enemies, Almaksalisk attacks ignore armor.<0> Anchor Attack requires:<10> Loaded ranged combatant<0> @@ -406,7 +406,7 @@ r<1><4>Warp in Archon <1>(<3>R<1>)<10>Frontline martyr.<0> ¤<3><4>Deconstruction <2>(passive)<10>Targets struck by the Pazuzu are debuffed for 5 seconds, and deal 5% of their weapon damage per stack to themselves when attacking.<0> e<1><4>Build Pazuzu <1>(<3>E<1>)<10>Anti-mech hovertank.<0> a<1><4>Mutate into Vornath Pond <1>(<3>A<1>)<10>Swarm node. Enables Nathrokors and Vorvrokors.<0> -a<1><4>Raise Aspirant <1>(<3>A<1>)<10>Ascendent walker.<0> +g<1><4>Raise Aspirant <1>(<3>G<1>)<10>Ascendent walker.<0> t<1><4>Mutate into Skibact Scab <1>(<3>T<1>)<10>Assault node. Enables Skithrokors and Bactalisks.<0> Terran Infantry Armor<0> Terran Vehicle Plating<0> @@ -435,12 +435,12 @@ Axitrilisk requires:<10> Axtoth Axis<0> ¤<3><4>Anodyne Annex <2>(passive)<10>Dying hostiles that were struck by the Empress in the last 2 seconds become subserviant and zombified.<10>Zombies are stunned if allied masters are outside 8 range for longer than 1 second, and expire if outside 8 range for 5 seconds. Zombies have their corpses avenged 1 second after death.<0> b<1><4>Bestow Blackjack <1>(<3>B<1>)<10>Dutiful walker drone.<0> ¤<3><4>Gamete Meiosis <2>(passive)<10>Whenever a broodspawn is birthed, allied Matraleths within 6 range of the birthing site gain +5 energy.<0> -z<1><4>Bestow Luminary <1>(<3>Z<1>)<10>Disruptive specialist craft. Provides detection.<0> +s<1><4>Bestow Luminary <1>(<3>S<1>)<10>Disruptive specialist craft. Provides detection.<0> a<1><4>Bestow Aspirant <1>(<3>A<1>)<10>Unstable strider.<0> s<1><4>Train Striga <1>(<3>S<1>)<10>Isolating infantry.<0> z<1><4>Raise Luminary <1>(<3>Z<1>)<10>Disruptive craft. Provides detection.<0> ¤<3><4>Incineration <2>(passive)<10>Victims of this combatant take 4 damage per second for 2 seconds.<10>If they take fatal damage during this time, their corpse explodes into a landborne fire field that applies Apollyoid Adhesive.<0> -q<1><4>Splice Tarasque <1>(<3>Q<1>)<10>Frontal biotank.<0> +t<1><4>Splice Tarasque <1>(<3>T<1>)<10>Frontal biotank.<0> g<1><4>Assemble Analogue <1>(<3>G<1>)<10>Durable disruption drone.<0> z<1><4>Splice Anticthon <1>(<3>Z<1>)<10>Corpse engine.<0> c<1><4>Mutate to Chokral Chaszal <1>(<3>C<1>)<10>Assault node. Enables Cherbrathalors, Okrimnilisks, and Algoztalisks.<0> @@ -480,7 +480,7 @@ Sovrol Aspect requires:<10> Tosvrol Haunt<0> d<1><4>Morph into Sovroleths <1>(<3>D<1>)<10>Symbiote strain.<0> ¤<3><4>Whetted Appetite <2>(passive)<10>Seeing death empowers the Mortothrokor, granting 5% lifesteal and increased attack speed.<10><10>This bonus can stack and expires after being out of combat for 2 seconds.<0> ¤<3><4>Excoriation Assembly <2>(passive)<10>Upon taking fatal damage while mobile and above solid ground, Tirades descend and embed themselves into the surface, becoming immobile and more heavily-armored.<10>During this time, they target all hostiles within their weapon range.<0> -c<1><4>Splice Cohort <1>(<3>C<1>)<10>Everlasting infantry.<0> +r<1><4>Splice Cohort <1>(<3>R<1>)<10>Everlasting infantry.<0> ¤<3><4>Mitosal Fog <2>(passive)<10>When the Nathrelisk attacks, it releases a cloud that heals all units within 1 range for 2 HP before dissipating.<0> z<0><4>Swarming Strains <1>(<3>Z<1>)<0> x<0><4>Assault Strains <1>(<3>X<1>)<0> @@ -1108,7 +1108,7 @@ a<1><4>Assemble Renesair <1>(<3>A<1>)<10>Reconstructing interceptor.<0> ¤<3><4>Triumphant Rise <2>(passive)<10>Victims of this warrior's attacks become energized for 1.5 seconds. Attacks on energized enemies bleed 2 shield points to all allies of the warrior within 3 range.<0> d<1><4>Train Madcap <1>(<3>D<1>)<10>Mechanized infantry.<0> ¤<3><4>Cabeirus Feeders <2>(passive)<10>While stationary, the Madcap gains a 15% attack speed bonus per attack, capping at a 150% bonus. This bonus falls off by 20% for every second the Madcap spends moving.<0> -¤<3><4>Miasma <2>(passive)<10>This strain's attacks infect its victims with Miasma for 1.5 seconds.<10>Miasma deals 50 damage over 5 seconds, cannot kill its victims, and reduces healing by 50%.<0> +¤<3><4>Miasma <2>(passive)<10>This strain's attacks infect its victims with Miasma for 1.5 seconds.<10>Miasma deals 15 damage over that time, cannot kill its victims, and reduces healing by 50%.<0> g<3><4>Land Grab <1>(<3>G<1>)<10>Orders the Wyvern to fire its weapon at the target site.<0> r<1><4>Warp in Strident Stratum <1>(<3>R<1>)<10>Utilitarian production.<0> Mantle requires:<10> Atlas<0> @@ -1139,7 +1139,7 @@ w<1><4>Build Cuirass <1>(<3>W<1>)<10>Durable frontline walker.<0> g<1><4>Warp in Gladius <1>(<3>G<1>)<10>Sustaining corvette.<0> r<5><4>Morph into Iroleth <1>(<3>R<1>)<10>Transport strain. Provides detection.<0> <0> -t<1><4>Build Lodestone <1>(<3>T<1>)<10>Defensive emplacement. Detects hidden enemies.<0> +d<1><4>Build Lodestone <1>(<3>D<1>)<10>Defensive emplacement. Detects hidden enemies.<0> t<1><4>Build Parthenon <1>(<3>T<1>)<10>Supportive production.<0> d<1><4>Build Madrigal <1>(<3>D<1>)<10>Versatile hovertank.<0> r<1><4>Build Scrapyard <1>(<3>R<1>)<10>Enables Blackjacks and Matadors.<0> @@ -1499,7 +1499,7 @@ Olympian requires:<10> Guildhall<0> Autocrat requires:<10> Guildhall<0> Anticthon requires:<10> Biotic Bastion<0> Aion requires:<10> Biotic Bastion<0> -z<1><4>Build Serathiel <1>(<3>Z<1>)<10>Vanguard specialist craft.<0> +s<1><4>Build Serathiel <1>(<3>S<1>)<10>Vanguard specialist craft.<0> Serathiel requires:<10> Commandment<0> <0> Expansion Zerg Campaign Area Town<0> @@ -1508,7 +1508,7 @@ Expansion Zerg Campaign Area Town<0> ¤<3><4>Harmony Drive <2>(passive)<10>Clarions gain increased movement speed and acceleration based on shields.<0> Expansion Protoss Campaign Area Town<0> <0> -c<1><4>Build Philoc <1>(<3>C<1>)<10>All-purpose fighter.<0> +w<1><4>Build Philoc <1>(<3>W<1>)<10>All-purpose fighter.<0> ¤<3><4>Death Cycle <2>(passive)<10>Broodspawn have timed life when away from cagra and sires. On attack, they gain 1 second of timed life back. On death, Broodspawn apply Corrosive Touch to hostiles within 3 range for 1 second.<0> Expansion Terran Campaign Area Town<0> <0> @@ -1776,7 +1776,7 @@ e<3><4>Support Mode <1>(<3>E<1>)<10>Returns the Shaman's vision, Nanite Field ra ¤<3><4>Fossilizer Rounds <2>(passive)<10>Negative effects, such as stuns and slows, have their durations extended by Goska's attacks.<0> <0> ¤<3><4>Relentless Aggression <2>(passive)<10>Ghitorokors gain 10% increased attack speed with each attack until they reach the attack speed cap. This bonus falls off after 2 seconds of not being refreshed.<0> -g<1><4>Train Silvertongue <1>(<3>G<1>)<10>Deceiving infantry.<0> +t<1><4>Train Silvertongue <1>(<3>T<1>)<10>Deceiving infantry.<0> ¤<3><4>Recursion Rounds <2>(passive)<10>Each Cyclops attack leaves behind a smart munition that detonates after 2 seconds, damaging all hostiles within 2 range.<0><10><0> g<1><4>Build Dugout <1>(<3>G<1>)<10>Light garrison.<0> z<1><4>Build Azazel <1>(<3>Z<1>)<10>Defensive support craft.<0> diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 82f0361..1968fe6 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 4ed8326..bfb85df 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1444,9 +1444,9 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # WraithAfterburnersInit: - wait 1 - engframe 0 - wait 1 + wait 1 + engframe 0 + wait 1 engframe 17 goto WraithAfterburnersInit @@ -3632,8 +3632,8 @@ CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] -Walking SkryrokorLocal00 -WalkingToIdle SkryrokorLocal00 +Walking Watchdog_Base_Walking +WalkingToIdle Watchdog_Base_WalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt Watchdog_Base_AlmostBuilt @@ -3656,38 +3656,52 @@ Watchdog_Base_AlmostBuilt: goto SkryrokorLocal00 Watchdog_Base_LiftOff: - nobrkcodestart - playsnd 471 # Misc\LiftOff.WAV - playfram 3 - wait 1 -# playfram 5 - wait 8 -# playfram 2 - wait 8 -# playfram 3 - wait 8 -# playfram 4 - sigorder 16 - nobrkcodeend - goto SkryrokorLocal00 + nobrkcodestart + playsnd 471 # Misc\LiftOff.WAV + playfram 3 + imgol 2489 0 0 # Watchdog Engines Idle (cm\t\watchdog-engine.grp) + wait 1 + playfram 4 + wait 4 + playfram 5 + wait 4 + playfram 6 + wait 4 + playfram 7 + wait 12 + sigorder 16 + nobrkcodeend + goto Watchdog_Base_WalkingToIdle Watchdog_Base_Landing: - nobrkcodestart - wait 15 - playsnd 472 # Misc\Land.WAV -# playfram 4 - wait 8 -# playfram 3 - wait 8 -# playfram 2 - wait 8 -# playfram 5 - wait 8 - playfram 0x00 - sigorder 16 - nobrkcodeend - playfram 2 - goto SkryrokorLocal00 + nobrkcodestart + imgol 2488 0 0 # Watchdog Engines (cm\t\watchdog-engine.grp) + wait 15 + playsnd 472 # Misc\Land.WAV + playfram 6 + wait 4 + playfram 5 + wait 4 + sigorder 32 + playfram 4 + wait 8 + playfram 3 + wait 8 + playfram 2 + wait 8 + playfram 0x00 + sigorder 16 + nobrkcodeend + playfram 2 + goto Watchdog_Base_WorkingToIdle + +Watchdog_Base_Walking: + imgol 2488 0 0 # Watchdog Engines (cm\t\watchdog-engine.grp) + goto SkryrokorLocal00 + +Watchdog_Base_WalkingToIdle: + imgol 2489 0 0 # Watchdog Engines Idle (cm\t\watchdog-engine.grp) + goto SkryrokorLocal00 Watchdog_Base_Built: imgol 297 0 0 # Watchdog (Turret) (terran\missileT.grp) @@ -22231,4 +22245,58 @@ HarakanGoldenWalking: move 4 wait 1 playfram 0x40 - goto HarakanGoldenWalking \ No newline at end of file + goto HarakanGoldenWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2488 Watchdog Engine (cm\watchdog-engine.grp) +# 2489 Watchdog Engine 2 (cm\watchdog-engine-2.grp) +.headerstart +IsId 858 +Type 20 +Init BuildingEngineInit +Death Generic_Wait1End +GndAttkInit Generic_Wait1End +AirAttkInit Generic_Wait1End +Unused1 [NONE] +GndAttkRpt Generic_Wait1End +AirAttkRpt Generic_Wait1End +CastSpell Generic_Wait1End +GndAttkToIdle Generic_Wait1End +AirAttkToIdle Generic_Wait1End +Unused2 [NONE] +Walking BuildingEngineInit +WalkingToIdle Generic_Wait1End +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt Generic_Wait1End +Built Generic_Wait1End +Landing BuildingEngineLanding +LiftOff Generic_Wait1End +IsWorking Generic_Wait1End +WorkingToIdle Generic_Wait1End +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +BuildingEngineInit: + playfram 0 + wait 1 + playfram 1 + wait 1 + goto BuildingEngineInit + +BuildingEngineLanding: + playfram 0 + wait 1 + playfram 1 + wait 1 + playfram 0 + wait 1 + playfram 1 + wait 1 + playfram 0 + wait 1 + playfram 1 + wait 1 + end \ No newline at end of file diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 22ff5e0..eb57ead 100644 Binary files a/mpq/scripts/iscript_zerg.bin and b/mpq/scripts/iscript_zerg.bin differ diff --git a/mpq/scripts/iscript_zerg.txt b/mpq/scripts/iscript_zerg.txt index 9ddcf3c..b18c0ec 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -9068,7 +9068,7 @@ AirAttkToIdle ZoryusthalethGndAttkToIdle Unused2 [NONE] Walking ZoryusthalethWalking WalkingToIdle ZoryusthalethGndAttkToIdle -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 SpecialState2 ZoryusthalethSpecialState2 AlmostBuilt [NONE] Built [NONE] diff --git a/mpq/sound/cm/a/cardinal/agg-01.wav b/mpq/sound/cm/a/cardinal/agg-01.wav index 53a74a0..0b64aea 100644 Binary files a/mpq/sound/cm/a/cardinal/agg-01.wav and b/mpq/sound/cm/a/cardinal/agg-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-02.wav b/mpq/sound/cm/a/cardinal/agg-02.wav index 5c2a8dc..97ae299 100644 Binary files a/mpq/sound/cm/a/cardinal/agg-02.wav and b/mpq/sound/cm/a/cardinal/agg-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-03.wav b/mpq/sound/cm/a/cardinal/agg-03.wav index 09ffae1..1df735c 100644 Binary files a/mpq/sound/cm/a/cardinal/agg-03.wav and b/mpq/sound/cm/a/cardinal/agg-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-04.wav b/mpq/sound/cm/a/cardinal/agg-04.wav index f85a07e..5f47079 100644 Binary files a/mpq/sound/cm/a/cardinal/agg-04.wav and b/mpq/sound/cm/a/cardinal/agg-04.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-01.wav b/mpq/sound/cm/a/cardinal/yes-01.wav index 8021304..b3a8d1c 100644 Binary files a/mpq/sound/cm/a/cardinal/yes-01.wav and b/mpq/sound/cm/a/cardinal/yes-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-02.wav b/mpq/sound/cm/a/cardinal/yes-02.wav index 3477eda..540ab4f 100644 Binary files a/mpq/sound/cm/a/cardinal/yes-02.wav and b/mpq/sound/cm/a/cardinal/yes-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-03.wav b/mpq/sound/cm/a/cardinal/yes-03.wav index ac4498d..4bbad1b 100644 Binary files a/mpq/sound/cm/a/cardinal/yes-03.wav and b/mpq/sound/cm/a/cardinal/yes-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-04.wav b/mpq/sound/cm/a/cardinal/yes-04.wav index 3a358ad..25974d9 100644 Binary files a/mpq/sound/cm/a/cardinal/yes-04.wav and b/mpq/sound/cm/a/cardinal/yes-04.wav differ diff --git a/mpq/sound/cm/a/intendent/agg-01.wav b/mpq/sound/cm/a/intendent/agg-01.wav new file mode 100644 index 0000000..a0e7150 Binary files /dev/null and b/mpq/sound/cm/a/intendent/agg-01.wav differ diff --git a/mpq/sound/cm/a/intendent/agg-02.wav b/mpq/sound/cm/a/intendent/agg-02.wav new file mode 100644 index 0000000..c3dd4cd Binary files /dev/null and b/mpq/sound/cm/a/intendent/agg-02.wav differ diff --git a/mpq/sound/cm/a/intendent/agg-03.wav b/mpq/sound/cm/a/intendent/agg-03.wav new file mode 100644 index 0000000..a17e592 Binary files /dev/null and b/mpq/sound/cm/a/intendent/agg-03.wav differ diff --git a/mpq/sound/cm/a/intendent/agg-04.wav b/mpq/sound/cm/a/intendent/agg-04.wav new file mode 100644 index 0000000..36a4da2 Binary files /dev/null and b/mpq/sound/cm/a/intendent/agg-04.wav differ diff --git a/mpq/sound/cm/a/intendent/hlp-01.wav b/mpq/sound/cm/a/intendent/hlp-01.wav new file mode 100644 index 0000000..07deae1 Binary files /dev/null and b/mpq/sound/cm/a/intendent/hlp-01.wav differ diff --git a/mpq/sound/cm/a/intendent/hlp-02.wav b/mpq/sound/cm/a/intendent/hlp-02.wav new file mode 100644 index 0000000..ed6491a Binary files /dev/null and b/mpq/sound/cm/a/intendent/hlp-02.wav differ diff --git a/mpq/sound/cm/a/intendent/hlp-03.wav b/mpq/sound/cm/a/intendent/hlp-03.wav new file mode 100644 index 0000000..b6190e3 Binary files /dev/null and b/mpq/sound/cm/a/intendent/hlp-03.wav differ diff --git a/mpq/sound/cm/a/intendent/hlp-04.wav b/mpq/sound/cm/a/intendent/hlp-04.wav new file mode 100644 index 0000000..cfa08b8 Binary files /dev/null and b/mpq/sound/cm/a/intendent/hlp-04.wav differ diff --git a/mpq/sound/cm/a/intendent/rdy-01.wav b/mpq/sound/cm/a/intendent/rdy-01.wav new file mode 100644 index 0000000..abfeb65 Binary files /dev/null and b/mpq/sound/cm/a/intendent/rdy-01.wav differ diff --git a/mpq/sound/cm/a/intendent/rdy-02.wav b/mpq/sound/cm/a/intendent/rdy-02.wav new file mode 100644 index 0000000..eb46bf2 Binary files /dev/null and b/mpq/sound/cm/a/intendent/rdy-02.wav differ diff --git a/mpq/sound/cm/a/intendent/rdy-03.wav b/mpq/sound/cm/a/intendent/rdy-03.wav new file mode 100644 index 0000000..e3d1227 Binary files /dev/null and b/mpq/sound/cm/a/intendent/rdy-03.wav differ diff --git a/mpq/sound/cm/a/intendent/wht-01.wav b/mpq/sound/cm/a/intendent/wht-01.wav new file mode 100644 index 0000000..230814b Binary files /dev/null and b/mpq/sound/cm/a/intendent/wht-01.wav differ diff --git a/mpq/sound/cm/a/intendent/wht-02.wav b/mpq/sound/cm/a/intendent/wht-02.wav new file mode 100644 index 0000000..58eee5e Binary files /dev/null and b/mpq/sound/cm/a/intendent/wht-02.wav differ diff --git a/mpq/sound/cm/a/intendent/wht-03.wav b/mpq/sound/cm/a/intendent/wht-03.wav new file mode 100644 index 0000000..1b45b3c Binary files /dev/null and b/mpq/sound/cm/a/intendent/wht-03.wav differ diff --git a/mpq/sound/cm/a/intendent/wht-04.wav b/mpq/sound/cm/a/intendent/wht-04.wav new file mode 100644 index 0000000..467afe1 Binary files /dev/null and b/mpq/sound/cm/a/intendent/wht-04.wav differ diff --git a/mpq/sound/cm/a/intendent/yes-01.wav b/mpq/sound/cm/a/intendent/yes-01.wav new file mode 100644 index 0000000..394d72a Binary files /dev/null and b/mpq/sound/cm/a/intendent/yes-01.wav differ diff --git a/mpq/sound/cm/a/intendent/yes-02.wav b/mpq/sound/cm/a/intendent/yes-02.wav new file mode 100644 index 0000000..7577d97 Binary files /dev/null and b/mpq/sound/cm/a/intendent/yes-02.wav differ diff --git a/mpq/sound/cm/a/intendent/yes-03.wav b/mpq/sound/cm/a/intendent/yes-03.wav new file mode 100644 index 0000000..cffa075 Binary files /dev/null and b/mpq/sound/cm/a/intendent/yes-03.wav differ diff --git a/mpq/sound/cm/a/intendent/yes-04.wav b/mpq/sound/cm/a/intendent/yes-04.wav new file mode 100644 index 0000000..1affbcd Binary files /dev/null and b/mpq/sound/cm/a/intendent/yes-04.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-01.wav b/mpq/sound/cm/a/vicar/agg-01.wav index b0437cc..12f9bac 100644 Binary files a/mpq/sound/cm/a/vicar/agg-01.wav and b/mpq/sound/cm/a/vicar/agg-01.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-02.wav b/mpq/sound/cm/a/vicar/agg-02.wav index 15759d1..c3bc6b8 100644 Binary files a/mpq/sound/cm/a/vicar/agg-02.wav and b/mpq/sound/cm/a/vicar/agg-02.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-03.wav b/mpq/sound/cm/a/vicar/agg-03.wav index b006b10..e6c3805 100644 Binary files a/mpq/sound/cm/a/vicar/agg-03.wav and b/mpq/sound/cm/a/vicar/agg-03.wav differ diff --git a/mpq/sound/cm/a/vicar/agg-04.wav b/mpq/sound/cm/a/vicar/agg-04.wav index f4f8b8c..abbbc8d 100644 Binary files a/mpq/sound/cm/a/vicar/agg-04.wav and b/mpq/sound/cm/a/vicar/agg-04.wav differ diff --git a/mpq/sound/cm/a/vicar/cst-01.wav b/mpq/sound/cm/a/vicar/cst-01.wav index 086277d..a3483c4 100644 Binary files a/mpq/sound/cm/a/vicar/cst-01.wav and b/mpq/sound/cm/a/vicar/cst-01.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-01.wav b/mpq/sound/cm/a/vicar/yes-01.wav index e3f8072..e58166b 100644 Binary files a/mpq/sound/cm/a/vicar/yes-01.wav and b/mpq/sound/cm/a/vicar/yes-01.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-02.wav b/mpq/sound/cm/a/vicar/yes-02.wav index d5dac38..ebeae96 100644 Binary files a/mpq/sound/cm/a/vicar/yes-02.wav and b/mpq/sound/cm/a/vicar/yes-02.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-03.wav b/mpq/sound/cm/a/vicar/yes-03.wav index d012487..6cdd85d 100644 Binary files a/mpq/sound/cm/a/vicar/yes-03.wav and b/mpq/sound/cm/a/vicar/yes-03.wav differ diff --git a/mpq/sound/cm/a/vicar/yes-04.wav b/mpq/sound/cm/a/vicar/yes-04.wav index 3a85ca0..59c409d 100644 Binary files a/mpq/sound/cm/a/vicar/yes-04.wav and b/mpq/sound/cm/a/vicar/yes-04.wav differ diff --git a/mpq/unit/cm/a/intendent.grp b/mpq/unit/cm/a/intendent.grp index 6333b14..3f06900 100644 Binary files a/mpq/unit/cm/a/intendent.grp and b/mpq/unit/cm/a/intendent.grp differ diff --git a/mpq/unit/cm/t/watchdog-turret.grp b/mpq/unit/cm/t/watchdog-turret.grp new file mode 100644 index 0000000..870c0cb Binary files /dev/null and b/mpq/unit/cm/t/watchdog-turret.grp differ diff --git a/mpq/unit/cm/z/agrileth-birth.grp b/mpq/unit/cm/z/agrileth-birth.grp index 1240111..027e19b 100644 Binary files a/mpq/unit/cm/z/agrileth-birth.grp and b/mpq/unit/cm/z/agrileth-birth.grp differ diff --git a/mpq/unit/cm/z/agrileth-remains.grp b/mpq/unit/cm/z/agrileth-remains.grp index 673d123..91ca4db 100644 Binary files a/mpq/unit/cm/z/agrileth-remains.grp and b/mpq/unit/cm/z/agrileth-remains.grp differ diff --git a/mpq/unit/cm/z/agrileth.grp b/mpq/unit/cm/z/agrileth.grp index 157e678..c70142f 100644 Binary files a/mpq/unit/cm/z/agrileth.grp and b/mpq/unit/cm/z/agrileth.grp differ diff --git a/mpq/unit/cm/z/quazilisk-attack.grp b/mpq/unit/cm/z/quazilisk-attack.grp index 541b045..c150621 100644 Binary files a/mpq/unit/cm/z/quazilisk-attack.grp and b/mpq/unit/cm/z/quazilisk-attack.grp differ diff --git a/mpq/unit/cm/z/quazilisk-birth.grp b/mpq/unit/cm/z/quazilisk-birth.grp index 28e5ae6..6d27c5b 100644 Binary files a/mpq/unit/cm/z/quazilisk-birth.grp and b/mpq/unit/cm/z/quazilisk-birth.grp differ diff --git a/mpq/unit/cm/z/quazilisk-mutate.grp b/mpq/unit/cm/z/quazilisk-mutate.grp index 53d42f4..a4b6e36 100644 Binary files a/mpq/unit/cm/z/quazilisk-mutate.grp and b/mpq/unit/cm/z/quazilisk-mutate.grp differ diff --git a/mpq/unit/cm/z/quazilisk-remains.grp b/mpq/unit/cm/z/quazilisk-remains.grp index 0ebbb33..c215a9e 100644 Binary files a/mpq/unit/cm/z/quazilisk-remains.grp and b/mpq/unit/cm/z/quazilisk-remains.grp differ diff --git a/mpq/unit/cm/z/quazilisk-shadow.grp b/mpq/unit/cm/z/quazilisk-shadow.grp index 509ab9f..e7ea827 100644 Binary files a/mpq/unit/cm/z/quazilisk-shadow.grp and b/mpq/unit/cm/z/quazilisk-shadow.grp differ diff --git a/mpq/unit/cm/z/quazilisk.grp b/mpq/unit/cm/z/quazilisk.grp index e12879d..b54034f 100644 Binary files a/mpq/unit/cm/z/quazilisk.grp and b/mpq/unit/cm/z/quazilisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 27a2760..7e41ab0 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 965dba8..62f68f7 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/missile.grp b/mpq/unit/terran/missile.grp deleted file mode 100644 index 8d57e61..0000000 Binary files a/mpq/unit/terran/missile.grp and /dev/null differ diff --git a/mpq/unit/terran/missile.lof b/mpq/unit/terran/missile.lof deleted file mode 100644 index 490f595..0000000 Binary files a/mpq/unit/terran/missile.lof and /dev/null differ diff --git a/mpq/unit/terran/watchdog-attack.lol b/mpq/unit/terran/watchdog-attack.lol new file mode 100644 index 0000000..17988ad Binary files /dev/null and b/mpq/unit/terran/watchdog-attack.lol differ diff --git a/mpq/unit/terran/watchdog-damage.lof b/mpq/unit/terran/watchdog-damage.lof new file mode 100644 index 0000000..740db2b Binary files /dev/null and b/mpq/unit/terran/watchdog-damage.lof differ diff --git a/mpq/unit/terran/watchdog-engine-idle.grp b/mpq/unit/terran/watchdog-engine-idle.grp new file mode 100644 index 0000000..fcda017 Binary files /dev/null and b/mpq/unit/terran/watchdog-engine-idle.grp differ diff --git a/mpq/unit/terran/watchdog-engine.grp b/mpq/unit/terran/watchdog-engine.grp new file mode 100644 index 0000000..bb98f25 Binary files /dev/null and b/mpq/unit/terran/watchdog-engine.grp differ diff --git a/mpq/unit/terran/watchdog-shadow.grp b/mpq/unit/terran/watchdog-shadow.grp new file mode 100644 index 0000000..8e7732b Binary files /dev/null and b/mpq/unit/terran/watchdog-shadow.grp differ diff --git a/mpq/unit/terran/watchdog-turret.grp b/mpq/unit/terran/watchdog-turret.grp new file mode 100644 index 0000000..1cd9b15 Binary files /dev/null and b/mpq/unit/terran/watchdog-turret.grp differ diff --git a/mpq/unit/terran/watchdog.grp b/mpq/unit/terran/watchdog.grp new file mode 100644 index 0000000..dea8d87 Binary files /dev/null and b/mpq/unit/terran/watchdog.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 3ce696b..6ad03fc 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 7674c5f..a876ab3 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 c1e1b38..6b6768d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -22,11 +22,16 @@ - **Known issues:** the `wait` crig action does not currently operate - **A new campaign menu has been achieved!** (c. Jesse) - It's so epic... please enjoy! +- **Options menu now allows for:** (c. Jesse) + - Advisor selection + - Player color selection + - Validation on save to prevent errors ## Game Modes - **NEW: Mindshare** (b. BtyB) - Resource pool is shared among allies! - *Caveat: Starting resources are not yet doubled in all cases* + - *Caveat: Cancelling units may result in oddities until fixed* ## Bugfixes - **Stability:** @@ -47,9 +52,11 @@ ## Audiovisuals - New models for: + - Watchdog (c. Solstice) - Magnetar, Ardent Authority, Argosy (c. DeltaCadimus) - Vorvrokor (c. Baelethal) - Landlock, Radix, Cipher, Function, Proscenium (c. fasswawds) + - All new wireframes c. jun3hong! - Resized model for: - Talos, Cyprian - Modified model (mostly shaders) for: @@ -59,7 +66,7 @@ - Added weapon launch offsets for: - Aphorist, Silversoul, Ghostwrit, Phontis, Iconoclast, Crematorium - Modified unit responses for Vorvrokor -- New unit responses for Cardinal +- New unit responses for Cardinal, Intendent - New error and structure placement SFX for Askosi (c. lolrsk8s) - New weapon SFX for: - Alzurokor (c. lolrsk8s) diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 11dbfd3..03b0b62 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ