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

Jump to bottom

Make consuming take time #40117

Closed
wants to merge 30 commits into from
Closed

Make consuming take time #40117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3838c3b
Add spurge seeds
Rail-Runner May 1, 2020
e7e2d87
Add item groups
Rail-Runner May 1, 2020
a1110ab
Works with constant 5 minute time
Ramza13 May 3, 2020
cf091cc
Get time set correctly and containers handeld and medicine
Ramza13 May 4, 2020
8d058cb
Fix verb
Ramza13 May 4, 2020
0b9c3f2
Formatting
Ramza13 May 4, 2020
314b291
Merge branch 'master' into consume_time
Ramza13 May 4, 2020
9200334
Hopefully fix all pockets conflicts
Ramza13 May 4, 2020
4fa8898
Merge branch 'consume_time' of https://github.com/Ramza13/Cataclysm-D…
Ramza13 May 4, 2020
65f527b
Fix merge conflict
Ramza13 May 4, 2020
3bd3a9d
Fix build
Ramza13 May 4, 2020
d31e9bc
Build fix once more
Ramza13 May 4, 2020
b4cbba5
Fix crafting iteminfo test
kevingranade May 4, 2020
2ebad2a
storage definition hotfix
kevingranade May 4, 2020
0c4d9b2
Merge pull request #40049 from Rail-Runner/plants3
Rivet-the-Zombie May 4, 2020
8cc6f88
Migrate inventory_ui.cpp and game_inventory.cpp to ui_adaptor
Qrox May 1, 2020
6b7fa02
map fixes (#40113)
curstwist May 4, 2020
141e5ff
Update materials for bullet damage type (#40112)
anothersimulacrum May 4, 2020
54afa14
Consume menu fix (#40108)
KorGgenT May 4, 2020
7ba9c31
Merge pull request #40123 from kevingranade/fix-iteminfo-crafting-test
ZhilkinSerg May 4, 2020
5ed7427
CFRelease CFString objects
akirashirosawa May 4, 2020
6d444b8
Make point and tripoint abs functions into methods. (#40106)
kevingranade May 4, 2020
6f79dc9
Merge pull request #40094 from Qrox/migrate-ui-12
ZhilkinSerg May 4, 2020
7780822
Merge pull request #40131 from akirashirosawa/fix-macos-memory-leak
ZhilkinSerg May 4, 2020
64d8209
Remove uneeded code
Ramza13 May 4, 2020
63bbe9a
Fix style issue
Ramza13 May 4, 2020
0c29d97
Code review suggestions
Ramza13 May 4, 2020
b305853
Merge branch 'consume_time' of https://github.com/Ramza13/Cataclysm-D…
Ramza13 May 4, 2020
2a7e0de
Code review changes/rebase
Ramza13 May 4, 2020
8911bad
Formatting
Ramza13 May 4, 2020
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
8 changes: 2 additions & 6 deletions data/json/furniture_and_terrain/furniture-flora.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"seasons": [ "spring", "summer", "autumn" ],
"entries": [
{ "drop": "withered", "base_num": [ 1, 2 ] },
{ "drop": "seed_flower", "base_num": [ 1, 2 ] },
{ "drop": "seed_spurge", "base_num": [ 1, 2 ] },
{ "drop": "spurge", "base_num": [ 1, 4 ] }
]
}
Expand Down Expand Up @@ -178,11 +178,7 @@
"harvest_by_season": [
{
"seasons": [ "spring", "summer", "autumn" ],
"entries": [
{ "drop": "withered", "base_num": [ 1, 2 ] },
{ "drop": "seed_flower", "base_num": [ 1, 2 ] },
{ "drop": "lotus", "base_num": [ 1, 2 ] }
]
"entries": [ { "drop": "withered", "base_num": [ 1, 2 ] }, { "drop": "lotus", "base_num": [ 1, 2 ] } ]
}
],
"//": "Add flower and bud spawns once useful.",
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
[ "seed_chili_pepper", 60 ],
[ "seed_tomato", 60 ],
[ "seed_horseradish", 10 ],
[ "seed_spurge", 10 ],
[ "seed_popcorn", 10 ],
[ "seed_mustard", 10 ]
]
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/trash_and_debris.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
[ "seed_weed", 5 ],
[ "seed_flower", 5 ],
[ "seed_tobacco", 1 ],
[ "seed_spurge", 1 ],
[ "joint_roach", 5 ],
[ "pipe", 20 ],
[ "bag_plastic", 10 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/ballistic_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"coverage": 85,
"encumbrance": 10,
"warmth": 15,
"material_thickness": 20,
"material_thickness": 16,
"flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/coats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"price": 91000,
"price_postapoc": 1500,
"to_hit": -1,
"material": [ "nomex", "kevlar" ],
"material": [ "nomex", "kevlar", "lycra" ],
"symbol": "[",
"looks_like": "coat_winter",
"color": "yellow",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/legs_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"price": 81500,
"price_postapoc": 500,
"to_hit": -1,
"material": [ "nomex", "kevlar" ],
"material": [ "nomex", "kevlar", "lycra" ],
"symbol": "[",
"looks_like": "pants_cargo",
"color": "dark_gray",
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/armor/power_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"price_postapoc": 30000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "light_gray",
Expand All @@ -72,7 +72,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
"warmth": 90,
"power_armor": true,
"material_thickness": 11,
"material_thickness": 14,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand Down Expand Up @@ -113,7 +113,7 @@
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_basic",
"color": "dark_gray",
Expand All @@ -123,7 +123,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
"warmth": 60,
"power_armor": true,
"material_thickness": 12,
"material_thickness": 16,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand All @@ -140,7 +140,7 @@
"price_postapoc": 7500,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_helmet",
"color": "light_gray",
Expand All @@ -149,7 +149,7 @@
"encumbrance": 50,
"warmth": 90,
"power_armor": true,
"material_thickness": 11,
"material_thickness": 14,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 2 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -166,7 +166,7 @@
"price_postapoc": 10000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_helmet_basic",
"color": "dark_gray",
Expand All @@ -175,7 +175,7 @@
"encumbrance": 60,
"warmth": 60,
"power_armor": true,
"material_thickness": 12,
"material_thickness": 16,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 2 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -192,7 +192,7 @@
"price_postapoc": 10000,
"to_hit": 1,
"bashing": 1,
"material": [ "superalloy", "plastic" ],
"material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_helmet_basic",
"color": "dark_gray",
Expand All @@ -201,7 +201,7 @@
"encumbrance": 40,
"warmth": 60,
"power_armor": true,
"material_thickness": 9,
"material_thickness": 8,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 1 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -218,7 +218,7 @@
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "superalloy", "plastic" ],
"material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "dark_gray",
Expand All @@ -228,7 +228,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
"warmth": 60,
"power_armor": true,
"material_thickness": 9,
"material_thickness": 8,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/torso_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
"coverage": 85,
"encumbrance": 5,
"warmth": 15,
"material_thickness": 4,
"material_thickness": 3,
"flags": [ "STURDY", "SKINTIGHT" ]
},
{
Expand Down
9 changes: 9 additions & 0 deletions data/json/items/comestibles/seed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,15 @@
"description": "Some chamomile seeds.",
"seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" }
},
{
"type": "COMESTIBLE",
"id": "seed_spurge",
"copy-from": "seed",
"looks_like": "seed_raw_dandelion",
"name": { "str_sp": "spurge seeds" },
"description": "Some spurge seeds.",
"seed_data": { "plant_name": "spurge", "fruit": "spurge", "byproducts": [ "withered" ], "grow": "91 days" }
},
{
"type": "COMESTIBLE",
"id": "seed_popcorn",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/spice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"symbol": "%",
"quench": -1,
"calories": 9,
"description": "A tasty collection of wild herbs including violet, sassafras, mint, clover, purslane, fireweed, and burdock.",
"description": "A tasty collection of wild herbs including violet, sassafras, mint, clover, purslane, and fireweed.",
"price": 190,
"price_postapoc": 50,
"material": "veggy",
Expand Down
32 changes: 16 additions & 16 deletions data/json/mapgen/campus/buildings/admin_f0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
"__|,,,,,,,,,,,,|________",
"__|,,,,,,,,,,,,|________",
"__|,,,,,,,,,,,,|________",
"bb|,,,,,,,,,,,,||||||||||",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,||||||||",
"bb|,,,,,,,,,,,,|||||||||",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,|||||||",
".||,,,,,,,,,,,,,,|.....b",
".|,,,,,,,,,,,,,,,|.....b",
".|,,,,,,,,,,,,,,,|.....b",
Expand Down
32 changes: 16 additions & 16 deletions data/json/mapgen/campus/buildings/admin_f1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,||||||||||",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,||||||||",
" |,,,,,,,,,,,,|||||||||",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,|||||||",
" ||,,,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,,,,| ",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/cs_gardening_allotment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[ "seed_carrot", 10 ],
[ "seed_pumpkin", 10 ],
[ "seed_broccoli", 10 ],
[ "seed_spurge", 10 ],
[ "gloves_work", 10 ]
]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/dumpsite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"........................",
"........................",
"..........^^^^.^........",
".......q^^__^_^_qq.......",
".......q^^__^_^_qq......",
".......q.________^q.....",
".....q^qq^______^^.q....",
"....q^^qq_______^^q.....",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/hotel_tower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
"******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
"******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
"*************************************************************************"
"************************************************************************"
],
"palettes": [ "hotel_tower_palette.json" ],
"terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house05_ab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
".# | #.",
".# | #.",
".####oo#########oo#####.",
"............^............"
"............^..........."
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/megastore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2194,7 +2194,7 @@
"########################",
"########################",
"####----------------####",
"####| | ####",
"####| | ###",
"####| -----",
"####|I I ",
"####| ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/steel_mill/steel_mill_z1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"fill_ter": "t_thconc_floor",
"rows": [
"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv._______,,_______.vvvvvvvvvvvvvvvvvvvvvvvvvvv",
"v..................................................._______,,_______............................v",
"v..................................................._______,,_______...........................v",
"v..................................................___________________________________,,,,,,,,.v",
"v....]]]]]]]]]]]]**]]]**]]**]]**].................____________________________________________.v",
"v....]ee]ee]<< #ch #ch #Sch S]-------------..._____________________________________________.v",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/steel_mill/steel_mill_z2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"object": {
"fill_ter": "t_carpet_concrete",
"rows": [
":::::::::::::::::::::::::::::::1:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::::::::::::::::::::::::::::1::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
"::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
"::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]]]]]]]]]]]]**]]]**]]**]]**]:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/trailhead.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
";;;...................;;",
";;;...................;;",
";;... ..;;;",
";;... . . . .;;;;",
";;... . . . .;;;",
";;;.. . ;;;;;",
";;;;. . . . ;;;;;",
";;;;; ;;;;;",
Expand Down
Loading