From 39c8e2c9145e00e24ab57da4273950295e7405a5 Mon Sep 17 00:00:00 2001
From: pjht <pjht@users.noreply.github.com>
Date: Tue, 16 Oct 2018 09:18:10 -0500
Subject: [PATCH] Farming work

---
 index.html |  2 ++
 main.js    | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 542c6bc..79ea71e 100644
--- a/index.html
+++ b/index.html
@@ -32,6 +32,8 @@
     </ul>
     <div id="tabMain">
       <button onclick="incResource('wood')">Gather wood</button>
+      <br>
+      <button onclick="incResource('food')">Gather food</button>
       <div class="resourcesRequired">
         <br>
         <p id="maxResources">Resources:</p>
diff --git a/main.js b/main.js
index 541721a..307e7f8 100644
--- a/main.js
+++ b/main.js
@@ -47,6 +47,15 @@ var allBuildings={
       wood:100,
       metal:50
     }
+  },
+  farm:{
+    ings:{
+      wood:30,
+      metal:15
+    },
+    attributes:{
+      maxFarmers:2
+    }
   }
 };
 var allWorkers={
@@ -62,6 +71,13 @@ var allResearches={
     effects:{
       workerRate:0.2
     }
+  },
+  "Better Yield": {
+    maxLevel:5,
+    cost:120,
+    effects:{
+      yield:3
+    }
   }
 };
 var multiplier=1.17;
@@ -69,8 +85,9 @@ var tradingRates={
   wood:1,
   metal:10
 };
-var startingStorage=100;
 var shelters=[];
+var startingStorage=100;
+var startingYield=3;
 function initializeShelterArray() {
   for (var name in allBuildings) {
     var building=allBuildings[name];
@@ -83,7 +100,7 @@ function initializeShelterArray() {
     }
   }
 }
-function getBuildingAttribute(name,attrname) {
+function buildingAttribute(name,attrname) {
   var attr=allBuildings[name].attributes[attrname];
   if (attr==undefined) {
     attr=0;
@@ -97,18 +114,32 @@ function numOfBuilding(name) {
   }
   return count;
 }
+function researchLevel(name) {
+  var level=researches[name]
+  if (level==undefined) {
+    level=0;
+  }
+  return level;
+}
+function researchEffect(name,attrname) {
+  var effect=allResearches[name].effects[attrname];
+  if (effect==undefined) {
+    effect=0;
+  }
+  return effect;
+}
 function tenthRound(number) {
   return Math.round(number*10)/10;
 }
 function maxResources() {
   var numStorehouses=numOfBuilding("storehouse");
-  var storehouseResources=getBuildingAttribute("storehouse","maxResources");
+  var storehouseResources=buildingAttribute("storehouse","maxResources");
   var extraStorage=numStorehouses*storehouseResources;
   return startingStorage+extraStorage;
 }
 function maxResearchPoints() {
   var numLabs=numOfBuilding("lab");
-  var labRpoints=getBuildingAttribute("lab","maxResearchPoints");
+  var labRpoints=buildingAttribute("lab","maxResearchPoints");
   return numLabs*labRpoints;
 }
 function maxPop() {
@@ -116,11 +147,18 @@ function maxPop() {
   for (var i in shelters) {
     var shelter=shelters[i];
     if (numOfBuilding(shelter)>0) {
-      maxpop+=numOfBuilding(shelter)*getBuildingAttribute(shelter,"maxPop");
+      maxpop+=numOfBuilding(shelter)*buildingAttribute(shelter,"maxPop");
     }
   }
   return maxpop;
 }
+function maxFarmers() {
+  return numOfBuilding("farm")*buildingAttribute("farm","maxFarmers");
+}
+function farmYield() {
+  var extraYield=researchLevel("Better Yield")*researchEffect("Better Yield","yield");
+  return extraYield+startingYield;
+}
 function updateShown() {
   var hasResources=Object.keys(resources).length>0;
   var hasLab=Object.keys(buildings).includes("lab");