fix: migrate legacy swords to proc recipes

Assisted-by: openai/gpt-5.4 on opencode
Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com>

Author: scarf005

data/json/obsoletion/migration.json

@@ -729,6 +729,11 @@
     "type": "MIGRATION",
     "replace": "multi_cooker"
   },
+  {
+    "id": [ "sword_metal", "sword_wood", "sword_nail", "sword_crude", "sword_bone" ],
+    "type": "MIGRATION",
+    "replace": "proc_sword_generic"
+  },
   {
     "id": [
       "blt",

data/json/obsoletion/recipes.json

@@ -2321,5 +2321,30 @@
     "type": "recipe",
     "result": "fish_sandwich",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sword_wood",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sword_nail",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sword_crude",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sword_metal",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sword_bone",
+    "obsolete": true
   }
 ]

data/json/recipes/weapon/proc_sword.json

@@ -7,6 +7,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": 1500,
+    "reversible": true,
     "proc": true,
     "proc_id": "sword",
     "builder_name": { "str": "Sword" },

src/proc_item.cpp

@@ -161,17 +161,18 @@ auto make_legacy_sandwich_part( const legacy_sandwich_part_spec &spec ) -> proc:
     return part;
 }
 
-auto default_weapon_blob( const item &it ) -> proc::fast_blob
+auto default_weapon_blob( const itype_id &source_id ) -> proc::fast_blob
 {
+    const auto source = item( source_id, calendar::turn );
     auto blob = proc::fast_blob{};
-    blob.mass_g = units::to_gram( it.weight() );
-    blob.volume_ml = units::to_milliliter( it.volume() );
-    blob.name = it.type_name();
-    blob.melee.bash = it.damage_melee( DT_BASH );
-    blob.melee.cut = it.damage_melee( DT_CUT );
-    blob.melee.stab = it.damage_melee( DT_STAB );
-    blob.melee.to_hit = it.type->m_to_hit;
-    blob.melee.dur = std::max( it.max_damage(), 0 );
+    blob.mass_g = units::to_gram( source.weight() );
+    blob.volume_ml = units::to_milliliter( source.volume() );
+    blob.name = source.type_name();
+    blob.melee.bash = source.damage_melee( DT_BASH );
+    blob.melee.cut = source.damage_melee( DT_CUT );
+    blob.melee.stab = source.damage_melee( DT_STAB );
+    blob.melee.to_hit = source.type->m_to_hit;
+    blob.melee.dur = std::max( source.max_damage(), 0 );
     return blob;
 }
 
@@ -903,7 +904,7 @@ auto legacy_sandwich_payload( const item &it,
     return out;
 }
 
-auto legacy_weapon_payload( const item &it,
+auto legacy_weapon_payload( const item &,
                             const itype_id &legacy_id ) -> std::optional<payload>
 {
     const auto specs = legacy_weapon_specs( legacy_id );
@@ -924,7 +925,7 @@ auto legacy_weapon_payload( const item &it,
     out.id = schema_id( "sword" );
     out.mode = hist::compact;
     out.fp = "sword:legacy:" + legacy_id.str();
-    out.blob = default_weapon_blob( it );
+    out.blob = default_weapon_blob( legacy_id );
     out.parts = make_compact_parts( facts, slots );
     return out;
 }

tests/proc_payload_test.cpp

@@ -357,11 +357,14 @@ TEST_CASE( "legacy_swords_gain_proc_payload_on_save_load", "[proc][payload][migr
         CHECK( payload->id == proc::schema_id( "sword" ) );
         CHECK( payload->mode == proc::hist::compact );
         CHECK( payload->fp == "sword:legacy:" + test_case.id.str() );
-        CHECK( restored->typeId() == test_case.id );
+        CHECK( item_controller->migrate_id( test_case.id ) == itype_id( "proc_sword_generic" ) );
+        CHECK( restored->typeId() == itype_id( "proc_sword_generic" ) );
         CHECK( restored->type_name() == legacy.type_name() );
         CHECK( payload->blob.name == legacy.type_name() );
         CHECK( payload->blob.mass_g == units::to_gram( legacy.weight() ) );
         CHECK( payload->blob.volume_ml == units::to_milliliter( legacy.volume() ) );
+        CHECK( units::to_gram( restored->weight() ) == units::to_gram( legacy.weight() ) );
+        CHECK( restored->volume() == legacy.volume() );
         CHECK( payload->blob.melee.bash == legacy.damage_melee( DT_BASH ) );
         CHECK( payload->blob.melee.cut == legacy.damage_melee( DT_CUT ) );
         CHECK( payload->blob.melee.stab == legacy.damage_melee( DT_STAB ) );
@@ -380,6 +383,25 @@ TEST_CASE( "legacy_swords_gain_proc_payload_on_save_load", "[proc][payload][migr
     } );
 }
 
+TEST_CASE( "legacy_sword_ids_migrate_to_proc_uncraft_recipe", "[proc][payload][migration]" )
+{
+    CHECK( recipe_dictionary::get_uncraft( itype_id( "proc_sword_generic" ) ) );
+
+    const auto cases = std::vector<itype_id> {
+        itype_id( "sword_metal" ),
+        itype_id( "sword_wood" ),
+        itype_id( "sword_nail" ),
+        itype_id( "sword_crude" ),
+        itype_id( "sword_bone" )
+    };
+
+    std::ranges::for_each( cases, [&]( const itype_id & test_case ) {
+        INFO( test_case.str() );
+        CHECK( item_controller->migrate_id( test_case ) == itype_id( "proc_sword_generic" ) );
+        CHECK( recipe_dictionary::get_uncraft( item_controller->migrate_id( test_case ) ) );
+    } );
+}
+
 TEST_CASE( "legacy_sandwich_ids_migrate_to_proc_uncraft_recipe", "[proc][payload][migration]" )
 {
     CHECK( recipe_dictionary::get_uncraft( itype_id( "sandwich_generic" ) ) );