summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-06-19 12:44:30 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-06-19 12:44:30 +0200
commit1145d52a35efbdc6bc17f86f60474f2eeb21ca30 (patch)
tree39e613785339f082595dc18e30dce72336199330 /src/battlemap
parenteeb52fb3927e810f7763a4ac2d8b246b09ecd88c (diff)
Fixes command order, tiles data.
Diffstat (limited to 'src/battlemap')
-rw-r--r--src/battlemap/query/bm_load_state.erl4
-rw-r--r--src/battlemap/struct/bm_tile.erl6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battlemap/query/bm_load_state.erl b/src/battlemap/query/bm_load_state.erl
index d7c53c7..4b5b3ab 100644
--- a/src/battlemap/query/bm_load_state.erl
+++ b/src/battlemap/query/bm_load_state.erl
@@ -113,10 +113,10 @@ generate_reply (QueryState, Input) ->
OutputList =
(
- [SetTimeline, SetMap | AddWeaponList]
+ AddTileList
+ ++ [SetTimeline, SetMap | AddWeaponList]
++ AddArmorList
++ AddCharList
- ++ AddTileList
),
Output = jiffy:encode(OutputList),
diff --git a/src/battlemap/struct/bm_tile.erl b/src/battlemap/struct/bm_tile.erl
index f8ce633..1e960bc 100644
--- a/src/battlemap/struct/bm_tile.erl
+++ b/src/battlemap/struct/bm_tile.erl
@@ -68,8 +68,8 @@ from_id (0) ->
id = 0,
name = <<"[Grassland] Grass">>,
cost = 6,
- class_range_min = 1,
- class_range_max = 1
+ class_range_min = 0,
+ class_range_max = 0
};
from_id (1) ->
#tile
@@ -92,7 +92,7 @@ from_id (2) ->
from_id (3) ->
#tile
{
- id = 2,
+ id = 3,
name = <<"[Grassland] Clear Water">>,
cost = cost_when_oob(),
class_range_min = 3,