From 328a522468deb2ed2637abfc69a77706bb39d389 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 27 Oct 2015 16:22:28 -0700 Subject: [PATCH] minor tweaks. --- desktop/build-osx.json | 4 ++-- desktop/src-common/advent/screens/dialogue.clj | 4 ++-- desktop/src-common/advent/screens/rooms/dream.clj | 3 ++- desktop/src-common/advent/screens/rooms/inside_castle.clj | 4 ++-- desktop/src-common/advent/screens/scene.clj | 2 +- desktop/src/advent/core/desktop_launcher.clj | 6 +++--- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/desktop/build-osx.json b/desktop/build-osx.json index 00985823..1eb650f0 100644 --- a/desktop/build-osx.json +++ b/desktop/build-osx.json @@ -1,11 +1,11 @@ { "platform": "mac", "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", "mainclass": "advent/core/desktop_launcher", "resources": [ ], "minimizejre": "soft", - "outdir": "target/osx/TicksTales.app" + "outdir": "target/osx/Tick's Tales.app" } diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index 548efae1..4bc73f3a 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -31,8 +31,8 @@ (defn scene-world->talk-world [scene-viewport [x y]] (let [[screen-x screen-y] (utils/project {:viewport scene-viewport} [x y]) - x (/ screen-x (/ (game :width) 1280.0 )) - y (/ screen-y (/ (game :height) 960.0 ))] + x (Math/round (/ screen-x (/ (game :width) 1280.0 ))) + y (Math/round (/ screen-y (/ (game :height) 960.0 )))] [x y])) (defscreen talking-screen diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index bd83c5f7..564163dd 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -414,7 +414,8 @@ :ego "Man! What a dream!" :ego "If I only really could be a knight." :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) (actions/do-dialogue entities :fairy-godfather "What are you doing?" :ego "Erm... Nothing.")))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 1770206f..ff519962 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -320,8 +320,8 @@ (actions/do-dialogue entities :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!") - (actions/georgia-say entities "Tick! My hero!") - (actions/talk entities :ego "... I wonder what that last bit is about.")) + (actions/georgia-say entities "Tick! My handsome hero!") + (actions/talk entities :ego "... I wonder what the 'final test' bit is about.")) (actions/do-dialogue entities :ego (str "I've proven myself in " (str/join " and " (map item->proof obtained-items)) ", but still have to prove myself in " diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 302ca300..bd59d459 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1309,7 +1309,7 @@ void main () (.apply viewport) (let [entities (utils/apply-tweens screen entities (:tweens entities))] (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)) :on-resize diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 3723e783..962efab1 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -1,12 +1,12 @@ (ns advent.core.desktop-launcher (:require [advent.core :refer :all] - [clojure.tools.nrepl.server]) + #_[clojure.tools.nrepl.server]) (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration] [org.lwjgl.input Keyboard] [com.badlogic.gdx Gdx]) (:gen-class)) -(defmacro start-nrepl-expr [port] +#_(defmacro start-nrepl-expr [port] `(let [{port# :port} (clojure.tools.nrepl.server/start-server :port ~port)] (doseq [port-file# ["target/repl-port" ".nrepl-port"]] (-> port-file# @@ -19,7 +19,7 @@ (defn -main [& [port]] - (try + #_(try (when port (start-nrepl-expr (Integer/parseInt port))) (catch Exception e)) (let [cfg (LwjglApplicationConfiguration.)]