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

removing unnecessary dark images

Browse Source
This commit is contained in:
Remington Covert
2015-05-05 17:17:57 -07:00
parent e233c67004
commit 5e0ebc8f48
29 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,11 @@
(assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)
(assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5)
(assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]
:night [(assoc (texture "behindhouse/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "behindhouse/house-dark.png") :x 0 :y 0 :baseline 122)
(assoc (texture "behindhouse/brush-dark.png") :x 0 :y 0 :baseline 240)]}
:night [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122)
(assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)
(assoc (texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5)
(assoc (texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]}
:entities {:stick (assoc (texture "behindhouse/stick.png")
:x 26 :y 80 :baseline 160
:script (actions/get-script entities

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

@@ -77,6 +77,7 @@
:x 215 :y 90 :baseline 150
:anim stand
:anim-start 0
:night-profile :sprite
:scale-x 1.4
:scale-y 1.4
:talk-color (color 0.6 0.2 0.6 1.0)
@@ -95,6 +96,7 @@
:x 244 :y 102 :baseline 138
:scale-x 1.4
:scale-y 1.4
:night-profile :sprite
:anim stand
:anim-start 0
:stand stand)))
@@ -106,6 +108,7 @@
:scale-x 1.4
:scale-y 1.4
:anim stand
:night-profile :sprite
:anim-start 0
:stand stand)))
@@ -140,8 +143,8 @@
(actions/remove-item entities :walkie-talkies)
(actions/walk-straight-to entities :ego [285 71]))}}}
:layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0)]
:night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0)]}
:layers {:day [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)]
:night [(assoc (texture "castle-gate/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)]}
:entities {:frankie (make-frankie screen)
:goon-1 (make-goon-1 screen)
:goon-2 (make-goon-2 screen)}

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

@@ -255,10 +255,10 @@
(assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161)
(assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240)
(assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]
:night [(assoc (texture "cat-tree/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "cat-tree/tree-and-rock-dark.png") :x 0 :y 0 :baseline 161)
(assoc (texture "cat-tree/brush-l-dark.png") :x -5 :y -5 :parallax 1.3 :baseline 240)
(assoc (texture "cat-tree/tree-r-dark.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]}
:night [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161)
(assoc (texture "cat-tree/brush-l.png") :x -5 :y -5 :parallax 1.3 :baseline 240)
(assoc (texture "cat-tree/tree-r.png") :x 270 :y 0 :scale-x 1.1 :scale-y 1.1 :parallax 1.5 :baseline 240)]}
:entities {:cat (actions/start-animation screen
(assoc (animation->texture screen cat-stand)
:x 184 :y 173 :baseline 1000
@@ -322,6 +322,7 @@
:talk-color (color 0.5 0.5 1.0 1.0)
:anim owl-stand
:anim-start 0
:night-profile :none
:script (actions/get-script entities (talk-to-owl entities))
:scripts #(condp = %
:monocle (actions/get-script entities (give-monocle entities))

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

@@ -319,11 +319,12 @@
:layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97)
(assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]
:night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-castle/way-back-tree-dark.png") :x 0 :y 0 :baseline 97)]
:night [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97)
(assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]
:sunrise [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]}
(assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97)
(assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]}
:blackout (assoc (texture "black.png")
:x 0 :y 0
:width 320

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

@@ -62,9 +62,10 @@
:scripts {:sword (actions/get-script entities (actions/talk entities :ego "There's not enough room to swing my sword here."))
:crowbar (actions/get-script entities
(bust-chest entities))}}}
:layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0)]
:layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)]
:entities {:lid (assoc (texture "inside-stash/lid.png")
:x 156 :y 116 :baseline 125)}
:x 156 :y 116 :baseline 125 :night-profile :none)
}
:collision "inside-stash/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)
:start-pos [143 96]

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

@@ -297,12 +297,12 @@
:layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]
:night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush-dark.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind-dark.png") :x 0 :y 0 :baseline 240)]
:night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]}
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]}
:entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:anim-sound-frames {peddler-stand {23 [:scratch 1.0]}
@@ -331,26 +331,27 @@
:stand)
:steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80
:stand steer-stand
:script (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
:ego "It's Angus, Remington's buff bull."
:ego "He's used in all of the town's rodeos."
:ego "Farmer Doug feeds him an exclusive wild high-protein grass diet to keep him in tip top shape."
:ego "He looks mean, I'd rather not pet him."))
:scripts #(condp = %
:grass (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities :slobber))
:carrot (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
:ego "I don't thing Angus is interested."
:ego "Farmer Doug only feeds him a wild high-protein grass."))
nil))
:night-profile :sprite
:script (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
:ego "It's Angus, Remington's buff bull."
:ego "He's used in all of the town's rodeos."
:ego "Farmer Doug feeds him an exclusive wild high-protein grass diet to keep him in tip top shape."
:ego "He looks mean, I'd rather not pet him."))
:scripts #(condp = %
:grass (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities :slobber))
:carrot (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
:ego "I don't thing Angus is interested."
:ego "Farmer Doug only feeds him a wild high-protein grass."))
nil))
:stand)
:balloons (actions/start-animation screen
(assoc (animation->texture screen balloon-stand)

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

@@ -175,8 +175,8 @@
(actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}}
:layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]
:night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-jail/fountain-dark.png") :x 0 :y 0 :baseline 114)]}
:night [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]}
:entities {:warden {:object nil
:x 36
:y 86
@@ -188,18 +188,20 @@
(particle-effect! :start))
:x 172
:y 140
:baseline 114)}
:baseline 114)
:axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite)}
[:axe :day] (rooms/make-entity :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176))
[:axe :night] (rooms/make-entity :axe (assoc (texture "outside-jail/axe-dark.png") :x 213 :y 63 :baseline 176))
:guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand)
:x 70 :y 55 :baseline 185
:stand guard-stand
:talk guard-talk
:sleep guard-sleep
:script (actions/get-script entities (search-guard entities))))
:script (actions/get-script entities (search-guard entities))
:night-profile :sprite))
:rope (rooms/make-entity :rope (assoc (texture "outside-jail/rope.png")
:x 14 :y 20 :baseline 1))
:x 14 :y 20 :baseline 1 :night-profile :sprite))
:spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png")
:x 60 :y 65 :baseline 180
:script (actions/get-script entities (grab-spear entities))))
@@ -221,7 +223,6 @@
:start-pos [145 15]
:apply-state (fn [entities]
(as-> entities entities
(assoc-in entities [:room :entities :axe] (get-in entities [:room [:axe (get-in entities [:state :time])]]))
(if (= :night (get-in entities [:state :time]))
(make-night entities)
entities)

7
desktop/src-common/advent/screens/scene.clj
View File

@@ -647,7 +647,7 @@ void main()
(update-fn screen entities)
entities))
(defn render-parallax [{:keys [^OrthographicCamera camera ^Stage renderer ^ShaderProgram shader] :as screen} {:keys [parallax] :as e }]
(defn render-parallax [{:keys [^OrthographicCamera camera ^Stage renderer ^ShaderProgram shader] :as screen} {:keys [parallax ^float multiply-amount ^float hue-amount] :as e }]
(let [tmp (Vector3.)
tmp2 (Vector3.)
@@ -670,7 +670,10 @@ void main()
(.begin batch)
(.setProjectionMatrix batch parallax-combined)
(.setShader batch shader)
(when shader
(.setUniformf shader "multiply_amount" (float (or multiply-amount 1.0)))
(.setUniformf shader "hue_amount" (float (or hue-amount 1.0))))
(.setColor batch (color (:r e 1.0) (:g e 1.0) (:b e 1.0) (:opacity e 1.0)))