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

un. believable. iphone 4s can play the whole game.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-25 20:24:21 -07:00
parent aec484deb5
commit a8b5136a9c
13 changed files with 91 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 49 KiB

BIN
desktop/resources/ego/font.tif
View File

Binary file not shown.

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

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

@@ -179,20 +179,6 @@ cat-tree/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-antique/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-jail/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
outsidehouse/dot outsidehouse/dot
rotate: false rotate: false
xy: 704, 916 xy: 704, 916
@@ -200,13 +186,6 @@ outsidehouse/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-house/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
title/dot title/dot
rotate: false rotate: false
xy: 704, 916 xy: 704, 916
@@ -214,7 +193,14 @@ title/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
dream/dot inside-antique/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
inside-house/dot
rotate: false rotate: false
xy: 704, 916 xy: 704, 916
size: 1, 1 size: 1, 1
@@ -228,6 +214,20 @@ ego/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-jail/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
dream/dot
rotate: false
xy: 704, 916
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
wizard/dot wizard/dot
rotate: false rotate: false
xy: 704, 916 xy: 704, 916
@@ -606,14 +606,14 @@ held/dot
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
outside-jail/dot space/dot
rotate: false rotate: false
xy: 1402, 759 xy: 1402, 759
size: 1, 1 size: 1, 1
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
index: -1 index: -1
space/dot outside-jail/dot
rotate: false rotate: false
xy: 1402, 759 xy: 1402, 759
size: 1, 1 size: 1, 1

2
desktop/src-common/advent/actions.clj
View File

@@ -573,7 +573,7 @@
([entities sound-file vol & [wait?]] ([entities sound-file vol & [wait?]]
(let [wait? (if (nil? wait?) true wait?) (let [wait? (if (nil? wait?) true wait?)
s (if (string? sound-file) s (if (string? sound-file)
(sound sound-file) (utils/load-sound sound-file)
sound-file)] sound-file)]
(run-action entities (run-action entities
(begin [this screen entities] (begin [this screen entities]

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

@@ -225,9 +225,9 @@
:shopkeep "My son would be stricken with grief to find it missing."))))] :shopkeep "My son would be stricken with grief to find it missing."))))]
(rooms/make :music :inside-antique (rooms/make :music :inside-antique
:name "Antique shop" :name "Antique shop"
:sounds {#_#_:fire-1 (utils/load-sound "inside-antique/fire-1.ogg") :sounds {:fire-1 (utils/load-sound "inside-antique/fire-1.ogg")
#_#_:fire-2 (utils/load-sound "inside-antique/fire-2.ogg") :fire-2 (utils/load-sound "inside-antique/fire-2.ogg")
#_#_:fire-3 (utils/load-sound "inside-antique/fire-3.ogg") :fire-3 (utils/load-sound "inside-antique/fire-3.ogg")
} }
:return-portrait (rooms/make-entity :return-portrait {:box [103 70 206 116] :return-portrait (rooms/make-entity :return-portrait {:box [103 70 206 116]
:label "Desk" :label "Desk"

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

@@ -232,8 +232,8 @@
(rooms/make :music :inside-antique (rooms/make :music :inside-antique
:name "In jail" :name "In jail"
:sounds { :sounds {
#_#_:squeek (utils/load-sound "inside-jail/squeak.ogg") :squeek (utils/load-sound "inside-jail/squeak.ogg")
#_#_:crowbar-sound (utils/load-sound "ego/crowbar.ogg") :crowbar-sound (utils/load-sound "ego/crowbar.ogg")
} }
:interactions { :interactions {
:lock {:box [172 102 190 124] :lock {:box [172 102 190 124]

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

@@ -626,7 +626,7 @@
(rooms/make :music {:day :town-2 :night :night} (rooms/make :music {:day :town-2 :night :night}
:name "Outside house" :name "Outside house"
:update-fn jump-around :update-fn jump-around
#_#_:cauldron-sound {:object nil :sound (utils/load-sound "outsidehouse/cauldron.ogg")} :cauldron-sound {:object nil :sound (utils/load-sound "outsidehouse/cauldron.ogg")}
:interactions :interactions
{:door {:box [250 100 281 160] {:door {:box [250 100 281 160]
:only-script :only-script
@@ -774,8 +774,8 @@
(actions/talk entities :ego "That's just cruel.")) (actions/talk entities :ego "That's just cruel."))
nil) nil)
#_#_:eat-sound (utils/load-sound "outsidehouse/sheep-eat.ogg") :eat-sound (utils/load-sound "outsidehouse/sheep-eat.ogg")
#_#_:bleet-sound (utils/load-sound "outsidehouse/sheep-bleet.ogg") :bleet-sound (utils/load-sound "outsidehouse/sheep-bleet.ogg")
:anim-sound-frames {sheep-stand {11 [:eat-sound 0.3] :anim-sound-frames {sheep-stand {11 [:eat-sound 0.3]
35 [:bleet-sound 0.5]}} 35 [:bleet-sound 0.5]}}
:left {:walk (utils/flip sheep-walk) :left {:walk (utils/flip sheep-walk)
@@ -794,7 +794,7 @@
:door (assoc (animation->texture screen door) :door (assoc (animation->texture screen door)
:x 252 :y 88 :baseline 122 :x 252 :y 88 :baseline 122
:open door :open door
#_#_:door-sound (utils/load-sound "door.ogg") :door-sound (utils/load-sound "door.ogg")
:anim-sound-frames {door {1 [:door-sound 0.1]}} :anim-sound-frames {door {1 [:door-sound 0.1]}}
) )
:lamb (assoc (utils/get-texture "outsidehouse/lamb.png") :lamb (assoc (utils/get-texture "outsidehouse/lamb.png")

14
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -196,10 +196,10 @@
grow-explode (particle-effect "particles/grow-explode")] grow-explode (particle-effect "particles/grow-explode")]
(rooms/make :music :fight (rooms/make :music :fight
:name "Duel" :name "Duel"
:sounds {#_#_:shock (utils/load-sound "space/shock.ogg") :sounds {:shock (utils/load-sound "space/shock.ogg")
#_#_:shock-short (utilw/load-sound "space/shock-short.ogg") :shock-short (utils/load-sound "space/shock-short.ogg")
#_#_:jump (utils/load-sound "space/jump.ogg") :jump (utils/load-sound "space/jump.ogg")
#_#_:swing-sword (utils/load-sound "space/swingsword.ogg")} :swing-sword (utils/load-sound "space/swingsword.ogg")}
:interactions :interactions
{} {}
:layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)] :layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)]
@@ -235,9 +235,9 @@
:bloodclot (assoc (animation->texture screen blergh-stand-anim) :bloodclot (assoc (animation->texture screen blergh-stand-anim)
:x 180 :y 50 :baseline 190 :x 180 :y 50 :baseline 190
:stand blergh-stand-anim :stand blergh-stand-anim
#_#_:inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg") :inhale-sound (utils/load-sound "space/bloodclot-inhale.ogg")
#_#_ :exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg") :exhale-sound (utils/load-sound "space/bloodclot-exhale.ogg")
#_#_ :explode-sound (utils/load-sound "space/bloodclot-explode.ogg") :explode-sound (utils/load-sound "space/bloodclot-explode.ogg")
:anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol] :anim-sound-frames {blergh-stand-anim {0 [:inhale-sound grunt-vol]
1 [:exhale-sound grunt-vol]} 1 [:exhale-sound grunt-vol]}
bloodclot-explode {35 [:grow-sound (constantly 0.5)] bloodclot-explode {35 [:grow-sound (constantly 0.5)]

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

@@ -654,28 +654,28 @@
:origin-x 9 :origin-x 9
:origin-y 0 :origin-y 0
:scaled true :scaled true
#_#_:drop-sound (utils/load-sound "ego/drop.ogg") :drop-sound (utils/load-sound "ego/drop.ogg")
#_#_:milk-sound (utils/load-sound "outsidehouse/milk.ogg") :milk-sound (utils/load-sound "outsidehouse/milk.ogg")
#_#_:step-sound-1 (utils/load-sound "ego/step-1.ogg") :step-sound-1 (utils/load-sound "ego/step-1.ogg")
#_#_:step-sound-2 (utils/load-sound "ego/step-2.ogg") :step-sound-2 (utils/load-sound "ego/step-2.ogg")
#_#_:step-sound-3 (utils/load-sound "ego/step-3.ogg") :step-sound-3 (utils/load-sound "ego/step-3.ogg")
#_#_:step-sound-4 (utils/load-sound "ego/step-4.ogg") :step-sound-4 (utils/load-sound "ego/step-4.ogg")
#_#_:shoot-sound (utils/load-sound "ego/slingshot.ogg") :shoot-sound (utils/load-sound "ego/slingshot.ogg")
#_#_:glad-sound (utils/load-sound "ego/glad.ogg") :glad-sound (utils/load-sound "ego/glad.ogg")
#_#_:get-sick-sound (utils/load-sound "ego/get-sick.ogg") :get-sick-sound (utils/load-sound "ego/get-sick.ogg")
#_#_:scratch-sound (utils/load-sound "ego/scratch.ogg") :scratch-sound (utils/load-sound "ego/scratch.ogg")
#_#_:scared-step-sound (utils/load-sound "ego/scared-step.ogg") :scared-step-sound (utils/load-sound "ego/scared-step.ogg")
#_#_:inside-step-sound-1 (utils/load-sound "ego/inside-step-1.ogg") :inside-step-sound-1 (utils/load-sound "ego/inside-step-1.ogg")
#_#_:inside-step-sound-2 (utils/load-sound "ego/inside-step-2.ogg") :inside-step-sound-2 (utils/load-sound "ego/inside-step-2.ogg")
#_#_:inside-step-sound-3 (utils/load-sound "ego/inside-step-3.ogg") :inside-step-sound-3 (utils/load-sound "ego/inside-step-3.ogg")
#_#_:inside-step-sound-4 (utils/load-sound "ego/inside-step-4.ogg") :inside-step-sound-4 (utils/load-sound "ego/inside-step-4.ogg")
#_#_:crowbar-sound (utils/load-sound "ego/crowbar.ogg") :crowbar-sound (utils/load-sound "ego/crowbar.ogg")
#_#_:sigh-sound (utils/load-sound "ego/sigh.ogg") :sigh-sound (utils/load-sound "ego/sigh.ogg")
#_#_:axe-sound (utils/load-sound "ego/axe.ogg") :axe-sound (utils/load-sound "ego/axe.ogg")
#_#_:breakglass-sound (utils/load-sound "ego/breakglass.ogg") :breakglass-sound (utils/load-sound "ego/breakglass.ogg")
#_#_:idea-sound (utils/load-sound "ego/idea.ogg") :idea-sound (utils/load-sound "ego/idea.ogg")
:scale-x start-scale :scale-x start-scale
:scale-y start-scale :scale-y start-scale
:talk-color (color 0.6 1.0 1.0 1.0) :talk-color (color 0.6 1.0 1.0 1.0)
@@ -916,7 +916,6 @@
(defn play-sound-if-necessary [screen entities target {:keys [previous-frame-index current-frame-index anim-sound-frames anim x y] :as e :or {anim-sound-frames {}}}] (defn play-sound-if-necessary [screen entities target {:keys [previous-frame-index current-frame-index anim-sound-frames anim x y] :as e :or {anim-sound-frames {}}}]
(if (and (not= previous-frame-index current-frame-index) (if (and (not= previous-frame-index current-frame-index)
(anim-sound-frames anim)) (anim-sound-frames anim))
(if-let [[snd vol-scale pitch] (get-in anim-sound-frames [anim current-frame-index])] (if-let [[snd vol-scale pitch] (get-in anim-sound-frames [anim current-frame-index])]
@@ -937,12 +936,12 @@
(defn play-key-sounds [screen entities] (defn play-key-sounds [screen entities]
(if (= (get-in entities [:fade :opacity]) 0.0) (if (= (get-in entities [:fade :opacity]) 0.0)
(reduce-kv (fn [entities target e] (reduce-kv (fn [es target e]
(if e (if e
(play-sound-if-necessary screen entities target e) (play-sound-if-necessary screen es target e)
entities)) es))
entities entities
entities) (-> entities :room :entities))
entities)) entities))
(defn update-current-sound-vols! [entities] (defn update-current-sound-vols! [entities]
@@ -1256,10 +1255,10 @@
:closing? {:object nil :closing? {:object nil
:value false} :value false}
:sounds {#_#_:blink (utils/load-sound "ego/blink2.ogg") :sounds {:blink (utils/load-sound "ego/blink2.ogg")
#_#_:pickup (utils/load-sound "pickup.ogg") :pickup (utils/load-sound "pickup.ogg")
#_#_:disappear (utils/load-sound "inside-house/disappear.ogg") :disappear (utils/load-sound "inside-house/disappear.ogg")
#_#_:grow-sound (utils/load-sound "ego/potion.ogg") :grow-sound (utils/load-sound "ego/potion.ogg")
:object nil} :object nil}
:fade {:object nil :fade {:object nil
:opacity 0.0} :opacity 0.0}

45
desktop/src-common/advent/utils.clj
View File

@@ -431,12 +431,10 @@
(doto (music (str r ".mp3")) (music! :set-looping true))))) (doto (music (str r ".mp3")) (music! :set-looping true)))))
(defn load-sound [f] (defn load-sound [f]
nil (try
#_(try
(iosify (iosify
(sound (str f ".mp3")) (sound (str f ".mp3"))
(sound f) (sound f))
)
(catch Exception e (catch Exception e
(log/info e) (log/info e)
(sound (str f ".mp3"))))) (sound (str f ".mp3")))))
@@ -679,29 +677,24 @@
(play-sound! screen entities snd volume-fn pan type 1.0)) (play-sound! screen entities snd volume-fn pan type 1.0))
([screen entities snd volume-fn pan type pitch] ([screen entities snd volume-fn pan type pitch]
(if (if (keyword? snd) (let [vol (volume-fn entities)
(or (-> entities :room :sounds snd) snd (if (keyword? snd)
(-> entities :sounds snd)) (or (-> entities :room :sounds snd)
snd) (-> entities :sounds snd))
snd)
(let [vol (volume-fn entities) sound-id (if (= :once type)
snd (if (keyword? snd) (sound! snd :play (scale-vol-from-fade entities (current-sound-volume vol)) (or pitch 1.0) pan )
(or (-> entities :room :sounds snd) (sound! snd :loop 0.0 (or pitch 1.0) pan )) ]
(-> entities :sounds snd)) (update-in entities [:current-sounds :value]
snd) conj {:id sound-id
:sound snd
sound-id (if (= :once type) :volume-fn volume-fn
(sound! snd :play (scale-vol-from-fade entities (current-sound-volume vol)) (or pitch 1.0) pan ) :type type
(sound! snd :loop 0.0 (or pitch 1.0) pan )) ] :ends-at (if (= type :once)
(update-in entities [:current-sounds :value] (+ (:total-time screen) 1.0 #_(sound! snd :duration))
conj {:id sound-id nil)}))
:sound snd entities))
:volume-fn volume-fn
:type type
:ends-at (if (= type :once)
(+ (:total-time screen) 1.0 #_(sound! snd :duration))
nil)}))
entities)))
(defn stop-all-sounds! [entities] (defn stop-all-sounds! [entities]
(doseq [snd (get-in entities [:current-sounds :value] [])] (doseq [snd (get-in entities [:current-sounds :value] [])]

4
ios/robovm.xml
View File

@@ -21,6 +21,7 @@
</includes> </includes>
<excludes> <excludes>
<exclude>**/*.ogg</exclude> <exclude>**/*.ogg</exclude>
<exclude>**/*.jar</exclude>
</excludes> </excludes>
<skipPngCrush>true</skipPngCrush> <skipPngCrush>true</skipPngCrush>
</resource> </resource>
@@ -86,7 +87,8 @@
</libs> </libs>
<stripArchives> <stripArchives>
<exclude>**/*.class</exclude> <exclude>**/*.class</exclude>
<exclude>**/*.jar</exclude> <include>**/*.jar</include>
<include>*.jar</include>
</stripArchives> </stripArchives>
<frameworks> <frameworks>
<framework>UIKit</framework> <framework>UIKit</framework>