Merge branch 'master' into love-9-transition

Conflicts:
	src/start.lua

src/blackjackgame.lua

@@ -203,7 +203,7 @@ function state:gameMenu() -- set the game menu after card additions/changes
     actualBets = self.currentBet
   end
 
-  if actualBets < self.player.money then
+  if actualBets < self.player.money/2 then
     self.options[ 3 ].active = true           -- double
   else
     self.options[ 3 ].active = false          -- double
@@ -481,7 +481,7 @@ function state:split()
     self.playerHand[newHandNum].has_ace = true
     -- no hits on splitting aces
     self:dealCard('player')
-    self.activeHand = self.activevHand + 1
+    self.activeHand = self.activeHand + 1
     self:dealCard('player')
     self.card_complete_callback = function()
       self.card_complete_callback = nil
@@ -567,16 +567,14 @@ function state:stand()
         end
       end
     end
-  end
-
-  -- player must have at least 1 coin to continue playing
-  if self.player.money < 1 then
-    self:gameOver()
-  end
-
-  -- decrease current bet if player has less money than previous bet
-  if self.player.money < self.currentBet then
-    self.currentBet = self.player.money
+    -- player must have at least 1 coin to continue playing
+    if self.player.money < 1 then
+      self:gameOver()
+    end
+    -- decrease current bet if player has less money than previous bet
+    if self.player.money < self.currentBet then
+      self.currentBet = self.player.money
+    end
   end
 
   self:dealMenu()

src/character.lua

@@ -21,16 +21,6 @@ function Character:reset()
   self.direction = 'right'
 end
 
--- FIXME: Needed for the taco meat item
--- If a character doesn't have this costume, no effect takes place
-function Character:setCostume(costume)
-  if costume == self.costume then 
-    return
-  end
-
-  -- Stuff for magic
-end
-
 function Character:sheet()
   return self:getSheet(self.costume)
 end

src/cheat.lua

@@ -1,6 +1,7 @@
 local overworld = require('overworld')
 local Player = require('player')
 local ItemClass = require('items/item')
+local app = require 'app'
 
 local Cheat = {}
 
@@ -37,6 +38,10 @@ local function setCheat(cheatName, turnOn)
   local activations = {
     give_money = function() player.money = player.money + 500 end,
     max_health = function() player.health = player.max_health end,
+	give_gcc_key = function() 
+	  local gamesave = app.gamesaves:active()
+	  gamesave:set('cuttriggers.throne', true) 
+	end,
     unlock_levels = function()
     player.visitedLevels = {}
       for _,mapInfo in pairs(overworld.zones) do
@@ -72,7 +77,8 @@ local function setCheat(cheatName, turnOn)
         end
       end
     end
-  elseif activations[cheatName] then
+  end
+  if activations[cheatName] then
     activations[cheatName]()
   end
 end

src/inventory.lua

@@ -517,6 +517,14 @@ function Inventory:removeItem( slotIndex, pageName )
     self.pages[pageName][slotIndex] = nil
 end
 
+---
+-- Removes all inventory items
+-- @return nil
+function Inventory:removeAllItems()
+  for page in pairs(self.pages) do
+    self.pages[page] = {}
+  end
+end
 ---
 -- Removes a certain amount of items from the player
 -- @parameter amount amount to remove

src/items/consumables/tacomeat.lua

@@ -14,7 +14,7 @@ return{
       player.punchDamage = punchDamage
       player.jumpDamage = jumpDamage
       player.slideDamage = slideDamage
-      player.character:setCostume(costume)
+      player.character.costume = costume
     end)
     for i=1,2 do
       Timer.add(2*i-1, function () -- Damage over time

src/level.lua

@@ -399,6 +399,11 @@ function Level:update(dt)
             self.player.character:reset()
             local gamesave = app.gamesaves:active()
             local point = gamesave:get('savepoint', {level='studyroom', name='bookshelf'})
+            if app.config.hardcore then
+              point = {level = 'studyroom', name = 'bookshelf'}
+              self.player.money = 0
+              self.player.inventory:removeAllItems()
+            end
             Gamestate.switch(point.level, point.name)
         end)
     end

src/main.lua

@@ -161,7 +161,7 @@ function love.load(arg)
       table.insert( cheats, string.sub( args["cheat"], from  ) )
     else
       if args["cheat"] == "all" then
-        cheats = {'jump_high','super_speed','god','slide_attack','give_money','max_health','give_gcc_key','give_weapons','give_materials','give_potions','give_scrolls','give_misc','unlock_levels'}
+        cheats = {'jump_high','super_speed','god','slide_attack','give_money','max_health','give_gcc_key','give_weapons', 'give_materials','give_potions','give_scrolls','give_taco_meat','unlock_levels','give_master_key'}  
       else
         cheats = {args["cheat"]}
       end

src/nodes/enemy.lua

@@ -184,6 +184,7 @@ function Enemy:hurt( damage, special_damage, knockback )
             self.flash = true
             self.flashing = Timer.addPeriodic(.12, function() self.flash = not self.flash end)
         end
+        if self.reviveTimer then Timer.cancel( self.reviveTimer ) end
         self.reviveTimer = Timer.add( self.revivedelay, function()
                                       self.state = 'default'
                                       self:cancel_flash()

src/npcs/hilda.lua

@@ -113,10 +113,19 @@ return {
     ['madam, i am on a quest']={
         "I can help with that",
         "I have information on many topics...",
+    },
+	['i will wear your skin']={
+        "My skin is my own.",
+    },
+		['stand aside']={
+        "I'm sorry to see you go.",
     },
     ['throne of hawkthorne']={
         "The throne is in Castle Hawkthorne, north of here.",
     "You unlock the castle with the white crystal of discipline, which you must free from the black caverns.",
+    },
+	['for your hand']={
+        "I cannot marry someone whom I do not truly love and trust.",
     },
     ['frog extinction']={
         "You know what? My prank is going to cause a sea of laughter,",
@@ -448,7 +457,7 @@ return {
     end,
     ['stay']=function(npc, player)
         npc.walking = false
-        npc.stare = true
+        npc.stare = false
     end,
     ['go home']=function(npc, player)
         npc.walking = true