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

[MoM] Add pseudo tool to nether crystal outcroppings, add that tool as a possibility to contemplation recipes #72794

Merged
merged 9 commits into from
Apr 16, 2024
Merged

[MoM] Add pseudo tool to nether crystal outcroppings, add that tool as a possibility to contemplation recipes #72794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
279c488
Create pseudo.json
Standing-Storm Apr 2, 2024
deabeca
Add pseudo-tool to glowing crystal
Standing-Storm Apr 2, 2024
e1bf9c2
Update practice recipes
Standing-Storm Apr 5, 2024
64bb054
Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-…
Standing-Storm Apr 5, 2024
d33aec4
Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-…
Standing-Storm Apr 11, 2024
857e574
Merge branch 'crystal-cluster-pseudo-tool' of https://github.com/Stan…
Standing-Storm Apr 11, 2024
5964d68
Detect nearby nether crystals, then check if they're still nearby
Standing-Storm Apr 11, 2024
ed17742
Add observed effect
Standing-Storm Apr 11, 2024
1ff8e9e
Add missing spaces
Standing-Storm Apr 12, 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
62 changes: 0 additions & 62 deletions data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,67 +1103,5 @@
{ "u_message": "As you concentrate on your powers, you feel a burning sensation in your veins!", "type": "bad" },
{ "math": [ "u_pain()", "+=", "rand(4) + 1" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_NETHER_ATTENTION_NIGHTMARES",
"eoc_type": "EVENT",
"required_event": "character_wakes_up",
"condition": { "and": [ { "u_has_effect": "psi_nether_attention" }, { "x_in_y_chance": { "x": 1, "y": 3 } } ] },
"effect": [
{ "u_message": "psi_nether_attention_nightmares", "snippet": true, "type": "bad" },
{ "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(7) + 3" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_PSIONICS_NETHER_AREA_CHECK",
"eoc_type": "EVENT",
"//": "The locations below should contain everything related to the Nether",
"required_event": "spellcasting_finish",
"condition": {
"and": [
{ "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" },
{
"or": [
{ "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" },
{ "test_eoc": "EOC_CONDITION_NEAR_NETHER_RELATED_LOCATION" }
]
}
]
},
"effect": [
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand( 1 )" ] },
{
"run_eocs": [
{
"id": "EOC_PSIONICS_NETHER_AREA_ATTENTION_CHECK",
"condition": {
"and": [
{ "not": { "u_has_effect": "effect_telepathic_psi_armor" } },
{
"x_in_y_chance": {
"x": {
"math": [
"rand(50 * (1 + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) - ( u_skill('metaphysics') / 2 ) ) )"
]
},
"y": 1000
}
}
]
},
"effect": [
{
"u_message": "The hairs stand up on the back of your neck. You have a strong feeling that you're being watched.",
"type": "bad"
},
{ "u_add_effect": "psi_nether_attention", "duration": "7 days" }
]
}
]
}
]
}
]
115 changes: 115 additions & 0 deletions data/mods/MindOverMatter/effectoncondition/eoc_observed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
[
{
"type": "effect_on_condition",
"id": "EOC_PSIONICS_NETHER_AREA_CHECK",
"eoc_type": "EVENT",
"required_event": "spellcasting_finish",
"condition": {
"and": [
{ "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" },
{
"or": [
{ "test_eoc": "EOC_CONDITION_CAUGHT_IN_NETHER_WEATHER" },
{ "test_eoc": "EOC_CONDITION_NEAR_NETHER_RELATED_LOCATION" }
]
}
]
},
"effect": [
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand( 1 )" ] },
{
"run_eocs": [
{
"id": "EOC_PSIONICS_NETHER_AREA_ATTENTION_CHECK",
"condition": {
"and": [
{ "test_eoc": "EOC_PORTAL_STORM_CONDITION_FLAG_PORTAL_PROOF" },
{
"x_in_y_chance": {
"x": {
"math": [
"rand(50 * (1 + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) - ( u_skill('metaphysics') / 2 ) ) )"
]
},
"y": 1000
}
}
]
},
"effect": [
{
"u_message": "The hairs stand up on the back of your neck. You have a strong feeling that you're being watched.",
"type": "bad"
},
{ "u_add_effect": "psi_nether_attention", "duration": "7 days" }
]
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_OBSERVED_SIDE_EFFECTS",
"effect": {
"switch": { "math": [ "u_effect_intensity('psi_nether_attention')" ] },
"cases": [ { "case": 1, "effect": { "weighted_list_eocs": [ [ "EOC_OBSERVED_EFFECT_HEARING_SOUNDS", 1 ] ] } } ]
}
},
{
"type": "effect_on_condition",
"id": "EOC_OBSERVED_EFFECT_HEARING_SOUNDS",
"effect": { "u_message": "observed_effect_hearing_sounds", "snippet": true }
},
{
"type": "effect_on_condition",
"id": "EOC_CHECK_NEAR_NETHER_CRYSTAL_RECURRING",
"recurrence": [ "2 hours", "16 hours" ],
"effect": [
{
"u_location_variable": { "u_val": "near_nether_crystal_coordinate_check" },
"target_min_radius": 0,
"target_max_radius": 6,
"furniture": "f_nether_crystal_structure",
"true_eocs": [
{
"id": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP",
"effect": [ { "queue_eocs": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP_2", "time_in_future": "30 minutes" } ]
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_CHECK_NEAR_NETHER_CRYSTAL_FOLLOWUP_2",
"effect": [
{
"u_location_variable": { "u_val": "near_nether_crystal_coordinate_check" },
"target_min_radius": 0,
"target_max_radius": 6,
"furniture": "f_nether_crystal_structure",
"true_eocs": "EOC_CHECK_NEAR_NETHER_CRYSTAL_EFFECTS"
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_CHECK_NEAR_NETHER_CRYSTAL_EFFECTS",
"condition": { "u_has_effect": "psi_nether_attention" },
"effect": [ { "run_eocs": "EOC_OBSERVED_SIDE_EFFECTS" } ],
"false_effect": { "run_eocs": "EOC_PSIONICS_NETHER_AREA_ATTENTION_CHECK" }
},
{
"type": "effect_on_condition",
"id": "EOC_NETHER_ATTENTION_NIGHTMARES",
"eoc_type": "EVENT",
"required_event": "character_wakes_up",
"condition": { "and": [ { "u_has_effect": "psi_nether_attention" }, { "x_in_y_chance": { "x": 1, "y": 3 } } ] },
"effect": [
{ "u_message": "psi_nether_attention_nightmares", "snippet": true, "type": "bad" },
{ "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 },
{ "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rand(7) + 3" ] }
]
}
]
1 change: 1 addition & 0 deletions data/mods/MindOverMatter/furniture_and_terrain/furniture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"looks_like": "f_boulder_large",
"coverage": 75,
"required_str": 32,
"crafting_pseudo_item": "black_nether_crystal_pseudo_tool",
"flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": {
"str_min": 25,
Expand Down
13 changes: 13 additions & 0 deletions data/mods/MindOverMatter/items/tools/pseudo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"id": "black_nether_crystal_pseudo_tool",
"type": "TOOL",
"name": { "str": "nether crystal outcropping" },
"description": "This is the pseudo-tool provided by having a nearby cluster of black nether crystal. You shouldn't see this as an individual item.",
"symbol": "O",
"color": "red",
"weight": "0 g",
"volume": "0 ml",
"flags": [ "ZERO_WEIGHT" ]
}
]
60 changes: 45 additions & 15 deletions data/mods/MindOverMatter/recipes/practice/biokinetic_practice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
{
Expand Down Expand Up @@ -71,7 +73,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
{
Expand Down Expand Up @@ -100,7 +104,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
{
Expand Down Expand Up @@ -180,7 +186,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
{
Expand Down Expand Up @@ -256,7 +264,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
{
Expand Down Expand Up @@ -332,7 +342,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -409,7 +421,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -486,7 +500,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -563,7 +579,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -640,7 +658,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -717,7 +737,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -794,7 +816,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -871,7 +895,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -948,7 +974,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down Expand Up @@ -1025,7 +1053,9 @@
"time": "30 m",
"autolearn": false,
"proficiencies": [ { "proficiency": "prof_contemplation_biokinesis", "required": false } ],
"tools": [ [ [ "matrix_crystal_drained", -1 ], [ "matrix_crystal_biokinesis", -1 ] ] ],
"tools": [
[ [ "matrix_crystal_drained", -1 ], [ "black_nether_crystal_pseudo_tool", -1 ], [ "matrix_crystal_biokinesis", -1 ] ]
],
"components": [ [ [ "matrix_crystal_biokin_dust", 1 ] ] ],
"flags": [ "SECRET", "BLIND_HARD" ],
"result_eocs": [
Expand Down
Loading
Loading