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 cb37de5b..82bc5873 100644 Binary files a/desktop/resources/inside-castle/collision.png and b/desktop/resources/inside-castle/collision.png differ 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))