From 0f30a4382a840e05a0b76eae6cc9eca7b259ee83 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Thu, 2 Apr 2020 05:04:44 +0000 Subject: [PATCH] Misc cleanups --- build-scripts/build.sh | 2 +- data/json/items/gun/223.json | 2 +- .../maps/mapgen/millyficent_lab.json | 4 +- .../Aftershock/npcs/whately_dialogue.json | 4 +- .../blacklists/item_blacklist.json | 18 -- .../blacklists/recipes_blacklist.json | 267 ++++++++++++++++++ .../blacklists/trait_blacklist.json | 2 +- .../Dark-Skies-Above/monsters/mongun.json | 6 +- .../Dark-Skies-Above/monsters/monspell.json | 2 +- .../monsters/wild_aliens/strays.json | 4 +- .../furniture_terrain/indoor_furniture.json | 4 + .../furniture_terrain/outdoor-furniture.json | 4 +- .../overrides/items/electronic.json | 2 +- .../overrides/locations/evac_center.json | 35 ++- .../Dark-Skies-Above/snippets/fliers.json | 20 +- .../Dark-Skies-Above/snippets/newspaper.json | 12 +- .../mods/Dark-Skies-Above/snippets/radio.json | 2 +- .../Dark-Skies-Above/snippets/survnotes.json | 31 +- src/debug.cpp | 2 +- src/game.cpp | 2 +- src/lightmap.cpp | 1 + src/mutation.cpp | 6 +- src/player.cpp | 3 +- 23 files changed, 357 insertions(+), 78 deletions(-) create mode 100644 data/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 32b0ec7b84789..93bd0a0a3dfd9 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -146,7 +146,7 @@ then cd android # Specify dumb terminal to suppress gradle's constatnt output of time spent building, which # fills the log with nonsense. - TERM=dumb ./gradlew assembleRelease -Pj=$num_jobs -Plocalize=false -Pabi_arm_32=false -Pabi_arm_64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip + TERM=dumb ./gradlew assembleExperimentalRelease -Pj=$num_jobs -Plocalize=false -Pabi_arm_32=false -Pabi_arm_64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip else make -j "$num_jobs" RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0 diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 958cb9bf4d437..f3486ca6a41c4 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -213,7 +213,7 @@ "looks_like": "skorpion_61", "type": "GUN", "name": { "str": "OA-93" }, - "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.", + "description": "An AR-15 derivative pistol manufactured by Olympic Arms in the nineties. The main difference compared to the AR-15 is that the recoil spring has been moved to the top of the gun, circumventing the necessity for a solid buttstock.", "weight": "2023 g", "volume": "2135 ml", "price": 125000, diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index 820ffad36f229..5a49d6effcd0b 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -243,7 +243,8 @@ "x": "t_console_broken", "*": "t_utility_light", "w": "t_window_bars_curtains", - ">": "t_wood_stairs_down" + ">": "t_wood_stairs_down", + "_": "t_open_air" }, "furniture": { "T": "f_trashcan", @@ -272,6 +273,7 @@ "N": "f_NMR", "O": "f_MRI", "0": "f_CTscan", + "P": "f_dishwasher", "r": "f_rack", "s": "f_stool", "S": "f_sink", diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index cb9a3470e2877..c0a01a5004b8e 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -12,7 +12,7 @@ "context": "meeting", "value": "yes", "yes": [ "What did you bring me?", "Hello.", "How are you?", "Welcome!", "Do you smell something?" ], - "no": "New test subjects! I'm so glad you showed up!" + "no": "New test subjects! I'm so glad you showed up!" }, "responses": [ { @@ -57,7 +57,7 @@ { "type": "talk_topic", "id": "TALK_millyficent_place", - "dynamic_line": "Welcome to my lab! Here we explore the boundaries of the possible beyond the reach of small minds.", + "dynamic_line": "Welcome to my lab! Here we explore the boundaries of the possible beyond the reach of small minds.", "responses": [ { "text": "Can you give me something to eat then?", "topic": "TALK_millyficent_food" }, { "text": "Oh, okay.", "topic": "TALK_Millyficent_1" }, diff --git a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json index 544b4ae9376d9..4ee71013522cc 100644 --- a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json +++ b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json @@ -18,8 +18,6 @@ "20x66_inc", "20x66_shot", "20x66_slug", - "360_200_mag", - "360_400_mag", "5x50_100_mag", "5x50_50_mag", "5x50_hull", @@ -169,26 +167,11 @@ "iv_mutagen_ursine", "iv_purifier", "l_bak_223", - "l_base_223", - "l_car_223", - "l_dsr_223", - "l_enforcer_45", - "l_HFPack", - "l_lmg_223", - "l_long_45", - "l_lookout_9mm", - "l_mbr_223", - "l_mp_45", - "l_mp_9mm", - "l_sp_45", - "l_sp_9mm", "laser_pack", "laser_rifle", "leg", "light_atomic_battery_cell", "light_minus_atomic_battery_cell", - "lw12mag", - "lw21mag", "lwfeed", "marloss_berry", "marloss_gel", @@ -246,7 +229,6 @@ "rm2000_smg", "rm228", "rm298", - "rm360_carbine", "rm451_flamethrower", "rm51_assault_rifle", "rm614_lmg", diff --git a/data/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json new file mode 100644 index 0000000000000..c59bd717513d5 --- /dev/null +++ b/data/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json @@ -0,0 +1,267 @@ +[ + { + "type": "recipe", + "result": "faction_base_canteen_dining_center_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_dining_east_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_dining_west_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_pantry_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_room2_center_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_room_center_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_canteen_smoking_area_migo_resin", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_brewery0_migo_resin_southwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_ne_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_nw_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_se_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_shack_ne_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_shack_nw_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_shack_se_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_shack_sw_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_core_sw_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room0_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room1_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room2_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room4_migo_resin_east", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room4_migo_resin_northwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room4_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room4_migo_resin_southwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_room4_migo_resin_west", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_shack4_migo_resin_east", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_shack4_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_shack4_migo_resin_southwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_hub_shack4_migo_resin_west", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_coop_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_shack_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable0_migo_resin_southwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable1_migo_resin_west", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_livestock_stable2_migo_resin_northwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_saltpan_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_shack_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_east", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_north", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_northwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_south", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_southwest", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_storehouse_migo_resin_west", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room0_migo_resin_northeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room11to12_migo_resin_southeast", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room3_migo_resin_north", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room4_migo_resin_east", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room5_migo_resin_center", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room6_migo_resin_north", + "obsolete": true + }, + { + "type": "recipe", + "result": "faction_base_modular_workshop_room7to9_migo_resin_northwest", + "obsolete": true + } +] diff --git a/data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json index 3074ac0086318..d1c77de91e563 100644 --- a/data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json +++ b/data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json @@ -1,7 +1,7 @@ [ { "//": "no need for robust genetics atm", - "type": "ITEM_BLACKLIST", + "type": "TRAIT_BLACKLIST", "traits": [ "ROBUST" ] } ] diff --git a/data/mods/Dark-Skies-Above/monsters/mongun.json b/data/mods/Dark-Skies-Above/monsters/mongun.json index be2019c0b8734..df0a1b5f77bfb 100644 --- a/data/mods/Dark-Skies-Above/monsters/mongun.json +++ b/data/mods/Dark-Skies-Above/monsters/mongun.json @@ -18,7 +18,7 @@ "symbol": "/", "color": "red", "name": { "str": "fake firecannon" }, - "description": "Fires an explosive bolt of firey energy. If you're seeing this, it's a bug.", + "description": "Fires an explosive bolt of firey energy. If you're seeing this, it's a bug.", "skill": "launcher", "range": 15, "ranged_damage": 5, @@ -32,7 +32,7 @@ "symbol": "/", "color": "red", "name": { "str": "fake smokegun" }, - "description": "Shoots dangerous radioactive gas. If you're seeing this, it's a bug.", + "description": "Shoots dangerous radioactive gas. If you're seeing this, it's a bug.", "skill": "launcher", "range": 10, "flags": [ "NEVER_JAMS" ], @@ -45,7 +45,7 @@ "symbol": "/", "color": "red", "name": { "str": "fake riotgun" }, - "description": "Shoots pacification gas. If you're seeing this, it's a bug.", + "description": "Shoots pacification gas. If you're seeing this, it's a bug.", "skill": "launcher", "range": 25, "flags": [ "NEVER_JAMS" ], diff --git a/data/mods/Dark-Skies-Above/monsters/monspell.json b/data/mods/Dark-Skies-Above/monsters/monspell.json index 8921f36f6d776..216e94c4ca33c 100644 --- a/data/mods/Dark-Skies-Above/monsters/monspell.json +++ b/data/mods/Dark-Skies-Above/monsters/monspell.json @@ -67,7 +67,7 @@ "type": "SPELL", "id": "dks_spell_mindblast", "name": "psi mindblast", - "description": "blasts a target with a wave of disorienting psionic energy. has random effects", + "description": "blasts a target with a wave of disorienting psionic energy. has random effects", "valid_targets": [ "hostile" ], "message": "", "effect": "none", diff --git a/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json b/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json index 3287f540948f4..6d3dfa42d1623 100644 --- a/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json +++ b/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json @@ -29,7 +29,7 @@ "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ], "death_drops": "mon_zombie_hulk_death_drops", "death_function": [ "NORMAL" ], - "upgrades": { "half_life": 10, "into": "DKS_GROUP_STRAY_UPGRADE" }, + "upgrades": { "half_life": 10, "into_group": "DKS_GROUP_STRAY_UPGRADE" }, "burn_into": "dks_mon_stray_burnt", "flags": [ "SEES", @@ -98,7 +98,7 @@ "id": "dks_mon_stray_fast", "type": "MONSTER", "name": "stray sprinter", - "description": "This once-shambling human body has become subtly toned, and though its still appears caught between putrefying on the spot and living, it now moves with a hint of animal cunning. A tightened mouth surrounds gnashing teeth as it hunts for fresh meat with more intensity than those around it.", + "description": "This once-shambling human body has become subtly toned, and though its still appears caught between putrefying on the spot and living, it now moves with a hint of animal cunning. A tightened mouth surrounds gnashing teeth as it hunts for fresh meat with more intensity than those around it.", "default_faction": "stray", "looks_like": "mon_zombie_runner", "bodytype": "human", diff --git a/data/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json b/data/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json index 691ad164b9879..194df73660fe5 100644 --- a/data/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json +++ b/data/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json @@ -5,6 +5,8 @@ "id": "t_plut_generator", "copy-from": "t_plut_generator", "name": "Edison generator", + "symbol": "0", + "color": "light_green", "description": "This imposing apparatus harnesses 'atmospheric charges', or at least thats what the news said when these things came out. Pioneered by Elton Moosek and his Bluebox team, these were immediately snapped up by the government due to their potential to generate near limitless power. It's not doing much good here though. Perhaps it could be salvaged for other purposes.", "deconstruct": { "ter_set": "t_concrete", @@ -26,6 +28,8 @@ "id": "f_dresser", "copy-from": "f_dresser", "name": "dresser", + "symbol": "{", + "color": "brown", "description": "Dress yourself!" } ] diff --git a/data/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json b/data/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json index 646f31a041806..4983ffca891a4 100644 --- a/data/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json +++ b/data/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json @@ -4,6 +4,8 @@ "id": "f_mutpoppy", "copy-from": "f_mutpoppy", "name": "poppy bush", - "description": "An invasive species brought to Earth by the invaders and found it quite to its liking. It spiny, writhing fronds make it look more like a jungle bush than a conventional poppy except for its red petals, but is named after such due to its similar medicinal properties. It exudes a potent, sleep inducing aroma." + "symbol": "f", + "color": "light_red", + "description": "An invasive species brought to Earth by the invaders and found it quite to its liking. It spiny, writhing fronds make it look more like a jungle bush than a conventional poppy except for its red petals, but is named after such due to its similar medicinal properties. It exudes a potent, sleep inducing aroma." } ] diff --git a/data/mods/Dark-Skies-Above/overrides/items/electronic.json b/data/mods/Dark-Skies-Above/overrides/items/electronic.json index 9ac5410d1c44b..6febc2544aefc 100644 --- a/data/mods/Dark-Skies-Above/overrides/items/electronic.json +++ b/data/mods/Dark-Skies-Above/overrides/items/electronic.json @@ -4,7 +4,7 @@ "type": "TOOL", "name": { "str": "smartphone" }, "copy-from": "smart_phone", - "description": "A popular, fancy smartphone. Capable of making photos due to integrated camera and illuminating an area as per its flashlight app, assuming it has enough charge. The smartphone also has a clock app that includes an alarm. Runs on a small, proprietary power cell that needs a specialized charger. That is to say, is quite difficult to recharge post-Cataclysm.", + "description": "A popular, fancy smartphone. Capable of making photos due to integrated camera and illuminating an area as per its flashlight app, assuming it has enough charge. The smartphone also has a clock app that includes an alarm. Runs on a small, proprietary power cell that needs a specialized charger. That is to say, is quite difficult to recharge post-Cataclysm.", "delete": { "flags": [ "USE_UPS" ] } }, { diff --git a/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json b/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json index f070b29e88f95..897624ab0d27e 100644 --- a/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json +++ b/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json @@ -169,7 +169,7 @@ " c 6 ", " " ], - "terrain": { " ": "t_null" }, + "terrain": { " ": "t_null", "6": "t_console" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { @@ -215,7 +215,7 @@ " | =........c..x| ", " |||||:||+|:||||| " ], - "terrain": { "x": "t_console_broken" }, + "terrain": { "x": "t_console_broken", "=": "t_door_locked_interior", "6": "t_console", ":": "t_window_domestic", "+": "t_door_c" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { @@ -319,7 +319,7 @@ " l ", " " ], - "terrain": { " ": "t_null" }, + "terrain": { " ": "t_null", "6": "t_console" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }, "computers": { @@ -365,7 +365,14 @@ " |..........|..l| ", " |||||:||+|:||||| " ], - "terrain": { "x": "t_console_broken" }, + "terrain": { + "x": "t_console_broken", + "+": "t_door_c", + ":": "t_window", + "-": "t_wall_w", + "=": "t_door_locked_interior", + "6": "t_console" + }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { @@ -421,7 +428,8 @@ ":": [ "t_window_frame", "t_window" ], "+": [ "t_door_c", "t_door_b" ], "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "6": "t_console_broken" + "6": "t_console_broken", + "-": "t_wall_w" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" }, "items": { @@ -465,7 +473,7 @@ " c ", " " ], - "terrain": { " ": "t_null" }, + "terrain": { " ": "t_null", "6": "t_console" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } } } @@ -502,7 +510,15 @@ " ||||||||||......c| ", " ||:|+|:|| " ], - "terrain": { "x": "t_console_broken" }, + "terrain": { + "x": "t_console_broken", + "-": "t_wall_w", + "=": "t_door_locked_interior", + "6": "t_console", + ":": "t_window_domestic", + "+": "t_door_c", + "*": "t_ladder_up" + }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" }, "computers": { "6": { @@ -562,7 +578,10 @@ ":": [ "t_window_frame", "t_window" ], "+": [ "t_door_c", "t_door_b" ], "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ], - "6": [ "t_console", "t_console_broken" ] + "6": [ "t_console", "t_console_broken" ], + "-": "t_wall_w", + "*": "t_ladder_up", + "x": "t_console_broken" }, "furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" }, "items": { diff --git a/data/mods/Dark-Skies-Above/snippets/fliers.json b/data/mods/Dark-Skies-Above/snippets/fliers.json index 1a4ad838bc332..c4484b0b19093 100644 --- a/data/mods/Dark-Skies-Above/snippets/fliers.json +++ b/data/mods/Dark-Skies-Above/snippets/fliers.json @@ -51,7 +51,7 @@ }, { "id": "dks_flier_14", - "text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Travel in groups and avoid crowds. Avoid hostile forces at all costs.\"" + "text": "This is a government-issued, air-dropped alert. \"EVACUATION ALERT. Please make your way to the nearest FEMA evacuation shelter. Travel in groups and avoid crowds. Avoid hostile forces at all costs.\"" }, { "id": "dks_flier_15", @@ -71,15 +71,15 @@ }, { "id": "dks_flier_19", - "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Do not continue to fight. Fugitives will be charged with malcompliant destabilizaion if they do not surrender to their nearest safety office at once. Join our New Order. Do not live in squalor. Witness what we can do *together*.\" Pictured is one of the Designated Living Zones, a city and its surrounding areas set aside specifically for humans. Underneath is listed some of the many qualities of the DLZs: safety, cleanliness, opprotunity, and so on." + "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Do not continue to fight. Fugitives will be charged with malcompliant destabilizaion if they do not surrender to their nearest safety office at once. Join our New Order. Do not live in squalor. Witness what we can do *together*.\" Pictured is one of the Designated Living Zones, a city and its surrounding areas set aside specifically for humans. Underneath is listed some of the many qualities of the DLZs: safety, cleanliness, opprotunity, and so on." }, { "id": "dks_flier_20", - "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Do not continue to fight. Surrender to your nearest surveillance drone for immediate evacuation to a designated civilian zone. Join our New Order. Witness what we can do *together*.\" Pictured is the president, along with several other 'smiling' world leaders, standing next to multiple cloaked creatures." + "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Do not continue to fight. Surrender to your nearest surveillance drone for immediate evacuation to a designated civilian zone. Join our New Order. Witness what we can do *together*.\" Pictured is the president, along with several other 'smiling' world leaders, standing next to multiple cloaked creatures." }, { "id": "dks_flier_21", - "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Resistance will be met with lethal deterrence. Do not throw away your potential. Join our New Order. Witness what we can do *together*.\" Pictured is a smiling family of humans standing in front of an alien soldier." + "text": "This very recent looking air-dropped alert. \"THE WAR IS OVER. Resistance will be met with lethal deterrence. Do not throw away your potential. Join our New Order. Witness what we can do *together*.\" Pictured is a smiling family of humans standing in front of an alien soldier." }, { "id": "dks_flier_22", @@ -104,15 +104,15 @@ }, { "id": "dks_flier_28", - "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms." + "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms." }, { "id": "dks_flier_29", - "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"TRAITORS\" in marker across the front." + "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"TRAITORS\" in marker across the front." }, { "id": "dks_flier_30", - "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"FAIR WEATHER SOLDIERS\" across the front." + "text": "This is very recent looking air-dropped alert. \"HERE FOR YOU\" is written in somewhat imposing text at the bottom of a depiction of several smiling humans wearing Occupation uniforms. Someone has scrawled \"FAIR WEATHER SOLDIERS\" across the front." }, { "id": "dks_flier_31", @@ -224,15 +224,15 @@ }, { "id": "dks_flier_58", - "text": "This is a propaganda poster from only a few weeks before the evacuation orders. A parent dressed in military fatigues hugs their partner goodbye as their smiling children look on. \"Enlist today. Take you freedom in your own hands.\"" + "text": "This is a propaganda poster from only a few weeks before the evacuation orders. A parent dressed in military fatigues hugs their partner goodbye as their smiling children look on. \"Enlist today. Take your freedom in your own hands.\"" }, { "id": "dks_flier_59", - "text": "This is a propaganda poster from only a few weeks before the evacuation orders. A handsome looking person dressed in military fatigues exercises along with several other people. \"Enlist today.\"" + "text": "This is a propaganda poster from only a few weeks before the evacuation orders. A handsome looking person dressed in military fatigues exercises along with several other people. \"Enlist today.\"" }, { "id": "dks_flier_60", - "text": "This is a propaganda poster from only a few weeks before the evacuation orders. Someone in military fatigues is helping someonestand up. \"Enlist today and become a community leader.\"" + "text": "This is a propaganda poster from only a few weeks before the evacuation orders. Someone in military fatigues is helping someone stand up. \"Enlist today and become a community leader.\"" }, { "id": "dks_flier_61", diff --git a/data/mods/Dark-Skies-Above/snippets/newspaper.json b/data/mods/Dark-Skies-Above/snippets/newspaper.json index 83e266e36345a..f3bd81a1f69f9 100644 --- a/data/mods/Dark-Skies-Above/snippets/newspaper.json +++ b/data/mods/Dark-Skies-Above/snippets/newspaper.json @@ -39,7 +39,7 @@ }, { "id": "dks_years_old_news_5", - "text": "BIG BREAK. At the pressure of tech moguls like Elton Moosek, a new bipartisan bill has set aside a big boost for long underfunded NASA. \"It's time we started looking at opportunities beyond our own atmosphere,\" says a spokesperson for Edison Automotives. This space fad is no doubt tied to a new collaborative in the tech industry, secretively nicknamed \"Project Bluebox.\"" + "text": "BIG BREAK. At the pressure of tech moguls like Elton Moosek, a new bipartisan bill has set aside a big boost for long underfunded NASA. \"It's time we started looking at opportunities beyond our own atmosphere,\" says a spokesperson for Edison Automotives. This space fad is no doubt tied to a new collaborative in the tech industry, secretively nicknamed \"Project Bluebox.\"" } ] }, @@ -73,7 +73,7 @@ }, { "id": "dks_one_year_old_news_8", - "text": "'SPACE AGE AESTHETIC'. After much buzz in the tech world about \"Project Bluebox\", a new line of what is being termed as 'space-age aesthetic' products have been demoed to a select group of potential investors, particularly NASA administrators. \"The public can look forward to new cutting edge devices hitting the shelves within a year. Prepare to have your horizons broadened.\" a spokesperson said mysteriously this Monday, standing in front of a display case with heavily tinted glass." + "text": "'SPACE AGE AESTHETIC'. After much buzz in the tech world about \"Project Bluebox\", a new line of what is being termed as 'space-age aesthetic' products have been demoed to a select group of potential investors, particularly NASA administrators. \"The public can look forward to new cutting edge devices hitting the shelves within a year. Prepare to have your horizons broadened.\" a spokesperson said mysteriously this Monday, standing in front of a display case with heavily tinted glass." }, { "id": "dks_one_year_old_news_9", @@ -91,7 +91,7 @@ "text": [ { "id": "dks_months_old_news_1", - "text": "SUPPORT THE COUNTRIES THAT SUPPORT YOURS: Washington has announced the deployment of additional soldiers to key locations in East Asia following Chinese joint military exercises with North Korea. \"We pledge our support to our allies, no matter where they are,\" the president said today in a press statement. Our survey results show that the public is more than 56% in favor of a war with China, up 2% from where it was last month." + "text": "SUPPORT THE COUNTRIES THAT SUPPORT YOURS: Washington has announced the deployment of additional soldiers to key locations in East Asia following Chinese joint military exercises with North Korea. \"We pledge our support to our allies, no matter where they are,\" the president said today in a press statement. Our survey results show that the public is more than 56% in favor of a war with China, up 2% from where it was last month." }, { "id": "dks_months_old_news_2", @@ -107,7 +107,7 @@ }, { "id": "dks_months_old_news_5", - "text": "SUNNY FUTURES. Edison Automotives released a new line of solar-powered vehicles today, as part of their 'space age aesthetic' initative. \"This is big news for everybody, no less those concerned with global warming as it stands. We could see massive cutbacks in atmospheric carbon dioxide,\" said a spokesperson during the meeting." + "text": "SUNNY FUTURES. Edison Automotives released a new line of solar-powered vehicles today, as part of their 'space age aesthetic' initative. \"This is big news for everybody, no less those concerned with global warming as it stands. We could see massive cutbacks in atmospheric carbon dioxide,\" said a spokesperson during the meeting." }, { "id": "dks_months_old_news_6", @@ -121,11 +121,11 @@ "text": [ { "id": "dks_weeks_old_news_1", - "text": "CHINESE AGGRESSION: China took the offensive last week on the country’s disputed border with India, seizing a local village along an important highway. While there was no violence, the UN is scrambling to ease tensions, calling the move \"Hostile for hostility's sake.\" China claims that British land treaties support their actions, saying that they were merely taking back what was rightfully theirs. This has done nothing to assuage national fears of open military conflict as the trade war begins to cut deep." + "text": "CHINESE AGGRESSION: China took the offensive last week on the country’s disputed border with India, seizing a local village along an important highway. While there was no violence, the UN is scrambling to ease tensions, calling the move \"Hostile for hostility's sake.\" China claims that British land treaties support their actions, saying that they were merely taking back what was rightfully theirs. This has done nothing to assuage national fears of open military conflict as the trade war begins to cut deep." }, { "id": "dks_weeks_old_news_2", - "text": "WILD WEATHER. Meteorologists are reported to be \"concerned\" by recent weather patterns, new survey says. Our own weatherman, Farhan Kishor, has this to say: \"Stock up on batteries and food and prepare to stay indoors for a while due to flooding and strong winds. Stay tuned to your local weather station for updates. We're in store for a big one, folks.\"" + "text": "WILD WEATHER. Meteorologists are reported to be \"concerned\" by recent weather patterns, new survey says. Our own weatherman, Farhan Kishor, has this to say: \"Stock up on batteries and food and prepare to stay indoors for a while due to flooding and strong winds. Stay tuned to your local weather station for updates. We're in store for a big one, folks.\"" }, { "id": "dks_weeks_old_news_3", diff --git a/data/mods/Dark-Skies-Above/snippets/radio.json b/data/mods/Dark-Skies-Above/snippets/radio.json index 8a271e79ecc9b..1653767610866 100644 --- a/data/mods/Dark-Skies-Above/snippets/radio.json +++ b/data/mods/Dark-Skies-Above/snippets/radio.json @@ -9,7 +9,7 @@ "This is …kssht… we're holding the line so that …kssht… it's been a pleasure to serve, but there's too many of them …kssht… God bless America…", "Attention. Attention. Do not fight. Do not resist. Become one with the family. Surrender. Recieve care. Be loved. Live. Do not throw your life away. Do not fight. Do not resist. Attention. Attention.", "This is an emergency broadcast from the National Emergency Alert System. This is not a test. Unknown military forces have been spotted nationwide. They are confirmed by law enforcement officials to be hostile. Please proceed to your local community shelter. If you are not in an evacuation zone, officials highly recommend you pack gear for evacuation. Make sure to include clean clothes, a blanket, and enough food and water to last a few days. More information will be released as it becomes available.", - "This is an emergency broadcast from the National Emergency Alert System. This is not a test. Seek immediate shelter. Multiple missile launches have been confirmed to be target designated military targets, including in urban areas. Seek immediate shelter. If a community shelter is not available, alternative shelter locations are basements, beneath stairwells, or central rooms with no windows. Ensure that you have sufficient protection from falling debris. Ensure that you have food and water for at least one week. Repeat. Seek immediate shelter." + "This is an emergency broadcast from the National Emergency Alert System. This is not a test. Seek immediate shelter. Multiple missile launches have been confirmed to be target designated military targets, including in urban areas. Seek immediate shelter. If a community shelter is not available, alternative shelter locations are basements, beneath stairwells, or central rooms with no windows. Ensure that you have sufficient protection from falling debris. Ensure that you have food and water for at least one week. Repeat. Seek immediate shelter." ] } ] diff --git a/data/mods/Dark-Skies-Above/snippets/survnotes.json b/data/mods/Dark-Skies-Above/snippets/survnotes.json index a60fdb02c35f6..ca0d47739fec8 100644 --- a/data/mods/Dark-Skies-Above/snippets/survnotes.json +++ b/data/mods/Dark-Skies-Above/snippets/survnotes.json @@ -37,10 +37,10 @@ "text": "\"When I think of the aliens I get mad, because I was supposed to be the next big leader. WHERES MY CHANCE!??\"" }, { "id": "dks_note_13", "text": "\"They stopped me at the edge of town, said they wanted to make a deal…\"" }, - { "id": "dks_note_14", "text": "\"robots cant smell. youll thank me later\"" }, + { "id": "dks_note_14", "text": "\"robots cant smell. youll thank me later\"" }, { "id": "dks_note_15", - "text": "\"Hey. Everyone reading this. Life isn't so bad with them. People just need to read up on their capitals if you catch my drift.\"" + "text": "\"Hey. Everyone reading this. Life isn't so bad with them. People just need to read up on their capitals if you catch my drift.\"" }, { "id": "dks_note_16", "text": "\"goddamn piece of shit gun doesnt fucking work\"" }, { @@ -73,14 +73,14 @@ { "id": "dks_note_26", "text": "\"This isn't real this is a test to turn you into a Manchurian Candidate!\"" }, { "id": "dks_note_27", - "text": "\"they sold us all down the river real fast huh? they're on the radio near washington.\"" + "text": "\"they sold us all down the river real fast huh? they're on the radio near washington.\"" }, { "id": "dks_note_28", "text": "\"Some of 'em are big. Real big. Don't stick around, I saw my mate get fucking torn in half!\"" }, { "id": "dks_note_29", "text": "\"po p y fl ow er s don t ea at them\"" }, - { "id": "dks_note_30", "text": "\"saw some of ours with them. traitor traitor traitor\"" }, + { "id": "dks_note_30", "text": "\"saw some of ours with them. traitor traitor traitor\"" }, { "id": "dks_note_31", "text": "\"did they break all the fucking lawnmowers?!\"" }, { "id": "dks_note_32", @@ -107,7 +107,10 @@ "text": "\"Why would you hide in a farm? Sure, it's isolated, but if they know where you are, you don't exactly have cover on all sides.\"" }, { "id": "dks_note_41", "text": "\"earth wasn't the first\"" }, - { "id": "dks_note_42", "text": "\"bullet holes and plasma burns all over the car. piece of shit hardly runs\"" }, + { + "id": "dks_note_42", + "text": "\"bullet holes and plasma burns all over the car. piece of shit hardly runs\"" + }, { "id": "dks_note_43", "text": "\"one day this will all be over.\"" }, { "id": "dks_note_44", @@ -145,7 +148,7 @@ { "id": "dks_note_59", "text": "\"got close to one of their ships and i feel crawly inside\"" }, { "id": "dks_note_60", - "text": "\"Remember history class with the invaders and their disesases? yeah… my gut doesn't feel right… like it's moving…\"" + "text": "\"Remember history class with the invaders and their disesases? yeah… my gut doesn't feel right… like it's moving…\"" }, { "id": "dks_note_61", @@ -202,7 +205,7 @@ { "id": "dks_note_80", "text": "\"THE MARLEY WAS RIGHT\"" }, { "id": "dks_note_81", - "text": "\"We surrendered to them and they're treating us well. I don't know why I was hiding all that time. \"" + "text": "\"We surrendered to them and they're treating us well. I don't know why I was hiding all that time.\"" }, { "id": "dks_note_82", "text": "\"how long were they watching us?\"" }, { @@ -240,7 +243,7 @@ }, { "id": "dks_note_95", - "text": "\"Crawled in through the vents. Whole office building is a wreck. Saved some, turned their guns on others.\"" + "text": "\"Crawled in through the vents. Whole office building is a wreck. Saved some, turned their guns on others.\"" }, { "id": "dks_note_96", @@ -248,7 +251,7 @@ }, { "id": "dks_note_96a", - "text": "\"Occupants are everywhere. Do NOT let those fucking drones see you. They'll alert the others with sirens and lights\"" + "text": "\"Occupants are everywhere. Do NOT let those fucking drones see you. They'll alert the others with sirens and lights\"" }, { "id": "dks_note_97", @@ -278,7 +281,7 @@ { "id": "dks_note_107", "text": "\"My skin is crawling and I teleport every few minutes… what is going o\"" }, { "id": "dks_note_108", - "text": "\"Occupiers crawling all over the place. Have reinforcement points all over. Could take them out. Might buy us some time in some places.\"" + "text": "\"Occupiers crawling all over the place. Have reinforcement points all over. Could take them out. Might buy us some time in some places.\"" }, { "id": "dks_note_109", @@ -295,7 +298,7 @@ "text": "\"This thing isn't a car any more. It's just a fucking mountain of metal on wheels, which I live in.\"" }, { "id": "dks_note_114", "text": "\"if you hear tires: run\"" }, - { "id": "dks_note_115", "text": "\"get on the roofs. they might see you but they can't climb.\"" }, + { "id": "dks_note_115", "text": "\"get on the roofs. they might see you but they can't climb.\"" }, { "id": "dks_note_116", "text": "\"i'm running out of ink but listen you need to\"" }, { "id": "dks_note_117", @@ -333,7 +336,7 @@ }, { "id": "dks_note_136", - "text": "\"made a movie out of some footage of the war. two days cut down into seven hours.\"" + "text": "\"made a movie out of some footage of the war. two days cut down into seven hours.\"" }, { "id": "dks_note_137", @@ -343,7 +346,7 @@ "id": "dks_note_138", "text": "\"if anyones reading this, please tell my mom i was right about robots being superior\"" }, - { "id": "dks_note_139", "text": "\"heard a kid whispering to me from inside a garage. i fucking bolted\"" }, + { "id": "dks_note_139", "text": "\"heard a kid whispering to me from inside a garage. i fucking bolted\"" }, { "id": "dks_note_140", "text": "\"waded through 14 miles of sewage for playboy magazine, wasnt worth it\"" }, { "id": "dks_note_141", @@ -401,7 +404,7 @@ { "id": "dks_note_164", "text": "\"all it takes to seal a wound is a sawblade and a match! trust me\"" }, { "id": "dks_note_165", - "text": "\"is it just me or are we healing faster? i think they put something in the water...\"" + "text": "\"is it just me or are we healing faster? i think they put something in the water…\"" }, { "id": "dks_note_166", "text": "\"the 50cal is strong with this one\"" }, { diff --git a/src/debug.cpp b/src/debug.cpp index 121c8799331a9..18dc274ca3920 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -983,7 +983,7 @@ std::string game_info::operating_system() #endif } -#if !defined(__CYGWIN__) && ( defined (__linux__) || defined(unix) || defined(__unix__) || defined(__unix) || ( defined(__APPLE__) && defined(__MACH__) ) || defined(BSD) ) // linux; unix; MacOs; BSD +#if !defined(__CYGWIN__) && !defined (__ANDROID__) && ( defined (__linux__) || defined(unix) || defined(__unix__) || defined(__unix) || ( defined(__APPLE__) && defined(__MACH__) ) || defined(BSD) ) // linux; unix; MacOs; BSD /** Execute a command with the shell by using `popen()`. * @param command The full command to execute. * @note The output buffer is limited to 512 characters. diff --git a/src/game.cpp b/src/game.cpp index d0bacd309aee3..a718370969848 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -888,7 +888,7 @@ vehicle *game::place_vehicle_nearby( const vproto_id &id, const point &origin, i find_params.min_distance = min_distance; find_params.search_range = max_distance; // if player spawns underground, park their car on the surface. - const tripoint omt_origin( origin.x, origin.y, 0 ); + const tripoint omt_origin( origin, 0 ); for( const tripoint &goal : overmap_buffer.find_all( omt_origin, find_params ) ) { // try place vehicle there. tinymap target_map; diff --git a/src/lightmap.cpp b/src/lightmap.cpp index 2ff5e9ac711b3..db6a5ac6cfec9 100644 --- a/src/lightmap.cpp +++ b/src/lightmap.cpp @@ -1242,6 +1242,7 @@ float fastexp( float x ) int i; } u, v; #pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" #pragma GCC diagnostic ignored "-Wpragmas" #pragma GCC diagnostic ignored "-Wimplicit-int-float-conversion" u.i = static_cast( 6051102 * x + 1056478197 ); diff --git a/src/mutation.cpp b/src/mutation.cpp index 19fd29eebb1c4..3ba4d42ef1a33 100644 --- a/src/mutation.cpp +++ b/src/mutation.cpp @@ -1445,10 +1445,10 @@ void test_crossing_threshold( Character &guy, const mutation_category_trait &m_c } } -bool are_conflicting_traits( const trait_id &trait_1, const trait_id &trait_2 ) +bool are_conflicting_traits( const trait_id &trait_a, const trait_id &trait_b ) { - return ( are_opposite_traits( trait_1, trait_2 ) || b_is_lower_trait_of_a( trait_1, trait_2 ) - || b_is_higher_trait_of_a( trait_1, trait_2 ) || are_same_type_traits( trait_1, trait_2 ) ); + return ( are_opposite_traits( trait_a, trait_b ) || b_is_lower_trait_of_a( trait_a, trait_b ) + || b_is_higher_trait_of_a( trait_a, trait_b ) || are_same_type_traits( trait_a, trait_b ) ); } bool are_opposite_traits( const trait_id &trait_a, const trait_id &trait_b ) diff --git a/src/player.cpp b/src/player.cpp index 16a1beed19ceb..86b2c302a1e62 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -3370,8 +3370,7 @@ bool character_martial_arts::pick_style( const avatar &you ) // Style selection uilist kmenu; kmenu.text = colorize( string_format( _( "Select a style. " - "Press [%s] for more info." ), - "Press %s for more info.", + "Press %s for more info." ), ctxt.get_desc( "SHOW_DESCRIPTION" ) ), c_white ); ma_style_callback callback( static_cast( STYLE_OFFSET ), selectable_styles ); kmenu.callback = &callback;