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-10-27 16:22:28 -07:00
parent 6e9729dbd5
commit 328a522468
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/build-osx.json
View File

@@ -1,11 +1,11 @@
{ {
"platform": "mac", "platform": "mac",
"jdk": "/Users/brycecovert/Downloads/jre1.7.0_80.jre/Contents/Home/Archive.zip", "jdk": "/Users/brycecovert/Downloads/jre1.7.0_80.jre/Contents/Home/Archive.zip",
"executable": "TicksTales", "executable": "TicksTales",
"appjar": "target/advent-0.0.1-SNAPSHOT-standalone.jar", "appjar": "target/advent-0.0.1-SNAPSHOT-standalone.jar",
"mainclass": "advent/core/desktop_launcher", "mainclass": "advent/core/desktop_launcher",
"resources": [ "resources": [
], ],
"minimizejre": "soft", "minimizejre": "soft",
"outdir": "target/osx/TicksTales.app" "outdir": "target/osx/Tick's Tales.app"
} }

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

@@ -31,8 +31,8 @@
(defn scene-world->talk-world [scene-viewport [x y]] (defn scene-world->talk-world [scene-viewport [x y]]
(let [[screen-x screen-y] (utils/project {:viewport scene-viewport} [x y]) (let [[screen-x screen-y] (utils/project {:viewport scene-viewport} [x y])
x (/ screen-x (/ (game :width) 1280.0 )) x (Math/round (/ screen-x (/ (game :width) 1280.0 )))
y (/ screen-y (/ (game :height) 960.0 ))] y (Math/round (/ screen-y (/ (game :height) 960.0 )))]
[x y])) [x y]))
(defscreen talking-screen (defscreen talking-screen

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

@@ -414,7 +414,8 @@
:ego "Man! What a dream!" :ego "Man! What a dream!"
:ego "If I only really could be a knight." :ego "If I only really could be a knight."
:ego "Then I'd be able to win Georgia McGorgeous' heart.") :ego "Then I'd be able to win Georgia McGorgeous' heart.")
(actions/in-love entities)) (actions/in-love entities)
(utils/snapshot-state @entities :after-dream))
(do (actions/walk-to entities :ego [148 76] :face :right) (do (actions/walk-to entities :ego [148 76] :face :right)
(actions/do-dialogue entities (actions/do-dialogue entities
:fairy-godfather "What are you doing?" :ego "Erm... Nothing.")))) :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))

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

@@ -320,8 +320,8 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "I think it means I have to prove myself worthy in wisdom, courage, and might!" :ego "I think it means 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/georgia-say entities "Tick! My hero!") (actions/georgia-say entities "Tick! My handsome hero!")
(actions/talk entities :ego "... I wonder what that last bit is about.")) (actions/talk entities :ego "... I wonder what the 'final test' bit is about."))
(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 "

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

@@ -1309,7 +1309,7 @@ void main ()
(.apply viewport) (.apply viewport)
(let [entities (utils/apply-tweens screen entities (:tweens entities))] (let [entities (utils/apply-tweens screen entities (:tweens entities))]
(label! (:fps entities) :set-text (str (game :fps))) (label! (:fps entities) :set-text (str (game :fps)))
(render! screen [ (:fps entities) (:inventory entities) (:close entities)]) (render! screen [ #_(:fps entities) (:inventory entities) (:close entities)])
entities)) entities))
:on-resize :on-resize

6
desktop/src/advent/core/desktop_launcher.clj
View File

@@ -1,12 +1,12 @@
(ns advent.core.desktop-launcher (ns advent.core.desktop-launcher
(:require [advent.core :refer :all] (:require [advent.core :refer :all]
[clojure.tools.nrepl.server]) #_[clojure.tools.nrepl.server])
(:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration] (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration]
[org.lwjgl.input Keyboard] [org.lwjgl.input Keyboard]
[com.badlogic.gdx Gdx]) [com.badlogic.gdx Gdx])
(:gen-class)) (:gen-class))
(defmacro start-nrepl-expr [port] #_(defmacro start-nrepl-expr [port]
`(let [{port# :port} (clojure.tools.nrepl.server/start-server :port ~port)] `(let [{port# :port} (clojure.tools.nrepl.server/start-server :port ~port)]
(doseq [port-file# ["target/repl-port" ".nrepl-port"]] (doseq [port-file# ["target/repl-port" ".nrepl-port"]]
(-> port-file# (-> port-file#
@@ -19,7 +19,7 @@
(defn -main (defn -main
[& [port]] [& [port]]
(try #_(try
(when port (start-nrepl-expr (Integer/parseInt port))) (when port (start-nrepl-expr (Integer/parseInt port)))
(catch Exception e)) (catch Exception e))
(let [cfg (LwjglApplicationConfiguration.)] (let [cfg (LwjglApplicationConfiguration.)]