Final commit, fixes gamecrashing bugs.

nanderv · Apr 24, 2018 · e90080e · e90080e
1 parent f2fd076
commit e90080e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/scripts/gameobjects/cards.lua b/scripts/gameobjects/cards.lua
@@ -267,28 +267,13 @@ cards.loan = {
     is_creeper = true,
 }
 
-cards.football_match = {
-    name = "Football match",
-    effects = {
-        {
-            type = "resource",
-            resource="happiness",
-            value = 30,
-        },
-    },
-    requirements = {{type="resource", property="happiness", relation="gt", value=30}},
-    costs = {},
-    autoadd=true,
-    is_creeper = true,
-}
-
 cards.demonstration = {
     name = "Demonstration",
     effects = {
         {
             type = "resource",
-            resource="nuisance",
-            value = 30,
+            resource="population",
+            value = -5,
         },
     },
     requirements = {{type="building_count", filter={"small_generator", "medium_generator"}, relation="gt", value=9}},
@@ -302,8 +287,8 @@ cards.vacancy = {
     effects = {
         {
             type = "resource",
-            resource = "nuisance",
-            value = 30,
+            resource = "money",
+            value = -10,
         },
     },
     requirements = {{type="resource", property="excessHousing", relation="gt", value=20}},

diff --git a/scripts/states/menu.lua b/scripts/states/menu.lua
@@ -22,9 +22,10 @@ function menu:draw()
     love.graphics.setFont(fonts["title"])
 
     scripts.rendering.renderMapView.draw(0, true)
-    love.graphics.print("Card Major", 500,180)
+    love.graphics.print("Card Mayor", 500,180)
 
     love.graphics.setFont(fonts["subtitle"])
+
     scripts.rendering.renderUI.drawMessageDown("                    Click to start\n\n A game by Peter van Dijk, Rolf van Kleef, Simon Struck, Nander Voortman\n\nWe hope you enjoy this game.")
     love.graphics.setFont(f)