Skip to content

Commit

Permalink
Misc cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevingranade @ZhilkinSerg
kevingranade authored and ZhilkinSerg committed Apr 2, 2020
1 parent 6804a62 commit 0f30a43
Show file tree
Hide file tree
Showing 23 changed files with 357 additions and 78 deletions.
2 changes: 1 addition & 1 deletion build-scripts/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/223.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion data/mods/Aftershock/maps/mapgen/millyficent_lab.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/npcs/whately_dialogue.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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" },
Expand Down
18 changes: 0 additions & 18 deletions data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
"20x66_inc",
"20x66_shot",
"20x66_slug",
"360_200_mag",
"360_400_mag",
"5x50_100_mag",
"5x50_50_mag",
"5x50_hull",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -246,7 +229,6 @@
"rm2000_smg",
"rm228",
"rm298",
"rm360_carbine",
"rm451_flamethrower",
"rm51_assault_rifle",
"rm614_lmg",
Expand Down
267 changes: 267 additions & 0 deletions data/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
]
2 changes: 1 addition & 1 deletion data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"//": "no need for robust genetics atm",
"type": "ITEM_BLACKLIST",
"type": "TRAIT_BLACKLIST",
"traits": [ "ROBUST" ]
}
]
Loading

0 comments on commit 0f30a43

Please sign in to comment.