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

Vitamin-based allergy #74763

Merged
merged 17 commits into from
Jun 27, 2024
+1,523 −894
Merged

Vitamin-based allergy #74763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7fdb178
Allergens for base game data
harakka Jun 22, 2024
581052c
Allergens for mods
harakka Jun 22, 2024
e071322
Revert decimal changes
harakka Jun 22, 2024
bd2993d
add vitamin definition
GuardianDll Jun 23, 2024
6381c34
Replace flag checks with vitamin checks
GuardianDll Jun 24, 2024
2cad7c3
add nut allergen and bread allergen
GuardianDll Jun 24, 2024
4cf4b54
Allergens for mods
harakka Jun 22, 2024
3cd8b55
Revert decimal changes
harakka Jun 22, 2024
d85d16f
Merge branch 'master' into allergens
GuardianDll Jun 24, 2024
aa87341
Astyle
GuardianDll Jun 24, 2024
26a0456
fix broken branch update
GuardianDll Jun 24, 2024
1741126
it happens when you add vitamin manually
GuardianDll Jun 24, 2024
60ac02b
milk
harakka Jun 25, 2024
86f13b9
Add milk vitamin in json
GuardianDll Jun 25, 2024
eb0481e
satisfy clang-tidy
GuardianDll Jun 25, 2024
15a9138
Merge branch 'CleverRaven:master' into allergens
GuardianDll Jun 26, 2024
7a0192c
Merge branch 'CleverRaven:master' into allergens
GuardianDll Jun 26, 2024
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
3 changes: 2 additions & 1 deletion data/json/items/biosignatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
"spoils_in": "60 days",
"price": "0 cent",
"price_postapoc": "0 cent",
"flags": [ "TRADER_AVOID", "INEDIBLE" ]
"flags": [ "TRADER_AVOID", "INEDIBLE" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down
6 changes: 4 additions & 2 deletions data/json/items/chemicals_and_resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,7 +1874,8 @@
"description": "A grayish, flexible vesicle filled to the brim with the potent paralytic agent the triffids use to subdue still-moving fertilizer such as yourself. If you know your way around poisons you might be able to find a use for it.",
"material": [ "veggy" ],
"color": "light_gray",
"fun": -50
"fun": -50,
"vitamins": [ [ "veggy_allergen", 1 ] ]
},
{
"id": "triffid_fungicide",
Expand All @@ -1884,7 +1885,8 @@
"description": "A triffid sac filled with what appears to be a triffid-produced antifungal agent. It will likely already work as an antifungal compound for more offensive applications, but requires further refining before it can be used as a medical drug.",
"material": [ "veggy" ],
"color": "light_blue",
"fun": -50
"fun": -50,
"vitamins": [ [ "veggy_allergen", 1 ] ]
},
{
"id": "conc_venom",
Expand Down
45 changes: 27 additions & 18 deletions data/json/items/comestibles/alcohol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"charges": 5,
"flags": [ "EATEN_COLD", "MYCUS_OK", "NO_AUTO_CONSUME" ],
"fun": 25,
"freezing_point": -8
"freezing_point": -8,
"vitamins": [ [ "veggy_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -53,7 +54,8 @@
"charges": 5,
"flags": [ "EATEN_COLD", "MYCUS_OK", "NO_AUTO_CONSUME" ],
"fun": 25,
"freezing_point": -8
"freezing_point": -8,
"vitamins": [ [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -593,7 +595,8 @@
"charges": 7,
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"fun": 2,
"freezing_point": -7
"freezing_point": -7,
"vitamins": [ [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -678,7 +681,8 @@
"charges": 1,
"phase": "liquid",
"fun": 20,
"flags": [ "EATEN_HOT", "NO_AUTO_CONSUME" ]
"flags": [ "EATEN_HOT", "NO_AUTO_CONSUME" ],
"vitamins": [ [ "milk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -794,7 +798,7 @@
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -34,
"fun": 20,
"vitamins": [ [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ] ]
"vitamins": [ [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -823,7 +827,7 @@
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -34,
"fun": 20,
"vitamins": [ [ "vitC", 135 ], [ "calcium", 1 ], [ "iron", 1 ] ]
"vitamins": [ [ "vitC", 135 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -856,7 +860,8 @@
"phase": "liquid",
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -30,
"fun": 20
"fun": 20,
"vitamins": [ [ "junk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -886,7 +891,8 @@
"phase": "liquid",
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -6,
"fun": 20
"fun": 20,
"vitamins": [ [ "junk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -920,7 +926,7 @@
"phase": "liquid",
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -6,
"vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 3 ] ],
"vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ],
"fun": 20
},
{
Expand Down Expand Up @@ -955,7 +961,7 @@
"phase": "liquid",
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -6,
"vitamins": [ [ "vitC", 105 ], [ "calcium", 2 ], [ "iron", 2 ] ],
"vitamins": [ [ "vitC", 105 ], [ "calcium", 2 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ],
"fun": 20
},
{
Expand Down Expand Up @@ -1390,7 +1396,7 @@
"charges": 6,
"flags": [ "EATEN_COLD", "EDIBLE_FROZEN", "NO_AUTO_CONSUME" ],
"fun": 8,
"vitamins": [ [ "vitC", 20 ] ],
"vitamins": [ [ "vitC", 20 ], [ "fruit_allergen", 1 ] ],
"freezing_point": -30
},
{
Expand Down Expand Up @@ -1419,7 +1425,7 @@
"charges": 6,
"flags": [ "EATEN_COLD", "EDIBLE_FROZEN", "NO_AUTO_CONSUME" ],
"fun": 2,
"vitamins": [ [ "vitC", 20 ] ],
"vitamins": [ [ "vitC", 20 ], [ "fruit_allergen", 1 ] ],
"freezing_point": -30
},
{
Expand Down Expand Up @@ -1556,7 +1562,8 @@
"charges": 5,
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -33,
"fun": 20
"fun": 20,
"vitamins": [ [ "junk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1585,7 +1592,8 @@
"charges": 2,
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -30,
"fun": 20
"fun": 20,
"vitamins": [ [ "junk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1692,7 +1700,7 @@
"primary_material": "alcohol",
"volume": "12 ml",
"fun": -1,
"vitamins": [ [ "vitC", 2 ], [ "iron", 4 ] ]
"vitamins": [ [ "vitC", 2 ], [ "iron", 4 ], [ "junk_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1722,7 +1730,7 @@
"charges": 2,
"flags": [ "EATEN_COLD", "EATEN_HOT", "FREEZERBURN", "NO_AUTO_CONSUME" ],
"fun": 20,
"vitamins": [ [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ] ],
"vitamins": [ [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ], [ "egg_allergen", 1 ], [ "milk_allergen", 1 ] ],
"freezing_point": -11
},
{
Expand Down Expand Up @@ -1784,7 +1792,7 @@
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -34,
"fun": 25,
"vitamins": [ [ "vitC", 23 ], [ "calcium", 1 ], [ "iron", 2 ] ]
"vitamins": [ [ "vitC", 23 ], [ "calcium", 1 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1813,7 +1821,8 @@
"phase": "liquid",
"flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ],
"freezing_point": -34,
"fun": -1
"fun": -1,
"vitamins": [ [ "meat_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down
5 changes: 3 additions & 2 deletions data/json/items/comestibles/baked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"material": [ "fruit" ],
"volume": "1 ml",
"fun": 3,
"vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ] ]
"vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ], [ "fruit_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -34,7 +34,7 @@
"material": [ "nut" ],
"volume": "1 ml",
"fun": 3,
"vitamins": [ [ "vitC", 2 ], [ "calcium", 3 ] ]
"vitamins": [ [ "vitC", 2 ], [ "calcium", 3 ], [ "nut_allergen", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -50,6 +50,7 @@
"price": "87 cent",
"price_postapoc": "43 cent",
"material": [ "bread", "nut" ],
"vitamins": [ [ "nut_allergen", 1 ], [ "bread_allergen", 1 ] ],
"volume": "100 ml",
"fun": 4,
"quench": -1
Expand Down
Loading
Loading