From d121041cadc4e5b61169c8a40e9f38dbf318abda Mon Sep 17 00:00:00 2001 From: 8bitgentleman Date: Sun, 25 Oct 2015 13:06:35 -0400 Subject: [PATCH] Various Bug and level fixes --- src/images/tilesets/greendale-lounge.png | Bin 12823 -> 12839 bytes src/items/improvements/hologram.lua | 2 +- src/maps/borchert-pool.tmx | 20 +++---- src/maps/greendale-computer-wing-2.tmx | 26 ++++----- src/maps/greendale-computer-wing-3.tmx | 22 ++++---- src/maps/greendale-computer-wing.tmx | 25 ++++----- src/maps/greendale-exterior.tmx | 6 +- src/maps/greendale-lounge-bathroom.tmx | 14 ++--- src/maps/greendale-lounge.tmx | 68 ++++++++++++----------- src/maps/greendale-secret-lab.tmx | 59 +++++++++++++------- src/npcs/borchert.lua | 13 +++-- src/npcs/hologram.lua | 5 +- src/npcs/officercackowski.lua | 4 +- 13 files changed, 147 insertions(+), 117 deletions(-) diff --git a/src/images/tilesets/greendale-lounge.png b/src/images/tilesets/greendale-lounge.png index 571f0ee72db6d2767b147bf4ce6a13f07aabfcb1..27eb0a2eac89b4b32317dd7265a9bc2b2fae9bff 100644 GIT binary patch literal 12839 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 literal 12823 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 - + @@ -8,10 +8,10 @@ - + - + @@ -61,13 +61,13 @@ - + - + @@ -75,23 +75,23 @@ - + - + - - + + - + diff --git a/src/maps/greendale-computer-wing-2.tmx b/src/maps/greendale-computer-wing-2.tmx index f516d333e..fa3385243 100644 --- a/src/maps/greendale-computer-wing-2.tmx +++ b/src/maps/greendale-computer-wing-2.tmx @@ -1,5 +1,5 @@ - + @@ -7,40 +7,40 @@ - + - + - + - eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzaICB5jZUAOkUIOajAQaa20Ars+mFaVm2gTAAhx0vVw== + eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8KmKgeQ0VQDoFiPmoiIHmNVDbTFpjWpQ5IAwA7bYsIw== - + - eJxjYBgFgwWIQmkxBoYGcs2QoI5T6A4SILhhDZBei0PNViDeBsTbgXgHEOsA8TEgPo6kJhC3+Q5AfACf+SBwAIgPIvEvAPFFJD4vlD4ExIeB+AgQH8VijhwSOxqIY/DYiQzEofQZID4LxOeA+DwWdRpI7GvAcEsj0nxigRGVzSMFNABxIxA34ZAvB2IfIPall4PwAADRRxpi + eJxjYBgF9AKiUFqMgaGBVL0S1HUKzUACBDesAdJrcajZCsTbgHg7EO8AYh0gPgbEx5HUBGKa6wDEB/CZCwIHgPggEv8CEF9E4vNC6UNAfBiIjwDxUSR5OSR2NBDH4LELGYhD6TNAfBaIzwHxeSR5DST2NWD4pBFpLiFgRCVzSAENQNwIxE045MuB2AeIfenlICQAACFDGmI= - + - eJy7xMDAcGkUj+JRPIpHMckYANr7E7A= + eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ== - + - eJx7zsDA8JyGmAGJphUYNX/UfFqZz8gIwehADCgmjkUcl/nEqkUGUlC7JbHoRXYTLcOHlmUDreOVHgAA5HQ02w== + eJx7zsDA8JwGmAGJpjYYNXfUXGLNZWSEYHQgBhQTxyKObi4hNdiAFNROSSS9yG6gRTjQIg/TKr5oCQCeszE/ - + - + diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx index 41149332e..d242bb4ad 100644 --- a/src/maps/greendale-computer-wing-3.tmx +++ b/src/maps/greendale-computer-wing-3.tmx @@ -1,5 +1,5 @@ - + @@ -13,34 +13,34 @@ - + - eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzkHAFGp9cDDS3AWRWChDz0QADzW2gldn0wrQs20AYAJkVL2E= + eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8JFyBxicVA81rAJmRAsR8VMRA8xqobSatMS3KHBAGAP4eLC0= - + - eJztzkduwkAYhmFfAsQZyCVDyTIgJHrvPQFCaAEh2EFYAqFlQwnn4I3EYmTZkk28yIJPeuTx+J/PI0n3/IdYDOgwX58mA7puyQprbLDFDt+w4kHlTAVVvGjo3+OAI074wRkeYcYLn/DeQhsddGV9fjjgxJOwPxTWYUQQRQxxJGQ9I4wV7pvEM1xwC/sTYZ1FDnkUUERJ+N7DB/oYyPrLCCCIkML/f/OKGupo4A1NlVl53pFCGhmNZ5QyxSdmOs48wga7htk5FljiS+/l/pgLXmMz8A== + eJztzslOAkEQxvF5CQ3PAC8JCEcgJoDIvsiOyKpsIXgTOMomcEGQ5+B/GJLKhNFMIJz8kl+6u7qq04ryn2vEdMbsrbreXOIjBjLHAl9YYoU1zLDozBRRwvMv727wjS12+MEe96LHC584N/GKN7TUmh93cMApevtiH0QIYUQQRUzznwHexTkOF9zwiPqH2D8hjQyyyCEv7tvooIueWivgAQE8KqdTxgsqqKKGuk7vMQ0kkETqj15thhhhbHDOChvsOvefmGCKmcG3z8kB4bQz8A== - + - eJy7xMDAcGkUj+JRPIpHMckYANr7E7A= + eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ== - + - eJx7zsDA8JyGmAGJphUYNX/U/KFuvhgjBIOAOCNCXArIlmCEiEkyYtf7HE0PNQEtywZahzs9AAAxuDUb + eJx7zsDA8JwGmAGJpjYYNXfU3MFirhgjBIOAOCNCXArIlmCEiEkyoup5jqaWGoAWeZhW4UpLAADkMDF/ - + - + diff --git a/src/maps/greendale-computer-wing.tmx b/src/maps/greendale-computer-wing.tmx index ab3c5531c..bcc812c37 100644 --- a/src/maps/greendale-computer-wing.tmx +++ b/src/maps/greendale-computer-wing.tmx @@ -1,5 +1,5 @@ - + @@ -7,10 +7,10 @@ - + - + @@ -33,20 +33,15 @@ eJy7xMDAcGkUj+JRPIpH8SgeYRgAcYdvkA== - + eJx7zsDA8HwA8SgYBaNgeAExRgYGcUby9Q4kYATaLwXEkoyo7pGC+kmMESHGSIRbkf2DrP4fA6T8+zNAmIFxtPwFAQDG9z5G - - - - - - - - + + + @@ -54,18 +49,18 @@ - + - + - + diff --git a/src/maps/greendale-exterior.tmx b/src/maps/greendale-exterior.tmx index e922db511..7056ac13f 100644 --- a/src/maps/greendale-exterior.tmx +++ b/src/maps/greendale-exterior.tmx @@ -43,12 +43,12 @@ - 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 @@ -232,7 +232,7 @@ - + diff --git a/src/maps/greendale-lounge-bathroom.tmx b/src/maps/greendale-lounge-bathroom.tmx index 0d1984539..b92a61934 100644 --- a/src/maps/greendale-lounge-bathroom.tmx +++ b/src/maps/greendale-lounge-bathroom.tmx @@ -1,12 +1,12 @@ - + - + - + @@ -21,7 +21,7 @@ - eJxjYKAv4GNgaMAnz8PAkMANpGGYnkCCTvYoI7H5scgLQ2kuIFaBstWBWBRNnSyU5kQSk6LYdfgBAHuCAiM= + eJxjYKAv4GNgaMAnz8PAkMANpAlhMQLmkAMkqG0gDqCMxObHIi8MpbmAWAXKVgdiUTR1slCaE0lMimLX4QcAuu0C+w== @@ -35,13 +35,13 @@ - + - + @@ -49,7 +49,7 @@ - + diff --git a/src/maps/greendale-lounge.tmx b/src/maps/greendale-lounge.tmx index 3f516613a..f16f926b9 100644 --- a/src/maps/greendale-lounge.tmx +++ b/src/maps/greendale-lounge.tmx @@ -1,5 +1,5 @@ - + @@ -10,19 +10,19 @@ - + - eJzd1LkOglAQRuEh2CKl2mLtioqiKK64sqioj+Ojc0x8gptLQ/HlzzSnHENEjBLVYIl8Ieb/1q1K/Q666KGPAYZwMcIYE3iK/Slm8DHHAgGWWCHEGhvF/hY77HFAhCNOOOOCK26K/RgJUmS444EncrzwxkehX4etUYMupMlCWmhr5NB1NDerpszf9lMAk/ch2A== + eJzV1LkOglAQRuEh2CKl2mLtioqiKK64sqioj+Ojc0x8gZtcCoovf6Y55RgiYpSgBkvkCzH/ty5V7nbQRQ99DDCEixHGmMBT7E4xg485FgiwxAoh1tgodrfYYY8DIhxxwhkXXHFT7MZIkCLDHQ88keOFNz4K3TpsDRr0IE0W0kJbA4eeo6lVdWX8nJ8C32QgZg== - + - eJztzssKglAUhWERsgYOtLKJ10BNqxfygiMvOPf98R84EEH0hCBCCz44m31YbEk6fs64jGZ5r0MEou59wIpcccMdBh4z/xKkUAT7bThw4eE52Rc4oUQFXbA/Qow3PvhO9i00ZMhhCfYvpYOJGg1eG/X6CIZ3uFHnP7+lBxEjByM= + eJztzrsKg0AQheFF0Fgao5WXWHj3iaJipRF735/8hcUWUVi2EMEDH8zOwGGFuF4esKW3cdZHLhoXL3jw/9w/aGEp9kaI8UYi7QeYGDHhqdhbokKNRtovcNChR6jYu5cVAb6YUWj2pci2OdfsunOcH4R6BrQ= - + - eJxjYBgFo2AUDHXQSAMzi2lgJi1B6wDYCQCCNwF6 + eJxjYBgFo2AU0Bs0DrQDBgC00sEOAOYcAQc= @@ -44,12 +44,6 @@ - - - - - - @@ -60,13 +54,13 @@ - + - + @@ -98,17 +92,17 @@ - + - + - + @@ -118,9 +112,15 @@ + + + + + + - + @@ -139,7 +139,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -198,34 +198,34 @@ - + - + - + - + - + - + - + - + - + @@ -278,5 +278,11 @@ + + + + + + diff --git a/src/maps/greendale-secret-lab.tmx b/src/maps/greendale-secret-lab.tmx index c0a76ee9e..66f790eec 100644 --- a/src/maps/greendale-secret-lab.tmx +++ b/src/maps/greendale-secret-lab.tmx @@ -1,5 +1,5 @@ - + @@ -7,52 +7,75 @@ - + - + - + - eJxjYmBgYKIhZqQxZgZiFihNTQw0s4EZgulivjxUXIECMxUH0P2j5uM2nw+I+amM+aDmKwPZICxJZaw8TDAtyzYQBgA7VhU0 + eJxjYmBgYKIBZqQRZgZiFihNDQw0q4EZgmlqrjxUXIEMsxQHwL2j5jIw8AExP5UwH9RcZSAbhCWphJWHKKZFmQPCAFbrFCQ= - + - eJxjYBgFo2AU0BLw0cbMBhDNCsQSNDAfaGYD0OwGWpiNbAcNjacLAAD0ygKH + eJxjYBgFo2AUYAN81DWrAUSzArEEFc0FmtUANLOBmmYim00DY2kKALZSAoc= - + - eJzt0Lsvg1EAxuFOqMltLCOqLq2ibkVR6lrF4FIGpQxaasCqf7ln+CSGb0Ni+H7Jk5yTnLzDicWiov5/FY454ZQkY6QYZ4JJpoL3GaaDcweddIXsxunmkipXXJNlhlnmyDHPAosssUyCHnrpC+5nnHNBPwPcUeeeB/KssMoaBdbZYJMiWwyHuKHGLYMM8cQzLV7YpsQOu+yxzwGHlDkiHeKRBk1GGA35t5/0yhvvv7z7vQ/af7j/1SfsWRgy + eJzt0DdPQlEAhmEmFScTHdERC/aOCtgQbCDoYAEHsQ0WZFBW+eU8wzW5k3FQp/smT84ZTr7hxGJRUf9XhSqnnDHOBCkmmWKameD9HPPBvYde+kJ7cfq5okadaxZYZIllVlglzRrrbJBgIDjPueCSQYa4454HHsmQJccmW2yzwy559kiG3NDglmFGeKXJGy0KFNnngEOOOKZEmRNmQ5545oVRxr7/+h/3zgftX9oL90nnD3a/6gJX5Rdj - + - eJztzKcOgDAUQFE8IIEvRbBJ2HvzvVxR2TQIFOlNjngdzzB0Ot3fChAiQowE6cu/vuTMhAVbzAVKVKjRoFXs7NBjwCi5d+DCE/OEGQtWbNgV+w+cuHAjQ654/1UPOxcPug== + eJztzzkKgDAQQFF7tVRPauEuuO+75/UXKSxSBBubfHiQIUwghqHT6f4uQIgIMRKkirv+62zCgi3mAiUq1GjQSt7o0GPAKLl34MIT84QZC1Zs2CV7B05cuJEhV/rVtx4JyA+6 - + - eJybzsDAMJ2GeAMDbcAGNHrU/JFj/jE0TA3zTwHxRiA+SUDfKSQ1MD3o+CQW8wmBU2jmHSegnl7hT8uyYTgAAHouOS4= + eJybzsDAMJ0GeAMDdcEGNHrU3KFv7jE0TIm5p4B4IxCfJKDvFJIamB4YPknAvbjMQzbnOJHupRaAmUeLPDwUAQAnmDVw - + - + + + - + - + + + + + + + + + + + + + + + + + + + + + + @@ -61,7 +84,5 @@ - - diff --git a/src/npcs/borchert.lua b/src/npcs/borchert.lua index c1b539f9c..ca43e3f91 100644 --- a/src/npcs/borchert.lua +++ b/src/npcs/borchert.lua @@ -23,19 +23,23 @@ return { }, talk_commands = { ['Money?']= function(npc, player) + local script = {"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!", + } if npc.trust < 1 then Dialog.new("I have a couple million Gerald Ford dollars in that bag over there. How about you leave me alone and I hereby grant this money to Greendale?", function() --taking in the inflation between 1974 and 2014 1 million gerald ford dollars would be worth ~5,044,350.65 USD - player.money = player.money + 5044350 + player.money = player.money + 5044351 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() + Dialog.new(script, function() npc.menu:close(player) end) end) else - 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() + Dialog.new(script, function() npc.menu:close(player) end) end @@ -45,7 +49,8 @@ return { talk_responses = { ['Who are you?']={ "I'm Russell Borchert. I founded Greendale in 1974 with money from the 9-track cassette player I invented.", - "I allowed the Dean to seal me and the entire computer lab off from the rest of the campus while I worked on creating a computer that could process human emotion.", + "In 1980 I allowed the Dean to seal me and the entire computer lab off from the rest of the campus.", + "I wanted to be left alone while I worked on creating a computer that could process human emotion.", }, ['What is that thing?']={ "This is Raquel. She is the computer I created to respond to emotional stimuli.", diff --git a/src/npcs/hologram.lua b/src/npcs/hologram.lua index 5e82fe8a1..a440a1e47 100644 --- a/src/npcs/hologram.lua +++ b/src/npcs/hologram.lua @@ -40,7 +40,10 @@ return { sound.playSfx("greendale") end) else - Dialog.new("This almost looks like the platform to some kind of hologram...", function() + local script = {"This almost looks like the platform to some kind of hologram...", + "It seems broken though, maybe the bursar knows when it will be fixed." + } + Dialog.new(script, function() player.freeze = false npc.menu:close(player) end) diff --git a/src/npcs/officercackowski.lua b/src/npcs/officercackowski.lua index 282bd76cc..e5cb4446b 100644 --- a/src/npcs/officercackowski.lua +++ b/src/npcs/officercackowski.lua @@ -17,8 +17,8 @@ return { greeting = "I'm {{red}}Officer Cackowski{{white}}. There were reports of a disturbance, something about a bandit, and I'm patrolling the area.", walking = true, - max_walk = 240, - min_walk = 240, + max_walk = 100, + min_walk = 100, stare = false,