From 033acad52cc9ca4127bd8c43f0c0347c696d0659 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 2 Dec 2015 20:22:45 -0800 Subject: [PATCH] minor tweaks. --- desktop/build-osx.json | 2 +- desktop/build-windows.json | 2 +- desktop/last-release | 2 +- desktop/resources/inside-castle/collision.png | Bin 5172 -> 5111 bytes .../advent/screens/rooms/inside_castle.clj | 2 +- .../advent/screens/rooms/outside_jail.clj | 5 +++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/desktop/build-osx.json b/desktop/build-osx.json index a69e3a0d..277a34e0 100644 --- a/desktop/build-osx.json +++ b/desktop/build-osx.json @@ -1,6 +1,6 @@ { "platform": "mac", - "jdk": "/Users/brycecovert/Downloads/jre1.7.0_80.jre/Contents/Home/Archive.zip", + "jdk": "/Users/brycecovert/dev/jvms/jre1.7.0_80.jre/Contents/Home/Archive.zip", "executable": "Tick's Tales", "appjar": "target/advent-standalone.jar", "mainclass": "advent/core/desktop_launcher", diff --git a/desktop/build-windows.json b/desktop/build-windows.json index cc6f8f17..7e28b2f5 100644 --- a/desktop/build-windows.json +++ b/desktop/build-windows.json @@ -1,6 +1,6 @@ { "platform": "windows", - "jdk": "/Users/brycecovert/Downloads/openjdk-1.7.0-u80-unofficial-windows-i586-image.zip", + "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-windows-i586-image.zip", "executable": "TicksTales", "appjar": "target/advent-standalone.jar", "mainclass": "advent/core/desktop_launcher", diff --git a/desktop/last-release b/desktop/last-release index 209e3ef4..aabe6ec3 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -20 +21 diff --git a/desktop/resources/inside-castle/collision.png b/desktop/resources/inside-castle/collision.png index cb37de5b9b5a960f812adad4ed7296f412e609f2..82bc587365c75a64ec47d098f141d048522a11f0 100644 GIT binary patch delta 4110 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 M07*qoM6N<$g5@JU%m4rY delta 4179 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 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 6211567d..c373b655 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -420,7 +420,7 @@ (actions/talk entities :ego "Ye Ol' Antique Shoppe."))} :background-houses {:box [84 145 126 180] :script (actions/get-script entities - (actions/walk-to entities :ego [79 145] :face :right :stop? false :skip-type :end) + (actions/walk-to entities :ego [81 148] :face :right :stop? false :skip-type :end) (actions/walk-straight-to entities :ego [92 150] :face :right) (actions/transition-background entities :outside-jail [159 -20]) (actions/walk-straight-to entities :ego [159 20])) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 26b05a6a..08679633 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -142,7 +142,7 @@ :ego "He's the mightiest knight in all of Remington." :ego "If only I could be as strong as him one day." ))} - :stump {:box [205 68 251 89] + :stump {:box [205 68 251 100] :script (actions/get-script entities (actions/walk-to entities :ego [170 71] :face :right) (actions/walk-straight-to entities :ego [188 71] :face :right) @@ -173,7 +173,8 @@ ) :sword (actions/get-script entities (actions/talk entities :ego "I can just use the axe.")) :default (actions/get-script entities (actions/talk entities :ego "No reason to chop that!")) - :frog-legs (actions/get-script entities (actions/talk entities :ego "They're already chopped up!"))}} + :frog-legs (actions/get-script entities (actions/talk entities :ego "They're already chopped up!")) + :broken-clock (actions/get-script entities (actions/talk entities :ego "It's already split in half!"))}} :lever {:box [3 72 20 90] :script (actions/get-script entities (interact-with-lever entities))