Skip to content

Commit

Permalink
Set aside 0.F-3 release to properly update it
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt committed May 9, 2022
1 parent d03d710 commit a996ca9
Show file tree
Hide file tree
Showing 49 changed files with 218 additions and 4,570 deletions.
24 changes: 24 additions & 0 deletions MST_Extra/furniture_and_terrain/furniture.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,30 @@
"items": [ { "item": "2x4", "count": [ 0, 2 ] }, { "item": "splinter", "count": 1 } ]
}
},
{
"type": "furniture",
"id": "f_hobo_stove_placed",
"looks_like": "hobo_stove",
"name": "placed hobo stove",
"description": "A small improvised wood stove, placed on the ground. It can only burn small amounts of wood at a time, but it will keep a fire safe from wind and rain.",
"symbol": "#",
"color": "red",
"move_cost_mod": -1,
"coverage": 15,
"required_str": 1,
"//": "INDOORS and BLOCK_WIND are used to ensure it doesn't go out. Doesn't let you move onto it to prevent exploiting that.",
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT", "INDOORS", "BLOCK_WIND" ],
"deployed_item": "hobo_stove",
"examine_action": "fireplace",
"max_volume": "1 L",
"bash": {
"str_min": 4,
"str_max": 10,
"sound": "clatter!",
"sound_fail": "clang!",
"items": [ { "item": "hobo_stove", "count": 1 } ]
}
},
{
"type": "furniture",
"id": "f_hobo_stove_clay_placed",
Expand Down
70 changes: 13 additions & 57 deletions MST_Extra/item_groups.json
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,67 @@
[
{
"id": "medieval",
"copy-from": "medieval",
"type": "item_group",
"extend": { "items": [ [ "crossbow_makeshift", 1 ] ] }
"items": [ [ "crossbow_makeshift", 1 ] ]
},
{
"id": "survivorzed_extra",
"copy-from": "survivorzed_extra",
"type": "item_group",
"extend": { "items": [ [ "hat_hooded", 1 ] ] }
"items": [ [ "hat_hooded", 1 ] ]
},
{
"id": "tools_survival",
"copy-from": "tools_survival",
"type": "item_group",
"extend": { "items": [ [ "hobo_stove", 3 ], [ "tinder", 3 ], [ "canteen_wood", 2 ] ] }
"items": [ [ "hobo_stove", 3 ], [ "tinder", 3 ], [ "canteen_wood", 2 ] ]
},
{
"id": "museum_primitive",
"copy-from": "museum_primitive",
"type": "item_group",
"extend": {
"items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ]
}
"items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ]
},
{
"id": "hive",
"copy-from": "hive",
"type": "item_group",
"extend": { "items": [ [ "beehive_empty", 1 ] ] }
"items": [ [ "beehive_empty", 1 ] ]
},
{
"id": "museum_misc",
"copy-from": "museum_misc",
"type": "item_group",
"extend": { "items": [ [ "jar_clay", 20 ], [ "oil_lamp_clay", 20 ], [ "tinderbox_clay", 5 ], [ "hobo_stove_clay", 10 ] ] }
"items": [ [ "jar_clay", 20 ], [ "oil_lamp_clay", 20 ], [ "tinderbox_clay", 5 ], [ "hobo_stove_clay", 10 ] ]
},
{
"id": "antique",
"copy-from": "antique",
"type": "item_group",
"extend": { "items": [ [ "oil_lamp_clay", 10 ] ] }
"items": [ [ "oil_lamp_clay", 10 ] ]
},
{
"id": "church",
"copy-from": "church",
"type": "item_group",
"extend": { "items": [ [ "oil_lamp_clay", 20 ] ] }
"items": [ [ "oil_lamp_clay", 20 ] ]
},
{
"id": "reading_lights",
"copy-from": "reading_lights",
"type": "item_group",
"extend": { "items": [ [ "oil_lamp_clay", 20 ] ] }
"items": [ [ "oil_lamp_clay", 20 ] ]
},
{
"id": "kitchen",
"copy-from": "kitchen",
"type": "item_group",
"ammo": 75,
"magazine": 100,
"subtype": "distribution",
"extend": {
"entries": [
{ "item": "bread_garlic", "prob": 7 },
{ "item": "potted_meat", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
]
}
"items": [ [ "bread_garlic", 7 ] ]
},
{
"id": "groce_bread",
"copy-from": "groce_bread",
"type": "item_group",
"extend": { "items": [ [ "bread_garlic", 20 ] ] }
"items": [ [ "bread_garlic", 20 ] ]
},
{
"id": "restaur_kitchen",
"copy-from": "restaur_kitchen",
"type": "item_group",
"extend": { "items": [ [ "bread_garlic", 14 ] ] }
"items": [ [ "bread_garlic", 14 ] ]
},
{
"id": "vet_utility",
"copy-from": "vet_utility",
"type": "item_group",
"extend": { "items": [ [ "jerky_offal", 20 ] ] }
},
{
"type": "item_group",
"id": "preserved_food",
"copy-from": "preserved_food",
"subtype": "distribution",
"extend": { "entries": [ { "item": "potted_meat", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" } ] }
},
{
"type": "item_group",
"id": "foodintincan",
"copy-from": "foodintincan",
"subtype": "distribution",
"extend": { "entries": [ { "item": "potted_meat", "prob": 1 } ] }
},
{
"type": "item_group",
"id": "cannedfood",
"copy-from": "cannedfood",
"subtype": "distribution",
"extend": { "entries": [ { "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" } ] }
"items": [ [ "jerky_offal", 20 ] ]
}
]
70 changes: 32 additions & 38 deletions MST_Extra/items/armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "arm_l", "arm_r" ],
"coverage": 50,
"encumbrance": 5,
"warmth": 15,
"material_thickness": 1,
"flags": [ "OVERSIZE" ],
"armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "arm_l", "arm_r" ] } ]
"flags": [ "OVERSIZE" ]
},
{
"id": "armwrap_fur",
Expand All @@ -26,10 +28,12 @@
"material": [ "fur" ],
"symbol": "[",
"color": "brown",
"covers": [ "arm_l", "arm_r" ],
"coverage": 50,
"encumbrance": 5,
"warmth": 20,
"material_thickness": 1,
"flags": [ "OVERSIZE" ],
"armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "arm_l", "arm_r" ] } ]
"flags": [ "OVERSIZE" ]
},
{
"id": "legwrap_leather",
Expand All @@ -42,10 +46,12 @@
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "leg_l", "leg_r" ],
"coverage": 50,
"encumbrance": 5,
"warmth": 15,
"material_thickness": 1,
"flags": [ "OVERSIZE" ],
"armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "leg_l", "leg_r" ] } ]
"flags": [ "OVERSIZE" ]
},
{
"id": "legwrap_fur",
Expand All @@ -58,10 +64,12 @@
"material": [ "fur" ],
"symbol": "[",
"color": "brown",
"covers": [ "leg_l", "leg_r" ],
"coverage": 50,
"encumbrance": 5,
"warmth": 20,
"material_thickness": 1,
"flags": [ "OVERSIZE" ],
"armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "leg_l", "leg_r" ] } ]
"flags": [ "OVERSIZE" ]
},
{
"id": "cloak_makeshift_sheet",
Expand All @@ -78,10 +86,12 @@
"looks_like": "sheet",
"repairs_like": "sheet",
"color": "white",
"covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
"coverage": 85,
"encumbrance": 10,
"warmth": 10,
"material_thickness": 1,
"flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ],
"armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
"flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ]
},
{
"id": "cloak_makeshift_blanket",
Expand All @@ -94,12 +104,11 @@
"price": 5500,
"looks_like": "blanket",
"repairs_like": "blanket",
"material": [ "cotton" ],
"color": "blue",
"encumbrance": 30,
"warmth": 50,
"material_thickness": 3,
"environmental_protection": 1,
"armor": [ { "encumbrance": 30, "coverage": 85, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
"environmental_protection": 1
},
{
"id": "cloak_makeshift_down_blanket",
Expand All @@ -111,14 +120,13 @@
"volume": "31 L",
"price": 5500,
"price_postapoc": 150,
"material": [ "cotton" ],
"looks_like": "down_blanket",
"repairs_like": "down_blanket",
"color": "blue",
"encumbrance": 40,
"warmth": 70,
"material_thickness": 3,
"environmental_protection": 1,
"armor": [ { "encumbrance": 40, "coverage": 85, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
"environmental_protection": 1
},
{
"id": "cloak_makeshift_fur_blanket",
Expand All @@ -134,10 +142,10 @@
"looks_like": "fur_blanket",
"repairs_like": "fur_blanket",
"color": "brown",
"encumbrance": 50,
"warmth": 80,
"material_thickness": 4,
"environmental_protection": 1,
"armor": [ { "encumbrance": 50, "coverage": 85, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
"environmental_protection": 1
},
{
"id": "quiver_atlatl",
Expand All @@ -147,16 +155,9 @@
"description": "A leather quiver worn at the waist, lengthened to hold atlatl darts. Activate to store up to 10 darts.",
"weight": "400 g",
"volume": "1 L",
"material": [ "leather" ],
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ],
"armor": [
{
"encumbrance": 5,
"coverage": 15,
"covers": [ "leg_l", "leg_r" ],
"specifically_covers": [ "leg_upper_l", "leg_upper_r" ]
}
]
"coverage": 15,
"encumbrance": 5,
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ]
},
{
"id": "quiver_birchbark_atlatl",
Expand All @@ -166,15 +167,8 @@
"description": "A quiver woven from strips of birch bark, worn at the waist, lengthened to hold atlatl darts. Activate to store up to 10 darts.",
"weight": "800 g",
"volume": "1 L",
"material": [ "wood" ],
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ],
"armor": [
{
"encumbrance": 15,
"coverage": 15,
"covers": [ "leg_l", "leg_r" ],
"specifically_covers": [ "leg_upper_l", "leg_upper_r" ]
}
]
"coverage": 15,
"encumbrance": 15,
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ]
}
]
21 changes: 0 additions & 21 deletions MST_Extra/items/comestibles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,26 +161,5 @@
"//": "Not millable as it requires a bit more drying to make into flour, and there may be technical issues if allowed to process less calorie-dense material into flour.",
"flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
"vitamins": [ [ "vitC", 1 ], [ "vitA", 3 ] ]
},
{
"type": "COMESTIBLE",
"id": "potted_meat",
"copy-from": "pemmican",
"name": { "str_sp": "potted meat" },
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "potted person" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "potted freak" } }
],
"weight": "155 g",
"container": "can_medium",
"calories": 452,
"charges": 2,
"description": "Meat cooked and preserved in butter or melted fat, a form of food preservation from the days before canning. Also known as confit. Rich and fattening, it will last for a long time.",
"price": "12 USD",
"price_postapoc": "4 USD",
"material": [ "flesh" ],
"vitamins": [ [ "vitA", 7 ], [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 69 ], [ "vitB", 781 ] ],
"fun": 1,
"extend": { "flags": [ "EATEN_HOT" ] }
}
]
Loading

0 comments on commit a996ca9

Please sign in to comment.