oops

CleverRaven · Feb 2, 2025 · dac5e42 · dac5e42
1 parent a5cea8d
commit dac5e42
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 27 deletions.
diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json
@@ -177,8 +177,7 @@
     "min_max_zlevel": [ -5, 5 ],
     "sym": "P",
     "color": "magenta",
-    "autonote": true,
-    "flags": [ "PORTAL" ]
+    "autonote": true
   },
   {
     "id": "mx_portal_in",
@@ -189,8 +188,7 @@
     "min_max_zlevel": [ -5, 5 ],
     "sym": "P",
     "color": "magenta",
-    "autonote": true,
-    "flags": [ "PORTAL" ]
+    "autonote": true
   },
   {
     "id": "mx_exocrash_1",
@@ -249,8 +247,7 @@
     "min_max_zlevel": [ -1, -1 ],
     "sym": "S",
     "color": "yellow",
-    "autonote": true,
-    "flags": [ "SPIDER" ]
+    "autonote": true
   },
   {
     "id": "mx_house_wasp",
@@ -261,8 +258,7 @@
     "min_max_zlevel": [ 0, 10 ],
     "sym": "W",
     "color": "yellow",
-    "autonote": true,
-    "flags": [ "WASP" ]
+    "autonote": true
   },
   {
     "id": "mx_bugout",
@@ -584,8 +580,7 @@
     "min_max_zlevel": [ 0, 9 ],
     "sym": "W",
     "color": "yellow",
-    "autonote": true,
-    "flags": [ "WASP" ]
+    "autonote": true
   },
   {
     "id": "mx_nest_dermatik",
@@ -596,8 +591,7 @@
     "min_max_zlevel": [ 0, 0 ],
     "sym": "D",
     "color": "brown",
-    "autonote": true,
-    "flags": [ "WASP" ]
+    "autonote": true
   },
   {
     "id": "mx_prison_bus",
@@ -709,8 +703,7 @@
     "name": { "str": "Beehive" },
     "description": "An ordinary beehive.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_beehive_natural" },
-    "min_max_zlevel": [ 0, 0 ],
-    "flags": [ "BEE" ]
+    "min_max_zlevel": [ 0, 0 ]
   },
   {
     "id": "mx_worm_sign",

diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json
@@ -236,7 +236,7 @@
     "type": "requirement",
     "//": "35g per unit. Crafting cotton items, adjusted for tailoring rework. 3g+excessive weight of material is wasted, producing patches or scraps. Time needed is usually 30 minutes per unit if hand-stitching. This uses roughly 50 inches of thread to account for waste.",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ],
-    "components": [ [ [ "sheet_linen", 1 ], [ "sheet_cotton", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
+    "components": [ [ [ "sheet_cotton", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
   },
   {
     "id": "tailoring_cotton_knitting",
@@ -250,14 +250,14 @@
     "type": "requirement",
     "//": "35g per unit. Crafting possibly-patchwork cotton items, adjusted for tailoring rework. Time needed is usually 30 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet)",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ],
-    "components": [ [ [ "sheet_linen", 1 ], [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
+    "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
   },
   {
     "id": "tailoring_cotton_patchwork_simple",
     "type": "requirement",
     "//": "35g per unit. Crafting possibly-patchwork cotton items, adjusted for tailoring rework. Time needed is usually 30 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).  Used for simpler items where precision cutting is less important.",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "sheet_linen", 1 ], [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
+    "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
   },
   {
     "id": "tailoring_cotton_small",

diff --git a/src/flag.cpp b/src/flag.cpp
@@ -299,7 +299,6 @@ const flag_id flag_REMOVED_STOCK( "REMOVED_STOCK" );
 const flag_id flag_REQUIRES_BALANCE( "REQUIRES_BALANCE" );
 const flag_id flag_REQUIRES_TINDER( "REQUIRES_TINDER" );
 const flag_id flag_RESTRICT_HANDS( "RESTRICT_HANDS" );
-const flag_id flag_RETTABLE( "RETTABLE" );
 const flag_id flag_REVIVE_SPECIAL( "REVIVE_SPECIAL" );
 const flag_id flag_ROLLER_INLINE( "ROLLER_INLINE" );
 const flag_id flag_ROLLER_ONE( "ROLLER_ONE" );

diff --git a/src/flag.h b/src/flag.h
@@ -305,7 +305,6 @@ extern const flag_id flag_REMOVED_STOCK;
 extern const flag_id flag_REQUIRES_BALANCE;
 extern const flag_id flag_REQUIRES_TINDER;
 extern const flag_id flag_RESTRICT_HANDS;
-extern const flag_id flag_RETTABLE;
 extern const flag_id flag_REVIVE_SPECIAL;
 extern const flag_id flag_ROLLER_INLINE;
 extern const flag_id flag_ROLLER_ONE;

diff --git a/src/iexamine.cpp b/src/iexamine.cpp
@@ -159,8 +159,6 @@ static const furn_str_id furn_f_water_mill( "f_water_mill" );
 static const furn_str_id furn_f_water_mill_active( "f_water_mill_active" );
 static const furn_str_id furn_f_wind_mill( "f_wind_mill" );
 static const furn_str_id furn_f_wind_mill_active( "f_wind_mill_active" );
-static const furn_str_id furn_f_retting_empty( "f_retting_empty" );
-static const furn_str_id furn_f_retting_full( "f_retting_full" );
 
 static const itype_id itype_2x4( "2x4" );
 static const itype_id itype_arm_splint( "arm_splint" );
@@ -7641,8 +7639,6 @@ iexamine_functions iexamine_functions_from_string( const std::string &function_n
             { "kiln_full", &iexamine::kiln_full },
             { "stook_empty", &iexamine::stook_empty },
             { "stook_full", &iexamine::stook_full },
-            { "retting_empty", &iexamine::retting_empty },
-            { "retting_full", &iexamine::retting_full },
             { "arcfurnace_empty", &iexamine::arcfurnace_empty },
             { "arcfurnace_full", &iexamine::arcfurnace_full },
             { "autoclave_empty", &iexamine::autoclave_empty },

diff --git a/src/iexamine.h b/src/iexamine.h
@@ -173,10 +173,6 @@ ret_val<void> can_fertilize( Character &you, const tripoint_bub_ms &tile,
 // Skill training common functions
 void practice_survival_while_foraging( Character &who );
 
-// Retting
-void retting_empty( Character &, const tripoint_bub_ms &examp );
-void retting_full( Character &, const tripoint_bub_ms &examp );
-
 } // namespace iexamine
 
 namespace iexamine_helper