notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

everyone at least says something.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-15 10:29:52 -07:00
parent c5ffaeb1ec
commit 7d04d6fa69
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/gametodos.txt
View File

@@ -17,15 +17,11 @@
+ putting out the candle in jail
+ lighting the hay on fire in jail
+ mark the squeaky board a bit
" wit's end" typo
+ gang dude should pop the georgia dream
+ you can drink the strength potion while in blood clots hand
+ try to have dialogue for every wrong interaction
+ When you have an item and you click somewhere on the screen that
is not a possible interaction, Tick should move to that location,
instead of saying "I don't know what to do with that"
+ All characters should say something instead of Tick's "I don't know
what to do with that."
+ when you use the slingshot on Bloodclot his lightening gem does
not disappear, but then when he picks you up to eat you it is gone,
then when he puts you down it appears again, then it is gone again

8
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -103,7 +103,9 @@
(present-frankie-choices entities))
:scripts {:walkie-talkies (actions/get-script entities
(actions/do-dialogue entities :frankie "Tin cans? What do I need walkie talkies for?"))})))
(actions/do-dialogue entities :frankie "Tin cans? What do I need walkie talkies for?"))
:default (actions/get-script entities
(actions/do-dialogue entities :frankie "What? Wanting to give up more of your goodies?"))})))
(defn make-coin-flip [screen]
(let [coin-flip (utils/make-anim "castle-gate/coinflip.png" [10 10] 0.05 (range 5))]
@@ -190,6 +192,10 @@
(do
(actions/do-dialogue entities :ego "Hey Bubba!"
:goon-2 "Beat it, Dipstick."))))
:scripts {:money (actions/get-script entities
(actions/do-dialogue entities :ego "I don't want to give it back!"))
:default (actions/get-script entities
(actions/do-dialogue entities :goon-2 "Beat it, Dipstick."))}
:night-profile :sprite
:anim-start 0
:stand stand)))

5
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -316,7 +316,8 @@
(actions/give entities :kiss)
(actions/do-dialogue entities :ego "A kiss for an inventory item?"
:ego "Sounds like the game designer was running out of good ideas."))
(actions/talk entities :ego "I guess I'm too far away.")))})
(actions/talk entities :ego "I guess I'm too far away.")))
:default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))})
cat-stand)
:grandma (let [gma (assoc (animation->texture screen grandma-stand)
:x 130 :y 37 :baseline 200
@@ -350,7 +351,7 @@
:script (actions/get-script entities (talk-to-owl entities))
:scripts #(condp = %
:monocle (actions/get-script entities (give-monocle entities))
nil)))
(actions/get-script entities (actions/talk entities :owl "No thank you.")))))
:collision "cat-tree/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)
:apply-state (fn [_ entities]

6
desktop/src-common/advent/screens/rooms/common.clj
View File

@@ -58,7 +58,7 @@
(defn read-note-1 [entities]
(actions/do-dialogue entities
:ego "It's a note from Gandarf! It says:"
:ego "'Boy, I have been kidnapped by Bloodclot.'"
:ego "'Tick, I have been kidnapped by Bloodclot.'"
:ego "'He's got me locked up in his fortress of doom.'"
:ego "'It's actually pretty comfortable, despite the name.'"
:ego "'You must cast the spell to restore magic to the Slinger's Shot yourself.'"
@@ -69,7 +69,7 @@
:ego "'Then pour the contents in the cauldron.'"
:ego "'I will give you more instructions when I can.'"
:ego "'And please hurry, because we're being forced into a karaoke competition.'"
:ego "'I'm about at my witt's end.'"
:ego "'I'm about at my wits' end.'"
:ego "'P.S., Guard that slingshot with your life!'"
:ego "'P.P.S., You can look for my secret stash of helpful stuff behind a nearby r...'"
:ego "It just cuts off there."))
@@ -78,7 +78,7 @@
(actions/do-dialogue entities
:ego "It's a Bingo card."
:ego "Look's like there's a note on the back."
:ego "'Boy, the situation is dire. I don't have much time. Please hurry.'"
:ego "'Tick, the situation is dire. I don't have much time. Please hurry.'"
:ego "'We've been forced into playing bingo for the last 3 hours.'"
:ego "'You are almost done with the spell to restore magic to The Slinger's Shot.'"
:ego "'You haven't lost it, right?'"

3
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -724,7 +724,8 @@
:script (actions/get-script entities (actions/talk entities :ego "That's a big cauldron!"))
:scripts put-something-in-cauldron))
:wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
:script (actions/get-script entities (talk-to-gandarf-outside entities))}))
:script (actions/get-script entities (talk-to-gandarf-outside entities))
:scripts {:default (actions/get-script entities (actions/talk entities :wizard "No time for that!"))}}))
:note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png")
:x 277 :y 74 :baseline 160
:night-profile :none

2
desktop/src/advent/core/desktop_launcher.clj
View File

@@ -19,7 +19,7 @@
(defn -main
[& [port]]
#_(when port (start-nrepl-expr (Integer/parseInt port)))
(when port (start-nrepl-expr (Integer/parseInt port)))
(let [cfg (LwjglApplicationConfiguration.)]
(if false
(do