dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat clone objects in JSON

Browse Source
This commit is contained in:
GriffinR
2022-02-05 14:02:35 -05:00
parent dd5f6ccd3b
commit 38601cf09b
363 changed files with 1711 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mapjson/mapjson.cpp
+22 -13
View File
@@ -288,19 +288,28 @@ string generate_firered_map_events_text(Json map_data) {
text << objects_label << "::\n";
for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i];
text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", "
<< (obj_event["in_connection"].bool_value() ? 255 : 0) << ", "
<< obj_event["x"].int_value() << ", "
<< obj_event["y"].int_value() << ", "
<< obj_event["elevation"].int_value() << ", "
<< obj_event["movement_type"].string_value() << ", "
<< obj_event["movement_range_x"].int_value() << ", "
<< obj_event["movement_range_y"].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";
string type = obj_event["type"].string_value();
if (type == "object") {
text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", "
<< obj_event["x"].int_value() << ", "
<< obj_event["y"].int_value() << ", "
<< obj_event["elevation"].int_value() << ", "
<< obj_event["movement_type"].string_value() << ", "
<< obj_event["movement_range_x"].int_value() << ", "
<< obj_event["movement_range_y"].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";
} else if (type == "clone") {
text << "\tclone_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", "
<< obj_event["x"].int_value() << ", "
<< obj_event["y"].int_value() << ", "
<< obj_event["target_local_id"].int_value() << ", "
<< obj_event["target_map"].string_value() << "\n";
}
}
text << "\n";
} else {