* redirect on mobile/unsupported browser to alternate page

* improved webgl template appearance * updated to latest field day core
fielddaylab · May 23, 2024 · 7526185 · 7526185
1 parent 710e3dc
commit 7526185
Show file tree

Hide file tree

Showing 87 changed files with 1,795 additions and 523 deletions.
diff --git a/Assets/Code/Alerts/AlertCreationSystem.cs b/Assets/Code/Alerts/AlertCreationSystem.cs
@@ -97,7 +97,7 @@ public override void ProcessWorkForComponent(EventActor component, float deltaTi
                 }
 
                 ZavalaGame.Events.Dispatch(GameEvents.AlertAppeared, new Data.AlertData(peekEvent.Alert, peekEvent.TileIndex, node.FullName));
-                Debug.Log("[Alerts] Created new alert!" + node.FullName);
+                Log.Debug("[Alerts] Created new alert!" + node.FullName);
                 component.DisplayingEvent = alert;
             }
         }

diff --git a/Assets/Code/Alerts/ExcessRunoffAlertSystem.cs b/Assets/Code/Alerts/ExcessRunoffAlertSystem.cs
@@ -32,10 +32,10 @@ public override void ProcessWorkForComponent(ActorPhosphorusGenerator generator,
             }
 
             // check if runoff is excessive
-            Log.Msg("[ExcessRunoffAlertSystem] Amount generated last tick by {0}: {1}", actor.name, generator.AmountProducedLastTick);
+            Log.Debug("[ExcessRunoffAlertSystem] Amount generated last tick by {0}: {1}", actor.name, generator.AmountProducedLastTick);
             if (generator.AmountProducedLastTick >= RunoffParams.ExcessRunoffThreshold) {
                 // if so, create alert on this tile
-                Log.Msg("-----> Sending runoff alert from {0}", actor.name);
+                Log.Debug("-----> Sending runoff alert from {0}", actor.name);
                 EventActorUtility.QueueAlert(actor, EventActorAlertType.ExcessRunoff, tile.TileIndex, tile.RegionIndex, 
                     new NamedVariant("isFromGrainFarm", isFromGrainFarm));
             }

diff --git a/Assets/Code/Alerts/GlobalAlertButton.cs b/Assets/Code/Alerts/GlobalAlertButton.cs
@@ -137,7 +137,7 @@ public static class GlobalAlertUtility {
         public static void TickGlobalAlertDelay(GlobalAlertButton button) {
             if (button.TicksSinceFired < GlobalAlertParams.GlobalAlertDelay) {
                 button.TicksSinceFired++;
-                Log.Msg("[GlobalAlertButton] Ticking global alert delay... {0} of {1}", button.TicksSinceFired, GlobalAlertParams.GlobalAlertDelay);
+                Log.Debug("[GlobalAlertButton] Ticking global alert delay... {0} of {1}", button.TicksSinceFired, GlobalAlertParams.GlobalAlertDelay);
             }
             if (button.TicksSinceFired >= GlobalAlertParams.GlobalAlertDelay) {
                 button.UpdateButtonRoutine();

diff --git a/Assets/Code/Alerts/UIAlert.cs b/Assets/Code/Alerts/UIAlert.cs
@@ -120,7 +120,7 @@ public static void SetAlertFaded(UIAlert alert, bool faded) {
 
         public static bool ClearAlert(UIAlert alert, bool recycleEvent = false) {
             if (alert == null) {
-                Log.Msg("[UIAlertUtility] Clear Alert: attempted to clear null alert, skipping.");
+                Log.Debug("[UIAlertUtility] Clear Alert: attempted to clear null alert, skipping.");
 ;                return false; 
             }
             alert.KeepFaded = false;
@@ -131,7 +131,7 @@ public static bool ClearAlert(UIAlert alert, bool recycleEvent = false) {
 
         public static bool ClearAlertImmediate(UIAlert alert, bool recycleEvent = false) {
             if (alert == null) {
-                Log.Msg("[UIAlertUtility] Clear Alert: attempted to clear null alert, skipping.");
+                Log.Debug("[UIAlertUtility] Clear Alert: attempted to clear null alert, skipping.");
                 return false;
             }
             alert.KeepFaded = false;

diff --git a/Assets/Code/Building/UserBuildingSystem.cs b/Assets/Code/Building/UserBuildingSystem.cs
@@ -127,7 +127,7 @@ private int RaycastTileIndex(SimWorldState world, SimGridState grid) {
             if (Game.Input.IsPointerOverCanvas()) {
                 // return  if over UI
                 // TODO: more permanent solution
-                Log.Msg("[UserBuildingSystem] Raycast over UI, discarding.");
+                Log.Debug("[UserBuildingSystem] Raycast over UI, discarding.");
                 return CODE_INVALID;
             }
             Ray mouseRay = m_StateB.Camera.ScreenPointToRay(m_StateA.ScreenMousePos);
@@ -145,7 +145,7 @@ private int RaycastTileIndex(SimWorldState world, SimGridState grid) {
                     return CODE_INVALID;
                 }
 
-                Log.Msg("[UserBuildingSystem] New raycast hit Tile {0}", i);
+                Log.Debug("[UserBuildingSystem] New raycast hit Tile {0}", i);
 
                 // TODO: check if valid neighbor (otherwise try to draw line between current and previous, or wait for return)
 
@@ -155,7 +155,7 @@ private int RaycastTileIndex(SimWorldState world, SimGridState grid) {
                 return i;
             }
             else {
-                Log.Msg("[UserBuildingSystem] Raycast missed.");
+                Log.Debug("[UserBuildingSystem] Raycast missed.");
                 return CODE_INVALID;
             }
         }
@@ -170,7 +170,7 @@ private Collider RaycastBuilding(SimWorldState world, SimGridState grid) {
             if (Game.Input.IsPointerOverCanvas()) {
                 // return  if over UI
                 // TODO: more permanent solution
-                Log.Msg("[UserBuildingSystem] Raycast over UI, discarding.");
+                Log.Debug("[UserBuildingSystem] Raycast over UI, discarding.");
                 return null;
             }
             Ray mouseRay = m_StateB.Camera.ScreenPointToRay(m_StateA.ScreenMousePos);
@@ -185,7 +185,7 @@ private Collider RaycastBuilding(SimWorldState world, SimGridState grid) {
         /// </summary>
         private void TryApplyTool(SimGridState grid, RoadNetwork network, UserBuildTool activeTool, int tileIndex) {
             if (tileIndex == CODE_INVALID) {
-                Log.Msg("[UserBuildingSystem] Invalid build location: tile {0} out of bounds", tileIndex);
+                Log.Debug("[UserBuildingSystem] Invalid build location: tile {0} out of bounds", tileIndex);
 
                 if (activeTool == UserBuildTool.Road) {
                     // cancel in-progress road
@@ -200,7 +200,7 @@ private void TryApplyTool(SimGridState grid, RoadNetwork network, UserBuildTool
                 return;
             }
             if ((grid.Terrain.Info[tileIndex].Flags & TerrainFlags.NonBuildable) != 0) {
-                Log.Msg("[UserBuildingSystem] Invalid build location: tile {0} unbuildable", tileIndex);
+                Log.Debug("[UserBuildingSystem] Invalid build location: tile {0} unbuildable", tileIndex);
                 if (activeTool == UserBuildTool.Road) {
                     SfxUtility.PlaySfx("road-nonbuildable");
                 }
@@ -442,7 +442,7 @@ private bool TryStageRoad(SimGridState grid, RoadNetwork network, int tileIndex,
                 RoadTileInfo idxRoadTile = network.Roads.Info[tileIndex];
                 RoadTileConstructionInfo idxRoadConstruct = network.Roads.ConstructInfo[tileIndex];
                 if ((idxRoadConstruct.InProgressMask | idxRoadTile.FlowMask)[dir]) {
-                    Log.Msg("[UserBuildingSystem] Trying to build across a connection that already exists or is staged");
+                    Log.Debug("[UserBuildingSystem] Trying to build across a connection that already exists or is staged");
                     return false;
                 }
 

diff --git a/Assets/Code/Data/Logging/AnalyticsService.cs b/Assets/Code/Data/Logging/AnalyticsService.cs
@@ -23,6 +23,7 @@
 using Zavala.World;
 using BeauData;
 using FieldDay.Components;
+using OGD;
 
 namespace Zavala.Data {
 
@@ -163,17 +164,6 @@ public GrainFarmData(List<GFarmGrainTabData> grainTab, List<GFarmFertilizerTabDa
             GrainTab = grainTab;
             FertilizerTab = fertilizerTab;
         }
-
-        public StringBuilder GrainTabJSON() {
-            using (PooledStringBuilder psb = PooledStringBuilder.Create()) {
-                psb.Builder.Append('[');
-                foreach (GFarmGrainTabData grain in GrainTab) {
-                    psb.Builder.Append(grain.ToJsonString()).Append(',');
-                }
-                psb.Builder.Append(']');
-                return psb.Builder;
-            }
-        }
     }
 
     [Serializable]
@@ -185,20 +175,6 @@ public struct GFarmGrainTabData
         public int BasePrice;
         public int ShippingCost;
         public int TotalProfit;
-
-        public StringBuilder ToJsonString() {
-            using (PooledStringBuilder psb = PooledStringBuilder.Create()) {
-                psb.Builder.Append('{');
-                psb.Builder.Append("is_active:").Append(IsActive ? "true" : "false").Append(',');
-                psb.Builder.Append("farm_name:").Append(FarmName).Append(',');
-                psb.Builder.Append("farm_county:").Append(FarmCounty).Append(',');
-                psb.Builder.Append("base_price:").Append(BasePrice.ToStringLookup()).Append(',');
-                psb.Builder.Append("shipping_cost:").Append(ShippingCost.ToStringLookup()).Append(',');
-                psb.Builder.Append("total_profit:").Append(TotalProfit.ToStringLookup());
-                psb.Builder.Append('}');
-                return psb.Builder;
-            }
-        }
     }
 
     [Serializable]

diff --git a/Assets/Code/Economy/MarketData.cs b/Assets/Code/Economy/MarketData.cs
@@ -379,7 +379,7 @@ static public bool QueueRequest(ResourceRequester requester, ResourceBlock reque
                 MarketData marketData = Game.SharedState.Get<MarketData>();
                 Assert.NotNull(marketData);
                 marketData.RequestQueue.PushBack(new MarketRequestInfo(requester, request));
-                Log.Msg("[MarketUtility] Producer '{0}' requested {1}", requester.name, request);
+                Log.Debug("[MarketUtility] Producer '{0}' requested {1}", requester.name, request);
                 return true;
             }
 

diff --git a/Assets/Code/Economy/MarketSystem.cs b/Assets/Code/Economy/MarketSystem.cs
@@ -383,7 +383,7 @@ private void UpdateAllSupplierPriorities()
             m_RequesterWorkList.Clear();
             m_BuyerPriorityWorkList.Clear();
 
-            Log.Msg("[MarketSystem] Updated supplier priorities");
+            Log.Debug("[MarketSystem] Updated supplier priorities");
         }
 
         private void UpdateSupplierPriority(ResourceSupplier supplier, MarketData data, MarketConfig config, RoadNetwork network, HexGridSize gridSize, TutorialState tutorialState)
@@ -606,7 +606,7 @@ private void UpdateAllRequesterPriorities()
             m_RequesterWorkList.Clear();
             m_SellerPriorityWorkList.Clear();
 
-            Log.Msg("[MarketSystem] Updated buyer priorities");
+            Log.Debug("[MarketSystem] Updated buyer priorities");
         }
 
 

diff --git a/Assets/Code/Economy/MoneyProducerSystem.cs b/Assets/Code/Economy/MoneyProducerSystem.cs
@@ -25,7 +25,7 @@ public override void ProcessWorkForComponent(MoneyProducer producer, ActorTimer
 
                 MarketUtility.RecordMilkRevenueToHistory(marketData, producedAmt, position.RegionIndex);
 
-                Log.Msg("[MoneyProducerSystem] Producer '{0}' consumed {1} to produce {2} money units", producer.name, consumed, producedAmt);
+                Log.Debug("[MoneyProducerSystem] Producer '{0}' consumed {1} to produce {2} money units", producer.name, consumed, producedAmt);
                 // TODO: events?
                 DebugDraw.AddWorldText(producer.transform.position, "Produced $!", Color.green, 2, TextAnchor.MiddleCenter, DebugTextStyle.BackgroundDark);
                 ResourceStorageUtility.RefreshStorageDisplays(producer.Storage);

diff --git a/Assets/Code/Economy/RequestFulfillmentSystem.cs b/Assets/Code/Economy/RequestFulfillmentSystem.cs
@@ -228,7 +228,7 @@ private void OrientAirship(ref RequestFulfiller fulfiller) {
         private void DeliverFulfillment(MarketData marketData, RequestFulfiller component, RequestVisualState visualState) {
             component.Target.Received += component.Carrying;
             component.Target.RequestCount--;
-            Log.Msg("[RequestFulfillmentSystem] Shipment of {0} received by '{1}'", component.Carrying, component.Target.name);
+            Log.Debug("[RequestFulfillmentSystem] Shipment of {0} received by '{1}'", component.Carrying, component.Target.name);
             DebugDraw.AddWorldText(component.Target.transform.position, "Received!", Color.black, 2, TextAnchor.MiddleCenter, DebugTextStyle.BackgroundLightOpaque);
             ResourceStorageUtility.RefreshStorageDisplays(component.Target.Storage);
 

diff --git a/Assets/Code/Economy/ResourceProducerSystem.cs b/Assets/Code/Economy/ResourceProducerSystem.cs
@@ -39,7 +39,7 @@ public override void ProcessWorkForComponent(ResourceProducer producer, ActorTim
                 }
 
                 ResourceRequester requester = producer.GetComponent<ResourceRequester>();
-                Log.Msg("[ResourceProducerSystem] Producer '{0}' consumed {1} to produce {2}", producer.name, consumed, produced);
+                Log.Debug("[ResourceProducerSystem] Producer '{0}' consumed {1} to produce {2}", producer.name, consumed, produced);
                 DebugDraw.AddWorldText(producer.transform.position, "Produced!", Color.green, 2, TextAnchor.MiddleCenter, DebugTextStyle.BackgroundDark);
 
                 if (requester != null && requester.IsLocalOption) {

diff --git a/Assets/Code/Economy/ResourcePurchaser.cs b/Assets/Code/Economy/ResourcePurchaser.cs
@@ -45,7 +45,7 @@ public void ChangeRequestAmount(ResourceId resource, int change) {
         public void ChangeDemandAmount(ResourceId resource, int change) {
             ChangeRequestAmount(resource, change);
             // ChangePurchasePrice(resource, change);
-            Log.Msg("[ResourcePurchaser] {0} demand changed by {1} for actor {2}", resource, change, transform.name);
+            Log.Debug("[ResourcePurchaser] {0} demand changed by {1} for actor {2}", resource, change, transform.name);
         }
 
         private void Awake() {

diff --git a/Assets/Code/Scripting/Actors/EventActorSystem.cs b/Assets/Code/Scripting/Actors/EventActorSystem.cs
@@ -61,7 +61,7 @@ public override void ProcessWorkForComponent(EventActor component, float deltaTi
                             }
                             HashSet<AutoAlertCondition> conditions = ZavalaGame.SharedState.Get<AlertState>().AutoTriggerAlerts;
                             foreach (AutoAlertCondition autoTrig in conditions) {
-                                Log.Msg("[EventActorUtility] Checking for AutoTriggerAlert...");
+                                Log.Debug("[EventActorUtility] Checking for AutoTriggerAlert...");
                                 if ((autoTrig.Alert == EventActorAlertType.None || autoTrig.Alert == queuedEvent.Alert) &&
                                     (autoTrig.RegionIndex == -1 || autoTrig.RegionIndex == queuedEvent.RegionIndex.Value) &&
                                     (autoTrig.CafosOnly == false || (queuedEvent.SecondArg.Id == "isFromGrainFarm" && queuedEvent.SecondArg.Value == false))) {
@@ -72,7 +72,7 @@ public override void ProcessWorkForComponent(EventActor component, float deltaTi
                                     conditions.Remove(autoTrig);
                                     break;
                                 } else {
-                                    Log.Msg("[EventActorUtility] AutoTriggerAlert BYPASSED.");
+                                    Log.Debug("[EventActorUtility] AutoTriggerAlert BYPASSED.");
                                 }
 
                             }

diff --git a/Assets/Code/Scripting/WinLossSystem.cs b/Assets/Code/Scripting/WinLossSystem.cs
@@ -156,7 +156,7 @@ private void EvaluateFertilizerProportions(ref bool triggered, TargetRatio MFert
 
             float MFertVal = ratios[0];
             float DFertVal = ratios[2];
-            Log.Msg("[WinLossSystem: Evaluating Fert. proportions: {0}:{1}:{2} over past {3} ticks", ratios[0], ratios[1], ratios[2], depth );
+            Log.Debug("[WinLossSystem: Evaluating Fert. proportions: {0}:{1}:{2} over past {3} ticks", ratios[0], ratios[1], ratios[2], depth );
 
             if (MFertProp.Target == 0 && !MFertProp.Above) {
                 // uninitialized

diff --git a/Assets/Code/Services/Localization/LocText.cs b/Assets/Code/Services/Localization/LocText.cs
@@ -6,6 +6,8 @@
 using TMPro;
 using UnityEngine;
 using System.Text;
+using BeauUtil.Debugger;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -46,7 +48,7 @@ public struct TextMetrics
         public TextMetrics Metrics { get { return m_LastMetrics; } }
 
         public void SetText(TextId inId, object inContext = null) {
-            Debug.Log("[Loc] Setting text for " + inId);
+            Log.Trace("[Loc] Setting text for {0}", inId);
 
             m_LastId = inId;
 

diff --git a/Assets/Code/Stress/Systems/SupplierFinancialStressSystem.cs b/Assets/Code/Stress/Systems/SupplierFinancialStressSystem.cs
@@ -41,7 +41,7 @@ public override void ProcessWorkForComponent(StressableActor actor, ActorTimer t
             }
 
             int soldUnstressed = financeStress.NonMilkSoldSinceLast - financeStress.SoldAtLossSinceLast;
-            Log.Msg("[SupplierFinancialStressSystem] NonMilkSold: {0}, SoldAtLoss: {1}", financeStress.NonMilkSoldSinceLast, financeStress.SoldAtLossSinceLast);
+            Log.Debug("[SupplierFinancialStressSystem] NonMilkSold: {0}, SoldAtLoss: {1}", financeStress.NonMilkSoldSinceLast, financeStress.SoldAtLossSinceLast);
 
             // TODO: may need to shift this to AFTER market system?
             if (financeStress.NonMilkSoldSinceLast > 0 && financeStress.SoldAtLossSinceLast >= soldUnstressed)

diff --git a/Assets/Code/ZavalaGame.cs b/Assets/Code/ZavalaGame.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Runtime.InteropServices;
 using BeauUtil;
 using FieldDay;
 using FieldDay.HID;
@@ -6,7 +8,9 @@
 using UnityEngine;
 using UnityEngine.Profiling;
 using UnityEngine.Scripting;
+using Zavala.Advisor;
 using Zavala.Data;
+using Zavala.Economy;
 using Zavala.Sim;
 using Zavala.World;
 
@@ -47,6 +51,8 @@ static private void OnPreBoot() {
             Game.SetEventDispatcher(Events);
             SaveBuffer = new SaveMgr();
 
+            Game.Rendering.EnableMinimumAspectClamping(1024, 660);
+
             UserSettings settings = new UserSettings();
             Game.SharedState.Register(settings);