diff --git a/build-scripts/build.sh b/build-scripts/build.sh index b191604bc66da..6fb72037ba229 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -9,34 +9,12 @@ function run_tests $WINE "$@" -d yes -r cata --rng-seed time $EXTRA_TEST_OPTS } -function just_json -{ - if [ -n $TRAVIS_COMMIT_RANGE ] - then - # If this string is populated, it will work. - files_changed="$(git diff --name-only $TRAVIS_COMMIT_RANGE)" - else - # The only time it isn't populated is on a new PR branch, where THIS will work. - files_changed="$(git diff --name-only $TRAVIS_BRANCH)" - fi - for filename in $files_changed - do - if [[ ! "$filename" =~ .json$ ]] - then - echo "$filename is not json, triggering full build." - return 1 - fi - done - echo "Only json files present, skipping full build." - return 0 -} - export CCACHE_MAXSIZE=1G if [ -n "$TEST_STAGE" ] then build-scripts/lint-json.sh make -j 5 style-json -elif just_json +elif [ -n "$JUST_JSON" ] then exit 0 fi diff --git a/build-scripts/requirements.sh b/build-scripts/requirements.sh index e646f82de0845..82581f486ecf5 100644 --- a/build-scripts/requirements.sh +++ b/build-scripts/requirements.sh @@ -2,6 +2,33 @@ set -e +function just_json +{ + if [ -n $TRAVIS_COMMIT_RANGE ] + then + # If this string is populated, it will work. + files_changed="$(git diff --name-only $TRAVIS_COMMIT_RANGE)" + else + # The only time it isn't populated is on a new PR branch, where THIS will work. + files_changed="$(git diff --name-only $TRAVIS_BRANCH)" + fi + for filename in $files_changed + do + if [[ ! "$filename" =~ .json$ ]] + then + echo "$filename is not json, triggering full build." + return 1 + fi + done + echo "Only json files present, skipping full build." + return 0 +} + +if just_json; then + export JUST_JSON=true + export CODE_COVERAGE="" +fi + if [ -n "${CODE_COVERAGE}" ]; then travis_retry pip install --user pyyaml cpp-coveralls; export CXXFLAGS=--coverage; diff --git a/data/json/harvest.json b/data/json/harvest.json index 9f81a2d83f3cd..1cab5c894aa19 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -252,7 +252,7 @@ "type": "harvest", "entries": [ { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.4 }, - { "drop": "feather", "type": "skin", "mass_ratio": 0.05 } + { "drop": "feather", "type": "skin", "mass_ratio": 0.01 } ] }, { @@ -262,7 +262,7 @@ { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 }, { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 }, { "drop": "liver", "type": "offal", "mass_ratio": 0.01 }, - { "drop": "feather", "type": "skin", "mass_ratio": 0.05 } + { "drop": "feather", "type": "skin", "mass_ratio": 0.01 } ] }, { @@ -272,7 +272,7 @@ { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 }, { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.03 }, { "drop": "fat", "type": "flesh", "mass_ratio": 0.18 }, - { "drop": "feather", "type": "skin", "mass_ratio": 0.03 }, + { "drop": "feather", "type": "skin", "mass_ratio": 0.02 }, { "drop": "bone", "type": "bone", "mass_ratio": 0.1 } ] }, diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 02b94b8e5a486..f552a51473db9 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -26,6 +26,22 @@ [ "recipe_bullets", 80 ] ] }, + { + "id": "boxing_books", + "type": "item_group", + "items": [ + [ "mag_unarmed", 40 ], + [ "manual_boxing", 50 ], + [ "mag_melee", 25 ], + [ "mag_bashing", 10 ], + [ "manual_melee", 15 ], + [ "recipe_melee", 10 ], + [ "manual_taekwondo", 10 ], + [ "manual_karate", 10 ], + [ "manual_muay_thai", 2 ], + [ "manual_krav_maga", 10 ] + ] + }, { "type": "item_group", "id": "book_martial", diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index da012ca888218..714956347eda3 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -363,5 +363,27 @@ "type": "item_group", "//": "Full face protection worn with hazmat suits", "items": [ { "collection": [ { "item": "glasses_safety" }, { "item": "mask_filter" } ], "prob": 40 }, [ "mask_gas", 60 ] ] + }, + { + "id": "boxing_clothes", + "type": "item_group", + "items": [ + [ "tank_top", 40 ], + [ "shorts", 40 ], + [ "boxing_gloves", 50 ], + [ "headgear", 50 ], + [ "mouthpiece", 50 ], + [ "jersey", 40 ], + [ "coat_rain", 15 ], + [ "hood_rain", 15 ], + [ "gloves_wraps", 45 ], + [ "jeans", 30 ], + [ "sports_bra", 25 ], + [ "jacket_leather", 20 ], + [ "aspirin", 30 ], + [ "water_clean", 30 ], + [ "sports_drink", 30 ], + [ "1st_aid", 20 ] + ] } ] diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 79ed23c2facfa..81a29139f62ad 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -246,6 +246,21 @@ "type": "item_group", "items": [ [ "bowling_ball", 100 ] ] }, + { + "id": "boxing_misc", + "type": "item_group", + "items": [ + [ "aspirin", 50 ], + [ "1st_aid", 40 ], + [ "bandages", 30 ], + [ "duct_tape", 20 ], + [ "sewing_kit", 10 ], + [ "mouthpiece", 10 ], + [ "cigar", 20 ], + [ "cig", 15 ], + [ "matches", 10 ] + ] + }, { "type": "item_group", "id": "bikeshop_tools", diff --git a/data/json/mapgen/boxing.json b/data/json/mapgen/boxing.json index 766e1135ef677..2102a7aa5ef7e 100644 --- a/data/json/mapgen/boxing.json +++ b/data/json/mapgen/boxing.json @@ -1,64 +1,11 @@ [ - { - "id": "boxing_clothes", - "type": "item_group", - "items": [ - [ "tank_top", 40 ], - [ "shorts", 40 ], - [ "boxing_gloves", 50 ], - [ "headgear", 50 ], - [ "mouthpiece", 50 ], - [ "jersey", 40 ], - [ "coat_rain", 15 ], - [ "hood_rain", 15 ], - [ "gloves_wraps", 45 ], - [ "jeans", 30 ], - [ "sports_bra", 25 ], - [ "jacket_leather", 20 ], - [ "aspirin", 30 ], - [ "water_clean", 30 ], - [ "sports_drink", 30 ], - [ "1st_aid", 20 ] - ] - }, - { - "id": "boxing_books", - "type": "item_group", - "items": [ - [ "mag_unarmed", 40 ], - [ "manual_boxing", 50 ], - [ "mag_melee", 25 ], - [ "mag_bashing", 10 ], - [ "manual_melee", 15 ], - [ "recipe_melee", 10 ], - [ "manual_taekwondo", 10 ], - [ "manual_karate", 10 ], - [ "manual_muay_thai", 2 ], - [ "manual_krav_maga", 10 ] - ] - }, - { - "id": "boxing_misc", - "type": "item_group", - "items": [ - [ "aspirin", 50 ], - [ "1st_aid", 40 ], - [ "bandages", 30 ], - [ "duct_tape", 20 ], - [ "sewing_kit", 10 ], - [ "mouthpiece", 10 ], - [ "cigar", 20 ], - [ "cig", 15 ], - [ "matches", 10 ] - ] - }, { "type": "mapgen", "method": "json", "om_terrain": [ "gym" ], "weight": 1000, "object": { - "fill_ter": "t_grass", + "fill_ter": "t_floor", "rows": [ " --ss---------------- ", " --ss--,-----,-----,- ", @@ -67,7 +14,7 @@ " --ss--,-----,-----,- ", " --ss--,-----,-----,- ", " qq++qqqqgggggqqqggqq ", - " xf................^x ", + " xf................^x4 ", " x........?$$$$$$?.0x ", " xE.E.....$555555$..x ", " xE.E.....$555555$.0x ", @@ -81,8 +28,8 @@ " xLLLLLLLLLx..xfZZZ^x ", " xBBBB.BBBBx..x.....p ", " x.........'..'.C.DCp ", - " xqqq...qqqx..x...DDx ", - " xS.'...'.Tx..xXXXXXx ", + " x+x+x..qqqxx'x...DDx ", + " xSxSx..'.Tx<.xXXXXXx ", " qqqqqqqqqqqqqqqqqqqq " ], "terrain": { @@ -94,26 +41,14 @@ ",": "t_pavement_y", "-": "t_pavement", ".": "t_floor", - "0": "t_floor", - "5": "t_floor", "?": "t_chainfence_posts", - "B": "t_floor", - "C": "t_floor", - "D": "t_floor", - "E": "t_floor", - "L": "t_floor", - "S": "t_floor", - "T": "t_floor", - "V": "t_floor", - "X": "t_floor", - "Z": "t_floor", - "^": "t_floor", - "f": "t_floor", "g": "t_window", "p": "t_window_domestic", - "q": "t_wall", + "q": "t_wall_w", "s": "t_sidewalk", - "x": "t_wall" + "4": "t_gutter_downspout", + "<": "t_stairs_up", + "x": "t_wall_g" }, "furniture": { "#": "f_table", @@ -140,5 +75,131 @@ { "item": "vending_drink", "x": [ 10, 11 ], "y": [ 16, 16 ], "chance": 70 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "gym_roof", + "weight": 200, + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " |2222222222222222223 ", + " |..................5 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |...#######+####...3 ", + " |...#_0________#...3 ", + " |...#______ssst#...3 ", + " |...#_0____s___#...3 ", + " |...#______s__t#...3 ", + " |...#_0______tt#...3 ", + " |...#######_####...3 ", + " |........#___#4.X..3 ", + " |....&.=.#_>_#...:.3 ", + " |--------#####-----3 " + ], + "terrain": { + ".": "t_flat_roof", + " ": "t_open_air", + "#": "t_wall_g", + "+": "t_door_locked", + "2": "t_gutter_north", + "-": "t_gutter_south", + "3": "t_gutter_east", + "|": "t_gutter_west", + ">": "t_stairs_down", + "5": "t_gutter_drop", + "_": "t_floor", + "s": "t_floor", + "t": "t_floor", + "0": "t_floor", + "4": "t_gutter_downspout" + }, + "furniture": { + "&": "f_roof_turbine_vent", + ":": "f_cellphone_booster", + "X": "f_small_satelitte_dish", + "=": "f_vent_pipe", + "b": "f_bench", + "s": "f_sofa", + "t": "f_table", + "0": "f_floor_canvas" + }, + "place_loot": [ { "item": "television", "x": 16, "y": 19 } ], + "place_nested": [ + { + "chunks": [ + [ "null", 20 ], + [ "roof_2x2_utilities_b", 15 ], + [ "roof_2x2_utilities_c", 5 ], + [ "roof_2x2_utilities_d", 20 ], + [ "roof_2x2_utilities", 30 ], + [ "roof_2x2_golf", 20 ], + [ "roof_3x3_wine", 30 ], + [ "roof_4x4_utility_1", 30 ], + [ "roof_4x4_party", 15 ], + [ "roof_16x16_help", 3 ] + ], + "x": 4, + "y": 8 + }, + { "chunks": [ [ "roof_4x4_survivor", 20 ], [ "null", 80 ] ], "x": 9, "y": 16 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "gym_upper_roof", + "weight": 200, + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " |22222222223 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |..........3 ", + " |-----...5-3 ", + " |...3 ", + " |...3 ", + " ----- " + ], + "terrain": { + ".": "t_flat_roof", + " ": "t_open_air", + "2": "t_gutter_north", + "-": "t_gutter_south", + "3": "t_gutter_east", + "|": "t_gutter_west", + "5": "t_gutter_drop" + } + } } ] diff --git a/data/json/npcs/missiondef_tacoma_commune.json b/data/json/npcs/missiondef_tacoma_commune.json index 27f448867b9df..298ebe756f0a2 100644 --- a/data/json/npcs/missiondef_tacoma_commune.json +++ b/data/json/npcs/missiondef_tacoma_commune.json @@ -14,7 +14,7 @@ "describe": "We need help...", "offer": "The wine and beer we can brew are sufficient to attract most patrons but we need something a bit stronger to get them to forget their misery. Could you build me a pair of stills?", "accepted": "This should let us start producing whiskey, rum, and brandy when we get access to the ingredients.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "I'm sure you could find the design for the stills in home brewing books.", "inquire": "Do you have the stills?", "success": "Thank you for the delivery.", @@ -44,7 +44,7 @@ "describe": "We need help...", "offer": "The last batch that I brewed was terrible, I'm fairly sure something contaminated the yeast we have been using. Could you locate a source of fresh yeast for us to use? I'd need about 20 teaspoons of dry yeast to get started.", "accepted": "Thank you for your assistance.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Yeast should be common in homes or bakeries.", "inquire": "Do you have the yeast?", "success": "Thank you for the delivery.", @@ -75,7 +75,7 @@ "describe": "We need help...", "offer": "Sugar and molasses remains in short supply. I've put in a request for more but it is unlikely that I'm going to see a reliable source for some time. If you are interested, we are going to need sugar beet seeds to meet future demand regardless of what the scavengers can find. Could you bring me at least enough seeds to plant a small 10 meter long patch?", "accepted": "Thank you for your assistance.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Farms or supply stores might have a few seeds...", "inquire": "Do you have the sugar beet seeds?", "success": "Thank you for the delivery.", @@ -106,7 +106,7 @@ "describe": "We need help...", "offer": "The drinks we brew here have become a major draw for visitors and the occasional trader. Our batches have become larger but we are still running out of storage space between trading runs. I've been able to get a few volunteers to help me build a set of standing tanks but I still need 12 metal tanks to build them. I've talked with the scrappers but we are a low priority at the moment.", "accepted": "Thank you for your assistance.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Scrapping vehicles might be your best bet.", "inquire": "Do you have the metal tanks?", "success": "Thank you for the delivery.", @@ -137,7 +137,7 @@ "describe": "We need help...", "offer": "The other survivor outposts that we have contact with have been more than eager to trade for beer or other drinks. Transporting the drinks to them has presented a number of challenges though. If you could locate a pair of 200-liter drums we should be able to keep them supplied while turning a significant profit.", "accepted": "Thank you for your assistance.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Factories or junk yards are the only places I know where to look.", "inquire": "Do you have the 200-liter drums?", "success": "Thank you for the delivery.", @@ -160,7 +160,7 @@ "describe": "We need help...", "offer": "Our first project is to enclose the barn so that new refugees have a safe place to sleep. Before we can begin serious improvements we need lumber to work with. Enclosing the four barn entrances will take nearly 400 2x4's... if you could provide half of that we should be able to take care of the other half and construction. If you don't have a truck, I'd make finding one your first priority. ", "accepted": "The more men we can bring to the camp the quicker improvements can be made.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Avoid destroying the furniture, we'll be needing it.", "inquire": "Do you have them?", "success": "Great, I'll send word that we could use another set of hands or two to help out here.", @@ -219,7 +219,7 @@ "describe": "We need help...", "offer": "With the barn entrances enclosed the refugees moving into there should feel safer but the weather can be bitter here. We're going to need to build makeshift beds in the stalls to ward off disease and frostbite. We can take care of the frames but will need your help looting blankets. We'd need 25 blankets to provide the most basic sleeping accommodations.", "accepted": "I'd start with looting hotels or you could sew them together... but that would be a last resort.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Avoid destroying the furniture here, we'll be needing it.", "inquire": "Do you have them?", "success": "Your assistance is always appreciated.", @@ -285,7 +285,7 @@ "describe": "We need help...", "offer": "Our supply of nails has been depleted. I'm going to have to ask you to get us a few more boxes. Hardware stores should have a few if they haven't been looted. I suppose you may be able to find handfuls of them in building rubble. We'd need 2500 to have enough that we won't be sending you back out too soon.", "accepted": "Deconstructing furniture isn't going to be efficient, try looking for boxes or grabbing any sitting on top of rubble piles.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Avoid destroying the furniture here, we'll be needing it.", "inquire": "Do you have them?", "success": "Your assistance is always appreciated.", @@ -351,7 +351,7 @@ "describe": "We need help...", "offer": "I'm sure you've noticed the new workers that have started trickling in. The Free Merchant counsel is demanding that we immediately begin projects to become self-sufficient due to limited supplies. We are going to need to rapidly setup an agricultural industry before winter and starvation catches us unprepared and unsupported. In order to get a half dozen shovels and a couple of bags of seeds, we are going to have to trade for it. I've already got the deal lined up but the only thing they are willing to trade it for is salt. I negotiated them down from 500 units to 300... we were hoping you might have access to a source.", "accepted": "Salt is key to preserving meat and other perishables... without any excess food it wouldn't do us much good now but I imagine we'll need to send you out to get more in the future. ", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "If you can find a source of salt water you should be able to boil it down.", "inquire": "Do you have the salt?", "success": "We are going to begin preparing our fields immediately.", @@ -421,7 +421,7 @@ "describe": "We need help...", "offer": "Well, our first crop will be planted shortly but I'm starting to suspect that our profit margin is going to be much smaller than we expect. With limited seed for our original crop our next course of action is to increase the soil's fertility. Is there any way you could find or produce a basic liquid fertilizer for us? We'd need at least 30 units to make a significant improvement in our output. ", "accepted": "I don't know the exact recipe but I'm sure you could make it from a commercial fertilizer or produce it from bonemeal.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "I'd look through a few basic chemistry books to find a simple recipe.", "inquire": "Do you have the liquid fertilizer?", "success": "This really should make the first winter easier to survive.", @@ -470,7 +470,7 @@ "describe": "We need help...", "offer": "Our current assessment for survivability has increased significantly thanks to your efforts. The next priority issue is securing a cleaner water source. Drinking from the pond on the back end of the ranch has led to an outbreak of dysentery. As quickly as possible we need to improve the sanitary conditions in the camp. To do so the first step is to dig a well and construct stone fireplaces in the barn for the migrants to boil water. We are going to need at least 75 large rocks from you if we hope to accomplish the task before we all get sick. After we have them installed you will have free access to them, guaranteed. ", "accepted": "If you take a shovel to a pile of rubble you should be able to pull out structural grade stone.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Mining would always be an option if you had the resources.", "inquire": "Do you have the stone?", "success": "I appreciate the work you do.", @@ -519,7 +519,7 @@ "describe": "We need help...", "offer": "To fabricate the well's hand pump and construct components for several other projects we are going to need to find or fabricate a number of steel pipes. Plumbing is a distant possibility for now but some form of irrigation will eventually become desirable. You could assist us with procuring 50 steel pipes, if you so have the chance.", "accepted": "Hopefully we will be able to assign new migrants to help fulfill our needs in the future.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Pipes are used in numerous metal constructions. Smashing abandoned furniture may provide the material we need.", "inquire": "Do you have the pipes?", "success": "I appreciate the work you do.", @@ -572,7 +572,7 @@ "describe": "We need help...", "offer": "With the well's completion we are rapidly closing the sustainability gap. In order to expand from here we will need massive quantities of lumber to construct fortifications and new buildings. We have already begun work on a manually operated sawmill but we will need two motors to control the actual blades. We were hoping you might be able to secure the motors for us.", "accepted": "Power for the motors will be provided by a salvaged truck battery, you need not bring additional mechanical components. ", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Mining would always be an option if you had the resources.", "inquire": "Do you have the motors?", "success": "I appreciate the work you do.", @@ -637,7 +637,7 @@ "describe": "We need help...", "offer": "Disease and infection remains a persistent problem among the refugees. Without dedicated medical personnel and facilities I doubt everyone will be willing to stick around when the next outbreak happens. Until we can get a former medic or nurse I'm just going to have to improvise. Sterilization would be the first step I imagine. Bring me 5 gallon jugs of bleach so we can get started.", "accepted": "I'm sure you can find bleach in most homes...", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "If you can't find a large supply I'd recommend checking hospitals or research labs.", "inquire": "Do you have the bleach?", "success": "I appreciate it.", @@ -677,7 +677,7 @@ "describe": "We need help...", "offer": "We've started planning a medical clinic but we are going to need a lot more supplies if we hope to warrant sending one of the few people with medical experience from the refugee center to our outpost. I know first aid kits are rare but they have all the basic supplies that I'm uncertain of. If you could bring in 6 full kits I'm sure we could supplement them to make them last a bit longer.", "accepted": "We'll do our best to make them last...", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Homes, hospitals, labs, and doctor offices would be where I'd check.", "inquire": "Do you have the first aid kits?", "success": "I appreciate it.", @@ -714,7 +714,7 @@ "describe": "We need help...", "offer": "The work you have done has swayed the leaders at the refugee center to send someone out to assist with our medical needs. The next step is for us to get a sort of chop-shop setup so that we can begin using scrap metal to build fortifications and equipment. We are going to need a pair of electric welders for our mechanics to use.", "accepted": "With two, we should be able to repair one if it breaks.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "The only place I've seen them is garages but I imagine you could find them in some stores.", "inquire": "Do you have the welders?", "success": "I appreciate it.", @@ -771,7 +771,7 @@ "describe": "We need help...", "offer": "We have the basic equipment that we need but without a functioning power grid we are forced to rely on the readily available vehicle batteries. This is going to be a chore but I'll need twelve car batteries to swap between charging and powering our equipment. The good news is that they don't need to be charged, we can take care of that.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Cars can be found in traffic jams along roads or in parking lots... I'm sure you can find a few.", "inquire": "Do you have the car batteries?", "success": "I'm impressed with your abilities.", @@ -814,7 +814,7 @@ "describe": "We need help...", "offer": "Check with the nurse when you get a chance, I know she will need help setting up our clinic. On the construction front, we are going to need to get dedicated scavenger teams setup to bring in the miscellaneous supplies that we use in small quantities. We are going to start setting up a junk shop for them in the North end of the outpost so we could use your help with that. Communication is the biggest obstacle for the teams... could you bring in a pair of two-way radios?", "accepted": "Organizing the scavenging missions is difficult enough without communication.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You should be able to find them in electronics stores or at a police station.", "inquire": "Do you have the two-way radios?", "success": "I'm sure the scavengers will find these useful.", @@ -857,7 +857,7 @@ "describe": "We need help...", "offer": "The volunteers for the scavenging teams will need to be issued some basic equipment. When the boss sets up shop in the junk shed you should ask him what else he needs for his teams. In the meantime we can provide a few backpacks to get them started. Could you find five backpacks to give to the initial team?", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "It may be easier to make them if you can't find a school or something.", "inquire": "Do you have the backpacks?", "success": "Having at least basic equipment greatly increases survivability. Thanks.", @@ -900,7 +900,7 @@ "describe": "We need help...", "offer": "Growth has lately begun to stall, we have individuals passing through the outpost but the prospect of hard labor just to eke out an existence is driving them away. We've asked around and decided that, despite our pressing needs, building a bar ought to draw some of the less committed individuals to the outpost. Unlike other settlements, the more hands we have to more food we can produce... at least in the long term. Unfortunately, no one here has brewed alcoholic drinks before so we are going to need you to find a book called the 'Homebrewer's Bible' or something along those lines.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "I guess you should search homes or libraries?", "inquire": "Do you have the book?", "success": "I guarantee we will toast to your name when the bar is finished.", @@ -930,7 +930,7 @@ "describe": "We need help...", "offer": "Just flipping through the book I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar. What alcohol we have been able to loot isn't going to last us long so starting our first large batch is a priority. Could you bring in 80 units of sugar? That should last us until we can start producing our own supply.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You might get lucky finding it but you could always boil it out of fruit if you are familiar with the process.", "inquire": "Do you have the sugar?", "success": "There is a large group of thirsty individuals in our outpost that are truly thankful for your work.", @@ -967,7 +967,7 @@ "describe": "We need help...", "offer": "Although we are an agricultural outpost, we are restricted to growing plants that are compatible with the New England climate during the warmer months. The easiest way to work around that is to build green houses to supplement our external fields. There isn't going to be an easy way to build these, we are going to need a massive number of glass sheets to enclose the frames. The first house will need 30 sheets of glass if you are still interested.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Deconstructing existing windows is the only way I know of to keep the sheets intact.", "inquire": "Do you have the glass sheets?", "success": "We'll begin planting our first seeds as soon as we can get these installed.", @@ -999,7 +999,7 @@ "describe": "We need help...", "offer": "I've got a handful of bandages and a few first aid kits to work with at the moment... in other words I'm completely unable to treat most serious medical emergencies. I'm supposed to have priority on any medical supplies that the scavengers bring in but I imagine the black market for the stuff will prevent me from ever seeing it. I could use your help getting a few bottles of aspirin to start with.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Aspirin is pretty common in homes and convenience stores.", "inquire": "Do you have the aspirin?", "success": "We'll go through this pretty quickly but it does help.", @@ -1023,7 +1023,7 @@ "describe": "We need help...", "offer": "I was given a few bottles of bleach when I arrived but I need a number of hotplates to actually sterilize equipment. I'm sure you can find them in any old house or appliance store. Three should be enough for now.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "It should be a fairly common item, don't know what else to say.", "inquire": "Do you have the hotplates?", "success": "Thank you for your assistance.", @@ -1047,7 +1047,7 @@ "describe": "We need help...", "offer": "Disease is spreading rapidly due to poor nutrition and there is little that I can do about it. With food being scarce, people are willing to survive on whatever they can. I need to start supplementing the outpost's diet with vitamins to prevent potential deaths indirectly attributable to nutrition. I know it is a lot but if you could bring me 200 multivitamin pills I'd be able to treat the most vulnerable before they spread anything to the rest of us.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "It should be a fairly common item, don't know what else to say.", "inquire": "Do you have the vitamins?", "success": "Thank you for your assistance.", @@ -1071,7 +1071,7 @@ "describe": "We need help...", "offer": "Despite my recommendations, we continue to have travelers come in with illnesses I've been able to trace back to contaminated drinking water. When boiling water isn't an option they need some form of charcoal water filter that they can use. If you could build me four charcoal water filters I'll distribute them to groups as they pass through.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "With some basic survival and crafting skills you should be able to make them with little effort.", "inquire": "Do you have the charcoal water filters?", "success": "Thank you for your assistance.", @@ -1094,7 +1094,7 @@ "describe": "We need help...", "offer": "I've been working on producing some of our own medical supplies but I'm going to need a chemistry set to get everything that I need in order. Is there any way you could go through one of the school chemistry labs and steal me a chemistry set?", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You might be able to find one in a pharmacy if you can't find a school.", "inquire": "Do you have the chemistry set?", "success": "Thank you for your assistance.", @@ -1118,7 +1118,7 @@ "describe": "We need help...", "offer": "The number of airway infections that I've encountered in the past week has depleted my supply of masks. Could you find me 10 filter masks? I tend to only distribute them in severe cases so I'll be sure to make them last.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You may be able to make one if you had the right guide.", "inquire": "Do you have the filter masks?", "success": "Thank you for your assistance.", @@ -1142,7 +1142,7 @@ "describe": "We need help...", "offer": "The bodily fluids that I often have to clean up and the caustic chemicals I deal with have done a number on my current pair of gloves. Could you find me four pairs of heavy rubber gloves? That should be enough that I can task a few laborers with cleanup details in the event of an outbreak.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You should be able to find them in cleaning closets.", "inquire": "Do you have the rubber gloves?", "success": "Thank you for your assistance.", @@ -1166,7 +1166,7 @@ "describe": "We need help...", "offer": "I heard that we may have a physician on his way here. The workers have already begun expanding the clinic but I need you to locate a pair of scalpels to use in surgery when he arrives. I'm sure you should be able to find them in a hospital or craft shop.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Hospitals and crafting stores should have a few.", "inquire": "Do you have the scalpels?", "success": "Thank you for your assistance.", @@ -1189,7 +1189,7 @@ "describe": "We need help...", "offer": "Have you heard of a book called the 'Guide to Advanced Emergency Care?' I really need a copy. The doctor is requesting a lot of supplies that I'm not familiar with but I believe I could make if I could get a copy of the book.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Libraries are the only place I'd think to look.", "inquire": "Do you have the Guide to Advanced Emergency Care?", "success": "Thank you for your assistance.", @@ -1212,7 +1212,7 @@ "describe": "We need help...", "offer": "The doctor has some ideas on how to recreate a vaccination program for the common flu. If you come across an unused flu shot please bring it to me. We haven't had any fatalities from the flu yet but it is only a matter of time until one of the older or younger members of the outpost gets a bad case.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Hospitals or clinics might have a few that haven't been used.", "inquire": "Do you have the flu shot?", "success": "Thank you for your assistance.", @@ -1235,7 +1235,7 @@ "describe": "We need help...", "offer": "We are starting to isolate a few natural antibiotic serums but we don't have the supplies to administer the cocktails. I need you to bring me 10 empty syringes to use. I'll take care of cleaning them to prevent transferring infections.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Hospitals or clinics might have a few sitting around.", "inquire": "Do you have the empty syringes?", "success": "Thank you for your assistance.", @@ -1258,7 +1258,7 @@ "describe": "We need help...", "offer": "I can usually use additional survival gear to kit-out the new recruits. The most basic weapon that everyone gets is the knife spear... it provides a good mix of range, power, and ease of use when engaging the more common monsters. Could you make me a dozen of them? I may need more later but that should help the first few teams.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You should be able to make them with the most basic of skills.", "inquire": "Do you have the knife spears?", "success": "Thank you for the delivery.", @@ -1282,7 +1282,7 @@ "describe": "We need help...", "offer": "Night is the ideal time for my team to go on raids but they are going to need better light sources to speed up their missions. Could you craft a set of five headlamps for them? Keeping both hands free greatly helps during combat.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "You should be able to make them with the most basic of skills.", "inquire": "Do you have the wearable flashlights?", "success": "Thank you for the delivery.", @@ -1306,7 +1306,7 @@ "describe": "We need help...", "offer": "Clothing that can withstand the wear and tear of climbing through windows and fighting back wild animals is in high demand. The best that we have been able to field is leather body armor but it is difficult to make with our limited resources. Could you craft us three pairs of leather body armor? The life-expectancy of my scavengers would drastically increase if you did.", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Finding the leather might be easier in town rather than making it yourself.", "inquire": "Do you have the leather armor?", "success": "Thank you for the delivery.", @@ -1330,7 +1330,7 @@ "describe": "We need help...", "offer": "When outnumbered or forced to pull back my scavengers have been taught to throw Molotov cocktails to keep monsters from chasing them. We go through one or two on every mission so we can always use a few more. Would you be willing to make us a dozen? I'm willing to pay you what I can for your assistance. ", "accepted": "I'm counting on you.", - "rejected": "Come back when you get a chance, we need skilled survivors.", + "rejected": "Come back when you get a chance. We need skilled survivors.", "advice": "Alcohol or lamp oil is probably easier to refine rather than find in large quantities.", "inquire": "Do you have the Molotov cocktails?", "success": "Thank you for the delivery.", diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 679d94f400235..64cf33e151cbd 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -1199,5 +1199,15 @@ { "point": [ 0, 0, 0 ], "overmap": "s_bike_shop_1_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_bike_shop_roof_1_north" } ] + }, + { + "type": "city_building", + "id": "gym", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "gym_north" }, + { "point": [ 0, 0, 1 ], "overmap": "gym_roof_north" }, + { "point": [ 0, 0, 2 ], "overmap": "gym_upper_roof_north" } + ] } ] diff --git a/data/json/overmap_terrain_recreational.json b/data/json/overmap_terrain_recreational.json index 8e0632163e36a..8fe149a40ff49 100644 --- a/data/json/overmap_terrain_recreational.json +++ b/data/json/overmap_terrain_recreational.json @@ -858,6 +858,20 @@ "copy-from": "generic_city_building", "color": "yellow_cyan" }, + { + "type": "overmap_terrain", + "id": "gym_roof", + "name": "boxing gym roof", + "copy-from": "generic_city_building", + "color": "yellow_cyan" + }, + { + "type": "overmap_terrain", + "id": "gym_upper_roof", + "name": "boxing gym roof", + "copy-from": "generic_city_building", + "color": "yellow_cyan" + }, { "type": "overmap_terrain", "id": "gym_fitness", diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index 219b056e45a5b..b103cb3d1e84b 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -71,7 +71,8 @@ [ "fat_tainted", 16 ], [ "lamp_oil", 1000 ] ] - ] + ], + "flags": [ "ALLOW_ROTTEN" ] }, { "result": "lamp_oil", diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 9f58f29fc5fe4..6e5cba80a9a17 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1395,7 +1395,8 @@ [ [ "tallow", 2 ], [ "lard", 2 ], [ "cooking_oil", 16 ], [ "cooking_oil2", 16 ] ], [ [ "lye", 2 ], [ "lye_powder", 75 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] - ] + ], + "flags": [ "ALLOW_ROTTEN" ] }, { "type": "recipe", diff --git a/src/bionics.cpp b/src/bionics.cpp index a22357104daa6..ba876640e8729 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -380,7 +380,7 @@ bool player::activate_bionic( int b, bool eff_only ) mod_moves( -100 ); } else if( bio.id == "bio_evap" ) { item water = item( "water_clean", 0 ); - water.reset_temp_check(); + water.set_item_temperature( 283.15 ); int humidity = weatherPoint.humidity; int water_charges = lround( humidity * 3.0 / 100.0 ); // At 50% relative humidity or more, the player will draw 2 units of water @@ -445,6 +445,7 @@ bool player::activate_bionic( int b, bool eff_only ) query_yn( _( "Extract water from the %s" ), colorize( it->tname(), it->color_in_inventory() ) ) ) { item water( "water_clean", calendar::turn, avail ); + water.set_item_temperature( 0.00001 * it->temperature ); if( g->consume_liquid( water ) ) { extracted = true; it->set_var( "remaining_water", static_cast( water.charges ) );