notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-09-14 10:14:24 -07:00
parent f26ce72bff
commit bf9e2a059b
5 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/gametodos.txt
View File

@@ -14,6 +14,7 @@ IOS
+ particle effects slowdown? + particle effects slowdown?
+ pngcrush breaks colors + pngcrush breaks colors
+ renable pickup sound once it's been replaced + renable pickup sound once it's been replaced
+ check out 64 bit?
AUDIO AUDIO
+ Walking + Walking

65
desktop/resources/packed/pack.atlas
View File

@@ -81,20 +81,6 @@ cat-tree/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ego/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
outsidehouse/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
dream/dot dream/dot
rotate: false rotate: false
xy: 729, 621 xy: 729, 621
@@ -102,21 +88,7 @@ dream/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-antique/dot ego/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
title/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-house/dot
rotate: false rotate: false
xy: 729, 621 xy: 729, 621
size: 1, 1 size: 1, 1
@@ -130,6 +102,27 @@ inside-jail/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-antique/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-house/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
outsidehouse/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
wizard/dot wizard/dot
rotate: false rotate: false
xy: 729, 621 xy: 729, 621
@@ -137,6 +130,13 @@ wizard/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
title/dot
rotate: false
xy: 729, 621
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
cat-tree/monocle cat-tree/monocle
rotate: false rotate: false
xy: 202, 3 xy: 202, 3
@@ -619,6 +619,13 @@ cloud
orig: 15, 15 orig: 15, 15
offset: 0, 0 offset: 0, 0
index: -1 index: -1
space/cloud
rotate: false
xy: 1007, 186
size: 15, 15
orig: 15, 15
offset: 0, 0
index: -1
dream/cliff dream/cliff
rotate: false rotate: false
xy: 494, 638 xy: 494, 638

6
desktop/src-common/advent/screens/fade.clj
View File

@@ -20,8 +20,10 @@
(utils/setup-viewport screen 320 240) (utils/setup-viewport screen 320 240)
{:fade (assoc (utils/get-texture "black.png") {:fade (assoc (utils/get-texture "black.png")
:scale-x 80 :scale-x 100
:scale-y 80 :scale-y 100
:x -1
:y -1
:opacity 0.0 :opacity 0.0
:origin-x 0 :origin-x 0
:origin-y 0)}) :origin-y 0)})

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

@@ -14,7 +14,7 @@
[play-clj.g2d :refer :all]) [play-clj.g2d :refer :all])
(:import [com.badlogic.gdx.graphics Color])) (:import [com.badlogic.gdx.graphics Color]))
(defn go-to-jail [entities] (defn go-to-jail [entities & [time]]
(actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %)))) (actions/update-state entities #(assoc % :chest-contents (concat (remove #{:key :ladder} (:inventory %)) (:chest-contents %))))
(actions/update-state entities #(assoc % :inventory [])) (actions/update-state entities #(assoc % :inventory []))
@@ -22,7 +22,8 @@
(actions/transition-background entities :inside-jail [130 85] :between (fn [s e] (actions/transition-background entities :inside-jail [130 85] :between (fn [s e]
(-> e (-> e
(assoc-in [:state :time] :night) (assoc-in [:state :time] :night)
(update-in [:room :entities :ego] #(actions/start-animation s % :crawl-stand))))) (update-in [:room :entities :ego] #(actions/start-animation s % :crawl-stand))))
:time time)
(actions/play-animation entities :ego :standup)) (actions/play-animation entities :ego :standup))
(defn make-wizard [screen wizard-spec] (defn make-wizard [screen wizard-spec]

16
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -36,7 +36,10 @@
((actions/get-script entities ((actions/get-script entities
(sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume)) (sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume))
(actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/play-animation entities :bloodclot-head :shoot :stop? false)
(actions/update-entity entities :lightning #(assoc % :opacity 1.0))
(actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/begin-animation entities :bloodclot-head :keep-shoot)
(Thread/sleep 2000)
(actions/update-entity entities :lightning #(assoc % :opacity 0.0))
(actions/do-dialogue entities :bloodclot-head "Dang! Come a little closer!")) (actions/do-dialogue entities :bloodclot-head "Dang! Come a little closer!"))
entities)) entities))
nil) nil)
@@ -184,6 +187,7 @@
bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7])
effect (particle-effect "particles/appear") effect (particle-effect "particles/appear")
blowup-effect (particle-effect "particles/blowup") blowup-effect (particle-effect "particles/blowup")
lightning-effect (particle-effect "particles/lightning")
grow-explode (particle-effect "particles/grow-explode")] grow-explode (particle-effect "particles/grow-explode")]
(rooms/make :music :fight (rooms/make :music :fight
:interactions :interactions
@@ -204,6 +208,10 @@
:blowup (assoc blowup-effect :blowup (assoc blowup-effect
:x 225 :y 175 :x 225 :y 175
:baseline 240) :baseline 240)
:lightning (assoc lightning-effect
:x 225 :y 160
:baseline 240
:opacity 0.0)
:bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim) :bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim)
:x 195 :y 138 :baseline 195 :x 195 :y 138 :baseline 195
:opacity 0.0 :opacity 0.0
@@ -224,7 +232,9 @@
:script (actions/get-script entities :script (actions/get-script entities
(actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!")) (actions/do-dialogue entities
:bloodclot-head "No time to talk."
:bloodclot-head "It's lunch time."))
:scripts {:sword (actions/get-script entities :scripts {:sword (actions/get-script entities
(if (actions/has-item? entities :magic-slingshot) (if (actions/has-item? entities :magic-slingshot)
(if (get-in @entities [:state :broke-jewel?]) (if (get-in @entities [:state :broke-jewel?])
@@ -246,8 +256,10 @@
(sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume)) (sound! (utils/load-sound "space/shock.ogg") :play (utils/current-sound-volume))
(actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/play-animation entities :bloodclot-head :shoot :stop? false)
(actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/begin-animation entities :bloodclot-head :keep-shoot)
(actions/update-entity entities :lightning #(assoc % :opacity 1.0))
(actions/play-animation entities :ego :shock :stop? false) (actions/play-animation entities :ego :shock :stop? false)
(actions/begin-animation entities :bloodclot-head :stand) (actions/begin-animation entities :bloodclot-head :stand)
(actions/update-entity entities :lightning #(assoc % :opacity 0.0))
(actions/play-animation entities :ego :burnt :stop? false) (actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true) (actions/play-animation entities :ego :passed-out :continue? true)
(actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him." (actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him."
@@ -256,7 +268,7 @@
:bloodclot-head "And THEN the feast will begin." :bloodclot-head "And THEN the feast will begin."
:bloodclot-head "Starting with his precious Georgia McGorgeous.") :bloodclot-head "Starting with his precious Georgia McGorgeous.")
(bloodclot-disappear entities) (bloodclot-disappear entities)
(common/go-to-jail entities) (common/go-to-jail entities 5.0)
(actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!")))) (actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!"))))
:magic-slingshot (actions/get-script entities :magic-slingshot (actions/get-script entities
(actions/do-dialogue entities (actions/do-dialogue entities