diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 43cdba54..4e4dab5e 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 723c5a9f..8a5a1052 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -573,9 +573,9 @@ Arhaun Turret Morningstar Radiation Field Zozarc Gorge Autocort -Extended Flingy #367 -Extended Flingy #368 -Extended Flingy #369 +Ogun (Tank Mode) +Ogun (Smithy Mode) +Cannibal Extended Flingy #370 Extended Flingy #371 Extended Flingy #372 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 79bf2cd2..34df4b17 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 b2a37661..1341996b 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 7a63aaa8..c1f696c7 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2057,12 +2057,12 @@ Zozarc Gorge Shadow Cikralisk Attack Overlay Autocort Autocort Shadow -Extended Image #1057 -Extended Image #1058 -Extended Image #1059 -Extended Image #1060 -Extended Image #1061 -Extended Image #1062 +Ogun (Tank Mode) +Ogun Shadow (Tank Mode) +Ogun (Smithy Mode) +Ogun Shadow (Smithy Mode) +Cannibal +Cannibal Shadow Extended Image #1063 Extended Image #1064 Extended Image #1065 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 5c8378d0..76612e5f 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3532,10 +3532,10 @@ Smoochie Boy Weaponfire 01 Smoochie Boy Weaponfire 02 Smoochie Boy Weaponfire 03 Zozarc Gorge Selected 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Cannibal Weaponfire 01 +Cannibal Weaponfire 02 +Cannibal Weaponfire 03 +Cannibal Weaponfire 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 440af326..b794f0b3 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3531,4 +3531,8 @@ cm\faultline\smoochie-boy\wh-04.wav cm\faultline\smoochie-boy\wf-01.wav cm\faultline\smoochie-boy\wf-02.wav cm\faultline\smoochie-boy\wf-03.wav -cm\z\_building\zozarc-gorge.wav \ No newline at end of file +cm\z\_building\zozarc-gorge.wav +cm\f-t\cannibal\wf-01.wav +cm\f-t\cannibal\wf-02.wav +cm\f-t\cannibal\wf-03.wav +cm\f-t\cannibal\wf-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index d99fac2f..eac8fa31 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 a8cc40fd..04696513 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1015,9 +1015,9 @@ Arhaun Turret Morningstar Radiation Field Zozarc Gorge Autocort -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Ogun (Tank Mode) +Ogun (Smithy Mode) +Cannibal Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 66a25405..1a2710fb 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index dc2a909f..3d569da5 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -492,10 +492,10 @@ Terran Arhaun (Base) Arhaun Turret Terran Addon Submenu Zerg Zozarc Gorge -Terran Ogun +Terran Ogun (Worker Mode) Protoss Autocort -Extended Unit #269 -Extended Unit #270 +Terran Cannibal (Upstart) +Terran Ogun (Smithy Mode) Extended Unit #271 Extended Unit #272 Francisco Goska diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index a0864833..a8f42738 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index a5343f72..d9022103 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -47,7 +47,7 @@ Plasmid Spores (Alkajelisk) Acid Spore (Geszithalor) Serrated Cleavers (Gorgrokor) Glave Wurm (Mutalisk) -Parasitic Spores (Alkajelisk) +Dispatch Pistols (Proselyte) Corrosive Acid (Bactalisk) Jupiter Driver (Pazuzu) Seeker Spores (Spraith Cesiant) @@ -55,7 +55,7 @@ Subterranean Tentacle (Surkith Cesiant) Skittering Spores (Skithrokor) Suicide (Skryrokor) Parasitic Excision (Matraleth ability) -Salvage (Talos) +Twintorch (Dyad) Screaming Venom 2 (Keskathalor) Dark Swarm (Isthrathaleth ability) Plague (Isthrathaleth ability) @@ -75,9 +75,9 @@ Photon Blasters (Aurora) Plasma Missiles (Panoptus) Aeon's Madness (Augur) Plasma Torpedo (Exemplar) -Phase Disruptor Cannon (Didact) +Aruo Twinshot (Missionary) Neutron Cannon (Magister) -Pulse Cannon (Steward) +Pulse Cannons (Steward) Prismatic Cannon (Warden) Swarming Spores (Rililisk) Plasma Shell (Accantor) (deprecated) @@ -152,10 +152,10 @@ Blindside Rockets (Sundog) Twinstrike Flamethrowers (Matador) Bisecting Blades (Zarcavrokor) Bones of Reflection -Retractor Batteries (Pegasus) -Lancet Missiles (Pegasus) +Scepter Orma Scrapray +Ersa Driver (Intendent) Chimera Cannons (Hippogriff) -Axis Drivers (Oberon) +Alru Burstray (Intendent) Pegasus Missiles (Hippogriff) Lazarus Salvo (Aion) Stellar Torch (Herald) @@ -177,16 +177,16 @@ Geometric Rifle (Sevenstep) Kaleidoscope Cannon (Hypnagogue) Cleaving Maw (Tetcaerokor) Spirtith Spores (Spirtith Colony) -Signatory Salvo (Ambassador) +Usko Scrapray (Helion) Skortra Tendril (Skortrith Colony) -Excellency Laser Batteries (Heir) -Hades Cannon (Horseman) +Ikta Driver (Tirade) +Reforming Carbine (Avatar) Through the Looking Glass (Hypnagogue) Wordsmith Railgun (Silvertongue) Sunsplit Beam (Optecton) -Skybond Ray (Optecton) +Particle Ray (Autocort) Ironhand Weaver (Patriarch) -Nominee Burst Rifle (Thespian) +Angeltear Missiles (Madrigal Hecaton) Embalming Spores (Selkerilisk) Congealing Spores (Elthrazalisk) Plasma Shell (Accantor) @@ -231,7 +231,7 @@ Phase Cremator (Ashguard) Successive Spines (Lakizilisk, Zorthos) Rapid Spines (Zobriolisk A) Quazrok Spray (Quazrokor) -Phase Disruptor (Dracadin) +Phase Disruptor (Dracadin Order) Moonbound Salvo (Tiangou) Revenant Rifle (Nydus Eidolon) Gauss Slugger (Maverick Futurist) @@ -241,7 +241,7 @@ Mining Saber (Pilgrim) Asoni Carbine (Blackguard) Phlegethon Cannons (Arhaun) Homing Spore (Liiralisk) -Extended Weapon #114 +Zulu Sidekicks (Cannibal) Extended Weapon #115 Extended Weapon #116 Extended Weapon #117 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 6dbde51a..cb05d68d 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 e47f646e..d33a04c6 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index adffaf1a..77bd18ee 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 7bd53f02..776b3c9b 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index d746e399..03f3d983 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/portrait/special/pr0nogo/fid00.smk b/mpq/portrait/special/pr0nogo/fid00.smk new file mode 100644 index 00000000..6b12bb62 Binary files /dev/null and b/mpq/portrait/special/pr0nogo/fid00.smk differ diff --git a/mpq/portrait/special/pr0nogo/fid01.smk b/mpq/portrait/special/pr0nogo/fid01.smk new file mode 100644 index 00000000..c46fd635 Binary files /dev/null and b/mpq/portrait/special/pr0nogo/fid01.smk differ diff --git a/mpq/portrait/special/pr0nogo/fid02.smk b/mpq/portrait/special/pr0nogo/fid02.smk new file mode 100644 index 00000000..d5569418 Binary files /dev/null and b/mpq/portrait/special/pr0nogo/fid02.smk differ diff --git a/mpq/portrait/special/pr0nogo/tlk00.smk b/mpq/portrait/special/pr0nogo/tlk00.smk new file mode 100644 index 00000000..fc96bf65 Binary files /dev/null and b/mpq/portrait/special/pr0nogo/tlk00.smk differ diff --git a/mpq/portrait/special/pr0nogo/tlk01.smk b/mpq/portrait/special/pr0nogo/tlk01.smk new file mode 100644 index 00000000..0773f2fb Binary files /dev/null and b/mpq/portrait/special/pr0nogo/tlk01.smk differ diff --git a/mpq/portrait/special/pr0nogo/tlk02.smk b/mpq/portrait/special/pr0nogo/tlk02.smk new file mode 100644 index 00000000..72decfb1 Binary files /dev/null and b/mpq/portrait/special/pr0nogo/tlk02.smk differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 75eb356b..945555be 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index a09e7efb..a33f4f23 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 49bae7aa..a68e72cd 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -55,6 +55,7 @@ military tiangou = 433 military maverick_futurist = 435 military blackguard = 489 military arhaun = 490 +military cannibal = 496 # Protoss factional units military adherent = 400 @@ -96,6 +97,8 @@ military valkyrie = 58 # Terran NGS units building talos = 20 +building ogun_worker = 494 +building ogun_smithy = 497 # military apostle = 10 military shaman = 15 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 63ef88a8..1c45f5ac 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 70e0e5ba..82e866fa 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -18970,4 +18970,272 @@ Arhaun_Turret_GndAttkInit: nobrkcodeend gotorepeatattk ignorerest - goto Goliath_Turret_Init \ No newline at end of file + goto Goliath_Turret_Init + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1586 Cannibal (cm\terran\cannibal.grp) +.headerstart +IsId 829 +Type 12 +Init CannibalInit +Death CannibalDeath +GndAttkInit CannibalGndAttkInit +AirAttkInit CannibalGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt CannibalGndAttkRpt +AirAttkRpt CannibalGndAttkRpt +CastSpell CannibalCastSpell +GndAttkToIdle CannibalGndAttkToIdle +AirAttkToIdle CannibalGndAttkToIdle +Unused2 [NONE] +Walking CannibalWalking +WalkingToIdle CannibalWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CannibalInit: + imgul 2064 0 0 # Cannibal Shadow (cm\faction-t\cannibal.grp) +CannibalWalkingToIdle: + playfram 0x00 + goto CannibalLocal00 + +CannibalLocal00: + wait 125 + goto CannibalLocal00 + +CannibalDeath: + playsndbtwn 276 277 # Maverick death 01, 02 + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 820 0 0 # Cannibal Remains (cm\terran\cannibal-remains.grp) + wait 1 + end + +CannibalGndAttkInit: + playfram 0x120 + wait 1 + playfram 0x160 +CannibalGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x1E0 + attackwith 1 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x180 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +CannibalGndAttkToIdle: + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + goto CannibalWalkingToIdle + +CannibalCastSpell: + wait 1 + goto CannibalGndAttkToIdle + +CannibalWalking: + move 3 + wait 1 + playfram 0x80 + move 3 + wait 1 + playfram 0xA0 + move 3 + wait 1 + playfram 0xC0 + move 3 + wait 1 + playfram 0xE0 + move 3 + wait 1 + playfram 0x100 + move 3 + wait 1 + playfram 0x20 + move 3 + wait 1 + playfram 0x40 + move 3 + wait 1 + playfram 0x60 + goto CannibalWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2059 Ogun Worker Mode (cm\terran\ogun.grp) +.headerstart +IsId 830 +Type 15 +Init OgunInit +Death OgunDeath +GndAttkInit OgunGndAttkInit +AirAttkInit OgunGndAttkInit +Unused1 OgunUnused1 +GndAttkRpt OgunGndAttkInit +AirAttkRpt OgunGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking OgunWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt OgunGndAttkInit +.headerend +# ----------------------------------------------------------------------------- # + +OgunInit: + imgul 2060 0 0 # Ogun Shadow (cm\terran\ogun-shadow.grp) + playfram 0x00 + goto InfestedTerranWalkingToIdle + +OgunDeath: + playsndbtwn 1385 1386 # Ogun death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +OgunUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 # Shaman revive 01, 02 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto InfestedTerranWalkingToIdle + +OgunGndAttkInit: + playfram 0x00 + setvertpos 0 + wait 1 + useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) + sigorder 32 + wait 13 + goto OgunGndAttkInit + +OgunWalking: + playfram 0x20 + move 4 + wait 1 + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + goto OgunWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2061 Ogun Smithy Mode (cm\terran\ogun.grp) +.headerstart +IsId 831 +Type 14 +Init OgunSmithyModeInit +Death OgunSmithyModeDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 OgunSmithyModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle OgunSmithyModeGndAttkToIdle +AirAttkToIdle OgunSmithyModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle SkryrokorLocal00 +SpecialState1 OgunSmithyModeSpecialState2 +SpecialState2 OgunSmithyModeSpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +OgunSmithyModeInit: + imgul 2062 0 0 # Ogun Shadow (cm\terran\ogun-shadow.grp) + wait 1 + playsnd 2429 # Ogun Smithy Transform + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 6 + sigorder 1 + goto OgunSmithyModeGndAttkToIdle + +OgunSmithyModeGndAttkToIdle: + playfram 0x180 + wait 1 + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x200 + wait 1 + playfram 0x220 + wait 1 + playfram 0x240 + wait 1 + playfram 0x260 + wait 1 + goto OgunSmithyModeGndAttkToIdle + +OgunSmithyModeDeath: + playsndbtwn 1385 1386 # Ogun death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +OgunSmithyModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 # Shaman revive 01, 02 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto OgunSmithyModeGndAttkToIdle + +OgunSmithyModeSpecialState2: + playsnd 2430 # Ogun Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 6 + sigorder 1 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-02.pk deleted file mode 100644 index 8617c376..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-03.pk deleted file mode 100644 index d5da875d..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-a-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-01.pk deleted file mode 100644 index e4e772cf..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-02.pk deleted file mode 100644 index a563da17..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-03.pk deleted file mode 100644 index 60712f11..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-b-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-01.pk deleted file mode 100644 index 3eeac17c..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-03.pk deleted file mode 100644 index 761e0c27..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-k-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-p-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-p-02.pk deleted file mode 100644 index baf42fbe..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-p-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-01.pk deleted file mode 100644 index d5da94df..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-03.pk deleted file mode 100644 index 690b9c26..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-t-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-01.pk deleted file mode 100644 index b1f0beb2..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-02.pk deleted file mode 100644 index c535d38f..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-03.pk deleted file mode 100644 index 7deaac13..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_allyattack-z-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-01.pk deleted file mode 100644 index c3faf712..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-02.pk deleted file mode 100644 index 9739744f..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-03.pk deleted file mode 100644 index 30883c87..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-04.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-04.pk deleted file mode 100644 index 1bbcf394..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_armyattack-04.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-02.pk deleted file mode 100644 index 13b1a12b..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-03.pk deleted file mode 100644 index 16899804..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-04.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-04.pk deleted file mode 100644 index 3c1b9a1b..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_baseattack-04.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-01.pk deleted file mode 100644 index 7f0e851c..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-02.pk deleted file mode 100644 index 12770021..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-03.pk deleted file mode 100644 index 7f62f47d..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-04.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-04.pk deleted file mode 100644 index 74b297d2..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_energy-04.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_intland-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_intland-01.pk deleted file mode 100644 index 2411f599..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_intland-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-03.pk deleted file mode 100644 index 8c41f2ec..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-04.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-04.pk deleted file mode 100644 index fd988947..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_minerals-04.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-01.pk deleted file mode 100644 index 8a3fbf0f..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-02.pk deleted file mode 100644 index e0da2e7d..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nobuild-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_noland-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_noland-01.pk deleted file mode 100644 index 67793352..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_noland-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-01.pk deleted file mode 100644 index 5eef80d6..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-02.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-02.pk deleted file mode 100644 index 72794a4b..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_nowarp-02.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-01.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-01.pk deleted file mode 100644 index 0ab12ff8..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-01.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-03.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-03.pk deleted file mode 100644 index c1d04ab6..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-03.pk and /dev/null differ diff --git a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-04.pk b/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-04.pk deleted file mode 100644 index e249fb5d..00000000 Binary files a/mpq/sound/cm/advisors/golden-republic/goldenrepublicad_vespene-04.pk and /dev/null differ diff --git a/mpq/sound/cm/f-t/cannibal/wf-01.wav b/mpq/sound/cm/f-t/cannibal/wf-01.wav new file mode 100644 index 00000000..cc9f96ce Binary files /dev/null and b/mpq/sound/cm/f-t/cannibal/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/cannibal/wf-02.wav b/mpq/sound/cm/f-t/cannibal/wf-02.wav new file mode 100644 index 00000000..9212c7d2 Binary files /dev/null and b/mpq/sound/cm/f-t/cannibal/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/cannibal/wf-03.wav b/mpq/sound/cm/f-t/cannibal/wf-03.wav new file mode 100644 index 00000000..aee2b190 Binary files /dev/null and b/mpq/sound/cm/f-t/cannibal/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/cannibal/wf-04.wav b/mpq/sound/cm/f-t/cannibal/wf-04.wav new file mode 100644 index 00000000..7db53689 Binary files /dev/null and b/mpq/sound/cm/f-t/cannibal/wf-04.wav differ diff --git a/mpq/sound/cm/p/vagrant/wht-01.pk b/mpq/sound/cm/p/vagrant/wht-01.pk deleted file mode 100644 index 7e40c16e..00000000 Binary files a/mpq/sound/cm/p/vagrant/wht-01.pk and /dev/null differ diff --git a/mpq/sound/cm/t/sundog/wht-01.pk b/mpq/sound/cm/t/sundog/wht-01.pk deleted file mode 100644 index d2d46428..00000000 Binary files a/mpq/sound/cm/t/sundog/wht-01.pk and /dev/null differ diff --git a/mpq/unit/cm/faction-t/cannibal-shadow.grp b/mpq/unit/cm/faction-t/cannibal-shadow.grp new file mode 100644 index 00000000..ca908ffd Binary files /dev/null and b/mpq/unit/cm/faction-t/cannibal-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/cannibal.grp b/mpq/unit/cm/faction-t/cannibal.grp new file mode 100644 index 00000000..a9a6069d Binary files /dev/null and b/mpq/unit/cm/faction-t/cannibal.grp differ diff --git a/mpq/unit/cm/terran/ogun-shadow.grp b/mpq/unit/cm/terran/ogun-shadow.grp new file mode 100644 index 00000000..84f7ef3a Binary files /dev/null and b/mpq/unit/cm/terran/ogun-shadow.grp differ diff --git a/mpq/unit/cm/terran/ogun.grp b/mpq/unit/cm/terran/ogun.grp new file mode 100644 index 00000000..f49809ef Binary files /dev/null and b/mpq/unit/cm/terran/ogun.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ce022739..f03e8765 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 f90bc6ee..2f96caac 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index f1d8b3ed..b25ae333 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 4e42b385..ec1d8936 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 fac75e24..f773b780 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -9,14 +9,31 @@ - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! ## Bugfixes +- **Stability:** + - Resolved a common crash after warping in a Monument of Sin (r. HitEmUp & Sosij, c. DF) - **AI:** - Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam) - **Audiovisual:** + - Fixed icon display for **Solarion** hangar (r. jakulangski, c. DF) - Corrected filenames for a few miscellaneous sound files (r. Mimika) +## Terran +- [Valkyrie](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/valkyrie): + - **Halo Rockets:** + - Weapon range 6 » 7 + - Weapon still fired at 6 range, improving chase potential +- [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile): + - Vision range 10 » 8 +- **NEW:** [Ogun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ogun): + - Sturdy constructor with a repair-oriented deployment + - Trained from Ministry or Treasury; requires Quarry +- **NEW:** [Cannibal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cannibal): + - **Upstart only!** Raiding infantry; replaces Cyprian + ## Protoss - **NEW:** [Autocort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/autocort): - - Advanced constructor with personal power field; trained from Embassy + - Advanced constructor with personal power field + - Trained from Embassy ## Zerg - [Sovroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovroleth): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 84f72b30..cdb57713 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ