Merge pull request #1987 from hawkthorne/master

Bugfix 0.5.2

src/characters/abed.json

@@ -15,6 +15,7 @@
  { "category": "s3e10", "name": "Christmas Sweater", "sheet": "christmas", "ow": 6 }, 
  { "category": "s2e24", "name": "Covered In Paint", "sheet": "paint", "ow": 7 }, 
  { "category": "s2e21", "name": "Cowboy", "sheet": "cowboy", "ow": 8 },
+ { "category": "s4e13", "name": "Darkest Timeline (Ra's Al Ghul)", "sheet": "rasalghul", "ow": 42 },
  { "category": "s2e19", "name": "Dinner With Andre", "sheet": "andre", "ow": 41 }, 
  { "category": "s3e10", "name": "Disco", "sheet": "disco", "ow": 30 }, 
  { "category": "s1e16", "name": "Drunk", "sheet": "drunk", "ow": 35 }, 

src/characters/britta.json

@@ -16,6 +16,7 @@
  { "category": "s3e16", "name": "Dr. Perry", "sheet": "doctor", "ow": 23 },
  { "category": "s3e1", "name": "Finally Be Fine", "sheet": "finallybefine", "ow": 22 },
  { "category": "s4e4", "name": "German Dirndl", "sheet": "german", "ow": 8 },
+ { "category": "s4e2", "name": "Ham", "sheet": "ham", "ow": 38 },
  { "category": "s2e2", "name": "Heather Popandlocklear", "sheet": "popnlock", "ow": 25 },
  { "category": "s2e3", "name": "Help the Gulf", "sheet": "fundraising", "ow": 29 },
  { "category": "s2e13", "name": "Kool Kat", "sheet": "cool", "ow": 9 },
@@ -35,6 +36,7 @@
  { "category": "s1e14", "name": "Teapot", "sheet": "teapot", "ow": 16 },
  { "category": "s4e13", "name": "Timeline Battle", "sheet": "timelinebattle", "ow": 26 },
  { "category": "s1e25", "name": "Tranny Queen", "sheet": "trannyqueen", "ow": 36 },
+ { "category": "s3e2", "name": "U.N. Protest", "sheet": "protest", "ow": 37 },
  { "category": "s2e6", "name": "Zombie", "sheet": "zombie", "ow": 17 }
  ], 
  "name": "britta",

src/characters/jeff.json

@@ -12,6 +12,7 @@
  { "category": "s3e12", "name": "Aviators", "sheet": "aviators", "ow": 4 },
  { "category": "s2e7", "name": "B-Ball", "sheet": "bball", "ow": 23 },
  { "category": "s1e17", "name": "Birthday Suit", "sheet": "naked", "ow": 5 },
+ { "category": "s4e2", "name": "Boxer", "sheet": "boxer", "ow": 44 },
  { "category": "s1e3", "name": "Carpe Diem!", "sheet": "carpediem", "ow": 27 },
  { "category": "s1e12", "name": "Christmas Brawl", "sheet": "hurt", "ow": 39 },
  { "category": "s3e4", "name": "Darkest Timeline", "sheet": "darkest", "ow": 41 },
@@ -26,14 +27,17 @@
  { "category": "s4e1", "name": "Greendale Baby", "sheet": "baby", "ow": 29 },
  { "category": "s1e13", "name": "Hawkeye", "sheet": "hawkeye", "ow": 32 },
  { "category": "s2e2", "name": "Heather Popandlocklear", "sheet": "poplock", "ow": 9 },
+ { "category": "s2e11", "name": "Jeff-In-The-Box", "sheet": "jeffinthebox", "ow": 43 },
  { "category": "s2e23", "name": "King of Spades", "sheet": "spades", "ow": 10 },
  { "category": "s2e13", "name": "Kool Kat", "sheet": "cool", "ow": 11 },
  { "category": "s2e14", "name": "Marrrrrrrr", "sheet": "mar", "ow": 31 },
  { "category": "s2e21", "name": "Mercury Poisoning", "sheet": "straightjacket", "ow": 12 },
  { "category": "s1e23", "name": "Modern Warfare", "sheet": "warfare", "ow": 26 },
  { "category": "s3e19", "name": "Mohawk", "sheet": "mohawk", "ow": 13 },
  { "category": "s3e1", "name": "Monkey Gas", "sheet": "monkeygas", "ow": 14 },
+ { "category": "s3e14", "name": "Plaid Coat", "sheet": "plaid", "ow": 45 },
  { "category": "s3e10", "name": "Planet Christmas", "sheet": "planet", "ow": 36 },
+ { "category": "s5e2", "name": "Professor", "sheet": "professor", "ow": 46 },
  { "category": "s4e4", "name": "Proving A Point", "sheet": "skater", "ow": 42 },
  { "category": "s3e21", "name": "Ricky Nightshade", "sheet": "ricky", "ow": 30 },
  { "category": "s3e12", "name": "Seacrest Hulk", "sheet": "hulk", "ow": 15 },

src/nodes/npc.lua

@@ -163,9 +163,7 @@ function Menu:draw(x, y)
  -- pointer
  love.graphics.setColor( 255, 255, 255, 255 )
  love.graphics.draw(self.tick, x - (Font:getWidth(value.text)+10), y - (i - 1) * 12 + 2)
- -- box
  love.graphics.setColor( self.color.r, self.color.g, self.color.b, self.color.a )
- love.graphics.rectangle( 'line', x - (Font:getWidth(value.text)+1) -1, y - (i - 1) * 12 -1, Font:getWidth(value.text) +2 , Font:getHeight(value.text) +2 )
  end
  end
  end

src/npcs/hilda.lua

@@ -427,7 +427,7 @@ return {
  "I'm broke.",
  "I tried to buy fertilizer the other day for the soccer field.",
  "Request denied.",
- "I literally can't buy [bleep].",
+ "I literally can't buy %$&#!.",
  },
  ['extra large swords']={
  "You have successfully rubbed your balls on his sword.",

src/npcs/sophieb.lua

@@ -10,7 +10,9 @@ local function playSong(npc, level, time, song)
  Timer.add(time, function()
  npc.state = "default"
  npc.busy = false
- sound.playMusic( level.music )
+ if level.music then
+ sound.playMusic( level.music )
+ end
  end)
 end
 

src/welcome.lua

@@ -5,6 +5,7 @@ local controls = require('inputcontroller').get()
 local fonts = require 'fonts'
 local Gamestate = require 'vendor/gamestate'
 local menu = require 'menu'
+local sound = require 'vendor/TEsound'
 local tween = require 'vendor/tween'
 local window = require 'window'
 
@@ -34,6 +35,7 @@ function state:enter(previous)
  self.splash = love.graphics.newImage("images/openingmenu.png")
  self.arrow = love.graphics.newImage("images/menu/small_arrow.png")
  self.text = string.format(app.i18n('s_or_s_select_item'), controls:getKey('JUMP'), controls:getKey('ATTACK') )
+ self.bg = sound.playMusic("ending")
 
  self.line = " terminal:// \n\n operations://loadprogram:(true) \n\n"..
  " program:-journey-to-the-center-of-hawkthorne \n\n loading simulation ..."