diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e337ba7a..fd7da4cc 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 b1d278ed..735018f4 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -1,4 +1,4 @@ -Skryling +Skryrokor Rilirokor Infested Terran Cocoon diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 395ff5fe..5fd7af48 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3627,11 +3627,11 @@ Treasury Ambient 01 Cyprian Windup 01 Cyprian Windup 02 Cyprian Windup 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Terran Unit Deployment 01 +Protoss Unit Deployment 01 +Protoss Unit Deployment 02 +Protoss Unit Deployment 03 +Protoss Unit Deployment 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a8a60f26..57c01096 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3626,4 +3626,9 @@ cm\z\egg\amb-04.wav cm\t\_building\treasury\amb-01.wav cm\t\cyprian\windup-01.wav cm\t\cyprian\windup-02.wav -cm\t\cyprian\windup-03.wav \ No newline at end of file +cm\t\cyprian\windup-03.wav +cm\t\_building\t-unit-deploy-01.wav +cm\p\_building\p-unit-deploy-01.wav +cm\p\_building\p-unit-deploy-02.wav +cm\p\_building\p-unit-deploy-03.wav +cm\p\_building\p-unit-deploy-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a0867aa5..fc41377f 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 88889482..df6a7a0b 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 722f8c10..55cb3573 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index f67328ef..a66ac287 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 27d8031c..ade121cc 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -15085,7 +15085,7 @@ GndAttkToIdle SkryrokorLocal00 AirAttkToIdle [NONE] Unused2 [NONE] Walking AutocortWalking -WalkingToIdle SkryrokorLocal00 +WalkingToIdle DidactGndAttkToIdle SpecialState1 [NONE] SpecialState2 [NONE] AlmostBuilt AutocortAlmostBuilt @@ -15101,7 +15101,7 @@ WarpIn AutocortWarpIn AutocortInit: imgul 2058 0 7 # Autocort Shadow (cm\protoss\autocort.grp) playfram 0x00 - goto SkryrokorLocal00 + goto DidactGndAttkToIdle AutocortDeath: setfldirect 0 diff --git a/mpq/scripts/iscript_zerg.bin b/mpq/scripts/iscript_zerg.bin index 301d6661..c3a0056d 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 3bb777d2..d5c0fe76 100644 --- a/mpq/scripts/iscript_zerg.txt +++ b/mpq/scripts/iscript_zerg.txt @@ -1591,26 +1591,40 @@ InfestedKerriganUnBurrow: # 036 Larva (zerg\larva.grp) .headerstart IsId 21 -Type 12 +Type 26 Init LarvaInit Death LarvaDeath -GndAttkInit [NONE] -AirAttkInit [NONE] -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle [NONE] -AirAttkToIdle [NONE] -Unused2 [NONE] +GndAttkInit SkryrokorLocal00 +AirAttkInit SkryrokorLocal00 +Unused1 SkryrokorLocal00 +GndAttkRpt SkryrokorLocal00 +AirAttkRpt SkryrokorLocal00 +CastSpell SkryrokorLocal00 +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle SkryrokorLocal00 +Unused2 SkryrokorLocal00 Walking LarvaWalking WalkingToIdle LarvaInit -SpecialState1 [NONE] +SpecialState1 SkryrokorLocal00 +SpecialState2 SkryrokorLocal00 +AlmostBuilt SkryrokorLocal00 +Built SkryrokorLocal00 +Landing SkryrokorLocal00 +LiftOff SkryrokorLocal00 +IsWorking SkryrokorLocal00 +WorkingToIdle SkryrokorLocal00 +WarpIn SkryrokorLocal00 +Unused3 SkryrokorLocal00 +StarEditInit SkryrokorLocal00 +Disable SkryrokorLocal00 +Burrow SkryrokorLocal00 +UnBurrow SkryrokorLocal00 +Enable [NONE] .headerend # ----------------------------------------------------------------------------- # LarvaInit: - playfram 0x00 # Frame set 0 + playfram 0x00 goto SkryrokorLocal00 LarvaDeath: diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-01.wav b/mpq/sound/cm/p/_building/p-unit-deploy-01.wav new file mode 100644 index 00000000..d09cf996 Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-01.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-02.wav b/mpq/sound/cm/p/_building/p-unit-deploy-02.wav new file mode 100644 index 00000000..4602dbbb Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-02.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-03.wav b/mpq/sound/cm/p/_building/p-unit-deploy-03.wav new file mode 100644 index 00000000..8730e472 Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-03.wav differ diff --git a/mpq/sound/cm/p/_building/p-unit-deploy-04.wav b/mpq/sound/cm/p/_building/p-unit-deploy-04.wav new file mode 100644 index 00000000..fefad74c Binary files /dev/null and b/mpq/sound/cm/p/_building/p-unit-deploy-04.wav differ diff --git a/mpq/sound/cm/t/_building/ministry/amb-01.wav b/mpq/sound/cm/t/_building/ministry/amb-01.wav index 7eaed639..e2765be8 100644 Binary files a/mpq/sound/cm/t/_building/ministry/amb-01.wav and b/mpq/sound/cm/t/_building/ministry/amb-01.wav differ diff --git a/mpq/sound/cm/t/_building/t-unit-deploy-01.wav b/mpq/sound/cm/t/_building/t-unit-deploy-01.wav new file mode 100644 index 00000000..62c7c873 Binary files /dev/null and b/mpq/sound/cm/t/_building/t-unit-deploy-01.wav differ diff --git a/mpq/tileset/ice.cv5 b/mpq/tileset/ice.cv5 index f2a1680f..991719f3 100644 Binary files a/mpq/tileset/ice.cv5 and b/mpq/tileset/ice.cv5 differ diff --git a/mpq/tileset/ice.vf4 b/mpq/tileset/ice.vf4 index 0a249005..0537375c 100644 Binary files a/mpq/tileset/ice.vf4 and b/mpq/tileset/ice.vf4 differ diff --git a/mpq/tileset/ice.vr4 b/mpq/tileset/ice.vr4 index 0d78bbb5..54e5684d 100644 Binary files a/mpq/tileset/ice.vr4 and b/mpq/tileset/ice.vr4 differ diff --git a/mpq/tileset/ice.vx4ex b/mpq/tileset/ice.vx4ex index 524f4688..96d5c02c 100644 Binary files a/mpq/tileset/ice.vx4ex and b/mpq/tileset/ice.vx4ex differ diff --git a/mpq/unit/cm/protoss/autocort-shadow.grp b/mpq/unit/cm/protoss/autocort-shadow.grp new file mode 100644 index 00000000..2485e537 Binary files /dev/null and b/mpq/unit/cm/protoss/autocort-shadow.grp differ diff --git a/mpq/unit/cm/protoss/autocort.grp b/mpq/unit/cm/protoss/autocort.grp index 598dfc2d..99782660 100644 Binary files a/mpq/unit/cm/protoss/autocort.grp and b/mpq/unit/cm/protoss/autocort.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 0b0b1d4d..e859b9f3 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 e13caeae..7941c0da 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 6a6b6b39..0befa799 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -11,6 +11,14 @@ - **Audiovisuals:** - Made 'no corpse' behaviors spawn a consumed corpse for better visual feedback +## Audiovisuals +- New model for: + - **Autocort** (c. DeltaCadimus) +- New SFX for: + - Unit completion (Terran & Protoss) +- Modified SFX for: + - **Ministry** training loop + ## Terran - For units with windups, added a slight forgiveness period to allow more movement and retargeting - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a0158cf0..490b7541 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ