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.

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

Food irradiator #28669

Merged
merged 46 commits into from
Apr 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
73cbc6f
irradiator computer console
nexusmrsep Mar 12, 2019
bbf4b34
mininuke timer, miliSieverts/hour
nexusmrsep Mar 12, 2019
4b0726c
two-way toggleable translate_radius
nexusmrsep Mar 12, 2019
f94cdf6
mapdata updates for glass wall shutters
nexusmrsep Mar 12, 2019
0bd8bc4
astyle
nexusmrsep Mar 12, 2019
068138b
added radiation platform as separate terrain
nexusmrsep Mar 17, 2019
212438e
added cobalt-60 pellet item
nexusmrsep Mar 17, 2019
61382c9
updated computer.cpp to new approach
nexusmrsep Mar 17, 2019
cc2f35e
added option COMPACT_EXTRACT_RAD_SOURCE, fixes
nexusmrsep Mar 17, 2019
02763de
assorted fixes
nexusmrsep Mar 17, 2019
3af8407
astyle
nexusmrsep Mar 17, 2019
c571839
Update src/computer.cpp
Night-Pryanik Mar 17, 2019
23f7a05
Merge branch 'master' into irradiator_comp
kevingranade Mar 23, 2019
e524a1a
gates connect to strong concrete wall
nexusmrsep Apr 11, 2019
d4a5c13
irradiated food group and also pre-irradiated
nexusmrsep Apr 11, 2019
98cae21
irradiated potato naming convention change with migration
nexusmrsep Apr 11, 2019
41fb2eb
potato continued
nexusmrsep Apr 11, 2019
c135aca
vehicle group cleanup
nexusmrsep Apr 11, 2019
4c6a5a5
conveyor belt indoors
nexusmrsep Apr 11, 2019
08bb6c5
irradiation facility mapgen files
nexusmrsep Apr 11, 2019
a61337b
Merge branch 'master' into irradiator_comp
nexusmrsep Apr 12, 2019
f1b9ce2
industrial ID cards, card readers etc.
nexusmrsep Apr 13, 2019
ee0df88
some reworks
nexusmrsep Apr 13, 2019
2458d8a
Apply suggestions from code review
Night-Pryanik Apr 14, 2019
682738a
astyle
nexusmrsep Apr 14, 2019
041e728
Merge branch 'master' into irradiator_comp
nexusmrsep Apr 16, 2019
fba4b22
new computer: shock disabler
nexusmrsep Apr 17, 2019
e03c944
tweaks and fixes, monster placement
nexusmrsep Apr 17, 2019
d5e86bd
astyle
nexusmrsep Apr 17, 2019
73c214e
lint
nexusmrsep Apr 17, 2019
35120bb
Apply suggestions from code review
Night-Pryanik Apr 18, 2019
0159daa
moves consumption for new comp action
nexusmrsep Apr 18, 2019
b9387b0
Update data/json/mapgen/irradiator_1.json
Night-Pryanik Apr 18, 2019
2f50b39
Update data/json/mapgen/irradiator_1.json
Night-Pryanik Apr 18, 2019
41e305e
Update data/json/mapgen/irradiator_1.json
Night-Pryanik Apr 18, 2019
4ec4304
Update data/json/mapgen/irradiator_1.json
Night-Pryanik Apr 18, 2019
1b8694a
Update data/json/mapgen/irradiator_1.json
Night-Pryanik Apr 18, 2019
b9fc1ff
Merge branch 'master' into irradiator_comp
nexusmrsep Apr 18, 2019
d1475ac
Merge branch 'master' into irradiator_comp
kevingranade Apr 19, 2019
fcc4b32
lint
nexusmrsep Apr 19, 2019
c77aa6b
Merge branch 'master' into irradiator_comp
nexusmrsep Apr 19, 2019
2c35ed3
fix for crash
nexusmrsep Apr 19, 2019
611e8f2
few layout fixes
nexusmrsep Apr 19, 2019
4ec799f
second part of potato migration
nexusmrsep Apr 19, 2019
1367aad
lint
nexusmrsep Apr 19, 2019
64d8eb7
lint 2
nexusmrsep Apr 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 24 additions & 2 deletions data/json/gates.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,18 @@
"other_handles": [ "t_gates_control_concrete", "t_gates_control_brick" ],
"door": "t_door_metal_locked",
"floor": "t_floor",
"walls": [ "t_wall", "t_wall_r", "t_wall_w", "t_wall_b", "t_wall_g", "t_wall_y", "t_wall_p", "t_concrete_wall", "t_brick_wall" ],
"walls": [
"t_wall",
"t_wall_r",
"t_wall_w",
"t_wall_b",
"t_wall_g",
"t_wall_y",
"t_wall_p",
"t_concrete_wall",
"t_brick_wall",
"t_strconc_wall"
],
"messages": {
"pull": "You turn the handle...",
"open": "The gate is opened!",
Expand All @@ -21,7 +32,18 @@
"other_handles": [ "t_gates_control_concrete_lab", "t_gates_control_brick_lab" ],
"door": "t_door_metal_locked",
"floor": "t_thconc_floor",
"walls": [ "t_wall", "t_wall_r", "t_wall_w", "t_wall_b", "t_wall_g", "t_wall_y", "t_wall_p", "t_concrete_wall", "t_brick_wall" ],
"walls": [
"t_wall",
"t_wall_r",
"t_wall_w",
"t_wall_b",
"t_wall_g",
"t_wall_y",
"t_wall_p",
"t_concrete_wall",
"t_brick_wall",
"t_strconc_wall"
],
"messages": {
"pull": "You turn the handle...",
"open": "The gate is opened!",
Expand Down
9 changes: 5 additions & 4 deletions data/json/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@
[ "coconut", 5 ],
[ "jam_fruit", 10 ],
[ "juice", 50 ],
[ "potato_raw", 10 ],
[ "potato", 10 ],
{ "item": "pickle", "prob": 40, "charges": 6, "container-item": "jar_glass_sealed" },
[ "vinegar", 15 ],
{ "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
Expand Down Expand Up @@ -1861,7 +1861,7 @@
[ "blackberries", 7 ],
[ "rhubarb", 20 ],
[ "mushroom", 4 ],
[ "potato_raw", 10 ],
[ "potato", 10 ],
[ "blueberries", 3 ],
[ "strawberries", 2 ],
[ "tomato", 9 ],
Expand Down Expand Up @@ -5030,7 +5030,7 @@
[ "broccoli", 9 ],
[ "cucumber", 10 ],
[ "zucchini", 7 ],
[ "potato_raw", 10 ],
[ "potato", 10 ],
[ "corn", 7 ],
[ "celery", 4 ],
[ "onion", 3 ],
Expand Down Expand Up @@ -6347,6 +6347,7 @@
[ "mobile_memory_card_science", 1 ],
[ "standard_template_construct", 8 ],
[ "id_military", 3 ],
[ "id_industrial", 5 ],
[ "militarymap", 3 ],
[ "pistol_bayonet", 4 ],
[ "rope_30", 35 ],
Expand Down Expand Up @@ -6455,7 +6456,7 @@
[ "celery", 2 ],
[ "onion", 3 ],
[ "carrot", 3 ],
[ "potato_raw", 10 ],
[ "potato", 10 ],
[ "pear", 65 ],
[ "grapefruit", 1 ],
[ "cherries", 5 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
[ "onion", 15 ],
[ "chili_pepper", 15 ],
[ "carrot", 15 ],
[ "potato_raw", 15 ],
[ "potato", 15 ],
[ "irradiated_tomato", 4 ],
[ "irradiated_lettuce", 4 ],
[ "irradiated_zucchini", 4 ],
Expand Down
94 changes: 94 additions & 0 deletions data/json/itemgroups/irradiated.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
[
{
"type": "item_group",
"id": "pre_irradiated_food",
"//": "Products valid for irradiation process.",
"items": [
[ "rose_hips", 50 ],
[ "elderberries", 50 ],
[ "mulberries", 50 ],
[ "huckleberries", 50 ],
[ "raspberries", 50 ],
[ "strawberries", 50 ],
[ "blueberries", 50 ],
[ "apple", 50 ],
[ "banana", 50 ],
[ "orange", 50 ],
[ "lemon", 50 ],
[ "grapefruit", 50 ],
[ "pear", 50 ],
[ "cherries", 50 ],
[ "plums", 50 ],
[ "grapes", 50 ],
[ "pineapple", 50 ],
[ "peach", 50 ],
[ "watermelon", 50 ],
[ "melon", 50 ],
[ "blackberries", 50 ],
[ "mango", 50 ],
[ "pomegranate", 50 ],
[ "papaya", 50 ],
[ "kiwi", 50 ],
[ "apricot", 50 ],
[ "lettuce", 50 ],
[ "cabbage", 50 ],
[ "tomato", 50 ],
[ "broccoli", 50 ],
[ "zucchini", 50 ],
[ "onion", 50 ],
[ "carrot", 50 ],
[ "corn", 50 ],
[ "pumpkin", 50 ],
[ "potato", 50 ],
[ "cucumber", 50 ],
[ "celery", 50 ],
[ "rhubarb", 50 ]
]
},
{
"type": "item_group",
"id": "irradiated_food",
"//": "Products of irradiation process.",
"items": [
[ "irradiated_rose_hips", 50 ],
[ "irradiated_elderberries", 50 ],
[ "irradiated_mulberries", 50 ],
[ "irradiated_huckleberries", 50 ],
[ "irradiated_raspberries", 50 ],
[ "irradiated_strawberries", 50 ],
[ "irradiated_blueberries", 50 ],
[ "irradiated_apple", 50 ],
[ "irradiated_banana", 50 ],
[ "irradiated_orange", 50 ],
[ "irradiated_lemon", 50 ],
[ "irradiated_grapefruit", 50 ],
[ "irradiated_pear", 50 ],
[ "irradiated_cherries", 50 ],
[ "irradiated_plums", 50 ],
[ "irradiated_grapes", 50 ],
[ "irradiated_pineapple", 50 ],
[ "irradiated_peach", 50 ],
[ "irradiated_watermelon", 50 ],
[ "irradiated_melon", 50 ],
[ "irradiated_blackberries", 50 ],
[ "irradiated_mango", 50 ],
[ "irradiated_pomegranate", 50 ],
[ "irradiated_papaya", 50 ],
[ "irradiated_kiwi", 50 ],
[ "irradiated_apricot", 50 ],
[ "irradiated_lettuce", 50 ],
[ "irradiated_cabbage", 50 ],
[ "irradiated_tomato", 50 ],
[ "irradiated_broccoli", 50 ],
[ "irradiated_zucchini", 50 ],
[ "irradiated_onion", 50 ],
[ "irradiated_carrot", 50 ],
[ "irradiated_corn", 50 ],
[ "irradiated_pumpkin", 50 ],
[ "irradiated_potato", 50 ],
[ "irradiated_cucumber", 50 ],
[ "irradiated_celery", 50 ],
[ "irradiated_rhubarb", 50 ]
]
}
]
1 change: 1 addition & 0 deletions data/json/itemgroups/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
[ "hk_g80mag", 35 ],
[ "emp_gun", 20 ],
[ "id_military", 30 ],
[ "id_industrial", 30 ],
[ "id_science", 20 ],
[ "knife_rm42", 20 ],
[ "l-stick", 10 ],
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1156,6 +1156,20 @@
"looks_like": "link_sheet",
"flags": [ "FRAGILE_MELEE" ]
},
{
"id": "cobalt_60",
"type": "GENERIC",
"category": "other",
"price": 1000,
"name": "cobalt-60 pellet",
"symbol": "=",
"color": "green",
"description": "Radioactive material that used to be a part of some nuclear industry equipment. You are yet to find some use for it.",
"material": [ "steel", "plastic" ],
"flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
"volume": 1,
"weight": 80
},
{
"id": "wooden_bead",
"type": "AMMO",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/irradiated_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
},
{
"type": "COMESTIBLE",
"id": "potato_irradiated",
"copy-from": "potato_raw",
"id": "irradiated_potato",
"copy-from": "potato",
"name": "irradiated potato",
"name_plural": "irradiated potatoes",
"description": "An irradiated potato will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/raw_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@
},
{
"type": "COMESTIBLE",
"id": "potato_raw",
"id": "potato",
"name": "raw potato",
"name_plural": "raw potatoes",
"weight": 210,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/seed.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
"description": "A raw potato, cut into pieces, separating each bud for planting.",
"weight": 20,
"stack_size": 10,
"seed_data": { "plant_name": "potatoes", "fruit": "potato_raw", "byproducts": [ "withered" ], "grow": "95 days" }
"seed_data": { "plant_name": "potatoes", "fruit": "potato", "byproducts": [ "withered" ], "grow": "95 days" }
},
{
"type": "COMESTIBLE",
Expand Down
15 changes: 15 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2842,6 +2842,21 @@
"volume": 0,
"to_hit": -3
},
{
"type": "GENERIC",
"id": "id_industrial",
"looks_like": "id_science",
"symbol": ",",
"color": "green",
"name": "industrial ID card",
"description": "This ID card once belonged to a high level technician. The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.",
"price": 120000,
"price_postapoc": 10000,
"material": "plastic",
"weight": 6,
"volume": 0,
"to_hit": -3
},
{
"type": "GENERIC",
"id": "neoprene",
Expand Down
10 changes: 10 additions & 0 deletions data/json/items/migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -520,5 +520,15 @@
"id": "bag_veggy_vac",
"type": "MIGRATION",
"replace": "veggy_salted"
},
{
"id": "potato_irradiated",
"type": "MIGRATION",
"replace": "irradiated_potato"
},
{
"id": "potato_raw",
"type": "MIGRATION",
"replace": "potato"
}
]