From ec21444268691271e9bd6c867b59ba7dc8017166 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sat, 13 Dec 2014 14:14:31 -0800 Subject: [PATCH] slightly better transitions. --- desktop/src-common/advent/screens/items.clj | 2 +- desktop/src-common/advent/screens/rooms/cat_tree.clj | 4 ++-- desktop/src-common/advent/screens/rooms/inside_castle.clj | 3 ++- .../src-common/advent/screens/rooms/outside_castle.clj | 8 ++++++-- desktop/src-common/advent/screens/rooms/outside_house.clj | 7 +++++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index bb71e5ad..1eb06a97 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -92,7 +92,7 @@ :glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye} :motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes} :used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs} - :grass {:name "Huge grass" :value :grass :cursor :grass} + :grass {:name "High protein grass" :value :grass :cursor :grass} :slobber {:name "Bull slobber" :value :slobber :cursor :slobber :scripts {:flask-1-with-cream-of-mushroom (make-strength-potion)}} :flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents :scripts {:slobber (make-strength-potion)}} diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 650b54f1..ddc09ab6 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -17,7 +17,7 @@ (actions/give entities :ladder)) (defn do-saved-grandma-dialogue [entities] - (actions/walk-straight-to entities :ego [165 45] :face :left) + (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities :grandma "Oh it's my handsome hero again!" :grandma "Back for another kiss?" @@ -27,7 +27,7 @@ (actions/talk entities :ego "No way.")) (defn do-grandma-dialogue-with-cat [entities] - (actions/walk-straight-to entities :ego [165 45] :face :left) + (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities :grandma "Oh, good, a strapping young lad!" :grandma "Are you here to help this damsel in distress?") diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index b38663d9..3c5a929b 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -151,7 +151,8 @@ :script (actions/get-script entities (actions/walk-to entities :ego [182 90] :face :left) (actions/play-animation entities :ego :reach) - (actions/transition-background entities :inside-antique [222 15]))} + (actions/transition-background entities :inside-antique [228 -30]) + (actions/walk-straight-to entities :ego [222 15] :face :left))} :sword {:box [0 130 39 165] :script (actions/get-script entities (if (actions/has-item? entities :sword) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 049d6640..d840f214 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -30,7 +30,9 @@ :script (actions/get-script entities (actions/walk-to entities :ego [310 80]) - (actions/transition-background entities :outside-house [0 80])) + (actions/walk-straight-to entities :ego [340 80]) + (actions/transition-background entities :outside-house [0 80]) + (actions/walk-straight-to entities :ego [30 80])) :cursor :right} :door {:box [66 180 85 195] :script (actions/get-script @@ -144,9 +146,11 @@ :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80 :stand steer-stand :script (actions/get-script entities + (actions/walk-to entities :ego [168 150] :face :right) (actions/do-dialogue entities :ego "It's Angus, Remington's buff bull." - :ego "Farmer doug feeds him a special grass diet to keep him in tip top shape.")) + :ego "Farmer Doug feeds him an exclusive wild high-protein grass diet to keep him in tip top shape." + :ego "He looks mean, I'd rather not pet him.")) :scripts {:grass (actions/get-script entities (actions/walk-to entities :ego [168 150] :face :right) (actions/play-animation entities :ego :reach) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 0faeed97..c31890aa 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -153,7 +153,10 @@ :script (actions/get-script entities (actions/walk-to entities :ego [0 80]) - (actions/transition-background entities :outside-castle [310 80])) + (actions/walk-straight-to entities :ego [-20 80]) + (actions/transition-background entities :outside-castle [330 80]) + (actions/walk-straight-to entities :ego [310 80]) + ) :cursor :left}} :layers [(assoc (texture "bg5.png") :x 0 :y 0 :baseline 0) (assoc (texture "house.png") :x 0 :y 0 :baseline 122) @@ -223,4 +226,4 @@ (if (get-in entities [:state :coaxed-sheep?]) (update-in entities [:room :entities :sheep] #(assoc % :x 95 :y 150 :baseline 40)) entities))) - :start-pos [0 80]))) + :start-pos [30 80])))