From d74604b578f5ec4dd44c07e76a605cf2fdcc5bc2 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 1 Jun 2017 08:05:02 -0700 Subject: [PATCH] various loading statements. --- desktop/src-common/advent/screens/credits.clj | 1 + desktop/src-common/advent/screens/dialogue.clj | 1 + desktop/src-common/advent/screens/fade.clj | 1 + desktop/src-common/advent/screens/inventory.clj | 1 + desktop/src-common/advent/screens/items.clj | 1 + desktop/src-common/advent/screens/rooms.clj | 1 + desktop/src-common/advent/screens/rooms/behind_house.clj | 1 + desktop/src-common/advent/screens/rooms/castle_gate.clj | 1 + desktop/src-common/advent/screens/rooms/cat_tree.clj | 3 +++ desktop/src-common/advent/screens/rooms/common.clj | 2 ++ desktop/src-common/advent/screens/rooms/dream.clj | 2 ++ desktop/src-common/advent/screens/rooms/ending.clj | 2 ++ desktop/src-common/advent/screens/rooms/held.clj | 1 + .../src-common/advent/screens/rooms/inside_antique.clj | 1 + .../src-common/advent/screens/rooms/inside_cafeteria.clj | 2 ++ desktop/src-common/advent/screens/rooms/inside_castle.clj | 1 + desktop/src-common/advent/screens/rooms/inside_house.clj | 2 ++ desktop/src-common/advent/screens/rooms/inside_jail.clj | 1 + desktop/src-common/advent/screens/rooms/inside_stash.clj | 1 + .../src-common/advent/screens/rooms/outside_castle.clj | 1 + desktop/src-common/advent/screens/rooms/outside_house.clj | 1 + desktop/src-common/advent/screens/rooms/outside_jail.clj | 1 + desktop/src-common/advent/screens/rooms/space.clj | 1 + desktop/src-common/advent/screens/safe.clj | 1 + desktop/src-common/advent/screens/scene.clj | 8 +++++--- desktop/src-common/advent/screens/shader.clj | 1 + desktop/src-common/advent/screens/splash.clj | 1 + desktop/src-common/advent/steam.clj | 1 + ios/Info.plist.xml | 2 +- 29 files changed, 40 insertions(+), 4 deletions(-) diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index 02550d94..0c7a5d28 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -15,6 +15,7 @@ [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen])) +(println "loading " *ns*) (defn center [e] (assoc e :x (- (/ 1280 2) (/ (or (:width e) (.getWidth (:object e))) 2)))) diff --git a/desktop/src-common/advent/screens/dialogue.clj b/desktop/src-common/advent/screens/dialogue.clj index dc1b6994..df0e64e6 100644 --- a/desktop/src-common/advent/screens/dialogue.clj +++ b/desktop/src-common/advent/screens/dialogue.clj @@ -17,6 +17,7 @@ [com.badlogic.gdx Screen] [com.badlogic.gdx.scenes.scene2d.utils NinePatchDrawable ] [play_clj.entities NinePatchEntity])) +(println "loading " *ns*) (defn ensure-on-screen [talk] (let [margin-width (* 0.05 1280) diff --git a/desktop/src-common/advent/screens/fade.clj b/desktop/src-common/advent/screens/fade.clj index 8da4f79b..0392b335 100644 --- a/desktop/src-common/advent/screens/fade.clj +++ b/desktop/src-common/advent/screens/fade.clj @@ -13,6 +13,7 @@ [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen] [com.badlogic.gdx.utils.viewport FitViewport])) +(println "loading " *ns*) (defscreen fade-screen diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index d0131daa..54c10a33 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -16,6 +16,7 @@ [com.badlogic.gdx.utils Align] [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen])) +(println "loading " *ns*) (defn interactable? [entities] (and (:shown? entities) (= 1.0 (:opacity entities)))) diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 566f3412..1f38d133 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -1,5 +1,6 @@ (ns advent.screens.items (:require [advent.actions :as actions])) +(println "loading " *ns*) (def make-cat-toy (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index b5aa70ee..c36370e2 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -6,6 +6,7 @@ [com.badlogic.gdx.utils.viewport FitViewport] [com.badlogic.gdx.scenes.scene2d Actor Stage] [java.lang Object])) +(println "loading " *ns*) (defn make-entity [id {:keys [scripts script only-script] :as entity}] (merge entity diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index b87dc216..2d4bded5 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -11,6 +11,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all]) ) +(println "loading behindhouse") (defn make-night [entities] (assoc-in entities [:room :entities :peeling :opacity] 0)) diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 59917aa7..1fc61829 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -16,6 +16,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn make-night [entities] entities) diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index e99b6848..7f577a3f 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -11,6 +11,9 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) + +(println "loading " *ns*) + (defn get-down [entities & break] (actions/walk-straight-to entities :ego [151 50] :update-baseline? false :face :left) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 5b09dac5..8cae657b 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -15,6 +15,8 @@ [play-clj.g2d :refer :all]) (:import [com.badlogic.gdx.graphics Color])) +(println "loading " *ns*) + (defn go-to-jail [entities & [time]] (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %)))) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 07e5968a..4ff6f24d 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -19,6 +19,8 @@ [play-clj.g2d :refer :all]) (:import [com.badlogic.gdx.graphics Color])) +(println "loading " *ns*) + (def walk-chan (a/chan)) (defn set-opacity [entities opacity tool-opacity] diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index 35f67ca8..4f1431eb 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -17,6 +17,8 @@ [play-clj.g2d :refer :all]) (:import [com.badlogic.gdx.graphics Color])) +(println "loading " *ns*) + (defn make [screen atlas global-atlas] (let [peddler-sheet (texture! (utils/atlas->texture atlas "peddler-talk" ) :split 18 36) peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index aa10fcc3..18d00493 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -15,6 +15,7 @@ [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn bloodclot-choices [entities] diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index bdaf3fc9..8121bacf 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -11,6 +11,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (def boy-names ["Steve" "Bob" "Bud" "Clement" "Terrence" "Flapjack" "Ticklemonster" "Peter" "Greg" "Dave" "Stu" "Calsbad" "Fatso" "Tanner" "Klug" "Griswold" "Leonardo" "Donatello" "Raphael" "Michelangelo" "Francis" "Ebeneezer" "Pierre" "Finn" "Slade" "Gilbert" "Graham" diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index c6b22d4d..34244818 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -11,6 +11,8 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) + (defn make-fight-entity [global-atlas] (assoc (utils/atlas->texture global-atlas "black.png") :x 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 2277b19f..62017041 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -16,6 +16,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn brian [screen entities] (when (and (not (get-in entities [:fg-actions :script-running?])) (not (get-in entities [:bg-actions :script-running?])) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index f9a5a036..9374987f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -11,6 +11,8 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) + (defn open-safe [entities] (actions/play-animation entities :ego :start-squat :stop? false) (Thread/sleep 500) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 45358e13..447c2503 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -14,6 +14,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn remove-lock [entities] (-> entities diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index d5a44476..fce41025 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -8,6 +8,7 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn bust-chest [entities] (if (get-in @entities [:state :broke-lock?]) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 440d1378..296d8c6d 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -12,6 +12,7 @@ [play-clj.math :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn flies-vol [entities] (utils/proximity-volume entities [201 175] :scale 0.20)) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index f51582f2..bcfb1ddd 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -16,6 +16,7 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn dawn-fade [entities] diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 66a8a827..4dddfb6e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -9,6 +9,7 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn add-spear-if-necessary [entities] (if (and (not (actions/has-obtained? entities :spear)) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 128d4724..f7905862 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -15,6 +15,7 @@ [play-clj.utils :refer :all] [play-clj.math :refer :all] [play-clj.g2d :refer :all])) +(println "loading " *ns*) (defn taunt [screen entities] (when (and (not (get-in entities [:fg-actions :script-running?])) diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj index a369eb7e..e2f42bfe 100644 --- a/desktop/src-common/advent/screens/safe.clj +++ b/desktop/src-common/advent/screens/safe.clj @@ -13,6 +13,7 @@ [com.badlogic.gdx.utils Align] [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen])) +(println "loading " *ns*) (def start-x 35) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index fe8b6f33..c4704879 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -58,6 +58,8 @@ #_(set! *unchecked-math* :warn-on-boxed) +(println "loading scene") + (declare hud) (declare get-selected-inventory-item) @@ -1429,8 +1431,8 @@ (assoc-in [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil))))))) :on-touch-up (fn [screen entities options] - (let [currently-pressed (dec (get-in entities [:cursor :counter])) - max-pressed (get-in entities [:cursor :max-counter])] + (let [currently-pressed (dec (get-in entities [:cursor :counter] 1)) + max-pressed (get-in entities [:cursor :max-counter] 1)] (println "touched up" currently-pressed max-pressed) (cond (and (<= currently-pressed 0) @@ -1448,7 +1450,7 @@ (update-in [:cam] dissoc :start-zoom :pinching)) (get-in entities [:state :active?]) - (update-in entities [:cursor :counter] #(max 0 (dec %))) + (update-in entities [:cursor :counter] #(max 0 (dec (or % 1)))) :else entities diff --git a/desktop/src-common/advent/screens/shader.clj b/desktop/src-common/advent/screens/shader.clj index dec46b4e..bbb04b03 100644 --- a/desktop/src-common/advent/screens/shader.clj +++ b/desktop/src-common/advent/screens/shader.clj @@ -1,5 +1,6 @@ (ns advent.screens.shader (:require [advent.utils :as utils])) +(println "loading " *ns*) (def v-shader (constantly "attribute vec4 a_position; diff --git a/desktop/src-common/advent/screens/splash.clj b/desktop/src-common/advent/screens/splash.clj index 513effe7..e5d682f9 100644 --- a/desktop/src-common/advent/screens/splash.clj +++ b/desktop/src-common/advent/screens/splash.clj @@ -23,6 +23,7 @@ [com.badlogic.gdx.scenes.scene2d.utils NinePatchDrawable TextureRegionDrawable] [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input InputMultiplexer InputProcessor Net Preferences Screen])) +(println "loading " *ns*) (defn fade-in [screen e thing then] (assoc-in e [:tweens :fade-in] diff --git a/desktop/src-common/advent/steam.clj b/desktop/src-common/advent/steam.clj index 63418993..a8111261 100644 --- a/desktop/src-common/advent/steam.clj +++ b/desktop/src-common/advent/steam.clj @@ -6,6 +6,7 @@ (def has-steam? false ) +(println "loading steam") (def is-app-store? false) (def all-achievements ["PARDON" "EX_CON" "PRO_WRESTLER" "SHEEP_HORDER" "SAFE_AND_SOUND" "DESTINY" "WISE_UP" "BLOODCLOT" "KITTY_KISS"]) diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index a61ac45d..ddd93d95 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 121 + 123 MinimumOSVersion 8.0 LSRequiresIPhoneOS