Skip to content

Commit

Permalink
Merge pull request #16 from CleverRaven/master
Browse files Browse the repository at this point in the history 
Update
  • Loading branch information
@acidia
acidia authored Jul 17, 2018
2 parents d240007 + 91006d2 commit 95fb62c
Show file tree
Hide file tree
Showing 77 changed files with 13,039 additions and 1,092 deletions.
40 changes: 40 additions & 0 deletions data/json/effects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,46 @@
"sleep_chance": [101]
}
},
{
"type": "effect_type",
"id": "bandaged",
"name": ["Bandaged"],
"desc": ["Your wounds are bandaged."],
"main_parts_only": true,
"rating": "good",
"int_dur_factor": 3600,
"max_intensity": 16,
"max_effective_intensity": 8,
"max_duration": 57600,
"base_mods": {
"healing_rate": [2],
"healing_head_mult": [50],
"healing_torso_mult": [150]
},
"scaling_mods": {
"healing_rate": [2]
}
},
{
"type": "effect_type",
"id": "disinfected",
"name": ["Disinfected"],
"desc": ["Your wounds are disinfected."],
"main_parts_only": true,
"rating": "good",
"int_dur_factor": 3600,
"max_intensity": 16,
"max_effective_intensity": 8,
"max_duration": 57600,
"base_mods": {
"healing_rate": [2],
"healing_head": [50],
"healing_torso": [150]
},
"scaling_mods": {
"healing_rate": [2]
}
},
{
"type": "effect_type",
"id": "spores",
Expand Down
217 changes: 217 additions & 0 deletions data/json/item_groups_faction.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
[
{
"type": "item_group",
"id": "gathering_faction_base_camp_firewood",
"items": [ [ "stick", 200 ], [ "withered", 10 ], [ "straw_pile", 10 ], [ "splinter", 400 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_1",
"items": [ [ "2x4", 100 ], [ "stick", 200 ], [ "rock", 100 ], [ "straw_pile", 100 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_2",
"items": [ [ "2x4", 100 ], [ "stick", 200 ], [ "rock", 100 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_3",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_4",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_5",
"items": [ [ "2x4", 50 ], [ "log", 100 ], [ "stick", 300 ], [ "nail", 10 ], [ "broketent", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_6",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_7",
"items": [
[ "2x4", 50 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "metal_tank", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_8",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_9",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "sheet_metal", 20 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_10",
"items": [ [ "2x4", 30 ], [ "log", 100 ], [ "stick", 300 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_11",
"items": [
[ "rock", 100 ],
[ "stick", 100 ],
[ "pipe", 30 ],
[ "2x4", 40 ],
[ "nail", 10 ],
[ "scrap", 40 ],
[ "steel_chunk", 20 ],
[ "broketent", 10 ],
[ "well_pump", 5 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_12",
"items": [
[ "withered", 300 ],
[ "straw_pile", 100 ],
[ "vine_30", 50 ],
[ "log", 100 ],
[ "nail", 10 ],
[ "scrap", 20 ],
[ "steel_chunk", 10 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_13",
"items": [
[ "withered", 500 ],
[ "straw_pile", 100 ],
[ "vine_30", 50 ],
[ "log", 100 ],
[ "nail", 10 ],
[ "scrap", 20 ],
[ "steel_chunk", 10 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_14",
"items": [
[ "withered", 100 ],
[ "straw_pile", 50 ],
[ "vine_30", 25 ],
[ "2x4", 50 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 30 ],
[ "metal_tank", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_15",
"items": [
[ "2x4", 50 ],
[ "pipe", 50 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 30 ],
[ "metal_tank", 20 ],
[ "scrap", 30 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_16",
"items": [ [ "2x4", 100 ], [ "stick", 300 ], [ "nail", 20 ], [ "scrap", 30 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_17",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "sheet_metal", 20 ],
[ "scrap", 30 ]
]
},
{
"type": "item_group",
"comment": "There are no more upgrades for the camp but you shouldn't be punished for that.",
"id": "gathering_faction_base_camp_18",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "rag", 100 ],
[ "sheet_metal", 20 ],
[ "scrap", 30 ],
[ "withered", 50 ],
[ "straw_pile", 50 ],
[ "vine_30", 5 ]
]
}
]
3 changes: 0 additions & 3 deletions data/json/items/armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4567,7 +4567,6 @@
"category": "clothing",
"name": "hide bag",
"description": "The raw skin of an animal, quickly turned into a makeshift bag for storage. It will still rot and needs to be cured and tanned.",

"symbol": "[",
"color": "pink",
"covers": [ "ARM_EITHER", "HAND_EITHER" ],
Expand All @@ -4576,7 +4575,6 @@
"storage": 60,
"material_thickness": 1,
"flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]

},
{
"id": "hide_tainted_bag",
Expand All @@ -4593,7 +4591,6 @@
"storage": 60,
"material_thickness": 1,
"flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]

},
{
"id": "holy_symbol",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5503,7 +5503,6 @@
"material": "fruit",
"volume": 1,
"stack_size": 4,
"flags": ["MYCUS_OK"],
"fun": 30
},
{
Expand Down Expand Up @@ -5546,6 +5545,7 @@
"material": "fruit",
"volume": 1,
"stack_size": 4,
"flags": ["MYCUS_OK"],
"fun": 30
},
{
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/comestibles/egg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"symbol": "%",
"quench": 10,
"nutrition": 20,
"description": "A fist-sized egg from from a giant spider. Incredibly gross.",
"description": "A fist-sized egg from a giant spider. Incredibly gross.",
"price": 80,
"material": "egg",
"volume": 1,
Expand All @@ -145,7 +145,7 @@
"healthy": -1,
"quench": 3,
"nutrition": 8,
"description": "A fist-sized egg from from a giant roach. Incredibly gross.",
"description": "A fist-sized egg from a giant roach. Incredibly gross.",
"price": 80,
"material": "egg",
"volume": 1,
Expand All @@ -172,7 +172,7 @@
"spoils_in": 112,
"quench": 3,
"nutrition": 8,
"description": "A fist-sized egg from from a locust.",
"description": "A fist-sized egg from a locust.",
"price": 80,
"material": "egg",
"volume": 1,
Expand Down
Loading

0 comments on commit 95fb62c

Please sign in to comment.