From f78b1e07c579203f468e33aaf0ddeef21d90bbac Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Fri, 30 May 2025 13:28:08 +0300
Subject: [PATCH] cs fix, demiplane fix

---
 .../Guidebook/Controls/GuideReagentReaction.xaml     |  3 +++
 .../Guidebook/Controls/GuideReagentReaction.xaml.cs  | 10 ++++------
 .../Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs    |  1 -
 .../Flora/Gatherable/Wild/water_lilies.yml           |  7 -------
 .../_CP14/Procedural/Demiplane/Modifiers/special.yml | 12 ++++++------
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
index dbb970fff9..7980a48a1f 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
@@ -39,6 +39,9 @@
                    Visible="False"
                    HorizontalAlignment="Center"
                    FontColorOverride="#1e6651" />
+            <BoxContainer Name="RandomProductsContainer" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical">
+                <!-- Random products will be added as children here -->
+            </BoxContainer>
             <controls:SplitBar MinHeight="10">
             </controls:SplitBar>
         </BoxContainer>
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
index 16ae1d5bea..3bbf64fd40 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
@@ -50,12 +50,10 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
         {
             // If there aren't any variations, this label will be not visible
             RandomVariationsLabel.Visible = true;
-            var randomProductLabel = new RichTextLabel {
-                HorizontalAlignment=HAlignment.Left,
-                VerticalAlignment=VAlignment.Center,
-            };
+
+            Container randomProductContainer = RandomProductsContainer;
             var randomProducts = new Dictionary<string, FixedPoint2>(randomVariation);
-            RandomVariations.AddChild(randomProductLabel);
+            RandomVariations.AddChild(randomProductContainer);
             RandomVariations.AddChild(new SplitBar
             {
                 MinHeight = 10,
@@ -65,7 +63,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
                 if (reactantProto.Catalyst)
                     randomProducts.Add(reagent, reactantProto.Amount);
             }
-            SetReagents(randomProducts, ref randomProductLabel, protoMan);
+            SetReagents(randomProducts, ref randomProductContainer, protoMan);
         }
         // CP14 random reagents end
 
diff --git a/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs b/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
index a75b9ce261..3ef262e899 100644
--- a/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
+++ b/Content.Server/_CP14/Demiplane/Jobs/CP14SpawnRandomDemiplaneJob.cs
@@ -76,7 +76,6 @@ public sealed class CP14SpawnRandomDemiplaneJob : Job<bool>
         var expeditionConfig = _prototypeManager.Index(_config);
         var indexedLocation = _prototypeManager.Index(expeditionConfig.LocationConfig);
 
-        dungeonConfig.Data = indexedLocation.Data;
         dungeonConfig.Layers.AddRange(indexedLocation.Layers);
         dungeonConfig.ReserveTiles = indexedLocation.ReserveTiles;
 
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml
index 2ffc329576..cb7e1c5508 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/water_lilies.yml
@@ -72,13 +72,6 @@
     speed: 3.5
     dis: 2
 
-- type: entityLootTable
-  id: CP14GatherAirLily
-  entries:
-  - id: CP14AirLily
-    amount: 2
-    maxAmount: 3
-
 - type: entity
   id: CP14GatherableWaterAirLily
   parent: 
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml
index 2c3afecc9c..e93fb2ed7f 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml
@@ -2,7 +2,7 @@
   id: EntryRoom
   generationProb: 0
   layers:
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entity: CP14DemiplanEnterRoomMarker
       count: 1
       minGroupSize: 1
@@ -12,7 +12,7 @@
   id: Core
   generationProb: 0
   layers:
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entity: CP14DemiplanCoreRoomMarker
       count: 1
       minGroupSize: 1
@@ -22,12 +22,12 @@
   id: Exit
   generationProb: 0
   layers:
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entity: CP14DemiplanePassway
       count: 1
       minGroupSize: 1
       maxGroupSize: 1
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entity: CP14DemiplaneHint
       count: 20
       minGroupSize: 1
@@ -37,12 +37,12 @@
   id: DemiplaneDecor
   generationProb: 0
   layers:
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entity: CP14AstralCorrosion
       count: 15
       minGroupSize: 3
       maxGroupSize: 10 
-    - !type:OreDunGen
+    - !type:CP14OreDunGen
       entityMask: 
       - CP14WallStone
       - CP14WallDirt