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

(Mind over Matter) allow incandescent lance to repair metal items #72716

Merged
merged 10 commits into from
Apr 4, 2024
Merged

(Mind over Matter) allow incandescent lance to repair metal items #72716

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8636c96
Update psions_summon_items.json
Blueflowerss Mar 30, 2024
2eb3d14
lint
Blueflowerss Mar 30, 2024
56396a3
Merge branch 'CleverRaven:master' into incadescent_lance_weldrepair
Blueflowerss Mar 31, 2024
458dd02
add `noetic energy` fake ammo
Blueflowerss Mar 31, 2024
2f027e0
change the lance's ammo to noetic energy
Blueflowerss Mar 31, 2024
bf535c6
Update data/mods/MindOverMatter/items/ammo.json
Blueflowerss Mar 31, 2024
1f0f010
Apply suggestions from code review
Blueflowerss Mar 31, 2024
1515508
deleted duplicate AMMO entry
Blueflowerss Mar 31, 2024
f0470c9
Update ammo.json
Blueflowerss Mar 31, 2024
e5da277
reset tests?
Blueflowerss Mar 31, 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
30 changes: 30 additions & 0 deletions data/mods/MindOverMatter/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"name": "matrix charge",
"default": "psionic_charge_power"
},
{
"type": "ammunition_type",
"id": "noetic_charge_power",
"name": "noetic energy",
"default": "noetic_charge_power"
},
{
"id": "mom_pulse_rifle_ammo",
"type": "AMMO",
Expand Down Expand Up @@ -46,5 +52,29 @@
"ammo_type": "psionic_charge_power",
"material": [ "nether_crystal" ],
"count": 100
},
{
Blueflowerss marked this conversation as resolved.
Show resolved Hide resolved
"type": "AMMO",
"id": "psionic_charge_power",
"category": "spare_parts",
"price": 1000,
"name": { "str_sp": "matrix charge" },
"symbol": "=",
"color": "white",
"description": "Power charge for matrix technology.",
"flags": [ "TRADER_AVOID", "ZERO_WEIGHT" ],
"weight": "0 mg",
"volume": "0 ml",
"ammo_type": "psionic_charge_power",
"material": [ "nether_crystal" ],
"count": 100
},
{
Blueflowerss marked this conversation as resolved.
Show resolved Hide resolved
"type": "AMMO",
"id": "noetic_charge_power",
"copy-from":"psionic_charge_power",
Blueflowerss marked this conversation as resolved.
Show resolved Hide resolved
"name": { "str_sp": "noetic energy" },
"ammo_type": "noetic_charge_power",
"description": "Power charge for psychic phenomena."
}
]
50 changes: 48 additions & 2 deletions data/mods/MindOverMatter/items/psions_summon_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,55 @@
"price_postapoc": 1,
"symbol": "$",
"color": "red",
"flags": [ "PERSONAL", "PADDED", "UNBREAKABLE", "INTEGRATED", "SEMITANGIBLE", "ZERO_WEIGHT", "LIGHT_50", "FIRE", "NO_DROP" ],
"flags": [
"PERSONAL",
"PADDED",
"UNBREAKABLE",
"INTEGRATED",
"SEMITANGIBLE",
"ZERO_WEIGHT",
"LIGHT_50",
"FIRE",
"NO_DROP",
"NO_UNLOAD",
"NO_RELOAD"
],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "noetic_charge_power": 1 } } ],
"charges_per_use": 0,
"qualities": [ [ "WELD", 2 ] ],
"use_action": [ { "type": "firestarter", "moves": 10 }, { "type": "OXYTORCH" } ],
"use_action": [
{ "type": "firestarter", "moves": 10 },
{ "type": "OXYTORCH" },
{
"type": "repair_item",
"item_action_type": "repair_metal",
"materials": [
"iron",
"steel",
"aluminum",
"copper",
"bronze",
"fancy_bronze",
"silver",
"gold",
"budget_steel",
"lc_steel",
"mc_steel",
"hc_steel",
"ch_steel",
"lc_steel_chain",
"mc_steel_chain",
"hc_steel_chain",
"ch_steel_chain",
"platinum",
"superalloy"
],
"skill": "fabrication",
"tool_quality": 10,
"cost_scaling": 0,
"move_cost": 500
}
],
"armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "hand_l", "hand_r" ] } ]
},
{
Expand Down
Loading