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

gandarf improvements.

Browse Source
This commit is contained in:
Bryce Covert
2016-02-15 18:21:27 -08:00
parent 344d081541
commit d005cfaf2e
6 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/last-release
View File

@@ -1 +1 @@
41
42

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

@@ -102,13 +102,6 @@ cat-tree/dot
orig: 1, 1
offset: 0, 0
index: -1
wizard/dot
rotate: false
xy: 846, 784
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
ego/dot
rotate: false
xy: 846, 784
@@ -116,7 +109,7 @@ ego/dot
orig: 1, 1
offset: 0, 0
index: -1
outsidehouse/dot
inside-house/dot
rotate: false
xy: 846, 784
size: 1, 1
@@ -130,6 +123,13 @@ dream/dot
orig: 1, 1
offset: 0, 0
index: -1
inside-jail/dot
rotate: false
xy: 846, 784
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
title/dot
rotate: false
xy: 846, 784
@@ -137,6 +137,13 @@ title/dot
orig: 1, 1
offset: 0, 0
index: -1
wizard/dot
rotate: false
xy: 846, 784
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-antique/dot
rotate: false
xy: 846, 784
@@ -144,14 +151,7 @@ inside-antique/dot
orig: 1, 1
offset: 0, 0
index: -1
inside-jail/dot
rotate: false
xy: 846, 784
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-house/dot
outsidehouse/dot
rotate: false
xy: 846, 784
size: 1, 1
@@ -284,14 +284,14 @@ held/dot
orig: 1, 1
offset: 0, 0
index: -1
space/dot
outside-jail/dot
rotate: false
xy: 849, 784
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
outside-jail/dot
space/dot
rotate: false
xy: 849, 784
size: 1, 1

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

@@ -344,12 +344,12 @@
:x 69
:y 86
:baseline 120)
:smoke-particle (doto (assoc (particle-effect "particles/smoke-particle") :x 162 :y 108
:smoke-particle (doto (assoc (particle-effect "particles/smoke-particle") :x 162 :y 104
:baseline 240)
(particle-effect! :set-position 162 108))
:fire-particle (doto (assoc (particle-effect "particles/fire-particle") :x 162 :y 108
(particle-effect! :set-position 162 103))
:fire-particle (doto (assoc (particle-effect "particles/fire-particle") :x 162 :y 104
:baseline 240)
(particle-effect! :set-position 162 108))
(particle-effect! :set-position 162 104))
:bowl (assoc (utils/get-texture "inside-antique/bowl.png")
:x 165
:y 110

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

@@ -13,8 +13,10 @@
(defn open-safe [entities]
(actions/play-animation entities :ego :start-squat :stop? false)
(Thread/sleep 500)
(screen! safe/safe-screen :show-screen
:success (actions/get-script entities
(Thread/sleep 500)
(actions/play-animation entities :ego :end-squat)
(if (actions/has-item? entities :recipe)
@@ -36,6 +38,7 @@
(actions/give entities :mandrake)
(actions/talk entities :ego "Weird. It's some kind of root."))))
:failure (actions/get-script entities
(Thread/sleep 500)
(actions/play-animation entities :ego :end-squat)
(actions/talk entities :ego "I don't think that worked...")))
(actions/update-state entities #(assoc % :active? false)))

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

@@ -390,7 +390,7 @@
:wizard "Surely thou doth know that thou can speaketh in this manner."
:wizard "Thy tongue requireth neither sword nor title.")
:choices actions/previous-choices}]}
"By besting traps, beasts, and long, boring, conversation with old geezers."
"By besting traps, beasts, and long, boring, conversations with old geezers."
{:run #(do (actions/respond entities %
:wizard "Quite right, quite right.")
(Thread/sleep 1000)

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

@@ -1412,7 +1412,7 @@ void main ()
:inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000
:mouse-in? (zone/box 278 0 320 42)
:opacity 0.8)
#_#_:fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)}))
:fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)}))
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} [entities]]
@@ -1431,7 +1431,7 @@ void main ()
(as-> entities entities
(update-in entities [:save] assoc :r 0.75 :g 0.75 :b 0.75)
(grow-hud screen entities :save false)))]
#_(label! (:fps entities) :set-text (str (game :fps)))
(label! (:fps entities) :set-text (str (game :fps)))
(render! screen [ (if (and hud-interactable? (not (:already-saved? entities)))
(:save entities)
(assoc (:save entities) :opacity 0.5))