diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index ddfa54e3..d73934b7 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -11,8 +11,6 @@ PROGRAMMING + Save slots? + descriptions for all items when used on self. + try to have dialogue for every wrong interaction -+ Have to open curtains -+ grime on portrait + Dialogue frozen AUDIO diff --git a/desktop/resources/inside-antique/background.psd b/desktop/resources/inside-antique/background.psd index a2716910..0abcaeb1 100644 Binary files a/desktop/resources/inside-antique/background.psd and b/desktop/resources/inside-antique/background.psd differ diff --git a/desktop/resources/inside-cafeteria/background.png b/desktop/resources/inside-cafeteria/background.png index 5ca1ed6d..f9fe89bf 100644 Binary files a/desktop/resources/inside-cafeteria/background.png and b/desktop/resources/inside-cafeteria/background.png differ diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd index 6b536220..5fdf254a 100644 Binary files a/desktop/resources/inside-cafeteria/background.psd and b/desktop/resources/inside-cafeteria/background.psd differ diff --git a/desktop/resources/inside-cafeteria/knight-a.png b/desktop/resources/inside-cafeteria/knight-a.png new file mode 100644 index 00000000..0e09d8d0 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knight-a.png differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/0.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/0.pxi new file mode 100644 index 00000000..61d6e1d3 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/0.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/1.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/1.pxi new file mode 100644 index 00000000..22b50f78 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/1.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/2.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/2.pxi new file mode 100644 index 00000000..99070369 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/2.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/3.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/3.pxi new file mode 100644 index 00000000..6b247118 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/3.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/4.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/4.pxi new file mode 100644 index 00000000..48cea3b2 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/4.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/5.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/5.pxi new file mode 100644 index 00000000..f88405e3 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/5.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/6.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/6.pxi new file mode 100644 index 00000000..48a8090a Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/6.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/7.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/7.pxi new file mode 100644 index 00000000..0d7e08e0 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/7.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/8.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/8.pxi new file mode 100644 index 00000000..a64d2e13 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/8.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/9.pxi b/desktop/resources/inside-cafeteria/knighta.pxa/9.pxi new file mode 100644 index 00000000..1c2249d8 Binary files /dev/null and b/desktop/resources/inside-cafeteria/knighta.pxa/9.pxi differ diff --git a/desktop/resources/inside-cafeteria/knighta.pxa/CelData.plist b/desktop/resources/inside-cafeteria/knighta.pxa/CelData.plist new file mode 100644 index 00000000..222d28b8 --- /dev/null +++ b/desktop/resources/inside-cafeteria/knighta.pxa/CelData.plist @@ -0,0 +1,46 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/inside-cafeteria/knights-stand.png b/desktop/resources/inside-cafeteria/knights-stand.png index 5685c1b6..1d4f66e7 100644 Binary files a/desktop/resources/inside-cafeteria/knights-stand.png and b/desktop/resources/inside-cafeteria/knights-stand.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 970db05b..33940e7a 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -31,7 +31,19 @@ (actions/talk entities :ego "Hey guys!") (actions/talk entities :warriors "Hark! Good day, young esquire.") (actions/present-choices entities - {:choices ["Why dost thou speaketh in this manner?" + {:choices ["Can I have some of your food?" + {:run #(actions/respond entities % + :warriors "Verily I say unto you: no." + :warriors "We art filled with hunger." + :warriors "And we musteth replentish our strength." + :warriors "Get ye your own food!") + :choices actions/previous-choices} + "Shouldn't you be guarding something?" + {:run #(actions/respond entities % + :warriors "Even the mightiest of knights musteth replentish their strength." + :warriors "And geteth some R and R.") + :choices actions/previous-choices} + "Why dost thou speaketh in this manner?" {:run #(actions/respond entities % :warriors "`Tis a tradition!" :warriors "All knights speaketh in such a manner." @@ -160,7 +172,8 @@ #_#_ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) ladder-guard-stand (animation 0.1 [(texture "inside-cafeteria/ladder-guard-2.png")]) ladder-guard-talk (animation 0.1 [ (texture "inside-cafeteria/ladder-guard-2.png")]) - warriors-stand (utils/make-anim "inside-cafeteria/knights-stand.png" [74 97] 0.6 (take 100 (repeatedly #(rand-int 10)))) + warriors-stand (utils/make-anim "inside-cafeteria/knights-stand.png" [49 80] 0.6 (take 100 (repeatedly #(rand-int 10)))) + knight-a-stand (utils/make-anim "inside-cafeteria/knight-a.png" [70 85] 0.2 (flatten [(repeat 3 [(repeat 7 0) (repeat 7 1) (repeat 7 0) (repeat 7 2)]) [3 4 5 6 7 8 9]])) @@ -188,8 +201,7 @@ (assoc (texture "inside-cafeteria/glow.png") :y 0 :baseline 240 :additive? true :opacity 0.3) (assoc (texture "inside-cafeteria/fg.png") :x 10 :y 0 :scale-x 1.1 :scale-y 1.0 :baseline 320 :parallax 1.5) ] - :entities { - :warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 8 :y 19 :baseline 180 + :entities {:warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 31 :y 36 :baseline 180 :left {:stand (utils/flip warriors-stand) :talk (utils/flip warriors-stand)} @@ -204,6 +216,12 @@ (actions/do-dialogue entities :warriors "We are warriors. We coveteth not earthly possessions.")))) :stand) + :knight-a (assoc (animation->texture screen knight-a-stand) + :x 0 :y 21 :baseline 181 + :anim knight-a-stand + :anim-start 0 + :talk knight-a-stand + :stand knight-a-stand) :ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 180 :y 70 :baseline 170 :stand ladder-guard-stand :talk ladder-guard-talk