Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesigning Arhtropods Part 4: Cellar Spiders #59075

Merged
merged 7 commits into from
Jul 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,21 @@
"base_mods": { "per_mod": [ -3, 0 ] },
"scaling_mods": { "per_mod": [ -2, -1 ] }
},
{
"type": "effect_type",
"id": "venom_pain",
"name": [ "Distracting Wound", "Painful Wound", "Searing Wound" ],
"desc": [ "The wound throbs with sharp pain." ],
"apply_message": "A dull pain starts spreading from the wound!",
"max_intensity": 6,
"int_add_val": 1,
"int_decay_step": -1,
"int_decay_tick": 100,
"int_decay_remove": true,
"resist_traits": [ "PAINRESIST" ],
"base_mods": { "pain_amount": [ 10, 2 ], "pain_min": [ 5, 1 ], "pain_chance": [ 10, 20 ], "pain_tick": [ 5 ] },
"scaling_mods": { "pain_min": [ 5, 1 ], "pain_chance": [ -1, 0 ] }
},
{
"type": "effect_type",
"id": "foodpoison",
Expand Down
20 changes: 20 additions & 0 deletions data/json/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,26 @@
},
"display_field": true
},
{
"id": "fd_web_nostick",
"type": "field_type",
"looks_like": "fd_web",
"intensity_levels": [ { "name": "thin cobwebs", "sym": "}", "color": "white" }, { "name": "thin webs", "transparent": false } ],
"description_affix": "covered_in",
"decrease_intensity_on_contact": true,
"priority": 2,
"phase": "solid",
"display_items": true,
"bash": {
"str_min": 1,
"str_max": 3,
"sound_vol": 2,
"sound_fail_vol": 2,
"sound": "hsh!",
"msg_success": "You brush aside some webs."
},
"display_field": true
},
{
"id": "fd_slime",
"type": "field_type",
Expand Down
16 changes: 16 additions & 0 deletions data/json/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,22 @@
{ "drop": "egg_firefly", "type": "offal", "base_num": [ 0, 3 ] }
]
},
{
"id": "arachnid_spider",
"type": "harvest",
"message": "<spider_harvest>",
"copy-from": "arachnid",
"entries": [
{ "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 },
{ "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
{ "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 },
{ "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
{ "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
{ "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.006 },
{ "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
{ "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "arachnid_tainted",
"type": "harvest",
Expand Down
124 changes: 0 additions & 124 deletions data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,130 +156,6 @@
{ "item": "briefs", "prob": 30 }
]
},
{
"type": "item_group",
"id": "spider",
"magazine": 100,
"subtype": "distribution",
"entries": [
{ "group": "mags_obscure", "prob": 40 },
{ "item": "corpse", "prob": 10 },
{ "item": "holy_symbol", "prob": 1 },
{ "item": "mutagen", "prob": 8 },
{ "item": "purifier", "prob": 12 },
{ "item": "meat", "prob": 50 },
{ "item": "meat_tainted", "prob": 60 },
{ "item": "arm", "prob": 4 },
{ "item": "leg", "prob": 4 },
{ "group": "used_1st_aid", "prob": 35 },
{ "item": "codeine", "prob": 15 },
{ "item": "oxycodone", "prob": 7 },
{ "item": "pipe_tobacco", "prob": 5 },
{ "item": "tobacco", "prob": 5 },
{ "item": "weed", "prob": 20 },
{ "item": "seed_weed", "prob": 15 },
{ "item": "seed_tobacco", "prob": 5 },
{ "item": "rolling_paper", "prob": 5 },
{ "item": "pipe_glass", "prob": 5 },
{ "item": "coke", "prob": 8 },
{ "item": "adrenaline_injector", "prob": 4 },
{ "item": "wrapper", "prob": 50 },
{ "item": "wrapper_foil", "prob": 5 },
{ "group": "wallets_science", "prob": 2 },
{ "item": "laptop", "prob": 5, "charges": [ 0, 500 ] },
{ "item": "atomic_light", "prob": 10 },
{ "item": "atomic_lamp", "prob": 5 },
{ "item": "smart_lamp", "prob": 10 },
{ "item": "atomic_coffeepot", "prob": 5 },
{ "item": "eink_tablet_pc", "prob": 1, "charges": [ 0, 100 ] },
{ "item": "mobile_memory_card", "prob": 8 },
{ "item": "mobile_memory_card_science", "prob": 1 },
{ "item": "standard_template_construct", "prob": 8 },
{ "group": "wallets_military", "prob": 3 },
{ "group": "wallets_industrial", "prob": 5 },
{ "item": "militarymap", "prob": 3 },
{ "item": "pistol_bayonet", "prob": 4 },
{ "item": "rope_30", "prob": 35 },
{ "item": "stick", "prob": 95 },
{ "item": "hatchet", "prob": 10 },
{ "item": "misc_repairkit", "prob": 5, "charges-min": 0 },
{ "item": "ax", "prob": 8 },
{ "item": "bee_sting", "prob": 5 },
{ "item": "chitin_piece", "prob": 10 },
{ "item": "vest", "prob": 15 },
{ "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
{ "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
{ "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
{ "item": "hat_boonie", "prob": 10 },
{ "item": "helmet_riot", "prob": 25 },
{ "item": "bolt_steel", "prob": 7 },
{ "item": "bolt_cf", "prob": 5 },
{ "item": "shot_00", "prob": 8 },
{ "item": "shot_flechette", "prob": 3 },
{ "item": "20x66_shot", "prob": 4 },
{ "item": "20x66_exp", "prob": 1 },
{ "item": "20x66_inc", "prob": 1 },
{ "item": "20x66_flare", "prob": 2 },
{ "item": "20x66_frag", "prob": 1 },
{ "item": "762_m87", "prob": 7 },
{ "item": "556", "prob": 6 },
{ "item": "556_incendiary", "prob": 2 },
{ "item": "3006_incendiary", "prob": 1 },
{ "item": "762_51", "prob": 6 },
{ "item": "762_51_incendiary", "prob": 6 },
{ "item": "saiga_12", "prob": 3 },
{ "item": "rm20", "prob": 1 },
{ "item": "hk_mp5", "prob": 12 },
{ "item": "hk_mp5k", "prob": 4 },
{ "item": "briefcase_smg", "prob": 1 },
{ "item": "TDI", "prob": 4 },
{ "item": "savage_111f", "prob": 10 },
{ "item": "ak47", "prob": 16 },
{ "item": "ak74", "prob": 4 },
{ "item": "m4_carbine", "variant": "m4a1", "prob": 7 },
{ "item": "m16a4", "prob": 6 },
{ "item": "m27_assault_rifle", "variant": "h&k416a5", "prob": 3 },
{ "item": "mossberg_930", "variant": "m1014", "prob": 1 },
{ "item": "m26_mass_standalone", "prob": 1 },
{ "item": "steyr_aug", "prob": 6 },
{ "item": "v29", "prob": 1 },
{ "item": "flamethrower", "prob": 1 },
{ "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
{ "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
{ "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
{ "item": "rad_monitor", "prob": 4, "charges": [ 0, 50 ] },
{ "item": "teleporter", "prob": 10 },
{ "item": "mil_mess_kit", "prob": 1 },
{ "item": "canister_goo", "prob": 8 },
{ "item": "dynamite", "prob": 5 },
{ "item": "mininuke", "prob": 1 },
{ "item": "bot_manhack", "prob": 1 },
{ "item": "bot_grenade_hack", "prob": 1 },
{ "item": "bot_flashbang_hack", "prob": 1 },
{ "item": "bot_gasbomb_hack", "prob": 1 },
{ "item": "UPS_off", "prob": 8 },
{ "item": "arrow_cf", "prob": 5 },
{ "item": "spray_can", "prob": 50 },
{ "item": "tac_helmet", "prob": 5 },
{ "item": "tac_fullhelmet", "prob": 2 },
{ "item": "lsd", "prob": 4 },
{ "item": "pocketwatch", "prob": 5 },
{ "item": "child_book", "prob": 20 },
{ "item": "manual_dodge_kid", "prob": 5 },
{ "item": "e_tool", "prob": 10 },
{ "item": "survivormap", "prob": 5 },
{ "item": "halligan", "prob": 10 },
{ "item": "fire_ax", "prob": 5 },
{ "item": "miner_hat", "prob": 10, "charges": [ 0, 100 ] },
{ "item": "grapnel", "prob": 2 },
{ "group": "tools_toolbox", "prob": 1 },
{ "item": "pur_tablets", "prob": 10 },
{ "item": "pastaextruder", "prob": 10 },
{ "item": "can_sealer", "prob": 10 },
{ "item": "remotevehcontrol", "prob": 8 },
{ "item": "mk47", "prob": 4 }
]
},
{
"type": "item_group",
"id": "cow",
Expand Down
78 changes: 0 additions & 78 deletions data/json/itemgroups/main.json
Original file line number Diff line number Diff line change
@@ -1,82 +1,4 @@
[
{
"type": "item_group",
"id": "rare",
"//": "Items that should have very low frequencies and or few locations.",
"magazine": 100,
"subtype": "distribution",
"entries": [
{ "item": "12mm", "prob": 20, "charges": [ 1, 20 ] },
{ "item": "adrenaline_injector", "prob": 20 },
{ "item": "ampoule", "prob": 100 },
{ "item": "antifungal", "prob": 10, "charges": [ 1, 10 ] },
{ "item": "antiparasitic", "prob": 20, "charges": [ 1, 10 ] },
{ "item": "armor_chitin", "prob": 10 },
{ "item": "bot_c4_hack", "prob": 30 },
{ "item": "c4", "prob": 50 },
{ "item": "canister_goo", "prob": 80 },
{ "item": "cleansuit", "prob": 100 },
{ "item": "dump_pouch", "prob": 100 },
{ "item": "electrohack", "prob": 30, "charges": [ 0, 100 ] },
{ "item": "fetus", "prob": 10 },
{ "item": "hazmat_suit", "prob": 50 },
{ "item": "plasma_gun", "prob": 10, "charges": [ 0, 25 ] },
{ "item": "hk_g80", "prob": 20, "charges": [ 0, 20 ] },
{ "item": "hk_g80mag", "prob": 35, "charges": [ 0, 20 ] },
{ "item": "emp_gun", "prob": 20 },
{ "item": "id_military", "prob": 30 },
{ "item": "id_industrial", "prob": 30 },
{ "item": "id_science", "prob": 20 },
{ "item": "knife_rm42", "prob": 20 },
{ "item": "l-stick", "prob": 10, "charges": [ 0, 500 ] },
{ "item": "large_repairkit", "prob": 20, "charges": [ 0, 500 ] },
{ "item": "standard_template_construct", "prob": 15 },
{ "item": "laser_rifle", "prob": 10 },
{ "item": "m240", "prob": 10, "charges": [ 0, 200 ] },
{ "item": "m249", "prob": 10, "charges": [ 0, 30 ] },
{ "item": "m60", "prob": 10, "charges": [ 0, 200 ] },
{ "item": "mask_bal", "prob": 100 },
{ "item": "militarymap", "prob": 20 },
{ "item": "mutagen", "prob": 80 },
{ "item": "optical_cloak", "prob": 20 },
{ "item": "holo_cloak", "prob": 20, "charges": [ 0, 1000 ] },
{ "item": "pickaxe", "prob": 10 },
{ "item": "plasma", "prob": 80, "charges": [ 1, 25 ] },
{ "item": "plasma_rifle", "prob": 10, "charges": [ 0, 25 ] },
{ "item": "plut_cell", "prob": 100, "charges": [ 1, 5 ] },
{ "item": "portal", "prob": 20 },
{ "item": "power_armor_basic", "prob": 50 },
{ "item": "power_armor_frame", "prob": 40 },
{ "item": "power_armor_generator", "prob": 40 },
{ "item": "power_armor_heavy", "prob": 30 },
{ "item": "power_armor_helmet_basic", "prob": 60 },
{ "item": "power_armor_helmet_heavy", "prob": 30 },
{ "item": "power_armor_helmet_light", "prob": 30 },
{ "item": "power_armor_light", "prob": 30 },
{ "item": "processor", "prob": 150 },
{ "item": "purifier", "prob": 120 },
{ "item": "pur_tablets", "prob": 200, "charges": [ 1, 15 ] },
{ "item": "recipe_medicalmut", "prob": 100 },
{ "item": "remotevehcontrol", "prob": 80, "charges": [ 0, 100 ] },
{ "item": "rm11b_sniper_rifle", "prob": 10, "charges": [ 0, 10 ] },
{ "item": "rm13_armor", "prob": 20, "charges": [ 0, 10000 ] },
{ "item": "rm51_assault_rifle", "prob": 10, "charges": [ 0, 50 ] },
{ "item": "royal_jelly", "prob": 80 },
{ "item": "RPG", "prob": 10 },
{ "item": "RPG-7_ammo", "prob": 10 },
{ "item": "RPG-7_og7v", "prob": 25 },
{ "item": "RPG-7_tbg7v", "prob": 8 },
{ "item": "RPG-7_pg7vr", "prob": 8 },
{ "item": "atgm_heat", "prob": 1 },
{ "item": "rx11_stimpack", "prob": 50, "charges": [ 0, 5 ] },
{ "item": "rx12_injector", "prob": 50 },
{ "item": "stimpack_ammo", "prob": 100 },
{ "item": "survivormap", "prob": 50 },
{ "item": "survnote", "prob": 10 },
{ "item": "tool_rdx_charge", "prob": 10 },
{ "item": "v29", "prob": 10 }
]
},
{
"type": "item_group",
"id": "debug_template_item",
Expand Down
1 change: 0 additions & 1 deletion data/json/mapgen/bugs/spider_pit.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
],
"terrain": { "#": "t_soil", "?": [ [ "t_soil", 2 ], "t_dirt_underground" ], ".": "t_dirt_underground", "<": "t_slope_up" },
"furniture": { ".": [ [ "f_null", 20 ], "f_egg_sackws" ] },
"items": { ".": { "item": "spider", "chance": 2 } },
"place_fields": [
{ "field": "fd_web", "x": [ 3, 20 ], "y": [ 3, 20 ], "repeat": 60 },
{ "field": "fd_web", "x": [ 8, 15 ], "y": [ 8, 15 ], "repeat": 60 }
Expand Down
53 changes: 52 additions & 1 deletion data/json/mapgen/map_extras/spider.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"nested_mapgen_id": "spider_webs",
"object": { "mapgensize": [ 1, 1 ], "place_fields": [ { "field": "fd_web", "x": 0, "y": 0 } ] }
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "spider_webs_nostick",
"object": { "mapgensize": [ 1, 1 ], "place_fields": [ { "field": "fd_web_nostick", "repeat": [ 0, 3 ], "x": 0, "y": 0 } ] }
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -38,9 +44,54 @@
],
"terrain": { "X": "t_dirt" },
"furniture": { "X": "f_egg_sackws" },
"monster": { "X": { "monster": "mon_spider_web" } },
"monsters": { "X": { "monster": "GROUP_SPIDER", "chance": 1, "density": 1 } },
"nested": { " ": { "chunks": [ [ "spider_webs", 10 ], [ "null", 1 ] ] } },
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_basement_spider",
"object": {
"rows": [
" ",
" ! ",
" ! ",
" ",
" ! ",
" ",
" ! ",
" ",
" ! ! ",
" ",
" ",
" ! ",
" ",
" ! ",
" ",
" ! ",
" ! ",
" ",
" ",
" ! ",
" ",
" ",
" ! ! ",
" "
],
"set": [ { "point": "bash", "x": [ 3, 20 ], "y": [ 3, 20 ], "repeat": [ 5, 10 ] } ],
"monster": { "!": { "group": "GROUP_SPIDER_BASEMENT", "chance": 50, "pack_size": [ 1, 3 ] } },
"nested": {
" ": {
"chunks": [
[ "spider_webs_nostick", 1 ],
[ "wasp_gibs", 1 ],
[ "damaged_door_nested_no_junk", 3 ],
[ "destroyed_door_nested_no_junk", 3 ]
]
}
}
}
}
]
12 changes: 12 additions & 0 deletions data/json/mapgen/nested/aux_nested.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "damaged_door_nested_no_junk",
"object": { "mapgensize": [ 1, 1 ], "place_ter_furn_transforms": [ { "transform": "damaged_door", "x": 0, "y": 0 } ] }
},
{
"type": "mapgen",
"method": "json",
Expand All @@ -51,6 +57,12 @@
]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "destroyed_door_nested_no_junk",
"object": { "mapgensize": [ 1, 1 ], "place_ter_furn_transforms": [ { "transform": "destroyed_door", "x": 0, "y": 0 } ] }
},
{
"type": "mapgen",
"method": "json",
Expand Down
Loading