Started adding event where Claus joins the party

3 files changed, 16 insertions, 2 deletions

@@ -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 {