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

minor tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-12-02 20:22:45 -08:00
parent 7bbb7b40b1
commit 033acad52c
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/build-osx.json
View File

@@ -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",

2
desktop/build-windows.json
View File

@@ -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",

2
desktop/last-release
View File

@@ -1 +1 @@
20
21

BIN
desktop/resources/inside-castle/collision.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

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

@@ -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]))

5
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -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))