Skip to content

Commit

Permalink
Merge pull request CleverRaven#29912 from curstwist/add-boxing-gym-roof
Browse files Browse the repository at this point in the history 
Add boxing gym roof
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Apr 26, 2019
2 parents 3df0181 + 6203d1c commit de41139
Show file tree
Hide file tree
Showing 6 changed files with 211 additions and 73 deletions.
16 changes: 16 additions & 0 deletions data/json/itemgroups/books.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@
[ "recipe_bullets", 80 ]
]
},
{
"id": "boxing_books",
"type": "item_group",
"items": [
[ "mag_unarmed", 40 ],
[ "manual_boxing", 50 ],
[ "mag_melee", 25 ],
[ "mag_bashing", 10 ],
[ "manual_melee", 15 ],
[ "recipe_melee", 10 ],
[ "manual_taekwondo", 10 ],
[ "manual_karate", 10 ],
[ "manual_muay_thai", 2 ],
[ "manual_krav_maga", 10 ]
]
},
{
"type": "item_group",
"id": "book_martial",
Expand Down
22 changes: 22 additions & 0 deletions data/json/itemgroups/clothing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,5 +363,27 @@
"type": "item_group",
"//": "Full face protection worn with hazmat suits",
"items": [ { "collection": [ { "item": "glasses_safety" }, { "item": "mask_filter" } ], "prob": 40 }, [ "mask_gas", 60 ] ]
},
{
"id": "boxing_clothes",
"type": "item_group",
"items": [
[ "tank_top", 40 ],
[ "shorts", 40 ],
[ "boxing_gloves", 50 ],
[ "headgear", 50 ],
[ "mouthpiece", 50 ],
[ "jersey", 40 ],
[ "coat_rain", 15 ],
[ "hood_rain", 15 ],
[ "gloves_wraps", 45 ],
[ "jeans", 30 ],
[ "sports_bra", 25 ],
[ "jacket_leather", 20 ],
[ "aspirin", 30 ],
[ "water_clean", 30 ],
[ "sports_drink", 30 ],
[ "1st_aid", 20 ]
]
}
]
15 changes: 15 additions & 0 deletions data/json/itemgroups/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,21 @@
"type": "item_group",
"items": [ [ "bowling_ball", 100 ] ]
},
{
"id": "boxing_misc",
"type": "item_group",
"items": [
[ "aspirin", 50 ],
[ "1st_aid", 40 ],
[ "bandages", 30 ],
[ "duct_tape", 20 ],
[ "sewing_kit", 10 ],
[ "mouthpiece", 10 ],
[ "cigar", 20 ],
[ "cig", 15 ],
[ "matches", 10 ]
]
},
{
"type": "item_group",
"id": "bikeshop_tools",
Expand Down
207 changes: 134 additions & 73 deletions data/json/mapgen/boxing.json
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,11 @@
[
{
"id": "boxing_clothes",
"type": "item_group",
"items": [
[ "tank_top", 40 ],
[ "shorts", 40 ],
[ "boxing_gloves", 50 ],
[ "headgear", 50 ],
[ "mouthpiece", 50 ],
[ "jersey", 40 ],
[ "coat_rain", 15 ],
[ "hood_rain", 15 ],
[ "gloves_wraps", 45 ],
[ "jeans", 30 ],
[ "sports_bra", 25 ],
[ "jacket_leather", 20 ],
[ "aspirin", 30 ],
[ "water_clean", 30 ],
[ "sports_drink", 30 ],
[ "1st_aid", 20 ]
]
},
{
"id": "boxing_books",
"type": "item_group",
"items": [
[ "mag_unarmed", 40 ],
[ "manual_boxing", 50 ],
[ "mag_melee", 25 ],
[ "mag_bashing", 10 ],
[ "manual_melee", 15 ],
[ "recipe_melee", 10 ],
[ "manual_taekwondo", 10 ],
[ "manual_karate", 10 ],
[ "manual_muay_thai", 2 ],
[ "manual_krav_maga", 10 ]
]
},
{
"id": "boxing_misc",
"type": "item_group",
"items": [
[ "aspirin", 50 ],
[ "1st_aid", 40 ],
[ "bandages", 30 ],
[ "duct_tape", 20 ],
[ "sewing_kit", 10 ],
[ "mouthpiece", 10 ],
[ "cigar", 20 ],
[ "cig", 15 ],
[ "matches", 10 ]
]
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "gym" ],
"weight": 1000,
"object": {
"fill_ter": "t_grass",
"fill_ter": "t_floor",
"rows": [
" --ss---------------- ",
" --ss--,-----,-----,- ",
Expand All @@ -67,7 +14,7 @@
" --ss--,-----,-----,- ",
" --ss--,-----,-----,- ",
" qq++qqqqgggggqqqggqq ",
" xf................^x ",
" xf................^x4 ",
" x........?$$$$$$?.0x ",
" xE.E.....$555555$..x ",
" xE.E.....$555555$.0x ",
Expand All @@ -81,8 +28,8 @@
" xLLLLLLLLLx..xfZZZ^x ",
" xBBBB.BBBBx..x.....p ",
" x.........'..'.C.DCp ",
" xqqq...qqqx..x...DDx ",
" xS.'...'.Tx..xXXXXXx ",
" x+x+x..qqqxx'x...DDx ",
" xSxSx..'.Tx<.xXXXXXx ",
" qqqqqqqqqqqqqqqqqqqq "
],
"terrain": {
Expand All @@ -94,26 +41,14 @@
",": "t_pavement_y",
"-": "t_pavement",
".": "t_floor",
"0": "t_floor",
"5": "t_floor",
"?": "t_chainfence_posts",
"B": "t_floor",
"C": "t_floor",
"D": "t_floor",
"E": "t_floor",
"L": "t_floor",
"S": "t_floor",
"T": "t_floor",
"V": "t_floor",
"X": "t_floor",
"Z": "t_floor",
"^": "t_floor",
"f": "t_floor",
"g": "t_window",
"p": "t_window_domestic",
"q": "t_wall",
"q": "t_wall_w",
"s": "t_sidewalk",
"x": "t_wall"
"4": "t_gutter_downspout",
"<": "t_stairs_up",
"x": "t_wall_g"
},
"furniture": {
"#": "f_table",
Expand All @@ -140,5 +75,131 @@
{ "item": "vending_drink", "x": [ 10, 11 ], "y": [ 16, 16 ], "chance": 70 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "gym_roof",
"weight": 200,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" |2222222222222222223 ",
" |..................5 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |...#######+####...3 ",
" |...#_0________#...3 ",
" |...#______ssst#...3 ",
" |...#_0____s___#...3 ",
" |...#______s__t#...3 ",
" |...#_0______tt#...3 ",
" |...#######_####...3 ",
" |........#___#4.X..3 ",
" |....&.=.#_>_#...:.3 ",
" |--------#####-----3 "
],
"terrain": {
".": "t_flat_roof",
" ": "t_open_air",
"#": "t_wall_g",
"+": "t_door_locked",
"2": "t_gutter_north",
"-": "t_gutter_south",
"3": "t_gutter_east",
"|": "t_gutter_west",
">": "t_stairs_down",
"5": "t_gutter_drop",
"_": "t_floor",
"s": "t_floor",
"t": "t_floor",
"0": "t_floor",
"4": "t_gutter_downspout"
},
"furniture": {
"&": "f_roof_turbine_vent",
":": "f_cellphone_booster",
"X": "f_small_satelitte_dish",
"=": "f_vent_pipe",
"b": "f_bench",
"s": "f_sofa",
"t": "f_table",
"0": "f_floor_canvas"
},
"place_loot": [ { "item": "television", "x": 16, "y": 19 } ],
"place_nested": [
{
"chunks": [
[ "null", 20 ],
[ "roof_2x2_utilities_b", 15 ],
[ "roof_2x2_utilities_c", 5 ],
[ "roof_2x2_utilities_d", 20 ],
[ "roof_2x2_utilities", 30 ],
[ "roof_2x2_golf", 20 ],
[ "roof_3x3_wine", 30 ],
[ "roof_4x4_utility_1", 30 ],
[ "roof_4x4_party", 15 ],
[ "roof_16x16_help", 3 ]
],
"x": 4,
"y": 8
},
{ "chunks": [ [ "roof_4x4_survivor", 20 ], [ "null", 80 ] ], "x": 9, "y": 16 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "gym_upper_roof",
"weight": 200,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" |22222222223 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |-----...5-3 ",
" |...3 ",
" |...3 ",
" ----- "
],
"terrain": {
".": "t_flat_roof",
" ": "t_open_air",
"2": "t_gutter_north",
"-": "t_gutter_south",
"3": "t_gutter_east",
"|": "t_gutter_west",
"5": "t_gutter_drop"
}
}
}
]
10 changes: 10 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1199,5 +1199,15 @@
{ "point": [ 0, 0, 0 ], "overmap": "s_bike_shop_1_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_bike_shop_roof_1_north" }
]
},
{
"type": "city_building",
"id": "gym",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "gym_north" },
{ "point": [ 0, 0, 1 ], "overmap": "gym_roof_north" },
{ "point": [ 0, 0, 2 ], "overmap": "gym_upper_roof_north" }
]
}
]
14 changes: 14 additions & 0 deletions data/json/overmap_terrain_recreational.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,20 @@
"copy-from": "generic_city_building",
"color": "yellow_cyan"
},
{
"type": "overmap_terrain",
"id": "gym_roof",
"name": "boxing gym roof",
"copy-from": "generic_city_building",
"color": "yellow_cyan"
},
{
"type": "overmap_terrain",
"id": "gym_upper_roof",
"name": "boxing gym roof",
"copy-from": "generic_city_building",
"color": "yellow_cyan"
},
{
"type": "overmap_terrain",
"id": "gym_fitness",
Expand Down

0 comments on commit de41139

Please sign in to comment.