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] Proficiency reshuffling, some crafts require that you are a psion #78992

Merged
merged 9 commits into from
Jan 7, 2025
Merged

[MoM] Proficiency reshuffling, some crafts require that you are a psion #78992

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
859ce6e
Initial commit
Standing-Storm Jan 6, 2025
886747e
Fixes
Standing-Storm Jan 6, 2025
9470529
Add missing recipe proficiencies
Standing-Storm Jan 6, 2025
ef96912
Set direct true
Standing-Storm Jan 6, 2025
9773b4c
Add EoC to grant the proficiency during the game
Standing-Storm Jan 6, 2025
ee61303
Fixes
Standing-Storm Jan 7, 2025
93ecfda
Grounding meditation no longer auto-learned, now learned through EoC
Standing-Storm Jan 7, 2025
0079a0a
Name change
Standing-Storm Jan 7, 2025
aa39348
Add note to Principles of Matrix Technology proficiency
Standing-Storm Jan 7, 2025
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
83 changes: 83 additions & 0 deletions data/mods/MindOverMatter/effectoncondition/eoc_crafting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,88 @@
"id": "EOC_PSI_PRACTICE_FOCUS_MOD_4",
"condition": { "math": [ "u_val('focus') >= 30" ] },
"effect": [ { "math": [ "u_val('focus')", "-=", "5" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_MOM_GRANT_GROUNDING_MEDITATION_TO_PSIONS",
"recurrence": 1,
"condition": {
"and": [
{
"u_has_any_trait": [
"BIOKINETIC",
"CLAIRSENTIENT",
"ELECTROKINETIC",
"PHOTOKINETIC",
"PYROKINETIC",
"TELEKINETIC",
"TELEPATH",
"TELEPORTER",
"VITAKINETIC"
]
},
{ "math": [ "u_skill('metaphysics') >= 4" ] }
]
},
"deactivate_condition": {
"or": [
{ "u_know_recipe": "psi_centering_meditation_drain_reduce" },
{
"not": {
"u_has_any_trait": [
"BIOKINETIC",
"CLAIRSENTIENT",
"ELECTROKINETIC",
"PHOTOKINETIC",
"PYROKINETIC",
"TELEKINETIC",
"TELEPATH",
"TELEPORTER",
"VITAKINETIC"
]
}
}
]
},
"effect": [ { "u_learn_recipe": "psi_centering_meditation_drain_reduce" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_MOM_GAME_ONGOING_GRANT_CRAFTING_PROFICIENICES",
"recurrence": 1,
"condition": {
"u_has_any_trait": [
"BIOKINETIC",
"CLAIRSENTIENT",
"ELECTROKINETIC",
"PHOTOKINETIC",
"PYROKINETIC",
"TELEKINETIC",
"TELEPATH",
"TELEPORTER",
"VITAKINETIC"
]
},
"deactivate_condition": {
"or": [
{ "u_has_proficiency": "prof_psionic_minimum_requirements" },
{
"not": {
"u_has_any_trait": [
"BIOKINETIC",
"CLAIRSENTIENT",
"ELECTROKINETIC",
"PHOTOKINETIC",
"PYROKINETIC",
"TELEKINETIC",
"TELEPATH",
"TELEPORTER",
"VITAKINETIC"
]
}
}
]
},
"effect": [ { "math": [ "u_proficiency('prof_psionic_minimum_requirements', 'format': 'percent', 'direct': true) += 100" ] } ]
}
]
2 changes: 2 additions & 0 deletions data/mods/MindOverMatter/recipes/armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"book_learn": [ [ "schematics_anchoring_crown", 3 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": false },
{ "proficiency": "prof_psionic_warping", "required": false }
Expand Down Expand Up @@ -41,6 +42,7 @@
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": false },
{ "proficiency": "prof_psionic_warping", "required": false }
Expand Down
23 changes: 23 additions & 0 deletions data/mods/MindOverMatter/recipes/batteries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "medium_storage_battery",
"category": "CC_*",
"subcategory": "CSC_*_NESTED",
"skill_used": "electronics",
"skills_required": [ "fabrication", 2 ],
"difficulty": 3,
"time": "40 m",
"book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ],
"using": [ [ "soldering_standard", 20 ] ],
"qualities": [ { "id": "SCREW", "level": 1 } ],
"proficiencies": [
{ "proficiency": "prof_elec_soldering" },
{ "proficiency": "prof_elec_circuits" },
{ "proficiency": "prof_elec_semiconductors" },
{ "proficiency": "prof_matrix_technology_beginner" }
],
"components": [ [ [ "small_storage_battery", 10 ] ], [ [ "e_scrap", 4 ] ], [ [ "scrap", 8 ] ], [ [ "cable", 5 ] ] ]
}
]
35 changes: 14 additions & 21 deletions data/mods/MindOverMatter/recipes/chemistry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"time": "55 m",
"batch_time_factors": [ 80, 4 ],
"book_learn": [ [ "schematics_reactant_liquid_base", 5 ] ],
"proficiencies": [ { "proficiency": "prof_psionic_basic", "required": false } ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "serum_production_standard", 25 ] ],
"components": [
[ [ "ether", 100 ] ],
Expand All @@ -36,8 +39,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_biokin_dust", 3 ] ] ],
Expand Down Expand Up @@ -71,8 +73,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_clair_dust", 3 ] ] ],
Expand Down Expand Up @@ -106,8 +107,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_electrokin_dust", 3 ] ] ],
Expand Down Expand Up @@ -141,8 +141,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_photokin_dust", 3 ] ] ],
Expand Down Expand Up @@ -176,8 +175,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_pyrokin_dust", 3 ] ] ],
Expand Down Expand Up @@ -211,8 +209,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_telekin_dust", 3 ] ] ],
Expand Down Expand Up @@ -246,8 +243,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_telepath_dust", 3 ] ] ],
Expand Down Expand Up @@ -281,8 +277,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_teleport_dust", 3 ] ] ],
Expand Down Expand Up @@ -316,8 +311,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_vitakin_dust", 3 ] ] ],
Expand Down Expand Up @@ -351,8 +345,7 @@
"tools": [ [ [ "microscope", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_inorganic_chemistry", "required": false },
{ "proficiency": "prof_psionic_basic", "required": false }
{ "proficiency": "prof_inorganic_chemistry", "required": false }
],
"using": [ [ "any_strong_acid", 2, "LIST" ], [ "surface_heat", 30, "LIST" ] ],
"components": [ [ [ "matrix_crystal_drained_dust", 3 ] ] ],
Expand Down
3 changes: 3 additions & 0 deletions data/mods/MindOverMatter/recipes/medical.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_intro_biology", "required": false },
{ "proficiency": "prof_pharmaceutical", "required": false },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": false },
{ "proficiency": "prof_psionic_morphic", "required": false }
Expand Down Expand Up @@ -43,6 +44,7 @@
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_intro_biology", "required": false },
{ "proficiency": "prof_pharmaceutical", "required": false },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": true },
{ "proficiency": "prof_psionic_morphic", "required": false }
Expand Down Expand Up @@ -73,6 +75,7 @@
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_intro_biology", "required": false },
{ "proficiency": "prof_pharmaceutical", "required": false },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": false },
{ "proficiency": "prof_psionic_warping", "required": false }
Expand Down
3 changes: 2 additions & 1 deletion data/mods/MindOverMatter/recipes/nether_attunement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"subcategory": "CSC_PSIONIC_OTHER",
"difficulty": 4,
"time": "15 m",
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_psionic_minimum_requirements", "required": true } ],
"skill_used": "metaphysics",
"flags": [ "BLIND_EASY", "NO_MANIP", "AFFECTED_BY_PAIN", "NO_BENCH", "NO_ENCHANTMENT" ],
"result_eocs": [
Expand Down Expand Up @@ -44,6 +44,7 @@
"time": "1 h",
"book_learn": [ [ "phavian_report_psionic_drain", 5 ] ],
"proficiencies": [
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_containment", "required": false }
],
Expand Down
35 changes: 33 additions & 2 deletions data/mods/MindOverMatter/recipes/proficiencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@
"name": "Psionic Crafting",
"description": "Proficiencies that help with channeling psionic energy into physical objects or into more esoteric applications."
},
{
"type": "proficiency",
"id": "prof_psionic_minimum_requirements",
"category": "prof_psionic",
"name": { "str": "Noetic Crafting" },
"description": "You are capable of using psi and can undertake crafts that require active psionic channeling.",
"can_learn": false,
"teachable": false,
"default_time_multiplier": 1,
"time_to_learn": "1 h"
},
{
"type": "proficiency",
"id": "prof_psionic_basic",
Expand All @@ -160,7 +171,8 @@
"can_learn": true,
"default_time_multiplier": 2,
"default_skill_penalty": 0.3,
"time_to_learn": "12 h"
"time_to_learn": "12 h",
"required_proficiencies": [ "prof_psionic_minimum_requirements" ]
},
{
"type": "proficiency",
Expand All @@ -171,7 +183,8 @@
"can_learn": true,
"default_time_multiplier": 1.2,
"default_skill_penalty": 0.4,
"time_to_learn": "20 h"
"time_to_learn": "20 h",
"required_proficiencies": [ "prof_psionic_minimum_requirements" ]
},
{
"type": "proficiency",
Expand Down Expand Up @@ -208,5 +221,23 @@
"default_skill_penalty": 0.4,
"time_to_learn": "18 h",
"required_proficiencies": [ "prof_psionic_basic", "prof_psionic_containment" ]
},
{
"type": "proficiency_category",
"id": "prof_matrix_technology",
"name": "Matrix Technology",
"description": "Proficiencies that help with making materials whose capabilities or functions are possible due to the existence of psionics, but which do not require its use in their creation."
},
{
"type": "proficiency",
"id": "prof_matrix_technology_beginner",
"category": "prof_matrix_technology",
"name": { "str": "Principles of Matrix Technology" },
"//": "This should not be used in any recipe that requires actual psionics to create",
"description": "You know the basics of creating items using matrix crystals that don't require you to personally to use psi in the crafting process.",
"can_learn": true,
"default_time_multiplier": 2,
"default_skill_penalty": 0.3,
"time_to_learn": "8 h"
}
]
8 changes: 5 additions & 3 deletions data/mods/MindOverMatter/recipes/psionics_practice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
"proficiencies": [ { "proficiency": "prof_psionic_basic", "time_multiplier": 1, "skill_penalty": 0 } ],
"time": "1 h",
"qualities": [ { "id": "MATRIX_CHANNEL", "level": 1 } ],
"components": [ [ [ "matrix_shard", 1 ], [ "matrix_crystal_drained", 1 ] ] ],
"byproducts": [ [ "matrix_crystal_drained_dust", 10 ] ],
"tools": [ [ [ "matrix_shard", -1 ], [ "matrix_crystal_drained", -1 ] ] ],
"book_learn": [ [ "manual_psionics_advan", 3 ], [ "schematics_matrix_channeling", 3 ], [ "schematics_matrix_aligning", 3 ] ]
},
{
Expand All @@ -86,7 +85,10 @@
"practice_data": { "min_difficulty": 4, "max_difficulty": 4, "skill_limit": 4 },
"proficiencies": [ { "proficiency": "prof_psionic_ritual", "time_multiplier": 1, "skill_penalty": 0 } ],
"time": "1 h",
"book_learn": [ [ "manual_psionic_ritual", 4 ] ]
"qualities": [ { "id": "MATRIX_CHANNEL", "level": 1 } ],
"tools": [ [ [ "matrix_shard", 1 ], [ "matrix_crystal_drained", 1 ] ] ],
"book_learn": [ [ "manual_psionic_ritual", 4 ] ],
"flags": [ "BLIND_EASY", "NO_MANIP", "AFFECTED_BY_PAIN", "NO_BENCH", "NO_ENCHANTMENT" ]
},
{
"id": "prac_concentration_basic",
Expand Down
2 changes: 2 additions & 0 deletions data/mods/MindOverMatter/recipes/research.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"proficiencies": [
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_intro_biology", "required": false },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_ritual", "required": false }
],
Expand Down Expand Up @@ -131,6 +132,7 @@
{ "proficiency": "prof_intro_chemistry", "required": false },
{ "proficiency": "prof_intro_biology", "required": false },
{ "proficiency": "prof_pharmaceutical", "required": false },
{ "proficiency": "prof_psionic_minimum_requirements", "required": true },
{ "proficiency": "prof_psionic_basic", "required": true },
{ "proficiency": "prof_psionic_ritual", "required": false }
],
Expand Down
Loading
Loading