Markers/triggers, shr_tile -> shr_tile{,_instance}

5 files changed, 14 insertions, 9 deletions

diff --git a/src/battle/mechanic/turn_action/btl_turn_actions_move.erl b/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
index 814239b..db46ef0 100644
--- a/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
+++ b/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
@@ -30,8 +30,8 @@ cross (_Map, _ForbiddenLocations, [], Cost, Location) ->
 cross (Map, ForbiddenLocations, [Step|NextSteps], Cost, Location) ->
    NextLocation = shr_location:apply_direction(Step, Location),
    NextTileInstance = shr_map:get_tile_instance(NextLocation, Map),
-   NextTileClassID = shr_tile:extract_main_class_id(NextTileInstance),
-   NextTile = shr_tile:from_class_id(NextTileClassID),
+   NextTileClassID = shr_tile_instance:get_tile_id(NextTileInstance),
+   NextTile = shr_tile:from_id(NextTileClassID),
    NextCost = (Cost + shr_tile:get_cost(NextTile)),
    IsForbidden =
       lists:foldl
diff --git a/src/battle/query/btl_load.erl b/src/battle/query/btl_load.erl
index eec8edb..7748c68 100644
--- a/src/battle/query/btl_load.erl
+++ b/src/battle/query/btl_load.erl
@@ -100,7 +100,12 @@ generate_reply (QueryState, Input) ->
          btl_battle:get_encoded_last_turns_effects(Battle)
       ),
 
-   SetMap = shr_set_map:generate(btl_battle:get_map(Battle)),
+   SetMap =
+      shr_set_map:generate
+      (
+         fun (_TriggerName) -> false end,
+         btl_battle:get_map(Battle)
+      ),
 
    AddCharList =
       lists:map
@@ -151,7 +156,7 @@ generate_reply (QueryState, Input) ->
       lists:map
       (
          fun (TileClassID) ->
-            btl_add_tile:generate(shr_tile:from_class_id(TileClassID))
+            btl_add_tile:generate(shr_tile:from_id(TileClassID))
          end,
          ordsets:to_list(btl_battle:get_used_tile_ids(Battle))
       ),
diff --git a/src/battle/reply/btl_add_tile.erl b/src/battle/reply/btl_add_tile.erl
index bf76547..980628d 100644
--- a/src/battle/reply/btl_add_tile.erl
+++ b/src/battle/reply/btl_add_tile.erl
@@ -21,7 +21,7 @@ generate (Tile) ->
    {
       [
          {<<"msg">>, <<"add_tile">>},
-         {<<"id">>, shr_tile:get_class_id(Tile)},
+         {<<"id">>, shr_tile:get_id(Tile)},
          {<<"nam">>, shr_tile:get_name(Tile)},
          {<<"ct">>, shr_tile:get_cost(Tile)},
          {<<"omni">>, shr_omnimods:encode(shr_tile:get_omnimods(Tile))}
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl
index 7237072..2a09244 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -12,7 +12,7 @@
       used_armor_ids :: ordsets:ordset(shr_armor:id()),
       used_weapon_ids :: ordsets:ordset(shr_weapon:id()),
       used_portrait_ids :: ordsets:ordset(shr_portrait:id()),
-      used_tile_ids :: ordsets:ordset(shr_tile:class_id()),
+      used_tile_ids :: ordsets:ordset(shr_tile:id()),
       map :: shr_map:type(),
       characters :: orddict:orddict(non_neg_integer(), btl_character:type()),
       players :: orddict:orddict(non_neg_integer(), btl_player:type()),
@@ -99,7 +99,7 @@ get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids.
 -spec get_used_armor_ids (type()) -> ordsets:ordset(shr_armor:id()).
 get_used_armor_ids (Battle) -> Battle#battle.used_armor_ids.
 
--spec get_used_tile_ids (type()) -> ordsets:ordset(shr_tile:class_id()).
+-spec get_used_tile_ids (type()) -> ordsets:ordset(shr_tile:id()).
 get_used_tile_ids (Battle) -> Battle#battle.used_tile_ids.
 
 -spec get_map (type()) -> shr_map:type().
diff --git a/src/battle/struct/btl_character_current_data.erl b/src/battle/struct/btl_character_current_data.erl
index 0be920b..3f25345 100644
--- a/src/battle/struct/btl_character_current_data.erl
+++ b/src/battle/struct/btl_character_current_data.erl
@@ -48,8 +48,8 @@
    -> shr_omnimods:type().
 location_to_omnimods (Location, Map) ->
    TileInstance = shr_map:get_tile_instance(Location, Map),
-   TileClassID = shr_tile:extract_main_class_id(TileInstance),
-   Tile = shr_tile:from_class_id(TileClassID),
+   TileClassID = shr_tile_instance:get_tile_id(TileInstance),
+   Tile = shr_tile:from_id(TileClassID),
 
    shr_tile:get_omnimods(Tile).