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

The Find Antibiotics mission should also accept broad-spectrum antibiotics #2397

Merged
merged 8 commits into from
Apr 11, 2023
Merged

The Find Antibiotics mission should also accept broad-spectrum antibiotics #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e3bd51
Update missiondef.json
Zlorthishen Mar 8, 2023
2106354
Merge branch 'cataclysmbnteam:upload' into fix-antibiotics
Zlorthishen Mar 19, 2023
45f01e7
Merge branch 'cataclysmbnteam:upload' into fix-antibiotics
Zlorthishen Mar 26, 2023
dc8ecbf
Merge branch 'cataclysmbnteam:upload' into fix-antibiotics
Zlorthishen Apr 2, 2023
30dbe19
Update missiondef.json
Zlorthishen Apr 2, 2023
bad6d74
Update drugs.json
Zlorthishen Apr 2, 2023
75a75e3
Update data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
Zlorthishen Apr 2, 2023
cd41aa6
Update data/json/npcs/missiondef.json
Zlorthishen Apr 2, 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
6 changes: 6 additions & 0 deletions data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
[ "weak_antibiotic", 30 ]
]
},
{
"id": "drugs_antibiotics",
"type": "item_group",
"//": "antibiotics used for the MISSION_GET_ANTIBIOTICS quest",
"items": [ [ "antibiotics", 100 ], [ "strong_antibiotic", 75 ], [ "panacea", 50 ] ]
},
{
"id": "drugs_emergency",
"type": "item_group",
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/missiondef.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
"id": "MISSION_GET_ANTIBIOTICS",
"type": "mission_definition",
"name": { "str": "Find Antibiotics" },
"goal": "MGOAL_FIND_ITEM",
"goal": "MGOAL_FIND_ITEM_GROUP",
"difficulty": 2,
"value": 150000,
"urgent": true,
"item": "antibiotics",
"item_group": "drugs_antibiotics",
"origins": [ "ORIGIN_OPENER_NPC" ],
"deadline_low": 24,
"deadline_high": 48,
Expand Down