diff options
| -rw-r--r-- | assets.lisp | 34 | ||||
| -rw-r--r-- | assets/emoji.png | bin | 48251 -> 54344 bytes | |||
| -rw-r--r-- | the-price-of-a-cup-of-coffee.lisp | 12 |
3 files changed, 25 insertions, 21 deletions
diff --git a/assets.lisp b/assets.lisp index bd7ab2d..cf24067 100644 --- a/assets.lisp +++ b/assets.lisp @@ -49,29 +49,33 @@ (defparameter +emoji-defs+ - '((:NAME "alarmed-question" :X 360 :Y 0 :WIDTH 72 :HEIGHT 72) - (:NAME "alarmed" :X 72 :Y 288 :WIDTH 72 :HEIGHT 72) - (:NAME "angry" :X 144 :Y 288 +'((:NAME "alarmed-question" :X 288 :Y 216 :WIDTH 72 :HEIGHT 72) + (:NAME "alarmed" :X 288 :Y 144 :WIDTH 72 :HEIGHT 72) + (:NAME "angry" :X 288 :Y 288 :WIDTH 72 :HEIGHT 72) - (:NAME "asshole" :X 216 :Y 288 :WIDTH 72 :HEIGHT 72) - (:NAME "breakdown" :X 0 :Y 360 :WIDTH 72 :HEIGHT 72) - (:NAME "chance" :X 216 :Y 72 + (:NAME "asshole" :X 360 :Y 0 :WIDTH 72 :HEIGHT 72) + (:NAME "breakdown" :X 72 :Y 288 :WIDTH 72 :HEIGHT 72) + (:NAME "chance" :X 144 :Y 288 :WIDTH 72 :HEIGHT 72) + (:NAME "coffee" :X 216 :Y 288 :WIDTH 72 :HEIGHT 72) + (:NAME "cold" :X 0 :Y 360 :WIDTH 72 :HEIGHT 72) - (:NAME "coffee" :X 216 :Y 144 :WIDTH 72 :HEIGHT 72) - (:NAME "cold" :X 216 :Y 216 + (:NAME "death" :X 216 :Y 72 :WIDTH 72 :HEIGHT 72) - (:NAME "death" :X 288 :Y 0 + (:NAME "dollars" :X 216 :Y 144 :WIDTH 72 :HEIGHT 72) + (:NAME "food1" :X 216 :Y 216 :WIDTH 72 :HEIGHT 72) - (:NAME "dollars" :X 72 :Y 216 :WIDTH 72 :HEIGHT 72) - (:NAME "food1" :X 144 :Y 216 + (:NAME "food2" :X 288 :Y 0 :WIDTH 72 :HEIGHT 72) - (:NAME "food2" :X 0 :Y 288 + (:NAME "food3" :X 72 :Y 216 :WIDTH 72 :HEIGHT 72) - (:NAME "food3" :X 144 :Y 72 + (:NAME "food4" :X 144 :Y 216 :WIDTH 72 :HEIGHT 72) - (:NAME "food4" :X 144 :Y 144 + (:NAME "food5" :X 0 :Y 288 :WIDTH 72 :HEIGHT 72) - (:NAME "food5" :X 216 :Y 0 + (:NAME "heart1" :X 144 :Y 72 + :WIDTH 72 :HEIGHT 72) + (:NAME "heart2" :X 144 :Y 144 :WIDTH 72 :HEIGHT 72) + (:NAME "heart3" :X 216 :Y 0 :WIDTH 72 :HEIGHT 72) (:NAME "incapacitated" :X 72 :Y 144 :WIDTH 72 :HEIGHT 72) (:NAME "nauseated" :X 0 :Y 216 :WIDTH 72 :HEIGHT 72) diff --git a/assets/emoji.png b/assets/emoji.png Binary files differindex 3caded9..d7555bd 100644 --- a/assets/emoji.png +++ b/assets/emoji.png diff --git a/the-price-of-a-cup-of-coffee.lisp b/the-price-of-a-cup-of-coffee.lisp index dcfa28e..275fe45 100644 --- a/the-price-of-a-cup-of-coffee.lisp +++ b/the-price-of-a-cup-of-coffee.lisp @@ -327,8 +327,8 @@ (emote *nance* (choose-one "stressed" "breakdown") 3000) (incf (percent *stress-meter*) (* 3 vulnerability))) ((cointoss kindness) - (emote pedestrian (choose-one "angry" "alarmed-question" "relaxed" "relaxed") 2500) - (emote *nance* "relaxed" 2000) + (emote pedestrian (choose-one "relaxed" "heart1" "heart2" "heart3" "angry") 2500) + (emote *nance* (choose-one "relaxed" "heart1" "heart2" "heart3") 2000) (incf (percent *money-meter*) (random generosity))) (t (emote pedestrian (choose-one "sorry-no" "neutral") 2500))) (resume-walking pedestrian old-vec 800))))))) @@ -346,10 +346,10 @@ (defun action-key-pressed () (let-if (mark (find-if (lambda (ped) (< (dist ped *nance*) - (* 0.5 (comfort-rad ped)))) + (* 0.75 (comfort-rad ped)))) *pedestrians*)) - (stop-and-consider mark) - (incf (percent *stress-meter*) 0.01))) + (stop-and-consider mark))) + @@ -567,7 +567,7 @@ (unless *on-coffee-break* (if (walking-p *nance*) (decf (percent *cold-meter*) 0.0004) - (incf (percent *cold-meter*) 0.0005)))) + (incf (percent *cold-meter*) 0.0003)))) |
