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

minor feedback.

Browse Source
This commit is contained in:
Bryce Covert
2015-12-20 19:31:52 -05:00
parent ce456df331
commit e0a997dee7
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@
{:run #(actions/respond entities %
:owl "Of course I can help you in your quest."
:owl "I know just what you need."
:owl "But I'm also in trouble of my own.")
:owl "But I'm also in some trouble of my own.")
:choices ["What kind of trouble?"
{:run #(do (actions/respond entities %
:owl "You see, we owls have very strong vision."
@@ -186,11 +186,6 @@
:owl "Could you help me find it?"
:ego "I'll let you know if I see anything."
:owl "Oh, thank you."))}
"Have you seen Gandarf tonight?"
{:run #(actions/respond entities %
:owl "I don't know him."
:owl "I'm actually just travelling through this land.")
:choices actions/previous-choices}
"Nevermind."
{:run #(do (actions/respond entities %
:owl "Oh, do tell me if you see a glass monocle around."

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

@@ -271,6 +271,7 @@
"inside-jail/guard-crash.ogg"
0.6 false)
(actions/do-dialogue entities :guard "*oof*!")
(actions/camera-shake entities 6)
(actions/begin-animation entities :warden :stand)
@@ -333,7 +334,9 @@
(actions/talk entities :ego "Not while I'm in this cell.")))}}
:door {:box [257 62 301 152]
:cursor :down
:script (actions/get-script entities (leave entities))}}
:script (actions/get-script entities (leave entities))}
}
:layers [(assoc (utils/get-texture "inside-jail/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)
(assoc (utils/get-texture "inside-jail/bars.png") :x 0 :y 0 :baseline 165 :night-profile :none)
(assoc (utils/get-texture "inside-jail/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.35 :night-profile :none)
@@ -435,7 +438,8 @@
(actions/talk entities :ego "I can't reach it."))))
:closed-window (assoc (utils/get-texture "inside-jail/window.png")
:night-profile :none
:x 99 :y 111 :baseline 128)}
:x 99 :y 111 :baseline 128)
:guard { :object nil :width 100 :height 100 :x 70 :y 55 :talk-color (color 0.2 0.6 1.0 1.0)}}
:collision "inside-jail/collision-locked.png"
:collision-free (advent.pathfind/map-from-resource "inside-jail/collision-free.png")
:scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5)

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

@@ -487,7 +487,7 @@
"Bloodclot is on the loose!"
{:run #(do (actions/respond entities %
:wizard "Bloodclot?"
:wizard "You can't mean the goblin, Bloodclot?"
:wizard "You can't mean the goblin Bloodclot?"
:wizard "If you did, you'd be burned to a crisp from his lightning gem!"
:ego "Yes, that Bloodclot!"
:wizard "I knew that there would be a \"final test\" for the hero who pulled the blade..."

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

@@ -130,7 +130,7 @@
:sherrif-house {:box [138 143 160 168]
:script (actions/get-script entities
(actions/do-dialogue entities
:ego "That's the Sherrif's house."
:ego "That's the Sheriff's house."
:ego "He hates me."
:ego "All because I threw a rock through his window."
:ego "Or windows."