From 2a836e1bbea5d0a62ee541a209ee69dc24a5aca8 Mon Sep 17 00:00:00 2001 From: Ferride <78005870+Ferride@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:13:29 -0600 Subject: [PATCH 001/130] Create polymer_plant --- data/json/mapgen/polymer_plant | 408 +++++++++++++++++++++++++++++++++ 1 file changed, 408 insertions(+) create mode 100644 data/json/mapgen/polymer_plant diff --git a/data/json/mapgen/polymer_plant b/data/json/mapgen/polymer_plant new file mode 100644 index 0000000000000..fad8d16e67386 --- /dev/null +++ b/data/json/mapgen/polymer_plant @@ -0,0 +1,408 @@ +[ + { + "type": "monstergroup", + "name": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", + "default": "mon_zombie_technician", + "monsters": [ + { "monster": "mon_zombie_technician", "freq": 300, "cost_multiplier": 3 }, + { "monster": "mon_zombie_hazmat", "freq": 200, "cost_multiplier": 3 }, + { "monster": "mon_zombie_electric", "freq": 100, "cost_multiplier": 5 }, + { "monster": "mon_skitterbot", "freq": 100, "cost_multiplier": 5 }, + { "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 5 } + ] + }, + { + "id": "repair_storage", + "type": "item_group", + "subtype": "collection", + "items": [ + { "group": "tools_common", "prob": 50 }, + { "group": "tools_electronics", "prob": 50 }, + { "group": "tools_lighting_industrial", "prob": 20 }, + { "group": "supplies_electronics", "prob": 50 }, + { "group": "hardware", "prob": 75 }, + { "group": "hardware_plumbing", "prob": 75 } + ] + }, + { + "type": "item_group", + "id": "decontamination", + "subtype": "collection", + "items": [ + { "item": "soap", "prob": 20 }, + { "item": "towel", "prob": 20 }, + { "item": "saline", "prob": 20 }, + { "item": "detergent", "prob": 20 }, + { "item": "mop", "prob": 10 }, + { "item": "boots_rubber", "prob": 10 }, + { "item": "gloves_rubber", "prob": 20 } + ] + }, + { + "type": "item_group", + "id": "packaging", + "subtype": "collection", + "items": [ + { "item": "bag_plastic", "prob": 90 }, + { "item": "bubblewrap", "prob": 60 }, + { "item": "box_small", "prob": 40 }, + { "item": "wrapper", "prob": 60 }, + { "item": "paper", "prob": 10 }, + { "item": "cup_plastic", "prob": 10 }, + { "item": "styrofoam_cup", "prob": 10 } + ] + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "irradiator_1_3", "irradiator_1_2", "irradiator_1_1" ], + [ "irradiator_1_6", "irradiator_1_5", "irradiator_1_4" ], + [ "irradiator_1_9", "irradiator_1_8", "irradiator_1_7" ] + ], + "weight": 250, + "object": { + "fill_ter": "t_strconc_floor", + "rows": [ + "''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''", + "'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'", + "'f***************************mmmmmmmmmmm******************************f'", + "'f**|--------------------------------------------------------------|**f'", + "'f**|qq c|c c|c c|c | f cc fTTf cc f |XXXXxXXXXXXXXXXXXX|**f'", + "'f**|- c|c c|c c|c | mmmm f ffff f mmmm |XM )!!!!!!!!!QX|**f'", + "'f**|qq c|c c|c c|c | mm/m G G m/mm |XM )!UUUUUUPPPX|**f'", + "'f**|qq c|c c|c c|c | mmmm f h f mmmm |XM )!UUUUUUPPPX|**f'", + "'f**|- -|- -|- -|- | f xxx f |X )!!!!!!!!!PX|**f'", + "'f**|qq |------4NN--------NN4------|X XXXXXXXXXXXXXXX|**f'", + "'f**|------------NN4-| |4NN---------------|**f'", + "'f**|MMMMMMMM4 4ZZPPPZZPPP|**f'", + "'f**|M PP N PPPXXXXXXX4NXXXXXXXXPPP N xP|**f'", + "'f**|MP PPPPP|----==-------XXXXXXXXNXXXXXXXX-----==-----|PPZPPPZPPP|**f'", + "'f**|TTTTTTTT| C K KXXXXXXX!Q!!!!!Q!XXXXXX J |TTTTTTTTTT|**f'", + "'f**|--------4 C K KKKXCCMMCX!!UUUUU!!XMMCCX J J C 4----------|**f'", + "'f**| N C K KXCXXXCX!!UUUUU!!XCXXCX J J C N |**f'", + "'f**| CCCCCCCMCC C CC1 XXCCCCCC3CCCCCCX 2 M CCMCCCCCCCCC |**f'", + "'f**| C N C K CCCC KXXXX!!UUUUU!!XXX CCCCCCM J C N C |**f'", + "'f**| C |----4 C K KXXXX!!UUUUU!!XXX M J C 4------| C |**f'", + "'f**| C |j}hd| C K [KKKKXXXX!!!!!!!!!XXX WW[[ |j > Q| C |**f'", + "'f**| C |j S|----==-------XXXXXXRRRRRXXXXXX-----==-----|j >>>>| C |**f'", + "'f**| C |j = |AAAA xxx AA MM| = > >| C |**f'", + "'f**| C |---------------- |A h M| |--------| >>QQ| C |**f'", + "'f**| C |^ ^| |AAA MMMMM| |.......^|c >QQ| C |**f'", + "'f**| C |] x|x x|x ]| |---N------------| |. |c > >| C |**f'", + "'f**| C |] hd|dh hd|dh ]| |##| 4|rG Gr|B B| |. htth |dh >Q>| C |**f'", + "'f**| C |] x|x x|x ]| | |Y----))--|B B| |. htth |------| C |**f'", + "'f**| C |] hd|dh hd|dh ]| |F | 4dh hd|B B| + ^|< + ?| C |**f'", + "'f**| C |] x|x x|x ]| |V |YRRxR4YxR|-+-| | oaao + |--| C |**f'", + "'f**| C |^ + + + + | oaao ^|< + ?| C |**f'", + "'f**| C |----------------==|---|---++---|----==|---------------| C |**f'", + "'f**| C |M KKKKKKKKKKKK |A AAAAR RAAAA A| JJJJJJJJJJJ | C |**f'", + "'f**| CCMCC |A D D A|J CCCMCC |**f'", + "'f**| N C KKKKKKKKKKKK |A ^oo^R R^oo^ A|J JJW MMMMMCCCC N |**f'", + "'f**| 4 C |-------++-------|J J W MMMMM 4 |**f'", + "'f**| N C KKKKKKKKKKKK |gggR{{R R{{Rggg|J JJW MMMMMCCCC N |**f'", + "'f**| CCMCC |g%%D%%D D%%D%%g|J CCCMCC |**f'", + "'f**| C |M KKKKKKKKKKKK |gggR{{R R{{Rggg| WWWWWWWWWWW N C |**f'", + "'f**-NMN4---------------4NN----|---++---|---4NN----------------4NMN|**f'", + "'f**| C KKKKKKKKKKKKKKKK M|S R R S|M JJJJJJJJJJJJJJJJ C |**f'", + "'f**| C x|S R RhS|x C |**f'", + "'f**| CCCCCCCCCCCCCCCCCCCCCC M|S D D S|M CCCCCCCCCCCCCCCCCCCCCC |**f'", + "'f**| x|S R R S|x |**f'", + "'f**| KKKKKKKKKKKKKKKKKKKKK |ShR R S| JJJJJJJJJJJJJJJJJJJJJJ |**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|---4N---|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^oo oo^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^ ^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!R aa at R!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!R ta aa R!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^ ^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", + "'f**|!!!!!!!!!!!!ee!!!!!!!!!!!!|^oo oo^|!!!!!!!!!!!!ee!!!!!!!!!!!!|**f'", + "'f**|YYYYYYYYYYYY--YYYYYYYYYYYY----++----YYYYYYYYYYYY--YYYYYYYYYYYY-**f'", + "'f**L____________LL____________L***ss***L____________LL____________L**f'", + "'f**L____________LL____________L***ss***L____________LL____________L**f'", + "'f**L____________LL____________L**#ss#**L____________LL____________L**f'", + "'f**L____________LL____________L**#ss#**L____________LL____________L**f'", + "'f**L____________LL____________L***ss***L____________LL____________L**f'", + "'f**L__________________________L***ss***L__________________________L**f'", + "'f**L_________________________LssssssssssL_________________________L**f'", + "'f**L________________________Lss***sss**ssL________________________L**f'", + "'f**L_______________________Lss***#ss#***ssL_______________________L**f'", + "'f**L______________________Lss****#ss#****ssL______________________L**f'", + "'f**L_____________________Lss******ss******ssL_____________________L**f'", + "'f**L____________________Ls##ssss##ss##ssss##sL____________________L**f'", + "'f**L___________________Lss--w=w---DD---w=w--ssL___________________L**f'", + "'f**L__________________Lssswdh ^hx xhA hdwsssL__________________L**f'", + "'f**L__________________Lssswxh hd dh hxwsssL__________________L**f'", + "'f**L__________________Lsss--w-w---DD---w-w--sssL__________________L**f'", + "'ffffGGGGGGGGGGGGGGGGGGffffffffffffGGffffffffffffGGGGGGGGGGGGGGGGGGffff'", + "[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[", + "[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[" + ], + "terrain": { + "*": [ [ "t_region_groundcover_forest", 2 ], "t_region_shrub_decorative" ], + "'": [ "t_fence_barbed" ], + "X": [ "t_strconc_wall" ], + "+": [ "t_door_c" ], + "-": [ "t_strconc_wall" ], + ",": [ "t_strconc_floor" ], + "Q": [ "t_strconc_floor" ], + "=": [ "t_door_locked_alarm" ], + "D": [ "t_reinforced_door_glass_c" ], + "G": [ "t_chaingate_l" ], + "L": [ "t_pavement_y" ], + "O": [ "t_wall_glass" ], + "C": [ "t_conveyor" ], + "_": [ "t_pavement" ], + "f": [ "t_chainfence_h" ], + "s": [ "t_sidewalk" ], + "w": [ "t_window" ], + "|": [ "t_strconc_wall" ], + "U": [ "t_water_pool" ], + "R": [ "t_reinforced_glass_shutter_open" ], + "m": [ "t_oil_circ_brkr_s", "t_station_disc", "t_switchgear_s", "t_potential_trans", "t_current_trans", "t_lgtn_arrest" ], + "e": [ "t_gates_mech_control" ], + "#": [ "t_sidewalk" ], + "P": [ "t_sewage_pump", [ "t_sewage_pipe", 3 ] ], + "Y": [ "t_door_metal_locked" ], + "y": [ "t_door_metal_o" ], + "N": [ "t_door_metal_locked" ], + "%": [ "t_grate" ], + "}": [ "t_ladder_up" ], + ")": [ "t_reinforced_glass" ], + "!": [ "t_thconc_floor" ], + "1": [ "t_floor_red" ], + "2": [ "t_floor_green" ], + "3": [ "t_rad_platform" ], + "4": [ "t_card_industrial" ] + }, + "furniture": { + "#": [ "f_bench" ], + "/": [ "f_compact_ASRG_containment" ], + "S": [ "f_locker" ], + "A": [ "f_locker" ], + "j": [ "f_locker" ], + "T": [ "f_standing_tank" ], + "^": [ "f_indoor_plant", "f_indoor_plant_y" ], + "a": [ "f_table" ], + "c": [ "f_utility_shelf" ], + "d": [ "f_desk" ], + "g": [ "f_shower" ], + "h": [ "f_chair" ], + "M": [ "f_machinery_heavy" ], + "o": [ "f_sofa" ], + "r": [ "f_rack" ], + "t": [ "f_table" ], + "Q": [ "f_air_filter" ], + "x": [ "f_console_broken" ], + "Z": [ "f_water_purifier" ], + "B": [ "f_bed", "f_dresser", "f_glass_cabinet" ], + "<": [ "f_sink" ], + "K": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ], + "J": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ], + "q": [ "f_crate_c", "f_utility_shelf" ], + "W": [ "f_crate_c", "f_utility_shelf" ], + "[": [ "f_dumpster" ], + "]": [ "f_bookcase", "f_filing_cabinet" ], + "?": [ "f_toilet" ], + ">": [ "f_vent_pipe" ], + ".": [ "f_oven", "f_counter", "f_fridge", "f_trashcan", "f_cupboard" ], + "{": [ "f_washer", "f_dryer" ] + }, + "toilets": { "?": { } }, + "vendingmachines": { "V": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "items": { + "S": { "item": "clothing_outdoor_set", "chance": 50 }, + "c": { "item": "repair_storage", "chance": 80 }, + "j": { "item": "cleaning", "chance": 80, "repeat": [ 1, 3 ] }, + "]": { "item": "file_room", "chance": 80 }, + "q": { "item": "supplies_electronics", "chance": 70, "repeat": [ 1, 4 ] }, + "K": { "item": "pre_irradiated_food", "chance": 20, "repeat": [ 1, 4 ] }, + "[": { "item": "pre_irradiated_food", "chance": 10, "repeat": [ 1, 4 ] }, + "J": { "item": "irradiated_food", "chance": 20, "repeat": [ 1, 4 ] }, + "A": { "item": "radiation_equipment", "chance": 20, "repeat": [ 1, 2 ] }, + "W": { "item": "packaging", "chance": 80, "repeat": [ 1, 15 ] }, + "#": { "item": "office_breakroom", "chance": 20 }, + "o": { "item": "office_breakroom", "chance": 20 }, + "a": { "item": "office_breakroom", "chance": 60 }, + "d": { "item": "cubical_office", "chance": 60 }, + ".": { "item": "coffee_shop", "chance": 50 }, + "B": { "item": "radiation_meds", "chance": 50 }, + "{": { "item": "decontamination", "chance": 15 }, + "%": { "item": "decontamination", "chance": 15 }, + "g": { "item": "decontamination", "chance": 15 } + }, + "place_loot": [ + { "group": "guns_pistol_common", "x": 34, "y": 26, "chance": 100, "ammo": 0, "magazine": 100, "repeat": [ 1, 2 ] }, + { "group": "ammo_pistol_common", "x": 39, "y": 26, "chance": 100, "repeat": [ 1, 5 ] }, + { "group": "prison_armor", "x": 39, "y": 26, "chance": 50, "repeat": [ 1, 2 ] } + ], + "liquids": { "T": { "liquid": "water_clean", "amount": [ 200, 600 ] } }, + "fields": { "U": { "field": "fd_nuke_gas", "intensity": 3, "age": 990 }, "/": { "field": "fd_shock_vent" } }, + "monster": { "!": { "monster": "mon_hazmatbot", "chance": 5 } }, + "monsters": { + "h": { "monster": "GROUP_ZOMBIE", "chance": 25 }, + "o": { "monster": "GROUP_ZOMBIE", "chance": 50 }, + "#": { "monster": "GROUP_ZOMBIE", "chance": 50 }, + "_": { "monster": "GROUP_ZOMBIE", "chance": 99 }, + " ": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 25 }, + "%": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 50 }, + "g": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 50 } + }, + "place_item": [ { "item": "cobalt_60", "x": [ 57, 61 ], "y": [ 6, 7 ], "amount": [ 1, 5 ], "chance": 50, "repeat": [ 1, 15 ] } ], + "place_graffiti": [ + { "text": "Decontamination", "x": 34, "y": 35 }, + { "text": "Decontamination", "x": 34, "y": 39 }, + { "text": "Decontamination", "x": 37, "y": 35 }, + { "text": "Decontamination", "x": 37, "y": 39 } + ], + "place_vehicles": [ + { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 0, "status": -1, "x": 8, "y": 48 }, + { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 180, "status": 0, "x": 23, "y": 48 }, + { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 0, "status": 1, "x": 47, "y": 48 }, + { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 180, "status": -1, "x": 60, "y": 48 }, + { + "vehicle": "industrial_transport", + "chance": 25, + "fuel": -1, + "rotation": 90, + "status": -1, + "x": 10, + "y": 62 + }, + { "vehicle": "industrial_transport", "chance": 25, "fuel": -1, "rotation": 90, "status": 0, "x": 20, "y": 62 }, + { "vehicle": "industrial_transport", "chance": 25, "fuel": -1, "rotation": 90, "status": 1, "x": 53, "y": 62 }, + { + "vehicle": "industrial_transport", + "chance": 25, + "fuel": -1, + "rotation": 90, + "status": -1, + "x": 62, + "y": 62 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "irradiator_1_3_roof", "irradiator_1_2_roof", "irradiator_1_1_roof" ], + [ "irradiator_1_6_roof", "irradiator_1_5_roof", "irradiator_1_4_roof" ], + [ "irradiator_1_9_roof", "irradiator_1_8_roof", "irradiator_1_7_roof" ] + ], + "weight": 250, + "object": { + "fill_ter": "t_flat_roof", + "rows": [ + " ", + " ", + " ", + " |------------------------------------------------------------3 ", + " 5............................................................5 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |....}.......................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |......................................................&.&...3 ", + " |...................................................AAA&.&...3 ", + " |......................................................&.&...3 ", + " |...................................................AAA&.&...3 ", + " |......................................................&.&...3 ", + " |...................................................AAA&.&...3 ", + " |......................................................&.&...3 ", + " |...................................................AAA&.&...3 ", + " |......................................................&.&...3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |............................................................3 ", + " |.................................................RR.........3 ", + " |.................................................RR.........3 ", + " |............................................................3 ", + " |..CC.......SSSSS.SSSSS.SSSSS.SSSSS...........D........D.....3 ", + " |..CC.......SSSSS.SSSSS.SSSSS.SSSSS..........................3 ", + " 5............................................................5 ", + " |------------------------------------------------------------3 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " |----------------3 ", + " |................3 ", + " |................5 ", + " |----------------3 ", + " ", + " ", + " " + ], + "terrain": { + ".": "t_flat_roof", + " ": "t_open_air", + "|": "t_gutter_west", + "-": "t_gutter_south", + "3": "t_gutter_east", + "5": "t_gutter_drop", + "}": "t_ladder_down", + "R": "t_radio_tower" + }, + "furniture": { + "&": "f_roof_turbine_vent", + "S": "f_solar_unit", + "D": "f_satellite", + "A": "f_air_conditioner", + "C": "f_cellphone_booster" + }, + "place_nested": [ + { + "chunks": [ + [ "null", 5 ], + [ "roof_4x4_survivor", 15 ], + [ "roof_16x16_help", 25 ], + [ "roof_4x4_holdout", 5 ], + [ "roof_6x6_utility", 45 ], + [ "roof_5x5_coop", 5 ] + ], + "x": [ 11, 23 ], + "y": [ 5, 23 ] + } + ] + } + } +] From f786c19a598c84d1c74e2f56d75daa5736110094 Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Fri, 28 Oct 2022 21:40:32 -0600 Subject: [PATCH 002/130] Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA From 7d179418f696dfbe8932da265b23c7e528f98ead Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 28 Oct 2022 21:44:11 -0600 Subject: [PATCH 003/130] Update character_attire.cpp --- src/character_attire.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 47a98225f7208..e58362a5e7d87 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -31,6 +31,7 @@ static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); static const trait_id trait_HORNS_POINTED( "HORNS_POINTED" ); static const trait_id trait_SQUEAMISH( "SQUEAMISH" ); +static const trait_id trait_VEGAN( "VEGAN" ); static const trait_id trait_WOOLALLERGY( "WOOLALLERGY" ); nc_color item_penalties::color_for_stacking_badness() const @@ -80,6 +81,11 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons it.has_own_flag( flag_wooled ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made of wool!" ) ); } + + if( has_trait( trait_VEGAN ) && ( it.made_of( material_leather ) || + it.has_own_flag( flag_wooled ) ) ) { + return ret_val::make_failure( _( "Can't wear that, it's made of animal!" ) ); + } if( it.is_filthy() && has_trait( trait_SQUEAMISH ) ) { return ret_val::make_failure( _( "Can't wear that, it's filthy!" ) ); From 5b93ca43d2945aac5760d6c0413181ddab0bcb01 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 28 Oct 2022 21:46:08 -0600 Subject: [PATCH 004/130] Update mutations.json --- data/json/mutations/mutations.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 9b686245fc1fe..6d499d642e8e4 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1809,6 +1809,15 @@ "starting_trait": true, "valid": true }, + { + "type": "mutation", + "id": "VEGAN", + "name": { "str": "Vegan" }, + "points": -1, + "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. Wearing animal products is also impossible.", + "starting_trait": true, + "valid": true + }, { "type": "mutation", "id": "TRUTHTELLER", From 51d106d3b47b73a947e945d562f568396422c254 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 29 Oct 2022 13:24:20 -0600 Subject: [PATCH 005/130] Update character_attire.cpp --- src/character_attire.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index e58362a5e7d87..de02d5d60759b 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -26,6 +26,7 @@ static const flag_id json_flag_ONE_PER_LAYER( "ONE_PER_LAYER" ); static const itype_id itype_shoulder_strap( "shoulder_strap" ); static const material_id material_wool( "wool" ); +static const material_id material_leather( "leather" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); From 82f8f35e68db26e08648294fe49cc0ccd9876f25 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:40:14 -0700 Subject: [PATCH 006/130] faux fur gloves --- data/json/items/armor/gloves.json | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index f209b402d0139..2a4474cd37e38 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -604,6 +604,41 @@ "name": { "str": "pair of XS fur gloves", "str_pl": "pairs of XS fur gloves" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "gloves_faux_fur", + "type": "ARMOR", + "name": { "str": "pair of faux fur gloves", "str_pl": "pairs of faux fur gloves" }, + "description": "A pair of warm faux fur gloves.", + "weight": "410 g", + "volume": "1 L", + "price": 4000, + "price_postapoc": 250, + "to_hit": 1, + "material": [ "faux_fur" ], + "symbol": "[", + "looks_like": "fire_gauntlets", + "color": "brown", + "warmth": 55, + "material_thickness": 3, + "armor": [ { "encumbrance": 30, "coverage": 95, "covers": [ "hand_l", "hand_r" ] } ] + }, + { + "id": "xl_gloves__faux_fur", + "type": "ARMOR", + "name": { "str": "pair of XL faux fur gloves", "str_pl": "pairs of XL faux fur gloves" }, + "copy-from": "gloves_faux_fur", + "proportional": { "weight": 1.6, "volume": 1.6 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "xs_gloves_faux_fur", + "type": "ARMOR", + "copy-from": "gloves_faux_fur", + "looks_like": "gloves_fur", + "name": { "str": "pair of XS faux fur gloves", "str_pl": "pairs of XS fur gloves" }, + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE" ] } }, { "id": "glove_jackson", From fe993c17e9a2dc499a2912b47b7fcb4a212348f0 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:44:32 -0700 Subject: [PATCH 007/130] faux fur feet styuff --- data/json/items/armor/boots.json | 85 ++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 191a1bcf58807..29e84602ee169 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -450,6 +450,73 @@ "name": { "str": "pair of XS fur boots", "str_pl": "pairs of XS fur boots" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "boots_faux_fur", + "type": "ARMOR", + "name": { "str": "pair of faux fur boots", "str_pl": "pairs of faux fur boots" }, + "description": "Boots lined with fur for warmth.", + "weight": "1890 g", + "volume": "4500 ml", + "price": 14000, + "price_postapoc": 750, + "to_hit": -1, + "bashing": 1, + "material": [ "cotton", "faux_fur" ], + "symbol": "[", + "looks_like": "boots", + "color": "brown", + "warmth": 40, + "material_thickness": 3, + "environmental_protection": 2, + "flags": [ "VARSIZE", "WATERPROOF" ], + "armor": [ + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ + "foot_toes_r", + "foot_toes_l", + "foot_ankle_r", + "foot_ankle_l", + "foot_heel_r", + "foot_heel_l", + "foot_arch_r", + "foot_arch_l" + ], + "material": [ + { "type": "cotton", "covered_by_mat": 100, "thickness": 1.5 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.5 } + ], + "encumbrance": 20, + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], + "material": [ + { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 } + ], + "coverage": 100 + } + ] + }, + { + "id": "xl_boots_faux_fur", + "type": "ARMOR", + "name": { "str": "pair of XL faux fur boots", "str_pl": "pairs of XL faux fur boots" }, + "copy-from": "boots_fur", + "proportional": { "weight": 1.15, "volume": 1.15 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "xs_boots_faux_fur", + "type": "ARMOR", + "copy-from": "boots__faux_fur", + "looks_like": "boots_fur", + "name": { "str": "pair of XS faux fur boots", "str_pl": "pairs of XS faux fur boots" }, + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE" ] } }, { "id": "boots_hiking", @@ -1360,6 +1427,24 @@ "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ], "armor": [ { "encumbrance": 5, "coverage": 65, "covers": [ "foot_l", "foot_r" ] } ] }, + { + "id": "footrags_faux_fur", + "type": "ARMOR", + "name": { "str": "pair of faux fur foot wraps", "str_pl": "pairs of faux fur foot wraps" }, + "description": "Faux fur patches tied around your feet. Not much of an improvement over being barefoot, but still better than nothing.", + "weight": "135 g", + "volume": "500 ml", + "price": 700, + "price_postapoc": 50, + "material": [ "faux_fur" ], + "symbol": "[", + "looks_like": "socks_wool", + "color": "brown", + "warmth": 18, + "material_thickness": 1.5, + "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ], + "armor": [ { "encumbrance": 5, "coverage": 65, "covers": [ "foot_l", "foot_r" ] } ] + }, { "id": "footrags_leather", "type": "ARMOR", From ad9fdfba866f92556d626e7ffd25216053c32694 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:48:23 -0700 Subject: [PATCH 008/130] faux fur scarfs --- data/json/items/armor/scarfs.json | 88 +++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 9b69589fccbd7..420da780c2aa3 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -417,6 +417,94 @@ "material_thickness": 2, "armor": [ { "coverage": 45, "covers": [ "mouth" ] } ] }, + { + "id": "scarf_faux_fur", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "faux fur scarf", "str_pl": "faux fur scarves" }, + "description": "A long faux fur scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", + "price": 9000, + "price_postapoc": 250, + "material": [ "faux_fur" ], + "weight": "140 g", + "volume": "1 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_faux_fur_loose", "menu_text": "Loosen" }, + "flags": [ "OUTER" ], + "warmth": 50, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "mouth" ] } ] + }, + { + "id": "scarf_faux_fur_loose", + "type": "TOOL_ARMOR", + "repairs_like": "scarf_faux_fur", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "faux fur scarf (loose)", "str_pl": "faux fur scarves (loose)" }, + "description": "A long faux fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", + "price": 9000, + "price_postapoc": 250, + "material": [ "faux_fur" ], + "weight": "140 g", + "volume": "1 L", + "to_hit": -3, + "revert_to": "scarf_faux_fur", + "use_action": { "type": "transform", "msg": "You wrap your scarf a bit tighter.", "target": "scarf_fur", "menu_text": "Wrap tighter" }, + "flags": [ "OUTER", "ALLOWS_NATURAL_ATTACKS" ], + "warmth": 25, + "environmental_protection": 1, + "material_thickness": 2, + "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] + }, + { + "id": "scarf_faux_fur_long", + "type": "TOOL_ARMOR", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "long faux fur scarf", "str_pl": "long faux fur scarves" }, + "description": "A really long faux fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", + "price": 17700, + "price_postapoc": 300, + "material": [ "faux_fur" ], + "weight": "280 g", + "volume": "2 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_faux_fur_long_loose", "menu_text": "Loosen" }, + "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], + "warmth": 50, + "environmental_protection": 2, + "material_thickness": 2, + "armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "mouth" ] } ] + }, + { + "id": "scarf_faux_fur_long_loose", + "type": "TOOL_ARMOR", + "repairs_like": "scarf_faux_fur_long", + "category": "clothing", + "symbol": "[", + "color": "brown", + "name": { "str": "long faux fur scarf (loose)", "str_pl": "long faux fur scarves (loose)" }, + "description": "A really long faux fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", + "price": 17700, + "price_postapoc": 300, + "material": [ "faux_fur" ], + "weight": "280 g", + "volume": "2 L", + "to_hit": -3, + "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_faux_fur_long", "menu_text": "Wrap tighter" }, + "revert_to": "scarf_faux_fur_long", + "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], + "warmth": 25, + "environmental_protection": 1, + "material_thickness": 2, + "armor": [ { "coverage": 45, "covers": [ "mouth" ] } ] + }, { "id": "marloss_scarf", "type": "ARMOR", From 60cf281f0498af6c2f8adaf6e095af58fd139bc1 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:54:47 -0700 Subject: [PATCH 009/130] faux fur boots recipes --- data/json/recipes/armor/feet.json | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 55b989eb3321d..e0974c0753101 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -214,6 +214,62 @@ [ "adhesive_rubber", 2 ] ], "time": "13 h 30 m" + }, + { + "result": "boots_faux_fur", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "difficulty": 2, + "skills_required": [ "survival", 1 ], + "time": "12 h", + "autolearn": true, + "book_learn": [ [ "textbook_survival", 1 ] ], + "using": [ + [ "sewing_standard", 13 ], + [ "tailoring_cotton_patchwork", 3 ], + [ "tailoring_faux_fur_patchwork", 2 ], + [ "fastener_shoes", 2 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ] + ], + "proficiencies": [ + { "proficiency": "prof_cobbling" }, + { "proficiency": "prof_closures" }, + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_furriery" } + ] + }, + { + "result": "xs_boots_faux_fur", + "type": "recipe", + "copy-from": "boots_faux_fur", + "time": "12 h", + "using": [ + [ "sewing_standard", 9 ], + [ "tailoring_cotton_patchwork", 2 ], + [ "tailoring_faux_fur_patchwork", 3 ], + [ "fastener_shoes", 1 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ] + ] + }, + { + "result": "xl_boots_fur", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "boots_faux_fur", + "using": [ + [ "sewing_standard", 16 ], + [ "tailoring_cotton_patchwork", 4 ], + [ "tailoring_faux_fur_patchwork", 4 ], + [ "fastener_shoes", 3 ], + [ "shoe_rubber", 2 ], + [ "adhesive_rubber", 2 ] + ], + "time": "13 h 30 m" }, { "result": "boots_wsurvivor_nofur", @@ -731,6 +787,19 @@ "components": [ [ [ "sheet_fur_patchwork", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, + { + "result": "footrags_faux_fur", + "type": "recipe", + "activity_level": "NO_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "time": "1 m 30 s", + "reversible": true, + "autolearn": true, + "components": [ [ [ "sheet_faux_fur_patchwork", 2 ] ] ], + "flags": [ "BLIND_HARD" ] + }, { "result": "footrags_leather", "type": "recipe", From 93f988cae05f5cecb311f1c7be1b30c4734dafe3 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:58:13 -0700 Subject: [PATCH 010/130] Update hands.json --- data/json/recipes/armor/hands.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 1e462a76d6ed1..fdbb51c0efa54 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -222,6 +222,35 @@ "copy-from": "gloves_fur", "time": "10 h 10 m", "using": [ [ "tailoring_fur_small", 5 ] ] + }, + { + "result": "gloves_faux_fur", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HANDS", + "skill_used": "tailor", + "difficulty": 2, + "skills_required": [ "survival", 1 ], + "time": "9 h", + "autolearn": true, + "book_learn": [ [ "manual_tailor", 1 ], [ "textbook_survival", 1 ], [ "pocket_survival", 1 ], [ "recipe_fauxfur", 1 ] ] + "using": [ [ "tailoring_faux_fur_small", 3 ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] + }, + { + "result": "xs_gloves_faux_fur", + "type": "recipe", + "copy-from": "gloves_faux_fur", + "time": "9 h", + "using": [ [ "tailoring_faux_fur_small", 2 ] ] + }, + { + "result": "xl_gloves_faux_fur", + "type": "recipe", + "copy-from": "gloves_faux_fur", + "time": "10 h 10 m", + "using": [ [ "tailoring_faux_fur_small", 5 ] ] }, { "result": "gloves_wsurvivor_nofur", From 82c9c23fc2b469ab77f065d7c80c22de42a18301 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:59:19 -0700 Subject: [PATCH 011/130] Update feet.json --- data/json/recipes/armor/feet.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index e0974c0753101..06355088d7d3b 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -170,7 +170,7 @@ "skills_required": [ "survival", 1 ], "time": "12 h", "autolearn": true, - "book_learn": [ [ "textbook_survival", 1 ] ], + "book_learn": [ [ "textbook_survival", 1 ], [ "recipe_fauxfur", 1 ] ], "using": [ [ "sewing_standard", 13 ], [ "tailoring_leather_patchwork", 3 ], From 0d694448af3a62146182c6cc3e538a5c7e907587 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:59:40 -0700 Subject: [PATCH 012/130] Update hands.json --- data/json/recipes/armor/hands.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index fdbb51c0efa54..855fc5ab28ec1 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -234,7 +234,7 @@ "skills_required": [ "survival", 1 ], "time": "9 h", "autolearn": true, - "book_learn": [ [ "manual_tailor", 1 ], [ "textbook_survival", 1 ], [ "pocket_survival", 1 ], [ "recipe_fauxfur", 1 ] ] + "book_learn": [ [ "manual_tailor", 1 ], [ "textbook_survival", 1 ], [ "pocket_survival", 1 ], [ "recipe_fauxfur", 1 ] ], "using": [ [ "tailoring_faux_fur_small", 3 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, From a8cb3a1bad252f9d5e6d191881d284794665bd89 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:07:19 -0700 Subject: [PATCH 013/130] Update character_attire.cpp --- src/character_attire.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index de02d5d60759b..6fd1c3a65184f 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -27,6 +27,7 @@ static const itype_id itype_shoulder_strap( "shoulder_strap" ); static const material_id material_wool( "wool" ); static const material_id material_leather( "leather" ); +static const material_id material_fur( "fur" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); @@ -84,8 +85,10 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons } if( has_trait( trait_VEGAN ) && ( it.made_of( material_leather ) || - it.has_own_flag( flag_wooled ) ) ) { - return ret_val::make_failure( _( "Can't wear that, it's made of animal!" ) ); + it.has_own_flag( flag_wooled ) || + it.made_of( material_fur ) || + it.made_of( material_wool ) ) ) { + return ret_val::make_failure( _( "Can't wear that, it's made from an animal!" ) ); } if( it.is_filthy() && has_trait( trait_SQUEAMISH ) ) { From 020c6befd7b7c81332ef000a0ffcb9f272bc50f3 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:30:20 -0700 Subject: [PATCH 014/130] Update flag.h --- src/flag.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/flag.h b/src/flag.h index 53edc1bbb5a9c..e6bef9f3dc9ec 100644 --- a/src/flag.h +++ b/src/flag.h @@ -343,6 +343,7 @@ extern const flag_id flag_USE_EAT_VERB; extern const flag_id flag_USE_PLAYER_ENERGY; extern const flag_id flag_USE_UPS; extern const flag_id flag_VARSIZE; +extern const flag_id flag_VEGAN_BAD; extern const flag_id flag_VEHICLE; extern const flag_id flag_WAIST; extern const flag_id flag_WATCH; From e6d2239a65be2245729130f7ecc504d34728dad7 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:31:45 -0700 Subject: [PATCH 015/130] Update flag.cpp --- src/flag.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/flag.cpp b/src/flag.cpp index 8aa2535aec624..16844a2e166b7 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -339,6 +339,7 @@ const flag_id flag_USE_EAT_VERB( "USE_EAT_VERB" ); const flag_id flag_USE_PLAYER_ENERGY( "USE_PLAYER_ENERGY" ); const flag_id flag_USE_UPS( "USE_UPS" ); const flag_id flag_VARSIZE( "VARSIZE" ); +const flag_id flag_VEHICLE( "VEGAN_BAD" ); const flag_id flag_VEHICLE( "VEHICLE" ); const flag_id flag_WAIST( "WAIST" ); const flag_id flag_WATCH( "WATCH" ); From c203308aa6ee30c427417136ad79c73bc27ca2d6 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:44:42 -0700 Subject: [PATCH 016/130] Update consumption.cpp --- src/consumption.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/consumption.cpp b/src/consumption.cpp index 0505d335b0cea..96363b8009592 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -144,6 +144,7 @@ static const trait_id trait_THRESH_FELINE( "THRESH_FELINE" ); static const trait_id trait_THRESH_LUPINE( "THRESH_LUPINE" ); static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" ); static const trait_id trait_THRESH_URSINE( "THRESH_URSINE" ); +static const trait_id trait_VEGETARIAN( "VEGAN" ); static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); @@ -158,6 +159,11 @@ static const std::array herbivore_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG }}; +static const std::array vegan_blacklist {{ + json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, + json_flag_ALLERGEN_MILK, json_flag_VEGAN_BAD + }}; + // TODO: Move pizza scraping here. static int compute_default_effective_kcal( const item &comest, const Character &you, const cata::flat_set &extra_flags = {} ) From 3569ad834595a721a57ccde4fd83e26df29aae97 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:48:34 -0700 Subject: [PATCH 017/130] Update flags.json --- data/json/flags.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/json/flags.json b/data/json/flags.json index 4f21ab95cbd95..92f93a226a91e 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -1116,6 +1116,9 @@ "type": "json_flag", "craft_inherit": true }, + { + "id": "VEGAN_BAD", + "type": "json_flag" { "id": "ALLERGEN_EGG", "type": "json_flag" From 82c0a04b3f014b74e023b883a19aa9a4674d41da Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:49:52 -0700 Subject: [PATCH 018/130] Update dairy.json --- data/json/items/comestibles/dairy.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 33c94e4bc6447..7d32721236dff 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -161,7 +161,8 @@ "price": 420, "price_postapoc": 50, "material": [ "oil" ], - "phase": "liquid" + "phase": "liquid", + "flags": "VEGAN_BAD" }, { "type": "COMESTIBLE", From ff6653b194cc8c60a7dbee357ba35e2855d0c744 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 15:02:49 -0700 Subject: [PATCH 019/130] Update consumption.cpp --- src/consumption.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 96363b8009592..a903855315e2d 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -80,9 +80,11 @@ static const efftype_id effect_visuals( "visuals" ); static const flag_id json_flag_ALLERGEN_EGG( "ALLERGEN_EGG" ); static const flag_id json_flag_ALLERGEN_FRUIT( "ALLERGEN_FRUIT" ); static const flag_id json_flag_ALLERGEN_MEAT( "ALLERGEN_MEAT" ); +static const flag_id json_flag_ALLERGEN_MILK( "ALLERGEN_MILK" ); static const flag_id json_flag_ALLERGEN_NUT( "ALLERGEN_NUT" ); static const flag_id json_flag_ALLERGEN_VEGGY( "ALLERGEN_VEGGY" ); static const flag_id json_flag_ALLERGEN_WHEAT( "ALLERGEN_WHEAT" ); +static const flag_id json_flag_VEGAN_BAD( "VEGAN_BAD" ); static const item_category_id item_category_chems( "chems" ); @@ -144,7 +146,7 @@ static const trait_id trait_THRESH_FELINE( "THRESH_FELINE" ); static const trait_id trait_THRESH_LUPINE( "THRESH_LUPINE" ); static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" ); static const trait_id trait_THRESH_URSINE( "THRESH_URSINE" ); -static const trait_id trait_VEGETARIAN( "VEGAN" ); +static const trait_id trait_VEGAN( "VEGAN" ); static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); @@ -817,6 +819,11 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } + if( ( has_trait( trait_VEGAN ) ) ) && + food.has_any_flag( vegan_blacklist ) ) { + return ret_val::make_failure( INEDIBLE_MUTATION, + _( "You're still not going to eat animal products." ) ); + } for( const trait_id &mut : get_mutations() ) { if( !food.made_of_any( mut.obj().can_only_eat ) && !mut.obj().can_only_eat.empty() ) { From c3ce82eca63f240a46c5ae14dc6991d51909fcf0 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 15:03:30 -0700 Subject: [PATCH 020/130] Update flag.cpp --- src/flag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flag.cpp b/src/flag.cpp index 16844a2e166b7..c2e4feb47cd1e 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -339,7 +339,7 @@ const flag_id flag_USE_EAT_VERB( "USE_EAT_VERB" ); const flag_id flag_USE_PLAYER_ENERGY( "USE_PLAYER_ENERGY" ); const flag_id flag_USE_UPS( "USE_UPS" ); const flag_id flag_VARSIZE( "VARSIZE" ); -const flag_id flag_VEHICLE( "VEGAN_BAD" ); +const flag_id flag_VEGAN_BAD( "VEGAN_BAD" ); const flag_id flag_VEHICLE( "VEHICLE" ); const flag_id flag_WAIST( "WAIST" ); const flag_id flag_WATCH( "WATCH" ); From 776e4d038d8a65875d7bb69d118dc6bc46988263 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:34:19 -0700 Subject: [PATCH 021/130] Update consumption.cpp --- src/consumption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index a903855315e2d..1cd97a592a011 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -819,7 +819,7 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } - if( ( has_trait( trait_VEGAN ) ) ) && + if( ( has_trait( trait_VEGAN ) ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, _( "You're still not going to eat animal products." ) ); From f6b787cc6cf72e33a000fd0b08a65b9d06edb073 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 9 Nov 2022 14:42:03 -0700 Subject: [PATCH 022/130] Update flags.json --- data/json/flags.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/flags.json b/data/json/flags.json index 92f93a226a91e..e9824b0115557 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -1119,6 +1119,7 @@ { "id": "VEGAN_BAD", "type": "json_flag" + }, { "id": "ALLERGEN_EGG", "type": "json_flag" From b0fcf083c5e516f11f825a80eb46f81e10b553d8 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 9 Nov 2022 19:59:02 -0700 Subject: [PATCH 023/130] Update boots.json --- data/json/items/armor/boots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 29e84602ee169..5141813991215 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -505,14 +505,14 @@ "id": "xl_boots_faux_fur", "type": "ARMOR", "name": { "str": "pair of XL faux fur boots", "str_pl": "pairs of XL faux fur boots" }, - "copy-from": "boots_fur", + "copy-from": "boots_faux_fur", "proportional": { "weight": 1.15, "volume": 1.15 }, "extend": { "flags": [ "OVERSIZE" ] } }, { "id": "xs_boots_faux_fur", "type": "ARMOR", - "copy-from": "boots__faux_fur", + "copy-from": "boots_faux_fur", "looks_like": "boots_fur", "name": { "str": "pair of XS faux fur boots", "str_pl": "pairs of XS faux fur boots" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, From ec572d7cc34805f08abf37a539e9cd2b090bfbc6 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 9 Nov 2022 20:01:24 -0700 Subject: [PATCH 024/130] Update gloves.json --- data/json/items/armor/gloves.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 2a4474cd37e38..444c6fcc79d0a 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -624,7 +624,7 @@ "armor": [ { "encumbrance": 30, "coverage": 95, "covers": [ "hand_l", "hand_r" ] } ] }, { - "id": "xl_gloves__faux_fur", + "id": "xl_gloves_faux_fur", "type": "ARMOR", "name": { "str": "pair of XL faux fur gloves", "str_pl": "pairs of XL faux fur gloves" }, "copy-from": "gloves_faux_fur", From ec10d7d2df16e4efb971c9f181d0ead14aeb5467 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:39:27 -0700 Subject: [PATCH 025/130] Update suits_protection.json --- data/json/items/armor/suits_protection.json | 60 +++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 95304e9d9cdea..859a6adc9fbab 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -181,6 +181,66 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER", "UNDERSIZE" ] }, + { + "id": "armor_faux_farmor", + "type": "ARMOR", + "category": "armor", + "name": { "str": "faux fur body armor" }, + "description": "Thick body armor made from faux furs.", + "weight": "3414 g", + "volume": "10 L", + "price": 100000, + "price_postapoc": 1500, + "to_hit": -5, + "bashing": 2, + "material": [ "faux_fur" ], + "symbol": "[", + "longest_side": "30 cm", + "looks_like": "armor_larmor", + "color": "brown", + "armor": [ + { "covers": [ "torso" ], "coverage": 90, "encumbrance": [ 21, 25 ] }, + { "covers": [ "leg_l", "leg_r" ], "coverage": 90, "encumbrance": [ 21, 21 ] }, + { "covers": [ "arm_l", "arm_r" ], "coverage": 90, "encumbrance": [ 21, 21 ] } + ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "3 kg", + "max_item_length": "165 mm", + "moves": 80 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "500 ml", + "max_contains_weight": "3 kg", + "max_item_length": "165 mm", + "moves": 80 + } + ], + "warmth": 60, + "material_thickness": 4, + "valid_mods": [ "steel_padded" ], + "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] + }, + { + "id": "xl_armor_faux_farmor", + "type": "ARMOR", + "name": { "str": "XL faux fur body armor" }, + "copy-from": "armor_faux_farmor", + "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE" ] } + }, + { + "id": "armor_faux_farmor_xs", + "type": "ARMOR", + "copy-from": "armor_faux_farmor", + "looks_like": "armor_farmor", + "name": { "str": "XS faux fur body armor" }, + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER", "UNDERSIZE" ] + }, { "id": "armor_larmor", "type": "ARMOR", From 9f0b6e4b964007e11d3e4ed0b46795bb001c29d0 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:41:26 -0700 Subject: [PATCH 026/130] Update suit.json --- data/json/recipes/armor/suit.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index 0cfec0be246f0..75e2ac6d72531 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -143,6 +143,36 @@ "using": [ [ "tailoring_fur_patchwork", 16 ] ], "byproducts": [ [ "fur", 6 ] ] }, + { + "result": "armor_faux_farmor", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 5, + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_faux_fur_patchwork", 14 ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ], + "byproducts": [ [ "faux_fur", 2 ] ] + }, + { + "result": "armor_faux_farmor_xs", + "type": "recipe", + "copy-from": "armor_faux_farmor", + "time": "8 h", + "using": [ [ "tailoring_faux_fur_patchwork", 11 ] ], + "byproducts": [ [ "faux_fur", 5 ] ] + }, + { + "result": "xl_armor_faux_farmor", + "type": "recipe", + "copy-from": "armor_faux_farmor", + "time": "9 h", + "using": [ [ "tailoring_faux_fur_patchwork", 16 ] ], + "byproducts": [ [ "faux_fur", 6 ] ] + }, { "result": "armor_larmor", "type": "recipe", From 99eb99914fbae685b3497766091c76e775bb15aa Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:47:37 -0700 Subject: [PATCH 027/130] Update flag.h --- src/flag.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flag.h b/src/flag.h index e6bef9f3dc9ec..489e5dc22484b 100644 --- a/src/flag.h +++ b/src/flag.h @@ -35,6 +35,7 @@ extern const flag_id flag_ALLERGEN_WOOL; extern const flag_id flag_ALLOWS_NATURAL_ATTACKS; extern const flag_id flag_ALLOWS_REMOTE_USE; extern const flag_id flag_ALWAYS_TWOHAND; +extern const flag_id flag_ANIMAL_PRODUCT; extern const flag_id flag_OLD_CURRENCY; extern const flag_id flag_AURA; extern const flag_id flag_BAROMETER; @@ -343,7 +344,6 @@ extern const flag_id flag_USE_EAT_VERB; extern const flag_id flag_USE_PLAYER_ENERGY; extern const flag_id flag_USE_UPS; extern const flag_id flag_VARSIZE; -extern const flag_id flag_VEGAN_BAD; extern const flag_id flag_VEHICLE; extern const flag_id flag_WAIST; extern const flag_id flag_WATCH; From b0af7ca60a43b750430a71f91a8a5fcef38fa576 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:49:06 -0700 Subject: [PATCH 028/130] Update flag.cpp --- src/flag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flag.cpp b/src/flag.cpp index c2e4feb47cd1e..4364f8573876b 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -27,6 +27,7 @@ const flag_id flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" ); const flag_id flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" ); const flag_id flag_ALWAYS_TWOHAND( "ALWAYS_TWOHAND" ); const flag_id flag_AURA( "AURA" ); +const flag_id flag_ANIMAL_PRODUCT( "ANIMAL_PRODUCT" ); const flag_id flag_BAROMETER( "BAROMETER" ); const flag_id flag_BASH_IMMUNE( "BASH_IMMUNE" ); const flag_id flag_BELTED( "BELTED" ); @@ -339,7 +340,6 @@ const flag_id flag_USE_EAT_VERB( "USE_EAT_VERB" ); const flag_id flag_USE_PLAYER_ENERGY( "USE_PLAYER_ENERGY" ); const flag_id flag_USE_UPS( "USE_UPS" ); const flag_id flag_VARSIZE( "VARSIZE" ); -const flag_id flag_VEGAN_BAD( "VEGAN_BAD" ); const flag_id flag_VEHICLE( "VEHICLE" ); const flag_id flag_WAIST( "WAIST" ); const flag_id flag_WATCH( "WATCH" ); From 68394c744a11da4a462263d593a6cc8fb7dd9777 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:51:02 -0700 Subject: [PATCH 029/130] Update flags.json --- data/json/flags.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/flags.json b/data/json/flags.json index e9824b0115557..f67dbe4074cb3 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -1116,10 +1116,6 @@ "type": "json_flag", "craft_inherit": true }, - { - "id": "VEGAN_BAD", - "type": "json_flag" - }, { "id": "ALLERGEN_EGG", "type": "json_flag" @@ -1156,6 +1152,10 @@ "id": "ALLERGEN_WOOL", "type": "json_flag" }, + { + "id": "ANIMAL_PRODUCT", + "type": "json_flag" + }, { "id": "ALWAYS_TWOHAND", "type": "json_flag" From ab7954916a98a706fd9be454699297beefd22890 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:51:44 -0700 Subject: [PATCH 030/130] Update dairy.json --- data/json/items/comestibles/dairy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 7d32721236dff..f2bf297e2f968 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -162,7 +162,7 @@ "price_postapoc": 50, "material": [ "oil" ], "phase": "liquid", - "flags": "VEGAN_BAD" + "flags": "ANIMAL_PRODUCT" }, { "type": "COMESTIBLE", From ea872b247b9acdc3e900615fa678b0978b171be4 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:53:54 -0700 Subject: [PATCH 031/130] Update character_attire.cpp --- src/character_attire.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 6fd1c3a65184f..07973da45bbef 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -28,6 +28,8 @@ static const itype_id itype_shoulder_strap( "shoulder_strap" ); static const material_id material_wool( "wool" ); static const material_id material_leather( "leather" ); static const material_id material_fur( "fur" ); +static const material_id material_chitin( "chitin" ); +static const material_id material_acidchitin( "acidchitin" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); @@ -85,9 +87,11 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons } if( has_trait( trait_VEGAN ) && ( it.made_of( material_leather ) || - it.has_own_flag( flag_wooled ) || + it.has_own_flag( flag_ANIMAL_PRODUCT ) || it.made_of( material_fur ) || - it.made_of( material_wool ) ) ) { + it.made_of( material_wool ) || + it.made_of( material_chitin ) || + it.made_of( material_acidchitin ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made from an animal!" ) ); } From 54551d15867e12770709acaa4b29f0e2b3235c5d Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:56:18 -0700 Subject: [PATCH 032/130] Update consumption.cpp --- src/consumption.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 1cd97a592a011..b8a4138bb6093 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -84,7 +84,7 @@ static const flag_id json_flag_ALLERGEN_MILK( "ALLERGEN_MILK" ); static const flag_id json_flag_ALLERGEN_NUT( "ALLERGEN_NUT" ); static const flag_id json_flag_ALLERGEN_VEGGY( "ALLERGEN_VEGGY" ); static const flag_id json_flag_ALLERGEN_WHEAT( "ALLERGEN_WHEAT" ); -static const flag_id json_flag_VEGAN_BAD( "VEGAN_BAD" ); +static const flag_id json_flag_ANIMAL_PRODUCT( "ANIMAL_PRODUCT" ); static const item_category_id item_category_chems( "chems" ); @@ -163,7 +163,7 @@ static const std::array herbivore_blacklist {{ static const std::array vegan_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, - json_flag_ALLERGEN_MILK, json_flag_VEGAN_BAD + json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT }}; // TODO: Move pizza scraping here. From a8f833b8c9dd313f5a7ee0857ec2efe3e36f4761 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:17:55 -0700 Subject: [PATCH 033/130] Update suits_protection.json --- data/json/items/armor/suits_protection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 859a6adc9fbab..118615f676352 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -159,7 +159,7 @@ "moves": 80 } ], - "warmth": 60, + "warmth": 45, "material_thickness": 4, "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] From 5e1942c0797b7d9a0c487a96f573503cbd9a94cf Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:20:08 -0700 Subject: [PATCH 034/130] Update scarfs.json --- data/json/items/armor/scarfs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 420da780c2aa3..04f2baf63e2d2 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -415,7 +415,7 @@ "warmth": 30, "environmental_protection": 1, "material_thickness": 2, - "armor": [ { "coverage": 45, "covers": [ "mouth" ] } ] + "armor": [ { "encumbrance:10", "coverage": 45, "covers": [ "mouth" ] } ] }, { "id": "scarf_faux_fur", @@ -503,7 +503,7 @@ "warmth": 25, "environmental_protection": 1, "material_thickness": 2, - "armor": [ { "coverage": 45, "covers": [ "mouth" ] } ] + "armor": [ { "encumbrance:10", "coverage": 45, "covers": [ "mouth" ] } ] }, { "id": "marloss_scarf", From 4d25f266b0cc46b083816d90cf92be4f0ffb606a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:45:45 -0700 Subject: [PATCH 035/130] Update legs_armor.json --- data/json/items/armor/legs_armor.json | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index eb7265b7f5ada..65afe350d9bfd 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -1572,5 +1572,59 @@ "warmth": 25, "material_thickness": 2.0, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + }, + { + "id": "survivor_adhoc_cotton_pants", + "repairs_like": "jeans", + "type": "ARMOR", + "name": { "str": "cloth-padded pants", "str_pl": "pairs of cloth-padded pants" }, + "description": "A pair of tough canvas pants with sections of cotton sewn onto it, except for the joints to retain mobility. Some pockets have been sewn over to add more room for cotton patches.", + "weight": "1970 g", + "volume": "2500 ml", + "price_postapoc": 1200, + "looks_like": "technician_pants_gray", + "to_hit": 1, + "material": [ "canvas", "cotton" ], + "symbol": "[", + "color": "light_gray", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_contains_volume": "1080 ml", + "max_contains_weight": "4 kg", + "max_item_length": "165 mm", + "moves": 100 + }, + { + "pocket_type": "CONTAINER", + "max_contains_volume": "1080 ml", + "max_contains_weight": "4 kg", + "max_item_length": "165 mm", + "moves": 100 + } + ], + "armor": [ + { + "material": [ + { "type": "canvas", "covered_by_mat": 100, "thickness": 0.5 }, + { "type": "cotton", "covered_by_mat": 90, "thickness": 1 }, + { "type": "cotton", "covered_by_mat": 90, "thickness": 1 } + ], + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_upper_l", "leg_upper_r", "leg_lower_l", "leg_lower_r" ], + "coverage": 100, + "encumbrance": [ 6, 8 ] + }, + { + "material": [ { "type": "canvas", "covered_by_mat": 100, "thickness": 0.5 } ], + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_knee_l", "leg_knee_r" ], + "coverage": 100, + "encumbrance": [ 0, 0 ] + } + ], + "warmth": 25, + "material_thickness": 2.0, + "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] } ] From 3f82ca3d3ce8c96e90441457fd77bdb35a425532 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:52:42 -0700 Subject: [PATCH 036/130] Update legs_armor.json --- data/json/items/armor/legs_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index 65afe350d9bfd..2a2e028dc4bf0 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -1574,7 +1574,7 @@ "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] }, { - "id": "survivor_adhoc_cotton_pants", + "id": "canvas_pants_padded", "repairs_like": "jeans", "type": "ARMOR", "name": { "str": "cloth-padded pants", "str_pl": "pairs of cloth-padded pants" }, From 5e98f35bbda18a1639438c8353fb68a6e8e3b433 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:56:13 -0700 Subject: [PATCH 037/130] Update legs.json --- data/json/recipes/armor/legs.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 3693caf71a74f..8f520d567f82b 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -239,6 +239,20 @@ "proficiencies": [ { "proficiency": "prof_closures" } ], "using": [ [ "tailoring_cotton", 15 ], [ "fastener_small", 1 ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] + }, + { + "result": "canvas_pants_padded", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_LEGS", + "skill_used": "tailor", + "difficulty": 2, + "time": "40 m", + "autolearn": "true", + "proficiencies": [ { "proficiency": "prof_closures" } ], + "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ], [ "technician_pants_gray", 1 ] ], + "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { "result": "skirt", From ef59e6a1c745b9e53050678e9a69453a9ebf0b68 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:00:18 -0700 Subject: [PATCH 038/130] Update legs_armor.json --- data/json/items/armor/legs_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index 2a2e028dc4bf0..6b6b4eab9c32e 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -1578,7 +1578,7 @@ "repairs_like": "jeans", "type": "ARMOR", "name": { "str": "cloth-padded pants", "str_pl": "pairs of cloth-padded pants" }, - "description": "A pair of tough canvas pants with sections of cotton sewn onto it, except for the joints to retain mobility. Some pockets have been sewn over to add more room for cotton patches.", + "description": "A pair of tough canvas pants with sections of cotton sewn onto it in a crossing pattern, clearly done by an amateur.", "weight": "1970 g", "volume": "2500 ml", "price_postapoc": 1200, From 7e39ffdf09d7cdc95e53b1c148782cedd81a3a54 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:12:26 -0700 Subject: [PATCH 039/130] Update holster.json --- data/json/items/armor/holster.json | 85 ++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index af03e6c448116..6d006c8067f4b 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -231,6 +231,44 @@ } ] }, + { + "id": "cotton_holster", + "type": "ARMOR", + "name": { "str": "cotton holster" }, + "description": "An improvised holster made from reinforced cotton scraps. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", + "weight": "220 g", + "volume": "500 ml", + "price": 900, + "price_postapoc": 250, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "sheath", + "color": "light_gray", + "sided": true, + "material_thickness": 1, + "pocket_data": [ + { + "magazine_well": "350 ml", + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "250 ml", + "max_contains_volume": "1000 ml", + "max_contains_weight": "1750 g", + "max_item_length": "30 cm", + "moves": 50 + } + ], + "use_action": { "type": "holster" }, + "flags": [ "BELTED", "OVERSIZE", "PALS_MEDIUM" ], + "armor": [ + { + "encumbrance": [ 3, 4 ], + "coverage": 5, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_r", "leg_hip_l" ] + } + ] + }, { "id": "western_holster", "copy-from": "holster", @@ -461,6 +499,43 @@ "specifically_covers": [ "leg_hip_r", "leg_hip_l", "leg_upper_r", "leg_upper_l" ] } ] + }, + { + "id": "XL_cotton_holster", + "type": "ARMOR", + "name": { "str": "large cotton holster" }, + "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", + "weight": "320 g", + "volume": "250 ml", + "price": 900, + "price_postapoc": 500, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "quiver_large", + "color": "light_gray", + "sided": true, + "material_thickness": 1, + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "500 ml", + "max_contains_volume": "1500 ml", + "max_contains_weight": "4 kg", + "max_item_length": "45 cm", + "moves": 70 + } + ], + "use_action": { "type": "holster" }, + "flags": [ "BELTED", "OVERSIZE", "PALS_LARGE" ], + "armor": [ + { + "encumbrance": [ 2, 7 ], + "coverage": 10, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_r", "leg_hip_l", "leg_upper_r", "leg_upper_l" ] + } + ] }, { "id": "XS_holster", @@ -472,4 +547,14 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] } + { + "id": "XS_cotton_holster", + "type": "ARMOR", + "copy-from": "cotton_holster", + "looks_like": "holster", + "name": { "str": "XS cotton holster" }, + "description": "A cotton strap holding a firearm close to hand. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] + }, ] From 0516caf346e496d19e58fdde09ad2d67eba65535 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:17:26 -0700 Subject: [PATCH 040/130] Update storage.json --- data/json/recipes/armor/storage.json | 41 ++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c26c1e1cc1bdf..2fb520e847cc8 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -16,6 +16,22 @@ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] + }, + { + "result": "XL_cotton_holster", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 4, + "skills_required": [ "gun", 1 ], + "time": "6 h", + "autolearn": true, + "using": [ [ "strap_small", 1 ], [ "tailoring_cotton_small", 15 ], [ "clasps", 1 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" } + ] }, { "result": "ammo_satchel", @@ -846,6 +862,23 @@ { "proficiency": "prof_leatherworking_basic" } ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] + }, + { + "result": "cotton_holster", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 3, + "skills_required": [ "pistol", 1 ], + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_cotton_small", 8 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" } + ], + "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { "result": "shoulder_holster", @@ -873,6 +906,14 @@ "time": "6 h", "using": [ [ "tailoring_leather_small", 2 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] + }, + { + "result": "XS_cotton_holster", + "type": "recipe", + "copy-from": "cotton_holster", + "time": "3 h", + "using": [ [ "tailoring_cotton_small", 3 ] ], + "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { "result": "western_holster", From 2d93a1c9e3d7d5ce0401496899a9676d8147d661 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:19:33 -0700 Subject: [PATCH 041/130] Update holster.json --- data/json/items/armor/holster.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 6d006c8067f4b..efcce51349e33 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -236,7 +236,7 @@ "type": "ARMOR", "name": { "str": "cotton holster" }, "description": "An improvised holster made from reinforced cotton scraps. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", - "weight": "220 g", + "weight": "400 g", "volume": "500 ml", "price": 900, "price_postapoc": 250, @@ -253,7 +253,7 @@ "holster": true, "min_item_volume": "250 ml", "max_contains_volume": "1000 ml", - "max_contains_weight": "1750 g", + "max_contains_weight": "1500 g", "max_item_length": "30 cm", "moves": 50 } @@ -505,7 +505,7 @@ "type": "ARMOR", "name": { "str": "large cotton holster" }, "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", - "weight": "320 g", + "weight": "400 g", "volume": "250 ml", "price": 900, "price_postapoc": 500, @@ -521,7 +521,7 @@ "holster": true, "min_item_volume": "500 ml", "max_contains_volume": "1500 ml", - "max_contains_weight": "4 kg", + "max_contains_weight": "3500 g", "max_item_length": "45 cm", "moves": 70 } From db80acfe526e9ea0cafa9a31df57a029863e5d40 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:26:48 -0700 Subject: [PATCH 042/130] Update holster.json --- data/json/items/armor/holster.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index efcce51349e33..8393b79466351 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -546,8 +546,8 @@ "description": "A leather strap worn on the hip for holding pistol-sized guns. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] - } - { + }, + { "id": "XS_cotton_holster", "type": "ARMOR", "copy-from": "cotton_holster", From 538d73714a2673d3abace7fec1497eaf4cdf8786 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:30:15 -0700 Subject: [PATCH 043/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 8393b79466351..dd9f4a062c400 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -556,5 +556,5 @@ "description": "A cotton strap holding a firearm close to hand. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] - }, + } ] From a8fd38b9525a22c8ba9702b82f33640f069bb63b Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:35:16 -0700 Subject: [PATCH 044/130] Update scarfs.json --- data/json/items/armor/scarfs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 04f2baf63e2d2..4e13921b50bac 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -415,7 +415,7 @@ "warmth": 30, "environmental_protection": 1, "material_thickness": 2, - "armor": [ { "encumbrance:10", "coverage": 45, "covers": [ "mouth" ] } ] + "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, { "id": "scarf_faux_fur", From afd27a3e487b020492147a0511efc742134b8f47 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:40:28 -0700 Subject: [PATCH 045/130] Update scarfs.json --- data/json/items/armor/scarfs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 4e13921b50bac..5083c2ea0fd61 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -503,7 +503,7 @@ "warmth": 25, "environmental_protection": 1, "material_thickness": 2, - "armor": [ { "encumbrance:10", "coverage": 45, "covers": [ "mouth" ] } ] + "armor": [ { "encumbrance": 10, "coverage": 45, "covers": [ "mouth" ] } ] }, { "id": "marloss_scarf", From b17c6988ffe1445818c6a0e20d98d46eda4a6794 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:52:16 -0700 Subject: [PATCH 046/130] Update legs.json --- data/json/recipes/armor/legs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 8f520d567f82b..0e367443c2bbe 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -251,7 +251,7 @@ "time": "40 m", "autolearn": "true", "proficiencies": [ { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ], [ "technician_pants_gray", 1 ] ], + "using": [ [ "technician_pants_gray", 1 ], [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { From 38d26a03015db08b21207217cb536595b2532463 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 19:53:22 -0700 Subject: [PATCH 047/130] Update nested.json --- data/json/recipes/nested.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index 2918c36e2162b..d3bf8e8a317b6 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -86,7 +86,10 @@ "tactical_holster", "XS_holster", "sholster", - "suspenders_holster" + "suspenders_holster", + "cotton_holster", + "XL_cotton_holster", + "XS_cotton_holster" ], "difficulty": 1 }, From 4a39b7cabf28d02ef6aa467029971aba49dda610 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 20:06:20 -0700 Subject: [PATCH 048/130] Update suits_protection.json --- data/json/items/armor/suits_protection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 118615f676352..c9d0cc4dd0074 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -219,7 +219,7 @@ "moves": 80 } ], - "warmth": 60, + "warmth": 40, "material_thickness": 4, "valid_mods": [ "steel_padded" ], "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] From dce449bba306f7378b7146b2e4f24be4e2c61233 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 20:11:14 -0700 Subject: [PATCH 049/130] Update wheat.json --- data/json/items/comestibles/wheat.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index 5d4edd1b3474b..aaae789a4e84a 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -580,7 +580,7 @@ "price": 5000, "price_postapoc": 300, "charges": 4, - "material": [ "wheat" ], + "material": [ "wheat", "egg" ], "symbol": "%", "color": "brown", "calories": 278, From c4dbd8875aa94941057ed7e370982c4dec1d9ceb Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 20:47:10 -0700 Subject: [PATCH 050/130] Update legs.json --- data/json/recipes/armor/legs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 0e367443c2bbe..03daa306c0a03 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -251,7 +251,8 @@ "time": "40 m", "autolearn": "true", "proficiencies": [ { "proficiency": "prof_closures" } ], - "using": [ [ "technician_pants_gray", 1 ], [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], + "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], + "components": [ [ "technician_pants_gray", 1 ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { From c3b4524f0203955da2ca5d5bb21919798de12b66 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 20:55:30 -0700 Subject: [PATCH 051/130] Update legs.json --- data/json/recipes/armor/legs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 03daa306c0a03..cda5ce4c1afb0 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -252,7 +252,7 @@ "autolearn": "true", "proficiencies": [ { "proficiency": "prof_closures" } ], "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], - "components": [ [ "technician_pants_gray", 1 ] ], + "components": [ [ [ "technician_pants_gray", 1 ] ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { From f7e2da051748937b2c7b6c096ca448bdd3dfdb2a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:31:46 -0700 Subject: [PATCH 052/130] Update mutations.json --- data/json/mutations/mutations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 6d499d642e8e4..bb3a290a7251e 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1813,7 +1813,7 @@ "type": "mutation", "id": "VEGAN", "name": { "str": "Vegan" }, - "points": -1, + "points": -4, "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. Wearing animal products is also impossible.", "starting_trait": true, "valid": true @@ -6473,6 +6473,7 @@ "points": -4, "description": "Your body's ability to digest fruits, vegetables, grains and nuts is severely hampered. You cannot eat anything besides meat.", "types": [ "DIET" ], + "cancels": [ "VEGAN" ], "category": [ "LIZARD", "SPIDER", "CHIMERA", "RAPTOR", "FELINE", "BATRACHIAN", "BEAST", "LUPINE" ], "vitamin_rates": [ [ "vitC", -1200 ] ] }, From 5725077a48c16bfcaf259bd9fc312e22ca12ec44 Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Thu, 10 Nov 2022 22:03:19 -0700 Subject: [PATCH 053/130] Delete polymer_plant --- data/json/mapgen/polymer_plant | 408 --------------------------------- 1 file changed, 408 deletions(-) delete mode 100644 data/json/mapgen/polymer_plant diff --git a/data/json/mapgen/polymer_plant b/data/json/mapgen/polymer_plant deleted file mode 100644 index fad8d16e67386..0000000000000 --- a/data/json/mapgen/polymer_plant +++ /dev/null @@ -1,408 +0,0 @@ -[ - { - "type": "monstergroup", - "name": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", - "default": "mon_zombie_technician", - "monsters": [ - { "monster": "mon_zombie_technician", "freq": 300, "cost_multiplier": 3 }, - { "monster": "mon_zombie_hazmat", "freq": 200, "cost_multiplier": 3 }, - { "monster": "mon_zombie_electric", "freq": 100, "cost_multiplier": 5 }, - { "monster": "mon_skitterbot", "freq": 100, "cost_multiplier": 5 }, - { "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 5 } - ] - }, - { - "id": "repair_storage", - "type": "item_group", - "subtype": "collection", - "items": [ - { "group": "tools_common", "prob": 50 }, - { "group": "tools_electronics", "prob": 50 }, - { "group": "tools_lighting_industrial", "prob": 20 }, - { "group": "supplies_electronics", "prob": 50 }, - { "group": "hardware", "prob": 75 }, - { "group": "hardware_plumbing", "prob": 75 } - ] - }, - { - "type": "item_group", - "id": "decontamination", - "subtype": "collection", - "items": [ - { "item": "soap", "prob": 20 }, - { "item": "towel", "prob": 20 }, - { "item": "saline", "prob": 20 }, - { "item": "detergent", "prob": 20 }, - { "item": "mop", "prob": 10 }, - { "item": "boots_rubber", "prob": 10 }, - { "item": "gloves_rubber", "prob": 20 } - ] - }, - { - "type": "item_group", - "id": "packaging", - "subtype": "collection", - "items": [ - { "item": "bag_plastic", "prob": 90 }, - { "item": "bubblewrap", "prob": 60 }, - { "item": "box_small", "prob": 40 }, - { "item": "wrapper", "prob": 60 }, - { "item": "paper", "prob": 10 }, - { "item": "cup_plastic", "prob": 10 }, - { "item": "styrofoam_cup", "prob": 10 } - ] - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ - [ "irradiator_1_3", "irradiator_1_2", "irradiator_1_1" ], - [ "irradiator_1_6", "irradiator_1_5", "irradiator_1_4" ], - [ "irradiator_1_9", "irradiator_1_8", "irradiator_1_7" ] - ], - "weight": 250, - "object": { - "fill_ter": "t_strconc_floor", - "rows": [ - "''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''", - "'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'", - "'f***************************mmmmmmmmmmm******************************f'", - "'f**|--------------------------------------------------------------|**f'", - "'f**|qq c|c c|c c|c | f cc fTTf cc f |XXXXxXXXXXXXXXXXXX|**f'", - "'f**|- c|c c|c c|c | mmmm f ffff f mmmm |XM )!!!!!!!!!QX|**f'", - "'f**|qq c|c c|c c|c | mm/m G G m/mm |XM )!UUUUUUPPPX|**f'", - "'f**|qq c|c c|c c|c | mmmm f h f mmmm |XM )!UUUUUUPPPX|**f'", - "'f**|- -|- -|- -|- | f xxx f |X )!!!!!!!!!PX|**f'", - "'f**|qq |------4NN--------NN4------|X XXXXXXXXXXXXXXX|**f'", - "'f**|------------NN4-| |4NN---------------|**f'", - "'f**|MMMMMMMM4 4ZZPPPZZPPP|**f'", - "'f**|M PP N PPPXXXXXXX4NXXXXXXXXPPP N xP|**f'", - "'f**|MP PPPPP|----==-------XXXXXXXXNXXXXXXXX-----==-----|PPZPPPZPPP|**f'", - "'f**|TTTTTTTT| C K KXXXXXXX!Q!!!!!Q!XXXXXX J |TTTTTTTTTT|**f'", - "'f**|--------4 C K KKKXCCMMCX!!UUUUU!!XMMCCX J J C 4----------|**f'", - "'f**| N C K KXCXXXCX!!UUUUU!!XCXXCX J J C N |**f'", - "'f**| CCCCCCCMCC C CC1 XXCCCCCC3CCCCCCX 2 M CCMCCCCCCCCC |**f'", - "'f**| C N C K CCCC KXXXX!!UUUUU!!XXX CCCCCCM J C N C |**f'", - "'f**| C |----4 C K KXXXX!!UUUUU!!XXX M J C 4------| C |**f'", - "'f**| C |j}hd| C K [KKKKXXXX!!!!!!!!!XXX WW[[ |j > Q| C |**f'", - "'f**| C |j S|----==-------XXXXXXRRRRRXXXXXX-----==-----|j >>>>| C |**f'", - "'f**| C |j = |AAAA xxx AA MM| = > >| C |**f'", - "'f**| C |---------------- |A h M| |--------| >>QQ| C |**f'", - "'f**| C |^ ^| |AAA MMMMM| |.......^|c >QQ| C |**f'", - "'f**| C |] x|x x|x ]| |---N------------| |. |c > >| C |**f'", - "'f**| C |] hd|dh hd|dh ]| |##| 4|rG Gr|B B| |. htth |dh >Q>| C |**f'", - "'f**| C |] x|x x|x ]| | |Y----))--|B B| |. htth |------| C |**f'", - "'f**| C |] hd|dh hd|dh ]| |F | 4dh hd|B B| + ^|< + ?| C |**f'", - "'f**| C |] x|x x|x ]| |V |YRRxR4YxR|-+-| | oaao + |--| C |**f'", - "'f**| C |^ + + + + | oaao ^|< + ?| C |**f'", - "'f**| C |----------------==|---|---++---|----==|---------------| C |**f'", - "'f**| C |M KKKKKKKKKKKK |A AAAAR RAAAA A| JJJJJJJJJJJ | C |**f'", - "'f**| CCMCC |A D D A|J CCCMCC |**f'", - "'f**| N C KKKKKKKKKKKK |A ^oo^R R^oo^ A|J JJW MMMMMCCCC N |**f'", - "'f**| 4 C |-------++-------|J J W MMMMM 4 |**f'", - "'f**| N C KKKKKKKKKKKK |gggR{{R R{{Rggg|J JJW MMMMMCCCC N |**f'", - "'f**| CCMCC |g%%D%%D D%%D%%g|J CCCMCC |**f'", - "'f**| C |M KKKKKKKKKKKK |gggR{{R R{{Rggg| WWWWWWWWWWW N C |**f'", - "'f**-NMN4---------------4NN----|---++---|---4NN----------------4NMN|**f'", - "'f**| C KKKKKKKKKKKKKKKK M|S R R S|M JJJJJJJJJJJJJJJJ C |**f'", - "'f**| C x|S R RhS|x C |**f'", - "'f**| CCCCCCCCCCCCCCCCCCCCCC M|S D D S|M CCCCCCCCCCCCCCCCCCCCCC |**f'", - "'f**| x|S R R S|x |**f'", - "'f**| KKKKKKKKKKKKKKKKKKKKK |ShR R S| JJJJJJJJJJJJJJJJJJJJJJ |**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|---4N---|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^oo oo^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^ ^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!R aa at R!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!R ta aa R!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!!!!!!!!!!!!!!!|^ ^|!!!!!!!!!!!!!!!!!!!!!!!!!!|**f'", - "'f**|!!!!!!!!!!!!ee!!!!!!!!!!!!|^oo oo^|!!!!!!!!!!!!ee!!!!!!!!!!!!|**f'", - "'f**|YYYYYYYYYYYY--YYYYYYYYYYYY----++----YYYYYYYYYYYY--YYYYYYYYYYYY-**f'", - "'f**L____________LL____________L***ss***L____________LL____________L**f'", - "'f**L____________LL____________L***ss***L____________LL____________L**f'", - "'f**L____________LL____________L**#ss#**L____________LL____________L**f'", - "'f**L____________LL____________L**#ss#**L____________LL____________L**f'", - "'f**L____________LL____________L***ss***L____________LL____________L**f'", - "'f**L__________________________L***ss***L__________________________L**f'", - "'f**L_________________________LssssssssssL_________________________L**f'", - "'f**L________________________Lss***sss**ssL________________________L**f'", - "'f**L_______________________Lss***#ss#***ssL_______________________L**f'", - "'f**L______________________Lss****#ss#****ssL______________________L**f'", - "'f**L_____________________Lss******ss******ssL_____________________L**f'", - "'f**L____________________Ls##ssss##ss##ssss##sL____________________L**f'", - "'f**L___________________Lss--w=w---DD---w=w--ssL___________________L**f'", - "'f**L__________________Lssswdh ^hx xhA hdwsssL__________________L**f'", - "'f**L__________________Lssswxh hd dh hxwsssL__________________L**f'", - "'f**L__________________Lsss--w-w---DD---w-w--sssL__________________L**f'", - "'ffffGGGGGGGGGGGGGGGGGGffffffffffffGGffffffffffffGGGGGGGGGGGGGGGGGGffff'", - "[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[", - "[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[" - ], - "terrain": { - "*": [ [ "t_region_groundcover_forest", 2 ], "t_region_shrub_decorative" ], - "'": [ "t_fence_barbed" ], - "X": [ "t_strconc_wall" ], - "+": [ "t_door_c" ], - "-": [ "t_strconc_wall" ], - ",": [ "t_strconc_floor" ], - "Q": [ "t_strconc_floor" ], - "=": [ "t_door_locked_alarm" ], - "D": [ "t_reinforced_door_glass_c" ], - "G": [ "t_chaingate_l" ], - "L": [ "t_pavement_y" ], - "O": [ "t_wall_glass" ], - "C": [ "t_conveyor" ], - "_": [ "t_pavement" ], - "f": [ "t_chainfence_h" ], - "s": [ "t_sidewalk" ], - "w": [ "t_window" ], - "|": [ "t_strconc_wall" ], - "U": [ "t_water_pool" ], - "R": [ "t_reinforced_glass_shutter_open" ], - "m": [ "t_oil_circ_brkr_s", "t_station_disc", "t_switchgear_s", "t_potential_trans", "t_current_trans", "t_lgtn_arrest" ], - "e": [ "t_gates_mech_control" ], - "#": [ "t_sidewalk" ], - "P": [ "t_sewage_pump", [ "t_sewage_pipe", 3 ] ], - "Y": [ "t_door_metal_locked" ], - "y": [ "t_door_metal_o" ], - "N": [ "t_door_metal_locked" ], - "%": [ "t_grate" ], - "}": [ "t_ladder_up" ], - ")": [ "t_reinforced_glass" ], - "!": [ "t_thconc_floor" ], - "1": [ "t_floor_red" ], - "2": [ "t_floor_green" ], - "3": [ "t_rad_platform" ], - "4": [ "t_card_industrial" ] - }, - "furniture": { - "#": [ "f_bench" ], - "/": [ "f_compact_ASRG_containment" ], - "S": [ "f_locker" ], - "A": [ "f_locker" ], - "j": [ "f_locker" ], - "T": [ "f_standing_tank" ], - "^": [ "f_indoor_plant", "f_indoor_plant_y" ], - "a": [ "f_table" ], - "c": [ "f_utility_shelf" ], - "d": [ "f_desk" ], - "g": [ "f_shower" ], - "h": [ "f_chair" ], - "M": [ "f_machinery_heavy" ], - "o": [ "f_sofa" ], - "r": [ "f_rack" ], - "t": [ "f_table" ], - "Q": [ "f_air_filter" ], - "x": [ "f_console_broken" ], - "Z": [ "f_water_purifier" ], - "B": [ "f_bed", "f_dresser", "f_glass_cabinet" ], - "<": [ "f_sink" ], - "K": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ], - "J": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ], - "q": [ "f_crate_c", "f_utility_shelf" ], - "W": [ "f_crate_c", "f_utility_shelf" ], - "[": [ "f_dumpster" ], - "]": [ "f_bookcase", "f_filing_cabinet" ], - "?": [ "f_toilet" ], - ">": [ "f_vent_pipe" ], - ".": [ "f_oven", "f_counter", "f_fridge", "f_trashcan", "f_cupboard" ], - "{": [ "f_washer", "f_dryer" ] - }, - "toilets": { "?": { } }, - "vendingmachines": { "V": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, - "items": { - "S": { "item": "clothing_outdoor_set", "chance": 50 }, - "c": { "item": "repair_storage", "chance": 80 }, - "j": { "item": "cleaning", "chance": 80, "repeat": [ 1, 3 ] }, - "]": { "item": "file_room", "chance": 80 }, - "q": { "item": "supplies_electronics", "chance": 70, "repeat": [ 1, 4 ] }, - "K": { "item": "pre_irradiated_food", "chance": 20, "repeat": [ 1, 4 ] }, - "[": { "item": "pre_irradiated_food", "chance": 10, "repeat": [ 1, 4 ] }, - "J": { "item": "irradiated_food", "chance": 20, "repeat": [ 1, 4 ] }, - "A": { "item": "radiation_equipment", "chance": 20, "repeat": [ 1, 2 ] }, - "W": { "item": "packaging", "chance": 80, "repeat": [ 1, 15 ] }, - "#": { "item": "office_breakroom", "chance": 20 }, - "o": { "item": "office_breakroom", "chance": 20 }, - "a": { "item": "office_breakroom", "chance": 60 }, - "d": { "item": "cubical_office", "chance": 60 }, - ".": { "item": "coffee_shop", "chance": 50 }, - "B": { "item": "radiation_meds", "chance": 50 }, - "{": { "item": "decontamination", "chance": 15 }, - "%": { "item": "decontamination", "chance": 15 }, - "g": { "item": "decontamination", "chance": 15 } - }, - "place_loot": [ - { "group": "guns_pistol_common", "x": 34, "y": 26, "chance": 100, "ammo": 0, "magazine": 100, "repeat": [ 1, 2 ] }, - { "group": "ammo_pistol_common", "x": 39, "y": 26, "chance": 100, "repeat": [ 1, 5 ] }, - { "group": "prison_armor", "x": 39, "y": 26, "chance": 50, "repeat": [ 1, 2 ] } - ], - "liquids": { "T": { "liquid": "water_clean", "amount": [ 200, 600 ] } }, - "fields": { "U": { "field": "fd_nuke_gas", "intensity": 3, "age": 990 }, "/": { "field": "fd_shock_vent" } }, - "monster": { "!": { "monster": "mon_hazmatbot", "chance": 5 } }, - "monsters": { - "h": { "monster": "GROUP_ZOMBIE", "chance": 25 }, - "o": { "monster": "GROUP_ZOMBIE", "chance": 50 }, - "#": { "monster": "GROUP_ZOMBIE", "chance": 50 }, - "_": { "monster": "GROUP_ZOMBIE", "chance": 99 }, - " ": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 25 }, - "%": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 50 }, - "g": { "monster": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY", "chance": 50 } - }, - "place_item": [ { "item": "cobalt_60", "x": [ 57, 61 ], "y": [ 6, 7 ], "amount": [ 1, 5 ], "chance": 50, "repeat": [ 1, 15 ] } ], - "place_graffiti": [ - { "text": "Decontamination", "x": 34, "y": 35 }, - { "text": "Decontamination", "x": 34, "y": 39 }, - { "text": "Decontamination", "x": 37, "y": 35 }, - { "text": "Decontamination", "x": 37, "y": 39 } - ], - "place_vehicles": [ - { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 0, "status": -1, "x": 8, "y": 48 }, - { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 180, "status": 0, "x": 23, "y": 48 }, - { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 0, "status": 1, "x": 47, "y": 48 }, - { "vehicle": "warehouse_vehicles", "chance": 50, "fuel": -1, "rotation": 180, "status": -1, "x": 60, "y": 48 }, - { - "vehicle": "industrial_transport", - "chance": 25, - "fuel": -1, - "rotation": 90, - "status": -1, - "x": 10, - "y": 62 - }, - { "vehicle": "industrial_transport", "chance": 25, "fuel": -1, "rotation": 90, "status": 0, "x": 20, "y": 62 }, - { "vehicle": "industrial_transport", "chance": 25, "fuel": -1, "rotation": 90, "status": 1, "x": 53, "y": 62 }, - { - "vehicle": "industrial_transport", - "chance": 25, - "fuel": -1, - "rotation": 90, - "status": -1, - "x": 62, - "y": 62 - } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ - [ "irradiator_1_3_roof", "irradiator_1_2_roof", "irradiator_1_1_roof" ], - [ "irradiator_1_6_roof", "irradiator_1_5_roof", "irradiator_1_4_roof" ], - [ "irradiator_1_9_roof", "irradiator_1_8_roof", "irradiator_1_7_roof" ] - ], - "weight": 250, - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " ", - " ", - " |------------------------------------------------------------3 ", - " 5............................................................5 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |....}.......................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |......................................................&.&...3 ", - " |...................................................AAA&.&...3 ", - " |......................................................&.&...3 ", - " |...................................................AAA&.&...3 ", - " |......................................................&.&...3 ", - " |...................................................AAA&.&...3 ", - " |......................................................&.&...3 ", - " |...................................................AAA&.&...3 ", - " |......................................................&.&...3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |............................................................3 ", - " |.................................................RR.........3 ", - " |.................................................RR.........3 ", - " |............................................................3 ", - " |..CC.......SSSSS.SSSSS.SSSSS.SSSSS...........D........D.....3 ", - " |..CC.......SSSSS.SSSSS.SSSSS.SSSSS..........................3 ", - " 5............................................................5 ", - " |------------------------------------------------------------3 ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " |----------------3 ", - " |................3 ", - " |................5 ", - " |----------------3 ", - " ", - " ", - " " - ], - "terrain": { - ".": "t_flat_roof", - " ": "t_open_air", - "|": "t_gutter_west", - "-": "t_gutter_south", - "3": "t_gutter_east", - "5": "t_gutter_drop", - "}": "t_ladder_down", - "R": "t_radio_tower" - }, - "furniture": { - "&": "f_roof_turbine_vent", - "S": "f_solar_unit", - "D": "f_satellite", - "A": "f_air_conditioner", - "C": "f_cellphone_booster" - }, - "place_nested": [ - { - "chunks": [ - [ "null", 5 ], - [ "roof_4x4_survivor", 15 ], - [ "roof_16x16_help", 25 ], - [ "roof_4x4_holdout", 5 ], - [ "roof_6x6_utility", 45 ], - [ "roof_5x5_coop", 5 ] - ], - "x": [ 11, 23 ], - "y": [ 5, 23 ] - } - ] - } - } -] From 5a740dda6dd346a7372f2fbf871a01bdec590df9 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:47:50 -0700 Subject: [PATCH 054/130] Update boots.json --- data/json/items/armor/boots.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 5141813991215..de60f506556fa 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -451,7 +451,7 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, - { + { "id": "boots_faux_fur", "type": "ARMOR", "name": { "str": "pair of faux fur boots", "str_pl": "pairs of faux fur boots" }, From e5559bb45f3ca07bb285d7b1a7dbea205b26a972 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:49:04 -0700 Subject: [PATCH 055/130] Update gloves.json --- data/json/items/armor/gloves.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 444c6fcc79d0a..4f227bc66551c 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -605,7 +605,7 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, - { + { "id": "gloves_faux_fur", "type": "ARMOR", "name": { "str": "pair of faux fur gloves", "str_pl": "pairs of faux fur gloves" }, From 98a523a48d055ce67a23d02aa32c97eb47d792e7 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:49:54 -0700 Subject: [PATCH 056/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index dd9f4a062c400..054db16bc24f8 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -500,7 +500,7 @@ } ] }, - { + { "id": "XL_cotton_holster", "type": "ARMOR", "name": { "str": "large cotton holster" }, From 66d192f789161dc34712e6468b9beed26c926cd4 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:51:12 -0700 Subject: [PATCH 057/130] Update scarfs.json --- data/json/items/armor/scarfs.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 5083c2ea0fd61..f2bd696341bd9 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -497,7 +497,12 @@ "weight": "280 g", "volume": "2 L", "to_hit": -3, - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_faux_fur_long", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your scarf tighter.", + "target": "scarf_faux_fur_long", + "menu_text": "Wrap tighter" + }, "revert_to": "scarf_faux_fur_long", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 25, @@ -535,3 +540,4 @@ "armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "head" ] } ] } ] + From b40940b2e3e9297e0f3370d684b388eadfba348a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:54:40 -0700 Subject: [PATCH 058/130] Update feet.json --- data/json/recipes/armor/feet.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 06355088d7d3b..7244601cb1549 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -215,7 +215,7 @@ ], "time": "13 h 30 m" }, - { + { "result": "boots_faux_fur", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -1579,3 +1579,4 @@ "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ] } ] + From aa39d4a32c6bb6936f5b0bc4c983d7f77b56e016 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:55:32 -0700 Subject: [PATCH 059/130] Update hands.json --- data/json/recipes/armor/hands.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 855fc5ab28ec1..a23fc8b9740ac 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -223,7 +223,7 @@ "time": "10 h 10 m", "using": [ [ "tailoring_fur_small", 5 ] ] }, - { + { "result": "gloves_faux_fur", "type": "recipe", "activity_level": "LIGHT_EXERCISE", From bed62894d6e88185b3ca37c20f076a38705e4d8e Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:56:18 -0700 Subject: [PATCH 060/130] Update legs.json --- data/json/recipes/armor/legs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index cda5ce4c1afb0..7966cd4aab552 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -240,7 +240,7 @@ "using": [ [ "tailoring_cotton", 15 ], [ "fastener_small", 1 ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, - { + { "result": "canvas_pants_padded", "type": "recipe", "activity_level": "LIGHT_EXERCISE", From 9299249467fe8cd1eb765f88636e7a82861103ee Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:57:11 -0700 Subject: [PATCH 061/130] Update storage.json --- data/json/recipes/armor/storage.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 2fb520e847cc8..5ce8890eb5375 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -17,7 +17,7 @@ { "proficiency": "prof_leatherworking" } ] }, - { + { "result": "XL_cotton_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -863,7 +863,7 @@ ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, - { + { "result": "cotton_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -907,7 +907,7 @@ "using": [ [ "tailoring_leather_small", 2 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, - { + { "result": "XS_cotton_holster", "type": "recipe", "copy-from": "cotton_holster", From 793c3d84f64ce7746b7b0e173d314aa8f4dcd277 Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Fri, 11 Nov 2022 11:02:11 -0700 Subject: [PATCH 062/130] lint --- data/json/items/armor/boots.json | 2 +- data/json/items/armor/gloves.json | 2 +- data/json/items/armor/holster.json | 2 +- data/json/items/armor/scarfs.json | 7 ++++++- data/json/recipes/armor/feet.json | 2 +- data/json/recipes/armor/hands.json | 2 +- data/json/recipes/armor/legs.json | 4 ++-- data/json/recipes/armor/storage.json | 14 +++++--------- src/character_attire.cpp | 14 +++++++------- src/consumption.cpp | 4 ++-- 10 files changed, 27 insertions(+), 26 deletions(-) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 5141813991215..de60f506556fa 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -451,7 +451,7 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, - { + { "id": "boots_faux_fur", "type": "ARMOR", "name": { "str": "pair of faux fur boots", "str_pl": "pairs of faux fur boots" }, diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 444c6fcc79d0a..4f227bc66551c 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -605,7 +605,7 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, - { + { "id": "gloves_faux_fur", "type": "ARMOR", "name": { "str": "pair of faux fur gloves", "str_pl": "pairs of faux fur gloves" }, diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index dd9f4a062c400..054db16bc24f8 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -500,7 +500,7 @@ } ] }, - { + { "id": "XL_cotton_holster", "type": "ARMOR", "name": { "str": "large cotton holster" }, diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 5083c2ea0fd61..b9d41a2063dae 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -497,7 +497,12 @@ "weight": "280 g", "volume": "2 L", "to_hit": -3, - "use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_faux_fur_long", "menu_text": "Wrap tighter" }, + "use_action": { + "type": "transform", + "msg": "You wrap your scarf tighter.", + "target": "scarf_faux_fur_long", + "menu_text": "Wrap tighter" + }, "revert_to": "scarf_faux_fur_long", "flags": [ "OVERSIZE", "POCKETS", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 25, diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 06355088d7d3b..49f003a3b33f9 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -215,7 +215,7 @@ ], "time": "13 h 30 m" }, - { + { "result": "boots_faux_fur", "type": "recipe", "activity_level": "LIGHT_EXERCISE", diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index 855fc5ab28ec1..a23fc8b9740ac 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -223,7 +223,7 @@ "time": "10 h 10 m", "using": [ [ "tailoring_fur_small", 5 ] ] }, - { + { "result": "gloves_faux_fur", "type": "recipe", "activity_level": "LIGHT_EXERCISE", diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index cda5ce4c1afb0..f4900cd633f50 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -240,7 +240,7 @@ "using": [ [ "tailoring_cotton", 15 ], [ "fastener_small", 1 ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, - { + { "result": "canvas_pants_padded", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -252,7 +252,7 @@ "autolearn": "true", "proficiencies": [ { "proficiency": "prof_closures" } ], "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], - "components": [ [ [ "technician_pants_gray", 1 ] ] ], + "components": [ [ [ "technician_pants_gray", 1 ] ] ], "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 2fb520e847cc8..c96f44986f70a 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -17,7 +17,7 @@ { "proficiency": "prof_leatherworking" } ] }, - { + { "result": "XL_cotton_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -29,9 +29,7 @@ "time": "6 h", "autolearn": true, "using": [ [ "strap_small", 1 ], [ "tailoring_cotton_small", 15 ], [ "clasps", 1 ] ], - "proficiencies": [ - { "proficiency": "prof_closures" } - ] + "proficiencies": [ { "proficiency": "prof_closures" } ] }, { "result": "ammo_satchel", @@ -863,7 +861,7 @@ ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, - { + { "result": "cotton_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -875,9 +873,7 @@ "time": "8 h", "autolearn": true, "using": [ [ "tailoring_cotton_small", 8 ] ], - "proficiencies": [ - { "proficiency": "prof_closures" } - ], + "proficiencies": [ { "proficiency": "prof_closures" } ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { @@ -907,7 +903,7 @@ "using": [ [ "tailoring_leather_small", 2 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, - { + { "result": "XS_cotton_holster", "type": "recipe", "copy-from": "cotton_holster", diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 07973da45bbef..6506d1cbdbee5 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -85,13 +85,13 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons it.has_own_flag( flag_wooled ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made of wool!" ) ); } - - if( has_trait( trait_VEGAN ) && ( it.made_of( material_leather ) || - it.has_own_flag( flag_ANIMAL_PRODUCT ) || - it.made_of( material_fur ) || - it.made_of( material_wool ) || - it.made_of( material_chitin ) || - it.made_of( material_acidchitin ) ) ) { + + if( has_trait( trait_VEGAN ) && ( it.made_of( material_leather ) || + it.has_own_flag( flag_ANIMAL_PRODUCT ) || + it.made_of( material_fur ) || + it.made_of( material_wool ) || + it.made_of( material_chitin ) || + it.made_of( material_acidchitin ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made from an animal!" ) ); } diff --git a/src/consumption.cpp b/src/consumption.cpp index b8a4138bb6093..24c16426bd246 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -162,7 +162,7 @@ static const std::array herbivore_blacklist {{ }}; static const std::array vegan_blacklist {{ - json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, + json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT }}; @@ -819,7 +819,7 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } - if( ( has_trait( trait_VEGAN ) ) && + if( ( has_trait( trait_VEGAN ) ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, _( "You're still not going to eat animal products." ) ); From 76cfbfe6a1b0c6c43b3b35dd0d9bfcde9a2b2ca1 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:09:06 -0700 Subject: [PATCH 063/130] Update scarfs.json --- data/json/items/armor/scarfs.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index f2bd696341bd9..b9d41a2063dae 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -540,4 +540,3 @@ "armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "head" ] } ] } ] - From 0ca5528fba085e033063f00a1bb2841e1b7fd367 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:09:47 -0700 Subject: [PATCH 064/130] Update feet.json --- data/json/recipes/armor/feet.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 7244601cb1549..49f003a3b33f9 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -1579,4 +1579,3 @@ "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ] } ] - From a37352879b87f2c66d0c462604e187592836264e Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:33:35 -0700 Subject: [PATCH 065/130] Update mutations.json --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index bb3a290a7251e..2fdf6aaab7ef8 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1814,7 +1814,7 @@ "id": "VEGAN", "name": { "str": "Vegan" }, "points": -4, - "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. Wearing animal products is also impossible.", + "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. Wearing animal products is also impossible.", "starting_trait": true, "valid": true }, From 4c537995b2ee813e88591c2ff316391519e32bab Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:34:38 -0700 Subject: [PATCH 066/130] Update holster.json --- data/json/items/armor/holster.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 054db16bc24f8..c88df7f171992 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -235,7 +235,7 @@ "id": "cotton_holster", "type": "ARMOR", "name": { "str": "cotton holster" }, - "description": "An improvised holster made from reinforced cotton scraps. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", + "description": "An improvised holster made from reinforced cotton scraps. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", "weight": "400 g", "volume": "500 ml", "price": 900, @@ -504,7 +504,7 @@ "id": "XL_cotton_holster", "type": "ARMOR", "name": { "str": "large cotton holster" }, - "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", + "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", "weight": "400 g", "volume": "250 ml", "price": 900, From 1e928c6ddaadb7386349e0ab58843173dba0f12f Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 11:35:32 -0700 Subject: [PATCH 067/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index c88df7f171992..06b4190a26fc5 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -504,7 +504,7 @@ "id": "XL_cotton_holster", "type": "ARMOR", "name": { "str": "large cotton holster" }, - "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", + "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", "weight": "400 g", "volume": "250 ml", "price": 900, From 4070e6649655f03f820ca0eafdb0c18f16f98aa5 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:26:32 -0700 Subject: [PATCH 068/130] Update consumption.cpp --- src/consumption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 24c16426bd246..70e9b9a4748c5 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -819,7 +819,7 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } - if( ( has_trait( trait_VEGAN ) ) && + if( ( has_trait( trait_VEGAN ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, _( "You're still not going to eat animal products." ) ); From af1381f7e866358f297fdce38e5cf914ca991e83 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:28:24 -0700 Subject: [PATCH 069/130] Update flag.cpp --- src/flag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flag.cpp b/src/flag.cpp index 4364f8573876b..5fa624bea3b05 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -26,8 +26,8 @@ const flag_id flag_ALLERGEN_WOOL( "ALLERGEN_WOOL" ); const flag_id flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" ); const flag_id flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" ); const flag_id flag_ALWAYS_TWOHAND( "ALWAYS_TWOHAND" ); -const flag_id flag_AURA( "AURA" ); const flag_id flag_ANIMAL_PRODUCT( "ANIMAL_PRODUCT" ); +const flag_id flag_AURA( "AURA" ); const flag_id flag_BAROMETER( "BAROMETER" ); const flag_id flag_BASH_IMMUNE( "BASH_IMMUNE" ); const flag_id flag_BELTED( "BELTED" ); From 9e6350c08ce613e35c532291858317f3624aeaa9 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:30:11 -0700 Subject: [PATCH 070/130] Update character_attire.cpp --- src/character_attire.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index 6506d1cbdbee5..b33291e9a1740 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -25,8 +25,8 @@ static const flag_id json_flag_ONE_PER_LAYER( "ONE_PER_LAYER" ); static const itype_id itype_shoulder_strap( "shoulder_strap" ); -static const material_id material_wool( "wool" ); static const material_id material_leather( "leather" ); +static const material_id material_wool( "wool" ); static const material_id material_fur( "fur" ); static const material_id material_chitin( "chitin" ); static const material_id material_acidchitin( "acidchitin" ); From bff26db6b0dfdd6bdc4e079282558c9ca2b04af0 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:45:39 -0700 Subject: [PATCH 071/130] Update holster.json --- data/json/items/armor/holster.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 06b4190a26fc5..89a7a6f1d6519 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -232,15 +232,15 @@ ] }, { - "id": "cotton_holster", + "id": "canvas_holster", "type": "ARMOR", - "name": { "str": "cotton holster" }, - "description": "An improvised holster made from reinforced cotton scraps. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", + "name": { "str": "canvas holster" }, + "description": "An improvised holster made from reinforced canvas. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", "weight": "400 g", "volume": "500 ml", "price": 900, "price_postapoc": 250, - "material": [ "cotton" ], + "material": [ "canvas" ], "symbol": "[", "looks_like": "sheath", "color": "light_gray", @@ -501,15 +501,15 @@ ] }, { - "id": "XL_cotton_holster", + "id": "XL_canvas_holster", "type": "ARMOR", - "name": { "str": "large cotton holster" }, - "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with cotton instead of leather. Expect weaker performance. Activate to holster/draw a gun", + "name": { "str": "large canvas holster" }, + "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with canvas instead of leather. Expect weaker performance. Activate to holster/draw a gun", "weight": "400 g", "volume": "250 ml", "price": 900, "price_postapoc": 500, - "material": [ "cotton" ], + "material": [ "canvas" ], "symbol": "[", "looks_like": "quiver_large", "color": "light_gray", @@ -548,12 +548,12 @@ "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] }, { - "id": "XS_cotton_holster", + "id": "XS_canvas_holster", "type": "ARMOR", - "copy-from": "cotton_holster", + "copy-from": "canvas_holster", "looks_like": "holster", - "name": { "str": "XS cotton holster" }, - "description": "A cotton strap holding a firearm close to hand. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", + "name": { "str": "XS canvas holster" }, + "description": "A canvas strap holding a firearm close to hand. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] } From 7eba2f50b28bb46b1b7b19055b5f8e5e4c24cd3f Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:47:12 -0700 Subject: [PATCH 072/130] Update storage.json --- data/json/recipes/armor/storage.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index c96f44986f70a..45744a0087b4e 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -18,7 +18,7 @@ ] }, { - "result": "XL_cotton_holster", + "result": "XL_canvas_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -28,7 +28,7 @@ "skills_required": [ "gun", 1 ], "time": "6 h", "autolearn": true, - "using": [ [ "strap_small", 1 ], [ "tailoring_cotton_small", 15 ], [ "clasps", 1 ] ], + "using": [ [ "strap_small", 1 ], [ "tailoring_canvas_small", 15 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -862,7 +862,7 @@ "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { - "result": "cotton_holster", + "result": "canvas_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -872,7 +872,7 @@ "skills_required": [ "pistol", 1 ], "time": "8 h", "autolearn": true, - "using": [ [ "tailoring_cotton_small", 8 ] ], + "using": [ [ "tailoring_canvas_small", 8 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, @@ -904,11 +904,11 @@ "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { - "result": "XS_cotton_holster", + "result": "XS_canvas_holster", "type": "recipe", - "copy-from": "cotton_holster", + "copy-from": "canvas_holster", "time": "3 h", - "using": [ [ "tailoring_cotton_small", 3 ] ], + "using": [ [ "tailoring_canvas_small", 3 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { From 31e7c81f8d333d27c0e3ba0c783aaee1b660d60f Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:48:12 -0700 Subject: [PATCH 073/130] Update nested.json --- data/json/recipes/nested.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index d3bf8e8a317b6..bc6a3aa062ba8 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -87,9 +87,9 @@ "XS_holster", "sholster", "suspenders_holster", - "cotton_holster", - "XL_cotton_holster", - "XS_cotton_holster" + "canvas_holster", + "XL_canvas_holster", + "XS_canvas_holster" ], "difficulty": 1 }, From cc548441cf8056e34c6ebb04e30a8b2ea047aff4 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:59:42 -0700 Subject: [PATCH 074/130] Update consumption.cpp --- src/consumption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 70e9b9a4748c5..24c16426bd246 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -819,7 +819,7 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } - if( ( has_trait( trait_VEGAN ) && + if( ( has_trait( trait_VEGAN ) ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, _( "You're still not going to eat animal products." ) ); From fca9f5d15bc276e5debf7d49b4dd7b8c9990f17a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:23:17 -0700 Subject: [PATCH 075/130] Update character_attire.cpp --- src/character_attire.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index b33291e9a1740..d5146ac900d75 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -25,11 +25,11 @@ static const flag_id json_flag_ONE_PER_LAYER( "ONE_PER_LAYER" ); static const itype_id itype_shoulder_strap( "shoulder_strap" ); +static const material_id material_acidchitin( "acidchitin" ); +static const material_id material_chitin( "chitin" ); +static const material_id material_fur( "fur" ); static const material_id material_leather( "leather" ); static const material_id material_wool( "wool" ); -static const material_id material_fur( "fur" ); -static const material_id material_chitin( "chitin" ); -static const material_id material_acidchitin( "acidchitin" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); From 52d46cf237b6ad7cf6b42537e516eb2542224090 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Fri, 11 Nov 2022 19:13:16 -0700 Subject: [PATCH 076/130] Update consumption.cpp --- src/consumption.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 24c16426bd246..fd7129d6aab9c 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -819,7 +819,7 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } - if( ( has_trait( trait_VEGAN ) ) && + if( has_trait( trait_VEGAN ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, _( "You're still not going to eat animal products." ) ); From f97cb3e578c4b4994bf4968b0f302d8e472b770a Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Sat, 12 Nov 2022 10:54:23 -0700 Subject: [PATCH 077/130] .22 ar --- .../Weapons_Mods_Ammo/magazines.json | 5 +- data/json/items/gunmod/mechanism.json | 13 +++++ data/json/items/magazine/22.json | 54 +++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index c97c0f96254bf..9d68240088bdb 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -404,7 +404,10 @@ [ "usc10mag", 5 ], [ "usc15mag", 7 ], [ "usc20mag", 20 ], - [ "m1carbinebigmag", 30 ] + [ "m1carbinebigmag", 30 ], + [ "ar_22_10", 50 ], + [ "ar_22_25", 20 ], + [ "ar_22_50", 10 ] ] }, { diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 13321e2231a2c..a16365e0843c1 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -42,6 +42,19 @@ "mode_modifier": [ [ "AUTO", "auto", 4 ] ], "min_skills": [ [ "rifle", 2 ] ] }, + { + "id": "22_conversion_AR", + "type": "GUNMOD", + "name": { "str": ".22 AR conversion kit", + "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", + "location": "mechanism", + "mod_targets": [ "ar15", "ar_pistol" ], + "install_time": "30 s", + "acceptable_ammo": [ "22" ], + "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], + "dispersion_modifier": 15, + "overwrite_min_cycle_recoil": 100 + }, { "id": "llink", "type": "GUNMOD", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 7d0ba212a72ef..718d85fc4f36e 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -106,6 +106,60 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] }, + { + "id": "ar_22_10", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A magazine that at first looks like a stanag 20 round magazine, but has a much smaller lip designed to fit 10 rounds of .22 ammo.", + "weight": "200 g", + "volume": "230 ml", + "longest_side": "129 mm", + "price": 2000, + "price_postapoc": 400, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ] + }, + { + "id": "ar_22_25", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A magazine that at first looks like a stanag 30 round magazine, but has a much smaller lip designed to fit 25 rounds of .22 ammo.", + "weight": "240 g", + "volume": "290 ml", + "longest_side": "190 mm", + "price": 2000, + "price_postapoc": 450, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 25 } } ] + }, + { + "id": "ar_22_50", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A weird looking drum magazine, designed to fit in an AR-15. Can hold 50 rounds of .22 ammo.", + "weight": "400 g", + "volume": "400 ml", + "longest_side": "200 mm", + "price": 100000, + "price_postapoc": 500, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 50 } } ] + }, { "id": "marlin_tubeloader", "looks_like": "stanag30", From a4de08b8a7b6d50da8344ec384602a68530d1a85 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:55:34 -0700 Subject: [PATCH 078/130] Update magazines.json --- data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 9d68240088bdb..7d7c916eed753 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -404,11 +404,7 @@ [ "usc10mag", 5 ], [ "usc15mag", 7 ], [ "usc20mag", 20 ], - [ "m1carbinebigmag", 30 ], - [ "ar_22_10", 50 ], - [ "ar_22_25", 20 ], - [ "ar_22_50", 10 ] - ] + [ "m1carbinebigmag", 30 ] }, { "type": "item_group", From a42949deea991502a746ecb67dec2a518c829359 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:57:37 -0700 Subject: [PATCH 079/130] Update magazines.json --- data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 7d7c916eed753..627978a02f42e 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -405,6 +405,7 @@ [ "usc15mag", 7 ], [ "usc20mag", 20 ], [ "m1carbinebigmag", 30 ] + ] }, { "type": "item_group", From c1fc6b78d7e6d4782d1855e8e469543e19449166 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:58:10 -0700 Subject: [PATCH 080/130] Update magazines.json --- data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 627978a02f42e..b2291d7615bf9 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -405,7 +405,7 @@ [ "usc15mag", 7 ], [ "usc20mag", 20 ], [ "m1carbinebigmag", 30 ] - ] + ] }, { "type": "item_group", From 67b27bf30ac5683aafa0c4e18d7331373cc820a8 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:58:35 -0700 Subject: [PATCH 081/130] Update magazines.json --- data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index b2291d7615bf9..c97c0f96254bf 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -405,7 +405,7 @@ [ "usc15mag", 7 ], [ "usc20mag", 20 ], [ "m1carbinebigmag", 30 ] - ] + ] }, { "type": "item_group", From 7078610c6b4e52c61a28ad41335359eeb62c56d0 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:58:57 -0700 Subject: [PATCH 082/130] Update mechanism.json --- data/json/items/gunmod/mechanism.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index a16365e0843c1..13321e2231a2c 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -42,19 +42,6 @@ "mode_modifier": [ [ "AUTO", "auto", 4 ] ], "min_skills": [ [ "rifle", 2 ] ] }, - { - "id": "22_conversion_AR", - "type": "GUNMOD", - "name": { "str": ".22 AR conversion kit", - "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", - "location": "mechanism", - "mod_targets": [ "ar15", "ar_pistol" ], - "install_time": "30 s", - "acceptable_ammo": [ "22" ], - "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], - "dispersion_modifier": 15, - "overwrite_min_cycle_recoil": 100 - }, { "id": "llink", "type": "GUNMOD", From 5bfb6745fe6aaaf8df0e66d6d0bbb9aff5a2859c Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 10:59:27 -0700 Subject: [PATCH 083/130] Update 22.json --- data/json/items/magazine/22.json | 54 -------------------------------- 1 file changed, 54 deletions(-) diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 718d85fc4f36e..7d0ba212a72ef 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -106,60 +106,6 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] }, - { - "id": "ar_22_10", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A magazine that at first looks like a stanag 20 round magazine, but has a much smaller lip designed to fit 10 rounds of .22 ammo.", - "weight": "200 g", - "volume": "230 ml", - "longest_side": "129 mm", - "price": 2000, - "price_postapoc": 400, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ] - }, - { - "id": "ar_22_25", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A magazine that at first looks like a stanag 30 round magazine, but has a much smaller lip designed to fit 25 rounds of .22 ammo.", - "weight": "240 g", - "volume": "290 ml", - "longest_side": "190 mm", - "price": 2000, - "price_postapoc": 450, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 25 } } ] - }, - { - "id": "ar_22_50", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A weird looking drum magazine, designed to fit in an AR-15. Can hold 50 rounds of .22 ammo.", - "weight": "400 g", - "volume": "400 ml", - "longest_side": "200 mm", - "price": 100000, - "price_postapoc": 500, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 50 } } ] - }, { "id": "marlin_tubeloader", "looks_like": "stanag30", From 05bd7155fcceec9a253dfcdcc6eae58bada029db Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Sat, 12 Nov 2022 11:05:56 -0700 Subject: [PATCH 084/130] .22 ar --- .../Weapons_Mods_Ammo/magazines.json | 5 +- data/json/items/gunmod/mechanism.json | 13 +++++ data/json/items/magazine/22.json | 54 +++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index c97c0f96254bf..9d68240088bdb 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -404,7 +404,10 @@ [ "usc10mag", 5 ], [ "usc15mag", 7 ], [ "usc20mag", 20 ], - [ "m1carbinebigmag", 30 ] + [ "m1carbinebigmag", 30 ], + [ "ar_22_10", 50 ], + [ "ar_22_25", 20 ], + [ "ar_22_50", 10 ] ] }, { diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index 13321e2231a2c..a16365e0843c1 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -42,6 +42,19 @@ "mode_modifier": [ [ "AUTO", "auto", 4 ] ], "min_skills": [ [ "rifle", 2 ] ] }, + { + "id": "22_conversion_AR", + "type": "GUNMOD", + "name": { "str": ".22 AR conversion kit", + "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", + "location": "mechanism", + "mod_targets": [ "ar15", "ar_pistol" ], + "install_time": "30 s", + "acceptable_ammo": [ "22" ], + "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], + "dispersion_modifier": 15, + "overwrite_min_cycle_recoil": 100 + }, { "id": "llink", "type": "GUNMOD", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 7d0ba212a72ef..718d85fc4f36e 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -106,6 +106,60 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] }, + { + "id": "ar_22_10", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A magazine that at first looks like a stanag 20 round magazine, but has a much smaller lip designed to fit 10 rounds of .22 ammo.", + "weight": "200 g", + "volume": "230 ml", + "longest_side": "129 mm", + "price": 2000, + "price_postapoc": 400, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ] + }, + { + "id": "ar_22_25", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A magazine that at first looks like a stanag 30 round magazine, but has a much smaller lip designed to fit 25 rounds of .22 ammo.", + "weight": "240 g", + "volume": "290 ml", + "longest_side": "190 mm", + "price": 2000, + "price_postapoc": 450, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 25 } } ] + }, + { + "id": "ar_22_50", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "AR-15 10 round .22 magazine" }, + "description": "A weird looking drum magazine, designed to fit in an AR-15. Can hold 50 rounds of .22 ammo.", + "weight": "400 g", + "volume": "400 ml", + "longest_side": "200 mm", + "price": 100000, + "price_postapoc": 500, + "material": [ "plastic" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 50 } } ] + }, { "id": "marlin_tubeloader", "looks_like": "stanag30", From 94062a94e66715231c1993c84ba3164ba270ffda Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Sat, 12 Nov 2022 11:27:37 -0700 Subject: [PATCH 085/130] Update gunmod.json --- data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json index 78cfaabca36b4..96bba937ba655 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json @@ -18,7 +18,8 @@ [ "cheek_pad", 25 ], [ "rail_laser_sight", 40 ], [ "red_dot_sight", 70 ], - [ "choke", 50 ] + [ "choke", 50 ], + [ "22_conversion_ar", 5 ] //put the mod here to avoid having them spawn in military locations ] }, { From 2420af3fd55831a824ff5b0db9b245035cdcc9bf Mon Sep 17 00:00:00 2001 From: Paprika-H Date: Sat, 12 Nov 2022 11:41:48 -0700 Subject: [PATCH 086/130] lint --- .../itemgroups/Weapons_Mods_Ammo/magazines.json | 6 +++--- data/json/items/gunmod/mechanism.json | 17 +++++++++-------- data/json/items/magazine/22.json | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 9d68240088bdb..d689eb20b103c 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -405,9 +405,9 @@ [ "usc15mag", 7 ], [ "usc20mag", 20 ], [ "m1carbinebigmag", 30 ], - [ "ar_22_10", 50 ], - [ "ar_22_25", 20 ], - [ "ar_22_50", 10 ] + [ "ar_22_10", 50 ], + [ "ar_22_25", 20 ], + [ "ar_22_50", 10 ] ] }, { diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index a16365e0843c1..ac64d1519b85e 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -45,15 +45,16 @@ { "id": "22_conversion_AR", "type": "GUNMOD", - "name": { "str": ".22 AR conversion kit", - "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", + "name": { "str": ".22 AR conversion kit", + "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", "location": "mechanism", - "mod_targets": [ "ar15", "ar_pistol" ], - "install_time": "30 s", - "acceptable_ammo": [ "22" ], - "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], - "dispersion_modifier": 15, - "overwrite_min_cycle_recoil": 100 + "mod_targets": [ "ar15", "ar_pistol" ], + "install_time": "30 s", + "acceptable_ammo": [ "22" ], + "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], + "dispersion_modifier": 100, + "overwrite_min_cycle_recoil": 100, + "min_skills": [ [ "rifle", 1 ] ] }, { "id": "llink", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 718d85fc4f36e..efb8bb032d072 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -114,7 +114,7 @@ "description": "A magazine that at first looks like a stanag 20 round magazine, but has a much smaller lip designed to fit 10 rounds of .22 ammo.", "weight": "200 g", "volume": "230 ml", - "longest_side": "129 mm", + "longest_side": "129 mm", "price": 2000, "price_postapoc": 400, "material": [ "plastic" ], @@ -132,7 +132,7 @@ "description": "A magazine that at first looks like a stanag 30 round magazine, but has a much smaller lip designed to fit 25 rounds of .22 ammo.", "weight": "240 g", "volume": "290 ml", - "longest_side": "190 mm", + "longest_side": "190 mm", "price": 2000, "price_postapoc": 450, "material": [ "plastic" ], @@ -150,7 +150,7 @@ "description": "A weird looking drum magazine, designed to fit in an AR-15. Can hold 50 rounds of .22 ammo.", "weight": "400 g", "volume": "400 ml", - "longest_side": "200 mm", + "longest_side": "200 mm", "price": 100000, "price_postapoc": 500, "material": [ "plastic" ], From 1675ba0ebba10c066994539a0c2338fbdfae3456 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:27:55 -0700 Subject: [PATCH 087/130] Update gunmod.json --- data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json index 96bba937ba655..78cfaabca36b4 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json @@ -18,8 +18,7 @@ [ "cheek_pad", 25 ], [ "rail_laser_sight", 40 ], [ "red_dot_sight", 70 ], - [ "choke", 50 ], - [ "22_conversion_ar", 5 ] //put the mod here to avoid having them spawn in military locations + [ "choke", 50 ] ] }, { From 5e0ff197a407cb93ac18d801da120dd7c7f90492 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:28:23 -0700 Subject: [PATCH 088/130] Update magazines.json --- data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index d689eb20b103c..c97c0f96254bf 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -404,10 +404,7 @@ [ "usc10mag", 5 ], [ "usc15mag", 7 ], [ "usc20mag", 20 ], - [ "m1carbinebigmag", 30 ], - [ "ar_22_10", 50 ], - [ "ar_22_25", 20 ], - [ "ar_22_50", 10 ] + [ "m1carbinebigmag", 30 ] ] }, { From 98fae3f5f3fcc6a2f9bff20624f2a934611ab481 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:28:51 -0700 Subject: [PATCH 089/130] Update 22.json --- data/json/items/magazine/22.json | 54 -------------------------------- 1 file changed, 54 deletions(-) diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index efb8bb032d072..7d0ba212a72ef 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -106,60 +106,6 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] }, - { - "id": "ar_22_10", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A magazine that at first looks like a stanag 20 round magazine, but has a much smaller lip designed to fit 10 rounds of .22 ammo.", - "weight": "200 g", - "volume": "230 ml", - "longest_side": "129 mm", - "price": 2000, - "price_postapoc": 400, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ] - }, - { - "id": "ar_22_25", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A magazine that at first looks like a stanag 30 round magazine, but has a much smaller lip designed to fit 25 rounds of .22 ammo.", - "weight": "240 g", - "volume": "290 ml", - "longest_side": "190 mm", - "price": 2000, - "price_postapoc": 450, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 25 } } ] - }, - { - "id": "ar_22_50", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "AR-15 10 round .22 magazine" }, - "description": "A weird looking drum magazine, designed to fit in an AR-15. Can hold 50 rounds of .22 ammo.", - "weight": "400 g", - "volume": "400 ml", - "longest_side": "200 mm", - "price": 100000, - "price_postapoc": 500, - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 50 } } ] - }, { "id": "marlin_tubeloader", "looks_like": "stanag30", From 1ae8695fd07393ff9ca15f04573b8a6103b718ad Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:29:17 -0700 Subject: [PATCH 090/130] Update mechanism.json --- data/json/items/gunmod/mechanism.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index ac64d1519b85e..13321e2231a2c 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -42,20 +42,6 @@ "mode_modifier": [ [ "AUTO", "auto", 4 ] ], "min_skills": [ [ "rifle", 2 ] ] }, - { - "id": "22_conversion_AR", - "type": "GUNMOD", - "name": { "str": ".22 AR conversion kit", - "description": "A bolt from an AR-15 modified to shoot .22 ammo. Makes a good training tool, or a weapon if you're desperate enough.", - "location": "mechanism", - "mod_targets": [ "ar15", "ar_pistol" ], - "install_time": "30 s", - "acceptable_ammo": [ "22" ], - "magazine_adaptor": [ [ "22", [ "ar_22_10" ], [ "ar_22_25" ], [ "ar_22_50" ] ] ], - "dispersion_modifier": 100, - "overwrite_min_cycle_recoil": 100, - "min_skills": [ [ "rifle", 1 ] ] - }, { "id": "llink", "type": "GUNMOD", From 8d9c1f40f70b2c707063598ab46533395e849046 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Sat, 12 Nov 2022 19:17:04 -0700 Subject: [PATCH 091/130] Update data/json/mutations/mutations.json Co-authored-by: NetSysFire <59517351+NetSysFire@users.noreply.github.com> --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 2fdf6aaab7ef8..656b3f4feb35b 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1814,7 +1814,7 @@ "id": "VEGAN", "name": { "str": "Vegan" }, "points": -4, - "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. Wearing animal products is also impossible.", + "description": "You're very strictly vegan, eating animal products is out of the question, even if it means death. You also can't bear to wear clothing made of animal products, such as leather or fur.", "starting_trait": true, "valid": true }, From 13abdaf587fb43e0a437f95fa14f31448285e0c6 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:42:32 -0600 Subject: [PATCH 092/130] Update character_attire.cpp --- src/character_attire.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index d5146ac900d75..3bfd69bcb0c51 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -30,6 +30,7 @@ static const material_id material_chitin( "chitin" ); static const material_id material_fur( "fur" ); static const material_id material_leather( "leather" ); static const material_id material_wool( "wool" ); +static const material_id material_bone( "bone" ); static const trait_id trait_ANTENNAE( "ANTENNAE" ); static const trait_id trait_ANTLERS( "ANTLERS" ); @@ -91,6 +92,7 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons it.made_of( material_fur ) || it.made_of( material_wool ) || it.made_of( material_chitin ) || + it.made_of( material_bone ) || it.made_of( material_acidchitin ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made from an animal!" ) ); } From b10d6470919cad7813f919cfcb5f930384a3e563 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 13:07:16 -0600 Subject: [PATCH 093/130] Update holster.json --- data/json/items/armor/holster.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 89a7a6f1d6519..20e75f9500b67 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -232,20 +232,20 @@ ] }, { - "id": "canvas_holster", + "id": "nylon_holster", "type": "ARMOR", - "name": { "str": "canvas holster" }, - "description": "An improvised holster made from reinforced canvas. Not as strong as one made from leather, and not as fashionable either. Or tough. Activate to draw/holster a gun.", - "weight": "400 g", + "name": { "str": "nylon holster" }, + "description": "Holster made from nylon, rather than leather. A bit stronger and lighter, but not as fashionable. Activate to draw/holster a gun.", + "weight": "350 g", "volume": "500 ml", "price": 900, "price_postapoc": 250, - "material": [ "canvas" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "sheath", "color": "light_gray", "sided": true, - "material_thickness": 1, + "material_thickness": 0.5, "pocket_data": [ { "magazine_well": "350 ml", @@ -253,7 +253,7 @@ "holster": true, "min_item_volume": "250 ml", "max_contains_volume": "1000 ml", - "max_contains_weight": "1500 g", + "max_contains_weight": "2250 g", "max_item_length": "30 cm", "moves": 50 } @@ -501,27 +501,27 @@ ] }, { - "id": "XL_canvas_holster", + "id": "XL_nylon_holster", "type": "ARMOR", "name": { "str": "large canvas holster" }, - "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with canvas instead of leather. Expect weaker performance. Activate to holster/draw a gun", + "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with nylon instead of leather. Activate to holster/draw a gun", "weight": "400 g", "volume": "250 ml", "price": 900, "price_postapoc": 500, - "material": [ "canvas" ], + "material": [ "nylon" ], "symbol": "[", "looks_like": "quiver_large", "color": "light_gray", "sided": true, - "material_thickness": 1, + "material_thickness": 0.5, "pocket_data": [ { "pocket_type": "CONTAINER", "holster": true, "min_item_volume": "500 ml", "max_contains_volume": "1500 ml", - "max_contains_weight": "3500 g", + "max_contains_weight": "3750 g", "max_item_length": "45 cm", "moves": 70 } From 2aeba53137d3045f65b85e87d33e994bb84bc1de Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 19:54:59 -0600 Subject: [PATCH 094/130] Update item_factory.cpp --- src/item_factory.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 47d3aa51af473..3fd470559c689 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -3366,10 +3366,11 @@ void Item_factory::set_allergy_flags( itype &item_template ) // First allergens: // An item is an allergen even if it has trace amounts of allergenic material { material_hflesh, flag_CANNIBALISM }, - { material_hflesh, flag_ALLERGEN_MEAT }, { material_iflesh, flag_ALLERGEN_MEAT }, { material_flesh, flag_ALLERGEN_MEAT }, + { material_blood, flag_ALLERGEN_MEAT }, + { material_hblood, flag_ALLERGEN_MEAT }, { material_wheat, flag_ALLERGEN_WHEAT }, { material_fruit, flag_ALLERGEN_FRUIT }, { material_veggy, flag_ALLERGEN_VEGGY }, @@ -3389,6 +3390,8 @@ void Item_factory::set_allergy_flags( itype &item_template ) { material_iflesh, flag_CARNIVORE_OK }, { material_milk, flag_CARNIVORE_OK }, { material_egg, flag_CARNIVORE_OK }, + { material_blood, flag_CARNIVORE_OK }, + { material_hblood, flag_CARNIVORE_OK }, { material_honey, flag_URSINE_HONEY } } }; From f28335db635dfcd282c0cbf86a47fd57c47de6a9 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:39:58 -0600 Subject: [PATCH 095/130] Update holster.json --- data/json/items/armor/holster.json | 108 ++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 11 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 20e75f9500b67..fcee2c6b329fc 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -236,7 +236,7 @@ "type": "ARMOR", "name": { "str": "nylon holster" }, "description": "Holster made from nylon, rather than leather. A bit stronger and lighter, but not as fashionable. Activate to draw/holster a gun.", - "weight": "350 g", + "weight": "200 g", "volume": "500 ml", "price": 900, "price_postapoc": 250, @@ -462,6 +462,102 @@ "use_action": { "type": "holster" }, "flags": [ "SKINTIGHT", "WATER_FRIENDLY" ], "armor": [ { "encumbrance": [ 1, 6 ], "coverage": 50, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] } ] + }, + { + "id": "side_nylon_double_holster", + "type": "ARMOR", + "name": { "str": "nylon side-by-side double holster" }, + "description": "Two nylon holsters attached together by a strap, right next to each other. The placement means that drawing guns out of either one is slower than a regular holster. Activate to holster/draw a gun.", + "weight": "500 g", + "volume": "1000 ml", + "price": 9000, + "price_postapoc": 1200, + "material": [ "nylon" ], + "symbol": "[", + "looks_like": "sheath", + "color": "light_gray", + "sided": true, + "material_thickness": 2, + "pocket_data": [ + { + "magazine_well": "350 ml", + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "250 ml", + "max_contains_volume": "1000 ml", + "max_contains_weight": "2250 g", + "max_item_length": "30 cm", + "moves": 70 + }, + { + "magazine_well": "350 ml", + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "250 ml", + "max_contains_volume": "1000 ml", + "max_contains_weight": "2250 g", + "max_item_length": "30 cm", + "moves": 70 + } + ], + "use_action": { "type": "holster" }, + "flags": [ "BELTED", "OVERSIZE", "PALS_LARGE" ], + "armor": [ + { + "encumbrance": [ 5, 7 ], + "coverage": 5, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_r", "leg_hip_l" ] + } + ] + }, + { + "id": "FB_nylon_double_holster", + "type": "ARMOR", + "name": { "str": "nylon front-to-back double holster" }, + "description": "Two nylon holsters attached together by a strap, one in front of the other. The placement means that drawing a gun out of the front holster is slower than the other holster. Activate to holster/draw a gun.", + "weight": "480 g", + "volume": "1000 ml", + "price": 9000, + "price_postapoc": 1200, + "material": [ "nylon" ], + "symbol": "[", + "looks_like": "sheath", + "color": "light_gray", + "sided": true, + "material_thickness": 1, + "pocket_data": [ + { + "magazine_well": "350 ml", + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "250 ml", + "max_contains_volume": "1000 ml", + "max_contains_weight": "2250 g", + "max_item_length": "30 cm", + "moves": 50 + }, + { + "magazine_well": "350 ml", + "pocket_type": "CONTAINER", + "holster": true, + "min_item_volume": "250 ml", + "max_contains_volume": "1000 ml", + "max_contains_weight": "2250 g", + "max_item_length": "30 cm", + "moves": 80 + } + ], + "use_action": { "type": "holster" }, + "flags": [ "BELTED", "OVERSIZE", "PALS_LARGE" ], + "armor": [ + { + "encumbrance": [ 8, 10 ], + "coverage": 8, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_r", "leg_hip_l" ] + } + ] }, { "id": "XL_holster", @@ -547,14 +643,4 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] }, - { - "id": "XS_canvas_holster", - "type": "ARMOR", - "copy-from": "canvas_holster", - "looks_like": "holster", - "name": { "str": "XS canvas holster" }, - "description": "A canvas strap holding a firearm close to hand. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", - "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] - } ] From 6b9b4696dc0d7fb90d720bea5b647a65db80b6d3 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:41:31 -0600 Subject: [PATCH 096/130] Update nested.json --- data/json/recipes/nested.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index bc6a3aa062ba8..eb5ee80a71d09 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -87,9 +87,10 @@ "XS_holster", "sholster", "suspenders_holster", - "canvas_holster", - "XL_canvas_holster", - "XS_canvas_holster" + "nylon_holster", + "XL_nylon_holster", + "side_nylon_double_holster", + "FB_nylon_double_holster" ], "difficulty": 1 }, From a7b6e8d228d0e4bac60a95b8f798c5329910ef14 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:46:15 -0600 Subject: [PATCH 097/130] Update storage.json --- data/json/recipes/armor/storage.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 45744a0087b4e..26019d26516c5 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -18,7 +18,7 @@ ] }, { - "result": "XL_canvas_holster", + "result": "XL_nylon_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -28,7 +28,7 @@ "skills_required": [ "gun", 1 ], "time": "6 h", "autolearn": true, - "using": [ [ "strap_small", 1 ], [ "tailoring_canvas_small", 15 ], [ "clasps", 1 ] ], + "using": [ [ "strap_small", 1 ], [ "tailoring_nylon_patchwork", 2 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -862,7 +862,7 @@ "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { - "result": "canvas_holster", + "result": "nylon_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -872,7 +872,7 @@ "skills_required": [ "pistol", 1 ], "time": "8 h", "autolearn": true, - "using": [ [ "tailoring_canvas_small", 8 ] ], + "using": [ [ "tailoring_nylon_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, @@ -904,11 +904,11 @@ "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { - "result": "XS_canvas_holster", + "result": "XS_nylon_holster", "type": "recipe", - "copy-from": "canvas_holster", + "copy-from": "nylon_holster", "time": "3 h", - "using": [ [ "tailoring_canvas_small", 3 ] ], + "using": [ [ "tailoring_nylon_patchwork", 1 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, { From 55e9f2bdee0a6a62bfc27cb6a0398f94ef5c02e2 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:46:44 -0600 Subject: [PATCH 098/130] Update nested.json --- data/json/recipes/nested.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index eb5ee80a71d09..e6e3d8bd090dc 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -89,6 +89,7 @@ "suspenders_holster", "nylon_holster", "XL_nylon_holster", + "XS_nylon_holster", "side_nylon_double_holster", "FB_nylon_double_holster" ], From 2966eb95230afb4dcaa2e257610d7ea4cf4823e9 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:47:56 -0600 Subject: [PATCH 099/130] Update holster.json --- data/json/items/armor/holster.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index fcee2c6b329fc..fe2b7be2062b0 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -643,4 +643,14 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] }, + { + "id": "XS_nylon_holster", + "type": "ARMOR", + "copy-from": "nylon_holster", + "looks_like": "holster", + "name": { "str": "XS nylon holster" }, + "description": "A nylon sheath worn on the hip for holding pistol-sized guns. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] + }, ] From df956683d0cb8554ddf5ec0e9470106ecb7c5085 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:49:14 -0600 Subject: [PATCH 100/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index fe2b7be2062b0..0102bbd89ab05 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -617,7 +617,7 @@ "holster": true, "min_item_volume": "500 ml", "max_contains_volume": "1500 ml", - "max_contains_weight": "3750 g", + "max_contains_weight": "5500 g", "max_item_length": "45 cm", "moves": 70 } From c894a6ab4f7337a3d1761f753dd38ea8e28028b9 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:51:23 -0600 Subject: [PATCH 101/130] Update gear.json --- data/json/itemgroups/Clothing_Gear/gear.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json index ceb1992349839..a76d0e5aeea78 100644 --- a/data/json/itemgroups/Clothing_Gear/gear.json +++ b/data/json/itemgroups/Clothing_Gear/gear.json @@ -17,7 +17,8 @@ [ "holo_sight", 20 ], [ "balclava", 10 ], [ "balaclava_cut_resistant", 5 ], - [ "holster", 15 ], + [ "nylon_holster", 10 ], + [ "holster", 5 ], [ "bandolier_shotgun", 15 ], [ "torso_bandolier_shotgun", 8 ], [ "kevlar", 20 ], From ce69b1900fc8ebbf9134c330659c1dfae1c7ec2d Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:52:49 -0600 Subject: [PATCH 102/130] Update gunstore.json --- data/json/itemgroups/SUS/gunstore.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json index 807547bc048b7..6c878a2d2544a 100644 --- a/data/json/itemgroups/SUS/gunstore.json +++ b/data/json/itemgroups/SUS/gunstore.json @@ -117,7 +117,8 @@ { "item": "knee_pads", "prob": 20 }, { "item": "kevlar", "prob": 5 }, { "item": "elbow_pads", "prob": 20 }, - { "item": "holster", "prob": 45 }, + { "item": "nylon_holster", "prob": 25 }, + { "item": "holster", "prob": 20 }, { "item": "sholster", "prob": 20 }, { "item": "shoulder_holster", "prob": 5 }, { "item": "boots_combat", "prob": 10 }, From 2a26aeb0dfad16c82290bdc0ae7f62a87d2c7507 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:54:44 -0600 Subject: [PATCH 103/130] Update military.json --- data/json/itemgroups/military.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index c7b117b080a67..38f3b6edcd8d7 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -453,7 +453,7 @@ "id": "infantry_officer_gear", "subtype": "collection", "entries": [ - { "item": "holster", "contents-group": "military_standard_pistols", "prob": 90 }, + { "item": "nylon_holster", "contents-group": "military_standard_pistols", "prob": 90 }, { "item": "id_military", "prob": 90 } ] }, @@ -522,7 +522,7 @@ { "item": "gloves_fingerless", "prob": 20 }, { "item": "glasses_safety", "prob": 40 }, { "item": "hat_boonie", "prob": 10 }, - { "item": "holster", "prob": 15 }, + { "item": "nylon_holster", "prob": 15 }, { "item": "sholster", "prob": 10 }, { "item": "bandolier_shotgun", "prob": 12 }, { "item": "torso_bandolier_shotgun", "prob": 8 }, From de4025f8e2f0e8436aeaf94c586a3e57aba08f34 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:57:46 -0600 Subject: [PATCH 104/130] Update clothing.json --- data/json/itemgroups/Clothing_Gear/clothing.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 72b2076e2e698..d47fb83b4bb0e 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -2697,7 +2697,7 @@ [ "glasses_bal", 30 ], [ "sheath", 10 ], [ "bootsheath", 8 ], - [ "holster", 15 ], + [ "nylon_holster", 15 ], [ "sholster", 10 ], [ "shoulder_holster", 1 ], [ "bandolier_shotgun", 8 ], @@ -2805,7 +2805,8 @@ [ "motorbike_armor", 5 ], [ "motorbike_pants", 5 ], [ "motorbike_boots", 5 ], - [ "holster", 8 ], + [ "holster", 3 ], + [ "nylon_holster", 5 ], [ "sholster", 4 ], [ "shoulder_holster", 1 ], [ "bootstrap", 3 ], @@ -3169,7 +3170,8 @@ [ "wristwatch", 24 ], [ "diving_watch", 16 ], [ "pocketwatch", 14 ], - [ "holster", 14 ], + [ "holster", 6 ], + [ "nylon_holster", 8 ], [ "bandana", 18 ], [ "scarf", 26 ], [ "long_knit_scarf", 15 ], @@ -4236,7 +4238,8 @@ { "item": "gartersheath2", "prob": 10 }, { "item": "sheath", "prob": 80 }, { "item": "back_holster", "prob": 10 }, - { "item": "holster", "prob": 30 }, + { "item": "holster", "prob": 10 }, + { "item": "nylon_holster", "prob": 20 }, { "item": "sholster", "prob": 10 }, { "item": "shoulder_holster", "prob": 1 }, { "item": "bholster", "prob": 10 }, From e4ddc6f15ec86b4ec2a9bca4930ce4d37dc7209a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 23:01:53 -0600 Subject: [PATCH 105/130] Update locations.json --- data/json/itemgroups/Locations_MapExtras/locations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index aed9701a28628..23e1888b62447 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1612,7 +1612,8 @@ { "item": "file", "prob": 25 }, { "item": "baton", "prob": 20 }, { "item": "kevlar", "prob": 15 }, - { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster", "prob": 10 }, + { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster", "prob": 4 }, + { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "nylon_holster", "prob": 6 }, { "item": "survnote", "prob": 10 }, { "item": "family_photo", "prob": 10 }, { "item": "tazer", "prob": 5 } From 2cae742ec24dab0ff92e50e5f0c91bc753d53c49 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Tue, 27 Jun 2023 23:31:54 -0600 Subject: [PATCH 106/130] Update item_factory.cpp --- src/item_factory.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 3fd470559c689..7c91053e215a3 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -86,10 +86,12 @@ static const item_category_id item_category_weapons( "weapons" ); static const item_group_id Item_spawn_data_EMPTY_GROUP( "EMPTY_GROUP" ); static const material_id material_bean( "bean" ); +static const material_id material_blood( "blood" ); static const material_id material_egg( "egg" ); static const material_id material_flesh( "flesh" ); static const material_id material_fruit( "fruit" ); static const material_id material_garlic( "garlic" ); +static const material_id material_hblood( "hblood" ); static const material_id material_hflesh( "hflesh" ); static const material_id material_honey( "honey" ); static const material_id material_hydrocarbons( "hydrocarbons" ); From c66e2ace9b3e24de6df2def2e86024349dbe4e5e Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:18:56 -0600 Subject: [PATCH 107/130] Update item_factory.cpp --- src/item_factory.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 7c91053e215a3..9f7e768ca695e 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -92,6 +92,7 @@ static const material_id material_flesh( "flesh" ); static const material_id material_fruit( "fruit" ); static const material_id material_garlic( "garlic" ); static const material_id material_hblood( "hblood" ); +static const material_id material_bone( "bone" ); static const material_id material_hflesh( "hflesh" ); static const material_id material_honey( "honey" ); static const material_id material_hydrocarbons( "hydrocarbons" ); @@ -3364,15 +3365,17 @@ void Item_factory::load_generic( const JsonObject &jo, const std::string &src ) // Set for all items (not just food and clothing) to avoid edge cases void Item_factory::set_allergy_flags( itype &item_template ) { - static const std::array, 22> all_pairs = { { + static const std::array, 28> all_pairs = { { // First allergens: // An item is an allergen even if it has trace amounts of allergenic material { material_hflesh, flag_CANNIBALISM }, + { material_hblood, flag_CANNIBALISM }, { material_hflesh, flag_ALLERGEN_MEAT }, { material_iflesh, flag_ALLERGEN_MEAT }, { material_flesh, flag_ALLERGEN_MEAT }, { material_blood, flag_ALLERGEN_MEAT }, { material_hblood, flag_ALLERGEN_MEAT }, + { material_bone, flag_ALLERGEN_MEAT }, { material_wheat, flag_ALLERGEN_WHEAT }, { material_fruit, flag_ALLERGEN_FRUIT }, { material_veggy, flag_ALLERGEN_VEGGY }, From 7cf390c7e30e808edfa8a3e691761c5da677fb75 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:02:38 -0600 Subject: [PATCH 108/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 0102bbd89ab05..fb8cfc5e8d102 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -599,7 +599,7 @@ { "id": "XL_nylon_holster", "type": "ARMOR", - "name": { "str": "large canvas holster" }, + "name": { "str": "large nylon holster" }, "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with nylon instead of leather. Activate to holster/draw a gun", "weight": "400 g", "volume": "250 ml", From 4073185e8b1413563cc1cd664c6b32c9c1edfc7a Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:09:02 -0600 Subject: [PATCH 109/130] Update storage.json --- data/json/recipes/armor/storage.json | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 26019d26516c5..cd925d99ec31b 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -911,6 +911,36 @@ "using": [ [ "tailoring_nylon_patchwork", 1 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 1, "LIST" ] ] ] }, + { + "result": "side_nylon_double_holster", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 1, + "skills_required": [ "pistol", 1 ], + "time": "1 m", + "reversible": { "time": "30 s" }, + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 1 ] ], + "components": [ [ [ "nyloln_holster", 2 ] ] ] + }, + { + "result": "FB_double_holster", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 1, + "skills_required": [ "pistol", 1 ], + "time": "1 m", + "reversible": { "time": "30 s" }, + "autolearn": true, + "using": [ [ "tailoring_cotton_patchwork", 1 ] ], + "components": [ [ [ "nyloln_holster", 2 ] ] ] + }, { "result": "western_holster", "type": "recipe", @@ -1436,6 +1466,12 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ] }, + { + "id": "nylon_scabbard", + "type": "ARMOR", + "name": { + "str": "nylon_scabbard" + }, { "result": "leg_sheath6", "type": "recipe", From c439e3c2de1cba7da8d6af0910a3562d1d103f52 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:10:57 -0600 Subject: [PATCH 110/130] Update sheath.json --- data/json/items/armor/sheath.json | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index d8f076f1e3e24..b671ba8612132 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -355,6 +355,44 @@ } ] }, + { + "id": "nylon_scabbard", + "type": "ARMOR", + "name": { "str": "nylon scabbard" }, + "description": "A large, adjustable sheath for holding swords and other large blades, made with nylon. Activate to sheathe/draw a weapon.", + "weight": "1360 g", + "volume": "1750 ml", + "price": 6000, + "price_postapoc": 500, + "bashing": 4, + "material": [ "nylon", "wood" ], + "symbol": "[", + "looks_like": "holster", + "color": "brown", + "sided": true, + "material_thickness": 1, + "pocket_data": [ + { + "magazine_well": "1250 ml", + "max_contains_volume": "2 L", + "max_contains_weight": "4 kg", + "max_item_length": "100 cm", + "holster": true, + "moves": 30, + "flag_restriction": [ "SHEATH_SWORD" ] + } + ], + "use_action": { "type": "holster", "holster_prompt": "Sheath sword", "holster_msg": "You sheath your %s" }, + "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ], + "armor": [ + { + "encumbrance": [ 3, 4 ], + "coverage": 15, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_r", "leg_hip_l" ] + } + ] + }, { "id": "sheath", "type": "ARMOR", From 7edb81d9420f3100e9bce1620a029d51df088dbc Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:13:03 -0600 Subject: [PATCH 111/130] Update storage.json --- data/json/recipes/armor/storage.json | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index cd925d99ec31b..507f05e94a32a 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -1467,10 +1467,22 @@ "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ] }, { - "id": "nylon_scabbard", - "type": "ARMOR", - "name": { - "str": "nylon_scabbard" + "result": "nylon_scabbard", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 5, + "skills_required": [ "melee", 1 ], + "time": "8 h", + "autolearn": true, + "using": [ [ "tailoring_nylon_patchwork", 10 ], [ "clasps", 1 ], [ "adhesive", 1 ] ], + "proficiencies": [ + { "proficiency": "prof_closures" }, + ], + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ] }, { "result": "leg_sheath6", From c70fa71cb6f4cf2ac3f91fd5d0ea7f42dc998dbd Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:30:00 -0600 Subject: [PATCH 112/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index fb8cfc5e8d102..1191441f2db7c 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -652,5 +652,5 @@ "description": "A nylon sheath worn on the hip for holding pistol-sized guns. The size of the strap has been adjusted to fit someone with much smaller legs. Activate to holster/draw a gun.", "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "BELTED", "OVERSIZE", "UNDERSIZE", "PALS_MEDIUM" ] - }, + } ] From 795cbe72e80da70a8fb01c3050a225c6eb099f6e Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:32:38 -0600 Subject: [PATCH 113/130] Update storage.json --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 507f05e94a32a..d7c91f3cb0ef8 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -1479,7 +1479,7 @@ "autolearn": true, "using": [ [ "tailoring_nylon_patchwork", 10 ], [ "clasps", 1 ], [ "adhesive", 1 ] ], "proficiencies": [ - { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures" } ], "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ] From 02e71d0ee15d9daf928f2bd67ab3c0f8c63b4133 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:33:36 -0600 Subject: [PATCH 114/130] Update storage.json --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index d7c91f3cb0ef8..fd1e840d9ecfe 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -927,7 +927,7 @@ "components": [ [ [ "nyloln_holster", 2 ] ] ] }, { - "result": "FB_double_holster", + "result": "FB_nylon_double_holster", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", From 662c107ee54f242f38f8f5490e6a910307261789 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:34:26 -0600 Subject: [PATCH 115/130] Update storage.json --- data/json/recipes/armor/storage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index fd1e840d9ecfe..70ac6f79a700c 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -924,7 +924,7 @@ "reversible": { "time": "30 s" }, "autolearn": true, "using": [ [ "tailoring_cotton_patchwork", 1 ] ], - "components": [ [ [ "nyloln_holster", 2 ] ] ] + "components": [ [ [ "nylon_holster", 2 ] ] ] }, { "result": "FB_nylon_double_holster", @@ -939,7 +939,7 @@ "reversible": { "time": "30 s" }, "autolearn": true, "using": [ [ "tailoring_cotton_patchwork", 1 ] ], - "components": [ [ [ "nyloln_holster", 2 ] ] ] + "components": [ [ [ "nylon_holster", 2 ] ] ] }, { "result": "western_holster", From 7670c39a7f89bba490f3fb09fc6447bfc3a31e12 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:33:30 -0600 Subject: [PATCH 116/130] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/armor/holster.json | 2 +- data/json/recipes/armor/storage.json | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 769221d767b28..ecc8240de57f8 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -589,7 +589,7 @@ } ] }, - { + { "id": "side_nylon_double_holster", "type": "ARMOR", "name": { "str": "nylon side-by-side double holster" }, diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 3a59b0282c22b..58bc6b16634be 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -1546,9 +1546,7 @@ "time": "8 h", "autolearn": true, "using": [ [ "tailoring_nylon_patchwork", 10 ], [ "clasps", 1 ], [ "adhesive", 1 ] ], - "proficiencies": [ - { "proficiency": "prof_closures" } - ], + "proficiencies": [ { "proficiency": "prof_closures" } ], "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ] }, From e932847af7117949061283e02f956d36f2852cdb Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:17:15 -0600 Subject: [PATCH 117/130] Update nested.json --- data/json/recipes/nested.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index 0d3b3698e0e82..dfe3e02b4ade1 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -103,9 +103,9 @@ "sholster", "suspenders_holster", "FB_double_holster", - "FB_nylon_double_holster" - "side_double_holster" - "side_nylon_double_holster", + "FB_nylon_double_holster", + "side_double_holster", + "side_nylon_double_holster" ], "difficulty": 1 }, From 5e79a4bb583c2e1f8da4ecf311ecd1e314c93638 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:22:36 -0600 Subject: [PATCH 118/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index ecc8240de57f8..47d14ec133bd0 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -251,7 +251,7 @@ "id": "nylon_holster", "type": "ARMOR", "name": { "str": "nylon holster" }, - "description": "Holster made from nylon, rather than leather. A bit stronger and lighter, but not as fashionable. Activate to draw/holster a gun.", + "description": "Holster made from nylon, rather than leather. A bit stronger and lighter, but not as fashionable. Activate to draw/holster a gun.", "weight": "200 g", "volume": "500 ml", "price": 900, From e3a2033003f263d2cc72b61acf3ec80f6cf52be8 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:22:39 -0600 Subject: [PATCH 119/130] Update boots.json --- data/json/items/armor/boots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 15b02ff2724fc..ca6a3d3a66e44 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -455,7 +455,6 @@ "price": 14000, "price_postapoc": 750, "to_hit": -1, - "bashing": 1, "material": [ "cotton", "faux_fur" ], "symbol": "[", "looks_like": "boots", @@ -493,7 +492,8 @@ ], "coverage": 100 } - ] + ], + "melee_damage": { "bash": 1 } }, { "id": "xl_boots_faux_fur", From 12e96d3dbb42fea6939748c175db1e3c5e837af5 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:22:43 -0600 Subject: [PATCH 120/130] Update legs_armor.json --- data/json/items/armor/legs_armor.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index 23a2bca3f0ba9..9b0b5cb824406 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -2072,7 +2072,6 @@ "warmth": 25, "material_thickness": 2.0, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] - ] }, { "id": "armor_riot_leg", From a1161f02466de81219825873082993098ec0ee75 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:38:01 -0600 Subject: [PATCH 121/130] Update consumption.cpp --- src/consumption.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 8ee0dbcf3047a..467e28a2a210d 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -85,6 +85,7 @@ static const flag_id json_flag_ALLERGEN_NUT( "ALLERGEN_NUT" ); static const flag_id json_flag_ALLERGEN_VEGGY( "ALLERGEN_VEGGY" ); static const flag_id json_flag_ALLERGEN_WHEAT( "ALLERGEN_WHEAT" ); static const flag_id json_flag_ANIMAL_PRODUCT( "ANIMAL_PRODUCT" ); +static const flag_id flag_URSINE_HONEY( "URSINE_HONEY" ); static const item_category_id item_category_chems( "chems" ); @@ -163,7 +164,8 @@ static const std::array herbivore_blacklist {{ static const std::array vegan_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, - json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT + json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, + flag_URSINE_HONEY }}; // TODO: Move pizza scraping here. From 378122f39ea37a70ec06d5a0c2993fae51cd9338 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:50:36 -0600 Subject: [PATCH 122/130] Update consumption.cpp --- src/consumption.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index 467e28a2a210d..8e4a0772895cb 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -85,7 +85,6 @@ static const flag_id json_flag_ALLERGEN_NUT( "ALLERGEN_NUT" ); static const flag_id json_flag_ALLERGEN_VEGGY( "ALLERGEN_VEGGY" ); static const flag_id json_flag_ALLERGEN_WHEAT( "ALLERGEN_WHEAT" ); static const flag_id json_flag_ANIMAL_PRODUCT( "ANIMAL_PRODUCT" ); -static const flag_id flag_URSINE_HONEY( "URSINE_HONEY" ); static const item_category_id item_category_chems( "chems" ); @@ -162,7 +161,7 @@ static const std::array herbivore_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG }}; -static const std::array vegan_blacklist {{ +static const std::array vegan_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, flag_URSINE_HONEY From d107ce759db0c30b150b83fb1e5261c079f5ae6c Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:11:55 -0600 Subject: [PATCH 123/130] Update character_attire.cpp --- src/character_attire.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index d57528b96abb3..f124158c622ff 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -29,6 +29,7 @@ static const itype_id itype_shoulder_strap( "shoulder_strap" ); static const material_id material_acidchitin( "acidchitin" ); static const material_id material_chitin( "chitin" ); static const material_id material_fur( "fur" ); +static const material_id material_gutskin( "gutskin" ); static const material_id material_leather( "leather" ); static const material_id material_wool( "wool" ); static const material_id material_bone( "bone" ); @@ -96,6 +97,7 @@ ret_val Character::can_wear( const item &it, bool with_equip_change ) cons it.made_of( material_wool ) || it.made_of( material_chitin ) || it.made_of( material_bone ) || + it.made_of( material_gutskin ) || it.made_of( material_acidchitin ) ) ) { return ret_val::make_failure( _( "Can't wear that, it's made from an animal!" ) ); } From 987cca08f87e6ddd1239356a3a78ebb745ab2139 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:12:54 -0600 Subject: [PATCH 124/130] Update sheath.json --- data/json/items/armor/sheath.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index 2f81923724d14..0ebc74eadb233 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -383,7 +383,6 @@ "volume": "1750 ml", "price": 6000, "price_postapoc": 500, - "bashing": 4, "material": [ "nylon", "wood" ], "symbol": "[", "looks_like": "holster", @@ -447,7 +446,8 @@ "encumbrance": [ 0, 1 ], "specifically_covers": [ "leg_hip_r", "leg_hip_l" ] } - ] + ], + "melee_damage": { "bash": 4 } }, { "id": "sheath_birchbark", From e6943a7504bb185fef1868df28a68ec4b8da1af8 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:14:01 -0600 Subject: [PATCH 125/130] Update suits_protection.json --- data/json/items/armor/suits_protection.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 5066eede551e5..d8bd520180a1d 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -180,7 +180,6 @@ "price": 100000, "price_postapoc": 1500, "to_hit": -5, - "bashing": 2, "material": [ "faux_fur" ], "symbol": "[", "longest_side": "30 cm", @@ -209,8 +208,8 @@ ], "warmth": 40, "material_thickness": 4, - "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] + "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ], + "melee_damage": { "bash": 2 } }, { "id": "xl_armor_faux_farmor", From acf52a3eb15337f2eae72722fdc0b9b195581795 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:14:28 -0600 Subject: [PATCH 126/130] Update legs.json --- data/json/recipes/armor/legs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index d1e33ebd4a88b..a14bd77f7f594 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -281,7 +281,7 @@ "skill_used": "tailor", "difficulty": 2, "time": "40 m", - "autolearn": "true", + "autolearn": true, "proficiencies": [ { "proficiency": "prof_closures" } ], "using": [ [ "tailoring_cotton", 15 ], [ "sewing_standard", 90 ] ], "components": [ [ [ "technician_pants_gray", 1 ] ] ], From 81169d14e15146851607c382891a8aefa49a1a4b Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:42:18 -0600 Subject: [PATCH 127/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 47d14ec133bd0..2bad17e6f66e2 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -727,7 +727,7 @@ "type": "ARMOR", "name": { "str": "large nylon holster" }, "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with nylon instead of leather. Activate to holster/draw a gun", - "weight": "400 g", + "weight": "300 g", "volume": "250 ml", "price": 900, "price_postapoc": 500, From 94ccb854fa651411bb9d1bbc2d8276534c92f63c Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 15:06:47 -0600 Subject: [PATCH 128/130] Update holster.json --- data/json/items/armor/holster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 2bad17e6f66e2..bb278253d8571 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -727,7 +727,7 @@ "type": "ARMOR", "name": { "str": "large nylon holster" }, "description": "A belt holster consisting of a loop and strap intended for use with larger firearms, but made with nylon instead of leather. Activate to holster/draw a gun", - "weight": "300 g", + "weight": "287 g", "volume": "250 ml", "price": 900, "price_postapoc": 500, From 2f131e3bfbf0ab968dc17bcb0070213a149adbcb Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 20:08:27 -0600 Subject: [PATCH 129/130] Apply suggestions from code review Co-authored-by: David Seguin --- src/character_attire.cpp | 2 +- src/consumption.cpp | 11 +++++------ src/item_factory.cpp | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/character_attire.cpp b/src/character_attire.cpp index f124158c622ff..1339c94ab7b91 100644 --- a/src/character_attire.cpp +++ b/src/character_attire.cpp @@ -27,12 +27,12 @@ static const flag_id json_flag_ONE_PER_LAYER( "ONE_PER_LAYER" ); static const itype_id itype_shoulder_strap( "shoulder_strap" ); static const material_id material_acidchitin( "acidchitin" ); +static const material_id material_bone( "bone" ); static const material_id material_chitin( "chitin" ); static const material_id material_fur( "fur" ); static const material_id material_gutskin( "gutskin" ); static const material_id material_leather( "leather" ); static const material_id material_wool( "wool" ); -static const material_id material_bone( "bone" ); static const sub_bodypart_str_id sub_body_part_foot_sole_l( "foot_sole_l" ); static const sub_bodypart_str_id sub_body_part_foot_sole_r( "foot_sole_r" ); diff --git a/src/consumption.cpp b/src/consumption.cpp index 8e4a0772895cb..f556c6b58e48c 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -161,12 +161,6 @@ static const std::array herbivore_blacklist {{ json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG }}; -static const std::array vegan_blacklist {{ - json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, - json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, - flag_URSINE_HONEY - }}; - // TODO: Move pizza scraping here. static int compute_default_effective_kcal( const item &comest, const Character &you, const cata::flat_set &extra_flags = {} ) @@ -834,6 +828,11 @@ ret_val Character::can_eat( const item &food ) const return ret_val::make_failure( INEDIBLE_MUTATION, _( "The thought of eating that makes you feel sick." ) ); } + const std::array vegan_blacklist {{ + json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, + json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, + flag_URSINE_HONEY + }}; if( has_trait( trait_VEGAN ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION, diff --git a/src/item_factory.cpp b/src/item_factory.cpp index eb9829244d568..834d741429bb0 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -90,12 +90,12 @@ static const item_group_id Item_spawn_data_EMPTY_GROUP( "EMPTY_GROUP" ); static const material_id material_bean( "bean" ); static const material_id material_blood( "blood" ); +static const material_id material_bone( "bone" ); static const material_id material_egg( "egg" ); static const material_id material_flesh( "flesh" ); static const material_id material_fruit( "fruit" ); static const material_id material_garlic( "garlic" ); static const material_id material_hblood( "hblood" ); -static const material_id material_bone( "bone" ); static const material_id material_hflesh( "hflesh" ); static const material_id material_honey( "honey" ); static const material_id material_hydrocarbons( "hydrocarbons" ); From 97a6a8d599acd69fcb45a33f99b59c1f5ad60ee5 Mon Sep 17 00:00:00 2001 From: Paprika-H <78005870+Paprika-H@users.noreply.github.com> Date: Wed, 28 Jun 2023 20:25:50 -0600 Subject: [PATCH 130/130] Update src/consumption.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/consumption.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/consumption.cpp b/src/consumption.cpp index f556c6b58e48c..c226def93085c 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -829,10 +829,10 @@ ret_val Character::can_eat( const item &food ) const _( "The thought of eating that makes you feel sick." ) ); } const std::array vegan_blacklist {{ - json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, - json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, - flag_URSINE_HONEY - }}; + json_flag_ALLERGEN_MEAT, json_flag_ALLERGEN_EGG, + json_flag_ALLERGEN_MILK, json_flag_ANIMAL_PRODUCT, + flag_URSINE_HONEY + }}; if( has_trait( trait_VEGAN ) && food.has_any_flag( vegan_blacklist ) ) { return ret_val::make_failure( INEDIBLE_MUTATION,