broken digester (not yet reparable)

fielddaylab · Mar 7, 2024 · 88ed00a · 88ed00a
1 parent 722c1d2
commit 88ed00a
Show file tree

Hide file tree

Showing 16 changed files with 421 additions and 41 deletions.
diff --git a/Assets/Art/Materials/RedLights_Static.mat b/Assets/Art/Materials/RedLights_Static.mat
@@ -115,7 +115,7 @@ Material:
     - _BendDirection: {r: 1.65, g: 2.1, b: 0, a: 0}
     - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _EndColor: {r: 1, g: 0.007843138, b: 0, a: 0}
+    - _EndColor: {r: 0.42352942, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _StartColor: {r: 0.4245283, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

diff --git a/Assets/Code/Assets/RegionAsset.cs b/Assets/Code/Assets/RegionAsset.cs
@@ -29,7 +29,8 @@ public enum BuildingType : byte {
         ExportDepot,
         TollBooth,
         TempObstruction,
-        SkimmerLocation
+        SkimmerLocation,
+        DigesterBroken
     }
 
     [CreateAssetMenu(menuName = "Zavala/Region Asset")]

diff --git a/Assets/Code/Building/BuildToolState.cs b/Assets/Code/Building/BuildToolState.cs
@@ -228,6 +228,7 @@ public static void RecalculateBlockedTiles(SimGridState grid, SimWorldState worl
                     // If non-buildable, add to list
                     if ((grid.Terrain.Info[index].Flags & TerrainFlags.NonBuildable) != 0)
                     {
+                        // TODO: add exception for broken digester
                         btState.BlockedIdxs.Add(index);
 
                     }

diff --git a/Assets/Code/Building/BuildingPools.cs b/Assets/Code/Building/BuildingPools.cs
@@ -12,7 +12,10 @@ public class BuildingPools : SharedStateComponent, IRegistrationCallbacks
         #region Types
 
         [Serializable] public class RoadPool : SerializablePool<RoadInstanceController> { }
-        [Serializable] public class DigesterPool : SerializablePool<OccupiesTile> { }
+        [Serializable] public class DigesterPool : SerializablePool<OccupiesTile> {
+            [Space]
+            [SerializeField] public GameObject BrokenDigesterPrefab;
+        }
         [Serializable] public class StoragePool : SerializablePool<OccupiesTile> { }
         [Serializable] public class SkimmerPool : SerializablePool<PhosphorusSkimmer> { }
         [Serializable] public class VizAnchorPool : SerializablePool<ParticleSystem> { }

diff --git a/Assets/Code/Editor/RegionImport.cs b/Assets/Code/Editor/RegionImport.cs
@@ -339,6 +339,17 @@ static public void ReadStaticConstructions(in TiledData data, RegionId regionId,
                                 tiles[pos].Flags |= TerrainFlags.NonBuildable;
                                 break;
                             }
+                        case 14: { // broken digester
+                                buildingList.Add(new RegionAsset.BuildingData() {
+                                    LocalTileIndex = (ushort)pos,
+                                    Type = BuildingType.DigesterBroken,
+                                    ScriptName = scriptName
+                                });
+                                occupiedTileIndices.Add(pos);
+                                tiles[pos].Flags |= TerrainFlags.IsOccupied;
+                                tiles[pos].Flags |= TerrainFlags.NonBuildable;
+                                break;
+                            }
                         case 11:
                         case 12:
                         case 13:

diff --git a/Assets/Code/Rendering/SimWorldObjectSpawnSystem.cs b/Assets/Code/Rendering/SimWorldObjectSpawnSystem.cs
@@ -73,6 +73,14 @@ public override void ProcessWork(float deltaTime) {
                         building.GetComponent<BuildingPreview>().Apply();
                         break;
                     }
+                    case BuildingType.DigesterBroken: {
+                        m_StateB.Terrain.Info[spawn.TileIndex].Flags |= TerrainFlags.IsOccupied;
+                        m_StateB.Terrain.Info[spawn.TileIndex].Flags |= TerrainFlags.NonBuildable;
+                            building = Instantiate(m_StateC.Digesters.BrokenDigesterPrefab, worldPos, Quaternion.identity);
+                        building.SetActive(true);
+                        // building.GetComponent<BuildingPreview>().Apply();
+                        break;
+                    }
                 }
                 Assert.NotNull(building);
                 EventActorUtility.RegisterActor(building.GetComponent<EventActor>(), spawn.Id);

diff --git a/Assets/Content/Story/region2-script.leaf b/Assets/Content/Story/region2-script.leaf
@@ -77,6 +77,18 @@ $call QueueDialogueBubble(region2_city1, region2.enjoyingCypress)
 {@advisorEcolForest}    All thanks to our <i>stellar</i> ecosystem management.
 {@advisorEcolForest}    Those <i>hill dwellers</i> over in Knoll County could learn a thing or two.
 
+:: oldDigester
+@trigger AlertExamined
+@conditions alertType == "dialogue", buildingType == "DigesterBroken", alertRegion == 2
+@once
+{@advisorEconForest}    Ah, this old thing.
+{@advisorEconForest}    A farmer tried to build a Manure Processor here...
+{@advisorEconForest}    Thought he could turn Manure into Fertilizer.
+{@advisorEcolHill}      That sounds great! What happened?
+{@advisorEconForest}    The cost was too great. It bankrupted his farm!
+{@advisorEconForest}    Simply not economically feasible...
+{@advisorEcolHill}      Ugh. You economists are always saying that.
+
 :: bloomRumors
 @once
 @queued

diff --git a/Assets/Content/Text/locations.zaloc b/Assets/Content/Text/locations.zaloc
@@ -96,12 +96,18 @@ Storage Unit
 :: digester
 Manure Processor
 
+:: digesterBroken
+Abandoned Processor
+
 :: digesterInfo
 <i><u>buys</u> raw manure, <u>sells</u> fertilizer</i>
 
 :: digesterDesc
 Manure Processors buy raw manure and turn it into fertilizer that can be shipped for cheap.
 
+:: digesterBrokenDesc
+Manure Processors turn manure into fertilizer... But this one's ruined.
+
 :: toll
 Border Gate
 

diff --git a/Assets/Data/Regions/SecondRegion.asset b/Assets/Data/Regions/SecondRegion.asset
@@ -233,7 +233,7 @@ MonoBehaviour:
   - RegionIndex: 65535
     Category: 1
     SubCategory: 1
-    Flags: 177
+    Flags: 128
     Height: 200
   - RegionIndex: 65535
     Category: 2
@@ -288,7 +288,7 @@ MonoBehaviour:
   - RegionIndex: 65535
     Category: 1
     SubCategory: 1
-    Flags: 0
+    Flags: 32
     Height: 200
   - RegionIndex: 65535
     Category: 2
@@ -796,6 +796,21 @@ MonoBehaviour:
       m_Type: 0
       m_RawValue: 0
       m_StringHashSource: 
+  - LocalTileIndex: 54
+    ScriptName:
+      m_Source: region2_digester1
+      m_HashValue: 1167550896
+    Type: 13
+    LocationName:
+      m_Source: 
+      m_HashValue: 0
+    CharacterId:
+      m_Source: 
+      m_HashValue: 0
+    AdditionalData:
+      m_Type: 0
+      m_RawValue: 0
+      m_StringHashSource: 
   Points: []
   Roads: []
   Modifiers:
@@ -809,17 +824,12 @@ MonoBehaviour:
       m_Source: 
       m_HashValue: 0
     Modifier: 0
-  - LocalTileIndex: 65
-    ScriptName:
-      m_Source: 
-      m_HashValue: 0
-    Modifier: 0
   - LocalTileIndex: 32
     ScriptName:
       m_Source: 
       m_HashValue: 0
     Modifier: 0
-  - LocalTileIndex: 43
+  - LocalTileIndex: 65
     ScriptName:
       m_Source: 
       m_HashValue: 0

diff --git a/Assets/Editor/LocDatabase.asset b/Assets/Editor/LocDatabase.asset
@@ -220,11 +220,15 @@ MonoBehaviour:
       Content: Storage Unit
     - Id: location.shared.digester
       Content: Manure Processor
+    - Id: location.shared.digesterBroken
+      Content: Abandoned Processor
     - Id: location.shared.digesterInfo
       Content: <i><u>buys</u> raw manure, <u>sells</u> fertilizer</i>
     - Id: location.shared.digesterDesc
       Content: Manure Processors buy raw manure and turn it into fertilizer that
         can be shipped for cheap.
+    - Id: location.shared.digesterBrokenDesc
+      Content: Manure Processors turn manure into fertilizer... But this one's ruined.
     - Id: location.shared.toll
       Content: Border Gate
     - Id: location.shared.tollDesc
@@ -275,7 +279,7 @@ MonoBehaviour:
     - Path: location.shared
       Start: 25
     - Path: region
-      Start: 42
+      Start: 44
     NeedsExport: 0
   - Name: ui
     FilePath: Assets/Content/Text/ui.zaloc

diff --git a/Assets/Prefabs/Regions/Shared/Digester.prefab b/Assets/Prefabs/Regions/Shared/Digester.prefab
@@ -161,7 +161,7 @@ MonoBehaviour:
   RefusesSameBuildingType: 0
   OverridesBuyPrice: 1
   OverrideBlock:
-    Phosphorus: 18
+    Phosphorus: 20
     Grain: 0
     Milk: 0
   Flagstaff: {fileID: 0}
@@ -240,7 +240,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 828cc8f04903a4348baf85b7c59522bc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Renderer: {fileID: 1895349179121568628}
   m_Renderers:
   - {fileID: 1895349179121568628}
   m_Snapping: {fileID: 4665823543789613535}