From a30f8a2d8f726285ca3f03ce4ad7d4b2056bebcc Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Thu, 4 Feb 2021 21:15:27 -0500 Subject: [PATCH] More sound effects --- NeutTower.dsk | Bin 143360 -> 143360 bytes game/boop.fnl | 10 +++++++--- game/entity.fnl | 5 +++-- game/level5.fnl | 4 +++- game/level6.fnl | 1 + game/player.fnl | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NeutTower.dsk b/NeutTower.dsk index dd9ef5722afca879a285f863cb389494e8fe5ad4..16038a0e687fd58bd9068ebb5c7970f47d7d9476 100644 GIT binary patch delta 7589 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 Yno){Q_4!^=WV=O`Sg95FYE{wy2ZdUFS^xk5 delta 7934 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 F{{anwTo3>N diff --git a/game/boop.fnl b/game/boop.fnl index 8a96c44..eeffccc 100644 --- a/game/boop.fnl +++ b/game/boop.fnl @@ -66,10 +66,14 @@ result) (vm:word :snd-explode 0x40 :lit :randombytes :blipmem) -(vm:word :snd-dooropen (notes [:c1 :e1] 8)) -(vm:word :snd-doorclose (notes [:e1 :c1] 8)) +(vm:word :snd-dooropen (notes [:c1 :e1] 3)) +(vm:word :snd-doorclose (notes [:e1 :c1] 3)) (vm:word :snd-term-jingle (notes [:e3 :f3 :g3] 0x20)) (vm:word :snd-termon :snd-term-jingle (note :c4 0x20)) (vm:word :snd-termoff :snd-term-jingle (note :c3 0x20)) - +(vm:word :snd-rexx (notes [:c2 :g2 :e2 :c3] 0x08 0x08)) +(vm:word :snd-libb (notes [:d#1 :g#1 :f#1 :g1] 0x08 0x7f)) +(vm:word :snd-garbage (notes [:a5 :a3 :a2] 0x04 0xa0)) +(vm:word :snd-teleport (notes [:e4 :d#4 :d4 :g#4] 0x1a 0x50)) +; ((. (require :game.boop) :notes) ) {: note : notes} diff --git a/game/entity.fnl b/game/entity.fnl index e6eff2a..37e8822 100644 --- a/game/entity.fnl +++ b/game/entity.fnl @@ -131,7 +131,7 @@ (vm:ifchain [:is-jaye?] [:drop ev.act] [:is-neut?] [:responder-itile (itile :termon) := (vm:when :linked-entity :dup :entity-itile (itile :termon) := - (vm:if [:get :move-player-to] + (vm:if [:get :move-player-to :snd-teleport] [:drop (say :neut "DESTINATION TERMINAL" "IS DISCONNECTED") :disconnected-term-attempt :get :not (vm:when vm.true :disconnected-term-attempt :set @@ -153,6 +153,7 @@ [ev.untouch :libb-on-responder :not (vm:when ev.deact :handle-scan)] [ev.hack vm.true :hack-handled :set ev.act :handle-scan + :snd-libb controlstate.libb :controlstate :bset :move-to-responder controlstate.neut :controlstate :bset @@ -165,7 +166,7 @@ (vm:if-and [[:is-neut?] [:responder-itile (itile :t-rexx) :=]] [0xffff :move-player-to (itile :t-rexxstop) :set-respondertile - :get-responder :set-rexx] + :get-responder :set-rexx :snd-rexx] [(vm:if-and [[:is-rexx?] [:responder-itile (itile :t-rexxstop) :=]] [0xffff :move-player-to (itile :t-rexx) :set-respondertile diff --git a/game/level5.fnl b/game/level5.fnl index 9afd062..33981f3 100644 --- a/game/level5.fnl +++ b/game/level5.fnl @@ -1,10 +1,12 @@ (local {: deflevel : say : itile : controlstate : tilelist} (require :game.defs)) (local {: ev} (require :game.entity)) (local tile (require :game.tiles)) +(local {: notes} (require :game.boop)) (local {: walkable : neutable : debris : sittable} tile.flag-to-bit) (local level (deflevel "game/map5.json" :level5)) (local vm level.vm) +(vm:word :snd-dropgarbage (notes [:a1] 0x02 0xf0)) (vm.code:append :debristiles) (each [itile tiledef (ipairs tilelist)] (when tiledef.flags.debris @@ -54,7 +56,7 @@ (say :rexx "PARITYe#ERPORr(sbaitso" " tellmeabout" " your problems") :drop vm.true :ret ] [ (vm:if-and [[:dup :not-picking-up?] [:dup :can-drop-rubble?]] - [:rexx-yx :get :randomgarbage :update-itile]) + [:rexx-yx :get :randomgarbage :update-itile :snd-dropgarbage]) ])]) :move-noop) diff --git a/game/level6.fnl b/game/level6.fnl index 447b2ff..23e4bf8 100644 --- a/game/level6.fnl +++ b/game/level6.fnl @@ -24,6 +24,7 @@ [(say :pady "ANOTHER STRANGE PROGRAM!" "MY, I'M POPULAR TODAY!") (say :libb "OH PUKE. PLEASE SHUT UP.") (say-runon :pady "HOW RUD") + :snd-libb (say :libb "]/WINNUKE 182.556.21.74") (say :pady "PADYSEC CAUSED A GENERAL" "PROTECTION FAULT IN MODULE" "MORICON.DLL AT 000A:BE3F.") (say :libb "]/OPEN")]) diff --git a/game/player.fnl b/game/player.fnl index b66e394..9a7c770 100644 --- a/game/player.fnl +++ b/game/player.fnl @@ -81,7 +81,7 @@ (vm:word :move-rexx-trash ; yx -- f (vm:if-and [[:dup debris :flag-at?] [:is-rexx?]] - [(itile :t-floor) :update-itile] [:drop]) + [(itile :t-floor) :update-itile :snd-garbage] [:drop]) vm.false) (vm:word :move-gord-sit ; yx -- f (vm:if-and [[:dup sittable :flag-at?] [:is-jaye?] [:gord-following?]]