diff --git a/src/audio/sfx/open_the_door.ogg b/src/audio/sfx/open_the_door.ogg new file mode 100644 index 000000000..0aeb52d1b Binary files /dev/null and b/src/audio/sfx/open_the_door.ogg differ diff --git a/src/images/sprites/greendale/Speakeasy-light.png b/src/images/sprites/greendale/Speakeasy-light.png deleted file mode 100644 index 41f589bb7..000000000 Binary files a/src/images/sprites/greendale/Speakeasy-light.png and /dev/null differ diff --git a/src/images/sprites/greendale/speakeasy-light.png b/src/images/sprites/greendale/speakeasy-light.png new file mode 100644 index 000000000..7374f1cf8 Binary files /dev/null and b/src/images/sprites/greendale/speakeasy-light.png differ diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx index c4094bf30..41149332e 100644 --- a/src/maps/greendale-computer-wing-3.tmx +++ b/src/maps/greendale-computer-wing-3.tmx @@ -1,5 +1,5 @@ - + @@ -7,10 +7,10 @@ - + - + @@ -34,13 +34,13 @@ - + - + @@ -49,16 +49,16 @@ - + - + - + - + diff --git a/src/maps/greendale-lounge.tmx b/src/maps/greendale-lounge.tmx index 721543d3e..3f516613a 100644 --- a/src/maps/greendale-lounge.tmx +++ b/src/maps/greendale-lounge.tmx @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -26,106 +26,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -133,14 +133,13 @@ - + - - + @@ -158,7 +157,7 @@ - + @@ -167,7 +166,7 @@ - + @@ -176,7 +175,7 @@ - + @@ -185,7 +184,7 @@ - + @@ -194,47 +193,47 @@ - + - + - + - + - + - + - + - + - + @@ -243,7 +242,7 @@ - + @@ -252,7 +251,7 @@ - + @@ -262,7 +261,7 @@ - + @@ -271,5 +270,13 @@ + + + + + + + + diff --git a/src/maps/greendale-speakeasy.tmx b/src/maps/greendale-speakeasy.tmx index 8cf9c64f0..d455c1035 100644 --- a/src/maps/greendale-speakeasy.tmx +++ b/src/maps/greendale-speakeasy.tmx @@ -1,5 +1,5 @@ - + @@ -30,8 +30,8 @@ eJztzDELgkAYh/HbHGtzKVxqs60222yrrS+QplBZkFZQWp+9Z7jhxe24E4f6ww9fPHiU+u+XNsK4w/4EU33HWDloeuIOMcMWa2wsukP9HYh/cywMOzskSLFHhly8++KOsDTsH3DECQXOuIj3wLDX3hUlKtxwx8OyKffECzUavPFx2O9zX+S2DgQ= - - + + @@ -67,18 +67,18 @@ - - - - - - + + + + + + @@ -89,9 +89,8 @@ - + - @@ -125,7 +124,7 @@ - + @@ -190,7 +189,7 @@ - + @@ -222,7 +221,7 @@ - + @@ -232,6 +231,13 @@ + + + + + + + diff --git a/src/npcs/borchert.lua b/src/npcs/borchert.lua index 247497cfd..c1b539f9c 100644 --- a/src/npcs/borchert.lua +++ b/src/npcs/borchert.lua @@ -29,9 +29,13 @@ return { player.money = player.money + 5044350 npc.trust = npc.trust + 1 npc.menu:close(player) + Dialog.new("I hope you can put that money to good use fixing up Greendale. I'm sure the Bursar knows what to fix up, her office is in the Administration Hallway. Now leave me and Raquel alone!", function() + npc.menu:close(player) + end) end) + else - Dialog.new("I hope you can put that money to good use fixing up Greendale. Now leave me and Raquel alone!", function() + Dialog.new("I hope you can put that money to good use fixing up Greendale. I'm sure the Bursar knows what to fix up, her office is in the Administration Hallway. Now leave me and Raquel alone!", function() npc.menu:close(player) end) end diff --git a/src/npcs/bursar.lua b/src/npcs/bursar.lua index 7e5c983b0..e99d320f3 100644 --- a/src/npcs/bursar.lua +++ b/src/npcs/bursar.lua @@ -33,7 +33,7 @@ return { talk_items = { { ['text']='i am done with you' }, { ['text']='How can I help?' }, - { ['text']='Any useful info for me?' }, + { ['text']='Any useful info?' }, { ['text']='Hello!' }, }, talk_responses = { @@ -45,10 +45,8 @@ return { "Hello, I'm Greendale's bursar.", "I deal with the (small amount of) money around here.", }, - ["Anything happening here?"]={ - "We used to have a cult leader that claimed to specialize in alchemy stay in the house next door.", - "What was odd was that he left with nothing and there was no alchemy equipment in the house at all.", - "We think that he was just lying in an attempt to obtain followers.", + ["Any useful info?"]={ + "I keep forgetting to remind the Dean to submit the master list of students to the state for funding. I'm sure he'll remember on his own though.", }, ["How can I help?"]={ diff --git a/src/npcs/jerry.lua b/src/npcs/jerry.lua index 9dc1e0de7..1b308a393 100644 --- a/src/npcs/jerry.lua +++ b/src/npcs/jerry.lua @@ -37,15 +37,14 @@ return { talk_commands = { ["Why is the pool closed?"]=function(npc, player) if player.quest == 'Save Greendale - Find out what the delay with pool repairs is' then - if player.inventory:hasMaterial('wires') and player.inventory:hasWeapon('wrench') then - player.freeze = false - player.inventory:removeManyItems(1, {name='wires',type='material'}) - player.inventory:removeManyItems(1, {name='wrench',type='weapon'}) - Quest.removeQuestItem(player) - Quest:activate(npc, player, quests.poolreturn) - npc.menu:close(player) - npc.db:set('borchertpool', true) - end + if player.inventory:hasMaterial('wires') and player.inventory:hasWeapon('wrench') then + player.freeze = false + player.inventory:removeManyItems(1, {name='wires',type='material'}) + player.inventory:removeManyItems(1, {name='wrench',type='weapon'}) + Quest.removeQuestItem(player) + Quest:activate(npc, player, quests.poolreturn) + npc.menu:close(player) + npc.db:set('borchertpool', true) else Dialog.new(quests.poolreturn.completeQuestFail, function() player.freeze = false