Merge pull request #2391 from hawkthorne/master

Bugfix 0.12.3

.travis.yml

@@ -4,7 +4,9 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
 install:
   - sudo apt-get install python-virtualenv lua5.1
-  - sudo make /usr/bin/love
+  - sudo add-apt-repository -y ppa:bartbes/love-stable
+  - sudo apt-get update -y -f
+  - sudo apt-get install -y love
   - mkdir -p $TRAVIS_BUILD_DIR/share/love/
 env:
   global:

Makefile

@@ -50,7 +50,7 @@ bin/love.app/Contents/MacOS/love:
 
 /usr/bin/love:
 	sudo add-apt-repository -y ppa:bartbes/love-stable
-	sudo apt-get update -y
+	sudo apt-get update -y -f
 	sudo apt-get install -y love
 
 ######################################################

src/board.lua

@@ -1,3 +1,4 @@
+local gamestate = require "vendor/gamestate"
 local sound = require 'vendor/TEsound'
 local camera = require 'camera'
 
@@ -25,6 +26,11 @@ function Board.new(width, height)
 end
 
 function Board:open()
+  local state = gamestate.currentState()
+  if state.player then
+    state.player.inventory:close()
+    state.player.controlState:inventory()
+  end
   sound.playSfx( 'menu_expand' )
   self.state = 'opening'
   self.targetWidth = self.maxWidth
@@ -44,6 +50,10 @@ function Board:update(dt)
 
   if self.done and self.state == 'closing' then
     self.state = 'closed'
+    local state = gamestate.currentState()
+    if not state.scene then
+      if state.player then state.player.controlState:standard() end
+    end
   end
 
   if self.done and self.state == 'opening' then

src/characters/annie.json

@@ -24,20 +24,20 @@
   "costumes": [
     {"category": "base", "name": "Annie Edison", "sheet": "base", "ow": 1},
     {"category": "s3e16", "name": "Abed", "sheet": "abed", "ow": 4},
-    {"category": "s2e4", "name": "Astronaut", "sheet": "astronaut", "ow": 19},
-    {"category": "s3e19", "name": "Asylum", "sheet": "asylum","ow": 2},
     {"category": "s2e23", "name": "Ace of Hearts", "sheet": "hearts", "ow": 8},
     {"category": "s3e2", "name": "Annie Kim", "sheet": "kim", "ow": 9},
     {"category": "s3e20", "name": "Armor", "sheet": "armor", "ow": 3},
+    {"category": "s2e4", "name": "Astronaut", "sheet": "astronaut", "ow": 19},
+    {"category": "s3e19", "name": "Asylum", "sheet": "asylum","ow": 2},
     {"category": "s2e11", "name": "Ballerannie", "sheet": "ballerannie", "ow": 20},
     {"category": "s1e20", "name": "Campus Security", "sheet": "security", "ow": 13},
     {"category": "s3e21", "name": "Changlorious Bastard", "sheet": "changlorious", "ow": 25},
     {"category": "s1e13", "name": "Cheerleader", "sheet": "cheerleader", "ow": 29},
     {"category": "s1e18", "name": "Chicken Mafia", "sheet": "mafia", "ow": 44},
     {"category": "s1e12", "name": "Christmas Brawl", "sheet": "hurt", "ow": 37},
     {"category": "s2e24", "name": "Covered In Paint", "sheet": "paint", "ow": 45}, 
-    {"category": "s3e11", "name": "Dorothy (Judy Garland)", "sheet": "dorothy", "ow": 24},
     {"category": "s1e9", "name": "Debate Uniform", "sheet": "debate", "ow": 30},
+    {"category": "s3e11", "name": "Dorothy (Judy Garland)", "sheet": "dorothy", "ow": 24},
     {"category": "s4e10", "name": "Evil Annie (Hanniebal)", "sheet": "hanniebal", "ow": 47},
     {"category": "s4e13", "name": "Evil Annie (Red Dress)", "sheet": "reddress", "ow": 39},
     {"category": "s3e1", "name": "Finally Be Fine", "sheet": "befine", "ow": 5},
@@ -63,8 +63,8 @@
     {"category": "s4e2", "name": "Samara (Ring Girl)", "sheet": "samara", "ow": 42},
     {"category": "s3e8", "name": "Script Supervisor", "sheet": "script", "ow": 35},
     {"category": "s3e10", "name": "Sexy Santa", "sheet": "santa", "ow": 12},
-    {"category": "s1e7", "name": "Skeleton", "sheet": "skeleton", "ow": 17},
     {"category": "s3e5", "name": "Sinful Party", "sheet": "party", "ow": 28},
+    {"category": "s1e7", "name": "Skeleton", "sheet": "skeleton", "ow": 17},
     {"category": "s5e11", "name": "Tight Ship", "sheet": "tightship", "ow": 49},
     {"category": "s4e13", "name": "Timeline Battle", "sheet": "timebattle", "ow": 32},
     {"category": "s3e5", "name": "Victorian", "sheet": "victorian", "ow": 7},

src/characters/britta.json

@@ -34,7 +34,7 @@
     { "category": "s2e23", "name": "Queen of Spades", "sheet": "spades", "ow": 19 },
     { "category": "s3e19", "name": "On Peyote", "sheet": "peyote", "ow": 14 },
     { "category": "s3e5", "name": "Psychopath", "sheet": "psychopath", "ow": 18 },
-    { "category": "s4e12", "name": "Punky Protestor", "sheet": "punk", "ow": 31 },
+    { "category": "s4e12", "name": "Punky Protester", "sheet": "punk", "ow": 31 },
     { "category": "s1e7", "name": "Squirrel", "sheet": "squirrel", "ow": 15 },
     { "category": "s1e14", "name": "Teapot", "sheet": "teapot", "ow": 16 },
     { "category": "s4e13", "name": "Timeline Battle", "sheet": "timelinebattle", "ow": 26 },

src/characters/fatneil.json

@@ -8,7 +8,7 @@
   "costumes": [
     {"category": "base", "name": "Fat Neil", "sheet": "base", "ow": 1},
     {"category": "s4e7", "name": "Coach", "sheet": "coach", "ow": 2},
-    {"category": "s2e14", "name": "Duquense", "sheet": "duquense", "ow": 3}
+    {"category": "s2e14", "name": "Duquesne", "sheet": "duquense", "ow": 3}
   ], 
   "name": "fatneil",
   "bbox": {

src/characters/troy.json

@@ -64,9 +64,9 @@
     {"category": "s3e19", "name": "Night Troy", "sheet": "night", "ow": 12},
     {"category": "s3e2", "name": "Operation", "sheet": "operation", "ow": 36},
     {"category": "s2e24", "name": "Orange Paint", "sheet": "orange", "ow": 13},
-    {"category": "s2e15", "name": "Pant Suit", "sheet": "pantsuit", "ow": 14},
     {"category": "s1e23", "name": "Paintball", "sheet": "paintball", "ow": 15},
     {"category": "s2e9", "name": "Pajamas", "sheet": "pajamas", "ow": 40},
+    {"category": "s2e15", "name": "Pant Suit", "sheet": "pantsuit", "ow": 14},
     {"category": "s1e21", "name": "Pharaoh", "sheet": "pharaoh", "ow": 43},
     {"category": "s2e19", "name": "Pumpkin", "sheet": "pumpkin", "ow": 25},
     {"category": "s2e6", "name": "Ripley", "sheet": "ridley", "ow": 16},

src/characters/vaughn.json

@@ -6,7 +6,7 @@
     }
   },
   "costumes": [
-    {"category": "base", "name": "Vaughn", "sheet": "base", "ow": 1}
+    {"category": "base", "name": "Vaughn Miller", "sheet": "base", "ow": 1}
   ], 
   "name": "vaughn",
   "bbox": {

src/conf.lua

@@ -2,13 +2,13 @@ function love.conf(t)
   t.title             = "Journey to the Center of Hawkthorne v0.0.0"
   t.url               = "http://projecthawkthorne.com"
   t.author            = "https://github.com/hawkthorne?tab=members"
-  t.version           = "0.9.0"
+  t.version           = "0.9.1"
   t.identity          = "hawkthorne"
   t.window.width      = 1056
   t.window.height     = 672
   t.window.fullscreen = false
   t.console           = false
   t.modules.physics   = false
-  t.modules.joystick  = false
+  t.modules.joystick  = true
   t.release           = false
 end

src/dialog.lua

@@ -45,6 +45,11 @@ function Dialog:open(callback)
   self.state = 'opened'
 end
 
+function Dialog:close()
+  self.board:close()
+  self.state = 'closing'
+end
+
 function Dialog:reposition()
   local state = gamestate.currentState()
 
@@ -131,8 +136,7 @@ function Dialog:keypressed( button )
       self.cursor = 0
       self.line = self.line + 1
     else
-      self.board:close()
-      self.state = 'closing'
+      self:close()
     end
   end
 

src/hawk/collision.lua

@@ -19,7 +19,9 @@ function module.platform_type(tile_id)
   if tile_id >= 26 and tile_id <= 51 then
     return 'oneway'
   end
-  if tile_id >= 0 and tile_id <= 25 then
+  -- Tile id 104 is a special block representing the breakable block
+  if (tile_id >= 0 and tile_id <= 25) or
+     (tile_id >= 104 and tile_id <= 129) then
     return 'block'
   end
 
@@ -222,7 +224,7 @@ function module.move_x(map, player, x, y, width, height, dx, dy)
 
           if new_x <= tile_x and tile_x <= x then
             if player.wall_pushback then
-              player:wall_pushback()
+              player:wall_pushback(tile)
             end
             return tile_x
           end
@@ -247,7 +249,7 @@ function module.move_x(map, player, x, y, width, height, dx, dy)
 
           if x <= tile_x and tile_x <= (new_x + width) then
             if player.wall_pushback then
-              player:wall_pushback()
+              player:wall_pushback(tile)
             end
             return tile_x - width
           end
@@ -321,7 +323,7 @@ function module.move_y(map, player, x, y, width, height, dx, dy)
           -- If the block is sloped, interpolate the y value to be correct
           if slope_y <= (new_y + height - tile_slope * dx + 2) and (slope_y >= y + height or not special) then
             if player.floor_pushback then
-              player:floor_pushback()
+              player:floor_pushback(tile)
             end
             return slope_y - height
           end
@@ -349,7 +351,7 @@ function module.move_y(map, player, x, y, width, height, dx, dy)
             end
 
             if player.floor_pushback then
-              player:floor_pushback()
+              player:floor_pushback(tile)
             end
             return slope_y - height
           end
@@ -374,7 +376,7 @@ function module.move_y(map, player, x, y, width, height, dx, dy)
           if y > tile_y and tile_y >= new_y then
             player.velocity.y = 0
             if player.ceiling_pushback then
-              player:ceiling_pushback()
+              player:ceiling_pushback(tile)
             end
             return tile_y
           end