Flora clean up (space-wizards#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
DebugOk · Dec 16, 2024 · af7e552 · af7e552
1 parent 9eda08c
commit af7e552
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 433 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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