diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 9476c51a..717d81c4 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a536c08c..0e03e5ca 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 d3fa5188..3f895fb6 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -349,7 +349,7 @@ Stasis Cell Protoss Monogram Protoss Hall of Heretics Zerg Nephrilosk -Protoss Vagrant (Shade) +Protoss Vagrant Shade Protoss Accantor Zerg Ocsal Larva Zerg Ocsal Colony diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 74fe4da2..6134f740 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 5e431bce..76cf4448 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/tips.tbl b/mpq/rez/tips.tbl index d5e1ade1..90e48010 100644 Binary files a/mpq/rez/tips.tbl and b/mpq/rez/tips.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 1aafc5eb..71cc21ed 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -3307,34 +3307,34 @@ WarpIn [NONE] # ----------------------------------------------------------------------------- # CreepColonyInit: - imgul 69 0 0 # Creep Colony Shadow (zerg\zfcShad.grp) - playfram 0x00 # Frame set 0 + imgul 69 0 0 # Creep Colony Shadow (zerg\zfcShad.grp) + playfram 0x00 goto InfestedTerranLocal00 CreepColonyAlmostBuilt: - imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) + imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) CreepColonyBuilt: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 CreepColonyLocal00: - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 2 - playfram 0x00 # Frame set 0 - wait 2 + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 0x00 + wait 2 goto CreepColonyLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 070 Hatchery (zerg\hatchery.grp) +# 070 Hachirosk (zerg\hatchery.grp) .headerstart IsId 43 Type 20 -Init HatcheryInit -Death HatcheryDeath +Init HachiroskInit +Death HachiroskDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -3348,22 +3348,22 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt HatcheryAlmostBuilt -Built HatcheryBuilt +AlmostBuilt HachiroskAlmostBuilt +Built HachiroskBuilt Landing [NONE] LiftOff [NONE] -IsWorking HatcheryIsWorking -WorkingToIdle HatcheryWorkingToIdle +IsWorking HachiroskIsWorking +WorkingToIdle HachiroskWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -HatcheryInit: - imgul 71 0 0 # Hatchery Shadow (zerg\zhaShad.grp) +HachiroskInit: + imgul 71 0 0 # Hachirosk Shadow (zerg\zhaShad.grp) playfram 0x00 - goto HatcheryWorkingToIdle + goto HachiroskWorkingToIdle -HatcheryWorkingToIdle: +HachiroskWorkingToIdle: playfram 1 wait 2 playfram 2 @@ -3376,9 +3376,9 @@ HatcheryWorkingToIdle: wait 2 playfram 0x00 wait 4 - goto HatcheryWorkingToIdle + goto HachiroskWorkingToIdle -HatcheryDeath: +HachiroskDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) wait 3 @@ -3386,14 +3386,14 @@ HatcheryDeath: wait 1 end -HatcheryAlmostBuilt: +HachiroskAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) -HatcheryBuilt: - playfram 0x00 # Frame set 0 +HachiroskBuilt: + playfram 0x00 wait 2 - goto HatcheryWorkingToIdle + goto HachiroskWorkingToIdle -HatcheryIsWorking: +HachiroskIsWorking: playfram 6 wait 2 playfram 7 @@ -3434,16 +3434,16 @@ HatcheryIsWorking: wait 2 playfram 7 waitrand 2 4 - goto HatcheryIsWorking + goto HachiroskIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 072 Hive (Zerg\Hive.grp) +# 072 Gathtelosk (zerg\Hive.grp) .headerstart IsId 44 Type 20 -Init HiveInit -Death HiveDeath +Init GathteloskInit +Death GathteloskDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -3457,90 +3457,90 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt HiveAlmostBuilt -Built HiveBuilt +AlmostBuilt GathteloskAlmostBuilt +Built GathteloskBuilt Landing [NONE] LiftOff [NONE] -IsWorking HiveIsWorking -WorkingToIdle HiveWorkingToIdle +IsWorking GathteloskIsWorking +WorkingToIdle GathteloskWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -HiveInit: - imgul 73 0 0 # Hive Shadow (zerg\zhiShad.grp) - playfram 0x00 # Frame set 0 - goto HiveWorkingToIdle +GathteloskInit: + imgul 73 0 0 # Gathtelosk Shadow (zerg\zhiShad.grp) + playfram 0x00 + goto GathteloskWorkingToIdle -HiveWorkingToIdle: - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 4 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 4 - goto HiveWorkingToIdle +GathteloskWorkingToIdle: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 4 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 4 + goto GathteloskWorkingToIdle -HiveDeath: - playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) - wait 1 +GathteloskDeath: + playsnd 774 # Zerg\Bldg\ZBldgDth.WAV + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) + wait 1 end -HiveAlmostBuilt: - imgol 109 0 0 # Zerg Building Spawn (Large) (zerg\zSpawn03.grp) -HiveBuilt: - playfram 0x00 # Frame set 0 +GathteloskAlmostBuilt: + imgol 109 0 0 # Zerg Building Spawn (Large) (zerg\zSpawn03.grp) +GathteloskBuilt: + playfram 0x00 wait 2 - goto HiveWorkingToIdle + goto GathteloskWorkingToIdle -HiveIsWorking: - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 3 - playfram 8 # Frame set 0, direction 8 - wait 3 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 8 # Frame set 0, direction 8 - waitrand 2 3 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - waitrand 2 3 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - waitrand 2 4 - goto HiveIsWorking +GathteloskIsWorking: + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 3 + playfram 8 + wait 3 + playfram 9 + wait 2 + playfram 8 + waitrand 2 3 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 7 + waitrand 2 3 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + waitrand 2 4 + goto GathteloskIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 074 Lair (zerg\Lair.grp) +# 074 Caphrolosk (zerg\lair.grp) .headerstart IsId 45 Type 20 -Init LairInit -Death LairDeath +Init CaphroloskInit +Death CaphroloskDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -3554,81 +3554,81 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt LairAlmostBuilt -Built LairBuilt +AlmostBuilt CaphroloskAlmostBuilt +Built CaphroloskBuilt Landing [NONE] LiftOff [NONE] -IsWorking LairIsWorking -WorkingToIdle LairWorkingToIdle +IsWorking CaphroloskIsWorking +WorkingToIdle CaphroloskWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -LairInit: - imgul 75 0 0 # Lair Shadow (zerg\zlrShad.grp) - playfram 0x00 # Frame set 0 - goto LairWorkingToIdle +CaphroloskInit: + imgul 75 0 0 # Caphrolosk Shadow (zerg\zlrShad.grp) + playfram 0x00 + goto CaphroloskWorkingToIdle -LairWorkingToIdle: - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 3 # Frame set 0, direction 3 - wait 4 - playfram 2 # Frame set 0, direction 2 - wait 2 - playfram 1 # Frame set 0, direction 1 - wait 2 - playfram 0x00 # Frame set 0 - wait 4 - goto LairWorkingToIdle +CaphroloskWorkingToIdle: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 4 + playfram 2 + wait 2 + playfram 1 + wait 2 + playfram 0x00 + wait 4 + goto CaphroloskWorkingToIdle -LairDeath: +CaphroloskDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV - imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) - wait 3 - lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) - wait 1 + imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) + wait 3 + lowsprul 187 0 0 # Zerg Building Rubble (Large) (thingy\ZRubbleL.grp) + wait 1 end -LairAlmostBuilt: +CaphroloskAlmostBuilt: imgol 109 0 0 # Zerg Building Spawn (Large) (zerg\zSpawn03.grp) -LairBuilt: - playfram 0x00 # Frame set 0 +CaphroloskBuilt: + playfram 0x00 wait 2 - goto LairWorkingToIdle + goto CaphroloskWorkingToIdle -LairIsWorking: - playfram 5 # Frame set 0, direction 5 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 3 - playfram 8 # Frame set 0, direction 8 - wait 3 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 8 # Frame set 0, direction 8 - waitrand 2 3 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - wait 2 - playfram 7 # Frame set 0, direction 7 - waitrand 2 3 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 9 # Frame set 0, direction 9 - wait 2 - playfram 8 # Frame set 0, direction 8 - wait 2 - playfram 7 # Frame set 0, direction 7 - wait 2 - playfram 6 # Frame set 0, direction 6 - waitrand 2 4 - goto LairIsWorking +CaphroloskIsWorking: + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + wait 3 + playfram 8 + wait 3 + playfram 9 + wait 2 + playfram 8 + waitrand 2 3 + playfram 7 + wait 2 + playfram 6 + wait 2 + playfram 7 + waitrand 2 3 + playfram 8 + wait 2 + playfram 9 + wait 2 + playfram 8 + wait 2 + playfram 7 + wait 2 + playfram 6 + waitrand 2 4 + goto CaphroloskIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -3780,7 +3780,7 @@ SurkithColonyLocal00: SurkithColonyLocal01: nobrkcodestart - playsnd 78 # Bullet\ZLuFir00.wav + playsnd 78 # Bullet\ZLuFir00.wav playfram 14 wait 1 playfram 15 @@ -47537,7 +47537,7 @@ WarpIn VagrantWarpIn # ----------------------------------------------------------------------------- # VagrantInit: - imgul 1172 0 0 # Ecclesiast Shadow (cm\protoss\ecclesiast-shad.grp) + imgul 1277 0 0 # Vagrant Shadow (cm\protoss\vagrant-shad.grp) playfram 0x00 wait 2 goto VagrantLocal69 diff --git a/mpq/unit/cm/protoss/vagrant-shade.grp b/mpq/unit/cm/protoss/vagrant-shade.grp index ad23719c..3ec9a973 100644 Binary files a/mpq/unit/cm/protoss/vagrant-shade.grp and b/mpq/unit/cm/protoss/vagrant-shade.grp differ diff --git a/mpq/unit/cm/protoss/vagrant-shadow.grp b/mpq/unit/cm/protoss/vagrant-shadow.grp index f928405d..1d0fcc4d 100644 Binary files a/mpq/unit/cm/protoss/vagrant-shadow.grp and b/mpq/unit/cm/protoss/vagrant-shadow.grp differ diff --git a/mpq/unit/cm/protoss/vagrant.grp b/mpq/unit/cm/protoss/vagrant.grp index 08cea178..3ec9a973 100644 Binary files a/mpq/unit/cm/protoss/vagrant.grp and b/mpq/unit/cm/protoss/vagrant.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index f573cbc7..6d3fbbd9 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/tranwire.grp b/mpq/unit/wirefram/tranwire.grp index bea2e549..589b5c7e 100644 Binary files a/mpq/unit/wirefram/tranwire.grp and b/mpq/unit/wirefram/tranwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 697de549..6bc3308b 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 9925f5d5..465fe914 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,11 +13,12 @@ Aside from that: We are targeting improvements to early-game pacing, as well as ## Bugfixes - Fixed Sundog not being able to attack +- AI should no longer stack Cagrant Colonies as often, improving base layouts - Badlands: A rogue low-ground ramp tile for Basilica has been corrected ## Audiovisuals - New sprites: - - Vagrant* + - Vagrant - New wireframes: (c. jun3hong) - Skortrith Colony, Spirtith Colony @@ -30,6 +31,9 @@ Aside from that: We are targeting improvements to early-game pacing, as well as ## Protoss - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - HP now 60, from 50 +- [Vagrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/vagrant): + - Weapon damage now 10, from 6 + - Weapon cooldown now 0.83, from 0.63 - [Architect](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/architect): - Now moves ~17% faster - [Crucible](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/crucible): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 100e23a8..1e105120 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ