From 160ea81eead66cfbe4c7a467745319270019e391 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Fri, 29 Dec 2023 20:43:36 -0600 Subject: [PATCH 01/12] Commit for remote --- .../itemgroups/Clothing_Gear/clothing.json | 144 +++--- data/json/itemgroups/military.json | 17 +- .../mapgen/military/mil_base/mil_base_z0.json | 435 ++++++++---------- .../military/mil_base_palette.json | 4 +- 4 files changed, 288 insertions(+), 312 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 8acbd7375037..b4daa3473870 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -113,20 +113,29 @@ "id": "clothing_military_distribution", "type": "item_group", "subtype": "distribution", - "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", - "items": [ - { "group": "clothing_soldier_shirt" }, - { "distribution": [ { "item": "jacket_army", "prob": 50 }, { "item": "tshirt", "prob": 50 } ] }, - { "item": "pants_army" }, - { "item": "webbing_belt" }, - { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] }, - { "item": "boots_combat" }, - { - "distribution": [ - { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }, - { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] } - ] - } + "//": "Assorted basic clothing for military stockpiles. Excludes underwear, armor and storage items", + "items": [ + { "item": "helmet_liner", "prob": 5 }, + { "item": "balclava", "prob": 5 }, + { "item": "hood_rain", "prob": 5 }, + { "item": "beret", "prob": 3 }, + { "item": "beret_wool", "prob": 2 }, + { "item": "jacket_army", "prob": 5 }, + { "item": "winter_jacket_army", "prob": 5 }, + { "item": "coat_rain", "prob": 3 }, + { "item": "folding_poncho", "prob": 2 }, + { "item": "webbing_belt", "prob": 5 } + { "item": "gloves_liner", "prob": 3 }, + { "item": "gloves_liner_wool", "prob": 2 }, + { "item": "winter_gloves_army", "prob": 5 }, + { "item": "gloves_tactical", "prob": 10 }, + { "item": "pants_army", "prob": 5 }, + { "item": "winter_pants_army", "prob": 5 }, + { "item": "knee_pads", "prob": 5 }, + { "item": "elbow_pads", "prob": 5 }, + { "item": "boots", "prob": 10 }, + { "item": "boots_combat", "prob": 10 } + ] }, { @@ -376,7 +385,7 @@ "type": "item_group", "//": "Tactical gear that can be strapped to the legs", "subtype": "distribution", - "entries": [ { "item": "legpouch_large", "prob": 100 }, { "item": "legrig", "prob": 100 } ] + "entries": [ { "item": "legpouch", "prob": 25 }, { "item": "legpouch_large", "prob": 75 }, { "item": "legrig", "prob": 50 }, { "item": "dump_pouch", "prob": 50 }, { "item": "grenadebandolier", "prob": 25 }, { "item": "grenadebandolier", "prob": 25 } ] }, { "id": "clothing_tactical_torso", @@ -391,9 +400,31 @@ { "item": "backpack_tactical_large", "prob": 20 }, { "item": "tacvest", "prob": 160 }, { "item": "molle_pack", "prob": 100 }, - { "item": "rucksack", "prob": 80 } + { "item": "rucksack", "prob": 80 }, + { "item": "duffelbag", "prob": 20 }, + { "item": "bigback", "prob": 10 } + ] + }, + + { + "id": "military_ballistic_armor", + "type": "item_group", + "//": "All ballistic armor items one might see in a military stockpile", + "subtype": "distribution", + "entries": [ + { "item": "kevlar", "prob": 5 }, + { "item": "modularvest", "prob": 10 }, + { "item": "modularvestceramic", "prob": 20 }, + { "item": "modularvesthard", "prob": 5 }, + { "item": helmet_army"", "prob": 30 }, + { "item": "tac_helmet", "prob": 10 }, + { "item": "glasses_bal", "prob": 10 }, + { "item": "mask_bal", "prob": 5 }, + { "item": "shield_ballistic", "prob": 5 } ] }, + + { "id": "clothing_watch", "type": "item_group", @@ -1900,78 +1931,48 @@ "type": "item_group", "id": "mil_armor", "items": [ - [ "pants_army", 10 ], - [ "jacket_army", 10 ], - [ "winter_pants_army", 30 ], - [ "winter_jacket_army", 30 ], - [ "winter_gloves_army", 30 ], - [ "army_top", 30 ], - [ "kevlar", 10 ], - [ "modularvest", 25 ], - [ "modularvestceramic", 30 ], - [ "vest", 15 ], + { "group": "clothing_military_distribution", "prob": 500 }, + { "group": "clothing_tactical_torso", "prob": 75 }, + { "group": "clothing_tactical_leg", "prob": 50 }, + { "group": "military_ballistic_armor", "prob": 200 }, + { "group": "pwr_armor", "prob": 10 }, + { "group": "pwr_armor_acc", "prob": 10 }, + [ "chestguard_hard", 20 ], + [ "armguard_hard", 20 ], + [ "legguard_hard", 15 ], [ "mask_gas", 10 ], [ "goggles_nv", 1 ], [ "goggles_ir", 1 ], [ "optical_cloak", 1 ], [ "holo_cloak", 1 ], - [ "backpack", 32 ], [ "adv_UPS_off", 10 ], - [ "tacvest", 10 ], - [ "molle_pack", 8 ], - [ "duffelbag", 15 ], - [ "dump_pouch", 20 ], - [ "legrig", 10 ], - [ "under_armor", 20 ], - [ "boots", 70 ], - [ "boots_combat", 70 ], - [ "gloves_tactical", 30 ], - [ "glasses_bal", 40 ], - [ "chestguard_hard", 20 ], - [ "armguard_hard", 20 ], - [ "legguard_hard", 15 ], - [ "power_armor_helmet_basic", 3 ], - [ "power_armor_basic", 3 ], - [ "power_armor_frame", 4 ], - [ "power_armor_back_holster", 1 ], - [ "power_armor_holster", 1 ], - [ "power_armor_chest_rig", 1 ], - [ "power_armor_bscabbard", 1 ], - [ "power_armor_scabbard", 1 ], - [ "power_armor_sheath", 1 ], - [ "helmet_army", 40 ], - [ "helmet_liner", 10 ], - [ "beret", 50 ], - [ "beret_wool", 40 ], - [ "elbow_pads", 50 ], - [ "knee_pads", 50 ], - [ "solarpack", 5 ], - [ "shield_ballistic", 3 ] + [ "solarpack", 5 ] ] }, { "type": "item_group", "id": "pwr_armor", - "items": [ - [ "power_armor_helmet_basic", 10 ], - [ "power_armor_basic", 10 ], - [ "power_armor_heavy", 5 ], - [ "power_armor_helmet_heavy", 5 ], - [ "power_armor_light", 15 ], - [ "power_armor_helmet_light", 15 ] + "subtype": "distribution", + "entries": [ + { "collection": [ { "item": "power_armor_basic" }, { "item": "power_armor_helmet_basic", "prob": 75 } ], "prob": 40 }, + { "item": "power_armor_helmet_basic", "prob": 10 }, + { "collection": [ { "item": "power_armor_light" }, { "item": "power_armor_helmet_light", "prob": 75 } ], "prob": 20 }, + { "item": "power_armor_helmet_light", "prob": 5 }, + { "collection": [ { "item": "power_armor_heavy" }, { "item": "power_armor_helmet_heavy", "prob": 75 } ], "prob": 20 }, + { "item": "power_armor_helmet_heavy", "prob": 5 } ] }, { "type": "item_group", "id": "pwr_armor_acc", "items": [ - [ "power_armor_frame", 1 ], - [ "power_armor_back_holster", 1 ], - [ "power_armor_holster", 1 ], - [ "power_armor_chest_rig", 1 ], - [ "power_armor_bscabbard", 1 ], - [ "power_armor_scabbard", 1 ], - [ "power_armor_sheath", 1 ] + [ "power_armor_frame", 25 ], + [ "power_armor_chest_rig", 25 ], + [ "power_armor_back_holster", 10 ], + [ "power_armor_holster", 10 ], + [ "power_armor_bscabbard", 10 ], + [ "power_armor_scabbard", 10 ], + [ "power_armor_sheath", 10 ] ] }, { @@ -2023,6 +2024,7 @@ "type": "item_group", "id": "mil_armor_torso", "items": [ + { "group": "clothing_tactical_torso", "prob": 75 }, [ "kevlar", 10 ], [ "modularvest", 25 ], [ "modularvestceramic", 30 ], diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 89107732ab8c..6d58000ad83f 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -410,9 +410,7 @@ "id": "army_bed", "subtype": "distribution", "entries": [ - { "item": "blanket", "prob": 70 }, - { "item": "pillow", "prob": 70 }, - { "item": "sheet", "prob": 70 }, + { "group": "mil_bedding", "prob": 210 }, { "item": "mag_porn", "prob": 40 }, { "item": "mag_comic", "prob": 10 }, { "item": "mag_guns", "prob": 10 }, @@ -428,6 +426,19 @@ { "item": "mag_rifle", "prob": 10 } ] }, + { + "type": "item_group", + "id": "mil_bedding", + "subtype": "distribution", + "entries": [ + { "item": "pillow", "prob": 25 }, + { "item": "sleeping_bag_roll", "prob": 15 }, + { "item": "rollmat", "prob": 10 }, + { "item": "blanket", "prob": 15 }, + { "item": "sheet", "prob": 10 }, + { "item": "emer_blanket", "prob": 25 } + ] + }, { "type": "item_group", "id": "mil_hw", diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 245dc52e8b69..b852e90b66aa 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -87,19 +87,19 @@ "x ,, b,,, sss________________sss ", "x ,,,b,,,, sss_______yy_______sss ", "x ,, b,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,~,,, sss_______yy_______sss ", - "x,,, b,,,, ,--------w-----w-----w---------, sss_______yy_______sss ", - "x ,, b,,,, ,|T+.+T|K[KlKlK[KlKlKlKlKlccou|, sss________________sss ", - "x ,, b ,, ,|--.--|K.K.K.K.K.K.K.K.K....u|, sss_______yy_______sss ", - "x,,, b,,, ,,|T+.+T|..................[[..w, sss_______yy_______sss ", - "x,,,,b ,,, ,-|--.--|..................[[..|, sss_______yy_______sss ", + "x,,, b,,,, ,||||||||w|||||w|||||w|||||||||, sss_______yy_______sss ", + "x ,, b,,,, ,|T+.+T-K[KlKlK[KlKlKlKlKlccou|, sss________________sss ", + "x ,, b ,, ,|--.---K.K.K.K.K.K.K.K.K....u|, sss_______yy_______sss ", + "x,,, b,,, ,,|T+.+T-..................[[..w, sss_______yy_______sss ", + "x,,,,b ,,, ,||--.---..................[[..|, sss_______yy_______sss ", "x,,, b ,, ,7|T+...+..lllll.llll.llll.....|, sss________________sss ", - "x ,, b ,, ,6|---.-|t.-----.----.----.....w, sss_______yy_______sss,", - "x ,, b ,,, ,-|LLL.S|..lllll.llll.llll....t|, ,sss_______yy_______sss,", - "x ,, b,,,, ,,|L...S|..................h|+-|, , , , ,,,sss_______yy_______sss,", - "x,,,,b,,, ,|L.&.S|...................|..w, ,,, ,, ,,,,,,,,,sss________________sss,", - "x ,, b ,, ,|L...S|..K.K.K.K.K.K.K.K.K|h.+,,,,,,,,,,,,,,,,,,sss_______yy_______sss,", - "x ,, b ,, ,|LLL.S|l[KlKlK.KlKlK[KlKlK|h.|,,,,,,,,,, ,,,,,,,sss_______yy_______sss,", - "x ,, b,,, ,--------w-----w-----w---------,,,,,, , , ,,,,sss_______yy_______sss,", + "x ,, b ,, ,6|---.--t.-----.----.----.....w, sss_______yy_______sss,", + "x ,, b ,,, ,||LLL.S-..lllll.llll.llll....t|, ,sss_______yy_______sss,", + "x ,, b,,,, ,,|L...S-..................h-+-|, , , , ,,,sss_______yy_______sss,", + "x,,,,b,,, ,|L.&.S-...................-..w, ,,, ,, ,,,,,,,,,sss________________sss,", + "x ,, b ,, ,|L...S-..K.K.K.K.K.K.K.K.K-h.z,,,,,,,,,,,,,,,,,,sss_______yy_______sss,", + "x ,, b ,, ,|LLL.S-l[KlKlK.KlKlK[KlKlK-h.|,,,,,,,,,, ,,,,,,,sss_______yy_______sss,", + "x ,, b,,, ,||||||||w|||||w|||||w|||||||||,,,,,, , , ,,,,sss_______yy_______sss,", "x,,,,b ,,, ,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,,, ,,,sss________________sss,", "x ,, b ,, ,, ,sss_______yy_______sss,", "x ,, b,,,, ,, sss_______yy_______sss ", @@ -107,7 +107,7 @@ "x,,, b ,,, ,, sss________________sss ", "x ,, b ,,, ,, sss_______yy_______sss ", "x ,, b,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,~,,, ,,, sss_______yy_______sss ", - "x,,, b,,,, ,--------w-----w-----w---------, ,, sss_______yy_______sss " + "x,,, b,,,, ,||||||||w|||||w|||||w|||||||||, ,, sss_______yy_______sss " ], "palettes": [ "mil_base_palette" ], "items": { @@ -217,14 +217,17 @@ " ,,,NNN, ,,,,,b ,, x", " ,,, ,,, b ,,,x", " ,,,,,, ,,,,,, ,,,,,, ,, b ,, x", + + + " ,,,,,,|67|,,,,, ,,,,,,|67|,,,,, ,,,,,,|67|,,,,, ,,,,b,,, x", - " ,-------------, ,-------------, ,-------------, ,, b ,, x", - " ,|LLLLL|T|T|T|, ,|LLLLL|T|T|T|, ,|LLLLL|T|T|T|, ,,,,b ,,,x", - " ~|L...L|+|+|+|, ~|L...L|+|+|+|, ~|L...L|+|+|+|, ,, b,,,,x", - " ,|L.&.L|.....|, ,|L.&.L|.....|, ,|L.&.L|.....|, ,,,b ,, x", - " ,|.......|+|+|, ,|.......|+|+|, ,|.......|+|+|, ,,, b ,,,x", - " ,|SSSSS|.|T|T|, ,|SSSSS|.|T|T|, ,|SSSSS|.|T|T|, ,,, b ,, x", - " ,|------+-----, ,|------+-----, ,|------+-----, ,,,b,,, x", + " ,|||||||||||||, ,|||||||||||||, ,|||||||||||||, ,, b ,, x", + " ,|LLLLL-T-T-T|, ,|LLLLL-T-T-T|, ,|LLLLL-T-T-T|, ,,,,b ,,,x", + " ~|L...L-+-+-+|, ~|L...L-+-+-+|, ~|L...L-+-+-+|, ,, b,,,,x", + " ,|L.&.L-.....|, ,|L.&.L-.....|, ,|L.&.L-.....|, ,,,b ,, x", + " ,|.......-+-+|, ,|.......-+-+|, ,|.......-+-+|, ,,, b ,,,x", + " ,|SSSSS-.-T-T|, ,|SSSSS-.-T-T|, ,|SSSSS-.-T-T|, ,,, b ,, x", + " ,|------+----|, ,|------+----|, ,|------+----|, ,,,b,,, x", " ,|KK........l|, ,|KK.......KK|, ,|l........KK|, ,,,b ,, x", " ,w[.........[w, ,w[..........w, ,w[..........w, ,,, b ,, x", " ,|KK..l-l..KK|, ,|KK..l-l..KK|, ,|KK..l-l..KK|, ,,,b,,, x", @@ -246,8 +249,8 @@ " ,|KK....[[..c|, ,|KK....hh..c|, ,|KK....[[h.c|, ,,, b ,,,x", " ,|----..[[h.c|, ,|l.....[[..c|, ,|----.h[[h.c|, ,, b,,,,x", " ,|h..+..h...o|~ ,|[.....[[h.o|~ ,|[..+......o|~ ,,,,b ,, x", - " ,|h.[|t....uu|, ,|t..[[....uu|, ,|[.h|[tuu.uu|, ,,,,b ,,,x", - " ,--+w--w--w---, ,--+w--w--w---, ,--+w--w--w---, ,, b ,, x", + " ,|h.[-t....uu|, ,|t..[[....uu|, ,|[.h-[tuu.uu|, ,,,,b ,,,x", + " ,||zw||w||w|||, ,||zw||w||w|||, ,||zw||w||w|||, ,, b ,, x", ", ,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,, ,,, b,,, x", ",,, ,,,,,,, ,,,,,, ,,,,,, , ,,,,b ,, x", ",,,,, ,, ,,,,,,,,,,,,,, ,,,,,,,,,,,,,, , , , ,,,,,,,,,,, , , , ,,,,,,,b ,, x", @@ -324,18 +327,18 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - "x ,, b,,,, ,|T+.+T|K[KlKlK[KlKlKlKlKlccoc|, ,,, sss________________sss ", - "x ,, b ,, ,|--.--|K.K.K.K.K.K.K.K.K.....|, ,, sss_______yy_______sss ", - "x,,, b,,, ,,|T+.+T|..................uu..w, ,, sss_______yy_______sss ", - "x,,,,b ,,, ,-|--.--|..................uu..|, ,, sss_______yy_______sss ", + "x ,, b,,,, ,|T+.+T-K[KlKlK[KlKlKlKlKlccoc|, ,,, sss________________sss ", + "x ,, b ,, ,|--.---K.K.K.K.K.K.K.K.K.....|, ,, sss_______yy_______sss ", + "x,,, b,,, ,,|T+.+T-..................[[..w, ,, sss_______yy_______sss ", + "x,,,,b ,,, ,||--.---..................[[..|, ,, sss_______yy_______sss ", "x,,, b ,, ,7|T+...+..lllll.llll.llll.h...|, ,,, sss________________sss ", - "x ,, b ,, ,6|---.-|t.-----.----.----.....w, ,, ,sss_______yy_______sss ", - "x ,, b ,,, ,-|LLL.S|..lllll.llll.llll....h|, ,,, ,sss_______yy_______sss ", - "x ,, b,,,, ,,|L...S|..................t|+-|, ,,,,, , ,,sss_______yy_______sss ", - "x,,,,b,,, ,|L.&.S|...................|..w,,,,,,,,,,,,,, ,,,sss________________sss ", - "x ,, b ,, ,|L...S|K.K.K.K.K.K.K.K.K.K|..+,,,,,,,,,,,,,,,,,,sss_______yy_______sss ", - "x ,, b ,, ,|LLL.S|K[KlKlK.KlKlK[KlKlK|.Y|,, , , ,,,,,,sss_______yy_______sss ", - "x ,, b,,, ,--------w-----w-----w---------, ,,sss_______yy_______sss ", + "x ,, b ,, ,6|---.--t.-----.----.----.....w, ,, ,sss_______yy_______sss ", + "x ,, b ,,, ,||LLL.S-..lllll.llll.llll....h|, ,,, ,sss_______yy_______sss ", + "x ,, b,,,, ,,|L...S-..................t-+-|, ,,,,, , ,,sss_______yy_______sss ", + "x,,,,b,,, ,|L.&.S-...................-..w,,,,,,,,,,,,,, ,,,sss________________sss ", + "x ,, b ,, ,|L...S-K.K.K.K.K.K.K.K.K.K-..z,,,,,,,,,,,,,,,,,,sss_______yy_______sss ", + "x ,, b ,, ,|LLL.S-K[KlKlK.KlKlK[KlKlK-.Y|,, , , ,,,,,,sss_______yy_______sss ", + "x ,, b,,, ,||||||||w|||||w|||||w|||||||||, ,,sss_______yy_______sss ", "x,,,,b ,,, ,,,~,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,sss________________sss ", "x,,, b ,,, sss_______yy_______sss ", "x ,, b ,, sss_______yy_______sss ", @@ -344,29 +347,29 @@ "x ,,,b ,, sss_______yy_______sss ", "x ,, b ,, sssssssssssssss sss_______yy_______sss ", "x ,, b,,,, sssssssssssssss sss_______yy_______sss ", - "x ,, b ,, ss-----------sssssssss________________sss ", - "x,,, b,,, ss|T|T|T|T|T|sssssssss_______yy_______sss ", - "x ,, b ,,, ss|+|+|+|+|+|-w--sssss_______yy_______sss ", + "x ,, b ,, ss|||||||||||sssssssss________________sss ", + "x,,, b,,, ss|T-T-T-T-T|sssssssss_______yy_______sss ", + "x ,, b ,,, ss|+-+-+-+-+||w||sssss_______yy_______sss ", "x ,,,b,,,, sssssssssssssssssssssssss|.........+...|sssss_______yy_______sss ", - "x ,,,b ,, ssssssssssssssssssssssssss~|tScStScSt|...wsssss________________sss ", - "x,,, b ,, ssss------w--w--w--w--w--w------------...+sssss_______yy_______ssss", - "x ,, b,,, ss---u.S|u.c.........................+...+sssss_______yy_______ssss", - "x ,,,b ,, ss|Td...|u.c...hhhhh..hhhh....h.hh...+...wsssss_______yy_______ssss", - "x ,,,b,,,, ss|----d|u.c...[[[[[..[[[[[..[[[[[..t|-+---|sss____________________", - "x,,,,b,,, ss|u.|..|u.c...[[[[[..[[[[[..[[[[[..t|Y.tOO|sss_______yy___________", - "x,,, b ,, ss|u.|..+..c...hh.hh..hhhhh..hh.h...c|.....wsss_______yy___________", - "x ,, b,,, sss|u.d..+...........................c|h[[h.|sss_______yy___________", - "x,,,,b,,, ss~|u.|..|u......hh.h..h.hh....hh.h..c|h[[h.|sss____________________", - "x ,, b ,, ss-----dd-------[[[[[..[[[[[..[[[[[...|.....wsss_______yy___________", - "x,,,,b ,,, ss|uSct..tccccu|[[[[[..[[[[[..[[[[[...|h[[h.|sss_______yy___________", - "x,,, b ,, sswc..........u|hhhhh...h.hh..hhh.h...|h[[h.|sss_______yy________yyy", - "x ,, b,,, ss|u......oo..u-------|...............|.....wsss_________________yyy", - "x ,, b ,,, ss--z-|c..oo..u|uuuuuu|hhh.h...hhh....|h[[h.|sss_______yy___________", - "x,,,,b,,,, sssss{|c..cc..u|......|[[[[[..[[[[[..O|h[[h.|sss_______yy___________", - "x,,,,b,,, sssss{|u..cc...d.uuuuu|[[[[[..[[[[[..O|.....wsss_______yy___________", - "x ,,,b,,, ssss|u.......|......|..hhh..hh.hh..O|h[[h.|sss____________________", - "x ,, b,,, ,ssss|u.uuu..Y|uuuuuu|..............O|h[[h.|sss_______yy___________", - "x,,, b ,,, ,,,ssss--w---wz----------w--w--w--w--w--------sss_______yy___________", + "x ,,,b ,, ssssssssssssssssssssssssss~|tScStScSt-...wsssss________________sss ", + "x,,, b ,, ssss||||||w||w||w||w||w||w||----------...zsssss_______yy_______ssss", + "x ,, b,,, ss|||c.S-u.c.........................+...zsssss_______yy_______ssss", + "x ,,,b ,, ss|Td...-u.c...hhhhh..hhhh....h.hh...+...wsssss_______yy_______ssss", + "x ,,,b,,,, ss|----d-u.c...[[[[[..[[[[[..[[[[[..t--+-|||sss____________________", + "x,,,,b,,, ss|u.-..-u.c...[[[[[..[[[[[..[[[[[..t-Y.tOO|sss_______yy___________", + "x,,, b ,, ss|u.-..+..c...hh.hh..hhhhh..hh.h...c-.....wsss_______yy___________", + "x ,, b,,, sss|u.d..+...........................c-h[[h.|sss_______yy___________", + "x,,,,b,,, ss~|u.-..-t......hh.h..h.hh....hh.h..c-h[[h.|sss____________________", + "x ,, b ,, ss||---dd-------[[[[[..[[[[[..[[[[[...-.....wsss_______yy___________", + "x,,,,b ,,, ss|uSct..tccccu-[[[[[..[[[[[..[[[[[...-h[[h.|sss_______yy___________", + "x,,, b ,, sswc..........u-hhhhh...h.hh..hhh.h...-h[[h.|sss_______yy________yyy", + "x ,, b,,, ss|u......oo..u--------...............-.....wsss_________________yyy", + "x ,, b ,,, ss||z||c..oo..u-uuuuuu-hhh.h...hhh....-h[[h.|sss_______yy___________", + "x,,,,b,,,, sssss{|c..cc..u-......-[[[[[..[[[[[..O-h[[h.|sss_______yy___________", + "x,,,,b,,, sssss{|u..cc...d.uuuuu-[[[[[..[[[[[..O-.....wsss_______yy___________", + "x ,,,b,,, ssss|u.......-......-..hhh..hh.hh..O-h[[h.|sss____________________", + "x ,, b,,, ,ssss|u.uuu..Y-uuuuuu-..............O-h[[h.|sss_______yy___________", + "x,,, b ,,, ,,,ssss||w|||wz||||||||||w||w||w||w||w||||||||sss_______yy___________", "x,,,,b ,, ,,,,,,ssssssssssssssssssssssssssssssssssssssssssssss_______yy___________", "x ,, b ,, ,NNN,,,ssssssssssssssssssssssssssssssssssssssssssssss________________ssss", "x ,,,b ,,, ,NNnN,,sssssssssssssssssssssssssssssssssssssssssssssss_______yy_______ssss", @@ -374,7 +377,7 @@ "x ,,,b ,,,,, ,,,,,,,,,NNn,,Nss//D///////////////////////////////////////sss_______yy_______ssss", "x ,,,b ,,,,,,,,,,,,,,,,,NNnNNss/e...???????????..???????....<..(>/$$.`OO/sss________________ssss", "x ,, b ,,,,,,,,,,, , ,NNN,ss/...............................///....ht/sss_______yy_______ssss", - "x ,, b,,,,,,,, , ,,, ss/.................................d.i.###gsss_______yy_______sss-", + "x ,, b,,,,,,,, , ,,, ss/.................................d.i.###gsss_______yy_______sss|", "x ,,,b,,,,,, ss/..............................i../...###/sss_______yy_______sss|", "x ,, b,,,,, ss/...........................::..../$.i.ht/sss________________sss|", "x ,,,b ,,, ss/....???????????..???????...::..../$.....gsss_______yy_______sss|", @@ -390,7 +393,7 @@ "G ,,,b,,}},,,, ss/................................./ssssssssss_______yy_______sss|", "G ,, b,,}}},, ss/................................./ssssssssss________________sssw", "x ,,,b,}}}},,, ss/....???????????..???????......i../ssssssssss_______yy_______sss|", - "x ,, bb}}},,,, ss/....???????????..???????.........Dssssssssss_______yy_______sss-", + "x ,, bb}}},,,, ss/....???????????..???????.........Dssssssssss_______yy_______sss|", "x,,, b}},,,,,, ss/.................................Dssssssssss_______yy_______sss~", "x ,,,b,,,,,,, ss/.................................Dssssssssss________________ssss", "x,,,,b ,,,, ss/.................................Dssssssssss_______yy_______ssss", @@ -407,87 +410,47 @@ "{": [ { "item": "trash_cart", "chance": 75, "repeat": [ 10, 20 ] } ], "#": [ { "item": "SUS_office_desk", "chance": 10, "repeat": [ 1, 2 ] } ], "$": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 5 ] } ], + "u": [ { "item": "SUS_pantry", "chance": 75 } ], "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], - "[": [ { "item": "mil_base_mess_hall", "chance": 20 } ], "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ] }, "monster": { "i": { "monster": "mon_zombie_soldier", "chance": 30 } }, "place_loot": [ { "group": "mil_base_hmg", "x": 25, "y": 46, "chance": 10, "magazine": 100 }, - { "group": "mil_base_mess_hall", "x": 38, "y": [ 26, 29 ], "chance": 90, "repeat": [ 50, 200 ] }, - { "group": "mil_base_mess_hall", "x": 32, "y": [ 29, 32 ], "chance": 90, "repeat": [ 250, 500 ] }, - { "group": "SUS_janitors_closet", "x": 34, "y": 26, "chance": 90, "repeat": [ 0, 1 ] }, - { "group": "SUS_kitchen_sink", "x": 31, "y": 34, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_kitchen_sink", "x": 31, "y": 36, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_spice_collection", "x": 41, "y": 34, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_utensils", "x": 42, "y": 34, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_junk_drawer", "x": 42, "y": 35, "chance": 90, "repeat": [ 0, 1 ] }, - { "group": "SUS_knife_drawer", "x": 42, "y": 36, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_dishes", "x": 42, "y": 37, "chance": 90, "repeat": [ 5, 20 ] }, - { "group": "SUS_cookware", "x": 42, "y": 38, "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "SUS_knife_drawer", "x": 35, "y": 39, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_appliances_cupboard", "x": 35, "y": 40, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_cookware", "x": 35, "y": 41, "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "SUS_pantry", "x": [ 44, 47 ], "y": 37, "chance": 90, "repeat": [ 4, 12 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 37, "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "SUS_fridge", "x": [ 45, 47 ], "y": 39, "chance": 90, "repeat": [ 3, 9 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 39, "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "SUS_fridge", "x": [ 44, 47 ], "y": 41, "chance": 90, "repeat": [ 4, 12 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 41, "chance": 90, "repeat": [ 2, 6 ] }, + + { "group": "SUS_janitors_closet", "x": 34, "y": 26 }, + { "group": "SUS_kitchen_sink", "x": 31, "y": 34 }, + { "group": "SUS_kitchen_sink", "x": 31, "y": 36 }, + { "group": "SUS_spice_collection", "x": 41, "y": 34 }, + { "group": "SUS_utensils", "x": 42, "y": 34 }, + { "group": "SUS_junk_drawer", "x": 42, "y": 35 }, + { "group": "SUS_knife_drawer", "x": 42, "y": 36 }, + { "group": "SUS_dishes", "x": 42, "y": 37, "chance": 90, "repeat": 10 }, + { "group": "SUS_cookware", "x": 42, "y": 38, "chance": 90, "repeat": 3 }, + { "group": "SUS_knife_drawer", "x": 35, "y": 39, "chance": 90 }, + { "group": "SUS_appliances_cupboard", "x": 35, "y": 40, "chance": 90 }, + { "group": "SUS_cookware", "x": 35, "y": 41, "chance": 90, "repeat": 3 }, { "item": "american_flag", "x": 95, "y": 47 }, - { "item": "tshirt", "x": 59, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "long_undertop", "x": 58, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "long_underpants", "x": 57, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "socks", "x": 56, "y": 71, "chance": 75, "repeat": [ 100, 200 ] }, - { "item": "socks_wool", "x": [ 55, 54 ], "y": 71, "chance": 75, "repeat": [ 250, 500 ] }, - { "item": "sports_bra", "x": 53, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boy_shorts", "x": 52, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "briefs", "x": 51, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boxer_briefs", "x": 50, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boxer_shorts", "x": 49, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "jacket_army", "x": 46, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_jacket_army", "x": 45, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "pants_army", "x": 44, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_pants_army", "x": 43, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "coat_rain", "x": 42, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "hood_rain", "x": 41, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "folding_poncho", "x": 40, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "webbing_belt", "x": 39, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boots_combat", "x": 38, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "helmet_liner", "x": 37, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "balclava", "x": 36, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "gloves_liner", "x": 46, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_gloves_army", "x": 45, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "emer_blanket", "x": 44, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "towel", "x": 43, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "blanket", "x": 42, "y": 66, "chance": 75, "repeat": [ 50, 200 ] }, - { "item": "sheet", "x": 41, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "ear_plugs", "x": 40, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "legpouch", "x": 39, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "legpouch_large", "x": 38, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "legrig", "x": 37, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "ammo_satchel", "x": 36, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "chestpouch", "x": 55, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "grenadebandolier", "x": 54, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "grenade_pouch", "x": 53, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "dump_pouch", "x": 52, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tacvest", "x": 51, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "backpack", "x": 50, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "camelbak", "x": 49, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "backpack_tactical_large", "x": 55, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "molle_pack", "x": 54, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "rucksack", "x": 53, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "bigback", "x": [ 51, 52 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "duffelbag", "x": [ 49, 50 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "glasses_bal", "x": 46, "y": 65, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "mask_bal", "x": 45, "y": 65, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "helmet_army", "x": [ 43, 44 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tac_helmet", "x": 42, "y": 65, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "gloves_tactical", "x": 41, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "kevlar", "x": 40, "y": 65, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "modularvestceramic", "x": [ 38, 39 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "elbow_pads", "x": 37, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "knee_pads", "x": 36, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, + { "group": "clothing_soldier_shirt", "x": [ 57, 59 ], "y": 71, "chance": 75, "repeat": 25 }, + { "group": "socks_unisex", "x": [ 54, 56 ], "y": 71, "chance": 75, "repeat": 25 }, + { "group": "underwear_unisex", "x": [ 49, 53 ], "y": 71, "chance": 75, "repeat": 25 }, + { "group": "clothing_military_distribution", "x": [ 36, 46 ], "y": 71, "chance": 75, "repeat": 25 }, + { "item": "towel", "x": 36, "y": 66, "chance": 75, "repeat": 10 }, + { "group": "ear_protection", "x": 46, "y": 66, "chance": 75, "repeat": 10 }, + { "group": "mil_bedding", "x": [ 37, 45 ], "y": 66, "chance": 75, "repeat": 25 }, + { "group": "clothing_tactical_leg", "x": [ 49, 55 ], "y": 66, "chance": 75, "repeat": 25 }, + { "group": "clothing_tactical_torso", "x": [ 49, 50 ], "y": 65, "chance": 75, "repeat": 25 }, + { "group": "military_ballistic_armor", "x": [ 36, 46 ], "y": 65, "chance": 75, "repeat": 20 }, + + + + + + + + + + { "item": "light_disposable_cell", "x": 46, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "light_battery_cell", "x": 45, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, { "item": "light_plus_battery_cell", "x": 44, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, @@ -582,27 +545,27 @@ " ,,,b,,,,x", " sssssssssssssssssssssssssssssssss ,, b ,, x", " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX sssssssssssssssssssssssssssssssss ,, b,,,,x", - " X X ss--------z----------DDD--XssXXss ,, b,,, x", - " X X ss|..jjj|...|JJ.JJ.|e....|{ss{Xss ,,, b ,, x", - " X sssssssssssssssssssssssssssss X ss|6....|...|......|..77.|{sssXss ,, b ,, x", + " X X ss||||||||z||||||||||DDD||XssXXss ,, b,,, x", + " X X ss|..jjj-...-JJ.JJ.-e....|{ss{Xss ,,, b ,, x", + " X sssssssssssssssssssssssssssss X ss|6....-...-......-..77.|{sssXss ,, b ,, x", " X sssssssssssssssssssssssssssss X ss|6....d...d......d..77.|{ss{Xss ,,, b ,, x", - " X ss/////////////////////////ss X sssssssssssss|6...u|...|u.pp.u|u.77.|{ss{Xsss ,,, b ,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ssssssssssss~|u...u|...|l.pp.u|u....|{ss{Xsss ,,, b,,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss--w---w---w------|...|-------------------ss ,,,b,,,,x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$.OOt##t..`O|uuu|...|S...+T|c.??..??..?|ss ,,,,b ,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$...h##h...O|u..z...|c...|-|c.??..??..?|ss ,, b,,,,x", - " X ss/](]]])]]])]]])]]])]]])]/ss X ssw.....##....O|..h|...|S...+T|c.??..??..?|ss ,, b ,, x", - " X ss/......................./ss X ss|$........Y.l|tVV|-d----d---|c.??..??..?|ss ,,, b ,, x", - " X ss/uuuuu.uuuuu.uuuuu....../ss X ss|$..l------=------.........>|..........?|ss ,,, b,,,,x", - " X ss///////////////////d///(/ss X ssw...Y|......................d..........?|ss ,,,b ,, x", - " X ss/th..$/uuuu$$/uuuu...u/>/ss X ss|$...=......................|c.??..??..?|ss ,,, b ,, x", - " X ss/###..D......d.......u///ss X ss|$$OO|......................|c.??..??..?|ss ,, b,,, x", - " X ssg###..5$$..[[/u..[[[.u/ssss X ss|-----..-----------------...|c.??..??..?|ss ,, b ,,,x", - " X ss/th..$///ggg//u..[[[../ssss X ss|O$`Y|..|.`$$$|u.QV.qV.v|...|c.??..??..?|ss ,, b ,, x", - " X ss/`....$/[.i.[/u....i../ss X ssw....=..=.....|u.......V|...|...........|ss ,,,,b ,, x", - " X ss/OO...Y/[...[/l.e...../ss X ss|###.|..|Y.###|uh....h..d...|...........|ss ,, b ,,,x", - " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..|..|l..ht|VVVt.VVVu|...|l........e.|ss ,, b ,, x", - " ssssssssssssssssssssssssss ss------w+--w--------d------d-----DDDDDD---ss ,,, b,,, x", + " X ss/////////////////////////ss X sssssssssssss|6...u-...-u.pp.u-u.77.|{ss{Xsss ,,, b ,, x", + " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", + " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", + " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.??..??..?|ss ,,,,b ,, x", + " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", + " X ss/](]]])]]])]]])]]])]]])]/ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", + " X ss/......................./ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", + " X ss/uuuuu.uuuuu.uuuuu....../ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", + " X ss///////////////////d///(/ss X ssw...Y-......................d..........?|ss ,,,b ,, x", + " X ss/th..$/uuuu$$/uuuu...u/>/ss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", + " X ss/###..D......d.......u///ss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", + " X ssg###..5$$..[[/u..[[[.u/ssss X ss|-----..-----------------...-c.??..??..?|ss ,, b ,,,x", + " X ss/th..$///ggg//u..[[[../ssss X ss|O$`Y-..-.`$$$-u.QV.qV.v-...-c.??..??..?|ss ,, b ,, x", + " X ss/`....$/[.i.[/u....i../ss X ssw....=..=.....-u.......V-...-...........|ss ,,,,b ,, x", + " X ss/OO...Y/[...[/l.e...../ss X ss|###.-..-Y.###-uh....h..d...-...........|ss ,, b ,,,x", + " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..-..-l..ht-VVVt.VVVu-...-l........e.|ss ,, b ,, x", + " ssssssssssssssssssssssssss ss||||||wz||w|-------d------d-||||DDDDDD|||ss ,,, b,,, x", "sssssssssssssssssssssssssssssssssssssssssssssssssss|l.uuuu...uuuu...|~s_______________ ,,,b ,, x", "sssssssssssssssssssssssssssssssssssssssssssssssssssz................|{s_______________ ,, b ,,,x", "sssssssssssssssssssssssssssssssssssssssssssssssssss|................|{s_______________ ,,,b ,, x", @@ -623,28 +586,28 @@ "___________________________________________________D................D_________________,,,,b ,, x", "___________________________________________________|e..............e|_________________ ,, b ,,,x", "ssssssssssssssssssssssssssssssss________________sss|..VVVuu.VVVuuu.l|ss_______________ ,, b ,,,x", - "ssssssssssssssssssssssssssssssss________________sss------------------ss_______________,,,,b ,,,x", + "ssssssssssssssssssssssssssssssss________________sss||||||||||||||||||ss_______________,,,,b ,,,x", "ssssssssssssssssssssssssssssssss________________ssss~ssssssssssssssssss_______________ ,,,b,,, x", - "ssssss--w----w-----w-----w---ss ________________sssssssssssssssssssssss_______________,,,,b,,, x", - "ssssss|[..|$$.`U|$`.$$|O...$|ss ________________ _______________,,,,b ,, x", - "ssssss|...|th...|...ht|th..$|ss ______________________________________________________,,, b ,,,x", - "-ww-+--...|###..|..###|###.`|ss ______________________________________________________ ,, b,,, x", - "..........|.....|....O|....U|ss ______________________________________________________ ,, b ,,,x", - "###.......|Y..OO|Y...O|.Y---|ss ______________________________________________________ ,,,b ,,,x", - "th....|...--=-----=----=-///|ss ______________________________________________________,,, b ,, x", - "OOO$$$|..................D>/|ss ______________________________________________________,,, b,,, x", + "ssssss||w||||w|||||w|||||w|||ss ________________sssssssssssssssssssssss_______________,,,,b,,, x", + "ssssss|[..-$$.`U-$`.$$-O...$|ss ________________ _______________,,,,b ,, x", + "ssssss|...-th...-...ht-th..$|ss ______________________________________________________,,, b ,,,x", + "|ww|z||...-###..-..###-###.`|ss ______________________________________________________ ,, b,,, x", + "..........-.....-....O-....U|ss ______________________________________________________ ,, b ,,,x", + "###.......-Y..OO-Y...O-.Y---|ss ______________________________________________________ ,,,b ,,,x", + "th....-...--=-----=----=-///|ss ______________________________________________________,,, b ,, x", + "OOO$$$-..................D>/|ss ______________________________________________________,,, b,,, x", "-------..................5//|ss ______________________________________________________ ,,,b ,,,x", - "OAAO.Y|...--=-----=----=-----ss ____1112111_______________________111111111111111_____,,,,b,,, x", - "......+...|Y.$$$|Y...`|.Y`$$|ss ____1B___^1__1112111______________1^M_M_M^MBM_M^1_____,,,,b ,, x", - "...[.A|...|.....|....$|.....|ss ____1MM_MM1__1____^1______________1_M_M_M_M_M_M_1_____ ,;,b,,, x", - "...[.A|...|..###|###.$|..#..|ss ____1^____1__1MM_MM1______________2_____________2_____ ,;,b,,, x", - "......|...|...ht|th..$|O.#h.|ss ____1MM_MM1__1B____1______________1_M_M_M_M_M_M_1_____,,; b ,, x", - "O.tOOO|...|$`..O|OO..U|O.#.t|ss ____1B___^1__1MM_MM1______________1_M^MBM_MBM_M^1_____,,, b,,, x", - "-+------+----w-----w-----w---ss ____1MM_MM1__1____^1______________111111111111111_____bbbbb ,,,x", - "t..u|T+..S|~sssssssssssssssssss ____1____B1__1MM_MM1__________________________________b.<.b ,, G", - "c..c|-|..t|ssssssssssssssssssss ____1MM_MM1__1^___B1_______________111111111111111____d...b,,,,G", - "c..S|T+..S|ss ____1^____1__1MM_MM1_______________1_M^M^MBMBM_M^1____b...b ,,,x", - "-+---------ss ____1MM_MM1__1B____1_______________1_M_M_M_M_M_M_1____bbbbb ,, x", + "OAAO.Y-...--=-----=----=----|ss ____1112111_______________________111111111111111_____,,,,b,,, x", + "......+...-Y.$$$-Y...`-.Y`$$|ss ____1B___^1__1112111______________1^M_M_M^MBM_M^1_____,,,,b ,, x", + "...[.A-...-.....-....$-.....|ss ____1MM_MM1__1____^1______________1_M_M_M_M_M_M_1_____ ,;,b,,, x", + "...[.A-...-..###-###.$-..#..|ss ____1^____1__1MM_MM1______________2_____________2_____ ,;,b,,, x", + "......-...-...ht-th..$-O.#h.|ss ____1MM_MM1__1B____1______________1_M_M_M_M_M_M_1_____,,; b ,, x", + "O.tOOO-...-$`..O-OO..U-O.#.t|ss ____1B___^1__1MM_MM1______________1_M^MBM_MBM_M^1_____,,, b,,, x", + "-+------+-|||w|||||w|||||w|||ss ____1MM_MM1__1____^1______________111111111111111_____bbbbb ,,,x", + "t..u-T+..S|~sssssssssssssssssss ____1____B1__1MM_MM1__________________________________b.<.b ,, G", + "c..c---..t|ssssssssssssssssssss ____1MM_MM1__1^___B1_______________111111111111111____d...b,,,,G", + "c..S-T+..S|ss ____1^____1__1MM_MM1_______________1_M^M^MBMBM_M^1____b...b ,,,x", + "|z|||||||||ss ____1MM_MM1__1B____1_______________1_M_M_M_M_M_M_1____bbbbb ,, x", "sssss{{ssssss ____1^___B1__1MM_MM1_______________2_____________2____,;;;b ,, x", "sssssssssssss ____1MM_MM1__1_____1_______________1_M_M_M_M_M_M_1____,;;;b,,,,x", "sssssssssssss ____1B___^1__1MM_MM1_______________1^M_MBM^MBM^M_1____,,,;b ,, x", @@ -853,31 +816,31 @@ "x,,,,b,,,, sss_______yy_______ssss", "x ,, b ,, ssssssssssssssssssssssss_______yy_______ssss", "x,,,,b,,, ssssssssssssssssssssssss________________ssss", - "x,,, b ,, ss---w-----w-----w---sss_______yy_______ssss", - "x ,, b ,, ss|th..O|O..ht|th..$|sss_______yy_______ssss", - "x ,, b ,,, ss|###.O|O.###|###.$|sss_______yy_______ssss", - "x ,,,b ,,, ss|....$|....$|O...$|sss________________ssss", - "x ,,,b ,, ss|Y...`|l...`|Y...`|sss_______yy_______ssss", + "x,,, b ,, ss|||w|||||w|||||w|||sss_______yy_______ssss", + "x ,, b ,, ss|th..O-O..ht-th..$|sss_______yy_______ssss", + "x ,, b ,,, ss|###.O-O.###-###.$|sss_______yy_______ssss", + "x ,,,b ,,, ss|....$-....$-O...$|sss________________ssss", + "x ,,,b ,, ss|Y...`-l...`-Y...`|sss_______yy_______ssss", "x,,, b ,,, ss|--=-----=-----=--|sss_______yy_______ssss", "x ,, b,,, ss|<...............hwsss_______yy_______ssss", - "x,,, b,,, ssssssssw.................+sss________________ssss", + "x,,, b,,, ssssssssz.................zsss________________ssss", "x,,,,b,,,, sssssss~|.................wsss_______yy_______ssss", - "x,,,,b,,,, ss------|...------++------|sss_______yy_______ssss", - "x ,, b ,,, ss|k..`O|...|$............|sss_______yy_______ssss", - "x ,, b ,, ss|k....=...|$..h...h...h.|sss________________ssss", - "x,,, b ,, ss|k..ht|...|$.'##.'##.'##wsss_______yy_______ssss", - "x ,,,b ,, ss|k.##'|...|O............|sss_______yy_______ssss", - "x,,, b,,,, ss|-----|...|O..h...h...h.|sss_______yy_______ssss", - "x,,, b ,,, ss|k..`O|...|..'##.'##.'##wsss________________ssss", + "x,,,,b,,,, ss|||||||...------++------|sss_______yy_______ssss", + "x ,, b ,,, ss|k..`O-...-$............|sss_______yy_______ssss", + "x ,, b ,, ss|k....=...-$..h...h...h.|sss________________ssss", + "x,,, b ,, ss|k..ht-...-$.'##.'##.'##wsss_______yy_______ssss", + "x ,,,b ,, ss|k.##'-...-O............|sss_______yy_______ssss", + "x,,, b,,,, ss|------...-O..h...h...h.|sss_______yy_______ssss", + "x,,, b ,,, ss|k..`O-...-..'##.'##.'##wsss________________ssss", "x ,,,b,,,, ss|k....=...+.............|sss_______yy_______sss ", - "x ,,,b ,,, ss|k.##'|...+...h...h...h.|sss_______yy_______sss ", - "x ,, b ,,, ss|k..ht|...|..'##.'##.'##wsss_______yy_______ssss", - "x,,, b,,,, ss|-----|...|t............|sss________________ssss", - "x ,,,b ,,, ss|T|T|T|...|O..h...h...h.|sss_______yy_______ssss", - "x,,,,b,,, ss|+|+|+|...|O.'##.'##.'##wsss_______yy_______ssss", - "x,,, b ,,, ss|.....+...|$............|sss_______yy_______sss ", - "x ,,,b,,, ss|ScScS|..h|`..OO$.$$O.$$|sss________________sss ", - "x ,, b ,,, ss-------w=w---w---w---w---sss_______yy_______sss ", + "x ,,,b ,,, ss|k.##'-...+...h...h...h.|sss_______yy_______sss ", + "x ,, b ,,, ss|k..ht-...-..'##.'##.'##wsss_______yy_______ssss", + "x,,, b,,,, ss|------...-t............|sss________________ssss", + "x ,,,b ,,, ss|T-T-T-...-O..h...h...h.|sss_______yy_______ssss", + "x,,,,b,,, ss|+-+-+-...-O.'##.'##.'##wsss_______yy_______ssss", + "x,,, b ,,, ss|.....+...-$............|sss_______yy_______sss ", + "x ,,,b,,, ss|ScScS-..h-`..OO$.$$O.$$|sss________________sss ", + "x ,, b ,,, ss|||||||wzw|||w|||w|||w|||sss_______yy_______sss ", "x ,,,b,,,, ssXssssssssssssssssssX{{ss~sss_______yy_______sss ", "x,,, b,,,, ssGssssssssssssssssssGssssssss_______yy_______sss ", "x,,, b ,,, ssXssssssssssss8888ssXssssssss________________sss ", @@ -994,52 +957,52 @@ "object": { "fill_ter": "t_thconc_floor", "rows": [ - "-------w+----w--w--w--w--w--~s ______________________________________________________,,,,b ,, x", - "|T|T|T|..h|r[.r[.r[.r[Wr[.r|ss ______________________________________________________,,, b,,, x", - "|+-+-+|...|r..r..r..r..r..r|ss ______________________________________________________,,,,b ,,,x", - "|.....+...|Y...............wss ______________________________________________________,,,,b ,,,x", - "|ScScS|...+................wss _______________________________________111111111111111,,, b ,, x", - "|-----|...|r..r..r..r..r..r|ss _______________________________________1_M^M_MBM^MBM_1,,,,b,,, x", - "|.MM.[|...|r.[rW[r.[r.[rW[r|ss ___111111111111111_____________________1_M_M_M_M_M_M_1,,, b,,, x", - "w.....=...|----------------|ss ___1^M_MBM_M^M_M^1_____________________2_____________2,,,,b ,, x", - "|O.h[[|...|r[Wr[.r[.r[Wr[.r|ss ___1_M_M_M_M_M_M_1_____________________1_M_M_M_M_M_M_1,,, b ,,,x", - "|-----|...|r..r..r..r..r..r|ss ___2_____________2_____________________1^M_MBM_M^MBM^1,,, b,,,,x", - "|.MM.[|...+................wss ___1_M_M_M_M_M_M_1_____________________111111111111111,,, b,,, x", - "w.....=...|Y...............wss ___1_M^M^MBM_MBMB1____________________________________,,,,b ,,,x", - "|O.h[[|...|r..r..r..r..r..r|ss ___111111111111111____________________________________,;;;b ,, x", - "|-----|...|r.[r.[rW[r.[rW[r|ss ______________________________________________________,;;;b,,,,x", - "|.AAA.....|----------------|ss _____________________________________111111111111111__,,, b ,,,x", - "w.........#t.$|Ycc|..|`...E|ss _____________________________________1^M_MBM^M_MBM_1__,;;;b,,, x", - "+.........#h.$|...+..=...ht|ss _____________________________________1_M_M_M_M_M_M_1__,,, b,,, x", - "|.AAAt....#.....ll|..|Y.###wss _____________________________________2_____________2__,,, b ,,,x", - "|-----|...--+------..|O...$|ss _____________________________________1_M_M_M_M_M_M_1__,,, b ,,,x", - "|T+...+..............|-----|ss _____________________________________1BM^MBM^MBM_M^1__,,,,b ,, x", - "|--..c|..............|`.#tE|ss _____________________________________111111111111111__,,, b,,, x", - "|T+..S|[.............=..#h.|ss ______________________________________________________,,,,b ,,,x", - "--------ww-------|-+-|Y.#..wssssssss__________________________________________________,,,,b,,, x", - "sssssssssss~|T+.S|...|O...$|ssssssss sssssss sXsssXXXXXXXXXs ,,, b,,,,x", - "ssssssssssss|--.c|...|------------ss sssssssssssss sXspsGsssXsssGs ,,,b,,, x", - " ss|T+..+...d..||>|uuuuu|{s ssss_______ssss sXsssXs*sXs*sXs ,,,b ,, x", - " ss-----|...|uS||.|.....|{s ssss___________ssss sXsssXs*sXs*sXs ,, b ,, x", - "ssssssssssssw.hhh....|----d---D--|ss sss_______________sss sXsssGsssXsssGs ,,,b ,,,x", - "ssssssssssss+........|.....|.0...wss ss_________________ss sXXXXXXXXXXXXXs ,, b ,,,x", - "ssssssssssss+........+.....+.....+ss ss___________________ss sssssssssssssss ,, b,,,,x", - "ssssssssssss|-###-...|.....|....h|ss sss___________________sss ,,, b,,, x", - " ss|$th.|...|-----|...---ss ss_____________________ss ffff ,,,b ,, x", - " ssssw........|cccll|...|ssss ss_______y_____y_______ss ff;;ffffff ,,, b ,, x", - " ssss|$$$$|...|.....|...wssss ss________y_____y________ss ;;;;;;; ff ,,,b,,,,x", - " ss-------|...+.WM..+...|ss ss________y_____y________ss ;;;;;;f ,,,b ,,,x", - " ss|llccuu|...+..M..+...wss ss________y_____y________ss ff;; ;;;;ff ,,,,b ,,,x", - " ssw......|...|.....|...|ss ss________yyyyyyy________ss f;;;; ;;; f ,,,b ,, x", - " ss|l.WM..|...|uuucc|...wss ss________y_____y________ss ff;;;;; ;;f ,,, b,,, x", + "||||||wz|||||w||w||w||w||w||~s ______________________________________________________,,,,b ,, x", + "|T-T-T-..h-r[.r[.r[.r[Wr[.r|ss ______________________________________________________,,, b,,, x", + "|+-+-+-...-r..r..r..r..r..r|ss ______________________________________________________,,,,b ,,,x", + "|.....+...-Y...............wss ______________________________________________________,,,,b ,,,x", + "|ScScS-...+................wss _______________________________________111111111111111,,, b ,, x", + "|------...-r..r..r..r..r..r|ss _______________________________________1_M^M_MBM^MBM_1,,,,b,,, x", + "|.MM.[-...-r.[rW[r.[r.[rW[r|ss ___111111111111111_____________________1_M_M_M_M_M_M_1,,, b,,, x", + "w.....=...-----------------|ss ___1^M_MBM_M^M_M^1_____________________2_____________2,,,,b ,, x", + "|O.h[[-...-r[Wr[.r[.r[Wr[.r|ss ___1_M_M_M_M_M_M_1_____________________1_M_M_M_M_M_M_1,,, b ,,,x", + "|------...-r..r..r..r..r..r|ss ___2_____________2_____________________1^M_MBM_M^MBM^1,,, b,,,,x", + "|.MM.[-...+................wss ___1_M_M_M_M_M_M_1_____________________111111111111111,,, b,,, x", + "w.....=...-Y...............wss ___1_M^M^MBM_MBMB1____________________________________,,,,b ,,,x", + "|O.h[[-...-r..r..r..r..r..r|ss ___111111111111111____________________________________,;;;b ,, x", + "|------...-r.[r.[rW[r.[rW[r|ss ______________________________________________________,;;;b,,,,x", + "|.AAA.....-----------------|ss _____________________________________111111111111111__,,, b ,,,x", + "w.........#t.$-Ycc-..-`...E|ss _____________________________________1^M_MBM^M_MBM_1__,;;;b,,, x", + "z.........#h.$-...+..=...ht|ss _____________________________________1_M_M_M_M_M_M_1__,,, b,,, x", + "|.AAAt....#.....ll-..-Y.###wss _____________________________________2_____________2__,,, b ,,,x", + "|------...--+------..-O...$|ss _____________________________________1_M_M_M_M_M_M_1__,,, b ,,,x", + "|T+...+..............------|ss _____________________________________1BM^MBM^MBM_M^1__,,,,b ,, x", + "|--..c-..............-`.#tE|ss _____________________________________111111111111111__,,, b,,, x", + "|T+..S-[.............=..#h.|ss ______________________________________________________,,,,b ,,,x", + "||||||||ww|||------+--Y.#..wssssssss__________________________________________________,,,,b,,, x", + "sssssssssss~|T+.S-...-O...$|ssssssss sssssss sXsssXXXXXXXXXs ,,, b,,,,x", + "ssssssssssss|--.c-...------|||||||ss sssssssssssss sXspsGsssXsssGs ,,,b,,, x", + " ss|T+..+...d..-->-uuuuu|{s ssss_______ssss sXsssXs*sXs*sXs ,,,b ,, x", + " ss|-----...-uS--.-.....|{s ssss___________ssss sXsssXs*sXs*sXs ,, b ,, x", + "ssssssssssssw.hhh....-----d---D--|ss sss_______________sss sXsssGsssXsssGs ,,,b ,,,x", + "ssssssssssssz........-.....-.0...wss ss_________________ss sXXXXXXXXXXXXXs ,, b ,,,x", + "ssssssssssssz........+.....+.....zss ss___________________ss sssssssssssssss ,, b,,,,x", + "ssssssssssss|-###-...-.....-....h|ss sss___________________sss ,,, b,,, x", + " ss|$th.-...-------...|||ss ss_____________________ss ffff ,,,b ,, x", + " ssssw........-cccll-...|ssss ss_______y_____y_______ss ff;;ffffff ,,, b ,, x", + " ssss|$$$$-...-.....-...wssss ss________y_____y________ss ;;;;;;; ff ,,,b,,,,x", + " ss|||-----...+.WM..+...|ss ss________y_____y________ss ;;;;;;f ,,,b ,,,x", + " ss|llccuu-...+..M..+...wss ss________y_____y________ss ff;; ;;;;ff ,,,,b ,,,x", + " ssw......-...-.....-...|ss ss________yyyyyyy________ss f;;;; ;;; f ,,,b ,, x", + " ss|l.WM..-...-uuucc-...wss ss________y_____y________ss ff;;;;; ;;f ,,, b,,, x", " ss|l..M..+...-------...|ss ss________y_____y________ss ff ;;;; ;;ff ,,,b ,,,x", - " ssw......+...+.........+ssssssss________y_____y________ss ffff;;;;ff ,,,b,,, x", - " ss|uuuccc|...+.........+sssssssss_______y_____y_______ss ffffff ,,, b ,,,x", - " ss-------|..h|........h|ss ss_____________________ss ssssssssssssss ,,,b ,,,x", - " ssss|T+..+..[|-w--w--w--ss sss___________________sss ssssssssssssss ,,, b ,, x", - " ssss|--.S|-+w|sssssssss~ss ss___________________ss ,,,, ssXXXXXXXXXXss ,,,,b,,,,x", + " ssw......+...+.........zssssssss________y_____y________ss ffff;;;;ff ,,,b,,, x", + " ss|uuuccc-...+.........zsssssssss_______y_____y_______ss ffffff ,,, b ,,,x", + " ss|||-----..h-........h|ss ss_____________________ss ssssssssssssss ,,,b ,,,x", + " ssss|T+..+..[||w||w||w||ss sss___________________sss ssssssssssssss ,,, b ,, x", + " ssss|--.S||zw|sssssssss~ss ss___________________ss ,,,, ssXXXXXXXXXXss ,,,,b,,,,x", " ss|T+.c|ssssssssssssssss ss_________________ss ,N,N,, ssXssssssssXss ,,,b ,, x", - " ss------ssssss sss_______________sss,NN,NN, ssXsHHssHHsXss ,,,,b,,, x", + " ss||||||ssssss sss_______________sss,NN,NN, ssXsHHssHHsXss ,,,,b,,, x", " ssssssssssss ssss___________ssss ,Nn,nN, ssXsHHssHHsXss ,,,b ,, x", " ssssssssssss ssss_______ssss ,NNnNN, ssXssssssssXss ,,, b ,, x", " ssssssssssss sssssssssssss ,NNN, ssXssssssssXss ,,,b ,, x", diff --git a/data/json/mapgen_palettes/military/mil_base_palette.json b/data/json/mapgen_palettes/military/mil_base_palette.json index b607d70e300c..09aae1921555 100644 --- a/data/json/mapgen_palettes/military/mil_base_palette.json +++ b/data/json/mapgen_palettes/military/mil_base_palette.json @@ -12,7 +12,7 @@ "X": "t_chainfence", "G": "t_chaingate_c", ".": "t_thconc_floor", - "|": "t_wall_w", + "|": "t_brick_wall", "-": "t_wall_w", "/": "t_strconc_wall", "_": "t_pavement", @@ -39,7 +39,7 @@ "g": "t_reinforced_glass_shutter", ">": "t_stairs_down", "<": "t_stairs_up", - "w": "t_window_domestic", + "w": "t_window_bars_curtains", "]": "t_bars", "(": "t_door_bar_locked", ")": [ "t_door_bar_c", "t_door_bar_o", "t_door_bar_locked" ], From f1b1495dc2e5552810006ae1b0f6a127098e67be Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sun, 31 Dec 2023 00:26:55 -0600 Subject: [PATCH 02/12] Commit for remote --- .../itemgroups/Clothing_Gear/clothing.json | 4 +- data/json/itemgroups/Food/food.json | 1 + data/json/itemgroups/books.json | 1 + .../mapgen/military/mil_base/mil_base_z0.json | 86 ++++--------------- 4 files changed, 21 insertions(+), 71 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index b4daa3473870..e06a30a8815d 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -124,7 +124,7 @@ { "item": "winter_jacket_army", "prob": 5 }, { "item": "coat_rain", "prob": 3 }, { "item": "folding_poncho", "prob": 2 }, - { "item": "webbing_belt", "prob": 5 } + { "item": "webbing_belt", "prob": 5 }, { "item": "gloves_liner", "prob": 3 }, { "item": "gloves_liner_wool", "prob": 2 }, { "item": "winter_gloves_army", "prob": 5 }, @@ -416,7 +416,7 @@ { "item": "modularvest", "prob": 10 }, { "item": "modularvestceramic", "prob": 20 }, { "item": "modularvesthard", "prob": 5 }, - { "item": helmet_army"", "prob": 30 }, + { "item": "helmet_army", "prob": 30 }, { "item": "tac_helmet", "prob": 10 }, { "item": "glasses_bal", "prob": 10 }, { "item": "mask_bal", "prob": 5 }, diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 83bf1a4c7b06..8fc973e813b2 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -43,6 +43,7 @@ { "item": "oatmeal", "prob": 40 }, { "item": "fruit_leather", "prob": 15 }, { "item": "salted_fish", "prob": 15 }, + { "item": "meat_salted", "prob": 15 }, { "item": "dry_beans", "prob": 40 }, { "item": "dry_lentils", "prob": 30 }, { "item": "dry_rice", "prob": 40 } diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 7f0b3096a889..2d82bfe39d27 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -77,6 +77,7 @@ "entries": [ { "group": "book_gunmags", "prob": 100 }, { "group": "book_martial", "prob": 100 }, + { "item": "mag_fieldrepair", "prob": 50 }, { "item": "manual_bashing", "prob": 40 }, { "item": "manual_knives", "prob": 40 }, { "item": "manual_launcher", "prob": 20 }, diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index b852e90b66aa..8a67091724c3 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -439,77 +439,25 @@ { "group": "ear_protection", "x": 46, "y": 66, "chance": 75, "repeat": 10 }, { "group": "mil_bedding", "x": [ 37, 45 ], "y": 66, "chance": 75, "repeat": 25 }, { "group": "clothing_tactical_leg", "x": [ 49, 55 ], "y": 66, "chance": 75, "repeat": 25 }, - { "group": "clothing_tactical_torso", "x": [ 49, 50 ], "y": 65, "chance": 75, "repeat": 25 }, + { "group": "clothing_tactical_torso", "x": [ 49, 55 ], "y": 65, "chance": 75, "repeat": 25 }, { "group": "military_ballistic_armor", "x": [ 36, 46 ], "y": 65, "chance": 75, "repeat": 20 }, + { "group": "ammo_light_batteries_full", "x": [ 42, 46 ], "y": 60, "chance": 75, "repeat": 25 }, + { "group": "tools_recharging", "x": [ 40, 41 ], "y": 60, "chance": 75, "repeat": 5 }, + { "group": "tools_lighting_industrial", "x": [ 36, 39 ], "y": 60, "chance": 75, "repeat": 10 }, + { "group": "book_military", "x": [ 49, 55 ], "y": 60, "repeat": 25 }, + { "group": "tools_entry", "x": [ 53, 55 ], "y": 59, "chance": 75, "repeat": 15 }, + { "group": "infantry_medical_gear", "x": 52, "y": 59, "chance": 75, "repeat": 10 }, + { "group": "infantry_common_gear", "x": [ 49, 51 ], "y": 59, "chance": 75, "repeat": 15 }, + { "group": "tools_hunting", "x": [ 36, 46 ], "y": 59, "chance": 75, "repeat": 30 }, + { "group": "MRE", "x": [ 49, 55 ], "y": [ 53, 54 ], "chance": 75, "repeat": 25 }, + { "group": "mil_food_nodrugs", "x": [ 49, 55 ], "y": 48, "chance": 75, "repeat": 15 }, + { "group": "groce_pasta", "x": [ 41, 46 ], "y": 54, "chance": 75, "repeat": 15 }, + { "group": "big_canned_food", "x": [ 36, 40 ], "y": 54, "chance": 75, "repeat": 15 }, + { "group": "dry_goods", "x": [ 41, 46 ], "y": 53, "chance": 75, "repeat": 15 }, + { "group": "groce_ingredient", "x": [ 37, 40 ], "y": 53, "chance": 75, "repeat": 25 }, + { "group": "pantry_liquids", "x": 36, "y": 53, "chance": 75, "repeat": 10 }, - - - - - - - - - - { "item": "light_disposable_cell", "x": 46, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "light_battery_cell", "x": 45, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "light_plus_battery_cell", "x": 44, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "hand_crank_charger", "x": 43, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "flashlight", "x": 42, "y": 60, "chance": 75, "repeat": [ 50, 200 ] }, - { "item": "heavy_flashlight", "x": 41, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "electric_lantern", "x": 40, "y": 60, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "flaregun", "x": 39, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "signal_flare", "x": 38, "y": 60, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "glowstick", "x": 37, "y": 60, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "handflare", "x": 36, "y": 60, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "manual_swimming", "x": 55, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_melee", "x": 54, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_stabbing", "x": 53, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_gun", "x": 52, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_traps_mil", "x": 51, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_rifle", "x": 50, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mag_fieldrepair", "x": 49, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boltcutters", "x": 55, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "halligan", "x": 54, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "crowbar", "x": 53, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "e_tool", "x": 52, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mask_gas", "x": 51, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "gasfilter_m", "x": 50, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "binoculars", "x": 49, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "multitool", "x": 46, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "heatpack", "x": 45, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "pockknife", "x": 44, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "ref_lighter", "x": 44, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "two_way_radio", "x": 43, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "rope_30", "x": 42, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "sleeping_bag_roll", "x": 41, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "rollmat", "x": 40, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "1st_aid", "x": 39, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mess_tin", "x": 38, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "thermos", "x": 38, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mil_mess_kit", "x": 37, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "water_purifier", "x": 36, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "pur_tablets", "x": 36, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "group": "MRE", "x": [ 49, 55 ], "y": [ 53, 54 ], "chance": 75, "repeat": 1500 }, - { "group": "MRE", "x": [ 49, 55 ], "y": 48, "chance": 75, "repeat": 750 }, - { "group": "groce_pasta", "x": [ 44, 46 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "dry_beans", "x": [ 41, 43 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "group": "big_canned_food", "x": [ 36, 40 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "oatmeal", "x": [ 45, 46 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "flour", "x": [ 43, 44 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "cornmeal", "x": [ 41, 42 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "coffee_raw", "x": 40, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tea_raw", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "sugar", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "salt", "x": 37, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "cooking_oil", "x": 36, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "meat_salted", "x": [ 45, 46 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "salted_fish", "x": [ 43, 44 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "milk_powder", "x": [ 41, 42 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "powder_eggs", "x": [ 39, 40 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "milk_UHT", "x": 37, "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "water_clean", "x": 38, "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "crackers", "x": 36, "y": 48, "chance": 75, "repeat": [ 50, 150 ] } + { "item": "water_clean", "x": [ 36, 46 ], "y": 48, "chance": 75, "repeat": 50 } ], "place_monsters": [ { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, From bb39797490ade01bb142c20a6fb1d2f01c4aa82d Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sun, 31 Dec 2023 16:04:16 -0600 Subject: [PATCH 03/12] Commit for remote --- .../military/mil_base/mil_base_z-1.json | 48 ++++++++++++++++--- .../mapgen/military/mil_base/mil_base_z0.json | 18 +++++-- .../overmap/overmap_special/specials.json | 1 + .../overmap_terrain_military.json | 3 +- 4 files changed, 60 insertions(+), 10 deletions(-) diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 0aad5f152c1c..b0a56cf17608 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -2,7 +2,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "mil_base_tunnels_a" ], + "om_terrain": [ "mil_base_tunnels_j" ], "weight": 250, "object": { "fill_ter": "t_thconc_floor", @@ -18,16 +18,52 @@ "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@ /////", + "@@@@@@ ]u.u]", + "@@@@@@ ]u.u]", + "@@@@@@ ]u.u]", + "@@@@@@ ]u.u]", + "@@@@@@ ]])]]", + "@@@@@@/.................", + "@@@@@@/.................", + "@@@@@@//////////////////", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@" + ], + "palettes": [ "mil_base_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "mil_base_tunnels_a" ], + "weight": 250, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@///////////////////", - "@@@@@/<.................", - "@@@@@//.................", - "@@@@@@/..///////////////", - "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "////@@@@@@@@@@@@@@@@@@@@", + "u.u/@@@@@@@@@@@@@@@@@@@@", + "u.u/////@@@@@@@@@@@@@@@@", + "u.u/..-..........?|ss ,,, b,,,,x", + " X ss/......................>/ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", + " X ss/uuuuu.uuuuu.uuuuu.....>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", " X ss///////////////////d///(/ss X ssw...Y-......................d..........?|ss ,,,b ,, x", " X ss/th..$/uuuu$$/uuuu...u/>/ss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", " X ss/###..D......d.......u///ss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", @@ -656,10 +655,14 @@ { "item": "extinguisher", "x": 67, "y": 44, "chance": 75 }, { "item": "extinguisher", "x": 21, "y": 22, "chance": 75 }, { "item": "extinguisher", "x": 62, "y": 9, "chance": 75 }, + + + { "item": "atgm_launcher", "x": 8, "y": 9, "chance": 75, "repeat": 1 }, { "item": "atgm_heat", "x": 8, "y": 10, "chance": 75, "repeat": 10 }, { "item": "LAW_Packed", "x": 8, "y": 11, "chance": 75, "repeat": 10 }, { "item": "c4", "x": 8, "y": 12, "chance": 75, "repeat": 20 }, + { "item": "grenade", "x": 10, "y": 9, "chance": 75, "repeat": 50 }, { "item": "grenade_inc", "x": 10, "y": 9, "chance": 75, "repeat": 25 }, { "item": "smokebomb", "x": 10, "y": 10, "chance": 75, "repeat": 50 }, @@ -668,6 +671,7 @@ { "item": "m203", "x": 10, "y": 11, "chance": 75, "repeat": 5 }, { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 }, { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 }, + { "item": "m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 30 }, { "item": "m27iar", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 8 }, { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, @@ -704,14 +708,18 @@ { "item": "50_incendiary", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, { "item": "50match", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, { "item": "50ss", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, + { "item": "m17", "x": 28, "y": [ 9, 10 ], "magazine": 100, "chance": 75, "repeat": 90 }, { "item": "m9", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 45 }, { "item": "glock_19", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 10 }, { "item": "p320mag_17rd_9x19mm", "x": 28, "y": 12, "chance": 75, "repeat": 90 }, { "item": "m9mag", "x": 28, "y": 12, "chance": 75, "repeat": 45 }, { "item": "glockmag", "x": 28, "y": 12, "chance": 75, "repeat": 10 }, + { "item": "9mm", "x": 30, "y": 9, "chance": 75, "repeat": 25 }, { "item": "9mmfmj", "x": 30, "y": [ 10, 12 ], "chance": 75, "repeat": 50 }, + + { "item": "shoulder_strap", "x": [ 8, 9 ], "y": 15, "chance": 75, "repeat": 100 }, { "item": "holo_sight", "x": 10, "y": 15, "chance": 75, "repeat": 50 }, { "item": "acog_scope", "x": 11, "y": 15, "chance": 75, "repeat": 30 }, @@ -721,6 +729,10 @@ { "item": "sheath", "x": 24, "y": 15, "chance": 75, "repeat": 100 }, { "item": "knife_combat", "x": [ 22, 23 ], "y": 15, "chance": 75, "repeat": 100 }, { "item": "holster", "x": [ 20, 21 ], "y": 15, "chance": 75, "repeat": 100 }, + + + + { "group": "mil_base_tent_medical_thrash", "x": [ 52, 64 ], "y": [ 54, 71 ], "chance": 25, "repeat": 15 } ], "place_monsters": [ diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 69994ff1db29..e66c8de122db 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -5415,6 +5415,7 @@ { "point": [ -1, 1, 0 ], "overmap": "mil_base_minefield_w_north" }, { "point": [ -1, 0, 0 ], "overmap": "mil_base_minefield_w_north" }, { "point": [ -1, -1, 0 ], "overmap": "mil_base_minefield_nw_north" }, + { "point": [ 4, 4, -1 ], "overmap": "mil_base_tunnels_j_north" }, { "point": [ 5, 4, -1 ], "overmap": "mil_base_tunnels_a_north" }, { "point": [ 5, 5, -1 ], "overmap": "mil_base_tunnels_b_north" }, { "point": [ 5, 6, -1 ], "overmap": "mil_base_tunnels_c_north" }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json index aed6c9bf6149..3c85341f5d76 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json @@ -311,7 +311,8 @@ "mil_base_tunnels_f", "mil_base_tunnels_g", "mil_base_tunnels_h", - "mil_base_tunnels_i" + "mil_base_tunnels_i", + "mil_base_tunnels_j" ], "copy-from": "generic_military_base", "name": "military base - tunnel" From e47999faedd4afc042f44a27a6c053eae2bc0204 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sun, 31 Dec 2023 17:37:12 -0600 Subject: [PATCH 04/12] Commit for remote --- .../military/mil_base/mil_base_z-1.json | 46 ++++++++++--------- .../mapgen/military/mil_base/mil_base_z0.json | 36 ++++++++++----- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index b0a56cf17608..1a251b07c9ac 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -18,19 +18,19 @@ "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@ /////", - "@@@@@@ ]u.u]", - "@@@@@@ ]u.u]", - "@@@@@@ ]u.u]", - "@@@@@@ ]u.u]", - "@@@@@@ ]])]]", - "@@@@@@/.................", - "@@@@@@/.................", - "@@@@@@//////////////////", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@" + "@@@@@@@@@///////////////", + "@@@@@@@@@/u..uu..uuuu.uu", + "@@@@@@@@@/u..uu.......uu", + "@@@@@@@@@/u.............", + "@@@@@@@@@/u.............", + "@@@@@@@@@/]]]]]]]]((]]]]", + "@@@@@@@@@/..............", + "@@@@@@@@@/..............", + "@@@@@@@@@//zz/////zz////", + "@@@@@@@@@/..../......../", + "@@@@@@@@@/C.../C......C/", + "@@@@@@@@@/C.uu/C.CCCC.C/", + "@@@@@@@@@///////////////" ], "palettes": [ "mil_base_palette" ] } @@ -55,20 +55,24 @@ "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "////@@@@@@@@@@@@@@@@@@@@", - "u.u/@@@@@@@@@@@@@@@@@@@@", - "u.u/////@@@@@@@@@@@@@@@@", - "u.u/../ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", - " X ss/uuuuu.uuuuu.uuuuu.....>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", - " X ss///////////////////d///(/ss X ssw...Y-......................d..........?|ss ,,,b ,, x", - " X ss/th..$/uuuu$$/uuuu...u/>/ss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", - " X ss/###..D......d.......u///ss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", - " X ssg###..5$$..[[/u..[[[.u/ssss X ss|-----..-----------------...-c.??..??..?|ss ,, b ,,,x", - " X ss/th..$///ggg//u..[[[../ssss X ss|O$`Y-..-.`$$$-u.QV.qV.v-...-c.??..??..?|ss ,, b ,, x", + " X ss/u..uu..uuuu..uu..u]...u/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", + " X ss/u..uu........uu..u]...u/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", + " X ss/u................u]...u/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.??..??..?|ss ,,,,b ,, x", + " X ss/u................u]...u/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", + " X ss/]]]]]]]]))]]]]]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", + " X ss/.....................(>/ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", + " X ss/uuuuu.uuuuu.uuuuu....(>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", + " X ss///////////////////d/////ss X ssw...Y-......................d..........?|ss ,,,b ,, x", + " X ss/th..$/uuuu$$/uuuu...u/ssss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", + " X ss/###..D......d.......u/ssss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", + " X ssg###..5$$..[[/u..[[[.u/ss X ss|-----..-----------------...-c.??..??..?|ss ,, b ,,,x", + " X ss/th..$///ggg//u..[[[../ss X ss|O$`Y-..-.`$$$-u.QV.qV.v-...-c.??..??..?|ss ,, b ,, x", " X ss/`....$/[.i.[/u....i../ss X ssw....=..=.....-u.......V-...-...........|ss ,,,,b ,, x", " X ss/OO...Y/[...[/l.e...../ss X ss|###.-..-Y.###-uh....h..d...-...........|ss ,, b ,,,x", " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..-..-l..ht-VVVt.VVVu-...-l........e.|ss ,, b ,, x", @@ -677,10 +677,14 @@ { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 }, { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 }, + { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, + { "item": "m4a1", "x": 16, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 36 }, { "item": "stanag30", "x": 16, "y": 12, "chance": 75, "repeat": 100 }, + { "item": "556", "x": 18, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, + { "item": "m249", "x": 20, "y": 9, "chance": 75, "repeat": 6 }, { "item": "m240", "x": 20, "y": 9, "chance": 75, "repeat": 4 }, { "item": "m1014", "x": 20, "y": 10, "chance": 75, "repeat": 10 }, @@ -690,6 +694,7 @@ { "item": "m2010mag", "x": 20, "y": 12, "chance": 75, "repeat": 10 }, { "item": "hk417mag_20rd", "x": 20, "y": 12, "chance": 75, "repeat": 16 }, { "item": "hk417mag_10rd", "x": 20, "y": 12, "chance": 75, "repeat": 8 }, + { "item": "300_winmag", "x": 22, "y": 12, "chance": 75, "repeat": 10 }, { "item": "belt223", "x": 22, "y": 9, "chance": 75, "repeat": 3 }, { "item": "belt308", "x": 22, "y": 9, "chance": 75, "repeat": 2 }, @@ -700,9 +705,11 @@ { "item": "shot_flechette", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, { "item": "762_51_incendiary", "x": 22, "y": 11, "chance": 75, "repeat": 5 }, { "item": "762_51", "x": 22, "y": [ 11, 12 ], "chance": 75, "repeat": 30 }, + { "item": "m2browning", "x": 24, "y": [ 9, 10 ], "chance": 75, "repeat": 2 }, { "item": "m107a1", "x": 24, "y": 11, "magazine": 100, "chance": 75, "repeat": 1 }, { "item": "m107a1mag", "x": 24, "y": 12, "chance": 75, "repeat": 6 }, + { "item": "belt50", "x": 26, "y": 9, "chance": 75, "repeat": 5 }, { "item": "50bmg", "x": 26, "y": [ 10, 12 ], "chance": 75, "repeat": 10 }, { "item": "50_incendiary", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, @@ -720,6 +727,11 @@ { "item": "9mmfmj", "x": 30, "y": [ 10, 12 ], "chance": 75, "repeat": 50 }, + + + + + { "item": "shoulder_strap", "x": [ 8, 9 ], "y": 15, "chance": 75, "repeat": 100 }, { "item": "holo_sight", "x": 10, "y": 15, "chance": 75, "repeat": 50 }, { "item": "acog_scope", "x": 11, "y": 15, "chance": 75, "repeat": 30 }, From 61b26c1ad3edb584163420bc4db14cd1e99ee8d4 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sun, 31 Dec 2023 19:05:12 -0600 Subject: [PATCH 05/12] Commit for remote --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 4 +- .../military/mil_base/mil_base_z-1.json | 51 +++++++++-- .../mapgen/military/mil_base/mil_base_z0.json | 86 ++----------------- 3 files changed, 56 insertions(+), 85 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 67cf2312a114..d954627e6e46 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -929,9 +929,11 @@ [ "m74_clip", 150 ], { "item": "m3_carlgustav", "prob": 50, "charges-min": 1, "charges-max": 1 }, { "item": "AT4", "prob": 50, "charges-min": 1, "charges-max": 1 }, + { "item": "atgm_launcher", "prob": 100, "charges": 1 }, [ "84x246mm_he", 100 ], [ "84x246mm_hedp", 80 ], - [ "84x246mm_smoke", 100 ] + [ "84x246mm_smoke", 100 ], + { "item": "atgm_heat", "prob": 100, "charges": [ 1, 5 ] } ] }, { diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 1a251b07c9ac..294bcde25f5e 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -19,20 +19,52 @@ "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@///////////////", - "@@@@@@@@@/u..uu..uuuu.uu", - "@@@@@@@@@/u..uu.......uu", + "@@@@@@@@@/u..u..uuuuu..u", + "@@@@@@@@@/u..u.........u", "@@@@@@@@@/u.............", - "@@@@@@@@@/u.............", - "@@@@@@@@@/]]]]]]]]((]]]]", + "@@@@@@@@@/u.....uuuuu...", + "@@@@@@@@@/]]]]((]]]]]((]", "@@@@@@@@@/..............", "@@@@@@@@@/..............", - "@@@@@@@@@//zz/////zz////", - "@@@@@@@@@/..../......../", + "@@@@@@@@@/]((]/]]]((]]]/", + "@@@@@@@@@/..../C......C/", "@@@@@@@@@/C.../C......C/", "@@@@@@@@@/C.uu/C.CCCC.C/", "@@@@@@@@@///////////////" ], - "palettes": [ "mil_base_palette" ] + "palettes": [ "mil_base_palette" ], + "place_loot": [ + { "group": "ammo_rifle_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 15 }, + { "group": "ammo_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 10 }, + { "group": "mags_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 5 }, + + { "group": "military_standard_shotguns", "x": 13, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, + { "group": "guns_shotgun_milspec", "x": 13, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, + + { "group": "military_standard_sniper_rifles", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, + { "group": "guns_rifle_milspec", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, + { "group": "guns_smg_milspec", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, + + { "group": "military_standard_assault_rifles", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 20 }, + { "group": "military_standard_lmgs", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 10 }, + { "group": "mil_base_hmg", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 2 }, + + { "group": "military_standard_pistols", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 10 }, + { "group": "guns_pistol_milspec", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, + + + { "group": "pwr_armor", "x": 10, "y": [ 21, 22 ], "chance": 75 }, + { "group": "pwr_armor_acc", "x": 10, "y": [ 21, 22 ], "chance": 75, "repeat": 3 }, + + { "item": "adv_UPS_off", "x": 12, "y": 22, "chance": 75, "repeat": 2 }, + { "item": "plut_cell", "x": 12, "y": 22, "chance": 75, "repeat": 4 }, + { "group": "mech_power_cell_spawn", "x": 13, "y": 22 }, + + { "group": "guns_launcher_rocket", "x": 15, "y": [ 20, 22 ], "chance": 75, "repeat": 5 }, + { "group": "grenades", "x": [ 17, 20 ], "y": 22, "chance": 75, "repeat": 20 }, + { "group": "guns_launcher_grenade", "x": 22, "y": [ 20, 22 ], "chance": 75, "repeat": 5 }, + { "group": "ammo_launcher_grenade", "x": 22, "y": [ 20, 22 ], "chance": 75, "repeat": 5 } + ] } }, { @@ -69,6 +101,11 @@ "@@@@@@/../@@@@@@@@@@@@@@" ], "palettes": [ "mil_base_palette" ], + "place_loot": [ + { "group": "ammo_rifle_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 15 }, + { "group": "ammo_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 10 }, + { "group": "mags_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 5 } + ], "place_monster": [ { "monster": "mon_turret_medium", "x": 0, "y": 19 }, { "monster": "mon_turret_medium", "x": 2, "y": 19 } diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 882f8f960ec6..8d1495aed290 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -497,13 +497,13 @@ " X sssssssssssssssssssssssssssss X ss|6....-...-......-..77.|{sssXss ,, b ,, x", " X sssssssssssssssssssssssssssss X ss|6....d...d......d..77.|{ss{Xss ,,, b ,, x", " X ss/////////////////////////ss X sssssssssssss|6...u-...-u.pp.u-u.77.|{ss{Xsss ,,, b ,, x", - " X ss/u..uu..uuuu..uu..u]...u/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", - " X ss/u..uu........uu..u]...u/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", + " X ss/u..u..uuuuuu..u..u]...u/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", + " X ss/u..u..........u..u]...u/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", " X ss/u................u]...u/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.??..??..?|ss ,,,,b ,, x", - " X ss/u................u]...u/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", - " X ss/]]]]]]]]))]]]]]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", + " X ss/u.....uuuuuu.....u]...u/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", + " X ss/]]]]))]]]]]]))]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", " X ss/.....................(>/ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", - " X ss/uuuuu.uuuuu.uuuuu....(>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", + " X ss/.....................(>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", " X ss///////////////////d/////ss X ssw...Y-......................d..........?|ss ,,,b ,, x", " X ss/th..$/uuuu$$/uuuu...u/ssss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", " X ss/###..D......d.......u/ssss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", @@ -658,75 +658,6 @@ - { "item": "atgm_launcher", "x": 8, "y": 9, "chance": 75, "repeat": 1 }, - { "item": "atgm_heat", "x": 8, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "LAW_Packed", "x": 8, "y": 11, "chance": 75, "repeat": 10 }, - { "item": "c4", "x": 8, "y": 12, "chance": 75, "repeat": 20 }, - - { "item": "grenade", "x": 10, "y": 9, "chance": 75, "repeat": 50 }, - { "item": "grenade_inc", "x": 10, "y": 9, "chance": 75, "repeat": 25 }, - { "item": "smokebomb", "x": 10, "y": 10, "chance": 75, "repeat": 50 }, - { "item": "flashbang", "x": 10, "y": 10, "chance": 75, "repeat": 20 }, - { "item": "m320_mod", "x": 10, "y": 11, "chance": 75, "repeat": 10 }, - { "item": "m203", "x": 10, "y": 11, "chance": 75, "repeat": 5 }, - { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 }, - { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 }, - - { "item": "m4a1", "x": 12, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 30 }, - { "item": "m27iar", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 8 }, - { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, - { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 }, - { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 }, - - { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, - - { "item": "m4a1", "x": 16, "y": [ 9, 11 ], "magazine": 100, "chance": 75, "repeat": 36 }, - { "item": "stanag30", "x": 16, "y": 12, "chance": 75, "repeat": 100 }, - - { "item": "556", "x": 18, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, - - { "item": "m249", "x": 20, "y": 9, "chance": 75, "repeat": 6 }, - { "item": "m240", "x": 20, "y": 9, "chance": 75, "repeat": 4 }, - { "item": "m1014", "x": 20, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "mossberg_590", "x": 20, "y": 10, "chance": 75, "repeat": 8 }, - { "item": "m2010", "x": 20, "y": 11, "magazine": 100, "chance": 75, "repeat": 2 }, - { "item": "m110a1", "x": 20, "y": 11, "magazine": 100, "chance": 75, "repeat": 8 }, - { "item": "m2010mag", "x": 20, "y": 12, "chance": 75, "repeat": 10 }, - { "item": "hk417mag_20rd", "x": 20, "y": 12, "chance": 75, "repeat": 16 }, - { "item": "hk417mag_10rd", "x": 20, "y": 12, "chance": 75, "repeat": 8 }, - - { "item": "300_winmag", "x": 22, "y": 12, "chance": 75, "repeat": 10 }, - { "item": "belt223", "x": 22, "y": 9, "chance": 75, "repeat": 3 }, - { "item": "belt308", "x": 22, "y": 9, "chance": 75, "repeat": 2 }, - { "item": "shot_00", "x": 22, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "shot_slug", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "shot_beanbag", "x": 22, "y": 10, "chance": 75, "repeat": 3 }, - { "item": "shot_he", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "shot_flechette", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "762_51_incendiary", "x": 22, "y": 11, "chance": 75, "repeat": 5 }, - { "item": "762_51", "x": 22, "y": [ 11, 12 ], "chance": 75, "repeat": 30 }, - - { "item": "m2browning", "x": 24, "y": [ 9, 10 ], "chance": 75, "repeat": 2 }, - { "item": "m107a1", "x": 24, "y": 11, "magazine": 100, "chance": 75, "repeat": 1 }, - { "item": "m107a1mag", "x": 24, "y": 12, "chance": 75, "repeat": 6 }, - - { "item": "belt50", "x": 26, "y": 9, "chance": 75, "repeat": 5 }, - { "item": "50bmg", "x": 26, "y": [ 10, 12 ], "chance": 75, "repeat": 10 }, - { "item": "50_incendiary", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - { "item": "50match", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - { "item": "50ss", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - - { "item": "m17", "x": 28, "y": [ 9, 10 ], "magazine": 100, "chance": 75, "repeat": 90 }, - { "item": "m9", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 45 }, - { "item": "glock_19", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 10 }, - { "item": "p320mag_17rd_9x19mm", "x": 28, "y": 12, "chance": 75, "repeat": 90 }, - { "item": "m9mag", "x": 28, "y": 12, "chance": 75, "repeat": 45 }, - { "item": "glockmag", "x": 28, "y": 12, "chance": 75, "repeat": 10 }, - - { "item": "9mm", "x": 30, "y": 9, "chance": 75, "repeat": 25 }, - { "item": "9mmfmj", "x": 30, "y": [ 10, 12 ], "chance": 75, "repeat": 50 }, - - @@ -736,12 +667,13 @@ { "item": "holo_sight", "x": 10, "y": 15, "chance": 75, "repeat": 50 }, { "item": "acog_scope", "x": 11, "y": 15, "chance": 75, "repeat": 30 }, { "item": "red_dot_sight", "x": 12, "y": 15, "chance": 75, "repeat": 20 }, + { "item": "goggles_ir", "x": [ 14, 16 ], "y": 15, "chance": 75, "repeat": 50 }, { "item": "goggles_nv", "x": [ 17, 18 ], "y": 15, "chance": 75, "repeat": 40 }, - { "item": "sheath", "x": 24, "y": 15, "chance": 75, "repeat": 100 }, - { "item": "knife_combat", "x": [ 22, 23 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "holster", "x": [ 20, 21 ], "y": 15, "chance": 75, "repeat": 100 }, + { "item": "holster", "x": [ 20, 21 ], "y": 15, "chance": 75, "repeat": 100 }, + { "item": "knife_combat", "x": [ 22, 23 ], "y": 15, "chance": 75, "repeat": 100 }, + { "item": "sheath", "x": 24, "y": 15, "chance": 75, "repeat": 100 }, From 42aa51e2e92556244afb828ff39ddb5b70fea437 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Mon, 1 Jan 2024 16:43:21 -0600 Subject: [PATCH 06/12] Commit for remote --- .../itemgroups/Clothing_Gear/clothing.json | 45 ++++++++++--------- .../monster_drops_advtech.json | 4 +- data/json/itemgroups/military.json | 34 +++++++------- .../military/mil_base/mil_base_z-1.json | 15 ++----- .../mapgen/military/mil_base/mil_base_z0.json | 38 +++++++++------- 5 files changed, 65 insertions(+), 71 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index e06a30a8815d..7db4337ffa25 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -263,7 +263,6 @@ "id": "clothing_military_pilot_distribution", "type": "item_group", "subtype": "distribution", - "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", "items": [ { "item": "chestrig", "prob": 40 }, { "item": "helmet_army" }, @@ -287,7 +286,11 @@ "id": "clothing_soldier_shirt", "type": "item_group", "subtype": "distribution", - "entries": [ { "item": "tshirt" } ] + "entries": [ + { "item": "tshirt", "prob": 75 }, + { "item": "army_top", "prob": 15 }, + { "item": "tank_top", "prob": 10 } + ] }, { "id": "clothing_outdoor_pants", @@ -1937,16 +1940,25 @@ { "group": "military_ballistic_armor", "prob": 200 }, { "group": "pwr_armor", "prob": 10 }, { "group": "pwr_armor_acc", "prob": 10 }, + { "group": "mil_armor_electronics", "prob": 20 }, [ "chestguard_hard", 20 ], [ "armguard_hard", 20 ], [ "legguard_hard", 15 ], - [ "mask_gas", 10 ], - [ "goggles_nv", 1 ], - [ "goggles_ir", 1 ], - [ "optical_cloak", 1 ], - [ "holo_cloak", 1 ], - [ "adv_UPS_off", 10 ], - [ "solarpack", 5 ] + [ "mask_gas", 10 ] + ] + }, + { + "type": "item_group", + "id": "mil_armor_electronics", + "items": [ + { "item": "radio", "prob": 5, "charges": [ 0, 300 ] }, + { "item": "two_way_radio", "prob": 20, "charges": [ 0, 300 ] }, + { "item": "adv_UPS_off", "prob": 25, "charges": [ 0, 2000 ] }, + { "item": "goggles_nv", "prob": 20, "charges": [ 0, 150 ] }, + { "item": "goggles_ir", "prob": 20, "charges": [ 0, 150 ] }, + [ "solarpack", 5 ], + [ "optical_cloak", 3 ], + [ "holo_cloak", 2 ] ] }, { @@ -1979,27 +1991,17 @@ "type": "item_group", "id": "mil_accessories", "items": [ + { "group": "mil_armor_electronics", "prob": 40 }, + { "group": "pwr_armor_acc", "prob": 10 }, [ "mask_gas", 10 ], [ "duffelbag", 15 ], - [ "goggles_nv", 1 ], - [ "goggles_ir", 1 ], - [ "optical_cloak", 1 ], - [ "holo_cloak", 1 ], [ "mess_kit", 9 ], [ "mil_mess_kit", 1 ], [ "backpack", 32 ], [ "briefcase", 10 ], - { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] }, [ "chestguard_hard", 20 ], [ "armguard_hard", 20 ], [ "legguard_hard", 15 ], - [ "power_armor_frame", 4 ], - [ "power_armor_back_holster", 1 ], - [ "power_armor_holster", 1 ], - [ "power_armor_chest_rig", 1 ], - [ "power_armor_bscabbard", 1 ], - [ "power_armor_scabbard", 1 ], - [ "power_armor_sheath", 1 ], [ "elbow_pads", 40 ], [ "knee_pads", 40 ], [ "mask_bal", 5 ], @@ -2013,7 +2015,6 @@ [ "holster", 15 ], [ "sholster", 10 ], [ "bandolier_shotgun", 8 ], - [ "solarpack", 5 ], [ "chem_hexamine", 3 ], [ "esbit_stove", 6 ], [ "mess_tin", 4 ], diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json index 9135ff7de5d1..bc908b6296b2 100644 --- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json +++ b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json @@ -32,8 +32,8 @@ { "item": "bot_flashbang_hack", "prob": 2 }, { "item": "bot_gasbomb_hack", "prob": 2 }, { "item": "bot_haulerbot", "prob": 2 }, - { "item": "bot_rifleturret", "prob": 2 }, - { "item": "bot_antimateriel", "prob": 2 } + { "item": "bot_turret_medium", "prob": 2 }, + { "item": "bot_turret_longrange", "prob": 2 } ] }, { diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 6d58000ad83f..7c5adb903d34 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -445,7 +445,7 @@ "subtype": "distribution", "entries": [ { "group": "mags_milspec", "prob": 40 }, - { "item": "adv_UPS_off", "prob": 5, "charges": [ 0, 2000 ] }, + { "group": "mil_armor_electronics", "prob": 20 }, { "item": "plut_cell", "prob": 5 }, { "item": "flamethrower", "prob": 20 }, { "item": "rm451_flamethrower", "prob": 10 }, @@ -545,6 +545,7 @@ { "group": "guns_launcher_milspec", "prob": 5 }, { "group": "guns_launcher_rocket", "prob": 44 }, { "group": "guns_rifle_milspec", "prob": 10 }, + { "group": "mil_armor_electronics", "prob": 40 }, { "item": "human_flesh", "prob": 4, "count-min": 1, "count-max": 10 }, { "item": "bone_human", "prob": 10, "count-min": 1, "count-max": 5 }, { "item": "rag_bloody", "prob": 10, "count-min": 1, "count-max": 10 }, @@ -594,8 +595,6 @@ { "item": "v8_combustion", "prob": 5 }, { "item": "engine_block_large", "prob": 5 }, { "item": "extinguisher", "prob": 20 }, - { "item": "radio", "prob": 20 }, - { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] }, { "item": "tacvest", "prob": 10 }, { "item": "molle_pack", "prob": 8 }, { "item": "legrig", "prob": 10 }, @@ -614,32 +613,29 @@ { "item": "glasses_bal", "prob": 10 }, { "item": "55gal_drum", "prob": 1 }, { "item": "30gal_drum", "prob": 2 }, - { "item": "optical_cloak", "prob": 1 }, - { "item": "holo_cloak", "prob": 1 }, { "item": "grapnel", "prob": 1 }, { "item": "briefcase", "prob": 5 }, { "item": "survnote", "prob": 2 }, - { "item": "robot_controls", "prob": 3 }, - { "item": "solarpack", "prob": 1 } + { "item": "robot_controls", "prob": 3 } ] }, { "id": "inactive_bots_milspec", "type": "item_group", "items": [ - [ "bot_EMP_hack", 100 ], - [ "bot_c4_hack", 25 ], - [ "bot_flashbang_hack", 50 ], - [ "bot_gasbomb_hack", 50 ], - [ "bot_grenade_hack", 50 ], - [ "bot_antimateriel", 5 ], - [ "bot_manhack", 100 ], - [ "bot_mininuke_hack", 2 ], - [ "bot_rifleturret", 10 ], - [ "bot_crows_m240", 10 ], + [ "bot_haulerbot", 25 ], + [ "bot_grenade_hack", 5 ], + [ "bot_EMP_hack", 5 ], + [ "bot_flashbang_hack", 5 ], + [ "bot_gasbomb_hack", 5 ], + [ "bot_c4_hack", 4 ], + [ "bot_mininuke_hack", 1 ], + [ "bot_secubot", 10 ], [ "bot_talon_m202a1", 10 ], - [ "bot_dispatch_military", 15 ], - [ "bot_turret_searchlight", 75 ] + [ "bot_dispatch_military", 5 ], + [ "bot_turret_longrange", 5 ], + [ "bot_turret_medium", 10 ], + [ "bot_turret_searchlight", 10 ] ] }, { diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 294bcde25f5e..1dda03b02e3b 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -27,7 +27,7 @@ "@@@@@@@@@/..............", "@@@@@@@@@/..............", "@@@@@@@@@/]((]/]]]((]]]/", - "@@@@@@@@@/..../C......C/", + "@@@@@@@@@/C.../C......C/", "@@@@@@@@@/C.../C......C/", "@@@@@@@@@/C.uu/C.CCCC.C/", "@@@@@@@@@///////////////" @@ -37,29 +37,22 @@ { "group": "ammo_rifle_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 15 }, { "group": "ammo_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 10 }, { "group": "mags_milspec", "x": 10, "y": [ 12, 15 ], "chance": 75, "repeat": 5 }, - { "group": "military_standard_shotguns", "x": 13, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, { "group": "guns_shotgun_milspec", "x": 13, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, - { "group": "military_standard_sniper_rifles", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, { "group": "guns_rifle_milspec", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, { "group": "guns_smg_milspec", "x": [ 16, 20 ], "y": 12, "chance": 75, "repeat": 5 }, - { "group": "military_standard_assault_rifles", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 20 }, { "group": "military_standard_lmgs", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 10 }, { "group": "mil_base_hmg", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 2 }, - { "group": "military_standard_pistols", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 10 }, { "group": "guns_pistol_milspec", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, - - - { "group": "pwr_armor", "x": 10, "y": [ 21, 22 ], "chance": 75 }, - { "group": "pwr_armor_acc", "x": 10, "y": [ 21, 22 ], "chance": 75, "repeat": 3 }, - + { "group": "military", "x": 10, "y": [ 20, 21 ], "chance": 75, "repeat": 25 }, + { "group": "pwr_armor", "x": 10, "y": 22, "chance": 75 }, + { "group": "pwr_armor_acc", "x": 10, "y": 22, "chance": 75, "repeat": 3 }, { "item": "adv_UPS_off", "x": 12, "y": 22, "chance": 75, "repeat": 2 }, { "item": "plut_cell", "x": 12, "y": 22, "chance": 75, "repeat": 4 }, { "group": "mech_power_cell_spawn", "x": 13, "y": 22 }, - { "group": "guns_launcher_rocket", "x": 15, "y": [ 20, 22 ], "chance": 75, "repeat": 5 }, { "group": "grenades", "x": [ 17, 20 ], "y": 22, "chance": 75, "repeat": 20 }, { "group": "guns_launcher_grenade", "x": 22, "y": [ 20, 22 ], "chance": 75, "repeat": 5 }, diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 8d1495aed290..ac4b7d96acc6 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -497,11 +497,11 @@ " X sssssssssssssssssssssssssssss X ss|6....-...-......-..77.|{sssXss ,, b ,, x", " X sssssssssssssssssssssssssssss X ss|6....d...d......d..77.|{ss{Xss ,,, b ,, x", " X ss/////////////////////////ss X sssssssssssss|6...u-...-u.pp.u-u.77.|{ss{Xsss ,,, b ,, x", - " X ss/u..u..uuuuuu..u..u]...u/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", - " X ss/u..u..........u..u]...u/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", - " X ss/u................u]...u/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.??..??..?|ss ,,,,b ,, x", - " X ss/u.....uuuuuu.....u]...u/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", - " X ss/]]]]))]]]]]]))]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", + " X ss/u..u..uuuuuu..u..u]h..O/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsss ,,, b,,, x", + " X ss/u..u..........u..u]...O/ss X ss||w|||w|||w|------...-------------|||||||ss ,,,b,,,,x", + " X ss/u................u]h..O/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.??..??..?|ss ,,,,b ,, x", + " X ss/u.....uuuuuu.....u]...O/ss X ss|$...h##h...O-u..z...-c...---c.??..??..?|ss ,, b,,,,x", + " X ss/]]]]((]]]]]]((]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c.??..??..?|ss ,, b ,, x", " X ss/.....................(>/ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", " X ss/.....................(>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", " X ss///////////////////d/////ss X ssw...Y-......................d..........?|ss ,,,b ,, x", @@ -586,9 +586,13 @@ { "group": "SUS_coffee_cupboard", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, { "group": "dinnerware", "x": 3, "y": 63, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "liquor_and_spirits", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, + + + { "group": "metal_workshop", "x": 55, "y": 20, "chance": 50, "repeat": [ 5, 20 ] }, { "group": "supplies_metal", "x": 55, "y": 21, "chance": 50, "repeat": [ 10, 40 ] }, { "group": "tools_electronics", "x": 55, "y": 22, "chance": 50, "repeat": [ 5, 20 ] }, + { "group": "tools_common", "x": 63, "y": 23, "chance": 50, "repeat": [ 5, 20 ] }, { "group": "tools_common", "x": 54, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "tools_electronics", "x": 55, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, @@ -650,6 +654,7 @@ { "item": "diesel", "x": 75, "y": 19, "chance": 80, "repeat": [ 1, 10 ] }, { "item": "jerrycan", "x": 75, "y": 20, "chance": 80, "repeat": [ 1, 10 ] }, { "group": "supplies_metal", "x": 76, "y": [ 17, 20 ], "chance": 50, "repeat": [ 20, 80 ] }, + { "item": "extinguisher", "x": 69, "y": 23, "chance": 75 }, { "item": "extinguisher", "x": 52, "y": 25, "chance": 75 }, { "item": "extinguisher", "x": 67, "y": 44, "chance": 75 }, @@ -663,19 +668,18 @@ - { "item": "shoulder_strap", "x": [ 8, 9 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "holo_sight", "x": 10, "y": 15, "chance": 75, "repeat": 50 }, - { "item": "acog_scope", "x": 11, "y": 15, "chance": 75, "repeat": 30 }, - { "item": "red_dot_sight", "x": 12, "y": 15, "chance": 75, "repeat": 20 }, - - { "item": "goggles_ir", "x": [ 14, 16 ], "y": 15, "chance": 75, "repeat": 50 }, - { "item": "goggles_nv", "x": [ 17, 18 ], "y": 15, "chance": 75, "repeat": 40 }, - - { "item": "holster", "x": [ 20, 21 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "knife_combat", "x": [ 22, 23 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "sheath", "x": 24, "y": 15, "chance": 75, "repeat": 100 }, - + { "group": "gunmod_milspec", "x": 8, "y": [ 9, 12 ], "chance": 75, "repeat": 20 }, + { "group": "mil_armor_electronics", "x": 11, "y": [ 9, 10 ], "chance": 75, "repeat": 10 }, + { "item": "knife_combat", "x": [ 14, 15 ], "y": 9, "chance": 75, "repeat": 15 }, + { "item": "PR24-retracted", "x": [ 16, 17 ], "y": 9, "chance": 75, "repeat": 10 }, + { "item": "knife_rm42", "x": [ 18, 19 ], "y": 9, "chance": 75, "repeat": 5 }, + { "item": "shoulder_strap", "x": [ 14, 15 ], "y": 12, "chance": 75, "repeat": 25 }, + { "item": "holster", "x": [ 16, 17 ], "y": 12, "chance": 75, "repeat": 10 }, + { "item": "sheath", "x": [ 18, 19 ], "y": 12, "chance": 75, "repeat": 10 }, + { "group": "tools_gunsmith", "x": 22, "y": [ 9, 10 ], "chance": 75, "repeat": 10 }, + { "group": "inactive_bots_milspec", "x": 25, "y": [ 9, 12 ], "chance": 75, "repeat": 5 }, + { "group": "book_military", "x": 30, "y": [ 9, 12 ], "chance": 75, "repeat": 20 }, { "group": "mil_base_tent_medical_thrash", "x": [ 52, 64 ], "y": [ 54, 71 ], "chance": 25, "repeat": 15 } ], From 58ec6d7c292be841d092b385e6e5f19cbbe472a4 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 2 Jan 2024 18:00:18 -0600 Subject: [PATCH 07/12] Commit for remote --- .../military/mil_base/mil_base_z-1.json | 86 +++++++++++++------ .../mapgen/military/mil_base/mil_base_z0.json | 16 ++-- .../military/mil_base_palette.json | 4 +- 3 files changed, 73 insertions(+), 33 deletions(-) diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 1dda03b02e3b..4d135f2596cf 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -116,31 +116,67 @@ "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@///////////", + "@@@@@@/../@@@/c..??..??.", + "@@@@@@/../@@@/c..??..??.", + "@@@@@@/../@@@/c..??..??.", + "@@@@@@/../@@@/c..??..??.", + "@@@@@@/../@@@/..........", + "@@@@@@/../////..........", + "@@@@@@/...z..//////zz///", + "@@@@@@/...z.............", + "@@@@@@/..//.............", + "@@@@@@/../..............", + "@@@@@@/../..............", + "@@@@@@/../...&&&&&&&&&&.", + "@@@@@@/../...&&&&&&&&&&.", + "@@@@@@/../..............", + "@@@@@@/../..............", + "@@@@@@/..//.............", + "@@@@@@/...z.............", + "@@@@@@/...z..///////////", + "@@@@@@/../////@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@" ], "palettes": [ "mil_base_palette" ] } }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "mil_base_tunnels_l" ], + "weight": 250, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@//////////@@@@@@@@", + "///@@@/......../@@@@@@@@", + ".?/@@@//......//@@@@@@@@", + ".?/@@@/......../@@@@@@@@", + ".?/@@@//......//@@@@@@@@", + ".?/@@@/......../@@@@@@@@", + "../@@@////DD5///@@@@@@@@", + "../@@@@/....../@@@@@@@@@", + "////////......///////@@@", + "..........uu......../@@@", + "..........αα......../@@@", + "....iiiiiiiiiiiiii../@@@", + "....iiiiiiiiiiiiii../@@@", + "....iiiiiiiiiiiiii../@@@", + "....iiiiiiiiiiiiii../@@@", + "....iiiiiiiiiiiiii../@@@", + "....iiiiiiiiiiiiii../@@@", + "..................../@@@", + "..................../@@@", + "/////////////////////@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@", + "@@@@@@@@@@@@@@@@@@@@@@@@" + ], + "palettes": [ "mil_base_palette" ] + } + }, { "type": "mapgen", "method": "json", @@ -408,10 +444,10 @@ "@@@@@/aaaaaaaB...c/@@@@@", "@@@@@/...........c/@@@@@", "@@@@@/...........B/@@@@@", + "@@@@@/aaaaaaaB...B/@@@@@", "@@@@@/aaaaaaaB...B//@@@@", - "@@@@@/aaaaaaaB.... Date: Wed, 3 Jan 2024 13:28:32 -0600 Subject: [PATCH 08/12] Commit for remote --- .../military/mil_base/mil_base_z-1.json | 222 ++++++++++++------ .../mapgen/military/mil_base/mil_base_z0.json | 83 ++++--- .../mapgen/military/mil_base/mil_base_z1.json | 30 +-- .../military/mil_base_palette.json | 3 +- .../overmap/overmap_special/specials.json | 3 + .../overmap_terrain_military.json | 5 +- 6 files changed, 221 insertions(+), 125 deletions(-) diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 4d135f2596cf..472513de9774 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -87,7 +87,7 @@ "]]]/..//////////////////", "...D..z.................", "...D..z.................", - "././5//..///////////////", + "ω/ω/5//..///////////////", "////@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", @@ -116,67 +116,31 @@ "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@///////////", - "@@@@@@/../@@@/c..??..??.", - "@@@@@@/../@@@/c..??..??.", - "@@@@@@/../@@@/c..??..??.", - "@@@@@@/../@@@/c..??..??.", - "@@@@@@/../@@@/..........", - "@@@@@@/../////..........", - "@@@@@@/...z..//////zz///", - "@@@@@@/...z.............", - "@@@@@@/..//.............", - "@@@@@@/../..............", - "@@@@@@/../..............", - "@@@@@@/../...&&&&&&&&&&.", - "@@@@@@/../...&&&&&&&&&&.", - "@@@@@@/../..............", - "@@@@@@/../..............", - "@@@@@@/..//.............", - "@@@@@@/...z.............", - "@@@@@@/...z..///////////", - "@@@@@@/../////@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", + "@@@@@@/../@@@@@@@@@@@@@@", "@@@@@@/../@@@@@@@@@@@@@@" ], "palettes": [ "mil_base_palette" ] } }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_tunnels_l" ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@//////////@@@@@@@@", - "///@@@/......../@@@@@@@@", - ".?/@@@//......//@@@@@@@@", - ".?/@@@/......../@@@@@@@@", - ".?/@@@//......//@@@@@@@@", - ".?/@@@/......../@@@@@@@@", - "../@@@////DD5///@@@@@@@@", - "../@@@@/....../@@@@@@@@@", - "////////......///////@@@", - "..........uu......../@@@", - "..........αα......../@@@", - "....iiiiiiiiiiiiii../@@@", - "....iiiiiiiiiiiiii../@@@", - "....iiiiiiiiiiiiii../@@@", - "....iiiiiiiiiiiiii../@@@", - "....iiiiiiiiiiiiii../@@@", - "....iiiiiiiiiiiiii../@@@", - "..................../@@@", - "..................../@@@", - "/////////////////////@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@" - ], - "palettes": [ "mil_base_palette" ] - } - }, { "type": "mapgen", "method": "json", @@ -442,19 +406,19 @@ "@@@@@@@@@@@/..../@@@@@@@", "@@@@@//////////d///@@@@@", "@@@@@/aaaaaaaB...c/@@@@@", - "@@@@@/...........c/@@@@@", - "@@@@@/...........B/@@@@@", - "@@@@@/aaaaaaaB...B/@@@@@", - "@@@@@/aaaaaaaB...B//@@@@", - "@@@@@/............/ss X ss|$........Y.l-tVV--d----d----c.??..??..?|ss ,,, b ,, x", - " X ss/.....................(>/ss X ss|$..l------=------.........>-..........?|ss ,,, b,,,,x", - " X ss///////////////////d/////ss X ssw...Y-......................d..........?|ss ,,,b ,, x", - " X ss/th..$/uuuu$$/uuuu...u/ssss X ss|$...=......................-c.??..??..?|ss ,,, b ,, x", - " X ss/###..D......d.......u/ssss X ss|$$OO-......................-c.??..??..?|ss ,, b,,, x", - " X ssg###..5$$..[[/u..[[[.u/ss X ss|-----..-----------------...-c.??..??..?|ss ,, b ,,,x", - " X ss/th..$///ggg//u..[[[../ss X ss|O$`Y-..-.`$$$-u.QV.qV.v-...-c.??..??..?|ss ,, b ,, x", - " X ss/`....$/[.i.[/u....i../ss X ssw....=..=.....-u.......V-...-...........|ss ,,,,b ,, x", - " X ss/OO...Y/[...[/l.e...../ss X ss|###.-..-Y.###-uh....h..d...-...........|ss ,, b ,,,x", - " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..-..-l..ht-VVVt.VVVu-...-l........e.|ss ,, b ,, x", + " X ss/////////////////////////ss X sssssssssssss|6...u-...-u.pp.u-u.77.|{ss{Xsssss ,,, b ,, x", + " X ss/u..u..uuuuuu..u..u]h..O/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsssss ,,, b,,, x", + " X ss/u..u..........u..u]...O/ss X ss||w|||w|||w|------...-------------|||||||||ss ,,,b,,,,x", + " X ss/u................u]h..O/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.????.????.?|ss ,,,,b ,, x", + " X ss/u.....uuuuuu.....u]...O/ss X ss|$...h##h...O-u..z...-c...---c...........?|ss ,, b,,,,x", + " X ss/]]]]((]]]]]]((]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c...........?|ss ,, b ,, x", + " X ss/.....................(>/ss X ss|$........Y.l-tVV--d----d----c..iiiiiii..?|ss ,,, b ,, x", + " X ss/.....................(>/ss X ss|$..l------=------.........>-...iiiiiii..?|ss ,,, b,,,,x", + " X ss///////////////////d/////ss X ssw...Y-......................d...iiiiiii..?|ss ,,,b ,, x", + " X ss/th..$/uuuu$$/uuuu...u/ssss X ss|$...=......................-...iiiiiii..?|ss ,,, b ,, x", + " X ss/###..D......d.......u/ssss X ss|$$OO-......................-c..iiiiiii..?|ss ,, b,,, x", + " X ssg###..5$$..[[/u..[[[.u/ss X ss|-----..-----------------...-c..iiiiiii..?|ss ,, b ,,,x", + " X ss/th..$///ggg//u..[[[../ss X ss|O$`Y-..-.`$$$-u.QV.qV.v-...-c..iiiiiii..?|ss ,, b ,, x", + " X ss/`....$/[...[/u......./ss X ssw....=..=.....-u.......V-...-c..iiiiiii...|ss ,,,,b ,, x", + " X ss/OO...Y/[...[/l.e...../ss X ss|###.-..-Y.###-uh....h..d...-...iiiiiii...|ss ,, b ,,,x", + " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..-..-l..ht-VVVt.VVVu-...-l.eiiiiiiiα..|ss ,, b ,, x", - " ssssssssssssssssssssssssss ss||||||wz||w|-------d------d-||||DDDDDD|||ss ,,, b,,, x", - "sssssssssssssssssssssssssssssssssssssssssssssssssss|l.uuuu...uuuu...|~s_______________ ,,,b ,, x", - "sssssssssssssssssssssssssssssssssssssssssssssssssssz................|{s_______________ ,, b ,,,x", - "sssssssssssssssssssssssssssssssssssssssssssssssssss|................|{s_______________ ,,,b ,, x", - "___________________________________________________|e..............e|_________________,,, b,,,,x", + " ssssssssssssssssssssssssss ss||||||wz||w|-------d------d-||||DDDDDDD||||ss ,,, b,,, x", + "sssssssssssssssssssssssssssssssssssssssssssssssssss|..uuuu...uuuu...|~ss______ss{{sss ,,,b ,, x", + "sssssssssssssssssssssssssssssssssssssssssssssssssssz................|sss______sssssss ,, b ,,,x", + "sssssssssssssssssssssssssssssssssssssssssssssssssss|e..............e|ss_______________ ,,,b ,, x", + "___________________________________________________D................D_________________,,, b,,,,x", "___________________________________________________D................D_________________ ,,,b ,, x", - "___________________________________________________D................D_________________,,, b ,, x", + "___________________________________________________D...&&&&&&&&&&...D_________________,,, b ,, x", "___________________________________________________D...&&&&&&&&&&...D_________________,,, b ,,,x", "___________________________________________________D...&&&&&&&&&&...D_________________ ,, b ,,,x", "___________________________________________________D................D_________________,,, b ,,,x", "___________________________________________________D................D_________________,,, b,,, x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy___________________|...uu..uu..uu...|_________________ ,,,b,,, x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy___________________|...uu..αα..uu...|_________________ ,,,b,,, x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,, b ,, x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,, b ,,,x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,,,b ,,,x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,,,b,,, x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,, b ,, x", - "___________________________________________________D.iiiiiiiiiiiiii.D_________________,,,,b ,, x", - "___________________________________________________|e..............e|_________________ ,, b ,,,x", - "ssssssssssssssssssssssssssssssss________________sss|..VVVuu.VVVuuu.l|ss_______________ ,, b ,,,x", - "ssssssssssssssssssssssssssssssss________________sss||||||||||||||||||ss_______________,,,,b ,,,x", - "ssssssssssssssssssssssssssssssss________________ssss~ssssssssssssssssss_______________ ,,,b,,, x", - "ssssss||w||||w|||||w|||||w|||ss ________________sssssssssssssssssssssss_______________,,,,b,,, x", + "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_________________ss|...uu..uu..uu...|ss_______________ ,,,b,,, x", + "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_________________ss|e..uu..uu..uu..e|ss_______________ ,,,b,,, x", + "___________________________________________________D................D_________________,,, b ,, x", + "___________________________________________________D................D_________________,,, b ,,,x", + "___________________________________________________D...&&&&&&&&&&...D_________________,,,,b ,,,x", + "___________________________________________________D...&&&&&&&&&&...D_________________,,,,b,,, x", + "___________________________________________________D...&&&&&&&&&&...D_________________,,, b ,, x", + "___________________________________________________D................D_________________,,,,b ,, x", + "___________________________________________________D................D_________________ ,, b ,,,x", + "ssssssssssssssssssssssssssssssss_________________ss|l.VVVuu.VVVuuu.l|ss_______________ ,, b ,,,x", + "ssssssssssssssssssssssssssssssss_________________ss||||||||||||||||||ss_______________,,,,b ,,,x", + "ssssssssssssssssssssssssssssssss_________________sss~ssssssssssssssssss_______________ ,,,b,,, x", + "ssssss||w||||w|||||w|||||w|||ss _________________ssssssssssssssssssssss_______________,,,,b,,, x", "ssssss|[..-$$.`U-$`.$$-O...$|ss ________________ _______________,,,,b ,, x", "ssssss|...-th...-...ht-th..$|ss ______________________________________________________,,, b ,,,x", @@ -583,7 +583,6 @@ ], "^": [ { "item": "mil_base_iv", "chance": 70 } ] }, - "monster": { "i": { "monster": "mon_zombie_soldier", "chance": 30 } }, "place_loot": [ { "group": "SUS_coffee_cupboard", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, { "group": "dinnerware", "x": 3, "y": 63, "chance": 50, "repeat": [ 5, 10 ] }, @@ -591,15 +590,21 @@ + + + { "group": "metal_workshop", "x": 55, "y": 20, "chance": 50, "repeat": [ 5, 20 ] }, { "group": "supplies_metal", "x": 55, "y": 21, "chance": 50, "repeat": [ 10, 40 ] }, { "group": "tools_electronics", "x": 55, "y": 22, "chance": 50, "repeat": [ 5, 20 ] }, { "group": "tools_common", "x": 63, "y": 23, "chance": 50, "repeat": [ 5, 20 ] }, + { "group": "tools_common", "x": 54, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "tools_electronics", "x": 55, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "supplies_electronics", "x": 56, "y": 11, "chance": 50, "repeat": [ 5, 20 ] }, + { "group": "supplies_metal", "x": 54, "y": 12, "chance": 50, "repeat": [ 5, 20 ] }, + { "group": "SUS_welding_gear", "x": 61, "y": 25, "chance": 100, "repeat": [ 1, 2 ] }, { "group": "tools_mechanic", "x": 62, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, { "group": "ammo_medium_batteries", "x": 63, "y": 25, "chance": 50, "repeat": [ 5, 10 ] }, @@ -607,13 +612,16 @@ { "group": "supplies_metal", "x": 64, "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, { "group": "tools_electronics", "x": [ 56, 57 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, { "group": "tools_common", "x": [ 54, 55 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, + { "group": "mechanics", "x": [ 55, 56 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, { "group": "mechanics", "x": [ 59, 60 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, { "group": "mechanics", "x": [ 63, 64 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, + { "group": "tools_common", "x": 57, "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "supplies_mechanics", "x": 58, "y": 44, "chance": 50, "repeat": [ 5, 20 ] }, { "group": "tools_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "supplies_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 10, 40 ] }, + { "group": "tools_common", "x": 52, "y": 9, "chance": 20 }, { "group": "tools_common", "x": 56, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, { "group": "tools_common", "x": 62, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, @@ -621,9 +629,7 @@ { "group": "tools_common", "x": 68, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, { "item": "hdframe", "x": 71, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 20 ] }, { "item": "mil_plate", "x": 71, "y": 13, "chance": 75, "repeat": [ 5, 30 ] }, - { "item": "alloy_plate", "x": 71, "y": 14, "chance": 75, "repeat": [ 5, 30 ] }, { "item": "steel_plate", "x": 72, "y": 11, "chance": 75, "repeat": [ 10, 40 ] }, - { "item": "hard_plate", "x": 72, "y": 12, "chance": 75, "repeat": [ 5, 30 ] }, { "item": "reinforced_glass_sheet", "x": 72, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 20 ] }, { "item": "wheel_mount_heavy", "x": 75, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 10 ] }, { "item": "wheel_armor", "x": 75, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 10 ] }, @@ -655,6 +661,7 @@ { "item": "motor_oil", "x": 75, "y": [ 17, 18 ], "chance": 50, "repeat": [ 20, 40 ] }, { "item": "diesel", "x": 75, "y": 19, "chance": 80, "repeat": [ 1, 10 ] }, { "item": "jerrycan", "x": 75, "y": 20, "chance": 80, "repeat": [ 1, 10 ] }, + { "group": "supplies_metal", "x": 76, "y": [ 17, 20 ], "chance": 50, "repeat": [ 20, 80 ] }, { "item": "extinguisher", "x": 69, "y": 23, "chance": 75 }, diff --git a/data/json/mapgen/military/mil_base/mil_base_z1.json b/data/json/mapgen/military/mil_base/mil_base_z1.json index 906acb94422e..caac4066d1b9 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z1.json @@ -335,21 +335,21 @@ " |......................3 F ", " ::::::::::::::::::::::::: |......................3 F ", " ::::::::::::::::::::::::: |......................3 F ", - " ::::::::::::::::::::::::: 222222222225......................2222223 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::: |.......................................3 F ", - " ::::::::::::::::::::::: |.......................................3 F ", - " |-----------................5-----------3 F ", + " ::::::::::::::::::::::::: 222222222225......................222222223 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " ::::::::::::::::::::::: |.........................................3 F ", + " |-----------................5-------------3 F ", " |................3 F ", " |................3 F ", " |................3 F ", diff --git a/data/json/mapgen_palettes/military/mil_base_palette.json b/data/json/mapgen_palettes/military/mil_base_palette.json index 7c81818c3c06..0d7645f72ec7 100644 --- a/data/json/mapgen_palettes/military/mil_base_palette.json +++ b/data/json/mapgen_palettes/military/mil_base_palette.json @@ -60,7 +60,8 @@ "0": "t_console", "@": "t_rock", "~": "t_gutter_downspout", - "α": "t_elevator_control" + "α": "t_elevator_control", + "ω": "t_thconc_floor_olight" }, "furniture": { "}": "f_rubble", diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index e66c8de122db..dce32a96a551 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -5426,6 +5426,9 @@ { "point": [ 3, 6, -1 ], "overmap": "mil_base_tunnels_g_north" }, { "point": [ 2, 6, -1 ], "overmap": "mil_base_tunnels_h_north" }, { "point": [ 6, 4, -1 ], "overmap": "mil_base_tunnels_i_north" }, + { "point": [ 7, 4, -1 ], "overmap": "mil_base_tunnels_l_north" }, + { "point": [ 7, 5, -1 ], "overmap": "mil_base_tunnels_m_north" }, + { "point": [ 6, 5, -1 ], "overmap": "mil_base_tunnels_n_north" }, { "point": [ 0, 0, 1 ], "overmap": "mil_base_1a1_north" }, { "point": [ 1, 0, 1 ], "overmap": "mil_base_2a1_north" }, { "point": [ 2, 0, 1 ], "overmap": "mil_base_3a1_north" }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json index 3c85341f5d76..80ded726df1f 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json @@ -312,7 +312,10 @@ "mil_base_tunnels_g", "mil_base_tunnels_h", "mil_base_tunnels_i", - "mil_base_tunnels_j" + "mil_base_tunnels_j", + "mil_base_tunnels_l", + "mil_base_tunnels_m", + "mil_base_tunnels_n" ], "copy-from": "generic_military_base", "name": "military base - tunnel" From 031b08de46682bf6cf565af026fde099d0b08448 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 3 Jan 2024 18:32:51 -0600 Subject: [PATCH 09/12] This should finally get it ready... --- data/json/itemgroups/military.json | 16 +- .../military/mil_base/mil_base_z-1.json | 77 ++++----- .../mapgen/military/mil_base/mil_base_z0.json | 149 ++++++------------ data/json/monstergroups/robots.json | 18 ++- data/json/monsters/utility_bot.json | 2 +- 5 files changed, 112 insertions(+), 150 deletions(-) diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 7c5adb903d34..ff1bdb39ed8d 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -651,14 +651,17 @@ [ "v_airjack_item", 20 ], [ "jumper_cable", 15 ], [ "jumper_cable_heavy", 5 ], - [ "frame", 10 ], [ "hd_tow_cable", 5 ], + [ "frame", 10 ], [ "hdframe", 20 ], - [ "motor", 2 ], + [ "steel_plate", 20 ], + [ "mil_plate", 10 ], + [ "wheel_mount_heavy", 10 ], [ "wheel", 10 ], [ "wheel_wide", 10 ], [ "wheel_small", 10 ], [ "wheel_wide_or", 5 ], + [ "wheel_armor", 10 ], [ "1cyl_combustion", 1 ], [ "v2_combustion", 2 ], [ "i4_combustion", 2 ], @@ -676,18 +679,19 @@ [ "large_turbine_engine", 3 ], [ "weldrig", 1 ], [ "solar_cell", 1 ], - [ "bearing", 1 ], - [ "headlight_reinforced", 10 ], + [ "bearing", 10 ], + [ "reinforced_glass_sheet", 10 ], [ "motor_large", 1 ], [ "battery_car", 6 ], [ "alternator_car", 6 ], [ "alternator_truck", 6 ], - [ "hd_tow_cable", 1 ], [ "generator_7500w", 3 ], [ "storage_battery", 6 ], [ "motor_oil", 100 ], [ "solar_panel", 3 ], - [ "recharge_station", 8 ] + [ "recharge_station", 8 ], + [ "turret_mount", 12 ], + [ "turret_controls", 3 ] ] } ] diff --git a/data/json/mapgen/military/mil_base/mil_base_z-1.json b/data/json/mapgen/military/mil_base/mil_base_z-1.json index 472513de9774..a87916ac6cf8 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z-1.json +++ b/data/json/mapgen/military/mil_base/mil_base_z-1.json @@ -47,7 +47,7 @@ { "group": "mil_base_hmg", "x": [ 16, 20 ], "y": 15, "chance": 75, "repeat": 2 }, { "group": "military_standard_pistols", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 10 }, { "group": "guns_pistol_milspec", "x": 23, "y": [ 12, 13 ], "chance": 75, "repeat": 5 }, - { "group": "military", "x": 10, "y": [ 20, 21 ], "chance": 75, "repeat": 25 }, + { "group": "military", "x": 10, "y": [ 20, 21 ], "chance": 75, "repeat": 10 }, { "group": "pwr_armor", "x": 10, "y": 22, "chance": 75 }, { "group": "pwr_armor_acc", "x": 10, "y": 22, "chance": 75, "repeat": 3 }, { "item": "adv_UPS_off", "x": 12, "y": 22, "chance": 75, "repeat": 2 }, @@ -57,7 +57,8 @@ { "group": "grenades", "x": [ 17, 20 ], "y": 22, "chance": 75, "repeat": 20 }, { "group": "guns_launcher_grenade", "x": 22, "y": [ 20, 22 ], "chance": 75, "repeat": 5 }, { "group": "ammo_launcher_grenade", "x": 22, "y": [ 20, 22 ], "chance": 75, "repeat": 5 } - ] + ], + "place_monster": [ { "group": "GROUP_ROBOTS_MIL", "x": [ 11, 22 ], "y": [ 13, 21 ], "repeat": [ 2, 3 ] } ] } }, { @@ -94,15 +95,13 @@ "@@@@@@/../@@@@@@@@@@@@@@" ], "palettes": [ "mil_base_palette" ], + "monster": { "ω": { "monster": "mon_turret_medium" } }, "place_loot": [ { "group": "ammo_rifle_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 15 }, { "group": "ammo_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 10 }, { "group": "mags_milspec", "x": 2, "y": [ 12, 15 ], "chance": 75, "repeat": 5 } ], - "place_monster": [ - { "monster": "mon_turret_medium", "x": 0, "y": 19 }, - { "monster": "mon_turret_medium", "x": 2, "y": 19 } - ] + "place_monster": [ { "group": "GROUP_ROBOTS_MIL", "x": [ 4, 5 ], "y": [ 14, 18 ], "repeat": [ 1, 2 ] } ] } }, { @@ -154,9 +153,9 @@ "........./@@@@@@@@@@@@@@", "........./@@@@@@@@@@@@@@", "///////../@@@@@@@@@@@@@@", - "///@@@/../@@@@@@@@@@@@@@", - "//$$.`OO/sss________________ssss", "x ,, b ,,,,,,,,,,, , ,NNN,ss/...............................///....ht/sss_______yy_______ssss", - "x ,, b,,,,,,,, , ,,, ss/.................................d.i.###gsss_______yy_______sss|", - "x ,,,b,,,,,, ss/..............................i../...###/sss_______yy_______sss|", - "x ,, b,,,,, ss/...........................::..../$.i.ht/sss________________sss|", + "x ,, b,,,,,,,, , ,,, ss/.................................d...###gsss_______yy_______sss|", + "x ,,,b,,,,,, ss/................................./...###/sss_______yy_______sss|", + "x ,, b,,,,, ss/...........................::..../$...ht/sss________________sss|", "x ,,,b ,,, ss/....???????????..???????...::..../$.....gsss_______yy_______sss|", "x,,, b,,,, ss/....???????????..???????........./$.Y.$$/sss_______yy_______sss|", "x ,, b ,,, ss/...........................::....//g/D5//sss_______yy_______sss|", @@ -392,7 +389,7 @@ "x ,, bbbb},,, ss/.................................Dssssssssss_______yy_______sss|", "G ,,,b,,}},,,, ss/................................./ssssssssss_______yy_______sss|", "G ,, b,,}}},, ss/................................./ssssssssss________________sssw", - "x ,,,b,}}}},,, ss/....???????????..???????......i../ssssssssss_______yy_______sss|", + "x ,,,b,}}}},,, ss/....???????????..???????........./ssssssssss_______yy_______sss|", "x ,, bb}}},,,, ss/....???????????..???????.........Dssssssssss_______yy_______sss|", "x,,, b}},,,,,, ss/.................................Dssssssssss_______yy_______sss~", "x ,,,b,,,,,,, ss/.................................Dssssssssss________________ssss", @@ -414,10 +411,8 @@ "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ] }, - "monster": { "i": { "monster": "mon_zombie_soldier", "chance": 30 } }, "place_loot": [ { "group": "mil_base_hmg", "x": 25, "y": 46, "chance": 10, "magazine": 100 }, - { "group": "SUS_janitors_closet", "x": 34, "y": 26 }, { "group": "SUS_kitchen_sink", "x": 31, "y": 34 }, { "group": "SUS_kitchen_sink", "x": 31, "y": 36 }, @@ -458,6 +453,10 @@ { "group": "pantry_liquids", "x": 36, "y": 53, "chance": 75, "repeat": 10 }, { "item": "water_clean", "x": [ 36, 46 ], "y": 48, "chance": 75, "repeat": 50 } ], + "place_monster": [ + { "group": "GROUP_ROBOTS_MIL", "x": [ 33, 47 ], "y": [ 48, 70 ] }, + { "group": "GROUP_ROBOTS_MIL", "x": [ 48, 64 ], "y": [ 48, 70 ] } + ], "place_monsters": [ { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, @@ -499,7 +498,7 @@ " X ss/////////////////////////ss X sssssssssssss|6...u-...-u.pp.u-u.77.|{ss{Xsssss ,,, b ,, x", " X ss/u..u..uuuuuu..u..u]h..O/ss X ssssssssssss~|u...u-...-l.pp.u-u....|{ss{Xsssss ,,, b,,, x", " X ss/u..u..........u..u]...O/ss X ss||w|||w|||w|------...-------------|||||||||ss ,,,b,,,,x", - " X ss/u................u]h..O/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c.????.????.?|ss ,,,,b ,, x", + " X ss/u................u]h..O/ss X ss|$.OOt##t..`O-uuu-...-S...+T-c..???.???..?|ss ,,,,b ,, x", " X ss/u.....uuuuuu.....u]...O/ss X ss|$...h##h...O-u..z...-c...---c...........?|ss ,, b,,,,x", " X ss/]]]]((]]]]]]((]]]]]..///ss X ssw.....##....O-..h-...-S...+T-c...........?|ss ,, b ,, x", " X ss/.....................(>/ss X ss|$........Y.l-tVV--d----d----c..iiiiiii..?|ss ,,, b ,, x", @@ -512,7 +511,6 @@ " X ss/`....$/[...[/u......./ss X ssw....=..=.....-u.......V-...-c..iiiiiii...|ss ,,,,b ,, x", " X ss/OO...Y/[...[/l.e...../ss X ss|###.-..-Y.###-uh....h..d...-...iiiiiii...|ss ,, b ,,,x", " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..-..-l..ht-VVVt.VVVu-...-l.eiiiiiiiα..|ss ,, b ,, x", - " ssssssssssssssssssssssssss ss||||||wz||w|-------d------d-||||DDDDDDD||||ss ,,, b,,, x", "sssssssssssssssssssssssssssssssssssssssssssssssssss|..uuuu...uuuu...|~ss______ss{{sss ,,,b ,, x", "sssssssssssssssssssssssssssssssssssssssssssssssssssz................|sss______sssssss ,, b ,,,x", @@ -537,15 +535,14 @@ "ssssssssssssssssssssssssssssssss_________________ss||||||||||||||||||ss_______________,,,,b ,,,x", "ssssssssssssssssssssssssssssssss_________________sss~ssssssssssssssssss_______________ ,,,b,,, x", "ssssss||w||||w|||||w|||||w|||ss _________________ssssssssssssssssssssss_______________,,,,b,,, x", - "ssssss|[..-$$.`U-$`.$$-O...$|ss ________________ _______________,,,,b ,, x", "ssssss|...-th...-...ht-th..$|ss ______________________________________________________,,, b ,,,x", "|ww|z||...-###..-..###-###.`|ss ______________________________________________________ ,, b,,, x", "..........-.....-....O-....U|ss ______________________________________________________ ,, b ,,,x", "###.......-Y..OO-Y...O-.Y---|ss ______________________________________________________ ,,,b ,,,x", "th....-...--=-----=----=-///|ss ______________________________________________________,,, b ,, x", - "OOO$$$-..................D>/|ss ______________________________________________________,,, b,,, x", - "-------..................5//|ss ______________________________________________________ ,,,b ,,,x", + "OOO$$$-..................z>/|ss ______________________________________________________,,, b,,, x", + "-------..................///|ss ______________________________________________________ ,,,b ,,,x", "OAAO.Y-...--=-----=----=----|ss ____1112111_______________________111111111111111_____,,,,b,,, x", "......+...-Y.$$$-Y...`-.Y`$$|ss ____1B___^1__1112111______________1^M_M_M^MBM_M^1_____,,,,b ,, x", "...[.A-...-.....-....$-.....|ss ____1MM_MM1__1____^1______________1_M_M_M_M_M_M_1_____ ,;,b,,, x", @@ -574,6 +571,7 @@ "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ], ";": [ { "item": "mil_base_bodybag", "chance": 90, "repeat": [ 0, 1 ] } ], + "l": [ { "item": "fireman_cabinet", "chance": 75 } ], "V": [ { "item": "tools_common", "chance": 50, "repeat": [ 0, 1 ] } ], "U": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 10 ] }, @@ -587,97 +585,36 @@ { "group": "SUS_coffee_cupboard", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, { "group": "dinnerware", "x": 3, "y": 63, "chance": 50, "repeat": [ 5, 10 ] }, { "group": "liquor_and_spirits", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, - - - - - - - { "group": "metal_workshop", "x": 55, "y": 20, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "supplies_metal", "x": 55, "y": 21, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_electronics", "x": 55, "y": 22, "chance": 50, "repeat": [ 5, 20 ] }, - - { "group": "tools_common", "x": 63, "y": 23, "chance": 50, "repeat": [ 5, 20 ] }, - - { "group": "tools_common", "x": 54, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "tools_electronics", "x": 55, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_electronics", "x": 56, "y": 11, "chance": 50, "repeat": [ 5, 20 ] }, - - { "group": "supplies_metal", "x": 54, "y": 12, "chance": 50, "repeat": [ 5, 20 ] }, - - { "group": "SUS_welding_gear", "x": 61, "y": 25, "chance": 100, "repeat": [ 1, 2 ] }, - { "group": "tools_mechanic", "x": 62, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "group": "ammo_medium_batteries", "x": 63, "y": 25, "chance": 50, "repeat": [ 5, 10 ] }, + { "group": "metal_workshop", "x": 55, "y": 20, "chance": 50, "repeat": 10 }, + { "group": "supplies_metal", "x": 55, "y": 21, "chance": 50, "repeat": 10 }, + { "group": "tools_electronics", "x": 55, "y": 22, "chance": 50, "repeat": 10 }, + { "group": "tools_common", "x": 63, "y": 23, "chance": 50, "repeat": 10 }, + { "group": "tools_common", "x": 54, "y": 11, "chance": 50, "repeat": 10 }, + { "group": "tools_electronics", "x": 55, "y": 11, "chance": 50, "repeat": 10 }, + { "group": "supplies_electronics", "x": 56, "y": 11, "chance": 50, "repeat": 5 }, + { "group": "supplies_metal", "x": 54, "y": 12, "chance": 50, "repeat": 5 }, + { "group": "SUS_welding_gear", "x": 61, "y": 25, "chance": 100 }, + { "group": "tools_mechanic", "x": 62, "y": 25, "chance": 50, "repeat": 5 }, + { "group": "ammo_medium_batteries", "x": 63, "y": 25, "chance": 50, "repeat": 5 }, { "item": "recharge_station", "x": 63, "y": 25, "chance": 90 }, - { "group": "supplies_metal", "x": 64, "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_electronics", "x": [ 56, 57 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_common", "x": [ 54, 55 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - - { "group": "mechanics", "x": [ 55, 56 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - { "group": "mechanics", "x": [ 59, 60 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - { "group": "mechanics", "x": [ 63, 64 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - - { "group": "tools_common", "x": 57, "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_mechanics", "x": 58, "y": 44, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "tools_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 10, 40 ] }, - + { "group": "supplies_metal", "x": 64, "y": 25, "chance": 50, "repeat": 5 }, + { "group": "tools_electronics", "x": [ 56, 57 ], "y": 25, "chance": 50, "repeat": 5 }, + { "group": "tools_common", "x": [ 54, 55 ], "y": 25, "chance": 50, "repeat": 5 }, + { "group": "mechanics", "x": [ 55, 56 ], "y": [ 35, 36 ], "chance": 50, "repeat": 5 }, + { "group": "mechanics", "x": [ 59, 60 ], "y": [ 35, 36 ], "chance": 50, "repeat": 5 }, + { "group": "mechanics", "x": [ 63, 64 ], "y": [ 35, 36 ], "chance": 50, "repeat": 5 }, + { "group": "tools_common", "x": 57, "y": 44, "chance": 50, "repeat": 5 }, + { "group": "supplies_mechanics", "x": 58, "y": 44, "chance": 50, "repeat": 5 }, + { "group": "tools_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": 5 }, + { "group": "supplies_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": 5 }, { "group": "tools_common", "x": 52, "y": 9, "chance": 20 }, - { "group": "tools_common", "x": 56, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 62, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 66, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 68, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "item": "hdframe", "x": 71, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 20 ] }, - { "item": "mil_plate", "x": 71, "y": 13, "chance": 75, "repeat": [ 5, 30 ] }, - { "item": "steel_plate", "x": 72, "y": 11, "chance": 75, "repeat": [ 10, 40 ] }, - { "item": "reinforced_glass_sheet", "x": 72, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 20 ] }, - { "item": "wheel_mount_heavy", "x": 75, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "wheel_armor", "x": 75, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "v8_diesel", "x": 76, "y": [ 11, 12 ], "chance": 75, "repeat": [ 1, 2 ] }, - { "item": "v12_diesel", "x": 76, "y": 13, "chance": 75 }, - { "item": "small_turbine_engine", "x": 76, "y": 14, "chance": 75 }, - { "item": "alternator_truck", "x": 79, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "battery_car", "x": 79, "y": 12, "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "vehicle_controls", "x": 79, "y": 13, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "vehicle_dashboard", "x": 79, "y": 14, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "muffler", "x": 79, "y": 15, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "drivebelt", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "filter_air", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "filter_liquid", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "glowplug", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "motor_small", "x": 79, "y": 17, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "power_supply", "x": 79, "y": 17, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "cable", "x": 79, "y": 17, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "engine_block_large", "x": 79, "y": 18, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "engine_block_massive", "x": 79, "y": 18, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "well_pump", "x": 79, "y": 19, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "pump_complex", "x": 79, "y": 19, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "metal_tank_little", "x": 79, "y": 19, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "turret_mount", "x": 79, "y": 20, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "weldtank", "x": 71, "y": [ 17, 18 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "weldtank", "x": 72, "y": [ 17, 18 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "tinyweldtank", "x": 71, "y": [ 19, 20 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "tinyweldtank", "x": 72, "y": [ 19, 20 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "motor_oil", "x": 75, "y": [ 17, 18 ], "chance": 50, "repeat": [ 20, 40 ] }, - { "item": "diesel", "x": 75, "y": 19, "chance": 80, "repeat": [ 1, 10 ] }, - { "item": "jerrycan", "x": 75, "y": 20, "chance": 80, "repeat": [ 1, 10 ] }, - - { "group": "supplies_metal", "x": 76, "y": [ 17, 20 ], "chance": 50, "repeat": [ 20, 80 ] }, - - { "item": "extinguisher", "x": 69, "y": 23, "chance": 75 }, - { "item": "extinguisher", "x": 52, "y": 25, "chance": 75 }, - { "item": "extinguisher", "x": 67, "y": 44, "chance": 75 }, - { "item": "extinguisher", "x": 21, "y": 22, "chance": 75 }, - { "item": "extinguisher", "x": 62, "y": 9, "chance": 75 }, - - - - - - - - - + { "group": "tools_common", "x": 56, "y": [ 8, 9 ], "chance": 20 }, + { "group": "tools_common", "x": 62, "y": [ 8, 9 ], "chance": 20 }, + { "group": "tools_common", "x": 66, "y": [ 8, 9 ], "chance": 20 }, + { "group": "tools_common", "x": 68, "y": [ 8, 9 ], "chance": 20 }, + { "group": "supplies_mechanics", "x": [ 72, 74 ], "y": 11, "chance": 75, "repeat": 10 }, + { "group": "supplies_spares_vehicle", "x": [ 76, 78 ], "y": 11, "chance": 75, "repeat": 5 }, + { "group": "supplies_mechanics_milspec", "x": 72, "y": [ 11, 20 ], "chance": 75, "repeat": 20 }, { "group": "gunmod_milspec", "x": 8, "y": [ 9, 12 ], "chance": 75, "repeat": 20 }, { "group": "mil_armor_electronics", "x": 11, "y": [ 9, 10 ], "chance": 75, "repeat": 10 }, { "item": "knife_combat", "x": [ 14, 15 ], "y": 9, "chance": 75, "repeat": 15 }, @@ -689,13 +626,15 @@ { "group": "tools_gunsmith", "x": 22, "y": [ 9, 10 ], "chance": 75, "repeat": 10 }, { "group": "inactive_bots_milspec", "x": 25, "y": [ 9, 12 ], "chance": 75, "repeat": 5 }, { "group": "book_military", "x": 30, "y": [ 9, 12 ], "chance": 75, "repeat": 20 }, - { "group": "mil_base_tent_medical_thrash", "x": [ 52, 64 ], "y": [ 54, 71 ], "chance": 25, "repeat": 15 } ], + "place_monster": [ + { "group": "GROUP_ROBOTS_MIL", "x": [ 9, 23 ], "y": [ 10, 21 ], "repeat": [ 2, 5 ] }, + { "group": "GROUP_ROBOTS_MIL", "x": [ 1, 23 ], "y": [ 51, 60 ], "repeat": [ 3, 6 ] } + ], "place_monsters": [ { "monster": "GROUP_MIL_BASE", "x": [ 0, 23 ], "y": [ 26, 47 ], "repeat": [ 6, 8 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 26, 47 ], "repeat": [ 1, 2 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 0, 23 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 24, 47 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 48, 71 ], "y": [ 48, 71 ], "repeat": [ 4, 5 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 72, 95 ], "y": [ 48, 71 ], "repeat": [ 4, 5 ], "density": 0.1 } diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json index bacbe0db1d80..e8914769ed62 100644 --- a/data/json/monstergroups/robots.json +++ b/data/json/monstergroups/robots.json @@ -41,5 +41,21 @@ "name": "GROUP_TURRET_RIOT", "default": "mon_turret_riot", "monsters": [ { "monster": "mon_turret_riot", "freq": 100, "cost_multiplier": 0 } ] - } + }, + { + "type": "monstergroup", + "name": "GROUP_ROBOTS_MIL", + "//": "75% chance of security and military robots, excluding turrets and hacks", + "default": "mon_null", + "monsters": [ + { "monster": "mon_haulerbot", "freq": 150, "cost_multiplier": 0 }, + { "monster": "mon_hazmatbot", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_molebot", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_riotbot", "freq": 150, "cost_multiplier": 0 }, + { "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 }, + { "monster": "mon_talon_m202a1", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_dispatch", "freq": 100, "cost_multiplier": 0 }, + { "monster": "mon_dispatch_military", "freq": 50, "cost_multiplier": 0 } + ] + }, ] diff --git a/data/json/monsters/utility_bot.json b/data/json/monsters/utility_bot.json index f4573fecce83..e2b808d13080 100644 --- a/data/json/monsters/utility_bot.json +++ b/data/json/monsters/utility_bot.json @@ -189,7 +189,7 @@ "revert_to_itype": "bot_molebot", "death_drops": { "groups": [ [ "robots", 4 ], [ "molebot", 1 ] ] }, "death_function": [ "BROKEN" ], - "flags": [ "HEARS", "GOODHEARING", "DIGS", "NO_BREATHE", "ELECTRONIC", "COLDPROOF", "PATH_AVOID_DANGER_1", "BIOPROOF" ] + "flags": [ "HEARS", "GOODHEARING", "CAN_DIG", "NO_BREATHE", "ELECTRONIC", "COLDPROOF", "PATH_AVOID_DANGER_1", "BIOPROOF" ] }, { "//": "nurse_bot and nurse_bot_defective look very similar, part of the trick is figuring out which one is the good one. So the sprites should probably look pretty similar to not give it away immediately", From fd9a6562d79e17bf42a34352a5d6c62a62a6d3f9 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 3 Jan 2024 20:03:39 -0600 Subject: [PATCH 10/12] One last bit of lint and error checking weh --- .../itemgroups/Clothing_Gear/clothing.json | 38 ++++++++++--------- data/json/itemgroups/military.json | 5 ++- .../mapgen/military/mil_base/mil_base_z0.json | 14 +++---- data/json/monstergroups/robots.json | 2 +- data/json/scenarios.json | 8 ++-- data/json/start_locations.json | 19 ++++++++++ 6 files changed, 55 insertions(+), 31 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 7db4337ffa25..c2ddc2d839ef 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -135,7 +135,6 @@ { "item": "elbow_pads", "prob": 5 }, { "item": "boots", "prob": 10 }, { "item": "boots_combat", "prob": 10 } - ] }, { @@ -286,11 +285,7 @@ "id": "clothing_soldier_shirt", "type": "item_group", "subtype": "distribution", - "entries": [ - { "item": "tshirt", "prob": 75 }, - { "item": "army_top", "prob": 15 }, - { "item": "tank_top", "prob": 10 } - ] + "entries": [ { "item": "tshirt", "prob": 75 }, { "item": "army_top", "prob": 15 }, { "item": "tank_top", "prob": 10 } ] }, { "id": "clothing_outdoor_pants", @@ -388,7 +383,14 @@ "type": "item_group", "//": "Tactical gear that can be strapped to the legs", "subtype": "distribution", - "entries": [ { "item": "legpouch", "prob": 25 }, { "item": "legpouch_large", "prob": 75 }, { "item": "legrig", "prob": 50 }, { "item": "dump_pouch", "prob": 50 }, { "item": "grenadebandolier", "prob": 25 }, { "item": "grenadebandolier", "prob": 25 } ] + "entries": [ + { "item": "legpouch", "prob": 25 }, + { "item": "legpouch_large", "prob": 75 }, + { "item": "legrig", "prob": 50 }, + { "item": "dump_pouch", "prob": 50 }, + { "item": "grenadebandolier", "prob": 25 }, + { "item": "grenadebandolier", "prob": 25 } + ] }, { "id": "clothing_tactical_torso", @@ -408,7 +410,6 @@ { "item": "bigback", "prob": 10 } ] }, - { "id": "military_ballistic_armor", "type": "item_group", @@ -426,8 +427,6 @@ { "item": "shield_ballistic", "prob": 5 } ] }, - - { "id": "clothing_watch", "type": "item_group", @@ -1953,7 +1952,8 @@ "items": [ { "item": "radio", "prob": 5, "charges": [ 0, 300 ] }, { "item": "two_way_radio", "prob": 20, "charges": [ 0, 300 ] }, - { "item": "adv_UPS_off", "prob": 25, "charges": [ 0, 2000 ] }, + { "item": "adv_UPS_off", "prob": 20, "charges": [ 0, 2000 ] }, + { "group": "used_UPS", "prob": 5 }, { "item": "goggles_nv", "prob": 20, "charges": [ 0, 150 ] }, { "item": "goggles_ir", "prob": 20, "charges": [ 0, 150 ] }, [ "solarpack", 5 ], @@ -1968,9 +1968,15 @@ "entries": [ { "collection": [ { "item": "power_armor_basic" }, { "item": "power_armor_helmet_basic", "prob": 75 } ], "prob": 40 }, { "item": "power_armor_helmet_basic", "prob": 10 }, - { "collection": [ { "item": "power_armor_light" }, { "item": "power_armor_helmet_light", "prob": 75 } ], "prob": 20 }, + { + "collection": [ { "item": "power_armor_light" }, { "item": "power_armor_helmet_light", "prob": 75 } ], + "prob": 20 + }, { "item": "power_armor_helmet_light", "prob": 5 }, - { "collection": [ { "item": "power_armor_heavy" }, { "item": "power_armor_helmet_heavy", "prob": 75 } ], "prob": 20 }, + { + "collection": [ { "item": "power_armor_heavy" }, { "item": "power_armor_helmet_heavy", "prob": 75 } ], + "prob": 20 + }, { "item": "power_armor_helmet_heavy", "prob": 5 } ] }, @@ -2025,17 +2031,15 @@ "type": "item_group", "id": "mil_armor_torso", "items": [ - { "group": "clothing_tactical_torso", "prob": 75 }, + { "group": "clothing_tactical_torso", "prob": 20 }, + { "group": "clothing_soldier_shirt", "prob": 30 }, [ "kevlar", 10 ], [ "modularvest", 25 ], [ "modularvestceramic", 30 ], [ "winter_jacket_army", 30 ], [ "vest", 15 ], - [ "tacvest", 10 ], - [ "molle_pack", 8 ], [ "under_armor", 20 ], [ "power_armor_basic", 5 ], - [ "army_top", 30 ], [ "elbow_pads", 20 ] ] }, diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index ff1bdb39ed8d..699bb4656688 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -623,7 +623,8 @@ "id": "inactive_bots_milspec", "type": "item_group", "items": [ - [ "bot_haulerbot", 25 ], + [ "bot_haulerbot", 20 ], + [ "bot_molebot", 5 ], [ "bot_grenade_hack", 5 ], [ "bot_EMP_hack", 5 ], [ "bot_flashbang_hack", 5 ], @@ -679,7 +680,7 @@ [ "large_turbine_engine", 3 ], [ "weldrig", 1 ], [ "solar_cell", 1 ], - [ "bearing", 10 ], + [ "bearing", 1 ], [ "reinforced_glass_sheet", 10 ], [ "motor_large", 1 ], [ "battery_car", 6 ], diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 7b5dd9120072..0ebc047ae9c4 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -454,9 +454,9 @@ { "item": "water_clean", "x": [ 36, 46 ], "y": 48, "chance": 75, "repeat": 50 } ], "place_monster": [ - { "group": "GROUP_ROBOTS_MIL", "x": [ 33, 47 ], "y": [ 48, 70 ] }, - { "group": "GROUP_ROBOTS_MIL", "x": [ 48, 64 ], "y": [ 48, 70 ] } - ], + { "group": "GROUP_ROBOTS_MIL", "x": [ 33, 47 ], "y": [ 48, 70 ] }, + { "group": "GROUP_ROBOTS_MIL", "x": [ 48, 64 ], "y": [ 48, 70 ] } + ], "place_monsters": [ { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, @@ -614,7 +614,7 @@ { "group": "tools_common", "x": 68, "y": [ 8, 9 ], "chance": 20 }, { "group": "supplies_mechanics", "x": [ 72, 74 ], "y": 11, "chance": 75, "repeat": 10 }, { "group": "supplies_spares_vehicle", "x": [ 76, 78 ], "y": 11, "chance": 75, "repeat": 5 }, - { "group": "supplies_mechanics_milspec", "x": 72, "y": [ 11, 20 ], "chance": 75, "repeat": 20 }, + { "group": "supplies_mechanics_milspec", "x": 81, "y": [ 11, 20 ], "chance": 75, "repeat": 20 }, { "group": "gunmod_milspec", "x": 8, "y": [ 9, 12 ], "chance": 75, "repeat": 20 }, { "group": "mil_armor_electronics", "x": 11, "y": [ 9, 10 ], "chance": 75, "repeat": 10 }, { "item": "knife_combat", "x": [ 14, 15 ], "y": 9, "chance": 75, "repeat": 15 }, @@ -629,9 +629,9 @@ { "group": "mil_base_tent_medical_thrash", "x": [ 52, 64 ], "y": [ 54, 71 ], "chance": 25, "repeat": 15 } ], "place_monster": [ - { "group": "GROUP_ROBOTS_MIL", "x": [ 9, 23 ], "y": [ 10, 21 ], "repeat": [ 2, 5 ] }, - { "group": "GROUP_ROBOTS_MIL", "x": [ 1, 23 ], "y": [ 51, 60 ], "repeat": [ 3, 6 ] } - ], + { "group": "GROUP_ROBOTS_MIL", "x": [ 9, 23 ], "y": [ 10, 21 ], "repeat": [ 2, 5 ] }, + { "group": "GROUP_ROBOTS_MIL", "x": [ 1, 23 ], "y": [ 51, 60 ], "repeat": [ 3, 6 ] } + ], "place_monsters": [ { "monster": "GROUP_MIL_BASE", "x": [ 0, 23 ], "y": [ 26, 47 ], "repeat": [ 6, 8 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 26, 47 ], "repeat": [ 1, 2 ], "density": 0.1 }, diff --git a/data/json/monstergroups/robots.json b/data/json/monstergroups/robots.json index e8914769ed62..7da318e729c4 100644 --- a/data/json/monstergroups/robots.json +++ b/data/json/monstergroups/robots.json @@ -57,5 +57,5 @@ { "monster": "mon_dispatch", "freq": 100, "cost_multiplier": 0 }, { "monster": "mon_dispatch_military", "freq": 50, "cost_multiplier": 0 } ] - }, + } ] diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 79f81ca3fd56..f9d835d16a3f 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -662,9 +662,9 @@ "id": "overrun", "name": "Overrun", "points": 3, - "description": "Despite all the soldiers, guns and minefields, the base you were on got overrun by the dead. Everyone was ordered to fall back to the armory, but during all the chaos you got lost and you are now stuck in the warehouse all alone. You are not sure if anyone made it to the armory, or if you are the last man alive.", - "start_name": "Military Base Warehouse", - "allowed_locs": [ "sloc_military_base_warehouse" ], + "description": "Despite all the soldiers, guns and minefields, the base you were on got overrun by the dead. Everyone was ordered to fall back to the armory, but during all the chaos you got lost and didn't make it there in time. You are not sure if anyone made it to the armory, or if you are the last man alive.", + "start_name": "Military Base", + "allowed_locs": [ "sloc_military_base_barracks", "sloc_military_base_mess_hall", "sloc_military_base_communications_center" ], "professions": [ "unemployed", "soldier", @@ -680,7 +680,7 @@ "medic", "mili_pilot" ], - "flags": [ "CHALLENGE", "LONE_START" ] + "flags": [ "CHALLENGE", "LONE_START", "CITY_START" ] }, { "type": "scenario", diff --git a/data/json/start_locations.json b/data/json/start_locations.json index 42e77509ce9f..516647740c1a 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -444,9 +444,28 @@ { "type": "start_location", "id": "sloc_military_base_warehouse", + "//": "Obsoleted, may be dangerous to start in due to robot spawns", "name": "Military Base Warehouse", "terrain": [ "mil_base_2g" ] }, + { + "type": "start_location", + "id": "sloc_military_base_barracks", + "name": "Barracks", + "terrain": [ "mil_base_2d", "mil_base_2e", "mil_base_3d", "mil_base_3e", "mil_base_5c", "mil_base_6c", "mil_base_7c" ] + }, + { + "type": "start_location", + "id": "sloc_military_base_mess_hall", + "name": "Mess Hall", + "terrain": [ "mil_base_2f", "mil_base_3f" ] + }, + { + "type": "start_location", + "id": "sloc_military_base_communications_center", + "name": "Communications Center", + "terrain": [ "mil_base_3h" ] + }, { "type": "start_location", "id": "aircraft_carrier_berth", From 7850d84896d394bb0cb2028dff646a49e953cada Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 3 Jan 2024 22:20:00 -0600 Subject: [PATCH 11/12] Lil addition --- .../Weapons_Mods_Ammo/everydaycarry_guns.json | 11 +++++++++++ data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 2 ++ .../itemgroups/Weapons_Mods_Ammo/nested_guns.json | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json index a4ca14e8bb3b..5a8722aa7566 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json @@ -1512,6 +1512,17 @@ { "group": "on_hand_308" } ] }, + { + "id": "everyday_m2browning", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "m2browning", "ammo-item": "50_incendiary", "charges-min": 0, "charges-max": 100 }, + { "group": "on_hand_50" } + ] + }, { "id": "everyday_bh_m89", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index d954627e6e46..7d1f7a16649a 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -578,6 +578,7 @@ { "group": "nested_m249", "prob": 25 }, { "group": "nested_m27iar", "prob": 50 }, { "group": "nested_m60", "prob": 15 }, + { "group": "nested_m2browning", "prob": 20 }, { "group": "nested_rm11b_sniper_rifle", "prob": 15 }, { "group": "nested_rm298", "prob": 10 }, { "group": "nested_rm51_assault_rifle", "prob": 25 }, @@ -605,6 +606,7 @@ { "group": "everyday_m249", "prob": 25 }, { "group": "everyday_m27iar", "prob": 50 }, { "group": "everyday_m60", "prob": 15 }, + { "group": "everyday_m2browning", "prob": 20 }, { "group": "everyday_rm11b_sniper_rifle", "prob": 15 }, { "group": "everyday_rm298", "prob": 10 }, { "group": "everyday_rm51_assault_rifle", "prob": 25 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index aa19e8048615..88a77429a8b2 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1515,6 +1515,14 @@ "ammo": 100, "entries": [ { "item": "m60", "charges-min": 0, "charges-max": 100 }, { "group": "on_hand_308" } ] }, + { + "id": "nested_m2browning", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ { "item": "m2browning", "charges-min": 0, "charges-max": 100 }, { "group": "on_hand_50" } ] + }, { "id": "nested_rm11b_sniper_rifle", "type": "item_group", From fb3081dd7ac89aa6a4985326cfd61a882956e495 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 3 Jan 2024 23:26:23 -0600 Subject: [PATCH 12/12] I swear on your fucking yeezys --- data/mods/Aftershock/mobs/robot_groups.json | 24 +- data/mods/No_Hope/Mapgen/mil_base_z-1.json | 369 ----- data/mods/No_Hope/Mapgen/mil_base_z0.json | 1571 ------------------- data/mods/No_Hope/monster_groups.json | 27 - 4 files changed, 3 insertions(+), 1988 deletions(-) delete mode 100644 data/mods/No_Hope/Mapgen/mil_base_z-1.json delete mode 100644 data/mods/No_Hope/Mapgen/mil_base_z0.json diff --git a/data/mods/Aftershock/mobs/robot_groups.json b/data/mods/Aftershock/mobs/robot_groups.json index db98a3b6fcca..9cfe70bc4cb2 100644 --- a/data/mods/Aftershock/mobs/robot_groups.json +++ b/data/mods/Aftershock/mobs/robot_groups.json @@ -139,28 +139,10 @@ }, { "type": "monstergroup", - "name": "GROUP_MIL_BASE", + "name": "GROUP_ROBOTS_MIL", "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_MAYBE_MIL", - "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_MIL_STRONG", - "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, + { "monster": "mon_tripod", "freq": 10, "cost_multiplier": 0 }, + { "monster": "mon_chickenbot", "freq": 10, "cost_multiplier": 0 }, { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } ] } diff --git a/data/mods/No_Hope/Mapgen/mil_base_z-1.json b/data/mods/No_Hope/Mapgen/mil_base_z-1.json deleted file mode 100644 index 096558ae2d17..000000000000 --- a/data/mods/No_Hope/Mapgen/mil_base_z-1.json +++ /dev/null @@ -1,369 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_tunnels_a" ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@@@@@@@@@@@@@@@@@@@@", - "@@@@@///////////////////", - "@@@@@/<.................", - "@@@@@//.................", - "@@@@@@/..///////////////", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@" - ], - "palettes": [ "mil_base_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_tunnels_b" ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@", - "@@@@@@/../@@@@@@@@@@@@@@" - ], - "palettes": [ "mil_base_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_tunnels_c" ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "@@@@@@/../@@@@@@@@@@@@@@", - "///////../@@@@@@@@@@@@@@", - "........./@@@@@@@@@@@@@@", - "........./@@@@@@@@@@@@@@", - "///////../@@@@@@@@@@@@@@", - "///@@@/../@@@@@@@@@@@@@@", - "//$$.`OO/sss________________ssss", - "x ,, b ,,,,,,,,,,, , ,NNN,ss/...............................///....ht/sss_______yy_______ssss", - "x ,, b,,,,,,,, , ,,, ss/.................................d.i.###gsss_______yy_______sss-", - "x ,,,b,,,,,, ss/..............................i../...###/sss_______yy_______sss|", - "x ,, b,,,,, ss/...........................::..../$.i.ht/sss________________sss|", - "x ,,,b ,,, ss/....???????????..???????...::..../$.....gsss_______yy_______sss|", - "x,,, b,,,, ss/....???????????..???????........./$.Y.$$/sss_______yy_______sss|", - "x ,, b ,,, ss/...........................::....//g/D5//sss_______yy_______sss|", - "x ,,,b ,,, ss/...........................::..../ssssssssss________________sss|", - "x,,,,b,,,, ss/................................./ssssssssss_______yy_______sss|", - "x,,, b ,,,, ss/................................e/ssssssssss_______yy_______sssw", - "x,,, b,,,,,,, ss/....???????????..???????.........Dssssssssss_______yy_______sssw", - "x ,,,b ,,,,,, ss/....???????????..???????.........Dssssssssss________________sss|", - "x,,,,b,,,,,,,, ss/.................................Dssssssssss_______yy_______sss|", - "x ,, bbbb},,, ss/.................................Dssssssssss_______yy_______sss|", - "G ,,,b,,}},,,, ss/................................./ssssssssss_______yy_______sss|", - "G ,, b,,}}},, ss/................................./ssssssssss________________sssw", - "x ,,,b,}}}},,, ss/....???????????..???????......i../ssssssssss_______yy_______sss|", - "x ,, bb}}},,,, ss/....???????????..???????.........Dssssssssss_______yy_______sss-", - "x,,, b}},,,,,, ss/.................................Dssssssssss_______yy_______sss~", - "x ,,,b,,,,,,, ss/.................................Dssssssssss________________ssss", - "x,,,,b ,,,, ss/.................................Dssssssssss_______yy_______ssss", - "x ,, b,,,, ss/................................e/ssssssssss_______yy_______ssss", - "x ,,,b ,,, ss/....???????????..???????????...../ssssssssss_______yy_______ssss" - ], - "palettes": [ "mil_base_palette" ], - "items": { - "K": [ { "item": "army_bed", "chance": 30, "repeat": [ 1, 2 ] } ], - "l": [ { "item": "army_personal_locker", "chance": 75, "repeat": [ 5, 10 ] }, { "item": "mil_base_coats", "chance": 10 } ], - "o": [ { "item": "SUS_oven", "chance": 50 } ], - "n": [ { "item": "mil_base_casing_hmg", "chance": 50, "repeat": [ 50, 100 ] } ], - "t": [ { "item": "trash_cart", "chance": 75, "repeat": [ 1, 10 ] } ], - "{": [ { "item": "trash_cart", "chance": 75, "repeat": [ 10, 20 ] } ], - "#": [ { "item": "SUS_office_desk", "chance": 10, "repeat": [ 1, 2 ] } ], - "$": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 5 ] } ], - "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], - "[": [ { "item": "mil_base_mess_hall", "chance": 20 } ], - "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ] - }, - "monster": { "i": { "monster": "mon_zombie_soldier", "chance": 30 } }, - "place_loot": [ - { "group": "mil_base_hmg", "x": 25, "y": 46, "chance": 10, "magazine": 100 }, - { "group": "mil_base_mess_hall", "x": 38, "y": [ 26, 29 ], "chance": 90, "repeat": [ 50, 200 ] }, - { "group": "mil_base_mess_hall", "x": 32, "y": [ 29, 32 ], "chance": 90, "repeat": [ 250, 500 ] }, - { "group": "SUS_janitors_closet", "x": 34, "y": 26, "chance": 90, "repeat": [ 0, 1 ] }, - { "group": "SUS_kitchen_sink", "x": 31, "y": 34, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_kitchen_sink", "x": 31, "y": 36, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_spice_collection", "x": 41, "y": 34, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_utensils", "x": 42, "y": 34, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_junk_drawer", "x": 42, "y": 35, "chance": 90, "repeat": [ 0, 1 ] }, - { "group": "SUS_knife_drawer", "x": 42, "y": 36, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_dishes", "x": 42, "y": 37, "chance": 90, "repeat": [ 5, 20 ] }, - { "group": "SUS_cookware", "x": 42, "y": 38, "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "SUS_knife_drawer", "x": 35, "y": 39, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "SUS_appliances_cupboard", "x": 35, "y": 40, "chance": 90, "repeat": [ 1, 3 ] }, - { "group": "SUS_cookware", "x": 35, "y": 41, "chance": 90, "repeat": [ 1, 5 ] }, - { "group": "SUS_pantry", "x": [ 44, 47 ], "y": 37, "chance": 90, "repeat": [ 4, 12 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 37, "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "SUS_fridge", "x": [ 45, 47 ], "y": 39, "chance": 90, "repeat": [ 3, 9 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 39, "chance": 90, "repeat": [ 2, 6 ] }, - { "group": "SUS_fridge", "x": [ 44, 47 ], "y": 41, "chance": 90, "repeat": [ 4, 12 ] }, - { "group": "SUS_fridge", "x": [ 48, 49 ], "y": 41, "chance": 90, "repeat": [ 2, 6 ] }, - { "item": "american_flag", "x": 95, "y": 47 }, - { "item": "tshirt", "x": 59, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "long_undertop", "x": 58, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "long_underpants", "x": 57, "y": 71, "chance": 75, "repeat": [ 250, 300 ] }, - { "item": "socks", "x": 56, "y": 71, "chance": 75, "repeat": [ 100, 200 ] }, - { "item": "socks_wool", "x": [ 55, 54 ], "y": 71, "chance": 75, "repeat": [ 250, 500 ] }, - { "item": "sports_bra", "x": 53, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boy_shorts", "x": 52, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "briefs", "x": 51, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boxer_briefs", "x": 50, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boxer_shorts", "x": 49, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "jacket_army", "x": 46, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_jacket_army", "x": 45, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "pants_army", "x": 44, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_pants_army", "x": 43, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "coat_rain", "x": 42, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "hood_rain", "x": 41, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "folding_poncho", "x": 40, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "webbing_belt", "x": 39, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boots_combat", "x": 38, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "helmet_liner", "x": 37, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "balclava", "x": 36, "y": 71, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "gloves_liner", "x": 46, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "winter_gloves_army", "x": 45, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "emer_blanket", "x": 44, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "towel", "x": 43, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "blanket", "x": 42, "y": 66, "chance": 75, "repeat": [ 50, 200 ] }, - { "item": "sheet", "x": 41, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "ear_plugs", "x": 40, "y": 66, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "legpouch", "x": 39, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "legpouch_large", "x": 38, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "legrig", "x": 37, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "ammo_satchel", "x": 36, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "chestpouch", "x": 55, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "grenadebandolier", "x": 54, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "grenade_pouch", "x": 53, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "dump_pouch", "x": 52, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tacvest", "x": 51, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "backpack", "x": 50, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "camelbak", "x": 49, "y": 66, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "backpack_tactical_large", "x": 55, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "molle_pack", "x": 54, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "rucksack", "x": 53, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "bigback", "x": [ 51, 52 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "duffelbag", "x": [ 49, 50 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "glasses_bal", "x": 46, "y": 65, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "mask_bal", "x": 45, "y": 65, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "helmet_army", "x": [ 43, 44 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tac_helmet", "x": 42, "y": 65, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "gloves_tactical", "x": 41, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "kevlar", "x": 40, "y": 65, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "ballistic_vest_esapi", "x": [ 38, 39 ], "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "elbow_pads", "x": 37, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "knee_pads", "x": 36, "y": 65, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "light_disposable_cell", "x": 46, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "light_battery_cell", "x": 45, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "light_plus_battery_cell", "x": 44, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "hand_crank_charger", "x": 43, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "flashlight", "x": 42, "y": 60, "chance": 75, "repeat": [ 50, 200 ] }, - { "item": "heavy_flashlight", "x": 41, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "electric_lantern", "x": 40, "y": 60, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "flaregun", "x": 39, "y": 60, "chance": 75, "repeat": [ 25, 50 ] }, - { "item": "signal_flare", "x": 38, "y": 60, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "glowstick", "x": 37, "y": 60, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "handflare", "x": 36, "y": 60, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "manual_swimming", "x": 55, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_melee", "x": 54, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_stabbing", "x": 53, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_gun", "x": 52, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_traps_mil", "x": 51, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "manual_rifle", "x": 50, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mag_fieldrepair", "x": 49, "y": 60, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "boltcutters", "x": 55, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "halligan", "x": 54, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "crowbar", "x": 53, "y": 59, "chance": 75, "repeat": [ 10, 25 ] }, - { "item": "e_tool", "x": 52, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mask_gas", "x": 51, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "gasfilter_m", "x": 50, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "binoculars", "x": 49, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "multitool", "x": 46, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "heatpack", "x": 45, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "pockknife", "x": 44, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "ref_lighter", "x": 44, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "two_way_radio", "x": 43, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "rope_30", "x": 42, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "sleeping_bag_roll", "x": 41, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "rollmat", "x": 40, "y": 59, "chance": 75, "repeat": [ 150, 300 ] }, - { "item": "mess_tin", "x": 38, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "thermos", "x": 38, "y": 59, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "mil_mess_kit", "x": 37, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "water_purifier", "x": 36, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "item": "pur_tablets", "x": 36, "y": 59, "chance": 75, "repeat": [ 50, 100 ] }, - { "group": "MRE", "x": [ 49, 55 ], "y": [ 53, 54 ], "chance": 75, "repeat": 1500 }, - { "group": "MRE", "x": [ 49, 55 ], "y": 48, "chance": 75, "repeat": 750 }, - { "group": "groce_pasta", "x": [ 44, 46 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "dry_beans", "x": [ 41, 43 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "group": "big_canned_food", "x": [ 36, 40 ], "y": 54, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "oatmeal", "x": [ 45, 46 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "flour", "x": [ 43, 44 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "cornmeal", "x": [ 41, 42 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "coffee_raw", "x": 40, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "tea_raw", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "sugar", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "salt", "x": 37, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "cooking_oil", "x": 36, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "meat_salted", "x": [ 45, 46 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "salted_fish", "x": [ 43, 44 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "milk_powder", "x": [ 41, 42 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "powder_eggs", "x": [ 39, 40 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "milk_UHT", "x": 37, "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "water_clean", "x": 38, "y": 48, "chance": 75, "repeat": [ 50, 150 ] }, - { "item": "crackers", "x": 36, "y": 48, "chance": 75, "repeat": [ 50, 150 ] } - ], - "place_monsters": [ - { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 48, 71 ], "y": [ 0, 19 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 72, 95 ], "y": [ 0, 23 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 24, 45 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 72, 95 ], "y": [ 24, 45 ], "repeat": [ 6, 8 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 4, 23 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 74, 95 ], "y": [ 48, 71 ], "repeat": [ 4, 5 ], "density": 0.1 } - ], - "place_vehicles": [ - { "vehicle": "military_vehicles", "x": 79, "y": 42, "chance": 25, "status": 1, "rotation": 90 }, - { "vehicle": "military_vehicles", "x": 86, "y": 13, "chance": 25, "status": 1, "rotation": 270 }, - { "vehicle": "military_vehicles", "x": 79, "y": 54, "chance": 25, "status": 1, "rotation": 270 }, - { "vehicle": "forklift", "x": 62, "y": 62, "chance": 80, "rotation": 90 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ - [ "mil_base_5e", "mil_base_6e", "mil_base_7e", "mil_base_8e" ], - [ "mil_base_5f", "mil_base_6f", "mil_base_7f", "mil_base_8f" ], - [ "mil_base_5g", "mil_base_6g", "mil_base_7g", "mil_base_8g" ] - ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - " ,,,,b ,, x", - " ,,,b,,,,x", - " sssssssssssssssssssssssssssssssss ,, b ,, x", - " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX sssssssssssssssssssssssssssssssss ,, b,,,,x", - " X X ss--------z----------DDD--XssXXss ,, b,,, x", - " X X ss|..jjj|...|JJ.JJ.|e....|{ss{Xss ,,, b ,, x", - " X sssssssssssssssssssssssssssss X ss|6....|...|......|..77.|{sssXss ,, b ,, x", - " X sssssssssssssssssssssssssssss X ss|6....d...d......d..77.|{ss{Xss ,,, b ,, x", - " X ss/////////////////////////ss X sssssssssssss|6...u|...|u.pp.u|u.77.|{ss{Xsss ,,, b ,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ssssssssssss~|u...u|...|l.pp.u|u....|{ss{Xsss ,,, b,,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss--w---w---w------|...|-------------------ss ,,,b,,,,x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$.OOt##t..`O|uuu|...|S...+T|c.??..??..?|ss ,,,,b ,, x", - " X ss/C.C]u.u]u.u]u.u]u.u]u.u/ss X ss|$...h##h...O|u..z...|c...|-|c.??..??..?|ss ,, b,,,,x", - " X ss/](]]])]]])]]])]]])]]])]/ss X ssw.....##....O|..h|...|S...+T|c.??..??..?|ss ,, b ,, x", - " X ss/......................./ss X ss|$........Y.l|tVV|-d----d---|c.??..??..?|ss ,,, b ,, x", - " X ss/uuuuu.uuuuu.uuuuu....../ss X ss|$..l------=------.........>|..........?|ss ,,, b,,,,x", - " X ss///////////////////d///(/ss X ssw...Y|......................d..........?|ss ,,,b ,, x", - " X ss/th..$/uuuu$$/uuuu...u/>/ss X ss|$...=......................|c.??..??..?|ss ,,, b ,, x", - " X ss/###..D......d.......u///ss X ss|$$OO|......................|c.??..??..?|ss ,, b,,, x", - " X ssg###..5$$..[[/u..[[[.u/ssss X ss|-----..-----------------...|c.??..??..?|ss ,, b ,,,x", - " X ss/th..$///ggg//u..[[[../ssss X ss|O$`Y|..|.`$$$|u.QV.qV.v|...|c.??..??..?|ss ,, b ,, x", - " X ss/`....$/[.i.[/u....i../ss X ssw....=..=.....|u.......V|...|...........|ss ,,,,b ,, x", - " X ss/OO...Y/[...[/l.e...../ss X ss|###.|..|Y.###|uh....h..d...|...........|ss ,, b ,,,x", - " XXXGX///gz///w/d/w////DDDD//XGXXXXX ss|th..|..|l..ht|VVVt.VVVu|...|l........e.|ss ,, b ,, x", - " ssssssssssssssssssssssssss ss------w+--w--------d------d-----DDDDDD---ss ,,, b,,, x", - "sssssssssssssssssssssssssssssssssssssssssssssssssss|l.uuuu...uuuu...|~s_______________ ,,,b ,, x", - "sssssssssssssssssssssssssssssssssssssssssssssssssssz................|{s_______________ ,, b ,,,x", - "sssssssssssssssssssssssssssssssssssssssssssssssssss|................|{s_______________ ,,,b ,, x", - "___________________________________________________|e..............e|_________________,,, b,,,,x", - "___________________________________________________D................D_________________ ,,,b ,, x", - "___________________________________________________D................D_________________,,, b ,, x", - "___________________________________________________D...&&&&&&&&&&...D_________________,,, b ,,,x", - "___________________________________________________D...&&&&&&&&&&...D_________________ ,, b ,,,x", - "___________________________________________________D................D_________________,,, b ,,,x", - "___________________________________________________D................D_________________,,, b,,, x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy___________________|...uu..uu..uu...|_________________ ,,,b,,, x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy___________________|...uu..uu..uu...|_________________ ,,,b,,, x", - "___________________________________________________D................D_________________,,, b ,, x", - "___________________________________________________D................D_________________,,, b ,,,x", - "___________________________________________________D...&&&&&&&&&&...D_________________,,,,b ,,,x", - "___________________________________________________D...&&&&&&&&&&...D_________________,,,,b,,, x", - "___________________________________________________D................D_________________,,, b ,, x", - "___________________________________________________D................D_________________,,,,b ,, x", - "___________________________________________________|e..............e|_________________ ,, b ,,,x", - "ssssssssssssssssssssssssssssssss________________sss|..VVVuu.VVVuuu.l|ss_______________ ,, b ,,,x", - "ssssssssssssssssssssssssssssssss________________sss------------------ss_______________,,,,b ,,,x", - "ssssssssssssssssssssssssssssssss________________ssss~ssssssssssssssssss_______________ ,,,b,,, x", - "ssssss--w----w-----w-----w---ss ________________sssssssssssssssssssssss_______________,,,,b,,, x", - "ssssss|[..|$$.`U|$`.$$|O...$|ss ________________ _______________,,,,b ,, x", - "ssssss|...|th...|...ht|th..$|ss ______________________________________________________,,, b ,,,x", - "-ww-+--...|###..|..###|###.`|ss ______________________________________________________ ,, b,,, x", - "..........|.....|....O|....U|ss ______________________________________________________ ,, b ,,,x", - "###.......|Y..OO|Y...O|.Y---|ss ______________________________________________________ ,,,b ,,,x", - "th....|...--=-----=----=-///|ss ______________________________________________________,,, b ,, x", - "OOO$$$|..................D>/|ss ______________________________________________________,,, b,,, x", - "-------..................5//|ss ______________________________________________________ ,,,b ,,,x", - "OAAO.Y|...--=-----=----=-----ss ____1112111_______________________111111111111111_____,,,,b,,, x", - "......+...|Y.$$$|Y...`|.Y`$$|ss ____1B___^1__1112111______________1^M_M_M^MBM_M^1_____,,,,b ,, x", - "...[.A|...|.....|....$|.....|ss ____1MM_MM1__1____^1______________1_M_M_M_M_M_M_1_____ ,;,b,,, x", - "...[.A|...|..###|###.$|..#..|ss ____1^____1__1MM_MM1______________2_____________2_____ ,;,b,,, x", - "......|...|...ht|th..$|O.#h.|ss ____1MM_MM1__1B____1______________1_M_M_M_M_M_M_1_____,,; b ,, x", - "O.tOOO|...|$`..O|OO..U|O.#.t|ss ____1B___^1__1MM_MM1______________1_M^MBM_MBM_M^1_____,,, b,,, x", - "-+------+----w-----w-----w---ss ____1MM_MM1__1____^1______________111111111111111_____bbbbb ,,,x", - "t..u|T+..S|~sssssssssssssssssss ____1____B1__1MM_MM1__________________________________b.<.b ,, G", - "c..c|-|..t|ssssssssssssssssssss ____1MM_MM1__1^___B1_______________111111111111111____d...b,,,,G", - "c..S|T+..S|ss ____1^____1__1MM_MM1_______________1_M^M^MBMBM_M^1____b...b ,,,x", - "-+---------ss ____1MM_MM1__1B____1_______________1_M_M_M_M_M_M_1____bbbbb ,, x", - "sssss{{ssssss ____1^___B1__1MM_MM1_______________2_____________2____,;;;b ,, x", - "sssssssssssss ____1MM_MM1__1_____1_______________1_M_M_M_M_M_M_1____,;;;b,,,,x", - "sssssssssssss ____1B___^1__1MM_MM1_______________1^M_MBM^MBM^M_1____,,,;b ,, x", - "ssssssssssssssssssssssssssssss ____1112111__1____^1_______________111111111111111____,,,;b,,,,x", - "ssss{{ssssssssssssssssssssssss _____________1112111__________________________________ ,,;b,,, x" - ], - "palettes": [ "mil_base_palette" ], - "items": { - "M": [ { "item": "mil_base_bed_hospital", "chance": 50, "repeat": [ 1, 2 ] } ], - "B": [ { "item": "mil_base_table_hospital", "chance": 25, "repeat": [ 1, 3 ] } ], - "t": [ { "item": "trash_cart", "chance": 75, "repeat": [ 1, 10 ] } ], - "{": [ { "item": "trash_cart", "chance": 75, "repeat": [ 10, 20 ] } ], - "#": [ { "item": "SUS_office_desk", "chance": 10, "repeat": [ 1, 2 ] } ], - "$": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 5 ] } ], - "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], - "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ], - ";": [ { "item": "mil_base_bodybag", "chance": 90, "repeat": [ 0, 1 ] } ], - "V": [ { "item": "tools_common", "chance": 50, "repeat": [ 0, 1 ] } ], - "U": [ - { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "guns_obscure", "chance": 50, "repeat": [ 1, 2 ] }, - { "item": "ammo_obscure", "chance": 50, "repeat": [ 2, 4 ] }, - { "item": "mags_obscure", "chance": 50, "repeat": [ 2, 3 ] } - ], - "^": [ { "item": "mil_base_iv", "chance": 70 } ] - }, - "monster": { "i": { "monster": "mon_zombie_soldier", "chance": 30 } }, - "place_loot": [ - { "group": "SUS_coffee_cupboard", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, - { "group": "dinnerware", "x": 3, "y": 63, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "liquor_and_spirits", "x": 3, "y": 63, "chance": 50, "repeat": [ 1, 2 ] }, - { "group": "metal_workshop", "x": 55, "y": 20, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "supplies_metal", "x": 55, "y": 21, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_electronics", "x": 55, "y": 22, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "tools_common", "x": 63, "y": 23, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "tools_common", "x": 54, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "tools_electronics", "x": 55, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_electronics", "x": 56, "y": 11, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "supplies_metal", "x": 54, "y": 12, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "SUS_welding_gear", "x": 61, "y": 25, "chance": 50, "repeat": [ 1, 2 ] }, - { "group": "tools_mechanic", "x": 62, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "group": "ammo_medium_batteries", "x": 63, "y": 25, "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "recharge_station", "x": 63, "y": 25, "chance": 90 }, - { "group": "supplies_metal", "x": 64, "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_electronics", "x": [ 56, 57 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_common", "x": [ 54, 55 ], "y": 25, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "mechanics", "x": [ 55, 56 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - { "group": "mechanics", "x": [ 59, 60 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - { "group": "mechanics", "x": [ 63, 64 ], "y": [ 35, 36 ], "chance": 50, "repeat": [ 1, 10 ] }, - { "group": "tools_common", "x": 57, "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_mechanics", "x": 58, "y": 44, "chance": 50, "repeat": [ 5, 20 ] }, - { "group": "tools_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 5, 10 ] }, - { "group": "supplies_electronics", "x": [ 63, 65 ], "y": 44, "chance": 50, "repeat": [ 10, 40 ] }, - { "group": "tools_common", "x": 52, "y": 9, "chance": 20 }, - { "group": "tools_common", "x": 56, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 62, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 66, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "group": "tools_common", "x": 68, "y": [ 8, 9 ], "chance": 20, "repeat": [ 0, 1 ] }, - { "item": "hdframe", "x": 71, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 20 ] }, - { "item": "mil_plate", "x": 71, "y": 13, "chance": 75, "repeat": [ 5, 30 ] }, - { "item": "alloy_plate", "x": 71, "y": 14, "chance": 75, "repeat": [ 5, 30 ] }, - { "item": "steel_plate", "x": 72, "y": 11, "chance": 75, "repeat": [ 10, 40 ] }, - { "item": "hard_plate", "x": 72, "y": 12, "chance": 75, "repeat": [ 5, 30 ] }, - { "item": "reinforced_glass_sheet", "x": 72, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 20 ] }, - { "item": "wheel_mount_heavy", "x": 75, "y": [ 11, 12 ], "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "wheel_armor", "x": 75, "y": [ 13, 14 ], "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "v8_diesel", "x": 76, "y": [ 11, 12 ], "chance": 75, "repeat": [ 1, 2 ] }, - { "item": "v12_diesel", "x": 76, "y": 13, "chance": 75 }, - { "item": "small_turbine_engine", "x": 76, "y": 14, "chance": 75 }, - { "item": "alternator_truck", "x": 79, "y": 11, "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "battery_car", "x": 79, "y": 12, "chance": 75, "repeat": [ 5, 10 ] }, - { "item": "vehicle_controls", "x": 79, "y": 13, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "vehicle_dashboard", "x": 79, "y": 14, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "muffler", "x": 79, "y": 15, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "drivebelt", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "filter_air", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "filter_liquid", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "glowplug", "x": 79, "y": 16, "chance": 50, "repeat": [ 10, 40 ] }, - { "item": "motor_small", "x": 79, "y": 17, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "power_supply", "x": 79, "y": 17, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "cable", "x": 79, "y": 17, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "engine_block_large", "x": 79, "y": 18, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "engine_block_massive", "x": 79, "y": 18, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "well_pump", "x": 79, "y": 19, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "pump_complex", "x": 79, "y": 19, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "metal_tank_little", "x": 79, "y": 19, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "turret_mount", "x": 79, "y": 20, "chance": 50, "repeat": [ 1, 5 ] }, - { "item": "weldtank", "x": 71, "y": [ 17, 18 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "weldtank", "x": 72, "y": [ 17, 18 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "tinyweldtank", "x": 71, "y": [ 19, 20 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "tinyweldtank", "x": 72, "y": [ 19, 20 ], "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "motor_oil", "x": 75, "y": [ 17, 18 ], "chance": 50, "repeat": [ 20, 40 ] }, - { "item": "jerrycan", "x": 75, "y": 20, "chance": 80, "repeat": [ 1, 10 ] }, - { "group": "supplies_metal", "x": 76, "y": [ 17, 20 ], "chance": 50, "repeat": [ 20, 80 ] }, - { "item": "extinguisher", "x": 69, "y": 23, "chance": 75 }, - { "item": "extinguisher", "x": 52, "y": 25, "chance": 75 }, - { "item": "extinguisher", "x": 67, "y": 44, "chance": 75 }, - { "item": "extinguisher", "x": 21, "y": 22, "chance": 75 }, - { "item": "extinguisher", "x": 62, "y": 9, "chance": 75 }, - { "item": "atgm_launcher", "x": 8, "y": 9, "chance": 75, "repeat": 1 }, - { "item": "atgm_heat", "x": 8, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "LAW_Packed", "x": 8, "y": 11, "chance": 75, "repeat": 10 }, - { "item": "c4", "x": 8, "y": 12, "chance": 75, "repeat": 20 }, - { "item": "grenade", "x": 10, "y": 9, "chance": 75, "repeat": 50 }, - { "item": "grenade_inc", "x": 10, "y": 9, "chance": 75, "repeat": 25 }, - { "item": "smokebomb", "x": 10, "y": 10, "chance": 75, "repeat": 50 }, - { "item": "flashbang", "x": 10, "y": 10, "chance": 75, "repeat": 20 }, - { "item": "m320_mod", "x": 10, "y": 11, "chance": 75, "repeat": 10 }, - { "item": "m203", "x": 10, "y": 11, "chance": 75, "repeat": 5 }, - { "item": "mgl", "x": 10, "y": 11, "chance": 75, "repeat": 3 }, - { "item": "40x46mm_m433", "x": 10, "y": 12, "chance": 75, "repeat": 20 }, - { "item": "m16a4", "x": 12, "y": 9, "magazine": 100, "chance": 75, "repeat": 2 }, - { "item": "stanag30", "x": 12, "y": 12, "chance": 75, "repeat": 80 }, - { "item": "stanag50", "x": 12, "y": 12, "chance": 75, "repeat": 20 }, - { "item": "556", "x": 14, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, - { "item": "stanag30", "x": 16, "y": 12, "chance": 75, "repeat": 100 }, - { "item": "556", "x": 18, "y": [ 9, 12 ], "chance": 75, "repeat": 150 }, - { "item": "m249", "x": 20, "y": 9, "chance": 75, "repeat": 6 }, - { "item": "m240", "x": 20, "y": 9, "chance": 75, "repeat": 4 }, - { "item": "m1014", "x": 20, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "mossberg_590", "x": 20, "y": 10, "chance": 75, "repeat": 8 }, - { "item": "m2010", "x": 20, "y": 11, "magazine": 100, "chance": 75, "repeat": 2 }, - { "item": "m110a1", "x": 20, "y": 11, "magazine": 100, "chance": 75, "repeat": 8 }, - { "item": "m2010mag", "x": 20, "y": 12, "chance": 75, "repeat": 10 }, - { "item": "hk417mag_20rd", "x": 20, "y": 12, "chance": 75, "repeat": 16 }, - { "item": "hk417mag_10rd", "x": 20, "y": 12, "chance": 75, "repeat": 8 }, - { "item": "300_winmag", "x": 22, "y": 12, "chance": 75, "repeat": 10 }, - { "item": "belt223", "x": 22, "y": 9, "chance": 75, "repeat": 3 }, - { "item": "belt308", "x": 22, "y": 9, "chance": 75, "repeat": 2 }, - { "item": "shot_00", "x": 22, "y": 10, "chance": 75, "repeat": 10 }, - { "item": "shot_slug", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "shot_beanbag", "x": 22, "y": 10, "chance": 75, "repeat": 3 }, - { "item": "shot_he", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "shot_flechette", "x": 22, "y": 10, "chance": 75, "repeat": 5 }, - { "item": "762_51_incendiary", "x": 22, "y": 11, "chance": 75, "repeat": 5 }, - { "item": "762_51", "x": 22, "y": [ 11, 12 ], "chance": 75, "repeat": 30 }, - { "item": "m2browning", "x": 24, "y": [ 9, 10 ], "chance": 75, "repeat": 2 }, - { "item": "m107a1", "x": 24, "y": 11, "magazine": 100, "chance": 75, "repeat": 1 }, - { "item": "m107a1mag", "x": 24, "y": 12, "chance": 75, "repeat": 6 }, - { "item": "belt50", "x": 26, "y": 9, "chance": 75, "repeat": 5 }, - { "item": "50bmg", "x": 26, "y": [ 10, 12 ], "chance": 75, "repeat": 10 }, - { "item": "50_incendiary", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - { "item": "50match", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - { "item": "50ss", "x": 26, "y": 12, "chance": 75, "repeat": 3 }, - { "item": "m17", "x": 28, "y": [ 9, 10 ], "magazine": 100, "chance": 75, "repeat": 90 }, - { "item": "m9", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 45 }, - { "item": "glock_19", "x": 28, "y": 11, "magazine": 100, "chance": 75, "repeat": 10 }, - { "item": "p320mag_17rd_9x19mm", "x": 28, "y": 12, "chance": 75, "repeat": 90 }, - { "item": "m9mag", "x": 28, "y": 12, "chance": 75, "repeat": 45 }, - { "item": "glockmag", "x": 28, "y": 12, "chance": 75, "repeat": 10 }, - { "item": "9mm", "x": 30, "y": 9, "chance": 75, "repeat": 25 }, - { "item": "9mmfmj", "x": 30, "y": [ 10, 12 ], "chance": 75, "repeat": 50 }, - { "item": "shoulder_strap", "x": [ 8, 9 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "holo_sight", "x": 10, "y": 15, "chance": 75, "repeat": 50 }, - { "item": "acog_scope", "x": 11, "y": 15, "chance": 75, "repeat": 30 }, - { "item": "red_dot_sight", "x": 12, "y": 15, "chance": 75, "repeat": 20 }, - { "item": "goggles_ir", "x": [ 14, 16 ], "y": 15, "chance": 75, "repeat": 50 }, - { "item": "goggles_nv", "x": [ 17, 18 ], "y": 15, "chance": 75, "repeat": 40 }, - { "item": "sheath", "x": 24, "y": 15, "chance": 75, "repeat": 100 }, - { "item": "knife_combat", "x": [ 22, 23 ], "y": 15, "chance": 75, "repeat": 100 }, - { "item": "holster", "x": [ 20, 21 ], "y": 15, "chance": 75, "repeat": 100 }, - { "group": "mil_base_tent_medical_thrash", "x": [ 52, 64 ], "y": [ 54, 71 ], "chance": 25, "repeat": 15 } - ], - "place_monsters": [ - { "monster": "GROUP_MIL_BASE", "x": [ 0, 23 ], "y": [ 26, 47 ], "repeat": [ 6, 8 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 26, 47 ], "repeat": [ 1, 2 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 0, 23 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 24, 47 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 48, 71 ], "y": [ 48, 71 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 72, 95 ], "y": [ 48, 71 ], "repeat": [ 4, 5 ], "density": 0.1 } - ], - "place_vehicles": [ - { "vehicle": "military_vehicles", "x": 60, "y": 30, "chance": 50 }, - { "vehicle": "military_vehicles", "x": 59, "y": 39, "chance": 50 }, - { "vehicle": "military_vehicles", "x": 9, "y": 32, "chance": 25, "status": 1 }, - { "vehicle": "military_vehicles", "x": 20, "y": 39, "chance": 25, "status": 1 }, - { "vehicle": "military_vehicles", "x": 83, "y": 39, "chance": 25, "rotation": 90 }, - { "vehicle": "welding_cart", "x": 67, "y": 36, "chance": 80 }, - { "vehicle": "engine_crane", "x": 55, "y": 26, "chance": 80 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ - [ "mil_base_1h", "mil_base_2h", "mil_base_3h", "mil_base_4h" ], - [ "mil_base_1i", "mil_base_2i", "mil_base_3i", "mil_base_4i" ], - [ "mil_base_1j", "mil_base_2j", "mil_base_3j", "mil_base_4j" ], - [ "mil_base_1k", "mil_base_2k", "mil_base_3k", "mil_base_4k" ] - ], - "weight": 250, - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "x,,, b,,,, ss///////////////////////////////////ssssssssss________________ssss", - "x ,,,b ,,, sssssssssssssssssssssssssssssssssssssssssssssss_______yy_______ssss", - "x ,,,b ,,, sssssssssssssssssssssssssssssssssssssssssssssss_______yy_______ssss", - "x,,, b,,, sss_______yy_______ssss", - "x,,, b,,, sss________________ssss", - "x ,, b ,,, sss_______yy_______ssss", - "x,,,,b,,,, sss_______yy_______ssss", - "x ,, b ,, ssssssssssssssssssssssss_______yy_______ssss", - "x,,,,b,,, ssssssssssssssssssssssss________________ssss", - "x,,, b ,, ss---w-----w-----w---sss_______yy_______ssss", - "x ,, b ,, ss|th..O|O..ht|th..$|sss_______yy_______ssss", - "x ,, b ,,, ss|###.O|O.###|###.$|sss_______yy_______ssss", - "x ,,,b ,,, ss|....$|....$|O...$|sss________________ssss", - "x ,,,b ,, ss|Y...`|l...`|Y...`|sss_______yy_______ssss", - "x,,, b ,,, ss|--=-----=-----=--|sss_______yy_______ssss", - "x ,, b,,, ss|<...............hwsss_______yy_______ssss", - "x,,, b,,, ssssssssw.................+sss________________ssss", - "x,,,,b,,,, sssssss~|.................wsss_______yy_______ssss", - "x,,,,b,,,, ss------|...------++------|sss_______yy_______ssss", - "x ,, b ,,, ss|k..`O|...|$............|sss_______yy_______ssss", - "x ,, b ,, ss|k....=...|$..h...h...h.|sss________________ssss", - "x,,, b ,, ss|k..ht|...|$.'##.'##.'##wsss_______yy_______ssss", - "x ,,,b ,, ss|k.##'|...|O............|sss_______yy_______ssss", - "x,,, b,,,, ss|-----|...|O..h...h...h.|sss_______yy_______ssss", - "x,,, b ,,, ss|k..`O|...|..'##.'##.'##wsss________________ssss", - "x ,,,b,,,, ss|k....=...+.............|sss_______yy_______sss ", - "x ,,,b ,,, ss|k.##'|...+...h...h...h.|sss_______yy_______sss ", - "x ,, b ,,, ss|k..ht|...|..'##.'##.'##wsss_______yy_______ssss", - "x,,, b,,,, ss|-----|...|t............|sss________________ssss", - "x ,,,b ,,, ss|T|T|T|...|O..h...h...h.|sss_______yy_______ssss", - "x,,,,b,,, ss|+|+|+|...|O.'##.'##.'##wsss_______yy_______ssss", - "x,,, b ,,, ss|.....+...|$............|sss_______yy_______sss ", - "x ,,,b,,, ss|ScScS|..h|`..OO$.$$O.$$|sss________________sss ", - "x ,, b ,,, ss-------w=w---w---w---w---sss_______yy_______sss ", - "x ,,,b,,,, ssXssssssssssssssssssX{{ss~sss_______yy_______sss ", - "x,,, b,,,, ssGssssssssssssssssssGssssssss_______yy_______sss ", - "x,,, b ,,, ssXssssssssssss8888ssXssssssss________________sss ", - "x ,, b,,,, XsssZssssZsssdJJ8ssX sss_______yy_______sss ", - "x,,,,b ,,, Xssssssssssss8888ssX sss_______yy_______sss ", - "x,,,,b,,,, XssssssssssssssssssX sss_______yy_______sss ", - "x ,, b ,,, XssssssssssssssssssX sss________________sss ", - "x ,, b,,,, Xssss|uuuuu|{s ssss_______ssss sXsssXs*sXs*sXs ,,,b ,, x", - " ss-----|...|uS||.|.....|{s ssss___________ssss sXsssXs*sXs*sXs ,, b ,, x", - "ssssssssssssw.hhh....|----d---D--|ss sss_______________sss sXsssGsssXsssGs ,,,b ,,,x", - "ssssssssssss+........|.....|.0...wss ss_________________ss sXXXXXXXXXXXXXs ,, b ,,,x", - "ssssssssssss+........+.....+.....+ss ss___________________ss sssssssssssssss ,, b,,,,x", - "ssssssssssss|-###-...|.....|....h|ss sss___________________sss ,,, b,,, x", - " ss|$th.|...|-----|...---ss ss_____________________ss ffff ,,,b ,, x", - " ssssw........|cccll|...|ssss ss_______y_____y_______ss ff;;ffffff ,,, b ,, x", - " ssss|$$$$|...|.....|...wssss ss________y_____y________ss ;;;;;;; ff ,,,b,,,,x", - " ss-------|...+.WM..+...|ss ss________y_____y________ss ;;;;;;f ,,,b ,,,x", - " ss|llccuu|...+..M..+...wss ss________y_____y________ss ff;; ;;;;ff ,,,,b ,,,x", - " ssw......|...|.....|...|ss ss________yyyyyyy________ss f;;;; ;;; f ,,,b ,, x", - " ss|l.WM..|...|uuucc|...wss ss________y_____y________ss ff;;;;; ;;f ,,, b,,, x", - " ss|l..M..+...-------...|ss ss________y_____y________ss ff ;;;; ;;ff ,,,b ,,,x", - " ssw......+...+.........+ssssssss________y_____y________ss ffff;;;;ff ,,,b,,, x", - " ss|uuuccc|...+.........+sssssssss_______y_____y_______ss ffffff ,,, b ,,,x", - " ss-------|..h|........h|ss ss_____________________ss ssssssssssssss ,,,b ,,,x", - " ssss|T+..+..[|-w--w--w--ss sss___________________sss ssssssssssssss ,,, b ,, x", - " ssss|--.S|-+w|sssssssss~ss ss___________________ss ,,,, ssXXXXXXXXXXss ,,,,b,,,,x", - " ss|T+.c|ssssssssssssssss ss_________________ss ,N,N,, ssXssssssssXss ,,,b ,, x", - " ss------ssssss sss_______________sss,NN,NN, ssXsHHssHHsXss ,,,,b,,, x", - " ssssssssssss ssss___________ssss ,Nn,nN, ssXsHHssHHsXss ,,,b ,, x", - " ssssssssssss ssss_______ssss ,NNnNN, ssXssssssssXss ,,, b ,, x", - " ssssssssssss sssssssssssss ,NNN, ssXssssssssXss ,,,b ,, x", - "sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssXXGXssHHsXss ,,,b,,, x", - "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssXssHHsXss ,,, b,,, x", - "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssXsssssXss ,,,b ,,,x", - "____________________________________________________________________ssssssssXXXXXXXss ,,, b ,, x", - "____________________________________________________________________sssssssssssssssss ,,,b,,,,x", - "____________________________________________________________________sssssssssssssssss ,,,,b ,,,x", - "____________________________________________________________________ ,,, b,,, x", - "____________________________________________________________________ ,,,b,,, x", - "____________________________________________________________________ ,, b ,,,x", - "____________________________________________________________________ ,,, b ,, x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy________________ ,,,,b,,,,x", - "_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy_yyy________________ ,,, b,,,,x", - "____________________________________________________________________ ,,,, b ,, x", - "____________________________________________________________________ ,,,b ,, x", - "____________________________________________________________________ ,,,b ,,,x", - "____________________________________________________________________ ,,, b,,, x", - "____________________________________________________________________ ,,,b,,,,x", - "____________________________________________________________________ ,,, b ,, x", - "____________________________________________________________________ ,,,b,,,,x", - ", ,,,, b,,, x", - ",, ,,,b,,,,x", - ", X 8dd8 8dd8 8dd8 X ,,,b,,, x", - ", X 8998 8dd8 8dd8 8dd8 8998 8998 8dd8 X ,,,,b,,,,x", - ", X 8998 8998 8dd8 8dd8 8998 8998 8998 8998 8998 X ,,, b ,,,x", - ",, X 8998 8998 8998 8998 8998 8998 8998 8998 8998 X ,,, b ,,,x", - ", X 8998 8998 8998 8998 8998 8998 8998 8998 8998 X ,,,b ,, x", - ", X 8998 8998 8998 8998 8998 8998 8998 8998 8998 X ,,,,b,,, x", - ", X 8998 8998 8998 8998 8998 8998 8998 8998 8998 X ,, b,,,,x", - ",, X 8998 8998 8998 8998 8998 8998 8998 8998 8998 X ,,,,b,,, x", - ",, X 8888 8998 8998 8998 8998 8998 8888 8888 8998 X ,,, b ,,,x", - ", X 8888 8998 8998 8888 8888 8888 X ,,,b ,,,x", - ", X 8888 8888 X ,,,,b,,, x", - " , X X ,,, b,,, x", - ",, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ,,,b,,,,x", - " , ,,,,b ,,,x", - ", ,,,,,,b,,,,x", - ",,, ,,,,,, b ,, x", - " ,,, , , ,,, ,,, ,,,, , , ,, , ,, , , , ,, ,,, , , ,, , , , , , , ,,, ,, ,, ,,,,bbbbb ,,,x", - ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,d...b ,,,x", - ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,b...b,,, x", - " , , , , , , , , , , ,, ,,, ,,, ,, , , , , ,,, ,, , , ,, , , , ,, , , ,,, b<..b,,, x", - "zbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,,,,x", - ",,, ,, ,, , , , ,, , ,,, , ,, , ,,, , , , , , , , ,,, ,,,,,,x", - ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,x", - ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,x", - ",,, , , , , ,, ,,, ,,, , , ,, ,, , , ,,, , , , ,, ,, , , ,,, , ,,,x", - "GxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxGxx" - ], - "palettes": [ "mil_base_palette" ], - "items": { - "M": [ { "item": "mil_base_bed_hospital", "chance": 50, "repeat": [ 1, 2 ] } ], - "r": [ { "item": "mil_base_bed_hospital", "chance": 50, "repeat": [ 1, 2 ] } ], - "B": [ { "item": "mil_base_table_hospital", "chance": 25, "repeat": [ 1, 3 ] } ], - "n": [ { "item": "mil_base_casing_hmg", "chance": 50, "repeat": [ 50, 100 ] } ], - ";": [ { "item": "mil_base_bodybag", "chance": 90, "repeat": [ 0, 1 ] } ], - "t": [ { "item": "trash_cart", "chance": 75, "repeat": [ 1, 10 ] } ], - "{": [ { "item": "trash_cart", "chance": 75, "repeat": [ 10, 20 ] } ], - "#": [ { "item": "SUS_office_desk", "chance": 10, "repeat": [ 1, 2 ] } ], - "$": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 5 ] } ], - "O": [ { "item": "mil_base_books", "chance": 30, "repeat": [ 1, 5 ] } ], - "Y": [ { "item": "mil_base_coats", "chance": 25, "repeat": [ 1, 2 ] } ], - "E": [ - { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "bionics_mil", "chance": 50, "repeat": [ 1, 2 ] }, - { "item": "bionic_power_storage_mil", "chance": 50 } - ], - "W": [ { "item": "mil_base_iv", "chance": 70 } ], - "^": [ { "item": "mil_base_iv", "chance": 70 } ] - }, - "gaspumps": { "p": { "fuel": "diesel", "amount": [ 800, 4000 ] } }, - "place_loot": [ - { "group": "mil_base_hmg", "x": 65, "y": 46, "chance": 10, "magazine": 100 }, - { "group": "SUS_janitors_closet", "x": 22, "y": 26, "chance": 90, "repeat": [ 1, 2 ] }, - { "item": "morphine", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "tramadol", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "aspirin", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 80 ] }, - { "item": "oxycodone", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "codeine", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "antifungal", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "antiparasitic", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "antibiotics", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "weak_antibiotic", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "strong_antibiotic", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "diazepam", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "vaccine_shot", "x": 29, "y": 25, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "adrenaline_injector", "x": 29, "y": 25, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "vitamins", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "calcium_tablet", "x": 28, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "inhaler", "x": 28, "y": 25, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "bandages", "x": 29, "y": 25, "chance": 30, "repeat": [ 20, 60 ] }, - { "item": "medical_gauze", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "medical_tape", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "mil_base_iv", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 80 ] }, - { "item": "eyedrops", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "anesthetic_kit", "x": 29, "y": 25, "chance": 50, "repeat": [ 1, 10 ], "ammo": 100 }, - { "item": "disinfectant", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "quikclot", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "bfipowder", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "cotton_ball", "x": 29, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "scalpel", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "scissors", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "stethoscope", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "autoclave", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "pouch_autoclave", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 3 ] }, - { "item": "1st_aid", "x": 30, "y": 25, "chance": 50, "repeat": [ 1, 20 ] }, - { "item": "gloves_medical", "x": 31, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "mask_dust", "x": 31, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "bag_body_bag", "x": 31, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "syringe", "x": 31, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "thermometer", "x": 31, "y": 25, "chance": 50, "repeat": [ 10, 30 ] }, - { "item": "vacutainer", "x": 31, "y": 25, "chance": 50, "repeat": [ 10, 30 ] }, - { "item": "coat_lab", "x": 31, "y": 25, "chance": 50, "repeat": [ 10, 30 ] }, - { "item": "towel", "x": 31, "y": 25, "chance": 50, "repeat": [ 10, 30 ] }, - { "item": "soap", "x": 31, "y": 25, "chance": 50, "repeat": [ 10, 30 ] }, - { "item": "bleach", "x": 31, "y": 25, "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "rad_monitor", "x": 32, "y": 25, "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "geiger_off", "x": 32, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "rad_monitor", "x": 32, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "cleansuit", "x": 32, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "aep_suit", "x": 32, "y": 25, "chance": 50, "repeat": [ 5, 10 ] }, - { "item": "oxygen_tank", "x": 32, "y": 25, "chance": 50, "repeat": [ 10, 20 ] }, - { "item": "wrapped_rad_badge", "x": 32, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "prussian_blue", "x": 32, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "iodine", "x": 32, "y": 25, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": [ 22, 23 ], "y": 37, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": 24, "y": 37, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": [ 25, 26 ], "y": 32, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": [ 11, 13 ], "y": 40, "chance": 50, "repeat": [ 30, 60 ] }, - { "group": "surgery", "x": 11, "y": [ 37, 38 ], "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": [ 11, 12 ], "y": 35, "chance": 50, "repeat": [ 20, 60 ] }, - { "group": "surgery", "x": [ 15, 16 ], "y": 35, "chance": 50, "repeat": [ 20, 60 ] }, - { "item": "jerrycan", "x": [ 64, 71 ], "y": [ 21, 23 ], "chance": 25, "repeat": 3 }, - { "item": "55gal_drum", "x": [ 64, 71 ], "y": [ 21, 23 ], "chance": 25, "repeat": 2 }, - { "group": "mil_base_tent_medical_thrash", "x": [ 37, 47 ], "y": [ 3, 5 ], "chance": 50, "repeat": 20 }, - { "group": "mil_base_tent_medical_thrash", "x": [ 72, 80 ], "y": [ 0, 3 ], "chance": 50, "repeat": 20 }, - { "group": "mil_base_tent_medical_thrash", "x": [ 51, 67 ], "y": [ 0, 23 ], "chance": 25, "repeat": 15 }, - { "item": "55gal_drum", "x": 72, "y": [ 41, 47 ], "chance": 50, "repeat": [ 5, 15 ] } - ], - "place_monsters": [ - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 24, 47 ], "y": [ 0, 23 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 48, 71 ], "y": [ 0, 23 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 72, 91 ], "y": [ 0, 23 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 0, 23 ], "y": [ 24, 47 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 24, 47 ], "y": [ 24, 47 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 48, 71 ], "y": [ 24, 47 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE_HOSPITAL", "x": [ 72, 91 ], "y": [ 24, 47 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 0, 23 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 48, 71 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 72, 91 ], "y": [ 48, 71 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 0, 23 ], "y": [ 72, 91 ], "repeat": [ 4, 5 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 24, 47 ], "y": [ 72, 91 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 48, 71 ], "y": [ 72, 91 ], "repeat": [ 0, 1 ], "density": 0.1 }, - { "monster": "GROUP_MIL_BASE", "x": [ 72, 91 ], "y": [ 72, 91 ], "repeat": [ 0, 1 ], "density": 0.1 } - ], - "place_vehicles": [ - { "vehicle": "ambulance", "x": 37, "y": 18, "chance": 80, "rotation": 180 }, - { "vehicle": "helicopter_blackhawk_3a", "x": 50, "y": 32, "chance": 5, "rotation": 270 }, - { "vehicle": "military_vehicles", "x": 5, "y": 61, "chance": 25, "rotation": 180, "status": 1 }, - { "vehicle": "military_vehicles", "x": 7, "y": 54, "chance": 25, "rotation": 180, "status": 1 }, - { "vehicle": "portable_generator", "x": 76, "y": 12, "chance": 50, "status": 1 } - ], - "computers": { - "0": { - "name": "Medical Storage Access", - "security": 4, - "options": [ { "name": "Open Storage Door", "action": "unlock" } ], - "failures": [ { "action": "shutdown" }, { "action": "alarm" } ] - } - } - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_road_entrance" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ ", - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ ", - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ ", - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ ", - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ ", - " ________________ ", - " _______yy_______ ", - " _______yy_______ ", - " _______yy_______ " - ], - "palettes": [ "mil_base_palette" ], - "place_monsters": [ { "monster": "GROUP_MIL_BASE_CIVILIAN", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 4, 5 ], "density": 0.1 } ], - "place_vehicles": [ - { "vehicle": "parkinglotbasic", "x": 8, "y": 21, "chance": 30, "rotation": 90 }, - { "vehicle": "parkinglotbasic", "x": 9, "y": 11, "chance": 30, "rotation": 90 }, - { "vehicle": "parkinglotbasic", "x": 16, "y": 16, "chance": 30, "rotation": 90 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_n" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "xxxxxxxxxxxxxxxxxxxxxxxx", - "PmmmmmmmmmmmPmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 0, 23 ], "y": [ 2, 22 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ { "signage": "DANGER MINEFIELD", "x": 0, "y": 1 }, { "signage": "DANGER MINEFIELD", "x": 12, "y": 1 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_ne" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "xxxxxxxxxxxxxxxxxxxxxxxx", - "PmmmmmmmmmmmPmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 0, 21 ], "y": [ 2, 23 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ - { "signage": "DANGER MINEFIELD", "x": 0, "y": 1 }, - { "signage": "DANGER MINEFIELD", "x": 12, "y": 1 }, - { "signage": "DANGER MINEFIELD", "x": 22, "y": 1 }, - { "signage": "DANGER MINEFIELD", "x": 22, "y": 12 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_e" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "mmmmmmmmmmmmmmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 1, 21 ], "y": [ 0, 23 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ { "signage": "DANGER MINEFIELD", "x": 22, "y": 0 }, { "signage": "DANGER MINEFIELD", "x": 22, "y": 12 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_se" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "mmmmmmmmmmmmmmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmPx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmmmmmmmmmmmmmx", - "mmmmmmmmmmmPmmmmmmmmmmPx", - "xxxxxxxxxxxxxxxxxxxxxxxx" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 0, 21 ], "y": [ 0, 21 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ - { "signage": "DANGER MINEFIELD", "x": 22, "y": 0 }, - { "signage": "DANGER MINEFIELD", "x": 22, "y": 12 }, - { "signage": "DANGER MINEFIELD", "x": 22, "y": 22 }, - { "signage": "DANGER MINEFIELD", "x": 11, "y": 22 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_s" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmmmmmmmmmmmmmm", - "mmmmmmmmmmmPmmmmmmmmmmmP", - "xxxxxxxxxxxxxxxxxxxxxxxx" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 0, 23 ], "y": [ 1, 21 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ { "signage": "DANGER MINEFIELD", "x": 11, "y": 22 }, { "signage": "DANGER MINEFIELD", "x": 23, "y": 22 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_sw" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmPmmmmmmmmmmmP", - "xxxxxxxxxxxxxxxxxxxxxxxx" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 2, 23 ], "y": [ 0, 21 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ - { "signage": "DANGER MINEFIELD", "x": 1, "y": 11 }, - { "signage": "DANGER MINEFIELD", "x": 1, "y": 22 }, - { "signage": "DANGER MINEFIELD", "x": 11, "y": 22 }, - { "signage": "DANGER MINEFIELD", "x": 23, "y": 22 } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_w" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmmmmmmmmmmmmmm" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 2, 22 ], "y": [ 0, 23 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ { "signage": "DANGER MINEFIELD", "x": 1, "y": 11 }, { "signage": "DANGER MINEFIELD", "x": 1, "y": 23 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "mil_base_minefield_nw" ], - "weight": 250, - "object": { - "fill_ter": "t_dirt", - "rows": [ - "xxxxxxxxxxxxxxxxxxxxxxxx", - "xPmmmmmmmmmmmPmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xmmmmmmmmmmmmmmmmmmmmmmm", - "xPmmmmmmmmmmmmmmmmmmmmmm" - ], - "palettes": [ "mil_base_palette" ], - "set": [ { "point": "trap", "id": "tr_landmine_buried", "x": [ 2, 23 ], "y": [ 2, 23 ], "repeat": [ 4, 14 ] } ], - "place_signs": [ - { "signage": "DANGER MINEFIELD", "x": 1, "y": 23 }, - { "signage": "DANGER MINEFIELD", "x": 1, "y": 11 }, - { "signage": "DANGER MINEFIELD", "x": 1, "y": 1 }, - { "signage": "DANGER MINEFIELD", "x": 13, "y": 1 } - ] - } - } -] diff --git a/data/mods/No_Hope/monster_groups.json b/data/mods/No_Hope/monster_groups.json index fd2c68deb98d..e78e443e68cd 100644 --- a/data/mods/No_Hope/monster_groups.json +++ b/data/mods/No_Hope/monster_groups.json @@ -12,32 +12,5 @@ { "monster": "mon_chickenbot", "freq": 60, "cost_multiplier": 0 }, { "monster": "mon_tankbot", "freq": 20, "cost_multiplier": 0 } ] - }, - { - "type": "monstergroup", - "name": "GROUP_MIL_BASE", - "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_MAYBE_MIL", - "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } - ] - }, - { - "type": "monstergroup", - "name": "GROUP_MIL_STRONG", - "monsters": [ - { "monster": "mon_tripod", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_chickenbot", "freq": 5, "cost_multiplier": 0 }, - { "monster": "mon_tankbot", "freq": 5, "cost_multiplier": 0 } - ] } ]