From bb954465c238e055a8834bab3674b1511cea84b1 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 30 Oct 2014 11:03:19 -0700 Subject: [PATCH] Revert "beginning process of the card game." This reverts commit 81efd7425a8c1371332480e3fcbdaec2620b041b. --- desktop/resources/cards/bar.png | Bin 1179 -> 0 bytes desktop/resources/cards/heal-big.png | Bin 1706 -> 0 bytes desktop/resources/cards/heal-med.png | Bin 1701 -> 0 bytes desktop/resources/cards/heal-small.png | Bin 1681 -> 0 bytes desktop/resources/cards/health-bar.png | Bin 1176 -> 0 bytes desktop/resources/cards/mana-bar.png | Bin 1176 -> 0 bytes desktop/resources/cards/recharge-big.png | Bin 1720 -> 0 bytes desktop/resources/cards/recharge-med.png | Bin 1712 -> 0 bytes desktop/resources/cards/recharge-small.png | Bin 1683 -> 0 bytes desktop/resources/cards/recharge.png | Bin 1706 -> 0 bytes desktop/src-common/advent/core.clj | 3 +- desktop/src-common/advent/screens/cards.clj | 51 -------------------- desktop/src-common/advent/screens/scene.clj | 2 +- 13 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 desktop/resources/cards/bar.png delete mode 100644 desktop/resources/cards/heal-big.png delete mode 100644 desktop/resources/cards/heal-med.png delete mode 100644 desktop/resources/cards/heal-small.png delete mode 100644 desktop/resources/cards/health-bar.png delete mode 100644 desktop/resources/cards/mana-bar.png delete mode 100644 desktop/resources/cards/recharge-big.png delete mode 100644 desktop/resources/cards/recharge-med.png delete mode 100644 desktop/resources/cards/recharge-small.png delete mode 100644 desktop/resources/cards/recharge.png delete mode 100644 desktop/src-common/advent/screens/cards.clj diff --git a/desktop/resources/cards/bar.png b/desktop/resources/cards/bar.png deleted file mode 100644 index 33bdceca0850cf0969c27108696867e27dca33f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1179 zcmV;M1Z4Y(P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000oNklJd;R0|3yl5COTsAyEJT002ovPDHLkV1i;_FSq~z diff --git a/desktop/resources/cards/heal-big.png b/desktop/resources/cards/heal-big.png deleted file mode 100644 index 810b639f4f783ce2edaae545e0ad1ea6ec6a89a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1706 zcmV;b237fqP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006(Nkl+|*bEjzZwrYjkM&+Eft0f>vAEahO_w{y(JWt_lpd%Qcm34B>Q=ZO~EDS*1eiI7diwI`8gBtuM8JU% zj>Ptru+4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006!NklwERvx9eRlQweDD4DU*cc>2YvV6 z_wG68pZC6s2>|%-@>{yI9jJF_mAa+1J zhF|ZU@jiQuE%Gf84lqGhVKKd%CcOVwvo_j&dc~I#Yl9sQ{@~g&JhRgX(vUO3KmbfGasMA$d0GQK}q`0!}X~15GFhU!%OV zhmh`muQJ)^%K@M$yesegu3tAq`>S0SbX%bnfJB^pwtOIHY>7z|V${|s8y>X+aB1zc z3EuRK7}x#0k>3?D!O$G#E~D`bARvms3mu^tiSeRbB!6!-$7`lIP(ZJ_eBBEv|r diff --git a/desktop/resources/cards/heal-small.png b/desktop/resources/cards/heal-small.png deleted file mode 100644 index bf21e3f21fd355af396a147f519955bac978250e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1681 zcmV;C25$L@P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006gNklQ=IQk2^NF54p1))wI z1d+Oki-@z6qf^ID9i5y-9CQ#B5ga;sQ#V1x;-G`8#X=Q}Q17LEC6~VBl304n9bA+5 z^74IOz9elk0MHNL#GWiN?>4s+5pY~Qg_%T{CDK$t>VUWfA5U%RSWLH@Zb9lm>VUY0 zKcBtn-aUye@huPzNP?`owZZ{gSADFrc~jC$00OFHORYtKyorh*^WFm41wqc^$7a0* zsH;bohx~Ia8CT#XfCKW)B`!c5!p>{QeE|gkd7j*N0ZZJ0RDhQQhwHVmZC>dW$8t6a zr*A?c-oL3vuacgt|N3!&lxsi$Whg=8H=q>T8XfQ@Cnh8>XG;{atx>?)#bsm?3c`1ik5&K@ zarU98xK+sl<6O|*0&evP%!!f-UHe)GI3Sk5!RE5@+z0{P_bv~d8>EBpc0>fmE{_&J1Tk*G_1hi5&YIvtQhJG;b0(4t z=L!s(z_dmISTBp9`9z{RgX1H2EXc7wRsa^MB1R4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000lNkl6D#Wg diff --git a/desktop/resources/cards/mana-bar.png b/desktop/resources/cards/mana-bar.png deleted file mode 100644 index 3a784f98bac22c03e7b6810097e5c2420400fe0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1176 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 diff --git a/desktop/resources/cards/recharge.png b/desktop/resources/cards/recharge.png deleted file mode 100644 index 810b639f4f783ce2edaae545e0ad1ea6ec6a89a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1706 zcmV;b237fqP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006(Nkl+|*bEjzZwrYjkM&+Eft0f>vAEahO_w{y(JWt_lpd%Qcm34B>Q=ZO~EDS*1eiI7diwI`8gBtuM8JU% zj>Ptru+! >!! chan go thread take! alts!!]] - ) - (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter] - [com.badlogic.gdx.graphics.g2d TextureRegion] - [com.badlogic.gdx.scenes.scene2d.utils Align] - [com.badlogic.gdx Screen])) - -(def min-x (+ 16 (* 320 0.1))) -(defscreen card-screen - :on-show - (fn [screen entities] - (update! screen :renderer (stage) :camera (orthographic)) - {:all-cards {:heal-big (texture "cards/heal-big.png") - :heal-med (texture "cards/heal-med.png") - :heal-small (texture "cards/heal-small.png") - :recharge-big (texture "cards/recharge-big.png") - :recharge-med (texture "cards/recharge-med.png") - :recharge-small (texture "cards/recharge-small.png")} - :health-bar (texture "cards/health-bar.png") - :mana-bar (texture "cards/mana-bar.png") - :bar (texture "cards/bar.png") - :player {:hp 65 - :mana 50 - :hand [:heal-big :heal-small :recharge-big :recharge-big :recharge-big]}}) - - :on-render - (fn [screen [entities]] - (let [player-hand (for [[c index] (map vector (get-in entities [:player :hand]) (range))] - (assoc (get-in entities [:all-cards c]) :x (+ min-x (* index 50)) :y 32)) - player-health (assoc (get-in entities [:health-bar]) - :x min-x - :y 16 - :width (* (/ (get-in entities [:player :hp]) 100.0) 50)) - player-mana (assoc (get-in entities [:mana-bar]) - :x min-x - :y 5 - :width (get-in entities [:player :mana]))] - (render! screen player-hand) - (render! screen [player-health (assoc (get-in entities [:bar] ) :x min-x :y 16)]) - (render! screen [player-mana (assoc (get-in entities [:bar] ) :x min-x :y 5)])) - entities) - - :on-resize (fn [screen entities] - (size! screen 320 240))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f586e6b7..bc2daa6a 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -154,7 +154,7 @@ (update! screen :renderer (stage) :camera (orthographic)) (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) music (sound "town-music.mp3") - _ (sound! music :loop 0.30) + ;;_ (sound! music :loop 0.30) rooms {:inside-house (rooms.inside-house/make screen) :outside-house (rooms.outside-house/make screen) :behind-house (rooms.behind-house/make screen)