Skip to content

Commit

Permalink
Merge pull request #2 from CleverRaven/master
Browse files Browse the repository at this point in the history
Update forked repo
8street authored Dec 14, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents e3bb1b3 + d2cb78a commit b5d17e9
Showing 585 changed files with 25,204 additions and 17,506 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ jobs:
android:
components:
- build-tools-28.0.1
- android-26
- android-28
cache:
# The ccache feature in Travis doesn't work for language: android, so
# do it ourselves.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
[![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
[![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
[![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)

# Cataclysm: Dark Days Ahead

4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ unzipDeps.dependsOn makeLocalization
preBuild.dependsOn unzipDeps

android {
compileSdkVersion 26
compileSdkVersion 28

if (override_version.isEmpty()) {
println("Generating version number to $version_header_path")
@@ -128,7 +128,7 @@ android {

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 28
versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
versionName new File("$version_header_path").text.split('\"')[1]
if (buildAsApplication) {
2 changes: 1 addition & 1 deletion data/json/construction.json
Original file line number Diff line number Diff line change
@@ -1464,7 +1464,7 @@
"required_skills": [ [ "fabrication", 4 ] ],
"time": "60 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ],
"components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 8 ] ] ],
"components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 8 ] ], [ [ "lock", 1 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_locker"
},
27 changes: 27 additions & 0 deletions data/json/field_type.json
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
"type": "field_type",
"legacy_enum_id": 1,
"intensity_levels": [ { "name": "blood splatter", "color": "red" }, { "name": "blood stain" }, { "name": "puddle of blood" } ],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -23,6 +24,7 @@
"type": "field_type",
"legacy_enum_id": 2,
"intensity_levels": [ { "name": "bile splatter", "color": "pink" }, { "name": "bile stain" }, { "name": "puddle of bile" } ],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -40,6 +42,7 @@
{ "name": "bloody meat chunks", "color": "light_red" },
{ "name": "heap of gore", "color": "red" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -57,6 +60,7 @@
{ "name": "shattered branches and leaves" },
{ "name": "broken vegetation tangle", "color": "green" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -70,6 +74,7 @@
"type": "field_type",
"legacy_enum_id": 5,
"intensity_levels": [ { "name": "cowebs", "sym": "}" }, { "name": "webs" }, { "name": "thick webs", "transparent": false } ],
"description_affix": "covered_in",
"immunity_data": { "traits": [ "WEB_WALKER" ] },
"priority": 2,
"phase": "solid",
@@ -85,6 +90,7 @@
{ "name": "slime stain" },
{ "name": "puddle of slime", "color": "green" }
],
"description_affix": "covered_in",
"decay_amount_factor": 2,
"apply_slime_factor": 10,
"is_splattering": true,
@@ -102,6 +108,7 @@
{ "name": "acid streak" },
{ "name": "pool of acid", "color": "green" }
],
"description_affix": "covered_in",
"immunity_data": { "traits": [ "ACIDPROOF" ] },
"underwater_age_speedup": "2 minutes",
"has_acid": true,
@@ -168,6 +175,7 @@
]
}
],
"description_affix": "covered_in",
"is_splattering": true,
"priority": 2,
"half_life": "2 minutes",
@@ -183,6 +191,7 @@
{ "name": "sludge trail", "color": "dark_gray" },
{ "name": "thick sludge trail" }
],
"description_affix": "covered_in",
"is_splattering": true,
"priority": 2,
"half_life": "6 hours",
@@ -206,6 +215,7 @@
{ "name": "fire", "color": "light_red", "light_emitted": 60, "translucency": 0.4 },
{ "name": "raging fire", "color": "red", "light_emitted": 160, "translucency": 0.1 }
],
"description_affix": "on",
"decay_amount_factor": 3,
"has_fire": true,
"priority": 4,
@@ -219,6 +229,7 @@
"type": "field_type",
"legacy_enum_id": 11,
"intensity_levels": [ { "name": "legacy rubble", "sym": "#", "color": "dark_gray" } ],
"description_affix": "covered_in",
"half_life": "1 turns",
"phase": "solid",
"display_items": false,
@@ -437,6 +448,7 @@
"type": "field_type",
"legacy_enum_id": 16,
"intensity_levels": [ { "name": "gas vent" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
"description_affix": "under",
"wandering_field": "fd_toxic_gas",
"gas_absorption_factor": 15,
"dirty_transparency_cache": true,
@@ -477,6 +489,7 @@
"type": "field_type",
"legacy_enum_id": 17,
"intensity_levels": [ { "name": "fire vent", "light_emitted": 20 }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
"description_affix": "under",
"has_fire": true,
"phase": "gas",
"display_items": false,
@@ -487,6 +500,7 @@
"type": "field_type",
"legacy_enum_id": 18,
"intensity_levels": [ { "name": "fire", "sym": "5", "color": "red", "dangerous": true, "light_emitted": 20 } ],
"description_affix": "on",
"has_fire": true,
"priority": 4,
"phase": "gas",
@@ -502,6 +516,7 @@
{ "name": "electric crackle", "color": "cyan", "light_emitted": 4 },
{ "name": "electric cloud", "color": "blue", "light_emitted": 20 }
],
"description_affix": "illuminated_by",
"has_elec": true,
"priority": 4,
"half_life": "2 turns",
@@ -533,6 +548,7 @@
"monster_spawn_group": "GROUP_NETHER_FATIGUE_FIELD"
}
],
"description_affix": "under",
"priority": 8,
"display_items": false,
"display_field": true
@@ -551,6 +567,7 @@
"type": "field_type",
"legacy_enum_id": 22,
"intensity_levels": [ { "name": "shock vent", "sym": "&" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
"description_affix": "under",
"has_elec": true,
"priority": -1,
"phase": "plasma",
@@ -562,6 +579,7 @@
"type": "field_type",
"legacy_enum_id": 23,
"intensity_levels": [ { "name": "acid vent", "sym": "&" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
"description_affix": "under",
"has_acid": true,
"priority": -1,
"phase": "liquid",
@@ -593,6 +611,7 @@
{ "name": "beam of light", "color": "light_blue" },
{ "name": "intense beam of light", "color": "white" }
],
"description_affix": "illuminated_by",
"priority": 4,
"half_life": "1 turns",
"dirty_transparency_cache": true,
@@ -605,6 +624,7 @@
"type": "field_type",
"legacy_enum_id": 26,
"intensity_levels": [ { "name": "spotlight", "sym": "&", "light_emitted": 80 } ],
"description_affix": "illuminated_by",
"priority": 1,
"half_life": "1 turns",
"display_field": true
@@ -614,6 +634,7 @@
"type": "field_type",
"legacy_enum_id": 27,
"intensity_levels": [ { "name": "dazzling", "color": "light_red_yellow", "sym": "#", "light_emitted": 5 } ],
"description_affix": "illuminated_by",
"priority": 4,
"half_life": "1 turns",
"phase": "plasma",
@@ -629,6 +650,7 @@
{ "name": "plant sap stain" },
{ "name": "puddle of resin" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -642,6 +664,7 @@
"type": "field_type",
"legacy_enum_id": 29,
"intensity_levels": [ { "name": "bug blood splatter", "color": "green" }, { "name": "bug blood stain" }, { "name": "puddle of bug blood" } ],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -659,6 +682,7 @@
{ "name": "hemolymph stain" },
{ "name": "puddle of hemolymph" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -676,6 +700,7 @@
{ "name": "shattered bug leg", "color": "green" },
{ "name": "torn insect organs", "color": "yellow" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -693,6 +718,7 @@
{ "name": "icky mess" },
{ "name": "heap of squishy gore", "color": "dark_gray" }
],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
@@ -1222,6 +1248,7 @@
"type": "field_type",
"legacy_enum_id": 50,
"intensity_levels": [ { "name": "smoke vent", "dangerous": true }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
"description_affix": "under",
"wandering_field": "fd_smoke",
"gas_absorption_factor": 15,
"dirty_transparency_cache": true,
6 changes: 6 additions & 0 deletions data/json/flags.json
Original file line number Diff line number Diff line change
@@ -730,5 +730,11 @@
"context": [ "COMESTIBLE" ],
"//": "Decreases calories as they appear in JSON def by 25%. This penalty is removed if the item is used in a recipe that requires heating.",
"info": "This food is <info>raw</info>, and will be <good>more nutritious</good> if cooked."
},
{
"id": "CANNIBALISM",
"type": "json_flag",
"context": [ "COMESTIBLE" ],
"craft_inherit": true
}
]
17 changes: 14 additions & 3 deletions data/json/furniture_and_terrain/furniture-regional-pseudo.json
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
"color": "black",
"move_cost_mod": 0,
"required_str": 0,
"flags": [ "TRANSPARENT", "NOITEM" ]
"flags": [ "TRANSPARENT" ]
},
{
"type": "furniture",
@@ -19,7 +19,18 @@
"color": "black",
"move_cost_mod": 0,
"required_str": 0,
"flags": [ "TRANSPARENT", "NOITEM" ]
"flags": [ "TRANSPARENT" ]
},
{
"type": "furniture",
"id": "f_region_water_plant",
"name": "this should never actually show up, it's a pseudo furniture",
"description": "this should never actually show up, it's a pseudo furniture",
"symbol": " ",
"color": "black",
"move_cost_mod": 0,
"required_str": 0,
"flags": [ "TRANSPARENT" ]
},
{
"type": "furniture",
@@ -30,6 +41,6 @@
"color": "black",
"move_cost_mod": 0,
"required_str": 0,
"flags": [ "TRANSPARENT", "NOITEM" ]
"flags": [ "TRANSPARENT" ]
}
]
46 changes: 35 additions & 11 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
@@ -433,6 +433,39 @@
]
}
},
{
"type": "furniture",
"id": "f_clothing_rail",
"name": "clothing rail",
"description": "A rail for hanging clothes on.",
"symbol": "{",
"color": "light_gray",
"move_cost_mod": -1,
"coverage": 10,
"required_str": 8,
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "PLACE_ITEM", "BLOCKSDOOR" ],
"deconstruct": {
"items": [
{ "item": "pipe", "count": [ 4, 6 ] },
{ "item": "sheet_metal_small", "count": [ 0, 4 ] },
{ "item": "wheel_caster", "count": 1 }
]
},
"max_volume": 7000,
"bash": {
"str_min": 6,
"str_max": 30,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 2, 8 ] },
{ "item": "steel_chunk", "count": [ 2, 4 ] },
{ "item": "sheet_metal_small", "count": [ 6, 10 ] },
{ "item": "pipe", "count": 1 },
{ "item": "wheel_caster", "count": [ 0, 1 ] }
]
}
},
{
"type": "furniture",
"id": "f_rack",
@@ -854,19 +887,10 @@
"move_cost_mod": -1,
"coverage": 70,
"required_str": -1,
"flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT" ],
"flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT", "EASY_DECONSTRUCT" ],
"examine_action": "keg",
"keg_capacity": 45,
"deconstruct": {
"items": [
{ "item": "2x4", "count": 18 },
{ "item": "nail", "charges": [ 7, 14 ] },
{ "item": "water_faucet", "count": 1 },
{ "item": "sheet_metal_small", "count": [ 12, 20 ] },
{ "item": "scrap", "count": [ 5, 10 ] },
{ "item": "foot_crank", "count": 1 }
]
},
"deconstruct": { "items": [ { "item": "churn", "count": 1 } ] },
"bash": {
"str_min": 12,
"str_max": 50,
Loading

0 comments on commit b5d17e9

Please sign in to comment.