Skip to content

Commit

Permalink
feat: JSONize and rework mx_collegekids map extra (#4904)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt authored Jun 29, 2024
1 parent 3b20857 commit b70af69
Show file tree
Hide file tree
Showing 5 changed files with 217 additions and 158 deletions.
131 changes: 0 additions & 131 deletions data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,136 +54,5 @@
{ "group": "smokedrugs", "prob": 135 },
{ "group": "weapons", "prob": 60 }
]
},
{
"type": "item_group",
"id": "college_camping",
"ammo": 50,
"magazine": 100,
"items": [
[ "daypack", 75 ],
[ "rope_30", 10 ],
[ "hatchet", 50 ],
[ "iceaxe", 20 ],
[ "mess_kit", 100 ],
[ "teapot", 50 ],
[ "binoculars", 30 ],
[ "firecracker_pack", 20 ],
[ "knife_hunting", 50 ],
[ "knife_heat", 30 ],
[ "glock_19", 5 ],
[ "backpack", 100 ],
[ "backpack_leather", 50 ],
[ "lighter", 100 ],
[ "ref_lighter", 20 ],
[ "electric_lighter", 20 ],
[ "matches", 50 ],
[ "flashlight", 100 ],
[ "radio", 20 ],
[ "rollmat", 60 ],
[ "tent_kit", 10 ],
[ "large_tent_kit", 5 ],
[ "survival_kit", 5 ],
[ "canteen", 100 ],
[ "2lcanteen", 50 ],
[ "camelbak", 25 ],
[ "heatpack", 100 ],
[ "glowstick", 100 ],
[ "handflare", 30 ],
[ "emer_blanket", 30 ],
[ "sleeping_bag", 80 ],
[ "gasoline_lantern", 40 ],
[ "oil_lamp", 40 ],
[ "popcan_stove", 10 ],
[ "soldering_ethanol", 5 ],
[ "denat_alcohol", 10 ],
[ "pur_tablets", 10 ],
[ "water_clean", 50 ],
[ "granola", 60 ],
[ "fruit_leather", 50 ],
{ "group": "salty_snacks", "prob": 130 },
[ "aspirin", 80 ],
[ "inhaler", 30 ],
{ "group": "beer", "prob": 80 },
[ "vodka", 60 ],
[ "cig", 20 ],
[ "crackpipe", 10 ],
[ "weed", 10 ],
[ "joint", 10 ],
[ "smart_phone", 20 ],
[ "camera", 20 ],
[ "chem_hexamine", 5 ]
]
},
{
"type": "item_group",
"id": "college_sports",
"items": [
[ "bat", 80 ],
[ "bat_metal", 80 ],
[ "boxing_gloves", 20 ],
[ "football_armor", 20 ],
[ "helmet_football", 20 ],
[ "jersey", 100 ],
[ "armguard_soft", 50 ],
[ "chestguard_hard", 20 ],
[ "armguard_hard", 20 ],
[ "legguard_hard", 50 ],
[ "leotard", 5 ],
[ "unitard", 5 ],
[ "hat_ball", 100 ],
[ "helmet_ball", 80 ],
[ "radio", 20 ],
[ "whistle", 20 ],
[ "elbow_pads", 80 ],
[ "knee_pads", 80 ],
[ "roller_blades", 40 ],
[ "rollerskates", 10 ],
[ "aspirin", 80 ],
[ "inhaler", 30 ],
{ "group": "beer", "prob": 180 },
[ "sports_drink", 80 ],
[ "energy_drink", 30 ],
[ "cig", 20 ],
[ "weed", 10 ],
[ "joint", 10 ],
[ "smart_phone", 50 ]
]
},
{
"type": "item_group",
"id": "college_lake",
"items": [
[ "bikini_top", 100 ],
[ "bikini_bottom", 100 ],
[ "trunks", 100 ],
[ "towel", 100 ],
[ "goggles_swim", 30 ],
[ "swim_fins", 20 ],
[ "flotation_vest", 50 ],
[ "diving_watch", 10 ],
[ "sunglasses", 60 ],
[ "fitover_sunglasses", 20 ],
[ "fancy_sunglasses", 10 ],
[ "flip_flops", 50 ],
[ "wetsuit_spring", 10 ],
[ "fishing_rod_professional", 30 ],
[ "straw_hat", 80 ],
[ "straw_fedora", 80 ],
[ "silver_ear", 20 ],
[ "bead_ear", 20 ],
[ "silver_necklace", 20 ],
[ "silver_bracelet", 20 ],
[ "silver_locket", 20 ],
[ "radio", 20 ],
[ "aspirin", 80 ],
[ "inhaler", 30 ],
[ "beer", 80 ],
[ "wine_barley", 20 ],
[ "cig", 20 ],
[ "weed", 10 ],
[ "joint", 10 ],
[ "smart_phone", 50 ]
]
}
]
62 changes: 38 additions & 24 deletions data/json/itemgroups/Locations_MapExtras/map_extras.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"subtype": "collection",
"id": "map_extra_college_camping",
"entries": [
{ "group": "underwear", "damage-min": 1, "damage-max": 3 },
{ "group": "shirts", "damage-min": 1, "damage-max": 4 },
{ "group": "jackets", "damage-min": 1, "damage-max": 4, "prob": 30 },
{ "group": "pants", "damage-min": 1, "damage-max": 4 },
{ "group": "shoes", "damage-min": 1, "damage-max": 4 },
{ "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 },
{ "group": "college_camping", "prob": 50 },
{ "group": "college_camping", "prob": 80 },
{ "group": "default_zombie_clothes" },
{ "group": "bags", "damage": [ 1, 4 ] },
{ "group": "default_zombie_items_pockets", "prob": 50 },
{ "group": "camping", "prob": 75, "count": [ 1, 2 ] },
{
"distribution": [ { "group": "fridge_alcohol_random", "prob": 75 }, { "group": "smokedrugs", "prob": 25 } ],
"prob": 50
},
{ "item": "corpse", "damage": 3 }
]
},
Expand All @@ -41,14 +41,14 @@
"subtype": "collection",
"id": "map_extra_college_sports",
"entries": [
{ "group": "underwear", "damage-min": 1, "damage-max": 3 },
{ "group": "shirts", "damage-min": 1, "damage-max": 4 },
{ "group": "jackets", "damage-min": 1, "damage-max": 4, "prob": 30 },
{ "group": "pants", "damage-min": 1, "damage-max": 4 },
{ "group": "shoes", "damage-min": 1, "damage-max": 4 },
{ "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 },
{ "group": "college_sports", "prob": 50 },
{ "group": "college_sports", "prob": 90 },
{ "group": "default_zombie_clothes" },
{ "group": "bags", "damage": [ 1, 4 ] },
{ "group": "default_zombie_items_pockets", "prob": 50 },
{ "group": "sports", "prob": 75, "count": [ 1, 2 ] },
{
"distribution": [ { "group": "fridge_alcohol_random", "prob": 75 }, { "group": "smokedrugs", "prob": 25 } ],
"prob": 50
},
{ "item": "corpse", "damage": 3 }
]
},
Expand All @@ -57,14 +57,28 @@
"subtype": "collection",
"id": "map_extra_college_lake",
"entries": [
{ "group": "underwear", "damage-min": 1, "damage-max": 3 },
{ "group": "shirts", "damage-min": 1, "damage-max": 4 },
{ "group": "jackets", "damage-min": 1, "damage-max": 4, "prob": 30 },
{ "group": "pants", "damage-min": 1, "damage-max": 4 },
{ "group": "shoes", "damage-min": 1, "damage-max": 4 },
{ "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 },
{ "group": "college_lake", "prob": 50 },
{ "group": "college_lake", "prob": 70 },
{
"distribution": [
{ "group": "default_zombie_clothes", "prob": 50 },
{ "group": "swimmer_wetsuit", "damage": [ 1, 4 ], "prob": 5 },
{
"collection": [
{ "group": "swimmer_head", "damage": [ 1, 4 ], "prob": 75 },
{ "group": "swimmer_torso", "damage": [ 1, 4 ], "prob": 33 },
{ "group": "swimmer_pants", "damage": [ 1, 4 ] },
{ "group": "swimmer_shoes", "damage": [ 1, 4 ], "prob": 25 }
],
"prob": 45
}
]
},
{ "group": "bags", "damage": [ 1, 4 ] },
{ "group": "default_zombie_items_pockets", "prob": 50 },
{ "group": "fishing_items", "prob": 75, "count": [ 1, 2 ] },
{
"distribution": [ { "group": "fridge_alcohol_random", "prob": 75 }, { "group": "smokedrugs", "prob": 25 } ],
"prob": 50
},
{ "item": "corpse", "damage": 3 }
]
},
Expand Down
44 changes: 44 additions & 0 deletions data/json/mapgen/map_extras/corpses.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_collegekids",
"object": {
"place_nested": [
{
"chunks": [ [ "lost_campers_chunk_1", 50 ], [ "lost_campers_chunk_2", 40 ], [ "lost_campers_chunk_3", 10 ] ],
"x": 1,
"y": 1
}
],
"place_monster": [ { "group": "GROUP_NETHER_CAPTURED", "x": [ 1, 22 ], "y": [ 1, 22 ], "repeat": [ 1, 3 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "lost_campers_chunk_1",
"object": {
"mapgensize": [ 22, 22 ],
"place_loot": [ { "group": "map_extra_college_camping", "chance": 100, "x": [ 0, 21 ], "y": [ 0, 21 ], "repeat": [ 2, 6 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "lost_campers_chunk_2",
"object": {
"mapgensize": [ 22, 22 ],
"place_loot": [ { "group": "map_extra_college_sports", "chance": 100, "x": [ 0, 21 ], "y": [ 0, 21 ], "repeat": [ 2, 6 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "lost_campers_chunk_3",
"object": {
"mapgensize": [ 22, 22 ],
"place_loot": [ { "group": "map_extra_college_lake", "chance": 100, "x": [ 0, 21 ], "y": [ 0, 21 ], "repeat": [ 2, 6 ] } ]
}
}
]
Loading

0 comments on commit b70af69

Please sign in to comment.