diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:19:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 01:19:16 -0500 |
| commit | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (patch) | |
| tree | 1170647551cd0b2d79c0b1543a09198aeb10612a /tools/mapjson/mapjson.cpp | |
| parent | 5695617d64335474ead8a7e25c539daebcc55fa5 (diff) | |
| parent | 367c7b5f89e9433b7e11af645afbaaa6f4002930 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'tools/mapjson/mapjson.cpp')
| -rw-r--r-- | tools/mapjson/mapjson.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 2dd6e5b31..1cf196fda 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -161,8 +161,8 @@ string generate_map_events_text(Json map_data) { << obj_event["movement_type"].string_value() << ", " << obj_event["movement_range_x"].int_value() << ", " << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].int_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " << obj_event["script"].string_value() << ", " << obj_event["flag"].string_value() << "\n"; } @@ -197,7 +197,7 @@ string generate_map_events_text(Json map_data) { << coord_event["y"].int_value() << ", " << coord_event["elevation"].int_value() << ", " << coord_event["var"].string_value() << ", " - << coord_event["var_value"].int_value() << ", " + << coord_event["var_value"].string_value() << ", " << coord_event["script"].string_value() << "\n"; } else if (coord_event["type"] == "weather") { |