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

[Magiclysm] Weapon Categories touchup #58418

Merged
merged 3 commits into from
Jun 15, 2022
Merged

[Magiclysm] Weapon Categories touchup #58418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85724cf
magiclysm weapon categories
catdach Jun 14, 2022
924a859
Delete martialarts.json
catdach Jun 14, 2022
0d64105
Merge branch 'CleverRaven:master' into magiclysm_weapon_categories
catdach Jun 14, 2022
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
2 changes: 2 additions & 0 deletions data/mods/Magiclysm/items/alchemy_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
"to_hit": -1,
"material": [ "flesh" ],
"cutting": 7,
"weapon_category": [ "SHIVS" ],
"flags": [ "SPEAR", "SHEATH_KNIFE" ]
},
{
Expand Down Expand Up @@ -243,6 +244,7 @@
"material": [ "flesh" ],
"volume": "250 ml",
"cutting": 8,
"weapon_category": [ "SHIVS" ],
"flags": [ "SPEAR", "SHEATH_KNIFE" ],
"price": 1500
},
Expand Down
3 changes: 3 additions & 0 deletions data/mods/Magiclysm/items/enchanted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"price": 10000,
"material": [ "wood" ],
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"weapon_category": [ "QUARTERSTAVES" ],
"flags": [ "SHEATH_SPEAR", "ALWAYS_TWOHAND", "MAGIC_FOCUS" ],
"relic_data": {
"passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "REGEN_MANA", "multiply": 0.5 } ] } ]
Expand All @@ -48,6 +49,7 @@
"price": 40000,
"material": [ "wood" ],
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"weapon_category": [ "QUARTERSTAVES" ],
"flags": [ "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE", "MAGIC_FOCUS" ],
"relic_data": {
"passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "REGEN_MANA", "multiply": 1.25 } ] } ]
Expand All @@ -69,6 +71,7 @@
"price": 1000000,
"material": [ "wood", "mithril_metal" ],
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"weapon_category": [ "QUARTERSTAVES" ],
"flags": [ "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE", "MAGIC_FOCUS" ],
"relic_data": {
"passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "REGEN_MANA", "multiply": 2 } ] } ]
Expand Down
4 changes: 3 additions & 1 deletion data/mods/Magiclysm/items/enchanted_melee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
"symbol": "/",
"color": "brown",
"techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
"weapon_category": [ "HOOKING_WEAPONRY" ],
"weapon_category": [ "HOOKING_WEAPONRY", "GREAT_AXES", "GREAT_HAMMERS" ],
"qualities": [ [ "AXE", 1 ], [ "BUTCHER", -20 ], [ "HAMMER", 1 ] ],
"use_action": [
{ "type": "cast_spell", "spell_id": "lightning_bolt", "no_fail": true, "level": 7, "need_wielding": true },
Expand Down Expand Up @@ -975,6 +975,7 @@
"symbol": "/",
"material": [ "steel", "plastic" ],
"techniques": [ "WBLOCK_1", "RAPID" ],
"weapon_category": [ "BATONS" ],
"flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
"use_action": {
"menu_text": "Extend to staff",
Expand All @@ -1001,6 +1002,7 @@
"symbol": "/",
"material": [ "steel", "plastic" ],
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"weapon_category": [ "QUARTERSTAVES" ],
"flags": [ "DURABLE_MELEE", "SHEATH_SPEAR" ],
"use_action": {
"menu_text": "Retract to baton",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Magiclysm/items/enchanted_ranged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"barrel_volume": "500 ml",
"valid_mod_locations": [ [ "mechanism", 1 ] ],
"reload_noise": "chuk chuk.",
"weapon_category": [ "MEDIUM_SWORDS" ],
"flags": [ "RELOAD_ONE", "PUMP_ACTION", "DURABLE_MELEE", "SHEATH_SWORD" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 3 } } ]
Expand Down
4 changes: 4 additions & 0 deletions data/mods/Magiclysm/items/ethereal_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@
"name": { "str": "Wicked Bonespear" },
"description": "This is a wicked spear/halberd hybrid entirely created of bone.",
"material": [ "bone" ],
"weapon_category": [ "POLEARMS", "SPEARS" ],
"flags": [
"UNBREAKABLE_MELEE",
"REACH_ATTACK",
Expand Down Expand Up @@ -603,6 +604,7 @@
"name": { "str": "flaming sword" },
"description": "This wooden sword is ablaze! It seems to be safe-ish to hold, but will burn up soon.",
"material": [ "wood" ],
"weapon_category": [ "CONSTRUCTED_SWORDS", "MEDIUM_SWORDS" ],
"flags": [
"UNBREAKABLE_MELEE",
"NONCONDUCTIVE",
Expand Down Expand Up @@ -634,6 +636,7 @@
"name": { "str": "decaying boneclub" },
"description": "A pulsating club made of bone, stained with an ever-moving blood coating eager to absorb the living.",
"material": [ "bone", "flesh" ],
"weapon_category": [ "BATONS" ],
"flags": [
"UNBREAKABLE_MELEE",
"NONCONDUCTIVE",
Expand Down Expand Up @@ -801,6 +804,7 @@
"symbol": "[",
"color": "light_gray",
"qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 12 ] ],
"weapon_category": [ "CLAWS" ],
"flags": [
"UNARMED_WEAPON",
"UNBREAKABLE_MELEE",
Expand Down
Loading