8 files changed, 35 insertions, 1 deletions

@@ -159,6 +159,7 @@
   <object id="7" name="switch_claus" type="sprite" x="864" y="784">
    <properties>
     <property name="animation" value="claus"/>
+    <property name="bumpPlayerScript" value="lets_switch_places"/>
     <property name="enclosureZone" value="switch_claus_enclosure"/>
     <property name="interactionScript" value="lets_switch_places"/>
     <property name="movementSpeed" type="int" value="1"/>
@@ -270,6 +270,7 @@ end
 function hallucination_interior.lets_switch_places()
   StartCutscene()
 
+  FaceTowardSprite("switch_claus", "lucas")
   FacePartyTowardSprite("lucas", "switch_claus")
   Halt("switch_claus")
   SetAnimation("switch_claus", "talk")
@@ -280,9 +281,13 @@ function hallucination_interior.lets_switch_places()
 
   if GetChoiceSelection() == 0 then
     DisplayMessage("* You'd like that, wouldn't you?\n\f* ...no. That's too easy.\n\fI'm not letting you off that easy.\n\f* It should've been you, right?\nYou feel guilty, right?\n\f* Well guess what, Lucas?\n\fYou're going to live with that for the rest of your life.\n\f* You know why?\n\f* Because you're going to live, Lucas!\n\fYOU'RE. GOING. TO. LIVE!", "Claus", SpeakerType.MAN)
-    SetAnimation("switch_claus", "still")
     HideCutsceneBars()
+
+    SetAnimation("switch_claus", "still")
   else
     -- TODO: let's switch places
   end
+
+  -- Just so we can get away, for now.
+  hallucination_interior.switch_claus_lose_interest()
 end
@@ -18,6 +18,7 @@ void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
   Sprite& leader = game_.getSprite(leaderId);
   Sprite& follower = game_.getSprite(followerId);
   follower.orientable = false;
+  follower.leaderId = leaderId;
 
   vec2i targetPos = leader.loc;
 
@@ -83,6 +84,7 @@ void CharacterSystem::breakUpParty(int leaderId) {
   for (int followerId : followers) {
     Sprite& follower = game_.getSprite(followerId);
     follower.trail.clear();
+    follower.leaderId = -1;
   }
 }
 
@@ -153,6 +155,7 @@ void CharacterSystem::tick(double dt) {
         // Check collision.
         CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, sprite.loc, pLoc, sprite.movementDir);
         bool blocked = collision.horiz.blocked || collision.vert.blocked;
+        int colliderSpriteId = (collision.horiz.colliderSprite == -1) ? collision.vert.colliderSprite : collision.horiz.colliderSprite;
 
         if (collision.horiz.blocked && !sprite.clipping) {
           pLoc.x() = sprite.loc.x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
@@ -179,6 +182,20 @@ void CharacterSystem::tick(double dt) {
           game_.getMixer().playSound("../res/sfx/bump.wav");
         }
 
+        if (colliderSpriteId != -1 && !sprite.bumpPlayerScript.empty()) {
+          Sprite& collider = game_.getSprite(colliderSpriteId);
+          bool bumpedPlayer = collider.player;
+
+          if (!bumpedPlayer && collider.leaderId != -1) {
+            Sprite& colliderLeader = game_.getSprite(collider.leaderId);
+            bumpedPlayer = colliderLeader.player;
+          }
+
+          if (bumpedPlayer) {
+            game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), sprite.bumpPlayerScript);
+          }
+        }
+
         // Move everything
         if (pLoc != sprite.loc) {
           game_.getSystem<TransformSystem>().moveSprite(spriteId, pLoc);
@@ -72,6 +72,9 @@ void Game::loadMap(std::string filename) {
       if (p.wander) {
         getSprite(spriteId).behaviourType = BehaviourType::Wander;
       }
+      if (!p.bumpPlayerScript.empty()) {
+        getSprite(spriteId).bumpPlayerScript = p.bumpPlayerScript;
+      }
     }
     if (!p.enclosureZone.empty()) {
       getSprite(spriteId).enclosureZone = p.enclosureZone;
@@ -48,6 +48,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int kumaSprite = game.emplaceSprite("kuma");
   game.getSystem<TransformSystem>().initSprite(kumaSprite, warpLoc);
+  game.getSystem<TransformSystem>().setUpCollision(kumaSprite, {-8, -8}, {12, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(kumaSprite, Direction::down);
   game.getSprite(kumaSprite).normallyHasShadow = true;
@@ -56,6 +57,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int dusterSprite = game.emplaceSprite("duster");
   game.getSystem<TransformSystem>().initSprite(dusterSprite, warpLoc);
+  game.getSystem<TransformSystem>().setUpCollision(dusterSprite, {-8, -8}, {12, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(dusterSprite, Direction::down);
   game.getSprite(dusterSprite).normallyHasShadow = true;
@@ -64,6 +66,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int boneySprite = game.emplaceSprite("boney");
   game.getSystem<TransformSystem>().initSprite(boneySprite, warpLoc);
+  game.getSystem<TransformSystem>().setUpCollision(boneySprite, {-8, -8}, {12, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(boneySprite, Direction::down);
   game.getSprite(boneySprite).normallyHasShadow = true;
@@ -119,6 +119,8 @@ Map::Map(std::string_view name) : name_(name) {
               p.mirrorAxis = property.getIntValue();
             } else if (property.getName() == "mirrorSprite") {
               p.spriteToMirror = property.getStringValue();
+            } else if (property.getName() == "bumpPlayerScript") {
+              p.bumpPlayerScript = property.getStringValue();
             }
           }
 
@@ -27,6 +27,7 @@ struct Prototype {
   std::string animName;
   Direction dir = Direction::down;
   std::string interactionScript;
+  std::string bumpPlayerScript;
   bool shadow = false;
   bool wander = false;
   int movementSpeed = -1;
@@ -81,6 +81,7 @@ public:
   vec2i collisionSize;
   std::string interactionScript;
   std::string walkthroughScript;
+  std::string bumpPlayerScript;
   std::string enclosureZone;
 
   // Animation (internals)
@@ -109,6 +110,7 @@ public:
   bool orientable = false;
   int movementSpeed = 0; // 1 is slow (good for NPCs), 2 is Lucas's default walking speed
   std::vector<int> followers;
+  int leaderId = -1;
   std::deque<Movement> trail;
   bool trailsAreHalved = false;
   CharacterState characterState = CharacterState::Still;