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

Skunk Spray Neutralizer #73600

Merged
merged 4 commits into from
May 10, 2024
Merged

Skunk Spray Neutralizer #73600

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
510c8eb
Skunk Spray Neutralizer
Maleclypse May 9, 2024
8e13dc1
Apply suggestions from code review
Maleclypse May 9, 2024
be47c25
Update data/json/effects.json
Maleclypse May 9, 2024
8570b8a
Apply suggestions from code review
Maleclypse May 9, 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
10 changes: 10 additions & 0 deletions data/json/effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,6 +2094,16 @@
}
]
},
{
"type": "effect_type",
"id": "skunk_spray_neutralizer",
"name": [ "Skunk Spray Neutralized" ],
"description": [ "A solution that neutralizes skunk odors." ],

Check failure on line 2101 in data/json/effects.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

(~[slow] ~[.],starting_items)=> Invalid or misplaced field name "description" in JSON data

    "id": "skunk_spray_neutralizer",
    "name": [ "Skunk Spray Neutralized" ],
    "description": [ "A solution that neutralizes skunk odors." ],
                 ▲▲▲
    "rating": "good",
    "apply_message": "As you apply the solution, the skunk odor dissipates.",

Check failure on line 2101 in data/json/effects.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Invalid or misplaced field name "description" in JSON data

    "id": "skunk_spray_neutralizer",
    "name": [ "Skunk Spray Neutralized" ],
    "description": [ "A solution that neutralizes skunk odors." ],
                 ▲▲▲
    "rating": "good",
    "apply_message": "As you apply the solution, the skunk odor dissipates.",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"rating": "good",
"apply_message": "As you apply the solution, the skunk odor dissipates.",
"max_duration": "2 minutes",
"removes_effects": [ "skunk_spray" ]
},
{
"type": "effect_type",
"id": "invisibility",
Expand Down
23 changes: 23 additions & 0 deletions data/json/items/comestibles/med.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,29 @@
"flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
"use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 2000 }
},
{
"id": "skunk_spray_neutralizing_solution",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "skunk spray neutralizing solution" },
"description": "A combination of hydrogen peroxide, baking soda, and dish soap that works together to transform skunk spray thiocetates into odorless acids.",
"weight": "28 g",
"volume": "250 ml",
"price": "1 USD",
"price_postapoc": "5 USD",
"charges": 10,
"symbol": "~",
"color": "white",
"phase": "liquid",
"container": "bottle_plastic_small",
"flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
"use_action": {
"type": "consume_drug",
"activation_message": "You cover yourself in the solution everywhere the spray touched your body.",
"move_cost": 2000,

Check failure on line 353 in data/json/items/comestibles/med.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Invalid or misplaced field name "move_cost" in JSON data

      "type": "consume_drug",
      "activation_message": "You cover yourself in the solution everywhere the spray touched your body.",
      "move_cost": 2000,
                 ▲▲▲
      "effects": [ { "id": "skunk_spray_neutralizer" } ]
    }

Check failure on line 353 in data/json/items/comestibles/med.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

(~[slow] ~[.],starting_items)=> Invalid or misplaced field name "move_cost" in JSON data

      "type": "consume_drug",
      "activation_message": "You cover yourself in the solution everywhere the spray touched your body.",
      "move_cost": 2000,
                 ▲▲▲
      "effects": [ { "id": "skunk_spray_neutralizer" } ]
    }
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"effects": [ { "id": "skunk_spray_neutralizer" } ]
}
},
{
"id": "cig",
"type": "COMESTIBLE",
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/recipe_medsandchemicals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,21 @@
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [ [ [ "poppy_bud", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "skunk_spray_neutralizing_solution",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_DRUGS",
"skill_used": "chemistry",
"skills_required": [ "survival", 1 ],
"difficulty": 1,
"time": "5 m",
"book_learn": [ [ "pocket_survival", 3 ], [ "survival_book", 3 ], [ "isherwood_herbal_remedies", 2 ] ],
"qualities": [ { "id": "CHEM", "level": 1 } ],
"components": [ [ [ "chem_hydrogen_peroxide", 4 ] ], [ [ "chem_baking_soda", 83 ], [ "liquid_soap", 2 ] ] ],
"charges": 4
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down
Loading