Skip to content

Commit

Permalink
[Experimental] Pr routine updates 7 (#195)
Browse files Browse the repository at this point in the history 
* split up reuirments and havest json

* Create Tree.json

* update terrain

* remove json

* Update Cooking_components.json

* remove dup

* Create fruit.json

* Create Irradiated_fruit.json

* Update Seeds.json

* Update Item_groups.json

* add irradiated_crowberries

* add drinks for fruit

* Update Primitive-readme.md

* add drink recipes

* add seed recipes

* [Github] Update TOC

* rename folders

* TCW_Box - update

* Throwing - update

* Update gun.json

* Tekitoumap - update

* Tekitoumap - update

* Threshold - update

* Throwing - update

* Toki_silly_classes - update

* Vermilion_Mod - update

* Warhammer_40K - update

* Wastelands_Mod - update

* Wandering_Masters - update

* wastelands mod - update

* Whaleys_Collectibles - update

* Window_door_frame - update

* move broken mods

* Xenos_sas4_weapons_pack - update

* Nocts_cata_mod - update

* Move broken mod

* Advanced_Gear_Technologies - update

* Zets_CDDA_Mod - update

* Advanced_Gear_Technologies - update

* Shard_stuff - update

* Zets_Hair_More_Locations - update

* Nocts_cata_mod - lint

* mainline mods update

* CRT_EXPANSION - update

* hard steel into qt_steel

* More_Armor - update

* More_Military - update

* brand cereal mod - update

* Brand_Cereal_mod - update

* Goats_Tow_mod - update

* Tool_hanger - update

* Blazemod - update

* Nonperishable_Overhaul - update

* Engineering_Essentials - update

* primitive survival - rearrange ammo

* primitive mod - update

* Update Bundles.json

* add targeted mutations to broken mods

* gods guns - update

* melee damage update

* bio_mod - update

* bio_mod - update

* tank - update

* rename and lint targeted mutations

* gods_gun_mod - update

* mutation_changes - update

* SD_Winterclothes - update

* Update modinfo.json

* ZSFixed_CDDAXP - update

* move broken mod

* update mainline mods

* move broken mod

* Advanced_Gear_Technologies - update

* Armor_Up_PA_Utilities - update

* agent_bandits - update

* Anti_fungicidal_equipment - update

* Artyom_Emporium - update

* move working mods

* add new mod useful helicopters

* move broken mod become batman

* move working mods

* Cannala - update

* CBM_Arms - update

* Community_Aftershock - update

* Creative_mode - update

* Custom_Bandit_King_Start - update

* broken mod

* move working mods

* Bootleg_Walkers - update

* Modular_Turrets_Remake - update

* Crazy_pets - update

* move broken mod

* Denjin_Makai - update

* move to working mods

* Egg_Eggplant_Plant_Combo_Seed - update

* EvilMoose - update

* move working mods

* Gourmands_Graces - update

* Gel_Walls - update

* Growable_pots - update

* Gun_Cotton - update

* move working mods

* Kingsman - update

* Large_Capacity_Storage_CBMs - update

* Bionic_Space_Expander - update

* move working mods

* Bionic_Space_Expander - update

* move broken mod

* move broken mod

* move broken mod

* Mad_Cyber_Science - update

* Maddre_Mod - update

* metal_elemental - update

* Misc_Gear - update

* MoDK - update

* Modular_Turrets_no_blacklist - update

* More_crops - update

* Mutant_Animals - update

* Maddre_Mod - update

* Material_Plants - update

* Mo_Insects - update

* Mo_Monsters - update

* Modern_Weapons_Pack_Expanded update

* More_Armor - update

* More_Makeshift_Stuff - update

* Mutamans_stuff - update

* Mutant_Animals - update

* Mutant_Insects - update

* mycus - update

* move working mods

* OSRS - update

* Nimian_Manufacture - update

* NBC_Items_Pack - update

* OP_Pack - update

* move broken mod

* BELTED and armor data update

* OSRS - update

* Nimian_Manufacture - update

* Odds_N_Ends - update

* OP_Pack - update

* move working mods

* Pistol_Crossbow - update

* pixels_fuckery - update

* Pneumatic_fun - update

* Power_Armor_Additons - update

* PoraComp - update

* PoraComp - update

* Project_Kawaii - update

* update mainline mods

* move broken mods

* mvoe working mods

* move working mod

* move broken mod

* Realistic_Fridge_Size - update

* Reapermod - update

* Reds_Odd_Additions - update

* move broken mods

* move working mods

* Sarcophagi_Access - update

* Scaly_duds - update

* Sci_Turret - update

* Secronom - update

* Seuz_DIYpistols - update

* Sierra_Madre_mod - update

* Standalone_Salvaged_Robots - update

* Survivors_Lost_item - update

* move working mods

* tamebugs - update

* TCW_Box - update

* move working mods

* move broken mod

* Uekibati_mod - update

* Vermilion_Mod - update

* Warhammer_40K - updatae

* move woring mods

* move working mods

* turn obsolete true to false

* Blazemod - update

* BlazeIndustries - update

* CRT_EXPANSION - update

* Airdrops_and_Alchemy - update

* Armor_Up_PA_Utilities - update

* Armor_Up_Survivor_Expansion - update

* ETC_handguns_etc - update

* makeshift_canteen - update

* More_Military - update

* lint

* lint

* Update vehicle_part.json

* Update tows.json

* primitive mod update

* Update vehicle_parts.json

* Tow mod update

* tool hanger update

* Update More_tools.json

* gods gun mods update

* update mainline mods and move old mods to legacy

* merge master into pr 7

---------

Co-authored-by: TheGoatGod <[email protected]>
  • Loading branch information
@TheGoatGod
TheGoatGod and TheGoatGod authored Jan 9, 2024
1 parent 170fa8b commit 82866dd
Show file tree
Hide file tree
Showing 2,425 changed files with 143,164 additions and 22,696 deletions.
3 changes: 0 additions & 3 deletions data/Goats_mods/Goats_Tow_mod/items/generic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"color": "light_blue",
"symbol": "&",
"material": [ "steel", "plastic" ],
"bashing": 6,
"to_hit": -1,
"price": "0 cent",
"price_postapoc": "0 cent"
Expand All @@ -41,7 +40,6 @@
"color": "light_blue",
"symbol": "&",
"material": [ "steel", "plastic" ],
"bashing": 6,
"to_hit": -1,
"price": "0 cent",
"price_postapoc": "0 cent"
Expand All @@ -56,7 +54,6 @@
"color": "light_blue",
"symbol": "&",
"material": [ "steel", "plastic" ],
"bashing": 6,
"to_hit": -1,
"price": "0 cent",
"price_postapoc": "0 cent"
Expand Down
6 changes: 2 additions & 4 deletions data/Goats_mods/Goats_Tow_mod/items/tows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
"material": [ "steel", "plastic" ],
"volume": "2100 ml",
"weight": "295 g",
"bashing": 6,
"category": "tools",
"price": "80 cent",
"price_postapoc": "5 USD",
"max_charges": 6,
"initial_charges": 6,
"use_action": [ "TOW_ATTACH" ],
"use_action": { "type": "link_up", "is_cable_item": true, "cable_length": 6, "targets": [ "no_link", "vehicle_tow" ] },
"qualities": [ [ "ROPE", 2 ] ],
"flags": [ "CABLE_SPOOL", "TOW_CABLE" ]
},
Expand All @@ -31,13 +30,12 @@
"material": [ "steel", "plastic" ],
"volume": "2300 ml",
"weight": "780 g",
"bashing": 6,
"category": "tools",
"price": "80 cent",
"price_postapoc": "5 USD",
"max_charges": 6,
"initial_charges": 6,
"use_action": [ "TOW_ATTACH" ],
"use_action": { "type": "link_up", "is_cable_item": true, "cable_length": 6, "targets": [ "no_link", "vehicle_tow" ] },
"qualities": [ [ "ROPE", 2 ] ],
"flags": [ "CABLE_SPOOL", "TOW_CABLE" ]
},
Expand Down
20 changes: 9 additions & 11 deletions data/Goats_mods/Goats_Tow_mod/items/vehicle_parts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,40 @@
"id": "rope_tow",
"type": "vehicle_part",
"name": { "str": "lightweight tow rope" },
"symbol": "{",
"categories": [ "other" ],
"color": "light_blue",
"broken_symbol": "*",
"broken_color": "dark_gray",
"damage_modifier": 10,
"durability": 80,
"description": "A lightweights tow rope, if the other end was attached to a vehicle, it could pull it.",
"item": "rope_tow",
"requirements": { "removal": { "time": 0 } },
"flags": [ "NOINSTALL", "UNMOUNT_ON_DAMAGE", "TOW_CABLE" ],
"breaks_into": [ { "item": "broken_rope_tow", "count": 2 } ]
"requirements": { "removal": { "time": "5 s" } },
"flags": [ "UNMOUNT_ON_DAMAGE", "TOW_CABLE" ],
"breaks_into": [ { "item": "broken_rope_tow", "count": 2 } ],
"variants": [ { "symbols": "{", "symbols_broken": "*" } ]
},
{
"id": "belt_tow",
"type": "vehicle_part",
"name": { "str": "heavy duty tow belt" },
"symbol": "{",
"categories": [ "other" ],
"color": "light_blue",
"broken_symbol": "*",
"broken_color": "dark_gray",
"damage_modifier": 10,
"durability": 100,
"description": "A Heavy duty tow belt, if the other end was attached to a vehicle, it could pull it.",
"item": "belt_tow",
"requirements": { "removal": { "time": 0 } },
"flags": [ "NOINSTALL", "UNMOUNT_ON_DAMAGE", "TOW_CABLE" ],
"breaks_into": [ { "item": "broken_belt_tow", "count": 2 } ]
"requirements": { "removal": { "time": "5 s" } },
"flags": [ "UNMOUNT_ON_DAMAGE", "TOW_CABLE" ],
"breaks_into": [ { "item": "broken_belt_tow", "count": 2 } ],
"variants": [ { "symbols": "{", "symbols_broken": "*" } ]
},
{
"id": "hd_tow_cable",
"type": "vehicle_part",
"copy-from": "hd_tow_cable",
"name": { "str": "heavy duty tow cable" },
"breaks_into": [ { "item": "broken_hd_tow_cable", "count": 2 } ],
"requirements": { "removal": { "time": 0 } }
"requirements": { "removal": { "time": "5 s" } }
}
]
1 change: 0 additions & 1 deletion data/Goats_mods/Gods_Gun_Mod/gods_gunmods.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"price_postapoc": 500,
"install_time": "40 m",
"to_hit": 1,
"bashing": 6,
"material": [ "plastic", "steel" ],
"symbol": ":",
"color": "dark_gray",
Expand Down
3 changes: 1 addition & 2 deletions data/Goats_mods/Gods_Gun_Mod/gods_guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"price": 1483300,
"price_postapoc": 0,
"to_hit": -1,
"bashing": 12,
"material": [ "steel" ],
"ammo": [ "god" ],
"range": 65,
Expand Down Expand Up @@ -49,7 +48,7 @@
"volume": "750 ml",
"longest_side": "75 cm",
"price_postapoc": 500,
"bashing": 6,
"melee_damage": { "bash": 6 },
"armor_data": {
"armor": [
{
Expand Down
3 changes: 0 additions & 3 deletions data/Goats_mods/Gods_Gun_Mod/weapons.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"price": 12000,
"price_postapoc": 500,
"to_hit": 1,
"bashing": 30,
"cutting": 80,
"material": [ "wood", "iron" ],
"symbol": "/",
"color": "brown",
Expand All @@ -30,7 +28,6 @@
"price": 700,
"price_postapoc": 100,
"to_hit": -1,
"bashing": 75,
"material": [ "steel", "wood" ],
"symbol": ";",
"color": "brown",
Expand Down
9 changes: 0 additions & 9 deletions data/Goats_mods/More_tools/More_tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"volume": "0374 ml",
"price": "30 USD",
"to_hit": -2,
"cutting": 1,
"material": [ "steel", "plastic" ],
"symbol": ";",
"color": "brown",
Expand All @@ -24,7 +23,6 @@
"volume": "2 L",
"price": "30 USD",
"to_hit": -2,
"cutting": 1,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "brown",
Expand All @@ -40,7 +38,6 @@
"volume": "500 ml",
"price": "7 USD",
"to_hit": 1,
"bashing": 9,
"material": [ "steel", "plastic" ],
"symbol": ";",
"color": "brown",
Expand All @@ -58,8 +55,6 @@
"volume": "40 ml",
"price": "0 cent",
"to_hit": 2,
"bashing": 2,
"cutting": 6,
"material": [ "steel", "plastic" ],
"symbol": "-",
"color": "dark_gray",
Expand All @@ -78,8 +73,6 @@
"volume": "233 ml",
"price": "0 cent",
"to_hit": 2,
"bashing": 10,
"cutting": 1,
"material": [ "steel" ],
"symbol": "-",
"color": "dark_gray",
Expand All @@ -98,8 +91,6 @@
"volume": "1350 ml",
"price": "0 cent",
"to_hit": 2,
"bashing": 12,
"cutting": 1,
"material": [ "steel" ],
"symbol": "-",
"color": "dark_gray",
Expand Down
16 changes: 8 additions & 8 deletions data/Goats_mods/Portable_Generator_mod/vehicle_parts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"fuel_type": "gasoline",
"m2c": 60,
"//": "30% energy efficiency",
"symbol": "*",
"color": "yellow",
"broken_color": "red",
"damage_modifier": 80,
Expand All @@ -27,15 +26,15 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
},
"flags": [ "ENGINE", "E_COMBUSTION", "E_ALTERNATOR", "E_HIGHER_SKILL", "E_HEATER", "ENABLED_DRAINS_EPOWER" ]
"flags": [ "ENGINE", "E_COMBUSTION", "E_ALTERNATOR", "E_HIGHER_SKILL", "E_HEATER", "ENABLED_DRAINS_EPOWER" ],
"variants": [ { "symbols": "*", "symbols_broken": "*" } ]
},
{
"abstract": "generator_diesel_base",
"type": "vehicle_part",
"fuel_type": "diesel",
"fuel_options": [ "diesel", "biodiesel" ],
"m2c": 65,
"symbol": "*",
"color": "yellow",
"broken_color": "red",
"damage_modifier": 80,
Expand All @@ -57,15 +56,16 @@
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
},
"flags": [ "ENGINE", "E_COMBUSTION", "E_ALTERNATOR", "E_HIGHER_SKILL", "E_HEATER", "ENABLED_DRAINS_EPOWER" ]
"flags": [ "ENGINE", "E_COMBUSTION", "E_ALTERNATOR", "E_HIGHER_SKILL", "E_HEATER", "ENABLED_DRAINS_EPOWER" ],
"variants": [ { "symbols": "*", "symbols_broken": "*" } ]
},
{
"id": "generator_25l_gasoline",
"type": "vehicle_part",
"copy-from": "generator_gasoline_base",
"name": { "str": "generator gasoline (25L)" },
"item": "generator_25l_gasoline",
"power": 0,
"power": 250,
"epower": 17500
},
{
Expand All @@ -75,7 +75,7 @@
"fuel_type": "gasoline",
"name": { "str": "generator gasoline (10L)" },
"item": "generator_10l_gasoline",
"power": 0,
"power": 250,
"epower": 17500
},
{
Expand All @@ -84,7 +84,7 @@
"copy-from": "generator_diesel_base",
"name": { "str": "generator diesel (25L)" },
"item": "generator_25l_diesel",
"power": 0,
"power": 250,
"epower": 7500
},
{
Expand All @@ -93,7 +93,7 @@
"type": "vehicle_part",
"name": { "str": "generator diesel (10L)" },
"item": "generator_10l_diesel",
"power": 0,
"power": 250,
"epower": 12500
}
]
2 changes: 1 addition & 1 deletion data/Goats_mods/Primitive_Survival/Harvest/Fruit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
{
"id": "shrub_acaiberry_harv",
"type": "harvest",
"entries": [ { "drop": "Acaiberries", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
"entries": [ { "drop": "acaiberries", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
}
]
14 changes: 3 additions & 11 deletions data/Goats_mods/Primitive_Survival/Items/Ammo/Ammo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
"material": [ "wood" ],
"volume": "1 L",
"weight": "900 g",
"bashing": 2,
"cutting": 7,
"to_hit": 0,
"ammo_type": "atlatl_dart",
"casing": "atlatl_dart_crude",
Expand All @@ -33,8 +31,6 @@
"material": [ "wood", "steel" ],
"volume": "1 L",
"weight": "1000 g",
"bashing": 3,
"cutting": 10,
"to_hit": 0,
"ammo_type": "atlatl_dart",
"casing": "atlatl_dart",
Expand All @@ -56,8 +52,6 @@
"material": [ "wood" ],
"volume": "50 ml",
"weight": "10 g",
"bashing": 2,
"cutting": 7,
"to_hit": 0,
"ammo_type": "blowgun_dart",
"casing": "blowgun_dart_crude",
Expand All @@ -79,8 +73,6 @@
"material": [ "wood" ],
"volume": "50 ml",
"weight": "10 g",
"bashing": 3,
"cutting": 10,
"to_hit": 0,
"ammo_type": "blowgun_dart",
"casing": "blowgun_dart",
Expand Down Expand Up @@ -123,8 +115,8 @@
"ammo_type": "javelin",
"range": 13,
"damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 1 },
"relative": { "weight": 100, "cutting": 2 },
"proportional": { "price": 0.5, "bashing": 0.8 },
"relative": { "weight": 100 },
"proportional": { "price": 0.5 },
"thrown_damage": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 13 } ],
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
},
Expand Down Expand Up @@ -160,7 +152,7 @@
"ammo_type": "javelin",
"damage": { "damage_type": "stab", "amount": 14, "armor_penetration": 2 },
"relative": { "weight": 30 },
"proportional": { "price": 0.5, "cutting": 0.85 },
"proportional": { "price": 0.5 },
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 14 } ],
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
},
Expand Down
1 change: 0 additions & 1 deletion data/Goats_mods/Primitive_Survival/Items/Chemicals_and_resources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"material": [ "stone" ],
"volume": "250 ml",
"weight": "14 g",
"bashing": 1,
"ammo_type": "components",
"count": 50
},
Expand Down
4 changes: 0 additions & 4 deletions data/Goats_mods/Primitive_Survival/Items/Comestibles/Food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"weight": "5480 g",
"volume": "20 L",
"price": 2500,
"bashing": 4,
"material": [ "clay" ],
"symbol": ")",
"color": "brown",
Expand All @@ -36,7 +35,6 @@
"weight": "5480 g",
"volume": "20 L",
"price": 2500,
"bashing": 4,
"material": [ "clay" ],
"symbol": ")",
"color": "brown",
Expand All @@ -52,7 +50,6 @@
"weight": "5480 g",
"volume": "20 L",
"price": 2500,
"bashing": 1,
"material": [ "clay" ],
"symbol": ")",
"color": "brown"
Expand All @@ -66,7 +63,6 @@
"weight": "5480 g",
"volume": "20 L",
"price": 2500,
"bashing": 1,
"material": [ "clay" ],
"symbol": ")",
"color": "brown"
Expand Down
8 changes: 4 additions & 4 deletions data/Goats_mods/Primitive_Survival/Items/Comestibles/Irradiated_fruit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
},
{
"type": "COMESTIBLE",
"id": "irradiated_Acaiberries",
"copy-from": "Acaiberries",
"name": { "str": "irradiated Acaiberry", "str_pl": "irradiated Acaiberries" },
"description": "An irradiated Acaiberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"id": "irradiated_acaiberries",
"copy-from": "acaiberries",
"name": { "str": "irradiated acaiberry", "str_pl": "irradiated acaiberries" },
"description": "An irradiated acaiberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
"proportional": { "price": 2.0 },
"spoils_in": "0 hours",
"container": "bag_plastic"
Expand Down
2 changes: 1 addition & 1 deletion data/Goats_mods/Primitive_Survival/Items/Comestibles/Seeds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"type": "COMESTIBLE",
"name": { "str_sp": "Acaiberry seeds" },
"description": "Some Acaiberry seeds.",
"seed_data": { "plant_name": "Acaiberry", "fruit": "Acaiberries", "byproducts": [ "withered" ], "grow": "91 days" }
"seed_data": { "plant_name": "acaiberry", "fruit": "acaiberries", "byproducts": [ "withered" ], "grow": "91 days" }
},
{
"type": "COMESTIBLE",
Expand Down
Loading

0 comments on commit 82866dd

Please sign in to comment.