Skip to content

migrate "longarm bag" item #81883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2025
+8 −48
Merged

migrate "longarm bag" item #81883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe34ea4
migrate "longarm bag" item
dynst Jul 17, 2025
bd688f1
update reload time test
dynst Jul 18, 2025
b8b630f
reload time test
dynst Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions data/json/items/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2970,37 +2970,6 @@
"flags": [ "BELTED", "WATER_FRIENDLY", "TARDIS", "OVERSIZE", "WATCH", "THERMOMETER" ],
"armor": [ { "encumbrance": [ 0, 0 ], "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
},
{
"id": "long_duffelbag",
"type": "ITEM",
"subtypes": [ "ARMOR" ],
"name": { "str": "longarm bag" },
"description": "A long duffel bag. Provides storage for long arms and rifles. Quite cumbersome.",
"weight": "1203 g",
"volume": "12 L",
"price": "180 USD",
"price_postapoc": "8 USD",
"material": [ "canvas" ],
"symbol": "[",
"looks_like": "rucksack",
"color": "green",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_contains_volume": "50 L",
"max_contains_weight": "80 kg",
"max_item_length": "150 cm",
"magazine_well": "10 L",
"moves": 300
}
],
"warmth": 8,
"material_thickness": 1,
"flags": [ "BELTED", "WATER_FRIENDLY" ],
"armor": [
{ "encumbrance": [ 8, 42 ], "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] }
]
},
{
"id": "rifle_case_soft",
"type": "ITEM",
Expand Down
5 changes: 5 additions & 0 deletions data/json/obsoletion_and_migration_0.I/migration_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2686,5 +2686,10 @@
"type": "MIGRATION",
"id": "e_combatsaw_on",
"replace": "elec_chainsaw_on"
},
{
"type": "MIGRATION",
"id": "long_duffelbag",
"replace": "duffelbag"
}
]
14 changes: 0 additions & 14 deletions data/json/recipes/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,20 +2364,6 @@
],
"components": [ [ [ "strap_large", 2, "LIST" ] ] ]
},
{
"result": "long_duffelbag",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_STORAGE",
"skill_used": "tailor",
"difficulty": 2,
"time": "10 h",
"autolearn": true,
"reversible": true,
"using": [ [ "tailoring_canvas_patchwork", 32 ], [ "fastener_large", 2 ], [ "waterproofing_plastic_sheets", 4 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ]
},
{
"result": "rifle_case_soft",
"type": "recipe",
Expand Down
6 changes: 3 additions & 3 deletions tests/reload_time_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
static const itype_id itype_ammo_pouch( "ammo_pouch" );
static const itype_id itype_arrow_wood( "arrow_wood" );
static const itype_id itype_backpack( "backpack" );
static const itype_id itype_long_duffelbag( "long_duffelbag" );
static const itype_id itype_backpack_giant( "backpack_giant" );
static const itype_id itype_longbow( "longbow" );
static const itype_id itype_pants( "pants" );
static const itype_id itype_pebble( "pebble" );
Expand Down Expand Up @@ -112,8 +112,8 @@ TEST_CASE( "reload_from_inventory_times", "[reload],[inventory],[balance]" )
}
}
SECTION( "reloading a bow" ) {
SECTION( "from a duffel bag" ) {
check_reload_time( itype_longbow, itype_arrow_wood, itype_long_duffelbag, 410 );
SECTION( "from a giant novelty backpack" ) {
check_reload_time( itype_longbow, itype_arrow_wood, itype_backpack_giant, 410 );
}
SECTION( "from a quiver" ) {
check_reload_time( itype_longbow, itype_arrow_wood, itype_quiver, 130 );
Expand Down
Loading