From 6ee27646f717e3e74eb440db441a142670cff655 Mon Sep 17 00:00:00 2001 From: Valiant Date: Tue, 24 Dec 2019 11:51:21 +0400 Subject: [PATCH 1/3] Removed autonote from "ambient" map extras --- data/json/overmap/map_extras.json | 42 +++++++++++-------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index bad3eb720a600..a9cb43b2884f2 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -13,8 +13,7 @@ "description": "There is a crater here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_crater" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_fumarole", @@ -23,8 +22,7 @@ "description": "There is a fumarole here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_fumarole" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_collegekids", @@ -53,8 +51,7 @@ "description": "Roadworks are here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadworks" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_mayhem", @@ -63,8 +60,7 @@ "description": "Road mayhem is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_mayhem" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_roadblock", @@ -223,8 +219,7 @@ "description": "This area is covered with a single type of trees.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_grove" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_shrubbery", @@ -233,8 +228,7 @@ "description": "This area is covered with a single type of shrubs.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_shrubbery" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_clearcut", @@ -243,8 +237,7 @@ "description": "Most trees in this area were uniformly cut down.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clearcut" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_pond", @@ -253,8 +246,7 @@ "description": "Small pond is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_pond" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_trees", @@ -284,8 +276,7 @@ "description": "Small clay deposit is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clay_deposit" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_dead_vegetation", @@ -294,8 +285,7 @@ "description": "Dead vegetation is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_dead_vegetation" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_point_dead_vegetation", @@ -304,8 +294,7 @@ "description": "Dead vegetation is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_dead_vegetation" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_burned_ground", @@ -314,8 +303,7 @@ "description": "Burned ground is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_burned_ground" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_point_burned_ground", @@ -324,8 +312,7 @@ "description": "Burned ground is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_burned_ground" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_marloss_pilgrimage", @@ -344,8 +331,7 @@ "description": "Several spent casings are here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_casings" }, "sym": "x", - "color": "yellow", - "autonote": true + "color": "yellow" }, { "id": "mx_looters", From cb5429d6ca5cd973a78b8710168e0ab450dbe97b Mon Sep 17 00:00:00 2001 From: Valiant Date: Tue, 24 Dec 2019 11:51:55 +0400 Subject: [PATCH 2/3] Fixed autonote for bandits roadblock --- data/json/overmap/map_extras.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index a9cb43b2884f2..fcefb7f85739c 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -77,7 +77,7 @@ "type": "map_extra", "name": "Roadblock (Bandits)", "description": "This road is blocked by bandits.", - "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadblock" }, + "generator": { "generator_method": "map_extra_function", "generator_id": "mx_bandits_block" }, "sym": "x", "color": "yellow", "autonote": true From 73cd22a71f9834f8339afef4f0c766c13f09a0c1 Mon Sep 17 00:00:00 2001 From: Valiant Date: Tue, 24 Dec 2019 12:23:15 +0400 Subject: [PATCH 3/3] Revert "Removed autonote from "ambient" map extras" This reverts commit 6ee27646f717e3e74eb440db441a142670cff655. --- data/json/overmap/map_extras.json | 42 ++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index fcefb7f85739c..9bf619d283ff8 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -13,7 +13,8 @@ "description": "There is a crater here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_crater" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_fumarole", @@ -22,7 +23,8 @@ "description": "There is a fumarole here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_fumarole" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_collegekids", @@ -51,7 +53,8 @@ "description": "Roadworks are here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_roadworks" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_mayhem", @@ -60,7 +63,8 @@ "description": "Road mayhem is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_mayhem" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_roadblock", @@ -219,7 +223,8 @@ "description": "This area is covered with a single type of trees.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_grove" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_shrubbery", @@ -228,7 +233,8 @@ "description": "This area is covered with a single type of shrubs.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_shrubbery" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_clearcut", @@ -237,7 +243,8 @@ "description": "Most trees in this area were uniformly cut down.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clearcut" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_pond", @@ -246,7 +253,8 @@ "description": "Small pond is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_pond" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_trees", @@ -276,7 +284,8 @@ "description": "Small clay deposit is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_clay_deposit" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_dead_vegetation", @@ -285,7 +294,8 @@ "description": "Dead vegetation is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_dead_vegetation" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_point_dead_vegetation", @@ -294,7 +304,8 @@ "description": "Dead vegetation is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_dead_vegetation" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_burned_ground", @@ -303,7 +314,8 @@ "description": "Burned ground is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_burned_ground" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_point_burned_ground", @@ -312,7 +324,8 @@ "description": "Burned ground is here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_point_burned_ground" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_marloss_pilgrimage", @@ -331,7 +344,8 @@ "description": "Several spent casings are here.", "generator": { "generator_method": "map_extra_function", "generator_id": "mx_casings" }, "sym": "x", - "color": "yellow" + "color": "yellow", + "autonote": true }, { "id": "mx_looters",