Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
Browse files Browse the repository at this point in the history
  • Loading branch information
@RarkGrames
RarkGrames committed Jan 29, 2020
2 parents 52a3f40 + 1e0185d commit 4a0b5e1
Show file tree
Hide file tree
Showing 22 changed files with 1,720 additions and 1,773 deletions.
27 changes: 0 additions & 27 deletions data/json/furniture_and_terrain/furniture-storage.json
View file
Expand Up @@ -222,33 +222,6 @@
"items": [ { "item": "paper", "charges": [ 50, 100 ] } ]
}
},
{
"type": "furniture",
"id": "f_cupboard",
"name": "cupboard",
"symbol": "#",
"description": "Store your cups.",
"color": "blue",
"move_cost_mod": 1,
"coverage": 55,
"required_str": -1,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE" ],
"deconstruct": {
"items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
},
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "2x4", "count": [ 1, 3 ] },
{ "item": "wood_panel", "count": [ 0, 1 ] },
{ "item": "nail", "charges": [ 2, 6 ] },
{ "item": "splinter", "count": 1 }
]
}
},
{
"type": "furniture",
"id": "f_dresser",
Expand Down
29 changes: 29 additions & 0 deletions data/json/furniture_and_terrain/furniture-surfaces.json
View file
Expand Up @@ -23,6 +23,35 @@
"examine_action": "workbench",
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
},
{
"type": "furniture",
"id": "f_cupboard",
"name": "cupboard",
"symbol": "#",
"description": "Store your cups.",
"color": "blue",
"move_cost_mod": 1,
"coverage": 55,
"required_str": -1,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF" ],
"deconstruct": {
"items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
},
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "2x4", "count": [ 1, 3 ] },
{ "item": "wood_panel", "count": [ 0, 1 ] },
{ "item": "nail", "charges": [ 2, 6 ] },
{ "item": "splinter", "count": 1 }
]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
},
{
"type": "furniture",
"id": "f_counter_gate_c",
Expand Down
15 changes: 11 additions & 4 deletions data/json/game_balance.json
View file
Expand Up @@ -190,9 +190,16 @@
},
{
"type": "EXTERNAL_OPTION",
"name": "INT_BASED_LEARNING",
"info": "INT Based Learning mod. Enables rebalance of practice and reading gains.",
"stype": "bool",
"value": false
"name": "INT_BASED_LEARNING_BASE_VALUE",
"info": "The amount of INT which is used as base point for focus adjustments",
"stype": "int",
"value": 8
},
{
"type": "EXTERNAL_OPTION",
"name": "INT_BASED_LEARNING_FOCUS_ADJUSTMENT",
"info": "The amount of focus gained per each INT point above INT_BASED_LEARNING_BASE_VALUE",
"stype": "int",
"value": 5
}
]
69 changes: 4 additions & 65 deletions data/json/itemgroups/books.json
View file
Expand Up @@ -276,10 +276,8 @@
"type": "item_group",
"id": "manuals",
"items": [
[ "manual_brawl", 30 ],
[ "manual_dodge", 1 ],
{ "group": "manuals_school", "prob": 424 },
[ "manual_melee", 6 ],
[ "manual_throw", 12 ],
[ "manual_cutting", 12 ],
[ "manual_stabbing", 6 ],
[ "manual_knives", 8 ],
Expand All @@ -290,27 +288,8 @@
[ "manual_smg", 2 ],
[ "manual_launcher", 1 ],
[ "recipe_bullets", 2 ],
[ "manual_mechanics", 35 ],
[ "manual_speech", 50 ],
[ "manual_business", 40 ],
[ "manual_first_aid", 40 ],
[ "manual_computers", 20 ],
[ "recipe_augs", 5 ],
[ "howto_computer", 10 ],
[ "cookbook", 35 ],
[ "cookbook_italian", 25 ],
[ "offalcooking", 10 ],
[ "manual_electronics", 20 ],
[ "manual_tailor", 15 ],
[ "howto_traps", 10 ],
[ "manual_traps", 12 ],
[ "manual_carpentry", 10 ],
[ "101_carpentry", 6 ],
[ "manual_fabrication", 20 ],
[ "manual_driving", 15 ],
[ "manual_survival", 20 ],
[ "dnd_handbook", 2 ],
[ "survnote", 3 ]
[ "manual_traps", 12 ]
]
},
{
Expand Down Expand Up @@ -350,55 +329,15 @@
"type": "item_group",
"id": "textbooks",
"items": [
[ "textbook_computer", 4 ],
[ "computer_science", 8 ],
[ "book_icef", 8 ],
[ "textbook_electronics", 6 ],
[ "advanced_electronics", 6 ],
[ "textbook_business", 12 ],
[ "adv_chemistry", 4 ],
[ "tailor_portfolio", 3 ],
[ "textbook_chemistry", 11 ],
[ "brewing_cookbook", 3 ],
[ "textbook_carpentry", 6 ],
[ "SICP", 3 ],
[ "survival_book", 8 ],
[ "emergency_book", 3 ],
[ "carpentry_book", 4 ],
[ "textbook_robots", 1 ],
[ "textbook_mechanics", 12 ],
[ "textbook_biodiesel", 12 ],
[ "textbook_fabrication", 12 ],
[ "welding_book", 2 ],
[ "glassblowing_book", 2 ],
{ "group": "textbooks_school", "prob": 228 },
[ "textbook_gaswarfare", 5 ],
[ "recipe_bullets", 8 ],
[ "textbook_tailor", 12 ],
[ "recipe_fauxfur", 4 ],
[ "recipe_bows", 4 ],
[ "recipe_arrows", 4 ],
[ "textbook_firstaid", 8 ],
[ "pocket_firstaid", 4 ],
[ "pocket_survival", 2 ],
[ "pocket_firearms", 2 ],
[ "textbook_anarch", 1 ],
[ "textbook_survival", 8 ],
[ "modern_tanner", 4 ],
[ "textbook_traps", 4 ],
[ "manual_survival", 3 ],
[ "manual_swimming", 5 ],
[ "textbook_speech", 12 ],
[ "textbook_fireman", 10 ],
[ "textbook_armschina", 3 ],
[ "textbook_weapwest", 3 ],
[ "textbook_weapeast", 3 ],
[ "textbook_armwest", 3 ],
[ "textbook_armeast", 3 ],
[ "reference_cooking", 2 ],
[ "reference_fabrication1", 6 ],
[ "reference_firstaid1", 2 ],
[ "reference_firstaid2", 1 ],
[ "survnote", 2 ]
[ "reference_firstaid2", 1 ]
]
},
{
Expand Down
29 changes: 14 additions & 15 deletions data/json/mapgen/basement/basement_bionic.json
View file
Expand Up @@ -5,9 +5,14 @@
"om_terrain": [ "basement_bionic" ],
"weight": 100,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" |---------- ",
" |?..i|..LL| ",
" |/...+L...| ",
Expand All @@ -23,14 +28,8 @@
"|................|-----|",
"|......|+-|++|...|&...i|",
"|......|.W|..|...+....C|",
"|..}...|.F|<<|...|.cc.*|",
"|..}...|.F|.<|...|.cc.*|",
"------------------------",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_game" ],
Expand Down Expand Up @@ -79,11 +78,17 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "basement" ],
"weight": 500,
"weight": 100,
"object": {
"rotation": [ 0, 3 ],
"fill_ter": "t_rock_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ------ ",
" |..LL| ",
" |L...| ",
Expand All @@ -101,12 +106,6 @@
"|......|.W|..|...+....C|",
"|..}...|.F|<<|...|.cc.*|",
"------------------------",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_game" ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/house/house09.json
View file
Expand Up @@ -26,10 +26,10 @@
".#|||||||||| |||||+|||#.",
".#d IID| so.",
".#@@ h + y so.",
".#@@ |y |||+||||#.",
".#d E||+|Q #.",
".# R T|>>|UUdA ZW#.",
".####oo#####o##########.",
".#@@ | y|||+||||#.",
".#d E|+||Q #.",
".# R T|>q|UUdA ZW#.",
".####oo################.",
"...................^...."
],
"palettes": [ "standard_domestic_palette" ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/mapgen_palettes/basement.json
View file
Expand Up @@ -61,9 +61,9 @@
"terrain": {
" ": "t_rock",
"+": "t_door_c",
"-": "t_wall",
"-": "t_wall_w",
".": "t_rock_floor",
"<": "t_stairs_up",
"<": "t_wood_stairs_up",
"&": "t_rock_floor",
"*": "t_rock_floor",
"%": "t_rock_floor",
Expand Down Expand Up @@ -98,7 +98,7 @@
"l": "t_floor",
"B": "t_floor",
"M": "t_floor",
"|": "t_wall",
"|": "t_wall_w",
"1": "t_wall_log"
},
"furniture": {
Expand Down

0 comments on commit 4a0b5e1

Please sign in to comment.