diff --git a/CMBW-editor/CMBW-editor.mpq b/CMBW-editor/CMBW-editor.mpq index 520437f1..2b8ebbd8 100644 Binary files a/CMBW-editor/CMBW-editor.mpq and b/CMBW-editor/CMBW-editor.mpq differ diff --git a/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh b/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh index 3c24e948..3473df0a 100644 Binary files a/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh and b/CMBW-editor/brush/Cosmonarchy-badlands.scmdbrh differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 945a28b3..a6908a4a 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 28d75998..23f766a5 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -36149,31 +36149,31 @@ AirAttkInit [NONE] # ----------------------------------------------------------------------------- # AstralBlasterHitInit: - wait 1 - sigorder 1 - wait 1 + wait 1 + sigorder 1 + wait 1 AstralBlasterHitDeath: - playfram 0x00 # Frame set 0 + playfram 0x00 domissiledmg - wait 1 - playfram 1 # Frame set 0, direction 1 - wait 1 - playfram 2 # Frame set 0, direction 2 - wait 1 - playfram 3 # Frame set 0, direction 3 - wait 1 - playfram 4 # Frame set 0, direction 4 - wait 1 - playfram 5 # Frame set 0, direction 5 - wait 1 - playfram 6 # Frame set 0, direction 6 - wait 1 - playfram 7 # Frame set 0, direction 7 - wait 1 - playfram 8 # Frame set 0, direction 8 - wait 1 - playfram 9 # Frame set 0, direction 9 - wait 1 + wait 1 + playfram 1 + wait 1 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 end # ----------------------------------------------------------------------------- # @@ -36188,7 +36188,21 @@ Death [NONE] # ----------------------------------------------------------------------------- # FullTilesetDoodadInit: - playframtile 0x00 # Frame set 0 + playframtile 0x00 + goto InfestedTerranLocal00 + +# ----------------------------------------------------------------------------- # +.headerstart +IsId 750 +Type 0 +Init FullTilesetDoodadWithShadowInit +Death [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +FullTilesetDoodadWithShadowInit: + playframtile 0x00 + imgulnextid 0 0 goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -36203,12 +36217,12 @@ Death FullTilesetDoodadFlipDeath # ----------------------------------------------------------------------------- # FullTilesetDoodadFlipInit: - playframtile 0x00 # Frame set 0 - setflipstate 1 + playframtile 0x00 + setflipstate 1 goto InfestedTerranLocal00 FullTilesetDoodadFlipDeath: - wait 1 + wait 1 end # ----------------------------------------------------------------------------- # @@ -51627,4 +51641,6 @@ Type 1 Init SpiderMineExplosionDeath Death ScourgeExplosionDeath .headerend -# ----------------------------------------------------------------------------- # \ No newline at end of file +# ----------------------------------------------------------------------------- # + +# Next free isid: 751 \ No newline at end of file diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5 index 06a403fb..a84dcc27 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 48b0d3aa..92b10f22 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 8c844bff..51b11da0 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 f1fb18fd..f3cc7794 100644 Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ diff --git a/mpq/unit/thingy/tileset/jungle/ldtree01.grp b/mpq/unit/thingy/tileset/jungle/ldtree01.grp new file mode 100644 index 00000000..f39e2091 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/ldtree01.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/ldtree1s.grp b/mpq/unit/thingy/tileset/jungle/ldtree1s.grp new file mode 100644 index 00000000..5ff6399d Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/ldtree1s.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree01.grp b/mpq/unit/thingy/tileset/jungle/tree01.grp new file mode 100644 index 00000000..596aaa06 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree01.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree02.grp b/mpq/unit/thingy/tileset/jungle/tree02.grp new file mode 100644 index 00000000..aac9a7f9 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree02.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree03.grp b/mpq/unit/thingy/tileset/jungle/tree03.grp new file mode 100644 index 00000000..bb8ab4b1 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree03.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree04.grp b/mpq/unit/thingy/tileset/jungle/tree04.grp new file mode 100644 index 00000000..aae17408 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree04.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree1sha.grp b/mpq/unit/thingy/tileset/jungle/tree1sha.grp new file mode 100644 index 00000000..dd65a810 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree1sha.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree2sha.grp b/mpq/unit/thingy/tileset/jungle/tree2sha.grp new file mode 100644 index 00000000..50a6ef71 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree2sha.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree3sha.grp b/mpq/unit/thingy/tileset/jungle/tree3sha.grp new file mode 100644 index 00000000..5723f927 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree3sha.grp differ diff --git a/mpq/unit/thingy/tileset/jungle/tree4sha.grp b/mpq/unit/thingy/tileset/jungle/tree4sha.grp new file mode 100644 index 00000000..1ee00dd7 Binary files /dev/null and b/mpq/unit/thingy/tileset/jungle/tree4sha.grp differ diff --git a/patchnotes.md b/patchnotes.md index e95ab6a3..1e1a0457 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -5,4 +5,8 @@ TBD ## Bugfixes -- More nullsprite crashes have been protected against \ No newline at end of file +- More nullsprite crashes have been protected against + +## AI +- Worker allocation has been better optimized for the new resource model (c. Veeq7) +- AI should now harvest from more than 3 vespene nodes (c. Veeq7) \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index a009c6e3..5bf85694 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ