Merge remote-tracking branch 'origin/master'

nanderv · Apr 23, 2018 · 78ebdb8 · 78ebdb8
2 parents 234fb55 + 8ee7def
commit 78ebdb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/scripts/gameobjects/buildings.lua b/scripts/gameobjects/buildings.lua
@@ -228,7 +228,11 @@ buildings.university = {
     name = "University",
     size = { x = 1, y = 1 },
     asset = "university",
-    effects = {},
+    effects = { {
+        type = "resource",
+        resource = "draw",
+        value = 1,
+    },},
 }
 
 buildings.casino = {

diff --git a/scripts/helpers/gamerules.lua b/scripts/helpers/gamerules.lua
@@ -99,12 +99,7 @@ end
 
 function gamerules.getCardDraw(state)
     local c = 3
-    for _, building in ipairs(state.buildings) do
-        if building.building == "university" then
-            c = c + 1
-        end
-    end
-    return c
+    return c + gamerules.getTotalResource(state, "draw")
 end
 
 function gamerules.getMoneyPerTurn(state)