From 5836637ddedc61cef246db2a042b906ee54fb23d Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 28 Mar 2022 22:39:45 +0000 Subject: [PATCH] [Maps] Oly use actors in the decoratives of the random biomes Accepted by: @wowgetoffyourcellphone Patch by: @marder Differential Revision: https://code.wildfiregames.com/D4569 This was SVN commit r26728. --- .../mods/public/maps/random/rmbiome/generic/aegean.json | 6 +++--- .../mods/public/maps/random/rmbiome/generic/alpine.json | 2 +- .../mods/public/maps/random/rmbiome/generic/arctic.json | 4 ++-- .../mods/public/maps/random/rmbiome/generic/autumn.json | 2 +- .../data/mods/public/maps/random/rmbiome/generic/india.json | 4 ++-- .../data/mods/public/maps/random/rmbiome/generic/nubia.json | 4 ++-- .../mods/public/maps/random/rmbiome/generic/sahara.json | 4 ++-- .../mods/public/maps/random/rmbiome/generic/savanna.json | 2 +- .../mods/public/maps/random/rmbiome/generic/temperate.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json b/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json index cd4c913493..82ebe84f6f 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/aegean.json @@ -69,14 +69,14 @@ "metalSmall": "gaia/ore/temperate_small" }, "Decoratives": { - "grass": "gaia/tree/bush_temperate", + "grass": "actor|props/flora/bush_medit_sm.xml", "grassShort": "actor|props/flora/bush_medit_sm.xml", "reeds": "actor|props/flora/reeds_pond_lush_b.xml", "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_granite_large.xml", "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "gaia/tree/bush_temperate", - "bushSmall": "actor|props/flora/bush_medit_sm.xml", + "bushMedium": "actor|flora/bushes/medit_scrub_01.xml", + "bushSmall": "actor|flora/trees/lavender_bush_01.xml", "tree": "actor|flora/trees/cypress_mediterranean_wild.xml" }, "ResourceCounts": { diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json b/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json index 79e6cc45cd..9ed7ae6422 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/alpine.json @@ -86,7 +86,7 @@ "lillies": "actor|geology/stone_granite_large.xml", "rockLarge": "actor|geology/stone_granite_large.xml", "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "gaia/tree/bush_temperate", + "bushMedium": "actor|props/flora/bush_medit_sm.xml", "bushSmall": "actor|flora/trees/lavender_bush_01.xml", "tree": "actor|flora/trees/pine.xml" }, diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json b/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json index afac1491bd..ba71e33fcf 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/arctic.json @@ -82,13 +82,13 @@ "metalSmall": "gaia/ore/temperate_small" }, "Decoratives": { - "grass": "gaia/tree/bush_temperate_winter", + "grass": "actor|props/flora/bush_desert_dry_a.xml", "grassShort": "actor|geology/stone_granite_med.xml", "reeds": "actor|props/flora/reeds_pond_dry.xml", "lillies": "actor|geology/stone_granite_small.xml", "rockLarge": "actor|geology/stone_granite_large.xml", "rockMedium": "actor|geology/stone_granite_med.xml", - "bushMedium": "gaia/tree/bush_temperate_winter", + "bushMedium": "actor|props/flora/bush_desert_dry_a.xml", "bushSmall": "actor|props/flora/bush_desert_dry_a.xml", "tree": "actor|flora/trees/fir_tree_winter.xml" }, diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/autumn.json b/binaries/data/mods/public/maps/random/rmbiome/generic/autumn.json index 4bd5e13e81..681dd6b8a8 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/autumn.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/autumn.json @@ -82,7 +82,7 @@ "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_granite_med.xml", "rockMedium": "actor|geology/stone_granite_small.xml", - "bushMedium": "gaia/tree/bush_temperate", + "bushMedium": "actor|props/flora/bush_medit_sm.xml", "bushSmall": "actor|props/flora/bush_medit_sm.xml", "tree": "actor|flora/trees/elm_dead.xml" }, diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/india.json b/binaries/data/mods/public/maps/random/rmbiome/generic/india.json index 606df2763f..e09dc7b35f 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/india.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/india.json @@ -83,9 +83,9 @@ "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_india_small.xml", "rockMedium": "actor|geology/stone_india_small.xml", - "bushMedium": "gaia/tree/bush_tropic", + "bushMedium": "actor|flora/trees/tropic_bush_biome.xml", "bushSmall": "actor|props/flora/plant_tropic_large.xml", - "tree": "gaia/tree/palm_areca" + "tree": "actor|flora/trees/palm_nipa.xml" }, "ResourceCounts": { "trees": { diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json b/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json index b92e61341a..d46e039cd5 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/nubia.json @@ -78,9 +78,9 @@ "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_savanna_med.xml", "rockMedium": "actor|geology/stone_savanna_med.xml", - "bushMedium": "gaia/tree/bush_tropic", + "bushMedium": "actor|props/flora/plant_tropic_large.xml", "bushSmall": "actor|props/flora/bush_dry_a.xml", - "tree": "gaia/tree/date_palm_dead" + "tree": "actor|flora/trees/palm_date_dead.xml" }, "ResourceCounts": { "trees": { diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json b/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json index 1b36c7bb2b..78f935e06a 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/sahara.json @@ -75,9 +75,9 @@ "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_desert_med.xml", "rockMedium": "actor|geology/stone_desert_med.xml", - "bushMedium": "gaia/tree/bush_tropic", + "bushMedium": "actor|props/flora/plant_tropic_large.xml", "bushSmall": "actor|props/flora/bush_dry_a.xml", - "tree": "gaia/tree/date_palm_dead" + "tree": "actor|flora/trees/palm_date_dead.xml" }, "ResourceCounts": { "trees": { diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json b/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json index 5db3e9cf53..9658e1bd09 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/savanna.json @@ -79,7 +79,7 @@ "rockMedium": "actor|geology/stone_desert_med.xml", "bushMedium": "actor|props/flora/bush_desert_dry_a.xml", "bushSmall": "actor|props/flora/bush_desert_dry_a.xml", - "tree": "gaia/tree/bush_temperate" + "tree": "actor|props/flora/bush_desert_a.xml" }, "ResourceCounts": { "trees": { diff --git a/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json b/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json index 9effd2c2ac..b3f89df419 100644 --- a/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json +++ b/binaries/data/mods/public/maps/random/rmbiome/generic/temperate.json @@ -66,7 +66,7 @@ "lillies": "actor|props/flora/water_lillies.xml", "rockLarge": "actor|geology/stone_granite_med.xml", "rockMedium": "actor|geology/stone_granite_small.xml", - "bushMedium": "gaia/tree/bush_temperate", + "bushMedium": "actor|flora/trees/temperate_bush_biome.xml", "bushSmall": "actor|props/flora/bush_medit_sm.xml", "tree": "actor|flora/trees/elm_dead.xml" },