Flora clean up (#33839)

* first migrate

* clean up prototypes

* Update polymorph.yml

* Update flora.yml

* and this one

* and this one x2

* and this one x3

* Update migration.yml

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 0ce625876f14a5ea7e2ae4984cba4977ddea6400..469c24ab97f6cd6ff1b6f924e530339a75c0a675 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -342,7 +342,10 @@
     - id: Lamp
       prob: 0.01
       orGroup: Useful
-    - id: FloraTreeLarge05
+    - id: FloraTreeLarge
+      prob: 0.01
+      orGroup: Useful
+    - id: LightTree #Funny mobs maybe
       prob: 0.01
       orGroup: Useful
     #notuseful

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
index 9abd35a920b1ac3d1150ecc3e09158542ad8e52d..416833538a31f9830fc4a935b493e46ee38b8648 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
@@ -7,36 +7,14 @@
     layers:
       - state: red
       - sprite: Objects/Decoration/Flora/flora_trees.rsi
-        state: icon
+        state: tree01
   - type: RandomSpawner
     prototypes:
-      - FloraTreeLarge01
-      - FloraTreeLarge02
-      - FloraTreeLarge03
-      - FloraTreeLarge04
-      - FloraTreeLarge05
-      - FloraTreeLarge06
-      - FloraTreeConifer01
-      - FloraTreeConifer02
-      - FloraTreeConifer03
-      - FloraTreeSnow01
-      - FloraTreeSnow02
-      - FloraTreeSnow03
-      - FloraTreeSnow04
-      - FloraTreeSnow05
-      - FloraTreeSnow06
-      - FloraTree01
-      - FloraTree02
-      - FloraTree03
-      - FloraTree04
-      - FloraTree05
-      - FloraTree06
+      - FloraTreeLarge
+      - FloraTreeConifer
+      - FloraTreeSnow
+      - FloraTree
     chance: 0.95
     rarePrototypes:
-      - ShadowTree01
-      - ShadowTree02
-      - ShadowTree03
-      - ShadowTree04
-      - ShadowTree05
-      - ShadowTree06
+      - ShadowTree
     rareChance: 0.05

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml
index 8d1b36c022b87decb448e3d16e877b220dabee87..34e6212dae29406496135a3484778a96ced669ba 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml
@@ -63,12 +63,7 @@
   - type: RandomSpawner
     offset: 0.3
     prototypes:
-      - FloraStalagmite1
-      - FloraStalagmite2
-      - FloraStalagmite3
-      - FloraStalagmite4
-      - FloraStalagmite5
-      - FloraStalagmite6
+      - FloraStalagmite
     chance: 0.9
 
 - type: entity
@@ -84,10 +79,5 @@
   - type: RandomSpawner
     offset: 0.3
     prototypes:
-      - FloraGreyStalagmite1
-      - FloraGreyStalagmite2
-      - FloraGreyStalagmite3
-      - FloraGreyStalagmite4
-      - FloraGreyStalagmite5
-      - FloraGreyStalagmite6
+      - FloraGreyStalagmite
     chance: 0.9

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
index 95a24157f98474574f03c66085dc29d73a511cb4..bb799580955164e1b7cfc36da8c8c1a17581052c 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
@@ -14,12 +14,12 @@
         - CrystalPink
         - CrystalPink
         - ShadowPortal
-        - ShadowTree01
-        - ShadowTree02
-        - ShadowTree03
-        - ShadowTree04
-        - ShadowTree05
-        - ShadowTree06
+        - ShadowTree #TODO: transform into EntityTable with weight
+        - ShadowTree
+        - ShadowTree
+        - ShadowTree
+        - ShadowTree
+        - ShadowTree
       rareChance: 0.05
       rarePrototypes:
         - MobCatShadow

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 31bc24cca63a08cfb29e6ac39a08321c634568b8..cdbf73a29b03e43c71656b366588e6a1fe46ae90 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -147,30 +147,24 @@
 
 - type: entity
   parent: BaseRock
-  id: FloraRockSolid01
+  id: FloraRockSolid
   components:
   - type: Sprite
-    state: rocksolid01
-
-- type: entity
-  parent: BaseRock
-  id: FloraRockSolid02
-  components:
-  - type: Sprite
-    state: rocksolid02
-
-- type: entity
-  parent: BaseRock
-  id: FloraRockSolid03
-  components:
-  - type: Sprite
-    state: rocksolid03
+    layers:
+    - state: rocksolid01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        rocksolid01: ""
+        rocksolid02: ""
+        rocksolid03: ""
 
 - type: entity
   name: stalagmite
   description: Natural stone spikes.
   parent: BaseRock
-  id: FloraStalagmite1
+  id: FloraStalagmite
   components:
   - type: Destructible
     thresholds:
@@ -185,192 +179,75 @@
               collection: GlassBreak
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite1
+    layers:
+    - state: stalagmite1
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        stalagmite1: ""
+        stalagmite2: ""
+        stalagmite3: ""
+        stalagmite4: ""
+        stalagmite5: ""
+        stalagmite6: ""
 
 - type: entity
-  parent: FloraStalagmite1
-  id: FloraStalagmite2
+  parent: FloraStalagmite
+  id: FloraGreyStalagmite
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite2
-
-- type: entity
-  parent: FloraStalagmite1
-  id: FloraStalagmite3
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite3
-
-- type: entity
-  parent: FloraStalagmite1
-  id: FloraStalagmite4
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite4
-
-- type: entity
-  parent: FloraStalagmite1
-  id: FloraStalagmite5
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite5
-
-- type: entity
-  parent: FloraStalagmite1
-  id: FloraStalagmite6
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: stalagmite6
-
-- type: entity
-  parent: FloraStalagmite1
-  id: FloraGreyStalagmite1
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite1
-
-- type: entity
-  parent: FloraGreyStalagmite1
-  id: FloraGreyStalagmite2
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite2
-
-- type: entity
-  parent: FloraGreyStalagmite1
-  id: FloraGreyStalagmite3
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite3
-
-- type: entity
-  parent: FloraGreyStalagmite1
-  id: FloraGreyStalagmite4
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite4
-
-- type: entity
-  parent: FloraGreyStalagmite1
-  id: FloraGreyStalagmite5
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite5
-
-- type: entity
-  parent: FloraGreyStalagmite1
-  id: FloraGreyStalagmite6
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
-    state: grey_stalagmite6
-
-
-- type: entity
-  parent: BaseTree
-  id: FloraTree01
-  name: tree
-  components:
-  - type: Sprite
-    state: tree01
-
-- type: entity
-  parent: BaseTree
-  id: FloraTree02
-  name: tree
-  components:
-  - type: Sprite
-    state: tree02
-
-- type: entity
-  parent: BaseTree
-  id: FloraTree03
-  name: tree
-  components:
-  - type: Sprite
-    state: tree03
+    layers:
+    - state: grey_stalagmite1
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        grey_stalagmite1: ""
+        grey_stalagmite2: ""
+        grey_stalagmite3: ""
+        grey_stalagmite4: ""
+        grey_stalagmite5: ""
+        grey_stalagmite6: ""
 
 - type: entity
   parent: BaseTree
-  id: FloraTree04
+  id: FloraTree
   name: tree
   components:
   - type: Sprite
-    state: tree04
-
-- type: entity
-  parent: BaseTree
-  id: FloraTree05
-  name: tree
-  components:
-  - type: Sprite
-    state: tree05
-
-- type: entity
-  parent: BaseTree
-  id: FloraTree06
-  name: tree
-  components:
-  - type: Sprite
-    state: tree06
-
-- type: entity
-  parent: BaseTreeSnow
-  id: FloraTreeSnow01
-  name: snowy tree
-  components:
-  - type: Sprite
-    state: treesnow01
+    layers:
+    - state: tree01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        tree01: ""
+        tree02: ""
+        tree03: ""
+        tree04: ""
+        tree05: ""
+        tree06: ""
 
 - type: entity
   parent: BaseTreeSnow
-  id: FloraTreeSnow02
+  id: FloraTreeSnow
   name: snowy tree
   components:
   - type: Sprite
-    state: treesnow02
-
-- type: entity
-  parent: BaseTreeSnow
-  id: FloraTreeSnow03
-  name: snowy tree
-  components:
-  - type: Sprite
-    state: treesnow03
-
-- type: entity
-  parent: BaseTreeSnow
-  id: FloraTreeSnow04
-  name: snowy tree
-  components:
-  - type: Sprite
-    state: treesnow04
-
-- type: entity
-  parent: BaseTreeSnow
-  id: FloraTreeSnow05
-  name: snowy tree
-  components:
-  - type: Sprite
-    state: treesnow05
-
-- type: entity
-  parent: BaseTreeSnow
-  id: FloraTreeSnow06
-  name: snowy tree
-  components:
-  - type: Sprite
-    state: treesnow06
+    layers:
+    - state: treesnow01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        treesnow01: ""
+        treesnow02: ""
+        treesnow03: ""
+        treesnow04: ""
+        treesnow05: ""
+        treesnow06: ""
 
 - type: entity
   parent: BaseTreeSnow
@@ -382,75 +259,38 @@
 
 - type: entity
   parent: BaseTreeLarge
-  id: FloraTreeLarge01
-  name: large tree
-  components:
-  - type: Sprite
-    state: treelarge01
-
-- type: entity
-  parent: BaseTreeLarge
-  id: FloraTreeLarge02
-  name: large tree
-  components:
-  - type: Sprite
-    state: treelarge02
-
-- type: entity
-  parent: BaseTreeLarge
-  id: FloraTreeLarge03
-  name: large tree
-  components:
-  - type: Sprite
-    state: treelarge03
-
-- type: entity
-  parent: BaseTreeLarge
-  id: FloraTreeLarge04
-  name: large tree
-  components:
-  - type: Sprite
-    state: treelarge04
-
-- type: entity
-  parent: BaseTreeLarge
-  id: FloraTreeLarge05
-  name: large tree
-  components:
-  - type: Sprite
-    state: treelarge05
-
-- type: entity
-  parent: BaseTreeLarge
-  id: FloraTreeLarge06
+  id: FloraTreeLarge
   name: large tree
   components:
   - type: Sprite
-    state: treelarge06
-
-- type: entity
-  parent: BaseTreeConifer
-  id: FloraTreeConifer01
-  name: snowy conifer
-  components:
-  - type: Sprite
-    state: treeconifer01
+    layers:
+    - state: treelarge01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        treelarge01: ""
+        treelarge02: ""
+        treelarge03: ""
+        treelarge04: ""
+        treelarge05: ""
+        treelarge06: ""
 
 - type: entity
   parent: BaseTreeConifer
-  id: FloraTreeConifer02
+  id: FloraTreeConifer
   name: snowy conifer
   components:
   - type: Sprite
-    state: treeconifer02
-
-- type: entity
-  parent: BaseTreeConifer
-  id: FloraTreeConifer03
-  name: snowy conifer
-  components:
-  - type: Sprite
-    state: treeconifer03
+    layers:
+    - state: treeconifer01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        treeconifer01: ""
+        treeconifer02: ""
+        treeconifer03: ""
 
 - type: entity
   parent: BaseTreeConifer
@@ -517,53 +357,17 @@
     state: treestumpconifer
 
 - type: entity
-  parent: FloraTree01
-  id: ShadowTree01
+  parent: FloraTree
+  id: ShadowTree
   name: dark wood
   description: The leaves are whispering about you.
   components:
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_shadow_trees.rsi
-    state: tree01
-
-- type: entity
-  parent: ShadowTree01
-  id: ShadowTree02
-  components:
-  - type: Sprite
-    state: tree02
-
-- type: entity
-  parent: ShadowTree01
-  id: ShadowTree03
-  components:
-  - type: Sprite
-    state: tree03
-
-- type: entity
-  parent: ShadowTree01
-  id: ShadowTree04
-  components:
-  - type: Sprite
-    state: tree04
-
-- type: entity
-  parent: ShadowTree01
-  id: ShadowTree05
-  components:
-  - type: Sprite
-    state: tree05
-
-- type: entity
-  parent: ShadowTree01
-  id: ShadowTree06
-  components:
-  - type: Sprite
-    state: tree06
 
 - type: entity
   parent: BaseTree
-  id: LightTree01
+  id: LightTree
   name: glowing tree
   description: A marvelous tree filled with strange energy.
   components:
@@ -573,7 +377,18 @@
     color: "#6270bb"
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree01
+    layers:
+    - state: tree01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        tree01: ""
+        tree02: ""
+        tree03: ""
+        tree04: ""
+        tree05: ""
+        tree06: ""
   - type: Destructible
     thresholds:
     - trigger:
@@ -603,44 +418,4 @@
         spawn:
           MobLuminousObject:
             min: 0
-            max: 1
-
-- type: entity
-  parent: LightTree01
-  id: LightTree02
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree02
-
-- type: entity
-  parent: LightTree01
-  id: LightTree03
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree03
-
-- type: entity
-  parent: LightTree01
-  id: LightTree04
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree04
-
-- type: entity
-  parent: LightTree01
-  id: LightTree05
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree05
-
-- type: entity
-  parent: LightTree01
-  id: LightTree06
-  components:
-  - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
-    state: tree06
+            max: 1
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index e6b81e7ce40b7cd23af15e7b364af967a1eb02b3..21b710a61803619e16d3fa1debf41a31a6ea83a1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -134,12 +134,12 @@
       offset: 0.2
       chance: 0.05
       prototypes:
-      - LightTree01
-      - LightTree02
-      - LightTree03
-      - LightTree04
-      - LightTree05
-      - LightTree06
+      - LightTree #TODO: transform into EntityTable with weight
+      - LightTree
+      - LightTree
+      - LightTree
+      - LightTree
+      - LightTree
       - CrystalCyan
       rarePrototypes:
       - AnomalyFloraBulb

diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index fe28287cb09e75cf0f77d39fba8d5c77d03cbeb7..745e032e7dea9852c1c520ea0f078414eaa4b48f 100644 (file)
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -109,7 +109,7 @@
 - type: polymorph
   id: TreeMorph
   configuration:
-    entity: FloraTree01
+    entity: FloraTree
     forced: true
     transferName: true
     revertOnDeath: true

diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml
index 88979316443e17ede1e33dd2fd46ee5f2591a03f..588d95f40da5d00dfe58dfd3002a9694a54901e5 100644 (file)
--- a/Resources/Prototypes/Procedural/biome_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_templates.yml
@@ -46,9 +46,7 @@
       allowedTiles:
         - FloorAsteroidSand
       entities:
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraRockSolid
     # Large rock areas
     - !type:BiomeEntityLayer
       threshold: -0.20
@@ -135,18 +133,8 @@
       allowedTiles:
         - FloorPlanetGrass
       entities:
-        - FloraTree01
-        - FloraTree02
-        - FloraTree03
-        - FloraTree04
-        - FloraTree05
-        - FloraTree06
-        - FloraTreeLarge01
-        - FloraTreeLarge02
-        - FloraTreeLarge03
-        - FloraTreeLarge04
-        - FloraTreeLarge05
-        - FloraTreeLarge06
+        - FloraTree
+        - FloraTreeLarge
     # Rock formations
     - !type:BiomeEntityLayer
       allowedTiles:
@@ -261,9 +249,7 @@
       allowedTiles:
         - FloorBasalt
       entities:
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraRockSolid
     - !type:BiomeEntityLayer
       threshold: 0.2
       noise:
@@ -384,12 +370,7 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - FloraTreeSnow01
-        - FloraTreeSnow02
-        - FloraTreeSnow03
-        - FloraTreeSnow04
-        - FloraTreeSnow05
-        - FloraTreeSnow06
+        - FloraTreeSnow
     # Rock formations
     - !type:BiomeEntityLayer
       allowedTiles:
@@ -479,12 +460,7 @@
       allowedTiles:
         - FloorChromite
       entities:
-        - ShadowTree01
-        - ShadowTree02
-        - ShadowTree03
-        - ShadowTree04
-        - ShadowTree05
-        - ShadowTree06
+        - ShadowTree
     # Rock formations
     - !type:BiomeEntityLayer
       threshold: -0.2
@@ -548,12 +524,7 @@
       allowedTiles:
       - FloorAsteroidSand
       entities:
-      - FloraStalagmite1
-      - FloraStalagmite2
-      - FloraStalagmite3
-      - FloraStalagmite4
-      - FloraStalagmite5
-      - FloraStalagmite6
+      - FloraStalagmite
     - !type:BiomeEntityLayer
       threshold: -0.5
       invert: true
@@ -601,12 +572,7 @@
       allowedTiles:
         - FloorAsteroidSand
       entities:
-        - FloraStalagmite1
-        - FloraStalagmite2
-        - FloraStalagmite3
-        - FloraStalagmite4
-        - FloraStalagmite5
-        - FloraStalagmite6
+        - FloraStalagmite
     - !type:BiomeEntityLayer
       threshold: -0.6
       invert: true

diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index d75581bbc2b00a4b2a49357af5f1b6ef97c60df9..c296aafad6430cb864050d3e25fc7cb558a47db3 100644 (file)
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -102,12 +102,7 @@
 
   - !type:CorridorClutterDunGen
     contents:
-    - id: FloraStalagmite1
-    - id: FloraStalagmite2
-    - id: FloraStalagmite3
-    - id: FloraStalagmite4
-    - id: FloraStalagmite5
-    - id: FloraStalagmite6
+    - id: FloraStalagmite
 
   - !type:BoundaryWallDunGen
 

diff --git a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
index eedf23b14f2060df0130051237b9e18af7226a52..6c9e4ba20809c242469ab9cbafff750e1fca13b9 100644 (file)
--- a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
@@ -16,7 +16,7 @@
 
   ## Make Like A Tree And Leave
   <Box>
-    <GuideEntityEmbed Entity="FloraTree06" Caption=""/>
+    <GuideEntityEmbed Entity="FloraTree" Caption=""/>
   </Box>
   Being exposed to too much Robust Harvest will cause a Diona to grow out of control, turning into an immobile tree (dropping all their equipment).
   Cutting down the tree will "restore" the Diona to their mobile state.

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png
deleted file mode 100644 (file)
index 41499b6..0000000
Binary files a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json
index 9242d06bd71177bfe55b617b59ead49b95aa4a95..af84abf130c6d29a18c254d0aa17e037bb5598a0 100644 (file)
--- a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json
@@ -7,9 +7,6 @@
         "y": 96
     },
     "states": [
-        {
-           "name": "icon"
-        },
         {
             "name": "tree01"
         },

diff --git a/Resources/migration.yml b/Resources/migration.yml
index b699335eb8d12b213c60e954ac7588ca252d2ace..1486a2f7b4d255d798a996dcb18c5a946e5bae3f 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -487,3 +487,53 @@ CrateSlimepersonLifeSupport: CrateNitrogenInternals
 
 # 2024-12-01
 DungeonMasterCircuitBoard: GameMasterCircuitBoard
+
+# 2024-12-12
+FloraRockSolid01: FloraRockSolid
+FloraRockSolid02: FloraRockSolid
+FloraRockSolid03: FloraRockSolid
+FloraStalagmite1: FloraStalagmite
+FloraStalagmite2: FloraStalagmite
+FloraStalagmite3: FloraStalagmite
+FloraStalagmite4: FloraStalagmite
+FloraStalagmite5: FloraStalagmite
+FloraStalagmite6: FloraStalagmite
+FloraGreyStalagmite1: FloraGreyStalagmite
+FloraGreyStalagmite2: FloraGreyStalagmite
+FloraGreyStalagmite3: FloraGreyStalagmite
+FloraGreyStalagmite4: FloraGreyStalagmite
+FloraGreyStalagmite5: FloraGreyStalagmite
+FloraGreyStalagmite6: FloraGreyStalagmite
+FloraTree01: FloraTree
+FloraTree02: FloraTree
+FloraTree03: FloraTree
+FloraTree04: FloraTree
+FloraTree05: FloraTree
+FloraTree06: FloraTree
+FloraTreeSnow01: FloraTreeSnow
+FloraTreeSnow02: FloraTreeSnow
+FloraTreeSnow03: FloraTreeSnow
+FloraTreeSnow04: FloraTreeSnow
+FloraTreeSnow05: FloraTreeSnow
+FloraTreeSnow06: FloraTreeSnow
+FloraTreeLarge01: FloraTreeLarge
+FloraTreeLarge02: FloraTreeLarge
+FloraTreeLarge03: FloraTreeLarge
+FloraTreeLarge04: FloraTreeLarge
+FloraTreeLarge05: FloraTreeLarge
+FloraTreeLarge06: FloraTreeLarge
+FloraTreeConifer01: FloraTreeConifer
+FloraTreeConifer02: FloraTreeConifer
+FloraTreeConifer03: FloraTreeConifer
+ShadowTree01: ShadowTree
+ShadowTree02: ShadowTree
+ShadowTree03: ShadowTree
+ShadowTree04: ShadowTree
+ShadowTree05: ShadowTree
+ShadowTree06: ShadowTree
+LightTree01: LightTree
+LightTree02: LightTree
+LightTree03: LightTree
+LightTree04: LightTree
+LightTree05: LightTree
+LightTree06: LightTree