diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/afs__items.json index fc64d6ada74e8..a63551b3b63a5 100644 --- a/data/mods/Aftershock/items/afs__items.json +++ b/data/mods/Aftershock/items/afs__items.json @@ -71,7 +71,7 @@ "type": "GENERIC", "id": "afs_scrap_titanium", "symbol": ",", - "color": "white", + "color": "light_gray", "name": "scrap titanium", "name_plural": "scrap titanium", "category": "spare_parts", @@ -79,8 +79,8 @@ "price": 1000, "material": "titanium", "looks_like": "scrap", - "weight": "100 g", - "volume": "250 ml", + "weight": "450 g", + "volume": "100 ml", "bashing": 1, "to_hit": -2 }, @@ -91,7 +91,7 @@ "description": "A sturdy, lightweight frame made from titanium. Useful for crafting.", "weight": "1 kg", "to_hit": -3, - "color": "white", + "color": "light_gray", "symbol": "]", "material": [ "titanium" ], "looks_like": "xlframe", @@ -191,5 +191,84 @@ "symbol": "H", "color": "light_cyan", "flags": [ "ALLOWS_REMOTE_USE" ] + }, + { + "id": "afs_titanium_small", + "type": "AMMO", + "category": "spare_parts", + "name": "titanium", + "name_plural": "titanium", + "description": "A strong, durable metal. Highly valued for its weight to strength ratio, it was an excellent upgrade to aluminium for those properties albeit a lot more expensive due to rarity. More commonly used in jewellery and medical implants.", + "weight": "1 g", + "//": "Density 4.506g/cm³ ~ 1.127kg/250ml @ stack 1000 = 1g/unit", + "volume": "50 ml", + "price": 10000, + "price_postapoc": 750, + "count": 100, + "stack_size": 200, + "material": [ "titanium" ], + "looks_like": "silver_small", + "symbol": "/", + "color": "light_gray", + "ammo_type": "components" + }, + { + "id": "afs_titanium_implant", + "type": "GENERIC", + "name": "titanium implant", + "description": "An internal implant to correct a musculoskeletal problem such as a bad hip or back. It is made of titanium due to its biocompatibility.", + "price": 9500, + "price_postapoc": 1500, + "weight": "2250 g", + "volume": "500 ml", + "to_hit": -3, + "symbol": "*", + "color": "light_gray", + "material": [ "titanium" ] + }, + { + "id": "afs_titanium_tooth", + "type": "GENERIC", + "name": "titanium tooth", + "description": "A dental implant made of pure titanium, used to replace teeth due to its bio-compatibility and durability.", + "price": 5000, + "price_postapoc": 50, + "weight": "10 g", + "to_hit": -3, + "symbol": "$", + "color": "light_gray", + "material": [ "titanium" ] + }, + { + "id": "afs_titanium_watch", + "type": "ARMOR", + "name": "titanium watch", + "name_plural": "titanium watches", + "description": "A thick, masculine watch made out of titanium. It is durable, light-weight and water-resistant, an excellent watch to have in a hostile environment.", + "weight": "50 g", + "volume": "250 ml", + "price": 20000, + "price_postapoc": 3000, + "to_hit": -1, + "material": [ "titanium" ], + "symbol": "[", + "color": "light_gray", + "covers": [ "HAND_EITHER" ], + "coverage": 5, + "flags": [ "WATCH", "STURDY", "BELTED", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ] + }, + { + "id": "afs_titanium_ring", + "type": "ARMOR", + "name": "titanium ring", + "description": "A thick, masculine ring made out of titanium. Made in a variety of styles and finishes, they're valued for their durability.", + "weight": "13 g", + "volume": 0, + "price": 700, + "price_postapoc": 500, + "material": [ "titanium" ], + "symbol": "[", + "color": "light_gray", + "flags": [ "STURDY" ] } ] diff --git a/data/mods/Aftershock/items/afs_harvest.json b/data/mods/Aftershock/items/afs_harvest.json new file mode 100644 index 0000000000000..1b3745a01eead --- /dev/null +++ b/data/mods/Aftershock/items/afs_harvest.json @@ -0,0 +1,18 @@ +[ + { + "id": "zombie", + "//": "your bog standard zombie", + "type": "harvest", + "entries": [ { "drop": "afs_titanium_implant", "type": "bionic", "flags": [ "FILTHY", "NO_STERILE" ], "max": 1 } ] + }, + { + "id": "CBM_CIV", + "type": "harvest", + "entries": [ { "drop": "afs_titanium_implant", "type": "bionic", "flags": [ "FILTHY", "NO_STERILE" ], "max": 1 } ] + }, + { + "id": "human", + "type": "harvest", + "entries": [ { "drop": "afs_titanium_implant", "type": "bionic", "flags": [ "FILTHY", "NO_STERILE" ], "max": 1 } ] + } +] diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/afs_item_groups.json index b3e60b7fac1dd..b18fd6cd6119d 100644 --- a/data/mods/Aftershock/items/afs_item_groups.json +++ b/data/mods/Aftershock/items/afs_item_groups.json @@ -77,5 +77,91 @@ [ "schematics_antimateriel", 20 ], [ "schematics_searchlight", 50 ] ] + }, + { + "id": "jewelry_accessories", + "type": "item_group", + "items": [ [ "afs_titanium_watch", 35 ], [ "afs_titanium_tooth", 35 ], [ "afs_titanium_ring", 35 ] ] + }, + { + "id": "rings_and_things", + "type": "item_group", + "items": [ [ "afs_titanium_watch", 35 ], [ "afs_titanium_ring", 35 ] ] + }, + { + "id": "jewelry_back", + "type": "item_group", + "items": [ [ "afs_titanium_watch", 35 ], [ "afs_titanium_ring", 35 ] ] + }, + { + "id": "jewelry_front", + "type": "item_group", + "items": [ [ "afs_titanium_watch", 35 ], [ "afs_titanium_ring", 35 ] ] + }, + { + "id": "weapons", + "type": "item_group", + "items": [ [ "afs_titanium_bat", 40 ] ] + }, + { + "id": "allsporting", + "type": "item_group", + "items": [ [ "afs_titanium_bat", 40 ] ] + }, + { + "id": "sports", + "type": "item_group", + "items": [ [ "afs_titanium_bat", 40 ] ] + }, + { + "id": "college_sports", + "type": "item_group", + "items": [ [ "afs_titanium_bat", 60 ] ] + }, + { + "id": "supplies_mechanics", + "type": "item_group", + "items": [ [ "afs_titanium_frame", 5 ] ] + }, + { + "id": "bikeshop_tools", + "type": "item_group", + "items": [ [ "afs_titanium_frame", 5 ] ] + }, + { + "type": "item_group", + "id": "steel_mill_foundry", + "items": [ [ "afs_titanium_small", 5 ], { "item": "afs_scrap_titanium", "prob": 5, "count": [ 1, 4 ] } ] + }, + { + "id": "oa_ig_rd_metal_trash", + "type": "item_group", + "items": [ [ "afs_titanium_frame", 5 ], { "item": "afs_scrap_titanium", "prob": 10, "count": [ 2, 8 ] } ] + }, + { + "id": "supplies_metal", + "type": "item_group", + "items": [ + { "item": "afs_titanium_frame", "prob": 5 }, + { "item": "afs_scrap_titanium", "prob": 5, "count": [ 2, 8 ] }, + [ "afs_titanium_small", 5 ] + ] + }, + { + "id": "clothing_watch", + "type": "item_group", + "items": [ { "item": "afs_titanium_watch", "prob": 50 } ] + }, + { + "id": "accessory_ring", + "type": "item_group", + "subtype": "distribution", + "items": [ { "item": "afs_titanium_ring", "prob": 50 } ] + }, + { + "id": "accessory_teeth", + "type": "item_group", + "subtype": "distribution", + "items": [ [ "afs_titanium_tooth", 25 ] ] } ] diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/afs_weapons.json index b673630519afc..0184c59c18e37 100644 --- a/data/mods/Aftershock/items/afs_weapons.json +++ b/data/mods/Aftershock/items/afs_weapons.json @@ -209,5 +209,22 @@ "durability": 9, "clip_size": 1, "loudness": 300 + }, + { + "type": "GENERIC", + "id": "afs_titanium_bat", + "name": "titanium bat", + "description": "A luxury baseball bat made out of titanium that was banned from competitive sport due to the increased performance that put defenders at risk.", + "weight": "680 g", + "to_hit": 3, + "color": "light_gray", + "symbol": "/", + "material": [ "titanium" ], + "looks_like": "bat_metal", + "techniques": [ "WBLOCK_1" ], + "flags": [ "DURABLE_MELEE" ], + "volume": "1750 ml", + "bashing": 22, + "price": 20000 } ] diff --git a/data/mods/Aftershock/recipes/afs__recipes.json b/data/mods/Aftershock/recipes/afs__recipes.json index a41cb50105c91..b7be85086e213 100644 --- a/data/mods/Aftershock/recipes/afs__recipes.json +++ b/data/mods/Aftershock/recipes/afs__recipes.json @@ -236,7 +236,7 @@ "reversible": true, "autolearn": true, "using": [ [ "welding_standard", 6 ] ], - "components": [ [ [ "afs_scrap_titanium", 4 ] ] ] + "components": [ [ [ "afs_scrap_titanium", 2 ] ] ] }, { "result": "afs_metal_rig", @@ -534,5 +534,20 @@ [ [ "plut_cell", 4 ] ], [ [ "mil_plate", 2 ] ] ] + }, + { + "result": "afs_scrap_titanium", + "type": "recipe", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "fabrication", + "difficulty": 1, + "time": "15 m", + "batch_time_factors": [ 90, 4 ], + "reversible": true, + "autolearn": true, + "using": [ [ "forging_standard", 1 ] ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "afs_titanium_small", 400 ] ] ] } ] diff --git a/data/mods/Aftershock/recipes/afs_uncraft.json b/data/mods/Aftershock/recipes/afs_uncraft.json index bccb7d4dfca7e..8313b292058d3 100644 --- a/data/mods/Aftershock/recipes/afs_uncraft.json +++ b/data/mods/Aftershock/recipes/afs_uncraft.json @@ -3,9 +3,11 @@ "result": "golf_club", "//": "Google tells me that golf clubs often have titanium heads, so that's a source of it.", "type": "uncraft", - "time": 10000, + "skill_used": "fabrication", + "difficulty": 2, + "time": "30 m", "qualities": [ { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "material_aluminium_ingot", 2 ] ], [ [ "afs_scrap_titanium", 2 ] ] ] + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "afs_scrap_titanium", 1 ] ] ] }, { "result": "afs_atomic_smartphone", @@ -20,5 +22,53 @@ [ [ "lens_small", 1 ] ], [ [ "plut_cell", 1 ] ] ] + }, + { + "result": "afs_titanium_frame", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 4, + "time": "1 h", + "qualities": [ { "id": "SAW_M", "level": 1 } ], + "tools": [ [ [ "welder", 100 ], [ "toolset", 150 ] ] ], + "components": [ [ [ "afs_scrap_titanium", 2 ] ] ] + }, + { + "result": "afs_titanium_tooth", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "afs_titanium_small", 1 ] ] ] + }, + { + "result": "afs_titanium_watch", + "type": "uncraft", + "time": "36 s", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ], + "components": [ [ [ "afs_titanium_small", 20 ] ], [ [ "clockworks", 1 ] ] ] + }, + { + "result": "afs_titanium_ring", + "type": "uncraft", + "time": "30 s", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "afs_titanium_small", 2 ] ] ] + }, + { + "result": "afs_titanium_implant", + "type": "uncraft", + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "afs_scrap_titanium", 5 ] ] ] + }, + { + "result": "afs_titanium_bat", + "type": "uncraft", + "skill_used": "mechanics", + "difficulty": 3, + "time": "30 m", + "using": [ [ "welding_standard", 3 ] ], + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "components": [ [ [ "afs_scrap_titanium", 2 ] ] ] } ] diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_groups.json b/data/mods/Aftershock/vehicles/afs_vehicle_groups.json index 4531434c0bd39..e83e163fc5834 100644 --- a/data/mods/Aftershock/vehicles/afs_vehicle_groups.json +++ b/data/mods/Aftershock/vehicles/afs_vehicle_groups.json @@ -52,5 +52,10 @@ "id": "highway", "type": "vehicle_group", "vehicles": [ [ "car_atomic", 1500 ], [ "suv_atomic", 1500 ], [ "compact_atomic", 300 ] ] + }, + { + "type": "vehicle_group", + "id": "bikeshop", + "vehicles": [ [ "afs_sports_bike", 400 ] ] } ]