Finish 'childhood-friend' prologue!

Wooooot! Antaŭludo finita c:<

dialogue.lisp

@@ -166,10 +166,10 @@ coordinates listed in the DIALOGUE’s :COORDS property. … If applicable, ofc.
     (when (not finished-moving-p)
      (🌍:move-entity
       map speaker
-      :x (cond ((< (getf target-coords :x) (getf speaker-coords :x)) -1)
+      :Δx (cond ((< (getf target-coords :x) (getf speaker-coords :x)) -1)
                 ((> (getf target-coords :x) (getf speaker-coords :x)) 1)
                 ('t 0))
-      :y (cond ((< (getf target-coords :y) (getf speaker-coords :y)) -1)
+      :Δy (cond ((< (getf target-coords :y) (getf speaker-coords :y)) -1)
                 ((> (getf target-coords :y) (getf speaker-coords :y)) 1)
                 ('t 0)))
      (sleep (or (getf dialogue :delay) 0)))
@@ -209,8 +209,9 @@ Returns the state for use with STATE-LOOP, pay attention!"
           (list :dialogue (cdr dialogue-list) :map map)
           (progn
             (✎:hide-cursor)
-            (values nil
+            (values (or (getf dialogue :return) nil)
-                    (list :map map)))))
+                    (or (getf dialogue :return-2)
+                        (list :map map))))))
       ;; Allow interupting text-printing to end it!
       ((and did-press-enter-p (not did-finish-printing-p))
        (setf (getf (car dialogue-list) :progress) (length text))
@@ -297,7 +298,7 @@ The data returned is a list of the box’es top-left coordinate, max-column,
 and max-row; for use with RENDER-STRING. Like so:
   ((:x X :y Y) MAX-COLUMN MAX-ROW)"
   (let* ((speaker-id (dialogue-speaker dialogue))
-         (playerp (eq speaker-id 'player)) ;;'✿:player))
+         (playerp (eq speaker-id 'player))
          (leftp (not (🌍:getf-entity-data map speaker-id :facing-right)))
          (text (getf dialogue :text))
          (coords (🌍:world-coords->screen-coords (🌍:getf-entity-data map speaker-id :coords))))

flora-search-aurora.lisp

@@ -180,6 +180,13 @@ Should be the `interact` function for takeable items."
 ;;; ———————————————————————————————————
 ;;; School prologue: Childhood friend
 ;;; ———————————————————————————————————
+(defun flashback-school-trigger (map)
+  "This is triggered right as the player enters the map — they literally can't
+avoid triggering this."
+  (take-item map 'bracelet)
+  't)
+
+
 (defun flashback-childhood-friend-interact (map &optional sasha)
   (make-dialogue-state
    map
@@ -187,39 +194,76 @@ Should be the `interact` function for takeable items."
     (face   'player "` `" "`o`")
     (say    'player :eo "Ĉu ĉio enordas, Saŝa? Iom malfruas, ĉu ne?"
                     :en "Is everything OK, Sasha? It's a bit late, isn't it?")
-    (face   sasha   ">->" ">o>")
+    (face   sasha   "=_=" "=o=")
-    (say    sasha   :eo "Jes, jes! Mi nur iom distriĝis."
+    (say    sasha   :eo "Ho, jes, mi simple ĵus eliris klubkunvenon."
-                    :en "Yea, yea! I just got a bit distracted is all.")
+                    :en "Yea, I just left a club-meeting, is all.")
-    (say    'player :eo "Prelegoj finiĝis antaŭ du horoj nun..."
+    (say    'player :eo "Hodiaŭ ne estas klubotago..."
-                    :en "School ended two hours ago...")
+                    :en "Today isn't club day...")
-    (say    sasha   :eo "Nu, mi ĵus eliris klubkunvenon! De klubo!"
+    (say    sasha   :eo "Nu, estas escepte speciala klubo!"
-                    :en "Well, I just got out of a meeting! ... Of a club!")
+                    :en "Well, whatever, it's a special club!"
-    (say    sasha   :eo "Do, kial VI restas? Ĉu ankoraŭ havas ne amikojn?"
+                    :face "<o<")
-                    :en "And what're YOU doing here? Still a loner?")
+    (say    sasha   :eo "Nu, kial VI restas? Ĉu ankoraŭ havas ne amikojn?"
-    (say    sasha   :eo "Nesurprize, tutatendite!"
+                    :en "And what're YOU doing here? Still no friends?")
-                    :en "I'm sure not surprised.")
+    (say    'player :eo "Ankoraŭ sole vin."
-    (say    'player :eo "Ĉu ne ni estas amikoj, Saŝa?"
+                    :en "Still just you.")
-                    :en "Well, aren't we friends, Sasha?")
     (face   sasha   ":v:" ":o:")
     (mumble sasha   :en "...")
-    (say    sasha   :eo "Kun vi? Ni? Amikoj..?"
+    (say    sasha   :eo "Nu..."
-                    :en "You? Me? Friends..?")
+                    :en "Well...")
     (mumble sasha   :en "...")
     (face   sasha   "<-<" "<o<")
     (face   'player ":w:" ":u:")
-    (say    sasha   :eo "Pŝ! Ne metu ŝercojn tiom stultaj, Dio mia!"
+    (say    sasha   :eo "Pŝ! Fermu la buŝon, vermo!"
-                    :en "Pssh! Don't make such bad jokes, Jesus.")
+                    :en "Ugh! Just shut up, you loser!")
     (face   sasha   ">->" ">o>")
     (say    sasha   :eo "Kvazaŭ ni povus esti tiel!"
                     :en "As if!")
     (face   sasha   "<-<" "<o<")
-    (say    sasha   :eo "Mi ne TIOM subigos miajn minimumojn!"
+    (say    sasha   :eo "Simple lasu min al paco, fek'!!"
-                    :en "I'd never lower my standards THAT much!")
+                    :en "Just get the hell out of my face!!"
-    (say    'player :eo "... ĉu iu ajn atingas viajn minimumojn?"
+                    :face ">o<")
-                    :en "... does anyone meet your standards?")
+    (say    'player :eo "Bedaŭron..."
-    (say    sasha   :eo "Fermu la buŝon, stulta vermo!"
+                    :en "Sorry...")
-                    :en "Shut up, you damn loser!"
+    (move   'player '(:x 46 :y 11) :delay .05)
-                    :face ">O<"))))
+    (face   'player "^_^" "^o^")
+    (say    'player :eo "Ho, jes!"
+                    :en "Oh, yea!")
+    (move   sasha  '(:x 36 :y 3) :delay .03)
+    (move   'player '(:x 43 :y 4) :delay .05)
+    (move   sasha  '(:x 37 :y 3))
+    (say    'player :eo "Mi freŝe trovis ĉi tion, ĝi ŝajnis akorda al via stilo."
+                    :en "I found this a while back, I thought you'd like it.")
+    (face   sasha   ":w:" ":u:")
+    (mumble 'player :eo "[Vi donas al SAŜA ĉirkaŭmanon belbrilan.]"
+                    :en "[You give SASHA a shiny bracelet.]")
+    (say    sasha   :eo "Ho, tio surprize afablis...."
+                    :en "Oh, that's surprisingly nice...")
+    (face   sasha   "<w<" "<o<")
+    (face   'player ";w:" ";o:")
+    (say    sasha   :eo "... jen la sola koloro, kiun mi malamas."
+                    :en "... this is literally the one color I hate.")
+    (say    sasha   :eo "Kial vi ne elektis bluan? Dio mia."
+                    :en "You couldn't have gotten blue?")
+    (say    sasha   :eo "Mi jam bone sciu, ne atendi bonon de vi."
+                    :en "I should know not to expect so much from you...")
+    (say    sasha   :eo "Bonaj \"amikoj\" ni estas, ja..."
+                    :en "\"Friends\" my ass.")
+    (face   'player "T_T" "ToT")
+    (say    'player :eo "Je Dio, mi ne povas elteni plu. Mi rezignas."
+                    :en "You know what? I give up.")
+    (move   'player '(:x 40 :y 3) :delay .05)
+    (face   sasha   ";_:")
+    (mumble 'player :eo "[Vi prenas de SAŜA ĉirkaŭmanon belbrilan.]"
+                    :en "[You take a shiny bracelet from SASHA.]")
+    (move   'player '(:x 46 :y 5) :delay .05)
+    (say    'player :eo "Mi rezignas."
+                    :en "I can't take this anymore.")
+    (move   'player '(:x 47 :y 9) :delay .05)
+    (say    'player :eo "Vi teruras, Saŝa."
+                    :en "You're the worst, Sasha.")
+    (move   'player '(:x 51 :y 19))
+    `((:return-2 ,(list :map (merge-maps map *casino-map*)))))))
+
 
 
 ;;; ———————————————————————————————————

res/maps/flashback-school.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="left-down" width="72" height="40" tilewidth="17" tileheight="17" infinite="0" nextlayerid="8" nextobjectid="11">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="left-down" width="72" height="41" tilewidth="17" tileheight="17" infinite="0" nextlayerid="11" nextobjectid="17">
  <tileset firstgid="1" source="font.tsx"/>
- <layer id="3" name="Background" width="72" height="40">
+ <layer id="3" name="Background" width="72" height="41">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -42,10 +42,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="1" name="Foreground" width="72" height="40">
+ <layer id="1" name="Foreground" width="72" height="41">
   <properties>
    <property name="colliding" type="bool" value="true"/>
   </properties>
@@ -89,10 +90,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="5" name="Topground-eo" width="72" height="40">
+ <layer id="5" name="Topground-eo" width="72" height="41">
   <properties>
    <property name="language" value="eo"/>
    <property name="top-layer" type="bool" value="true"/>
@@ -137,10 +139,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="6" name="Topground-en" width="72" height="40">
+ <layer id="6" name="Topground-en" width="72" height="41">
   <properties>
    <property name="language" value="en"/>
    <property name="top-layer" type="bool" value="true"/>
@@ -185,10 +188,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="4" name="Topground" width="72" height="40">
+ <layer id="4" name="Topground" width="72" height="41">
   <properties>
    <property name="top-layer" type="bool" value="true"/>
   </properties>
@@ -232,11 +236,12 @@
 0,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <objectgroup id="7" name="Descriptions">
-  <object id="4" name="Sasha's desk" type="Item" x="672" y="197.333">
+  <object id="4" name="Sasha's desk" x="672" y="197.333">
    <properties>
     <property name="desc-en" value="(Sasha's desk... It's a complete mess.)"/>
     <property name="desc-eo" value="(Labortablo de Saŝa... Ĝi iom malordas.)"/>
@@ -272,7 +277,9 @@
    </properties>
    <point/>
   </object>
-  <object id="9" name="Monujo" x="672.667" y="282">
+ </objectgroup>
+ <objectgroup id="8" name="Items">
+  <object id="13" name="Monujo" type="Item" x="676.667" y="286">
    <properties>
     <property name="avatar" value="$$$"/>
     <property name="desc-en" value="(My wallet, right where I left it.)"/>
@@ -286,9 +293,21 @@
    </properties>
    <point/>
   </object>
+  <object id="14" name="Bracelet" type="Item" x="1198" y="692">
+   <properties>
+    <property name="avatar" value="*=*"/>
+    <property name="comment" value="This is deliberately off-map! c:&lt;"/>
+    <property name="desc-en" value="A bracelet that gleams in the light, it's simply dazzling!"/>
+    <property name="desc-eo" value="Ĉirkaŭmano kiu lumspegulas belbrile, kia ĉarma aspekto!"/>
+    <property name="id" value="✿:bracelet"/>
+    <property name="name-en" value="dazzling bracelet"/>
+    <property name="name-eo" value="belbrila ĉirkaŭmano"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <objectgroup id="2" name="People">
-  <object id="1" name="Player" type="Person" x="111.234" y="437.067">
+  <object id="1" name="Player" type="Person" x="92.234" y="436.067">
    <properties>
     <property name="id" value="✿:player"/>
     <property name="normal-face" value="^w^"/>
@@ -296,7 +315,7 @@
    </properties>
    <point/>
   </object>
-  <object id="2" name="Sasha" type="Person" x="689.333" y="60">
+  <object id="2" name="Sasha" type="Person" x="723.833" y="78">
    <properties>
     <property name="facing-right" type="bool" value="true"/>
     <property name="id" value="✿:childhood-friend"/>
@@ -307,4 +326,11 @@
    <point/>
   </object>
  </objectgroup>
+ <objectgroup id="10" name="Triggers">
+  <object id="16" name="Entering map" type="Trigger" x="38.5" y="394.75" width="117" height="83.5">
+   <properties>
+    <property name="function" value="✿:flashback-school-trigger"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>