| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-02-15 22:29:05 +0100 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-02-15 22:29:05 +0100 |
| commit | 1e3ed11d30c5c6639de10caca2eea898e506e4cf (patch) | |
| tree | 4bd676ed07ca71c46506b1fc3c1b54a9847e3466 /src/battle/query | |
| parent | 11ba787cd7a9bbcd0dff71176285337375313409 (diff) | |
Markers/triggers, shr_tile -> shr_tile{,_instance}
Diffstat (limited to 'src/battle/query')
| -rw-r--r-- | src/battle/query/btl_load.erl | 9 |
1 files changed, 7 insertions, 2 deletions
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)) ), |