diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 5fd7af48..db8e7648 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3632,9 +3632,9 @@ 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 +Optecton Windup 01 +Optecton Windup 02 +Optecton Windup 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 57c01096..92a8f312 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3631,4 +3631,7 @@ 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 +cm\p\_building\p-unit-deploy-04.wav +cm\p\optecton\windup-01.wav +cm\p\optecton\windup-02.wav +cm\p\optecton\windup-03.wav \ No newline at end of file diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 70990cae..63a44ac3 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index a66ac287..9dba4fc9 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 ade121cc..e01ab54e 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -13001,11 +13001,15 @@ OptectonGndAttkRpt: wait 1 nobrkcodestart wait 1 - playsnd 1557 # Architect charge 01 + playsndbtwn 3634 3636 # Optecton charge 01, 02, 03 imgol 1820 0 0 # Architect charge overlay - wait 7 + wait 8 imgol 1820 0 0 # Architect charge overlay - wait 7 + wait 8 + imgol 1820 0 0 # Architect charge overlay + wait 8 + imgol 1820 0 0 # Architect charge overlay + wait 8 imgol 1820 0 0 # Architect charge overlay wait 8 playfram 0x220 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 387b3d0e..914d9cf8 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 d4ac71fb..d4c32571 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -7418,7 +7418,7 @@ CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 MadrigalFuriaBaseSpecialState2 @@ -7480,7 +7480,7 @@ CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] -Walking [NONE] +Walking SkryrokorLocal00 WalkingToIdle SkryrokorLocal00 SpecialState1 SkryrokorLocal00 SpecialState2 MadrigalFuriaTurretSpecialState2 diff --git a/mpq/sound/cm/p/_building/embassy/amb-01.wav b/mpq/sound/cm/p/_building/embassy/amb-01.wav index 515c4e1d..5daf0834 100644 Binary files a/mpq/sound/cm/p/_building/embassy/amb-01.wav and b/mpq/sound/cm/p/_building/embassy/amb-01.wav differ diff --git a/mpq/sound/cm/p/_building/lattice/amb-01.wav b/mpq/sound/cm/p/_building/lattice/amb-01.wav index be34ed8f..4cc3e85a 100644 Binary files a/mpq/sound/cm/p/_building/lattice/amb-01.wav and b/mpq/sound/cm/p/_building/lattice/amb-01.wav differ diff --git a/mpq/sound/cm/p/optecton/windup-01.wav b/mpq/sound/cm/p/optecton/windup-01.wav new file mode 100644 index 00000000..1966e7d5 Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-01.wav differ diff --git a/mpq/sound/cm/p/optecton/windup-02.wav b/mpq/sound/cm/p/optecton/windup-02.wav new file mode 100644 index 00000000..d333a99e Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-02.wav differ diff --git a/mpq/sound/cm/p/optecton/windup-03.wav b/mpq/sound/cm/p/optecton/windup-03.wav new file mode 100644 index 00000000..740e8da6 Binary files /dev/null and b/mpq/sound/cm/p/optecton/windup-03.wav differ diff --git a/mpq/tileset/Jungle.cv5 b/mpq/tileset/Jungle.cv5 index f6fbccb7..bdea53db 100644 Binary files a/mpq/tileset/Jungle.cv5 and b/mpq/tileset/Jungle.cv5 differ diff --git a/mpq/tileset/Jungle.vf4 b/mpq/tileset/Jungle.vf4 index 08d972d4..5eda01fe 100644 Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ diff --git a/mpq/tileset/Jungle.vr4 b/mpq/tileset/Jungle.vr4 index 1cdb051f..15d30422 100644 Binary files a/mpq/tileset/Jungle.vr4 and b/mpq/tileset/Jungle.vr4 differ diff --git a/mpq/tileset/Jungle.vx4ex b/mpq/tileset/Jungle.vx4ex index f32ca284..c720b522 100644 Binary files a/mpq/tileset/Jungle.vx4ex and b/mpq/tileset/Jungle.vx4ex differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index f4df33be..abbc5793 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 501f1140..c907aa9c 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 0befa799..80ab4884 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -8,6 +8,10 @@ - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! ## Bugfixes +- **Stability:** + - Resolved more iscript errors (r. TheBeaver99) +- **Gameplay:** + - Prospectively resolved permacloak edge cases (r. Kenoli) -- needs testing! - **Audiovisuals:** - Made 'no corpse' behaviors spawn a consumed corpse for better visual feedback @@ -16,8 +20,9 @@ - **Autocort** (c. DeltaCadimus) - New SFX for: - Unit completion (Terran & Protoss) + - Attack windup (Optecton) - Modified SFX for: - - **Ministry** training loop + - Ambient training SFX (Ministry, Embassy, Lattice) ## Terran - For units with windups, added a slight forgiveness period to allow more movement and retargeting @@ -30,9 +35,15 @@ - Vision range 9 » 7 ## Protoss +- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): + - **Sunsplit Beam:** + - Windup 0.95 » 1.67 - [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold): - Vision range 8 » 7 - Also affects **Starbound** variant +- [Oscilliant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/oscilliant): + - **Rotating Ray:** + - Armor penetration 5 » 3 ## Zerg - [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 490b7541..e61dc121 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ