Merge branch '4nonch' of https://github.com/4nonch/Cataclysm-BN into …

…4nonch
4nonch · Jul 23, 2024 · 96beeb4 · 96beeb4
2 parents efd412e + bc04a6d
commit 96beeb4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -735,7 +735,7 @@
     "price": "60 USD",
     "price_postapoc": "15 USD",
     "material": [ "wood", "iron" ],
-    "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "extend": { "flags": [ "NONCONDUCTIVE" ] },
     "weight": "1275 g",
     "bashing": 30,
     "qualities": [ [ "HAMMER", 1 ] ]

diff --git a/data/json/mapgen/sports_store.json b/data/json/mapgen/sports_store.json
@@ -3,7 +3,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "s_sports" ],
-    "weight": 300,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -33,8 +32,8 @@
         "........4..............."
       ],
       "terrain": {
-        ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "?": "t_dirt",
+        ".": "t_region_groundcover_urban",
+        "?": "t_region_groundcover_urban",
         " ": "t_floor",
         "'": "t_pavement",
         "`": "t_pavement_y",

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -1168,7 +1168,6 @@
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_MATERIALS",
     "skill_used": "survival",
-    "difficulty": 1,
     "time": "1 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 } ],
@@ -1188,7 +1187,8 @@
         [ "birchbark", 1 ],
         [ "willowbark", 1 ]
       ]
-    ]
+    ],
+    "flags": [ "BLIND_EASY" ]
   },
   {
     "type": "recipe",

diff --git a/src/options.cpp b/src/options.cpp
@@ -1968,8 +1968,8 @@ void options_manager::add_options_graphics()
 
     add( "USE_CHARACTER_PREVIEW", graphics, translate_marker( "Enable character preview window" ),
          translate_marker( "If true, shows character preview window in traits tab on character creation. "
-                                     "While having a window press 'z'/'Z' to perform zoom-in/zoom-out. "
-                                     "Press 'C' to toggle clothes preview" ),
+                           "While having a window press 'z'/'Z' to perform zoom-in/zoom-out. "
+                           "Press 'C' to toggle clothes preview" ),
          true, COPT_CURSES_HIDE
        );