diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 314987c9..4ede0f79 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 1349fa8c..0a30d1e9 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 85edc326..fdc751f9 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -7413,7 +7413,7 @@ GndAttkRpt MadrigalFuriaTurretGndAttkInit AirAttkRpt MadrigalFuriaTurretGndAttkInit CastSpell [NONE] GndAttkToIdle SkryrokorLocal00 -AirAttkToIdle [NONE] +AirAttkToIdle SkryrokorLocal00 Unused2 [NONE] Walking [NONE] WalkingToIdle SkryrokorLocal00 @@ -7900,7 +7900,7 @@ Death MadcapDeath GndAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit Unused1 SkryrokorLocal00 -GndAttkRpt eeGndAttkRpt +GndAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt CastSpell [NONE] GndAttkToIdle MadcapGndAttkToIdle diff --git a/mpq/templates/Deathmarch(1).got b/mpq/templates/Deathmarch(1).got new file mode 100644 index 00000000..e4dc2935 Binary files /dev/null and b/mpq/templates/Deathmarch(1).got differ diff --git a/mpq/templates/templates.lst b/mpq/templates/templates.lst index 839c56d7..1795e918 100644 --- a/mpq/templates/templates.lst +++ b/mpq/templates/templates.lst @@ -8,4 +8,5 @@ "Duopoly(1).got" "Embraced(1).got" "Dark Ages(1).got" +"Deathmarch(1).got" "Debug(1).got" \ No newline at end of file diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index cc853a78..b6355abe 100644 Binary files a/mpq/tileset/badlands.cv5 and b/mpq/tileset/badlands.cv5 differ diff --git a/mpq/tileset/badlands.vf4 b/mpq/tileset/badlands.vf4 index a8caf088..23fa6a18 100644 Binary files a/mpq/tileset/badlands.vf4 and b/mpq/tileset/badlands.vf4 differ diff --git a/mpq/tileset/badlands.vr4 b/mpq/tileset/badlands.vr4 index 0fce6118..f63aa2ee 100644 Binary files a/mpq/tileset/badlands.vr4 and b/mpq/tileset/badlands.vr4 differ diff --git a/mpq/tileset/badlands.vx4ex b/mpq/tileset/badlands.vx4ex index c7054512..4a5c8e1c 100644 Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ diff --git a/mpq/unit/thingy/tileset/ashworld/hasroc04.grp b/mpq/unit/thingy/tileset/ashworld/hasroc04.grp new file mode 100644 index 00000000..fb6bce24 Binary files /dev/null and b/mpq/unit/thingy/tileset/ashworld/hasroc04.grp differ diff --git a/mpq/unit/thingy/tileset/ashworld/hasroc05.grp b/mpq/unit/thingy/tileset/ashworld/hasroc05.grp new file mode 100644 index 00000000..df2ae638 Binary files /dev/null and b/mpq/unit/thingy/tileset/ashworld/hasroc05.grp differ diff --git a/mpq/unit/thingy/tileset/ashworld/hasroc06.grp b/mpq/unit/thingy/tileset/ashworld/hasroc06.grp new file mode 100644 index 00000000..eec0125b Binary files /dev/null and b/mpq/unit/thingy/tileset/ashworld/hasroc06.grp differ diff --git a/patchnotes.md b/patchnotes.md index abf82388..4e85ba87 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -14,6 +14,10 @@ ## Game Modes - **Massacre:** - Units created from abilities are no longer doubled +- **Embraced:** + - Resource returns doubled +- **NEW: Deathmarch:** + - Massacre and The Turning rules apply! ## Bugfixes - **Stability:** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 23a8d98f..5a35add2 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ