Skip to content

Commit

Permalink
Merge pull request #4 from CleverRaven/master
Browse files Browse the repository at this point in the history
Bring me up to speed
  • Loading branch information
Inglonias authored Nov 5, 2018
2 parents 098496f + bd9c3f4 commit 4741db3
Show file tree
Hide file tree
Showing 48 changed files with 2,551 additions and 1,182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Debug*/
*.user
*.vcxproj.filters
.vscode/
*.code-workspace

# Temporary and backup files
*~
Expand Down
6 changes: 3 additions & 3 deletions data/json/construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -2004,7 +2004,7 @@
"category" : "DIG",
"required_skills" : [ [ "fabrication", 5 ], [ "survival", 3 ] ],
"time" : 420,
"qualities": [ [ { "id": "AXE", "level": 2 } ],
"qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
[ { "id": "HAMMER", "level": 2 } ],
[ { "id": "DIG", "level": 2 } ]
],
Expand All @@ -2023,7 +2023,7 @@
"category" : "DIG",
"required_skills" : [ [ "fabrication", 6 ], [ "survival", 4 ] ],
"time" : 480,
"qualities": [ [ { "id": "AXE", "level": 2 } ],
"qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
[ { "id": "HAMMER", "level": 2 } ],
[ { "id": "DIG", "level": 2 } ]
],
Expand All @@ -2043,7 +2043,7 @@
"category" : "DIG",
"required_skills" : [ [ "fabrication", 6 ], [ "survival", 4 ] ],
"time" : 480,
"qualities": [ [ { "id": "AXE", "level": 2 } ],
"qualities": [ [ { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
[ { "id": "HAMMER", "level": 2 } ],
[ { "id": "DIG", "level": 2 } ]
],
Expand Down
8 changes: 8 additions & 0 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@
"type" : "item_action",
"id" : "CLEAR_RUBBLE",
"name" : "Clear rubble"
},{
"type" : "item_action",
"id" : "COIN_FLIP",
"name" : "Flip"
},{
"type" : "item_action",
"id" : "COKE",
Expand Down Expand Up @@ -443,6 +447,10 @@
"type" : "item_action",
"id" : "LADDER",
"name" : "Place"
},{
"type" : "item_action",
"id" : "MAGIC_8_BALL",
"name" : "Ask"
},{
"type" : "item_action",
"id" : "MARLOSS",
Expand Down
62 changes: 55 additions & 7 deletions data/json/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@
["hat_cotton", 45],
["hat_knit", 25],
["hat_fur", 15],
["hat_faux_fur", 30],
["hat_newsboy", 20],
["hat_sombrero", 3],
["helmet_bike", 35],
Expand Down Expand Up @@ -575,7 +576,18 @@
["scots_cookbook", 6],
["food_processor", 30 ],
["eclipse_glasses", 1],
["thermos", 15]
["thermos", 15],
{"item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "human_pickled", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"}
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -1773,7 +1785,18 @@
["lutefisk", 1],
["dry_beans", 40],
["dry_rice", 40],
{"item": "meat_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed"}
{"item": "meat_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed"},
{"item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "veggy_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "offal_canned", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "sauce_red", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"},
{"item": "kompot", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed"}
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -1937,6 +1960,7 @@
["magnifying_glass", 5],
["chem_chromium_oxide", 5],
["chem_thermite", 10],
["chem_zinc_powder", 10],
["denat_alcohol", 25],
["tourist_table", 1]
]
Expand Down Expand Up @@ -2804,6 +2828,7 @@
["hat_newsboy", 20],
["hat_knit", 25],
["hat_fur", 15],
["hat_faux_fur", 20],
["pants_ski", 60],
["long_underpants", 40],
["long_undertop", 40],
Expand All @@ -2817,21 +2842,27 @@
"type" : "item_group",
"id" : "fancyfurs",
"items":[
["hat_fur", 400],
["hat_fur", 300],
["hat_faux_fur", 300],
["sleeveless_trenchcoat_fur", 10],
["sleeveless_duster_fur", 10],
["sleeveless_trenchcoat_faux_fur", 10],
["coat_fur_sf", 100],
["coat_faux_fur", 300],
["coat_fur", 300],
["gloves_fur", 300],
["boots_fur", 200]
["boots_fur", 200],
["trenchcoat_faux_fur", 50],
["duster_faux_fur", 50],
["pants_faux_fur", 50]
]
},{
"type" : "item_group",
"id" : "hatstore_hats",
"items":[
["hat_cotton", 30],
["hat_knit", 40],
["hat_faux_fur", 30],
["hat_fur", 20],
["hat_newsboy", 20],
["hat_sombrero", 30],
Expand Down Expand Up @@ -3024,6 +3055,7 @@
["hat_newsboy", 20],
["hat_sombrero", 3],
["hat_fur", 15],
["hat_faux_fur", 20],
["UPS_off", 5],
["adv_UPS_off", 3],
["under_armor", 20],
Expand All @@ -3039,12 +3071,17 @@
["arm_warmers", 20],
["leg_warmers", 20],
["trenchcoat_leather", 12],
["trenchcoat_faux_fur", 6],
["sleeveless_trenchcoat", 2],
["sleeveless_trenchcoat_leather", 2],
["sleeveless_trenchcoat_faux_fur", 2],
["trenchcoat_leather", 12],
["sleeveless_trenchcoat_fur", 1],
["duster_leather", 12],
["duster_faux_fur", 6],
["sleeveless_duster", 2],
["sleeveless_duster_leather", 2],
["sleeveless_duster_faux_fur", 2],
["sleeveless_duster_fur", 1],
["cloak", 5],
["cloak_wool", 5],
Expand Down Expand Up @@ -3288,6 +3325,7 @@
[ "textbook_biodiesel", 4 ],
[ "textbook_fabrication", 4 ],
[ "textbook_tailor", 4 ],
[ "recipe_fauxfur", 6 ],
[ "carpentry_book", 4 ],
[ "brewing_cookbook", 4 ],
[ "computer_science", 8 ],
Expand Down Expand Up @@ -3396,6 +3434,7 @@
["textbook_gaswarfare", 5],
["recipe_bullets", 8],
["textbook_tailor", 12],
["recipe_fauxfur", 4],
["recipe_bows", 4],
["recipe_arrows", 4],
["textbook_firstaid", 8],
Expand Down Expand Up @@ -4346,7 +4385,9 @@
["katana", 2],
["rapier", 3],
["cavalry_sabre", 2],
["sf_watch", 5]
["sf_watch", 5],
["magic_8_ball", 1],
["coin_quarter", 1]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -4556,6 +4597,7 @@
["helmet_army", 40],
["helmet_liner", 10],
["hat_fur", 15],
["hat_faux_fur", 15],
["hat_newsboy", 20],
["hat_sombrero", 5],
["holster", 8],
Expand Down Expand Up @@ -4795,7 +4837,9 @@
["l-stick", 1],
["solarpack", 5],
["tourist_table", 10],
["thermos", 25]
["thermos", 25],
["magic_8_ball", 2],
["coin_quarter", 2]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -5172,6 +5216,7 @@
["charcoal", 15],
["chem_hydrogen_peroxide", 15],
["chem_carbide", 10],
["chem_zinc_powder", 10],
["denat_alcohol", 10]
]
},{
Expand Down Expand Up @@ -5225,6 +5270,7 @@
["chem_saltpetre", 15],
["chem_nitric_acid", 15],
["chem_chromium_oxide", 10],
["chem_zinc_powder", 10],
["denat_alcohol", 10]
]
},{
Expand Down Expand Up @@ -8519,7 +8565,9 @@
["straw_doll", 1],
["pitchfork", 1],
["straw_sandals", 1],
["holy_symbol", 10]
["holy_symbol", 10],
["magic_8_ball", 1],
["coin_quarter", 1]
]
},{
"type" : "item_group",
Expand Down
70 changes: 68 additions & 2 deletions data/json/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1866,10 +1866,11 @@
"type": "ARMOR",
"copy-from": "coat_fur",
"name": "faux fur coat",
"description": "A garishly colored faux fur coat with a couple small pockets. Although not as warm as the natural fur, it gives you some of that unique flair.",
"description": "A garishly-colored faux fur coat with a couple small pockets. Although not as warm as the natural fur, it gives you some of that unique flair.",
"material": [ "faux_fur", "cotton" ],
"color": "pink",
"covers": [ "TORSO", "ARMS" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER", "SUPER_FANCY" ],
"warmth": 70
},
{
Expand Down Expand Up @@ -2419,6 +2420,17 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ]
},
{
"id": "duster_faux_fur",
"type": "ARMOR",
"copy-from": "duster_fur",
"name": "faux fur duster",
"description": "A thick faux fur duster, falling below your knees. Has many pockets for storing things.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "TORSO", "ARMS", "LEGS" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER", "FANCY" ],
"warmth": 40
},
{
"id": "duster_leather",
"type": "ARMOR",
Expand Down Expand Up @@ -2687,7 +2699,7 @@
"type": "holster",
"holster_prompt": "Attach what to belt loop?",
"holster_msg": "You clip your %s to your %s",
"max_volume": 5,
"max_volume": 8,
"max_weight": 3600,
"draw_cost": 50,
"flags": [ "BELT_CLIP" ]
Expand Down Expand Up @@ -4056,6 +4068,17 @@
"warmth": 70,
"material_thickness": 3
},
{
"id": "hat_faux_fur",
"type": "ARMOR",
"copy-from": "hat_fur",
"name": "faux fur hat",
"description": "A stylish hat made of faux fur. Like real fur, but without the suffering, if the tag is to be believed. Very warm.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "HEAD" ],
"flags": [ "FANCY" ],
"warmth": 60
},
{
"id": "hat_hard",
"type": "ARMOR",
Expand Down Expand Up @@ -6801,6 +6824,16 @@
"environmental_protection": 3,
"flags": [ "VARSIZE", "POCKETS" ]
},
{
"id": "pants_faux_fur",
"type": "ARMOR",
"copy-from": "pants_fur",
"name": "faux fur pants",
"description": "A pair of long cotton pants lined with warm imitation fur.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "LEGS" ],
"warmth": 70
},
{
"id": "pants_leather",
"type": "ARMOR",
Expand Down Expand Up @@ -7868,6 +7901,17 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF" ]
},
{
"id": "sleeveless_duster_faux_fur",
"type": "ARMOR",
"copy-from": "sleeveless_duster_fur",
"name": "sleeveless faux fur duster",
"description": "A thick, sleeveless faux fur duster, falling below your knees. Has many pockets for storing things.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "TORSO", "LEGS" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER", "FANCY" ],
"warmth": 40
},
{
"id": "sleeveless_duster_leather",
"type": "ARMOR",
Expand Down Expand Up @@ -7957,6 +8001,17 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
"id": "sleeveless_trenchcoat_faux_fur",
"type": "ARMOR",
"copy-from": "sleeveless_trenchcoat_fur",
"name": "sleeveless faux fur trenchcoat",
"description": "A thick faux fur trenchcoat without sleeves. Has plenty of storage space, and looks pretty good.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "TORSO" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER", "FANCY" ],
"warmth": 40
},
{
"id": "sleeveless_trenchcoat_leather",
"type": "ARMOR",
Expand Down Expand Up @@ -9001,6 +9056,17 @@
"environmental_protection": 1,
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
"id": "trenchcoat_faux_fur",
"type": "ARMOR",
"copy-from": "trenchcoat_fur",
"name": "faux fur trenchcoat",
"description": "A thick faux fur trenchcoat, lined with pockets. Great for storage, and makes you the talk of the town.",
"material": [ "faux_fur", "cotton" ],
"covers": [ "TORSO", "ARMS" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER", "FANCY" ],
"warmth": 40
},
{
"id": "trenchcoat_leather",
"type": "ARMOR",
Expand Down
1 change: 1 addition & 0 deletions data/json/items/biosignatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "COMESTIBLE",
"id": "feces_bird",
"name": "bird litter",
"category": "chems",
"weight": 40,
"color": "brown",
"spoils_in": "4 days 16 hours",
Expand Down
Loading

0 comments on commit 4741db3

Please sign in to comment.