From f3e09622ed68fad53e934a1caa34d445f24327b5 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 26 Jul 2015 15:53:49 -0700 Subject: [PATCH] tweaks! --- desktop/gametodos.txt | 20 +++ desktop/pom.xml | 165 +++++++++++++++++++++ desktop/resources/testscreen/subject.png | Bin 0 -> 1129 bytes desktop/resources/testscreen/test.png | Bin 0 -> 3073 bytes desktop/src-common/advent/screens/test.clj | 49 ++++++ 5 files changed, 234 insertions(+) create mode 100644 desktop/gametodos.txt create mode 100644 desktop/pom.xml create mode 100644 desktop/resources/testscreen/subject.png create mode 100644 desktop/resources/testscreen/test.png create mode 100644 desktop/src-common/advent/screens/test.clj diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt new file mode 100644 index 00000000..393e0849 --- /dev/null +++ b/desktop/gametodos.txt @@ -0,0 +1,20 @@ ++ Grandma cry? ++ More ways to burn paper ++ drool icon +++ antique position ++ origins are still messed up when scaling ++ loop sounds update every frame instead of each play ++ door open and close animations ++ shitty plates ++ better gross-out animation ++ sudden night befoe switching ++ too small area ++ peddler stuff should be gone at night ++ owl barf effect ++ sack lunch should spoil ++ swinging axe at second doesn't seem right ++ bloodclot isn't hidden at start ++ fight with blergh at end isn't great ++ ending ++ wrong timing for potions ++ secret lever diff --git a/desktop/pom.xml b/desktop/pom.xml new file mode 100644 index 00000000..cb3e6588 --- /dev/null +++ b/desktop/pom.xml @@ -0,0 +1,165 @@ + + 4.0.0 + advent + advent + jar + 0.0.1-SNAPSHOT + advent + FIXME: write description + + src + test + + + resources + + + + + dev-resources + + + resources + + + target + target/classes + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + src-common + + + + + + + + + + central + https://repo1.maven.org/maven2/ + + false + + + true + + + + clojars + https://clojars.org/repo/ + + true + + + true + + + + + + com.badlogicgames.gdx + gdx + 1.5.3 + + + com.badlogicgames.gdx + gdx-backend-lwjgl + 1.5.3 + + + com.badlogicgames.gdx + gdx-box2d + 1.5.3 + + + com.badlogicgames.gdx + gdx-tools + 1.5.3 + + + com.badlogicgames.gdx + gdx-box2d-platform + 1.5.3 + natives-desktop + + + com.badlogicgames.gdx + gdx-bullet + 1.5.3 + + + com.badlogicgames.gdx + gdx-bullet-platform + 1.5.3 + natives-desktop + + + com.badlogicgames.gdx + gdx-platform + 1.5.3 + natives-desktop + + + org.clojure + clojure + 1.6.0 + + + org.clojure + tools.nrepl + 0.2.6 + + + org.clojure + clojure + + + test + + + play-clj + play-clj + 0.4.5-BRYCE + + + org.clojure + data.priority-map + 0.0.5 + + + org.clojure + core.async + 0.1.338.0-5c5012-alpha + + + clojure-complete + clojure-complete + 0.2.3 + + + org.clojure + clojure + + + test + + + + + diff --git a/desktop/resources/testscreen/subject.png b/desktop/resources/testscreen/subject.png new file mode 100644 index 0000000000000000000000000000000000000000..306e44dd30036f0c8142178af0cbb83187be87d4 GIT binary patch literal 1129 zcmV-v1eW`WP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z3Ko#PIn)1DSw{OnqQ&qnb$!J-h)H vG4~=~;}}Qd8E^PtNa77`4Ap1?6ln$kfUyTlby|{|00000NkvXXu0mjfYknhX literal 0 HcmV?d00001 diff --git a/desktop/resources/testscreen/test.png b/desktop/resources/testscreen/test.png new file mode 100644 index 0000000000000000000000000000000000000000..c030f455856d17f8ae48a240c6dc1df57d91f2a8 GIT binary patch literal 3073 zcmeI!`#aMM7y$6^OjGV+Zc&rlDQ74NUzA-3zK-H`1V1#b-p0Ps>65{X73kuY?0L}=KR5CE{u$?+VE81+!G%Z%_VSG6mv z%aw;_F+4H8jr%m8a3HAL5578RHokd(xV-BcUK2BXyrKW9Cw)~SLRJi>JeAs?M{v-T z?Oc7j0D6YP*h2^P%57pt5SMPRCRaz+Ffh&j92S*9wwj5zU3_Pbcy+FrPeW~ne&YoU-!xcouLy}vQpRt57C-u}2J3!|J&q8WsZY$=RS5*aA@4my8b2iua z3&SV{RVQl{U_7Vwr91<+or`D24twPmE)(MLoh)s-z_GU|FPa>p*n|Igz++2m&K`7=(bC53Jh3RqZ8iR zR;QJQH(C5*lcJ_HUfu6NozX=UhQ>S&$RN$-)N$KQ1#s8t^GT|6zv~N5MUMA#x-&?M z*0rD}5L-2Z!N!v`v)-n!4FkHc5!L2^=b)tQb`kUpdIBezz zL+UdcsUke`$<5Mz#UQjo2>~GM@>J1wEup+WO#x>$=r}Q-5cM4Ehd`#-&GRP}ys^QZ}v{uvD{{Khc;yVhvA&cV2aR6jSn*VVeJy=t`TuK{VnqbgV4|*H_Ps&=Ot5G^h3GqY^mH>8WBMTbnJ*Fb z=g%h24Cj}x=>u>%RB+$^fq9PzV zY0iP81M>Ag_#>UAG-y98i}X?{%313otB}r;x~9vTX>h%_Nt3>m4Q0f@XeW+8>LKcI z6A;&lBNx>cDi=zlay~SfEMf|Vr;a66SNheiyh!pfJ8gwdc+h5 zVhvs=BI=38A(ks@JRggLA7a6u!WGKCGo6Rh<0tCrAV148i;t;GZ{78hKueduuL;Ti z8Z9Mw^Ad%nwpp%K<1kl2ey<7@f z#qpgxMxl_aZJ>x&rUj)!R?JURg=%X!V7jOK<`lDii;cwPcMxlC^X8e790CG{pddUu z0I!leB>;#_!Bc=6H59uJ{93;9YZ>*9jXeO23pJ&T3G@x~)J!Ss$^fFw2nRHexwyeh zaDd1Vpdik50CCNCN)gx&VA>t{w*hEA&cy0Q3kB3e2LK6w5cvH9Hd-P91g6=60Ldl^ zNbP9rq~x*$#FQ)n?2g?fi+fJ$+B3PGHzfhZFVgBe1MCRw2>ge@(gv1}Cw5iHY%~Oa nvk+5u7I)`z> literal 0 HcmV?d00001 diff --git a/desktop/src-common/advent/screens/test.clj b/desktop/src-common/advent/screens/test.clj new file mode 100644 index 00000000..5fd16515 --- /dev/null +++ b/desktop/src-common/advent/screens/test.clj @@ -0,0 +1,49 @@ +(ns advent.screens.test + (:require [play-clj.core :refer :all] + [play-clj.math :refer :all] + [play-clj.ui :refer :all] + [play-clj.utils :refer :all] + [play-clj.g2d :refer :all] + [advent.utils :as utils] + [advent.tween :as tween] + [advent.screens.scene :as scene] + [advent.screens.dialogue :as dialogue] + [advent.screens.title :as title] + [advent.screens.inventory :as inventory] + [advent.screens.safe :as safe] + [advent.screens.fade :as fade] + ) + (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter] + [com.badlogic.gdx.graphics.g2d TextureRegion] + [com.badlogic.gdx.utils.viewport FitViewport] + [com.badlogic.gdx.scenes.scene2d.ui Slider$SliderStyle] + [com.badlogic.gdx.scenes.scene2d.utils Align] + [com.badlogic.gdx Application Audio Files Game Gdx Graphics Input + InputMultiplexer InputProcessor Net Preferences Screen])) + + + + + + +(defscreen test-screen + :on-show + (fn [screen entities] + + (utils/setup-viewport screen 320 240) + + {:overlay (assoc (texture "testscreen/test.png" ) :x 0 :y 0 :origin-x 0 :origin-y 0) + :subject (assoc (texture "testscreen/subject.png" ) :x 160 :y 120 :origin-x 7 :origin-y 7 :scale-x 5 :scale-y 5 )}) + + :on-render + (fn [screen [entities]] + + (clear!) + (render! screen [(:overlay entities) (:subject entities)]) + entities) + + :show-screen (fn [entities] + entities) + :on-resize (fn [{:keys [viewport width height]} [entities]] + (.update viewport width height) + nil))