diff --git a/.gitattributes b/.gitattributes index 77282fa..36e3d95 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ *.jpg filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.mp4 filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text diff --git a/Rollercoaster.singe b/Rollercoaster.singe index 0afd51f..b3f903c 100644 --- a/Rollercoaster.singe +++ b/Rollercoaster.singe @@ -139,13 +139,13 @@ ROOMS = { EXITS = "MCQ@", NAME = "A MAINTENANCE ROOM", DESCRIPTION = "THERE ARE DOORS TO THE NORTH AND SOUTH. THE NORTHERN DOOR IS OPEN. YOU CAN HEAR THE ROLLER COASTER.", - VIDEO = "FR14038SE/FR14178PL/" --"FR14038SE/FR14100PL/" + VIDEO = "FR14038SE/FR14178PL/" }, { -- H 8 EXITS = "D@N@", NAME = "THE BELLY DANCER'S TENT", DESCRIPTION = "SHE STOPS AND LOOKS AT YOU.", - VIDEO = "FR11818SE/FR11926PL/" --"FR11818SE/FR11907PL/" + VIDEO = "FR11818SE/FR11926PL/" }, { -- I 9 EXITS = "@@M@", @@ -175,7 +175,7 @@ ROOMS = { EXITS = "I@G@", NAME = "A CRAWLWAY", DESCRIPTION = "THE PASSAGE LEADS NORTH TO THE TOP OF THE ROLLER COASTER. THE NOISE IS QUITE LOUD.", - VIDEO = "FR14724SE/FR14890PL/" --"FR14724SE/FR14855PL/" + VIDEO = "FR14724SE/FR14890PL/" }, { -- N 14 EXITS = "@@@R", @@ -302,9 +302,7 @@ function onOverlayUpdate() end if END_FRAME ~= -1 then - debugPrint("Frame " .. discGetFrame() .. " Waiting " .. END_FRAME) if (discGetFrame() >= END_FRAME) then - --debugPrint("Playback end. Switching to state " .. NEXT_STATE) discSearch(END_FRAME) END_FRAME = -1 STATE = NEXT_STATE @@ -434,8 +432,6 @@ function pioneer(newstate, command) STATE = STATE_DONT_CHANGE end - --debugPrint("Laserdisc " .. command .. " NEXT_STATE " .. NEXT_STATE .. " STATE " .. STATE) - end @@ -449,7 +445,6 @@ function processGameState(what) local func = STATES[STATE] if (func) then - --debugPrint("Firing state " .. STATE .. " with [" .. what .. "]") func(what) end @@ -619,7 +614,6 @@ STATES = { screenPrint("YOU HAVE JUST RECEIVED AN ANONYMOUS") screenPrint("TIP THAT A BOMB HAS BEEN PLANTED") screenPrint("ON A ROLLER COASTER.") - --pioneer(STATE_BOMB_PLANTED, "FR6726SE/FR6959PL/") pioneer(STATE_BOMB_PLANTED, "FR6726SE/FR7022PL/") end, @@ -627,7 +621,6 @@ STATES = { screenPrint("") screenPrint("YOU ARE CALLED TO INVESTIGATE AND FLY") screenPrint("OFF TO STOP THE SABOTEUR.") - --pioneer(STATE_PLANE_ARRIVED, "FR30032SE/FR30214PL/") pioneer(STATE_PLANE_ARRIVED, "FR30032SE/FR30258PL/") end, @@ -780,7 +773,6 @@ STATES = { screenPrint("YOU ARE SERVED A DELICIOUS MEAL") screenPrint("UNFORTUNATELY, THE SERVICE IS") screenPrint("RATHER SLOW.") - --pioneer(STATE_BOOM, "FR19453SE/FR19799PL/") pioneer(STATE_BOOM, "FR19453SE/FR19884PL/") else screenPrint("PLEASE ANSWER YES OR NO.") @@ -836,7 +828,6 @@ STATES = { [STATE_ROOM_9] = function(what) screenPrint("IF YOU LOOK BACK, YOU'LL NOTICE") screenPrint("A CAR SPEEDING TOWARD YOU.") - --pioneer(STATE_PLAY_AGAIN, "FR16185SE/FR16223PL/") pioneer(STATE_PLAY_AGAIN, "FR16185SE/FR16239PL/") end, @@ -871,15 +862,12 @@ STATES = { V, N = getVerbNoun(what) - --debugPrint("Parser [" .. V .. "][" .. N .. "]") - STATE = STATE_NONE -- And now the fun! if L == 2 and (what == "BREAK BOX" or what == "PUSH BUTTON" or what == "PRESS BUTTON" or what == "TURN KNOB" or what == "TURN DIAL") then KW = 1 screenPrint("UH OH, I THINK THAT WAS A MISTAKE.") - --pioneer(STATE_BREAK_BOX, "FR18722SE/FR18807PL/") pioneer(STATE_BREAK_BOX, "FR18722SE/FR18827PL/") end @@ -961,9 +949,7 @@ STATES = { screenPrint("YOU HAND OVER THE COINS AND PICK") screenPrint("UP THE GUN.") OBJECTS[1].LOCATION = -1 - --pioneer(STATE_WON_BEAR, "FR10960SE/FR11107PL/") pioneer(STATE_WON_BEAR, "FR10960SE/FR11146PL/") - --debugPrint("Asked for state " .. STATE_WON_BEAR) end end @@ -973,7 +959,7 @@ STATES = { screenPrint("YOU CAN'T AFFORD THE GAME.") else screenPrint("YOU HAND OVER THE TICKET AND THROW THE BALL.") - -- CHR$(7) three times here + soundPlay(sndBeeps) screenPrint("IT'S A WINNER.") screenPrint("YOU HAVE A CHOICE OF FOUR PRIZES!") screenPrint("A LAMP, TOWELS, RADIO, OR POSTER.") @@ -1017,7 +1003,6 @@ STATES = { if B == 0 then screenPrint("IT DOESN'T WORK, MAYBE IT NEEDS BATTERIES?") else - --pioneer(STATE_WON_GAME, "FR12169SE/FR12227PL/") pioneer(STATE_WON_GAME, "FR12169SE/FR12240PL/") end end @@ -1036,7 +1021,6 @@ STATES = { if what == "MAKE JAMMER" then KW = 1 - -- 55000 if BK == 0 then screenPrint("YOU DON'T KNOW HOW.") else @@ -1176,7 +1160,6 @@ STATES = { T = T + 1 if T > 150 then screenPrint("I THINK TIME JUST RAN OUT.") - --pioneer(STATE_PLAY_AGAIN, "FR19801SE/FR20007PL/") pioneer(STATE_PLAY_AGAIN, "FR19885SE/FR20109PL/") end @@ -1184,8 +1167,6 @@ STATES = { if STATE == STATE_NONE then NEXT_STATE = STATE_PARSER end - - --debugPrint("Parser Exit") end, @@ -1332,6 +1313,8 @@ fntApple12Height = spriteGetHeight(sprApple12) + 2 fntApple12Width = spriteGetWidth(sprApple12) + 1 spriteUnload(sprApple12) +sndBeeps = soundLoad(GAME .. "/Sounds/beep3.wav") + resetGameData() -- Initialize text screen @@ -1340,19 +1323,4 @@ screenClear() NEXT_STATE = STATE_NONE STATE = STATE_GET_NAME ---[[ -NA = "SCOTT" -STATE = STATE_LOOK -L = 1 -KW = 1 -B = 1 -OBJECTS[1].LOCATION = -1 -OBJECTS[2].LOCATION = 0 -OBJECTS[3].LOCATION = -2 -OBJECTS[8].LOCATION = -2 -OBJECTS[9].LOCATION = 0 -OBJECTS[10].LOCATION = 0 -OBJECTS[11].LOCATION = -2 -]]-- - pioneer(STATE, "FR2818SE/") diff --git a/Sounds/beep3.wav b/Sounds/beep3.wav new file mode 100644 index 0000000..7933a2d --- /dev/null +++ b/Sounds/beep3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12a3b374bbf00bfd105091053591d266d54b87709bee43be96ae5a37b46c6966 +size 86828