8 files changed, 154 insertions, 3 deletions

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="9">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="10">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
   <image source="map2_tiles.png" width="160" height="288"/>
   <tile id="61">
@@ -676,6 +676,18 @@
     <property name="script" value="approach_doria"/>
    </properties>
   </object>
+  <object id="9" name="join_claus" type="sprite" x="640.334" y="153.667">
+   <properties>
+    <property name="animation" value="../res/sprites/claus_anim.txt"/>
+    <property name="collisionHeight" type="int" value="8"/>
+    <property name="collisionOffsetX" type="int" value="-8"/>
+    <property name="collisionOffsetY" type="int" value="-8"/>
+    <property name="collisionWidth" type="int" value="12"/>
+    <property name="interactionScript" value="join_claus"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
@@ -24,6 +24,32 @@ function map2.mailbox1()
   HideCutsceneBars()
 end
 
+function map2.join_claus()
+  StartCutscene()
+  SetAnimation("join_claus", "talk")
+  DisplayMessage("* Say, Lucas. Whatcha up to?\n\f* It looks so fun! Let me join you!", "Claus", SpeakerType.MAN)
+  ShowChoice("Yes", "No")
+  WaitForEndOfMessage()
+
+  if GetChoiceSelection() == 0 then
+    DisplayMessage("* Yes!\n\f* Okay, then I'll be at the very end!\n* Thanks!", "Claus", SpeakerType.MAN)
+    WaitForEndOfMessage()
+
+    local clausId = getSpriteByAlias("join_claus")
+    character():addSpriteToParty(getPlayerSprite(), clausId)
+    transform():undoCollision(clausId)
+
+    local clausSprite = getSprite(clausId)
+    clausSprite.persistent = true
+  else
+    DisplayMessage("* You won't let me join in?\nWhy not? Why not?\n\f* Why won't you let me join in?", "Claus", SpeakerType.MAN)
+    WaitForEndOfMessage()
+  end
+
+  SetAnimation("join_claus", "still")
+  HideCutsceneBars()
+end
+
 function map2.mailbox_lightning()
   StartCutscene()
   DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
@@ -0,0 +1,42 @@
+../res/sprites/claus.png
+../res/sprites/claus_frames.txt
+still[down]: 0
+still[down_left]: 1
+still[left]: 2
+still[up_left]: 3
+still[up]: 4
+still[up_right]: 5
+still[right]: 6
+still[down_right]: 7
+walk[down]: 8,0,16,0
+walk[down_left]: 9,1,17,1
+walk[left]: 10,2,18,2
+walk[up_left]: 11,3,19,3
+walk[up]: 12,4,20,4
+walk[up_right]: 13,5,21,5
+walk[right]: 14,6,22,6
+walk[down_right]: 15,7,23,7
+crouch[down]: 0
+crouch[down_left]: 1
+crouch[left]: 2
+crouch[up_left]: 3
+crouch[up]: 4
+crouch[up_right]: 5
+crouch[right]: 6
+crouch[down_right]: 7
+run[down]: 8,0,16,0
+run[down_left]: 9,1,17,1
+run[left]: 10,2,18,2
+run[up_left]: 11,3,19,3
+run[up]: 12,4,20,4
+run[up_right]: 13,5,21,5
+run[right]: 14,6,22,6
+run[down_right]: 15,7,23,7
+talk[down]: 24,0
+talk[down_left]: 25,1
+talk[left]: 26,2
+talk[up_left]: 27,3
+talk[up]: 28,4
+talk[up_right]: 29,5
+talk[right]: 30,6
+talk[down_right]: 31,7
\ No newline at end of file
@@ -0,0 +1,57 @@
+17,32 cell size
+10 frames per row
+53 frames
+
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,9,32
+16,32,9,32
+16,32,9,32
+16,32,9,32
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+17,24,9,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+17,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,32,8,32
+16,32,8,32
+16,32,8,32
+16,32,8,32
+17,32,9,32
+16,32,9,32
+16,32,9,32
+16,32,9,32
+16,32,8,32
+16,24,8,24
+17,32,9,32
+17,24,9,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,8,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
+16,24,9,24
@@ -35,7 +35,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "animFinished", &Sprite::animFinished,
     "getCurrentFrame", [] (const Sprite& sprite) -> const SpriteFrame& {
       return sprite.frames[sprite.animations[sprite.animationId].frameIndices[sprite.animationFrame]];
-    });
+    },
+    "persistent", &Sprite::persistent);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -54,6 +55,7 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
 
   engine_.new_usertype<CharacterSystem>(
     "character",
+    "addSpriteToParty", &CharacterSystem::addSpriteToParty,
     "transplantParty", &CharacterSystem::transplantParty,
     "startRunning", &CharacterSystem::startRunning,
     "halt", &CharacterSystem::halt);
@@ -62,7 +64,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "transform",
     "initSprite", [] (TransformSystem& transform, int spriteId, int x, int y, SpriteLayer layer) {
       transform.initSprite(spriteId, vec2i{x, y}, layer);
-    });
+    },
+    "undoCollision", &TransformSystem::undoCollision);
 
   engine_.new_usertype<EffectSystem>(
     "effect",
@@ -19,6 +19,15 @@ void TransformSystem::setUpCollision(int spriteId, vec2i offset, vec2i size, boo
   addCollidable(spriteId);
 }
 
+void TransformSystem::undoCollision(int spriteId) {
+  Sprite& sprite = game_.getSprite(spriteId);
+
+  sprite.collidable = false;
+  sprite.solid = false;
+
+  removeCollidable(spriteId);
+}
+
 void TransformSystem::moveSprite(int spriteId, vec2i newLoc) {
   Sprite& sprite = game_.getSprite(spriteId);
   if (sprite.collidable) {
@@ -35,6 +35,8 @@ public:
 
   void setUpCollision(int spriteId, vec2i offset, vec2i size, bool solid);
 
+  void undoCollision(int spriteId);
+
   void moveSprite(int spriteId, vec2i newLoc);
 
   auto getSpritesByY(SpriteLayer layer) const {