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

don't stop while quaking, added logo

Browse Source
This commit is contained in:
Bryce Covert
2016-03-08 07:44:40 -08:00
parent 5980a31706
commit e89d3ffbc8
19 changed files with 3125 additions and 3153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/src-common/advent/saves.clj
View File

@@ -9,10 +9,10 @@
(def chapter-name
{:chapter-1 "Part 1: Our tale's beginning"
:chapter-2 "Part 2: To be a knight"
:chapter-3 "Part 3: In the slammer"
:chapter-4 "Part 4: Tick the ex-con"
:chapter-5 "Part 5: Slingshot stew"})
{:chapter-1 "Part 1: Our Tale's Beginning"
:chapter-2 "Part 2: To Be a Knight"
:chapter-3 "Part 3: In the Slammer"
:chapter-4 "Part 4: Tick the Ex-con"
:chapter-5 "Part 5: Slingshot Stew"})

64
desktop/src-common/advent/screens/items.clj
View File

@@ -100,71 +100,71 @@
:scripts {:flask-1-with-milk (actions/get-script entities (make-cream-of-mushroom entities))
:flask-1 (add-mushrooms-to-flask)}}
:carrot {:name "Carrot" :value :carrot :cursor :carrot}
:flask-1-with-mushrooms {:name "Flask with mushrooms" :value :flask-1-with-mushrooms :cursor :flask-with-contents
:flask-1-with-mushrooms {:name "Flask with Mushrooms" :value :flask-1-with-mushrooms :cursor :flask-with-contents
:scripts {:mandrake (not-ready) :slobber (not-ready)}}
:flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents
:flask-1-with-milk {:name "Flask with Milk" :value :flask-1-with-milk :cursor :flask-with-contents
:scripts {:mushrooms (actions/get-script entities (make-cream-of-mushroom entities))
:slobber (not-ready)
:mandrake (not-ready)}}
:flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-strength}
:flask-1-strength {:name "Strength Potion" :value :flask-1-strength :cursor :flask-with-strength}
:flask-1 {:name "Flask" :value :flask-1 :cursor :flask
:scripts {:mushrooms (add-mushrooms-to-flask)
:mandrake (not-ready)
:slobber (not-ready)}}
:trophy {:name "Trophy of wisdom" :value :trophy :cursor :trophy}
:cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy}
:trophy {:name "Trophy of Wisdom" :value :trophy :cursor :trophy}
:cat-toy {:name "Cat Toy" :value :cat-toy :cursor :cat-toy}
:stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}}
:balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon}
:frog-legs {:name "Frog legs" :value :frog-legs :cursor :frog-legs}
:balloon {:name "Choicest of Balloons" :value :balloon :cursor :balloon}
:frog-legs {:name "Frog Legs" :value :frog-legs :cursor :frog-legs}
:ladder {:name "Ladder" :value :ladder :cursor :ladder}
:teddy {:name "Teddy Bear" :value :teddy :cursor :teddy}
:portrait {:name "Portrait" :value :portrait :cursor :portrait}
:recipe {:name "Strength potion recipe" :value :recipe :cursor :recipe}
:glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye}
:motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes}
:used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs}
:grass {:name "High protein grass" :value :grass :cursor :grass}
:slobber {:name "Bull slobber" :value :slobber :cursor :slobber :scripts {:flask-1-with-mushrooms (not-ready) :flask-1-with-milk (not-ready) :flask-1 (not-ready) :flask-1-with-cream-of-mushroom (add-slobber)}}
:flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents
:recipe {:name "Strength Potion Recipe" :value :recipe :cursor :recipe}
:glass-eye {:name "Choicest of Glass Eyes" :value :glass-eye :cursor :glass-eye}
:motivational-tapes {:name "Choicest Motivational Tapes" :value :motivational-tapes :cursor :motivational-tapes}
:used-earplugs {:name "Choicest Used Earplugs" :value :used-earplugs :cursor :used-earplugs}
:grass {:name "High Protein Grass" :value :grass :cursor :grass}
:slobber {:name "Bull Slobber" :value :slobber :cursor :slobber :scripts {:flask-1-with-mushrooms (not-ready) :flask-1-with-milk (not-ready) :flask-1 (not-ready) :flask-1-with-cream-of-mushroom (add-slobber)}}
:flask-1-with-cream-of-mushroom {:name "Flask with Cream of Mushroom Soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents
:scripts {:slobber (add-slobber) :mandrake (not-ready)}}
:flask-1-slobber {:name "Cream of mushrooms soup and bull slobber" :value :flask-1-slobber :cursor :flask-with-contents
:flask-1-slobber {:name "Cream of Mushroom Soup and Bull Slobber" :value :flask-1-slobber :cursor :flask-with-contents
:scripts {:mandrake (make-strength-potion)}}
:medal {:name "Medal of strength" :value :medal :cursor :medal}
:kiss {:name "Kiss for courage" :value :kiss :cursor :kiss}
:medal {:name "Medal of Strength" :value :medal :cursor :medal}
:kiss {:name "Kiss for Courage" :value :kiss :cursor :kiss}
:sword {:name "Sword of Blergh" :value :sword :cursor :sword}
:mandrake {:name "Mandrake root" :value :mandrake :cursor :mandrake
:mandrake {:name "Mandrake Root" :value :mandrake :cursor :mandrake
:scripts {:flask-1-slobber (make-strength-potion)
:flask-1-with-cream-of-mushroom (not-ready)
:flask-1-with-milk (not-ready)
:flask-1-with-mushrooms (not-ready)
:flask-1 (not-ready)}}
:ball-n-chain {:name "Ball-n-chain" :value :ball-n-chain :cursor :ball-n-chain}
:key {:name "Jail key" :value :key :cursor :key}
:key {:name "Jail Key" :value :key :cursor :key}
:rope {:name "Rope" :value :rope :cursor :rope}
:crowbar {:name "Crowbar" :value :crowbar :cursor :crowbar}
:flask-2 {:name "Flask" :value :flask-2 :cursor :flask :flask? true}
:flask-water {:name "Water from fountain" :flask? true :value :flask-water :cursor :flask-water :scripts (mix-ingredients :flask-water) }
:flask-water-ash {:name "Water and ashes" :flask? true :value :flask-water-ash :cursor :flask-water-stuff :scripts (mix-ingredients :flask-water-ash) }
:flask-water-flies {:name "Water and flies" :flask? true :value :flask-water-flies :cursor :flask-water-stuff :scripts (mix-ingredients :flask-water-flies)}
:flask-flies-ash {:name "Water, flies, and ash" :flask? true :value :flask-flies-ash :cursor :flask-water-stuff-2 :scripts (mix-ingredients :flask-flies-ash)}
:flask-water {:name "Water from Fountain" :flask? true :value :flask-water :cursor :flask-water :scripts (mix-ingredients :flask-water) }
:flask-water-ash {:name "Water and Ashes" :flask? true :value :flask-water-ash :cursor :flask-water-stuff :scripts (mix-ingredients :flask-water-ash) }
:flask-water-flies {:name "Water and Flies" :flask? true :value :flask-water-flies :cursor :flask-water-stuff :scripts (mix-ingredients :flask-water-flies)}
:flask-flies-ash {:name "Water, Flies, and Ashes" :flask? true :value :flask-flies-ash :cursor :flask-water-stuff-2 :scripts (mix-ingredients :flask-flies-ash)}
:note-1 {:name "Note from Gandarf" :value :note-1 :cursor :note-1}
:ash {:name "Ashes" :value :ash :cursor :ash :scripts (mix-ingredients :ash)}
:sack-lunch {:name "Pungent sack lunch" :value :sack-lunch :cursor :sack-lunch}
:sack-lunch {:name "Pungent Sack Lunch" :value :sack-lunch :cursor :sack-lunch}
:flies {:name "Flies" :value :flies :cursor :flies :scripts (mix-ingredients :flies)}
:spear {:name "Spear" :value :spear :cursor :spear}
:monocle {:name "Monocle" :value :monocle :cursor :monocle}
:feather {:name "Feather" :value :feather :cursor :feather :scripts (mix-ingredients :feather)}
:spell-component {:name "Spell component" :value :spell-component :cursor :spell-component}
:spell-component {:name "Spell Component" :value :spell-component :cursor :spell-component}
:money {:name "Money" :value :money :cursor :money}
:charcoal {:name "Piece of charcoal" :value :charcoal :cursor :charcoal}
:broken-clock {:name "Sliced time-keeping device" :value :broken-clock :cursor :broken-clock}
:charcoal {:name "Piece of Charcoal" :value :charcoal :cursor :charcoal}
:broken-clock {:name "Sliced Time-keeping Device" :value :broken-clock :cursor :broken-clock}
:slingshot {:name "The Slinger's Shot" :value :slingshot :cursor :slingshot}
:note-2 {:name "Bingo card" :value :note-2 :cursor :note-2}
:camera {:name "Image taking device" :value :camera :cursor :camera}
:walkie-talkies {:name "Communication devices" :value :walkie-talkies :cursor :walkie-talkies}
:walkie-talkie {:name "Communication device" :value :walkie-talkie :cursor :walkie-talkie}
:alarm-clock {:name "Time-keeping device" :value :alarm-clock :cursor :alarm-clock}
:note-2 {:name "Bingo Card" :value :note-2 :cursor :note-2}
:camera {:name "Image Taking Device" :value :camera :cursor :camera}
:walkie-talkies {:name "Communication Devices" :value :walkie-talkies :cursor :walkie-talkies}
:walkie-talkie {:name "Communication Device" :value :walkie-talkie :cursor :walkie-talkie}
:alarm-clock {:name "Time-keeping Device" :value :alarm-clock :cursor :alarm-clock}
:magic-slingshot {:name "The Slinger's Shot" :value :magic-slingshot :cursor :magic-slingshot}
:shovel {:name "Shovel" :value :shovel :cursor :shovel}
:broom {:name "Broom" :value :broom :cursor :broom}

12
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -293,12 +293,12 @@
:bloodclot-head "You're no hero. You're just a morsel."
:bloodclot-head "Come here, and I promise I will spare you much pain.")
(actions/talk entities :ego "Wait a second. I'm just a kid." :anim :scared-talk)
(actions/walk-straight-to entities :ego [115 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I'm just trying to impress Georgia McGorgeous." :anim :scared-talk)
(actions/walk-straight-to entities :ego [75 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I just... accidentally pulled the sword!":anim :scared-talk)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I wouldn't taste very good anyhow!" :anim :scared-talk)
(actions/walk-straight-to entities :ego [115 45] :override-dir :right :anim :scared-walk :speed 0.5 :stop? false)
(actions/talk entities :ego "I'm just trying to impress Georgia McGorgeous." :anim :scared-talk :stop? false)
(actions/walk-straight-to entities :ego [75 45] :override-dir :right :anim :scared-walk :speed 0.5 :stop? false)
(actions/talk entities :ego "I just... accidentally pulled the sword!":anim :scared-talk :stop? false)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right :anim :scared-walk :speed 0.5 :stop? false)
(actions/talk entities :ego "I wouldn't taste very good anyhow!" :anim :scared-talk :stop? false)
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities
:bloodclot-head "\"A final test remains, behold!\""

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

@@ -141,7 +141,7 @@ vec3 BlendHue(vec3 base, vec3 blend)
void main ()
{
vec2 sz = vec2 (1024.0, 1024.0);
vec2 sz = vec2 (2048.0, 2048.0);
vec3 step = vec3 (1.0 / 4.0, 1.0 / 4.0, 0.0);
vec2 tex_pixel = sz * v_texCoords - step.xy / 2.0;

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

@@ -51,7 +51,7 @@
:origin-y 0
:z 0)
:poslogo (assoc (utils/get-texture "pos.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 1 :opacity 0.0)
:dbhlogo (assoc (utils/get-texture "dbh.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0 :z 1 :opacity 0.0)
:dbhlogo (assoc (utils/get-texture "dbh.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :z 1 :opacity 0.0)
}]
(fade-in screen entities :dbhlogo
(fn [entities]

10
desktop/src-common/advent/screens/title.clj
View File

@@ -110,8 +110,8 @@
(defn quest-label []
(if (seq (utils/snapshot-list))
"Continue quest"
"Begin quest"))
"Continue Quest"
"Begin Quest"))
(defn start-playing [screen entities save]
(do (log/info "Starting/Continuing quest.")
@@ -214,7 +214,7 @@
(defn main-menu []
(let [start-playing-label (quest-label)
is-starting? (= "Begin quest" start-playing-label)]
is-starting? (= "Begin Quest" start-playing-label)]
(make-table [[(make-button start-playing-label :key :continue-or-start) :height 56 :pad-bottom 4 :width 250]
:row
[(doto (make-button "Load" :key :load)
@@ -230,7 +230,7 @@
[(make-button "Settings" :key :settings) :height 56 :pad-bottom 4 :width 250]
:row
[(make-button "End quest" :key :end-quest) :height 56 :width 250]
[(make-button "End Quest" :key :end-quest) :height 56 :width 250]
])))
(defn chapters-menu []
@@ -481,7 +481,7 @@
(quit screen entities)
(= :continue-or-start actor-key)
(start-playing screen entities (if (= "Begin quest" (quest-label))
(start-playing screen entities (if (= "Begin Quest" (quest-label))
nil
(first (utils/snapshot-list))))
(= :continue actor-key)