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

more fun animations.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-03 20:05:44 -07:00
parent e47afef20a
commit 32acd489c2
21 changed files with 842 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/gametodos.txt
View File

@@ -4,10 +4,8 @@
+ ending
+ proper save/settings file location
+ closing should stop all scripts
+ night gandarf text is bad
+ descriptions for all items when used on self.
+ revamp text
+ gandarf animation
+ alternate solutions to puzzle in jail (strength potion etc)
+ have warden wake up when you drop the cannonball
+ Opening should include dialogue tree
@@ -15,3 +13,5 @@
+ fire mints "Specialty fire mints, hand delivered by Gandarf!"
+ Test new gandarf dialogue
+ sometimes you can walk on stuff

BIN
desktop/resources/ego/fire.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
desktop/resources/ego/fire.pxa/0.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/1.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/10.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/11.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/2.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/3.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/4.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/5.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/6.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/7.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/8.pxi
View File

Binary file not shown.

BIN
desktop/resources/ego/fire.pxa/9.pxi
View File

Binary file not shown.

BIN
desktop/resources/inside-antique/dot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

339
desktop/resources/inside-antique/fire-particle Normal file
View File

@@ -0,0 +1,339 @@
Untitled
- Delay -
active: true
lowMin: 2000.0
lowMax: 2000.0
- Duration -
lowMin: 800.0
lowMax: 800.0
- Count -
min: 0
max: 500
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 10.0
highMax: 10.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 500.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 8.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 0.1632653
scaling2: 0.63265306
scaling3: 0.4489796
timelineCount: 4
timeline0: 0.0
timeline1: 0.26027396
timeline2: 0.31506848
timeline3: 0.6164383
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 20.0
highMax: 20.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 15.0
highMax: 0.0
relative: true
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.42465752
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 50.0
relative: false
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.4520548
- Tint -
colorsCount: 6
colors0: 1.0
colors1: 1.0
colors2: 1.0
colors3: 0.21176471
colors4: 0.21176471
colors5: 0.21176471
timelineCount: 2
timeline0: 0.0
timeline1: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.01754386
scaling1: 1.0
scaling2: 0.8947368
scaling3: 0.14035088
timelineCount: 4
timeline0: 0.0
timeline1: 0.0890411
timeline2: 0.5890411
timeline3: 1.0
- Options -
attached: false
continuous: false
aligned: false
additive: false
behind: false
premultipliedAlpha: false
- Image Path -
dot.png
Untitled
- Delay -
active: true
lowMin: 2000.0
lowMax: 2000.0
- Duration -
lowMin: 800.0
lowMax: 800.0
- Count -
min: 0
max: 200
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 75.0
highMax: 75.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 1000.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.3
timelineCount: 3
timeline0: 0.0
timeline1: 0.66
timeline2: 1.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 6.0
highMax: 10.0
relative: false
scalingCount: 6
scaling0: 0.0
scaling1: 0.26530612
scaling2: 0.9183673
scaling3: 0.4489796
scaling4: 0.53061223
scaling5: 0.0
timelineCount: 6
timeline0: 0.0
timeline1: 0.14383562
timeline2: 0.30136988
timeline3: 0.5273973
timeline4: 0.8561644
timeline5: 1.0
- Velocity -
active: true
lowMin: 10.0
lowMax: 10.0
highMin: 300.0
highMax: 1000.0
relative: false
scalingCount: 6
scaling0: 0.0
scaling1: 1.0
scaling2: 0.12244898
scaling3: 0.36734694
scaling4: 0.12244898
scaling5: 0.0
timelineCount: 6
timeline0: 0.0
timeline1: 0.15753424
timeline2: 0.19863014
timeline3: 0.32876712
timeline4: 0.42465752
timeline5: 1.0
- Angle -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: -15.0
highMax: 15.0
relative: true
scalingCount: 3
scaling0: 0.0
scaling1: 1.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.5410959
timeline2: 1.0
- Rotation -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: true
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 1.0
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 30.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Tint -
colorsCount: 9
colors0: 1.0
colors1: 1.0
colors2: 1.0
colors3: 1.0
colors4: 1.0
colors5: 1.0
colors6: 0.0
colors7: 0.0
colors8: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.19104992
timeline2: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 1.0
scaling2: 0.7368421
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.2
timeline2: 0.8082192
timeline3: 1.0
- Options -
attached: false
continuous: false
aligned: true
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
fire-particle.png

BIN
desktop/resources/inside-antique/fire-particle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

325
desktop/resources/inside-antique/outside-particle Normal file
View File

@@ -0,0 +1,325 @@
Untitled
- Delay -
active: false
- Duration -
lowMin: 1000.0
lowMax: 1000.0
- Count -
min: 0
max: 500
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 10.0
highMax: 10.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 500.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 8.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 0.1632653
scaling2: 0.63265306
scaling3: 0.4489796
timelineCount: 4
timeline0: 0.0
timeline1: 0.26027396
timeline2: 0.31506848
timeline3: 0.6164383
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 20.0
highMax: 20.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 15.0
highMax: 0.0
relative: true
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.42465752
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 50.0
relative: false
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.4520548
- Tint -
colorsCount: 6
colors0: 1.0
colors1: 1.0
colors2: 1.0
colors3: 0.21176471
colors4: 0.21176471
colors5: 0.21176471
timelineCount: 2
timeline0: 0.0
timeline1: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.01754386
scaling1: 1.0
scaling2: 0.8947368
scaling3: 0.14035088
timelineCount: 4
timeline0: 0.0
timeline1: 0.0890411
timeline2: 0.5890411
timeline3: 1.0
- Options -
attached: false
continuous: true
aligned: false
additive: false
behind: false
premultipliedAlpha: false
- Image Path -
dot.png
Untitled
- Delay -
active: false
- Duration -
lowMin: 3000.0
lowMax: 3000.0
- Count -
min: 0
max: 200
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 75.0
highMax: 75.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 1000.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.3
timelineCount: 3
timeline0: 0.0
timeline1: 0.66
timeline2: 1.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 6.0
highMax: 10.0
relative: false
scalingCount: 6
scaling0: 0.0
scaling1: 0.26530612
scaling2: 0.9183673
scaling3: 0.4489796
scaling4: 0.53061223
scaling5: 0.0
timelineCount: 6
timeline0: 0.0
timeline1: 0.14383562
timeline2: 0.30136988
timeline3: 0.5273973
timeline4: 0.8561644
timeline5: 1.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 100.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 10.0
highMax: 15.0
relative: true
scalingCount: 3
scaling0: 0.0
scaling1: 1.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.5410959
timeline2: 1.0
- Rotation -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: true
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 1.0
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 30.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Tint -
colorsCount: 9
colors0: 1.0
colors1: 1.0
colors2: 1.0
colors3: 1.0
colors4: 1.0
colors5: 1.0
colors6: 0.0
colors7: 0.0
colors8: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.19104992
timeline2: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 1.0
scaling2: 0.7368421
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.2
timeline2: 0.8082192
timeline3: 1.0
- Options -
attached: false
continuous: true
aligned: true
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
fire-particle.png

152
desktop/resources/inside-antique/smoke-particle Normal file
View File

@@ -0,0 +1,152 @@
Untitled
- Delay -
active: true
lowMin: 1500.0
lowMax: 1500.0
- Duration -
lowMin: 400.0
lowMax: 400.0
- Count -
min: 0
max: 500
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 20.0
highMax: 20.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 500.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: point
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 8.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 0.1632653
scaling2: 0.63265306
scaling3: 0.4489796
timelineCount: 4
timeline0: 0.0
timeline1: 0.26027396
timeline2: 0.31506848
timeline3: 0.6164383
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 20.0
highMax: 30.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: true
lowMin: 0.0
lowMax: -20.0
highMin: 15.0
highMax: 0.0
relative: true
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.42465752
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 30.0
highMax: 50.0
relative: false
scalingCount: 2
scaling0: 0.0
scaling1: 1.0
timelineCount: 2
timeline0: 0.0
timeline1: 0.4520548
- Tint -
colorsCount: 6
colors0: 1.0
colors1: 1.0
colors2: 1.0
colors3: 0.21176471
colors4: 0.21176471
colors5: 0.21176471
timelineCount: 2
timeline0: 0.0
timeline1: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 4
scaling0: 0.01754386
scaling1: 1.0
scaling2: 0.8947368
scaling3: 0.14035088
timelineCount: 4
timeline0: 0.0
timeline1: 0.0890411
timeline2: 0.5890411
timeline3: 1.0
- Options -
attached: false
continuous: false
aligned: false
additive: false
behind: false
premultipliedAlpha: false
- Image Path -
dot.png

2
desktop/settings.edn
View File

@@ -1 +1 @@
{:sound-volume 82.0, :music-volume 86.0}
{:sound-volume 82.0, :music-volume 33.0}

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

@@ -30,7 +30,7 @@
"Is there anything here you will sell?"
{:run #(actions/respond entities %
:shopkeep "No."
:shopkeep "But I do have some free magical fire mints that Gandarf brewed up."
:shopkeep "But I do have some free magical lava mints that Gandarf brewed up."
:shopkeep "Careful! They're spicy.")
:choices actions/previous-choices}
"So in order to continue on my quest, I'll need to solve some puzzle here?"
@@ -210,6 +210,12 @@
:x 70
:y 86
:baseline 120)
:smoke-particle (doto (assoc (particle-effect "inside-antique/smoke-particle") :x 162 :y 108
:baseline 240)
(particle-effect! :set-position 162 108))
:fire-particle (doto (assoc (particle-effect "inside-antique/fire-particle") :x 162 :y 108
:baseline 240)
(particle-effect! :set-position 162 108))
:bowl (assoc (texture "inside-antique/bowl.png")
:x 165
:y 110
@@ -217,19 +223,32 @@
:script (actions/get-script entities
(if (= 3 (get-in @entities [:state :mints-eaten]))
(do (actions/walk-to entities :ego [159 62] :face :right)
(actions/update-state entities (fn [s] (assoc s :mints-eaten 0)))
(actions/do-dialogue entities
:ego "She's all out."
:ego "Maybe Gandarf can brew her up another batch."))
:shopkeep "That's right I'm all out."
:shopkeep "Go tell Gandarf that I need some more brewed up."
:shopkeep "Pronto!"))
(do (actions/walk-to entities :ego [159 62] :face :right)
(actions/talk entities :ego "I'll just try one of these mints.")
(actions/play-animation entities :ego :reach)
(actions/update-state entities (fn [s] (assoc s :mints-eaten (inc (s :mints-eaten)))))
(sound! (sound (str "inside-antique/fire-" (get-in @entities [:state :mints-eaten]) ".ogg")) :play (utils/current-sound-volume))
(cond
(= 2 (get-in @entities [:state :mints-eaten]))
(do (particle-effect! (get-in @entities [:room :entities :smoke-particle]) :reset)
(particle-effect! (get-in @entities [:room :entities :smoke-particle]) :start))
(= 3 (get-in @entities [:state :mints-eaten]))
(do (particle-effect! (get-in @entities [:room :entities :fire-particle]) :reset)
(particle-effect! (get-in @entities [:room :entities :fire-particle]) :start)))
(actions/play-animation entities :ego [:fire (get-in @entities [:state :mints-eaten])])
(actions/talk entities :ego "WOWZA! Those are hot.")
(when (= 3 (get-in @entities [:state :mints-eaten]))
(actions/talk entities :shopkeep "You brat! You ate the last mint.")
(actions/talk entities :shopkeep "Since you ate the last one, you have to go tell Gandarf to bring me some more."))))))
(actions/do-dialogue entities :shopkeep "Oh drat! You ate the last mint."
:shopkeep "It seems like I'm always running out."
:shopkeep "Now be a good lad and tell Gandarf that I need some more brewed up."
:shopkeep "Pronto!"))))))
:teddy teddy}
:collision "inside-antique/collision.png"
:apply-state (fn [_ entities]