Added sound and animation changes to scripting

9 files changed, 77 insertions, 9 deletions

@@ -21,3 +21,20 @@ function HideCutsceneBars()
   WaitForEndOfMessage()
   message():hideCutsceneBars()
 end
+
+function SetAnimation(spriteName, animName)
+  local spriteId = getSpriteByAlias(spriteName)
+  animation():setSpriteAnimation(spriteId, animName)
+end
+
+function PlaySound(filename)
+  mixer():playSound("../res/sfx/" .. filename)
+end
+
+function LoopSound(filename)
+  return mixer():loopSound("../res/sfx/" .. filename)
+end
+
+function StopSound(soundId)
+  mixer():stopChannel(soundId)
+end
@@ -1,4 +1,12 @@
 function script0001()
-  DisplayMessage("It's almost suppertime.\nHinawa should be back soon.\nWhat? She's not coming back? Why, did you do something to her?\nHuh? I did it to her? Hinawa isn't coming back?\nWho are you? What did you do?\nIt's time for supper. It's time for supper.", "Flint", SpeakerType.MAN)
+  SetAnimation("boney", "barking")
+  local barkingNoise = LoopSound("barking_at_hallucination.wav")
+
+  DisplayMessage("Lucas. It's me, Flint. Your father.\nI found Claus. He's here. After three years I've finally found your brother.\nLook at me when I'm talking to you, Lucas.\nWhen Claus gets home, we won't need you anymore. You're nothing compared to him.", "Flint", SpeakerType.MAN)
+  WaitForEndOfMessage()
+
+  SetAnimation("boney", "crouch")
+  StopSound(barkingNoise)
+  PlaySound("boney_growl.wav")
   HideCutsceneBars()
 end
@@ -31,4 +31,12 @@ run[up_left]: 51,59,67,75
 run[up]: 52,60,68,76
 run[up_right]: 53,61,69,77
 run[right]: 54,62,70,78
-run[down_right]: 55,63,71,79
\ No newline at end of file
+run[down_right]: 55,63,71,79
+barking[down]: 0,32,40,32,40,32,40
+barking[down_left]: 1,33,41,33,41,33,41
+barking[left]: 2,34,42,34,42,34,42
+barking[up_left]: 3,35,43,35,43,35,43
+barking[up]: 4,36,44,36,44,36,44
+barking[up_right]: 5,37,45,37,45,37,45
+barking[right]: 6,38,46,38,46,38,46
+barking[down_right]: 7,39,47,39,47,39,47
\ No newline at end of file
@@ -1,8 +1,9 @@
 #include "game.h"
 
-int Game::emplaceSprite() {
+int Game::emplaceSprite(std::string alias) {
   int id = sprites_.size();
   sprites_.emplace_back();
   spriteIds_.push_back(id);
+  spritesByAlias_[alias] = id;
   return id;
 }
@@ -43,7 +43,7 @@ public:
     });
   }
 
-  int emplaceSprite();
+  int emplaceSprite(std::string alias);
 
   const Sprite& getSprite(int id) const {
     return sprites_.at(id);
@@ -57,6 +57,10 @@ public:
     return spriteIds_;
   }
 
+  int getSpriteByAlias(std::string alias) const {
+    return spritesByAlias_.at(alias);
+  }
+
   auto spriteView() const {
     return ranges::views::transform([&] (int id) -> const Sprite& {
       return sprites_.at(id);
@@ -85,6 +89,7 @@ private:
 
   std::vector<int> spriteIds_;
   std::vector<Sprite> sprites_;
+  std::map<std::string, int> spritesByAlias_;
   std::unique_ptr<Map> map_;
   Font font_;
 };
@@ -25,29 +25,29 @@ void loop(Renderer& renderer) {
   auto map = std::make_unique<Map>("../res/maps/map1.tmx", renderer);
   game.setMap(std::move(map));
 
-  int lucasSprite = game.emplaceSprite();
+  int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
   game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8});
   game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
   game.getSprite(lucasSprite).controllable = true;
   game.getSystem<CharacterSystem>().initSprite(lucasSprite);
 
-  int kumaSprite = game.emplaceSprite();
+  int kumaSprite = game.emplaceSprite("kuma");
   game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
 
-  int dusterSprite = game.emplaceSprite();
+  int dusterSprite = game.emplaceSprite("duster");
   game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
 
-  int boneySprite = game.emplaceSprite();
+  int boneySprite = game.emplaceSprite("boney");
   game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
 
-  int flintSprite = game.emplaceSprite();
+  int flintSprite = game.emplaceSprite("flint");
   game.getSystem<TransformSystem>().initSprite(flintSprite, {35*16, 19*16});
   game.getSystem<TransformSystem>().setUpCollision(flintSprite, {-8, -8}, {12, 8});
   game.getSystem<AnimationSystem>().initSprite(flintSprite, "../res/sprites/flint_anim.txt", renderer);
@@ -2,6 +2,7 @@
 #include <iostream>
 #include "game.h"
 #include "message_system.h"
+#include "animation_system.h"
 
 ScriptSystem::ScriptSystem(Game& game) : game_(game) {
   engine_.open_libraries(
@@ -15,12 +16,40 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "hideCutsceneBars", &MessageSystem::hideCutsceneBars,
     "isMessageActive", sol::property(&MessageSystem::isMessageActive));
 
+  engine_.new_usertype<AnimationSystem>(
+    "animation",
+    "setSpriteAnimation", &AnimationSystem::setSpriteAnimation);
+
+  engine_.new_usertype<Mixer>(
+    "mixer",
+    "playSound", &Mixer::playSound,
+    "loopSound", &Mixer::loopSound,
+    "stopChannel", &Mixer::stopChannel);
+
   engine_.set_function(
     "message",
     [&] () -> MessageSystem& {
       return game_.getSystem<MessageSystem>();
     });
 
+  engine_.set_function(
+    "animation",
+    [&] () -> AnimationSystem& {
+      return game_.getSystem<AnimationSystem>();
+    });
+
+  engine_.set_function(
+    "mixer",
+    [&] () -> Mixer& {
+      return game_.getMixer();
+    });
+
+  engine_.set_function(
+    "getSpriteByAlias",
+    [&] (std::string alias) -> int {
+      return game_.getSpriteByAlias(alias);
+    });
+
   engine_.script_file("../res/scripts/common.lua");
 }