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

typos, and love is in the air.

Browse Source
This commit is contained in:
Remington Covert
2015-04-20 08:14:36 -07:00
parent 634b87d541
commit e6bad70bfe
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,9 @@
:frankie "Not a chance, Faceplant." :frankie "Not a chance, Faceplant."
:frankie "Burglers like us gotta eat too, you know." :frankie "Burglers like us gotta eat too, you know."
:ego "But it's a matter of life and death! Georgia McGorgeous is counting on me!" :ego "But it's a matter of life and death! Georgia McGorgeous is counting on me!"
)
(actions/in-love entities)
(actions/respond entities %
:frankie "Georgia's going steady with me now, Faceplant.") :frankie "Georgia's going steady with me now, Faceplant.")
(actions/play-animation entities :frankie :laugh) (actions/play-animation entities :frankie :laugh)
(actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town." (actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town."

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

@@ -175,7 +175,7 @@
(actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[260 120] [260 124]]) true)))) (actions/update-entities entities (fn [e] (update-in e [:room :entities :fairy-godfather] assoc :path (catmull-rom-spline (map #(apply vector-2* %) [[260 120] [260 124]]) true))))
(actions/do-dialogue entities :fairy-godfather "Next, we have the broom, representing the humble job of a janitor." (actions/do-dialogue entities :fairy-godfather "Next, we have the broom, representing the humble job of a janitor."
:ego "I'm not going to be a janitor!" :ego "I'm not going to be a janitor!"
:ego "I'm going to take the sword and be a knight?" :ego "I'm going to take the sword and be a knight!"
:fairy-godfather "Hmm? Sword?") :fairy-godfather "Hmm? Sword?")
(actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path)) (actions/update-entities entities #(update-in % [:room :entities :fairy-godfather] dissoc :path))
(actions/walk-straight-to entities :fairy-godfather [192 120] :speed 3.0 :update-baseline? false) (actions/walk-straight-to entities :fairy-godfather [192 120] :speed 3.0 :update-baseline? false)

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

@@ -50,7 +50,7 @@
:warriors "We thinketh not, young esquire." :warriors "We thinketh not, young esquire."
:warriors "Thou lacketh the strength and vigor required for such a task." :warriors "Thou lacketh the strength and vigor required for such a task."
:warriors "To becometh a knight, thou wouldst have to best Captain McHulk in battle." :warriors "To becometh a knight, thou wouldst have to best Captain McHulk in battle."
:warriors "And no one durst challeng him!") :warriors "And no one durst challenge him!")
:choices ["But I'm on a quest to become a knight!" :choices ["But I'm on a quest to become a knight!"
{:run #(actions/respond entities % {:run #(actions/respond entities %
:warriors "Young esquire, thou art valiant in heart. " :warriors "Young esquire, thou art valiant in heart. "
@@ -66,7 +66,7 @@
(play-battle entities :win) (play-battle entities :win)
(actions/do-dialogue entities (actions/do-dialogue entities
:warriors "Congratulations young master. Thou art worthy in might." :warriors "Congratulations young master. Thou art worthy in might."
:warriors "Take my medal of strength.") :warriors "Take thy servant's medal of strength.")
(actions/give entities :medal)) (actions/give entities :medal))
(do (do
(play-battle entities :lose) (play-battle entities :lose)

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

@@ -201,6 +201,7 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "I have to prove myself worthy in wisdom, courage, and might!" :ego "I have to prove myself worthy in wisdom, courage, and might!"
:ego "Then I can become a knight and impress Georgia McGorgeous!") :ego "Then I can become a knight and impress Georgia McGorgeous!")
(actions/in-love entities)
(actions/do-dialogue entities :ego (str "I've proven myself in " (actions/do-dialogue entities :ego (str "I've proven myself in "
(str/join " and " (map item->proof obtained-items)) (str/join " and " (map item->proof obtained-items))
", but still have to prove myself in " ", but still have to prove myself in "
@@ -300,7 +301,7 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "That's Georgia McGorgeous' house." :ego "That's Georgia McGorgeous' house."
:ego "One day, when I'm a knight, I'll ask her to be my girlfriend.") :ego "One day, when I'm a knight, I'll ask her to be my girlfriend.")
(actions/transition-music entities :love :duration 1.0))}} (actions/in-love entities))}}
:layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]
:night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)] :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)]

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

@@ -384,9 +384,7 @@
(leave-sheep entities)) (leave-sheep entities))
(do (do
(actions/talk entities :ego "Come here mama sheep!") (actions/talk entities :ego "Come here mama sheep!")
(actions/play-animation entities :ego :throw)
(actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :sigh)
(actions/talk entities :ego "She's too far away for me to pet her."))))) (actions/talk entities :ego "She's too far away for me to pet her.")))))
:scripts #(condp = % :scripts #(condp = %
:wool (actions/get-script entities :wool (actions/get-script entities