diff --git a/data/Goats_mods/Goats_Tow_mod/items/tows.json b/data/Goats_mods/Goats_Tow_mod/items/tows.json index 33799f206..6c06505df 100644 --- a/data/Goats_mods/Goats_Tow_mod/items/tows.json +++ b/data/Goats_mods/Goats_Tow_mod/items/tows.json @@ -15,7 +15,12 @@ "price_postapoc": "5 USD", "max_charges": 6, "initial_charges": 6, - "use_action": { "type": "link_up", "is_cable_item": true, "cable_length": 6, "targets": [ "no_link", "vehicle_tow" ] }, + "use_action": { + "type": "link_up", + "menu_text": "Attach / Manage connections", + "efficiency": 0.0, + "targets": [ "no_link", "vehicle_tow" ] + }, "qualities": [ [ "ROPE", 2 ] ], "flags": [ "CABLE_SPOOL", "TOW_CABLE" ] }, @@ -35,7 +40,12 @@ "price_postapoc": "5 USD", "max_charges": 6, "initial_charges": 6, - "use_action": { "type": "link_up", "is_cable_item": true, "cable_length": 6, "targets": [ "no_link", "vehicle_tow" ] }, + "use_action": { + "type": "link_up", + "menu_text": "Attach / Manage connections", + "efficiency": 0.0, + "targets": [ "no_link", "vehicle_tow" ] + }, "qualities": [ [ "ROPE", 2 ] ], "flags": [ "CABLE_SPOOL", "TOW_CABLE" ] }, diff --git a/data/Goats_mods/Gods_Gun_Mod/gods_guns.json b/data/Goats_mods/Gods_Gun_Mod/gods_guns.json index 65cc2f7bd..5a459a585 100644 --- a/data/Goats_mods/Gods_Gun_Mod/gods_guns.json +++ b/data/Goats_mods/Gods_Gun_Mod/gods_guns.json @@ -48,7 +48,6 @@ "volume": "750 ml", "longest_side": "75 cm", "price_postapoc": 500, - "melee_damage": { "bash": 6 }, "armor_data": { "armor": [ { diff --git a/data/Goats_mods/Gods_Gun_Mod/weapons.json b/data/Goats_mods/Gods_Gun_Mod/weapons.json index 94393aa56..8a1812c35 100644 --- a/data/Goats_mods/Gods_Gun_Mod/weapons.json +++ b/data/Goats_mods/Gods_Gun_Mod/weapons.json @@ -33,7 +33,7 @@ "color": "brown", "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], "qualities": [ [ "HAMMER", 1 ], [ "HAMMER_FINE", 1 ] ], - "use_action": [ "HAMMER" ], + "use_action": [ "CROWBAR" ], "flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE" ] } ] diff --git a/data/Goats_mods/More_tools/Item_groups.json b/data/Goats_mods/More_tools/Item_groups.json index c8fdf93fa..d8ad08258 100644 --- a/data/Goats_mods/More_tools/Item_groups.json +++ b/data/Goats_mods/More_tools/Item_groups.json @@ -160,7 +160,6 @@ [ "soup_meat", 15 ], [ "soup_chicken", 15 ], [ "soup_mushroom", 15 ], - [ "inflatable_boat", 5 ], [ "hand_pump", 5 ], [ "soup_tomato", 15 ], [ "soup_dumplings", 15 ], @@ -187,7 +186,6 @@ [ "cheese_hard", 5 ], [ "bandages", 50 ], [ "cotton_ball", 50 ], - [ "1st_aid", 35 ], [ "survival_kit_box", 35 ], [ "saline", 10 ], [ "vitamins", 75 ], @@ -280,7 +278,6 @@ [ "oil_lamp", 5 ], [ "lamp_oil", 5 ], [ "flotation_vest", 1 ], - [ "vaccine_shot", 10 ], [ "flu_shot", 1 ], [ "coat_rain", 5 ], [ "hood_rain", 5 ], @@ -310,7 +307,6 @@ [ "chem_hexamine", 4 ], [ "esbit_stove", 8 ], [ "bottle_folding", 6 ], - [ "mess_tin", 8 ], [ "metal_file", 5 ], [ "pin_reamer", 3 ] ] @@ -438,7 +434,6 @@ [ "laptop", 20 ], [ "atomic_light", 1 ], [ "eink_tablet_pc", 1 ], - [ "mobile_memory_card", 5 ], [ "cell_phone", 10 ], [ "smart_phone", 30 ], [ "rag", 1 ], @@ -542,7 +537,6 @@ [ "small_prybar", 35 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, [ "manual_electronics", 20 ], - [ "mobile_memory_card", 20 ], [ "usb_drive", 5 ], [ "software_useless", 10 ], [ "survnote", 1 ] @@ -552,14 +546,12 @@ "id": "sewage_plant", "type": "item_group", "items": [ - [ "1st_aid", 35 ], [ "motor", 2 ], [ "motor_small", 1 ], [ "hose", 15 ], [ "water_faucet", 20 ], [ "screwdriver", 40 ], [ "small_prybar", 35 ], - [ "inflatable_boat", 10 ], [ "hand_pump", 10 ], [ "wrench", 30 ], [ "pipe", 20 ], diff --git a/data/Goats_mods/More_tools/More_tools.json b/data/Goats_mods/More_tools/More_tools.json index d08ff261a..782d72622 100644 --- a/data/Goats_mods/More_tools/More_tools.json +++ b/data/Goats_mods/More_tools/More_tools.json @@ -42,7 +42,7 @@ "symbol": ";", "color": "brown", "qualities": [ [ "HAMMER", 3 ], [ "PRY", 1 ], [ "HAMMER_FINE", 1 ] ], - "use_action": [ "HAMMER", "CROWBAR" ], + "use_action": [ "CROWBAR" ], "flags": [ "BELT_CLIP", "NONCONDUCTIVE" ] }, { diff --git a/data/Goats_mods/Portable_Generator_mod/vehicle_parts.json b/data/Goats_mods/Portable_Generator_mod/vehicle_parts.json index cd1f4f1bc..0857540c8 100644 --- a/data/Goats_mods/Portable_Generator_mod/vehicle_parts.json +++ b/data/Goats_mods/Portable_Generator_mod/vehicle_parts.json @@ -65,8 +65,8 @@ "copy-from": "generator_gasoline_base", "name": { "str": "generator gasoline (25L)" }, "item": "generator_25l_gasoline", - "power": 250, - "epower": 17500 + "power": "6500 W", + "epower": "-20 W" }, { "id": "generator_10l_gasoline", @@ -75,8 +75,8 @@ "fuel_type": "gasoline", "name": { "str": "generator gasoline (10L)" }, "item": "generator_10l_gasoline", - "power": 250, - "epower": 17500 + "power": "5200 W", + "epower": "-20 W" }, { "id": "generator_25l_diesel", @@ -84,8 +84,8 @@ "copy-from": "generator_diesel_base", "name": { "str": "generator diesel (25L)" }, "item": "generator_25l_diesel", - "power": 250, - "epower": 7500 + "power": "6500 W", + "epower": "-20 W" }, { "id": "generator_10l_diesel", @@ -93,7 +93,7 @@ "type": "vehicle_part", "name": { "str": "generator diesel (10L)" }, "item": "generator_10l_diesel", - "power": 250, - "epower": 12500 + "power": "5200 W", + "epower": "-20 W" } ] diff --git a/data/Goats_mods/Tool_hanger/Item.json b/data/Goats_mods/Tool_hanger/Item.json index 19e4233eb..12b1317da 100644 --- a/data/Goats_mods/Tool_hanger/Item.json +++ b/data/Goats_mods/Tool_hanger/Item.json @@ -45,7 +45,6 @@ "chipper", "clamp", "claw_bar", - "con_mix", "cordless_drill", "distaff_spindle", "elec_jackhammer", @@ -63,7 +62,6 @@ "metal_file", "metal_smoother", "misc_repairkit", - "mold_plastic", "multitool", "oxy_torch", "paint_brush", @@ -78,7 +76,6 @@ "soldering_iron", "toolbox_empty", "toolbox_workshop_empty", - "toolset_extended", "welder", "welder_crude", "wood_smoother", @@ -159,8 +156,6 @@ "picklocks", "pseudo_bio_picklock", "butchering_kit", - "mess_kit", - "mil_mess_kit", "anesthetic_kit", "p_saw", "bow_saw", diff --git a/data/Legacy_mods/mods/Dark-Skies-Above/DESIGN.md b/data/Legacy_mods/mods/Dark-Skies-Above/DESIGN.md index 2e9072439..8f01bfdec 100644 --- a/data/Legacy_mods/mods/Dark-Skies-Above/DESIGN.md +++ b/data/Legacy_mods/mods/Dark-Skies-Above/DESIGN.md @@ -1,21 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Dark Skies Above](#dark-skies-above) -- [Summary of Intent and Content](#summary-of-intent-and-content) -- [Contributing](#contributing) -- [Content](#content) - - [The World](#the-world) - - [The Arrival and The Aliens](#the-arrival-and-the-aliens) - - [Other Aliens](#other-aliens) - - [Alien Technology](#alien-technology) - - [The Player](#the-player) - - [The Resistance and the Narrative](#the-resistance-and-the-narrative) - - [Other NPCs](#other-npcs) - - - # Dark Skies Above This document is intended to not only guide new potential contributors, but also help get my own thoughts on how the game will progress in text. Assume spoilers beyond this point! diff --git a/data/Legacy_mods/mods/Dark-Skies-Above/README.md b/data/Legacy_mods/mods/Dark-Skies-Above/README.md index a0366a834..53e29b42b 100644 --- a/data/Legacy_mods/mods/Dark-Skies-Above/README.md +++ b/data/Legacy_mods/mods/Dark-Skies-Above/README.md @@ -1,13 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Dark Skies Above](#dark-skies-above) -- [Takeaway Features](#takeaway-features) -- [Meta](#meta) - - - # Dark Skies Above A partial conversion mod for Cataclysm: DDA, taking inspiration from XCOM 2, Half Life 2, and similar 'alien invasion' media to present a game of survival against an alien occupation force. WIP, but will feature new quests, NPCs, locations, and enemies. diff --git a/data/Legacy_mods/mods/Dark-Skies-Above/TODO.md b/data/Legacy_mods/mods/Dark-Skies-Above/TODO.md index f157819a6..da8ae2c91 100644 --- a/data/Legacy_mods/mods/Dark-Skies-Above/TODO.md +++ b/data/Legacy_mods/mods/Dark-Skies-Above/TODO.md @@ -1,14 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [List of Short Term Tasks](#list-of-short-term-tasks) - - [JSON](#json) - - [Code](#code) -- [Mid Term Ideas](#mid-term-ideas) - - - # List of Short Term Tasks In order to keep Dark Skies Above moving and to not get overwhelmed, I'm creating lists of achievable, short term tasks that need to done. These lists should be periodically updated as items are completed. diff --git a/data/Legacy_mods/mods/Mythos/README.md b/data/Legacy_mods/mods/Mythos/README.md index 3c017eb98..85d9024ac 100644 --- a/data/Legacy_mods/mods/Mythos/README.md +++ b/data/Legacy_mods/mods/Mythos/README.md @@ -1,12 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [About This Mod](#about-this-mod) -- [Planned list of features](#planned-list-of-features) - - - # About This Mod A very work-in-progress start to a more Lovecraftian-focused version of Cataclysm set in the 1920s, with 99.9% of the population mysteriously disappearing at midnight of day 0. diff --git a/data/Mainline_mods/Mods/Defense_Mode/eocs.json b/data/Mainline_mods/Mods/Defense_Mode/eocs.json index 12410e3a7..37a8d86b5 100644 --- a/data/Mainline_mods/Mods/Defense_Mode/eocs.json +++ b/data/Mainline_mods/Mods/Defense_Mode/eocs.json @@ -3,7 +3,6 @@ "type": "effect_on_condition", "id": "scenario_defense_mode", "eoc_type": "SCENARIO_SPECIFIC", - "deactivate_condition": { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, ">=", { "const": 1 } ] }, "effect": [ { "open_dialogue": { "topic": "TALK_DEFENSE_MODE_MAIN_MENU" } }, { "u_message": "Get ready for the first wave, it's not that far away!", "type": "good", "popup": true }, @@ -27,6 +26,12 @@ { "u_message": "A caravan approaches!", "type": "good", "popup": false } ] }, + { + "type": "effect_on_condition", + "id": "defense_mode_caravan_remove", + "global": false, + "effect": [ { "mapgen_update": "defense_mode_caravan_remove" } ] + }, { "type": "effect_on_condition", "id": "defense_mode_hire_merc_true", @@ -53,39 +58,28 @@ "type": "effect_on_condition", "id": "DEFENSE_MODE_WAVE_CONTROL", "recurrence": "1 day", - "global": true, "effect": [ - { "u_teleport": { "global_val": "your_spawnpoint" } }, { "arithmetic": [ { "global_val": "var", "var_name": "wave_number" }, "+=", { "const": 1 } ] }, { "math": [ "wave_cash_number", "++" ] }, { "u_message": "Welcome to wave !", "type": "bad", "popup": false }, - { "run_eocs": [ "defense_mode_money_add", "DEFENSE_MODE_WAVE_SPECIAL_DECIDER" ] } - ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WAVE_SPECIAL_DECIDER", - "global": true, - "//": "This is used to decide for special waves, like shadow spawns and ultimate victory.", - "condition": { - "or": [ - { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 5 } ] }, - { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 15 } ] }, - { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 30 } ] }, - { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 50 } ] } - ] - }, - "effect": [ + { "run_eocs": [ "defense_mode_caravan_remove", "defense_mode_money_add" ] }, { - "run_eocs": [ - "DEFENSE_MODE_WAVE_SPECIAL_FERALS", - "DEFENSE_MODE_WAVE_SPECIAL_RATKIN", - "DEFENSE_MODE_WAVE_SPECIAL_MILITARY", - "DEFENSE_MODE_WAVE_SPECIAL_SHADOW" + "weighted_list_eocs": [ + [ "DEFENSE_MODE_WAVE_SPAWN_ZOMBIES", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_SPECIAL_ZOMBIES", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_SPIDERS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_ROBOTS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_TRIFFIDS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_SUBSPACE", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_DINOS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_LIZARDFOLK", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_GOLEMS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", { "const": 1 } ], + [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ] ] } - ], - "false_effect": [ { "run_eocs": "DEFENSE_MODE_WAVE_SPAWN_FALLBACK" } ] + ] }, { "type": "effect_on_condition", @@ -105,12 +99,7 @@ [ "DEFENSE_MODE_WAVE_SPAWN_GOLEMS", { "const": 1 } ], [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", { "const": 1 } ], [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_CANDY", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_MYTHOS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_EXODII", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_XEDRA", { "const": 1 } ] + [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ] ] } ] @@ -307,133 +296,11 @@ ], "false_effect": { "run_eocs": "DEFENSE_MODE_WAVE_SPAWN_FALLBACK" } }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WAVE_SPECIAL_FERALS", - "condition": { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 5 } ] }, - "effect": [ - { - "u_spawn_monster": "GROUP_FERAL", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_FERAL", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_FERAL", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_message": "You hear the wild howls of crazed individuals and unintelligible, carnal gibberish and slavering cries. Something is coming, and it doesn't have your best interest in mind.", - "type": "bad", - "popup": true - } - ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WAVE_SPECIAL_RATKIN", - "condition": { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 15 } ] }, - "effect": [ - { - "u_spawn_monster": "GROUP_RATKIN_EVOLVED", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_RATKIN_EVOLVED", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_RATKIN_EVOLVED", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_message": "Squeaking and chittering can be heard nearby, with the pattering of many feet, like a swarm of rats travelling quickly. However, this sounds more, organized? Almost like they're all walking in formation.", - "type": "bad", - "popup": true - } - ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WAVE_SPECIAL_MILITARY", - "condition": { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 30 } ] }, - "effect": [ - { - "u_spawn_monster": "GROUP_MIL_HELIPAD", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_MIL_HELIPAD", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_spawn_monster": "GROUP_MIL_HELIPAD", - "real_count": { "global_val": "wave_number", "default": 1 }, - "outdoor_only": true, - "group": true, - "min_radius": 20, - "max_radius": 40 - }, - { - "u_message": "You hear crazed, half-pronounced orders screamed from afar. The tamping of boots and off-beat shouts of two-three-four sound like the signs of an approaching army, but all the footfall is out of tune.", - "type": "bad", - "popup": true - } - ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WAVE_SPECIAL_SHADOW", - "condition": { "compare_num": [ { "global_val": "var", "var_name": "wave_number" }, "==", { "const": 50 } ] }, - "effect": [ - { "u_spawn_monster": "mon_boss_shadow", "real_count": 1, "outdoor_only": true, "min_radius": 20, "max_radius": 40 }, - { - "u_message": "Your vision flickers with black, blob-like creatures for a moment. An intense feeling of paranoia washes over you, as if the world itself is now out to kill you, the night itself reaching for your mind to rip it apart. Somethings wicked comes this way, and it wants you dead.", - "type": "bad", - "popup": true - } - ] - }, { "type": "effect_on_condition", "id": "DEFENSE_MODE_FORTRESS_TRAP", "//": "Keeps you from running away from your hideout.", - "global": true, - "recurrence": 100, + "recurrence": 10, "condition": { "or": [ { "u_near_om_location": "field", "range": 0 }, @@ -447,57 +314,5 @@ { "u_message": "You can't leave your fortress behind!", "type": "bad", "popup": false }, { "u_teleport": { "global_val": "your_spawnpoint" } } ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_WIN_SCREEN", - "global": true, - "recurrence": 100, - "condition": { "math": [ "final_wave_defeated", "==", "1" ] }, - "effect": [ { "open_dialogue": { "topic": "TALK_DEFENSE_MODE_WIN" } } ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_QUEUE_WIN_SCREEN", - "effect": [ { "math": [ "final_wave_defeated", "=", "1" ] } ] - }, - { - "type": "effect_on_condition", - "id": "DEFENSE_MODE_RANDOM_EVENT", - "recurrence": [ "2 days", "4 days" ], - "//": "A general EOC for selecting a random event. Can and should be expanded.", - "condition": { "and": [ { "not": { "is_weather": "portal_storm" } }, { "x_in_y_chance": { "x": 7, "y": 10 } } ] }, - "effect": [ - { - "weighted_list_eocs": [ - [ "EOC_DEFENSE_MODE_RANDOM_NPC", { "const": 10 } ], - [ "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER", { "const": 6 } ], - [ "EOC_DEFENSE_MODE_BANDIT_ATTACK", { "const": 1 } ] - ] - } - ] - }, - { - "type": "effect_on_condition", - "id": "EOC_DEFENSE_MODE_RANDOM_NPC", - "effect": [ { "u_spawn_npc": "random_survivor", "outdoor_only": true, "real_count": 1, "min_radius": 15, "max_radius": 40 } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER", - "effect": [ - { - "u_spawn_npc": "random_survivor_nefarious", - "outdoor_only": true, - "real_count": 1, - "min_radius": 15, - "max_radius": 40 - } - ] - }, - { - "type": "effect_on_condition", - "id": "EOC_DEFENSE_MODE_BANDIT_ATTACK", - "effect": [ { "u_spawn_npc": "defense_mode_raider", "outdoor_only": true, "real_count": 5, "min_radius": 15, "max_radius": 25 } ] } ] diff --git a/data/Mainline_mods/Mods/MindOverMatter/recipes/power_improvements.json b/data/Mainline_mods/Mods/MindOverMatter/recipes/power_improvements.json index 0d900c9cd..392cccb57 100644 --- a/data/Mainline_mods/Mods/MindOverMatter/recipes/power_improvements.json +++ b/data/Mainline_mods/Mods/MindOverMatter/recipes/power_improvements.json @@ -4,7 +4,7 @@ "activity_level": "LIGHT_EXERCISE", "name": "contemplation: lifting field", "id": "improve_telekinesis_lifting_field", - "description": "WARNING: DO NOT USE IF YOUR LIFTING FIELD CONTAINS ANYTHING.\n\nContemplate your powers and update your ability to carry objects for long periods of time to a level commensurate with your overall telekinetic mastery.\n\nWARNING: DO NOT USE IF YOUR LIFTING FIELD CONTAINS ANYTHING.", + "description": "WARNING: DO NOT USE IF YOUR LIFTING FIELD CONTAINS ANYTHING.\n\nContemplate your powers and improve your ability to carry objects for long periods of time.\n\nWARNING: DO NOT USE IF YOUR LIFTING FIELD CONTAINS ANYTHING.", "category": "CC_PSIONIC", "subcategory": "CSC_PSIONIC_OTHER", "skill_used": "metaphysics", diff --git a/data/Mainline_mods/Mods/No_Hope/Mapgen/nested/basement_nested.json b/data/Mainline_mods/Mods/No_Hope/Mapgen/nested/basement_nested.json index c4221d619..25ff4b646 100644 --- a/data/Mainline_mods/Mods/No_Hope/Mapgen/nested/basement_nested.json +++ b/data/Mainline_mods/Mods/No_Hope/Mapgen/nested/basement_nested.json @@ -106,11 +106,7 @@ "type": "palette", "id": "basement_utility_nest_palette", "terrain": { " ": "t_null", ".": "t_thconc_floor", "g": "t_thconc_floor", "f": "t_thconc_floor" }, - "furniture": { - "g": [ "f_water_heater", "f_water_heater_family" ], - "f": "f_home_furnace", - "a": [ "f_air_conditioner", "f_null", "f_counter" ] - }, + "furniture": { "g": "f_water_heater", "f": "f_home_furnace", "a": [ "f_air_conditioner", "f_null", "f_counter" ] }, "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } } }, { diff --git a/data/Mainline_mods/Mods/No_Hope/Mapgen/s_hunting.json b/data/Mainline_mods/Mods/No_Hope/Mapgen/s_hunting.json index a80682da1..7eacbf371 100644 --- a/data/Mainline_mods/Mods/No_Hope/Mapgen/s_hunting.json +++ b/data/Mainline_mods/Mods/No_Hope/Mapgen/s_hunting.json @@ -88,7 +88,7 @@ { "group": "guns_rifle_common", "x": 2, "y": 13, "chance": 20 }, { "group": "guns_shotgun_common", "x": 2, "y": 14, "chance": 20 }, { "group": "SUS_hunting_archery", "x": 2, "y": 15, "chance": 20 }, - { "group": "archery_ammo", "x": 2, "y": 16, "chance": 20 }, + { "group": "lodge_archery_ammo", "x": 2, "y": 16, "chance": 20 }, { "group": "archery_mods", "x": 2, "y": 17, "chance": 20 }, { "group": "gun_cases", "x": [ 3, 9 ], "y": 6, "chance": 20 }, { "group": "clothing_hunting", "x": [ 3, 9 ], "y": [ 8, 9 ], "chance": 20 }, diff --git a/data/Mainline_mods/Mods/innawood/overmap/overmap_mutable/stream_mutable.json b/data/Mainline_mods/Mods/innawood/overmap/overmap_mutable/stream_mutable.json index fa70d7970..0c415c76f 100644 --- a/data/Mainline_mods/Mods/innawood/overmap/overmap_mutable/stream_mutable.json +++ b/data/Mainline_mods/Mods/innawood/overmap/overmap_mutable/stream_mutable.json @@ -23,7 +23,7 @@ "stream_end_bend_wn": { "overmap": "stream_end_north", "south": "stream_to_east" }, "stream_end_bend_ws": { "overmap": "stream_end_south", "north": "stream_to_east" } }, - "root": "stream_end_n", + "root": "stream_body", "phases": [ [ { "overmap": "stream_body", "weight": 100 }, diff --git a/data/Maintained_mods/mods/Nocts_cata_mod/README_DDA.md b/data/Maintained_mods/mods/Nocts_cata_mod/README_DDA.md index 7b70bc364..a9f4e4966 100644 --- a/data/Maintained_mods/mods/Nocts_cata_mod/README_DDA.md +++ b/data/Maintained_mods/mods/Nocts_cata_mod/README_DDA.md @@ -1,23 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Expansion mod for Cataclysm, Dark Days Ahead version](#expansion-mod-for-cataclysm-dark-days-ahead-version) - - [Special Thanks](#special-thanks) - - [Frequently Asked Questions](#frequently-asked-questions) - - ["The zombie super scout (insert event where it killed your char)!"](#the-zombie-super-scout-insert-event-where-it-killed-your-char) - - [Why do you have books that level you up from 0-10? Isn't that a bit broken?](#why-do-you-have-books-that-level-you-up-from-0-10-isnt-that-a-bit-broken) - - [Here is my github for this project](#here-is-my-github-for-this-project) - - [Contributing](#contributing) - - [Suggestions](#suggestions) - - [Reporting bugs](#reporting-bugs) - - [Modifying the code](#modifying-the-code) - - [Github Rules](#github-rules) -- [Warning: Spoilers Ahead!](#warning-spoilers-ahead) - - [To do](#to-do) - - - # Expansion mod for Cataclysm, Dark Days Ahead version The version of this mod in this folder is is for Cataclysm: Dark Days Ahead. Copy the folder containing this content into data/mods if you are using that version of Cataclysm. Use the other folder, nocts_cata_mod_BN if you are playing with Cataclysm: Bright Nights. diff --git a/data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Generic/Generic.json b/data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Generic/Generic.json index 75c8c80a1..c7021cc95 100644 --- a/data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Generic/Generic.json +++ b/data/Unleash_The_Mods/Working_mods/Advanced_Gear_Technologies/Items/Generic/Generic.json @@ -12,7 +12,6 @@ "volume": "450 L", "melee_damage": { "bash": 8 }, "to_hit": -9, - "melee_damage": { "cut": 0 }, "material": [ "qt_steel" ], "pocket_data": [ { diff --git a/data/Unleash_The_Mods/Working_mods/Useful_Helicopters/README.md b/data/Unleash_The_Mods/Working_mods/Useful_Helicopters/README.md index 270b16416..152fab4bd 100644 --- a/data/Unleash_The_Mods/Working_mods/Useful_Helicopters/README.md +++ b/data/Unleash_The_Mods/Working_mods/Useful_Helicopters/README.md @@ -1,11 +1,3 @@ - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [useful_helicopters](#useful_helicopters) - - - # useful_helicopters A Cataclysm DDA mod that rebalances helicopters to make them more practical. Has recently undergone a complete overhaul to make it compatible with 0.F and address issues with the initial (extremely hacky) release. The goal of this mod is to make helicopters actually factor into gameplay in an authentic and fun way. This is not a "realism" mod, but it is also not designed to (intentionally) enable giant flying bases. Note: NOT compatible with Bright Nights. NOT compatible with 0.E Stable. Designed for the upcoming 0.F stable release and working with the current 0.F experimental.