diff --git a/desktop/resources/behindhouse/backgroudn.psd b/desktop/resources/behindhouse/backgroudn.psd index 6d4308f7..b0ac1f15 100644 Binary files a/desktop/resources/behindhouse/backgroudn.psd and b/desktop/resources/behindhouse/backgroudn.psd differ diff --git a/desktop/resources/behindhouse/background-dark.png b/desktop/resources/behindhouse/background-dark.png new file mode 100644 index 00000000..646bacbf Binary files /dev/null and b/desktop/resources/behindhouse/background-dark.png differ diff --git a/desktop/resources/behindhouse/brush-dark.png b/desktop/resources/behindhouse/brush-dark.png new file mode 100644 index 00000000..230cdfa4 Binary files /dev/null and b/desktop/resources/behindhouse/brush-dark.png differ diff --git a/desktop/resources/behindhouse/house-dark.png b/desktop/resources/behindhouse/house-dark.png new file mode 100644 index 00000000..0112129c Binary files /dev/null and b/desktop/resources/behindhouse/house-dark.png differ diff --git a/desktop/resources/cat-tree/background-dark.png b/desktop/resources/cat-tree/background-dark.png new file mode 100644 index 00000000..3ac17740 Binary files /dev/null and b/desktop/resources/cat-tree/background-dark.png differ diff --git a/desktop/resources/cat-tree/background.psd b/desktop/resources/cat-tree/background.psd index f951bdfb..0e36758a 100644 Binary files a/desktop/resources/cat-tree/background.psd and b/desktop/resources/cat-tree/background.psd differ diff --git a/desktop/resources/cat-tree/sillhoute-dark.png b/desktop/resources/cat-tree/sillhoute-dark.png new file mode 100644 index 00000000..7d0a6985 Binary files /dev/null and b/desktop/resources/cat-tree/sillhoute-dark.png differ diff --git a/desktop/resources/cat-tree/tree-and-rock-dark.png b/desktop/resources/cat-tree/tree-and-rock-dark.png new file mode 100644 index 00000000..3c76e747 Binary files /dev/null and b/desktop/resources/cat-tree/tree-and-rock-dark.png differ diff --git a/desktop/resources/inside-castle/background-dark.png b/desktop/resources/inside-castle/background-dark.png new file mode 100644 index 00000000..f6f4b90b Binary files /dev/null and b/desktop/resources/inside-castle/background-dark.png differ diff --git a/desktop/resources/inside-castle/pedestal-overlay-dark.png b/desktop/resources/inside-castle/pedestal-overlay-dark.png new file mode 100644 index 00000000..8d72d58c Binary files /dev/null and b/desktop/resources/inside-castle/pedestal-overlay-dark.png differ diff --git a/desktop/resources/outside-castle/background-dark.png b/desktop/resources/outside-castle/background-dark.png new file mode 100644 index 00000000..282130c1 Binary files /dev/null and b/desktop/resources/outside-castle/background-dark.png differ diff --git a/desktop/resources/outside-castle/background.psd b/desktop/resources/outside-castle/background.psd index be5d3339..254209d2 100644 Binary files a/desktop/resources/outside-castle/background.psd and b/desktop/resources/outside-castle/background.psd differ diff --git a/desktop/resources/outsidehouse/background-dark.png b/desktop/resources/outsidehouse/background-dark.png new file mode 100644 index 00000000..3c5b6bfb Binary files /dev/null and b/desktop/resources/outsidehouse/background-dark.png differ diff --git a/desktop/resources/outsidehouse/background-trees-dark.png b/desktop/resources/outsidehouse/background-trees-dark.png new file mode 100644 index 00000000..897d1794 Binary files /dev/null and b/desktop/resources/outsidehouse/background-trees-dark.png differ diff --git a/desktop/resources/background-trees.png b/desktop/resources/outsidehouse/background-trees.png similarity index 100% rename from desktop/resources/background-trees.png rename to desktop/resources/outsidehouse/background-trees.png diff --git a/desktop/resources/outsidehouse/bg5.png b/desktop/resources/outsidehouse/background.png similarity index 100% rename from desktop/resources/outsidehouse/bg5.png rename to desktop/resources/outsidehouse/background.png diff --git a/desktop/resources/outsidehouse/background.psd b/desktop/resources/outsidehouse/background.psd index 5ec2c5eb..a4c9ce56 100644 Binary files a/desktop/resources/outsidehouse/background.psd and b/desktop/resources/outsidehouse/background.psd differ diff --git a/desktop/resources/outsidehouse/fence-dark.png b/desktop/resources/outsidehouse/fence-dark.png new file mode 100644 index 00000000..93572872 Binary files /dev/null and b/desktop/resources/outsidehouse/fence-dark.png differ diff --git a/desktop/resources/outsidehouse/house-dark.png b/desktop/resources/outsidehouse/house-dark.png new file mode 100644 index 00000000..9b6f28f5 Binary files /dev/null and b/desktop/resources/outsidehouse/house-dark.png differ diff --git a/desktop/resources/house.png b/desktop/resources/outsidehouse/house.png similarity index 100% rename from desktop/resources/house.png rename to desktop/resources/outsidehouse/house.png diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index a48c5581..a37e7e2e 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -40,9 +40,12 @@ (actions/do-dialogue entities :ego "I can see Gandarf moving around in the corner of the room." :ego "It's hard to make out from this angle."))}} - :layers [(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)] + :layers {:day [(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)] + :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)]} :entities {:stick (assoc (texture "behindhouse/stick.png") :x 26 :y 80 :baseline 160 :script (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index b2e3796f..5232b88b 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -144,9 +144,12 @@ (actions/walk-to entities :ego [165 45] :face :left) (actions/do-dialogue entities :grandma "No thank you, handsome."))) }} - :layers [(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/sillhoute.png") :x 0 :y 0 :baseline 240)] + :layers {:day [(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/sillhoute.png") :x 0 :y 0 :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/sillhoute-dark.png") :x 0 :y 0 :baseline 240)]} :entities {:cat (actions/start-animation screen (assoc (animation->texture screen cat-stand) :x 184 :y 173 :baseline 1000 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 1a993716..800ad794 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -223,8 +223,10 @@ (actions/do-dialogue entities :ego "That's Georgia McGorgeous' house." :ego "One day, when I'm a knight, I'll ask her to be my girlfriend."))}} - :layers [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) - (assoc (texture "inside-castle/pedestal-overlay.png") :x 0 :y 0 :baseline 135)] + :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "inside-castle/pedestal-overlay.png") :x 0 :y 0 :baseline 135)] + :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "inside-castle/pedestal-overlay-dark.png") :x 0 :y 0 :baseline 135)]} :blackout (assoc (texture "black.png") :x 0 :y 0 :width 320 diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 2f2a9c62..ac6406a7 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -185,7 +185,8 @@ (actions/do-dialogue entities :ego "Are you interested in this?" :peddler "No, I have no use for it.")))}} - :layers [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)] + :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)] + :night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)]} :entities {:peddler (actions/start-animation screen (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil :talk peddler-talk :stand peddler-stand diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index f18c8a15..06312fb6 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -158,11 +158,16 @@ (actions/walk-straight-to entities :ego [310 80]) ) :cursor :left}} - :layers [(assoc (texture "outsidehouse/bg5.png") :x 0 :y 0 :baseline 0) - (assoc (texture "house.png") :x 0 :y 0 :baseline 122) - (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 95) - - (assoc (texture "background-trees.png") :x 0 :y 0 :baseline 44)] + :layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122) + (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 95) + + (assoc (texture "outsidehouse/background-trees.png") :x 0 :y 0 :baseline 44)] + :night [(assoc (texture "outsidehouse/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outsidehouse/house-dark.png") :x 0 :y 0 :baseline 122) + (assoc (texture "outsidehouse/fence-dark.png") :x 0 :y 0 :baseline 95) + + (assoc (texture "outsidehouse/background-trees-dark.png") :x 0 :y 0 :baseline 44)]} :entities {:sheep (actions/start-animation screen (assoc (animation->texture screen sheep-stand) :x 38 :y 160 :baseline 160 :box [38 160 71 181]