Merge pull request #129 from collectanos/master

Мелкие улучшения
AtomicFox556 · Oct 29, 2023 · efcf999 · efcf999
2 parents c8c3250 + 6df07bf
commit efcf999
Show file tree

Hide file tree

Showing 7 changed files with 256 additions and 31 deletions.
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -2933,6 +2933,201 @@
         "encumbrance": 4
       },
       { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 60 }
+    ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "stockings_black",
+        "name": { "str": "pair of black stockings", "str_pl": "pairs of black stockings" },
+        "description": "This one is colored black.",
+        "weight": 140,
+        "color": "dark_gray",
+        "append": true
+      },
+      {
+        "id": "stockings_white",
+        "name": { "str": "pair of white stockings", "str_pl": "pairs of white stockings" },
+        "description": "This one is colored white",
+        "weight": 70,
+        "color": "light_gray",
+        "append": true
+      },
+      {
+        "id": "stockings_red",
+        "name": { "str": "pair of red stockings", "str_pl": "pairs of red stockings" },
+        "description": "This one is colored red.",
+        "weight": 30,
+        "color": "red",
+        "append": true
+      },
+      {
+        "id": "stockings_yellow",
+        "name": { "str": "pair of yellow stockings", "str_pl": "pairs of yellow stockings" },
+        "description": "This one is colored yellow.",
+        "weight": 10,
+        "color": "yellow",
+        "append": true
+      },
+      {
+        "id": "stockings_green",
+        "name": { "str": "pair of green stockings", "str_pl": "pairs of green stockings" },
+        "description": "This one is colored green.",
+        "weight": 40,
+        "color": "green",
+        "append": true
+      },
+      {
+        "id": "stockings_blue",
+        "name": { "str": "pair of blue stockings", "str_pl": "pairs of blue stockings" },
+        "description": "This one is colored blue.",
+        "weight": 60,
+        "color": "blue",
+        "append": true
+      },
+      {
+        "id": "stockings_purple",
+        "name": { "str": "pair of purple stockings", "str_pl": "pairs of purple stockings" },
+        "description": "This one is colored purple.",
+        "weight": 50,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pink",
+        "name": { "str": "pair of pink stockings", "str_pl": "pairs of pink stockings" },
+        "description": "This one is colored pink.",
+        "weight": 35,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_default",
+        "name": { "str": "pair of pride flag stockings", "str_pl": "pairs of pride flag stockings" },
+        "description": "This one has patterns akin to the pride flag.",
+        "weight": 80,
+        "color": "yellow",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_lesbian",
+        "name": { "str": "pair of lesbian flag stockings", "str_pl": "pairs of lesbian flag stockings" },
+        "description": "This one has patterns akin to the lesbian flag.",
+        "weight": 75,
+        "color": "red",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_bisexual",
+        "name": { "str": "pair of bisexual flag stockings", "str_pl": "pairs of bisexual flag stockings" },
+        "description": "This one has patterns akin to the bisexual flag.",
+        "weight": 45,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_transgender",
+        "name": { "str": "pair of transgender flag stockings", "str_pl": "pairs of transgender flag stockings" },
+        "description": "This one has patterns akin to the transgender flag.",
+        "weight": 90,
+        "color": "blue",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_asexual",
+        "name": { "str": "pair of asexual flag stockings", "str_pl": "pairs of asexual flag stockings" },
+        "description": "This one has patterns akin to the asexual flag.",
+        "weight": 75,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_aromantic",
+        "name": { "str": "pair of aromantic flag stockings", "str_pl": "pairs of aromantic flag stockings" },
+        "description": "This one has patterns akin to the aromantic flag.",
+        "weight": 65,
+        "color": "green",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_pansexual",
+        "name": { "str": "pair of pansexual flag stockings", "str_pl": "pairs of pansexual flag stockings" },
+        "description": "This one has patterns akin to the pansexual flag.",
+        "weight": 75,
+        "color": "blue",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_genderqueer",
+        "name": { "str": "pair of genderqueer flag stockings", "str_pl": "pairs of genderqueer flag stockings" },
+        "description": "This one has patterns akin to the genderqueer flag.",
+        "weight": 55,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_genderfluid",
+        "name": { "str": "pair of genderfluid flag stockings", "str_pl": "pairs of genderfluid flag stockings" },
+        "description": "This one has patterns akin to the genderfluid flag.",
+        "weight": 45,
+        "color": "magenta",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_agender",
+        "name": { "str": "pair of agender flag stockings", "str_pl": "pairs of agender flag stockings" },
+        "description": "This one has patterns akin to the agender flag.",
+        "weight": 45,
+        "color": "dark_gray",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_nonbinary",
+        "name": { "str": "pair of non-binary flag stockings", "str_pl": "pairs of non-binary flag stockings" },
+        "description": "This one has patterns akin to the non-binary flag.",
+        "weight": 75,
+        "color": "yellow",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_intersex",
+        "name": { "str": "pair of intersex flag stockings", "str_pl": "pairs of intersex flag stockings" },
+        "description": "This one has patterns akin to the intersex flag.",
+        "weight": 55,
+        "color": "yellow",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_polysexual",
+        "name": { "str": "pair of polysexual flag stockings", "str_pl": "pairs of polysexual flag stockings" },
+        "description": "This one has patterns akin to the polysexual flag.",
+        "weight": 25,
+        "color": "green",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_straight",
+        "name": { "str": "pair of straight flag stockings", "str_pl": "pairs of straight flag stockings" },
+        "description": "This one has patterns akin to the straight flag.",
+        "weight": 45,
+        "color": "white",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_bear",
+        "name": { "str": "pair of bear subculture flag stockings", "str_pl": "pairs of bear subculture flag stockings" },
+        "description": "This one has patterns akin to the bear subculture flag.",
+        "weight": 15,
+        "color": "yellow",
+        "append": true
+      },
+      {
+        "id": "stockings_pride_leather",
+        "name": { "str": "pair of leather subculture flag stockings", "str_pl": "pairs of leather subculture flag stockings" },
+        "description": "This one has patterns akin to the leather subculture flag.",
+        "weight": 15,
+        "color": "blue",
+        "append": true
+      }
     ]
   },
   {

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -425,7 +425,7 @@
       "blackpowder_tolerance": 60,
       "clip_size": 1
     },
-    "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "launcher", 1 ] ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
@@ -462,7 +462,7 @@
       "blackpowder_tolerance": 60,
       "clip_size": 1
     },
-    "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "launcher", 1 ] ],
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
@@ -527,7 +527,7 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 330, "durability": 10, "clip_size": 4 },
-    "min_skills": [ [ "weapon", 2 ], [ "shotgun", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "shotgun", 1 ] ],
     "flags": [ "RELOAD_ONE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 4 } } ]
   },
@@ -557,7 +557,7 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 310, "durability": 10, "clip_size": 5 },
-    "min_skills": [ [ "weapon", 2 ], [ "shotgun", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "shotgun", 1 ] ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "m26_mass_mag_3", "m26_mass_mag_5" ] } ]
   },
   {
@@ -613,7 +613,7 @@
     "color": "light_gray",
     "location": "underbarrel",
     "mod_targets": [ "pistol" ],
-    "min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "melee", 1 ] ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ],
     "mode_modifier": [ [ "REACH", "bayonet", 1, [ "MELEE" ] ] ],
     "flags": [  ],
@@ -666,7 +666,7 @@
     "location": "underbarrel",
     "mod_targets": [ "rifle", "crossbow" ],
     "gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 375, "durability": 10, "clip_size": 2 },
-    "min_skills": [ [ "weapon", 2 ], [ "shotgun", 1 ] ],
+    "min_skills": [ [ "weapon", 1 ], [ "shotgun", 1 ] ],
     "flags": [ "RELOAD_ONE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ]
   },

diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json
@@ -762,7 +762,7 @@
       "MISSION_ROBOFAC_INTERCOM_ROBOT_SM_1_COMPLETE_Binder"
     ],
     "type": "talk_topic",
-    "dynamic_line": "&The intercom tray quickly slides shut.\n\n\"We expected nothing less.  We hope your found the prototype's performance to be satisfactory.\"",
+    "dynamic_line": "&The intercom tray quickly slides shut.\n\n\"We expected nothing less.  We hope you found the prototype's performance to be satisfactory.\"",
     "responses": [
       {
         "text": "Will this weapon work on other robots, as well?",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -767,6 +767,29 @@
       "female": [ "bra", "panties" ]
     }
   },
+  {
+    "type": "profession",
+    "id": "butcher",
+    "name": "Butcher",
+    "description": "You spent most of your adult life in a butcher shop.  Your trusty knife has seen many different creatures and you know how to butcher them.",
+    "points": 2,
+    "skills": [ { "name": "cutting", "level": 2 }, { "name": "cooking", "level": 2 }, { "name": "survival", "level": 2 } ],
+    "proficiencies": [ "prof_food_prep", "prof_knife_skills", "prof_intro_biology", "prof_wp_basic_bird" ],
+    "items": {
+      "both": {
+        "items": [ "pants", "socks", "sneakers" ],
+        "entries": [
+          { "group": "charged_smart_phone" },
+          { "item": "knife_butcher", "container-item": "sheath" },
+          { "item": "hat_chef", "variant": "white_hat_chef" },
+          { "item": "jacket_chef", "variant": "white_jacket_chef" },
+          { "item": "apron_plastic" }
+        ]
+      },
+      "male": [ "briefs" ],
+      "female": [ "bra", "panties" ]
+    }
+  },
   {
     "type": "profession",
     "id": "churl",

diff --git a/data/json/recipes/practice/tailoring.json b/data/json/recipes/practice/tailoring.json
@@ -89,6 +89,25 @@
     "components": [ [ [ "sheet_lycra", 1 ], [ "sheet_lycra_patchwork", 1 ], [ "lycra_patch", 2 ] ] ],
     "using": [ [ "sewing_standard", 20 ] ]
   },
+  {
+    "id": "prac_quilting",
+    "type": "practice",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_PRACTICE",
+    "subcategory": "CSC_PRACTICE_TAILORING",
+    "name": "fabric quilting",
+    "description": "Practice the beautiful art of quilting by efficiently sewing a pair of padded sheets together in different patterns.",
+    "skill_used": "tailor",
+    "proficiencies": [ { "proficiency": "prof_quilting", "time_multiplier": 1, "skill_penalty": 0 } ],
+    "time": "1 h",
+    "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 },
+    "autolearn": [ [ "tailor", 2 ] ],
+    "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "textbook_armwest", 1 ] ],
+    "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ],
+    "components": [ [ [ "sheet_cotton", 2 ] ], [ [ "gambeson_batting", 2 ] ] ],
+    "using": [ [ "filament_canvas", 20 ] ],
+    "byproducts": [ [ "cotton_patchwork", 6 ], [ "gambeson_batting", 2 ] ]
+  },
   {
     "id": "prac_leather_beg",
     "type": "practice",

diff --git a/data/title/en.christmas b/data/title/en.christmas
@@ -1,21 +1,15 @@
 # The ASCII art must be 18 lines in height (6 lines per ascii art text line).
 # Max length of a line is 80 characters; the following line is for reference.
 ################################################################################
-<color_light_cyan>   _________            __                   .__                                
-<color_light_cyan>   \_   ___ \ _____   _/  |_ _____     ____  |  |   ___.__   ______  _____      
-<color_light_cyan>   /    \  \/ \__  \  \   __\\__  \  _/ ___\ |  |  <   |  | /  ___/ /     \     
-<color_light_cyan>   \     \____ / __ \_ |  |   / __ \_\  \___ |  |__ \___  | \___ \ |  Y Y  \    
-<color_light_cyan>    \______  /(____  / |__|  (____  / \___  >|____/ / ____|/____  >|__|_|  /    
-<color_light_cyan>           \/      \/             \/      \/        \/          \/       \/     
-<color_white>     _________              __           _________ .__                          
-<color_white>    /   _____/____    _____/  |______    \_   ___ \|  | _____   __ __  ______   
-<color_red>    \_____  \\__  \  /    \   __\__  \   /    \  \/|  | \__  \ |  |  \/  ___/   
-<color_red>    /        \/ __ \|   |  \  |  / __ \_ \     \___|  |__/ __ \|  |  /\___ \    
-<color_red>   /_______  (____  /___|  /__| (____  /  \______  /____(____  /____//____  >   
-<color_red>           \/     \/     \/          \/          \/          \/           \/    
-<color_light_blue>                     _____   .__                         .___                   
-<color_light_blue>                    /  _  \  |  |__    ____  _____     __| _/                   
-<color_light_blue>                   /  /_\  \ |  |  \ _/ __ \ \__  \   / __ |                    
-<color_light_blue>                  /    |    \|   Y  \\  ___/  / __ \_/ /_/ |                    
-<color_light_blue>                  \____|__  /|___|  / \___  >(____  /\____ |                    
-<color_light_blue>                          \/      \/      \/      \/      \/                    
+<color_light_cyan>   _________            __                   .__                                                  </color>
+<color_light_cyan>   \_   ___ \ _____   _/  |_ _____     ____  |  |   ___.__   ______  _____                        </color>
+<color_light_cyan>   /    \  \/ \__  \  \   __\\__  \  _/ ___\ |  |  <   |  | /  ___/ /     \                       </color>
+<color_light_cyan>   \     \____ / __ \_ |  |   / __ \_\  \___ |  |__ \___  | \___ \ |  Y Y  \                      </color>
+<color_light_cyan>    \______  /(____  / |__|  (____  / \___  >|____/ / ____|/____  >|__|_|  /                      </color>
+<color_light_cyan>           \/      \/             \/      \/        \/          \/       \/                       </color>
+<color_white>        _________                   ______           ________                                          </color>
+<color_white>       /   _____/_______ _____     /  __  \   ____   \______ \    ____    ____  _____   ___.__         </color>
+<color_red>         |   |___  \_  __ \\__  \    |  | | |  /  _ \   |    |  \ _/ __ \ _/ ___\ \__  \ <   |  |        </color>
+<color_red>         |   ___/   |  | \/ / __ \_  |  | | | _| |_\/   |        \\  ___/ \  \___  / __ \_\___  |        </color>
+<color_light_blue>  |   |____  |__|   (____  /  |  |_| | \_ __\   /_______  / \___  > \___  >(____  // ____|        </color>
+<color_light_blue>  \_______/              \/   \______/  |_/             \/      \/      \/      \/ \/             </color>
diff --git a/data/title/en.easter b/data/title/en.easter
@@ -16,9 +16,3 @@
 <color_white>   | <color_yellow>(_<color_red>{;}<color_yellow>_)<color_white> || <color_green>(_ <color_yellow>(_)<color_green> _)<color_white>|  <color_light_blue>(_,_)<color_white>\  ||  <color_magenta>(_,_)<color_white>\  | |   |  \  `-'    /\    `-'  | 
 <color_white>   |  <color_yellow>(_,_)<color_white>  / \ <color_green>/  . \<color_white> /|  |    |  ||  |    |  | |   |   \       /  \       /  
 <color_white>   /_______.'   `<color_green>`-'`-'<color_white>' '--'    '--''--'    '--' '---'    `'-..-'    `-...-'   
-<color_green>                     _____   .__                         .___                   
-<color_green>                    /  _  \  |  |__    ____  _____     __| _/                   
-<color_green>                   /  /_\  \ |  |  \ _/ __ \ \__  \   / __ |                    
-<color_green>                  /    |    \|   Y  \\  ___/  / __ \_/ /_/ |                    
-<color_green>                  \____|__  /|___|  / \___  >(____  /\____ |                    
-<color_green>                          \/      \/      \/      \/      \/