Merge pull request #183 from Permafrost-Game/bugfixes-showcase

Minor bug fixes
Permafrost-Game · Jul 23, 2020 · 1e0fed3 · 1e0fed3
2 parents a55be7e + 014a860
commit 1e0fed3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/TeamProject/GlobalWarmingGame/Interactions/Interactables/Buildings/CampFire.cs b/TeamProject/GlobalWarmingGame/Interactions/Interactables/Buildings/CampFire.cs
@@ -32,7 +32,7 @@ public CampFire() : base(Vector2.Zero, Textures.MapSet[TextureSetTypes.CampFire]
 
         [PFSerializable]
         public float timeUntilBurntout;
-        private const float burnoutTime = 15000f;
+        private const float burnoutTime = 30000f;
 
         public CampFire(Vector2 position, bool heating = true, float timeUntilBurntout = burnoutTime) : base
         (
@@ -59,9 +59,18 @@ public CampFire(Vector2 position, bool heating = true, float timeUntilBurntout =
 
         private void Fuel(Instruction instruction)
         {
-            Heating = true;
-            TextureGroupIndex = 1;
-            InstructionTypes.Clear();
+            if (instruction.ActiveMember.Inventory.ContainsAll(instruction.Type.RequiredResources))
+            {
+                foreach (ResourceItem item in instruction.Type.RequiredResources)
+                {
+                    instruction.ActiveMember.Inventory.RemoveItem(item);
+                }
+
+                Heating = true;
+                TextureGroupIndex = 1;
+                InstructionTypes.Clear();
+
+            }
         }
 
         public override void Update(GameTime gameTime)

diff --git a/TeamProject/GlobalWarmingGame/Interactions/Interactables/InteractablesFactory.cs b/TeamProject/GlobalWarmingGame/Interactions/Interactables/InteractablesFactory.cs
@@ -29,6 +29,7 @@ public static IInteractable MakeInteractable(Interactable interactable, Vector2
                 case Interactable.Colonist:
                     Inventory i = new Inventory(Colonist.COLONIST_DEFAULT_INVENTORY_SIZE);
                     i.AddItem(new ResourceItem(Resource.Food, 10));
+                    i.AddItem(new ResourceItem(Resource.Wood, 10));
                     return new Colonist(position, i);
                 case Interactable.Merchant:
                     return new Merchant(position);

diff --git a/TeamProject/GlobalWarmingGame/UI/Controllers/GameUIController.cs b/TeamProject/GlobalWarmingGame/UI/Controllers/GameUIController.cs
@@ -451,7 +451,7 @@ private static void UpdateTemperature(Vector2 gameHover, Vector2 screenHover)
 
             if (t != null && !view.Hovering)
             {
-                int temperature = MathHelper.Clamp((int)Math.Round(t.Temperature.Value), -50, +50);
+                int temperature = MathHelper.Clamp((int)Math.Round(t.Temperature.Value), -50, +50) - 30;
                 if (temperature == 0)
                     temp = "±";
                  else if (temperature > 0)

diff --git a/TeamProject/GlobalWarmingGame/ZoneGenerator.cs b/TeamProject/GlobalWarmingGame/ZoneGenerator.cs
@@ -12,7 +12,7 @@ namespace GlobalWarmingGame
 {
     static class ZoneGenerator
     {
-        private static readonly int towerDistance = 7;
+        private static readonly int towerDistance = 3;
         private static readonly int towerSpan = 100;
 
         /// <summary>