diff --git a/desktop/resources/love.ogg b/desktop/resources/love.ogg new file mode 100644 index 00000000..f671ac7e Binary files /dev/null and b/desktop/resources/love.ogg differ diff --git a/desktop/resources/love.wav b/desktop/resources/love.wav new file mode 100644 index 00000000..5c48c073 Binary files /dev/null and b/desktop/resources/love.wav differ diff --git a/desktop/resources/outsidehouse/outsidehouse.atlas b/desktop/resources/outsidehouse/outsidehouse.atlas new file mode 100644 index 00000000..0a4d0943 --- /dev/null +++ b/desktop/resources/outsidehouse/outsidehouse.atlas @@ -0,0 +1,153 @@ + +outsidehouse.png +size: 1024,1024 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +background + rotate: false + xy: 2, 774 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +background-dark + rotate: false + xy: 2, 532 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +background-trees + rotate: false + xy: 324, 774 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +background-trees-dark + rotate: false + xy: 2, 290 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +cauldron + rotate: false + xy: 646, 250 + size: 200, 38 + orig: 200, 38 + offset: 0, 0 + index: -1 +collision + rotate: false + xy: 324, 532 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +fence + rotate: false + xy: 646, 774 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +fence-dark + rotate: false + xy: 2, 48 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +fg + rotate: false + xy: 324, 290 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +fg1 + rotate: false + xy: 646, 185 + size: 128, 63 + orig: 128, 63 + offset: 0, 0 + index: -1 +fg2 + rotate: false + xy: 776, 187 + size: 59, 61 + orig: 59, 61 + offset: 0, 0 + index: -1 +fgtest + rotate: false + xy: 646, 108 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 +foreground + rotate: false + xy: 646, 532 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +house + rotate: false + xy: 324, 48 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +house-dark + rotate: false + xy: 646, 290 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +lamb + rotate: false + xy: 433, 27 + size: 26, 19 + orig: 26, 19 + offset: 0, 0 + index: -1 +lamb-walk + rotate: false + xy: 848, 260 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 +note + rotate: false + xy: 202, 7 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +sheep + rotate: false + xy: 968, 993 + size: 33, 21 + orig: 33, 21 + offset: 0, 0 + index: -1 +sheep-anim + rotate: false + xy: 2, 25 + size: 429, 21 + orig: 429, 21 + offset: 0, 0 + index: -1 +sheep-walk + rotate: false + xy: 2, 2 + size: 198, 21 + orig: 198, 21 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/outsidehouse/outsidehouse.png b/desktop/resources/outsidehouse/outsidehouse.png new file mode 100644 index 00000000..2af4bc6b Binary files /dev/null and b/desktop/resources/outsidehouse/outsidehouse.png differ diff --git a/desktop/settings.edn b/desktop/settings.edn new file mode 100644 index 00000000..6de83e6a --- /dev/null +++ b/desktop/settings.edn @@ -0,0 +1 @@ +{:sound-volume 84.0, :music-volume 38.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 3d1e18ef..3fbc7c3c 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -297,7 +297,8 @@ :script (actions/get-script entities (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."))}} + :ego "One day, when I'm a knight, I'll ask her to be my girlfriend.") + (actions/transition-music entities :love :duration 1.0))}} :layers {:day [(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)] :night [(assoc (texture "inside-castle/background-dark.png") :x 0 :y 0 :baseline 0)] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 6c37ef27..c58be20f 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -522,6 +522,7 @@ :inside-antique (utils/make-music "inside-antique.ogg") :town-1 (utils/make-music "town-music-1.ogg") :town-2 (utils/make-music "town-music-2.ogg") + :love (utils/make-music "love.ogg") :inside-fangald (utils/make-music "inside-fangald.ogg") :fight (utils/make-music "megaboss.mp3") :pull-sword (utils/make-music "pull-sword.ogg")