Added first underwater map

Also spruced up the event that takes you there. Also fixed an issue where transplantParty wouldn't take the medium of the new position into consideration. Also added a constructor to the lua version of vec2i.

2 files changed, 6 insertions, 1 deletions

@@ -46,10 +46,12 @@ void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
 void CharacterSystem::transplantParty(int leaderId, vec2i pos, Direction dir) {
   Sprite& leader = game_.getSprite(leaderId);
   CharacterState oldState = leader.characterState;
+  CharacterMedium newMedium = game_.getSystem<TransformSystem>().getMediumAtPosition(leaderId, pos);
 
   std::vector<int> followers = leader.followers;
   leader.followers.clear();
   leader.trailsAreHalved = false;
+  leader.characterMedium = newMedium;
 
   game_.getSystem<TransformSystem>().moveSprite(leaderId, pos);
   game_.getSystem<AnimationSystem>().setSpriteDirection(leaderId, dir);
@@ -60,6 +62,7 @@ void CharacterSystem::transplantParty(int leaderId, vec2i pos, Direction dir) {
 
     game_.getSystem<TransformSystem>().moveSprite(followerId, pos);
     game_.getSystem<AnimationSystem>().setSpriteDirection(followerId, dir);
+    follower.characterMedium = newMedium;
     addSpriteToParty(leaderId, followerId);
   }
 
@@ -17,6 +17,7 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
 
   engine_.new_usertype<vec2i>(
     "vec2i",
+    sol::constructors<vec2i(int, int)>(),
     "x", [] (const vec2i& v) { return v.x(); },
     "y", [] (const vec2i& v) { return v.y(); });
 
@@ -70,7 +71,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "initSprite", [] (TransformSystem& transform, int spriteId, int x, int y, SpriteLayer layer) {
       transform.initSprite(spriteId, vec2i{x, y}, layer);
     },
-    "undoCollision", &TransformSystem::undoCollision);
+    "undoCollision", &TransformSystem::undoCollision,
+    "moveSprite", &TransformSystem::moveSprite);
 
   engine_.new_usertype<EffectSystem>(
     "effect",