tely/asset: Load up the merchant

feely_pona_game.h

@@ -58,20 +58,8 @@ enum FP_GameEntityActionFlag
     FP_GameEntityActionFlag_Failed          = 1 << 1,
 };
 
-enum FP_ActionType
-{
-    FP_ActionType_Idle,
-    FP_ActionType_Attack,
-    FP_ActionType_WalkUp,
-    FP_ActionType_WalkDown,
-    FP_ActionType_WalkLeft,
-    FP_ActionType_WalkRight,
-    FP_ActionType_Death,
-};
-
 struct FP_ActionToAnimationMapping
 {
-    FP_ActionType              action_type;
     TELY_AssetSpriteSheet     *sheet;
     TELY_AssetSpriteAnimation  anim;
 };
@@ -79,6 +67,7 @@ struct FP_ActionToAnimationMapping
 Dqn_f32 const FP_GAME_ENTITY_ACTION_INFINITE_TIMER = -1.f;
 struct FP_GameEntityAction
 {
+    bool                        flip_on_x;
     uint32_t                    state;
     uint32_t                    flags; // Bit flags corresponding with `FP_GameEntityActionFlag`
     FP_ActionToAnimationMapping mapping;
@@ -98,15 +87,16 @@ enum FP_GameEntityType
 {
     FP_GameEntityType_Terry,
     FP_GameEntityType_Smoochie,
+    FP_GameEntityType_Merchant,
 };
 
 enum FP_GameTerryState
 {
     FP_GameTerryState_Nil,
     FP_GameTerryState_Idle,
-    FP_GameTerryState_AttackA,
-    FP_GameTerryState_AttackB,
-    FP_GameTerryState_AttackC,
+    FP_GameTerryState_AttackUp,
+    FP_GameTerryState_AttackDown,
+    FP_GameTerryState_AttackSide,
     FP_GameTerryState_Run,
     FP_GameTerryState_Dash,
 };
@@ -115,10 +105,18 @@ enum FP_GameSmoochieState
 {
     FP_GameSmoochieState_Nil,
     FP_GameSmoochieState_Idle,
-    FP_GameSmoochieState_Attack,
+    FP_GameSmoochieState_AttackDown,
+    FP_GameSmoochieState_AttackSide,
+    FP_GameSmoochieState_AttackHeart,
     FP_GameSmoochieState_Run,
 };
 
+enum FP_GameTerryMerchantState
+{
+    FP_GameTerryMerchantState_Nil,
+    FP_GameTerryMerchantState_Idle,
+};
+
 struct FP_GameEntity
 {
     FP_GameEntity                         *next;
@@ -199,6 +197,9 @@ struct FP_Game
     TELY_AssetSpriteSheet                   smoochie_sprite_sheet;
     Dqn_Slice<FP_ActionToAnimationMapping>  smoochie_action_mappings;
 
+    TELY_AssetSpriteSheet                   terry_merchant_sprite_sheet;
+    Dqn_Slice<FP_ActionToAnimationMapping>  terry_merchant_action_mappings;
+
     FP_GameEntity                          *root_entity;
     FP_GameEntity                          *entity_free_list;