Skip to content
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

Lower volume of MRE packages #66319

Merged
merged 6 commits into from
Oct 9, 2023
Merged

Lower volume of MRE packages #66319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9027318
migrates MRE beverage bags into zipper bags
azraneth Jun 19, 2023
af3eca1
actually migrate
azraneth Jun 19, 2023
35dcbc5
astyle
azraneth Jun 19, 2023
c152b5e
fix mre package volume
azraneth Jun 21, 2023
70860af
Merge remote-tracking branch 'origin/pr/66319'
kevingranade Oct 9, 2023
12db9a8
Merge branch 'master' of github.com:CleverRaven/Cataclysm-DDA
kevingranade Oct 9, 2023
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
22 changes: 11 additions & 11 deletions data/json/itemgroups/SUS/mre_packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
{ "item": "spork" },
{
"distribution": [
{ "item": "instant_coffee", "count": 2, "container-item": "beverage_bag" },
{ "item": "herbal_tea_bag", "count": 2, "container-item": "beverage_bag" },
{ "item": "tea_bag", "count": 2, "container-item": "beverage_bag" },
{ "item": "tea_bag_chamomile", "count": 2, "container-item": "beverage_bag" },
{ "item": "tea_bag_dandelion", "count": 2, "container-item": "beverage_bag" },
{ "item": "tea_fruit_bag", "count": 2, "container-item": "beverage_bag" },
{ "item": "tea_green_bag", "count": 2, "container-item": "beverage_bag" }
{ "item": "instant_coffee", "count": 2, "container-item": "bag_zipper" },
{ "item": "herbal_tea_bag", "count": 2, "container-item": "bag_zipper" },
{ "item": "tea_bag", "count": 2, "container-item": "bag_zipper" },
{ "item": "tea_bag_chamomile", "count": 2, "container-item": "bag_zipper" },
{ "item": "tea_bag_dandelion", "count": 2, "container-item": "bag_zipper" },
{ "item": "tea_fruit_bag", "count": 2, "container-item": "bag_zipper" },
{ "item": "tea_green_bag", "count": 2, "container-item": "bag_zipper" }
]
}
]
Expand Down Expand Up @@ -168,15 +168,15 @@
"id": "pur_tablets_beverage_bag_6",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "beverage_bag",
"container-item": "bag_zipper",
"entries": [ { "item": "pur_tablets", "count": 6 } ]
},
{
"type": "item_group",
"id": "sugar_beverage_bag_2",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "beverage_bag",
"container-item": "bag_zipper",
"entries": [ { "item": "sugar", "container-item": "null", "count": 2 } ]
},
{
Expand All @@ -192,15 +192,15 @@
"id": "pur_tablets_beverage_bag_0_6",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "beverage_bag",
"container-item": "bag_zipper",
"entries": [ { "item": "pur_tablets", "count": [ 0, 6 ] } ]
},
{
"type": "item_group",
"id": "sugar_beverage_bag_0_2",
"subtype": "collection",
"//": "This group was created automatically and may contain errors.",
"container-item": "beverage_bag",
"container-item": "bag_zipper",
"entries": [ { "item": "sugar", "container-item": "null", "count": [ 0, 2 ] } ]
},
{
Expand Down
30 changes: 1 addition & 29 deletions data/json/items/containers/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3632,7 +3632,7 @@
"pocket_data": [
{
"pocket_type": "CONTAINER",
"max_contains_volume": "2263 ml",
"max_contains_volume": "1769 ml",
"max_contains_weight": "4 kg",
"airtight": true,
"moves": 50,
Expand Down Expand Up @@ -3699,34 +3699,6 @@
"symbol": ")",
"color": "light_gray"
},
{
"id": "beverage_bag",
"type": "GENERIC",
"category": "container",
"name": { "str": "plastic beverage bag" },
"description": "A transparent, watertight plastic bag meant for holding drinks.",
"looks_like": "bag_plastic",
"weight": "6 g",
"volume": "262 ml",
"price": 0,
"price_postapoc": 0,
"to_hit": 1,
"material": [ "plastic" ],
"symbol": ")",
"color": "white",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"rigid": false,
"watertight": true,
"open_container": true,
"max_contains_volume": "250 ml",
"max_contains_weight": "1 kg",
"//": "sealed_data is here so the container can be sealed to avoid spilling",
"sealed_data": { "spoil_multiplier": 1.0 }
}
]
},
{
"id": "ipok",
"type": "GENERIC",
Expand Down
6 changes: 6 additions & 0 deletions data/json/obsoletion/migration_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,11 @@
"id": "burdock_stalk",
"type": "MIGRATION",
"replace": "plant_stalk"
},
{
"id": "beverage_bag",
"type": "MIGRATION",
"replace": "bag_zipper",
"sealed": false
}
]
Loading