From 543d45ee0401872b65f8f87847f69d220534cc78 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:57:05 +0300
Subject: [PATCH] Normal quartz returns (#838)

* return of normal quartz

* Update furnace.yml
---
 .../Structures/Flora/Crystal/elemental.yml    | 110 ++++++++++++++++++
 .../Structures/Flora/Crystal/shards.yml       |   1 -
 .../Demiplane/Modifiers/Reward/crystals.yml   |  38 +++++-
 .../_CP14/Recipes/Workbench/furnace.yml       |  18 +--
 Resources/migration.yml                       |   4 +-
 5 files changed, 154 insertions(+), 17 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml
index 0afd27abc7..359513c2b3 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml
@@ -1,3 +1,113 @@
+# Normal
+
+- type: entity
+  id: CP14CrystalSmall
+  suffix: Normal, Small
+  parent: CP14CrystalSmallBase
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi
+    layers:
+      - state: small1
+        map: ["random"]
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+            !type:DamageTrigger
+            damage: 10
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14CrystalShardBase:
+                min: 0
+                max: 1
+          - !type:TriggerBehavior
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: PointLight
+    enabled: false
+
+- type: entity
+  id: CP14CrystalMedium
+  suffix: Normal, Medium
+  parent: CP14CrystalMediumBase
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi
+    layers:
+      - state: medium1
+        map: ["random"]
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+            !type:DamageTrigger
+            damage: 15
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14CrystalShardBase:
+                min: 1
+                max: 2
+          - !type:TriggerBehavior
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: PointLight
+    enabled: false
+
+- type: entity
+  id: CP14CrystalBig
+  suffix: Normal, Big
+  parent: CP14CrystalBigBase
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Flora/Crystal/crystal_big.rsi
+    layers:
+      - state: big1
+        map: ["random"]
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+            !type:DamageTrigger
+            damage: 20
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14CrystalShardBase:
+                min: 2
+                max: 3
+          - !type:TriggerBehavior
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: PointLight
+    enabled: false
+
 # Water
 
 - type: entity
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml
index d26e7eb6ff..d95e3933d9 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml
@@ -1,7 +1,6 @@
 - type: entity
   id: CP14CrystalShardBase
   parent: BaseItem
-  abstract: true
   name: quartz shard
   description: Natural quartz crystals that can absorb the magical energy of the world around them.
   categories: [ ForkFiltered ]
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
index b0717bd134..4ffe173efc 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
@@ -1,8 +1,37 @@
 
+- type: cp14DemiplaneModifier
+  id: CrystalNormal
+  tiers:
+    - 1
+  generationWeight: 0.1
+  categories:
+    Reward: 0.1
+  layers:
+    - !type:OreDunGen
+      tileMask: 
+      - CP14FloorBase
+      entity: CP14CrystalSmall
+      count: 30
+      minGroupSize: 1
+      maxGroupSize: 3
+    - !type:OreDunGen
+      tileMask: 
+      - CP14FloorBase
+      entity: CP14CrystalMedium
+      count: 20
+      minGroupSize: 1
+      maxGroupSize: 2
+    - !type:OreDunGen
+      tileMask: 
+      - CP14FloorBase
+      entity: CP14CrystalBig
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 1
+
 - type: cp14DemiplaneModifier
   id: CrystalFire
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
@@ -36,10 +65,11 @@
       minGroupSize: 1
       maxGroupSize: 1
 
+# TIER 2
+
 - type: cp14DemiplaneModifier
   id: CrystalElectric
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
@@ -83,7 +113,6 @@
 - type: cp14DemiplaneModifier
   id: CrystalHealing
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
@@ -132,7 +161,6 @@
 - type: cp14DemiplaneModifier
   id: CrystalWater
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
@@ -181,7 +209,6 @@
 - type: cp14DemiplaneModifier
   id: CrystalDarkness
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
@@ -209,7 +236,6 @@
 - type: cp14DemiplaneModifier
   id: CrystalLight
   tiers:
-    - 1
     - 2
     - 3
   generationWeight: 0.1
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
index f892f0a773..364d3a7e7e 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
@@ -46,14 +46,16 @@
     knowledge: MetallMelting
   result: CP14MithrilBar1
 
-#- type: CP14Recipe
-#  id: CP14GlassSheet1
-#  tag: CP14RecipeMeltingFurnace
-#  craftTime: 4
-#  entities:
-#    CP14QuartzShard: 1
-#  result: CP14GlassSheet1
-#  knowledgeRequired: Glasswork
+- type: CP14Recipe
+  id: CP14GlassSheet1
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 4
+  requirements:
+  - !type:ProtoIdResource
+    protoId: CP14CrystalShardBase
+  - !type:KnowledgeRequired
+    knowledge: Glasswork
+  result: CP14GlassSheet1
 
 - type: CP14Recipe
   id: CP14GlassSheetShard1
diff --git a/Resources/migration.yml b/Resources/migration.yml
index b0363c331c..fce40313d0 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -231,8 +231,8 @@ CP14CrystalDiamondsSmall: CP14CrystalElementalLightSmall
 CP14CrystalDiamondsMedium: CP14CrystalElementalLightMedium
 CP14CrystalDiamondsBig: CP14CrystalElementalLightBig
 
-CP14QuartzCrystal: null
-CP14QuartzShard: null
+CP14QuartzCrystal: CP14CrystalMedium
+CP14QuartzShard: CP14CrystalShardBase
 
 #2025-30-01
 CP14OreCopper: CP14OreCopper1