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

Fix Magiclysm json errors #34525

Merged
merged 1 commit into from
Oct 7, 2019
Merged

Fix Magiclysm json errors #34525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions data/mods/Magiclysm/Spells/debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
"message": "Debug spell %s cast.",
"effect": "area_pull",
"effect_filter": [ "ally", "hostile", "item", "fd_fire", "fd_blood" ],
"effect_iterations": 4,
"valid_targets": [ "self", "ally", "hostile", "ground" ],
"min_range": 5,
"max_range": 15,
Expand All @@ -164,7 +163,6 @@
"message": "Debug spell %s cast.",
"effect": "area_pull",
"effect_filter": [ "fd_fire", "fd_blood" ],
"effect_iterations": 4,
"valid_targets": [ "self", "ally", "hostile", "ground" ],
"min_range": 5,
"max_range": 15,
Expand All @@ -186,7 +184,6 @@
"message": "Debug spell %s cast.",
"effect": "area_push",
"effect_filter": [ "ally", "hostile", "item" ],
"effect_iterations": 4,
"valid_targets": [ "self", "ally", "hostile", "ground" ],
"min_range": 5,
"max_range": 15,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/Spells/dragonbreath.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"min_field_intensity": 1,
"max_field_intensity": 4,
"field_chance": 2,
"intensity_increment": 0.1,
"field_intensity_increment": 0.1,
"flags": [ "VERBAL", "NO_HANDS", "NO_LEGS" ]
}
]
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/Spells/item_only.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "twisted_restore",
"type": "SPELL",
"name": "Twisted Restoration",
"\\": "Used for potion of Twisted Restoration, not castable",
"//": "Used for potion of Twisted Restoration, not castable",
"description": "This spell overclocks your heart, generating new flesh and muscle. It is unwise to use this in immediate danger, and may be fatal if done in critical condition.",
"valid_targets": [ "self" ],
"flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ],
Expand Down Expand Up @@ -31,7 +31,7 @@
"id": "twisted_restore_improved",
"type": "SPELL",
"name": "Improved Twisted Restoration",
"\\": "Used for Animist-exclusive potion, not castable",
"//": "Used for Animist-exclusive potion, not castable",
"description": "This spell overclocks your heart, generating new flesh and muscle. It is unwise to use this in immediate danger, and may be fatal if done in critical condition. Improved brewing mitigates the strain of the spell.",
"valid_targets": [ "self" ],
"flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/Spells/kelvinist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"field_id": "fd_cold_air2",
"min_field_intensity": 0,
"max_field_intensity": 4,
"intensity_increment": 0.5,
"field_intensity_increment": 0.5,
"damage_type": "cold"
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/effects/effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"remove_message": "Your energy field fades.",
"rating": "good",
"show_in_info": true,
"base_mods": { "environmental_protection": [ 5 ], "material_thickness": [ 3 ], "warmth": [ 50 ] }
"base_mods": { }
},
{
"type": "effect_type",
Expand All @@ -70,7 +70,7 @@
"remove_message": "Your Frost Armor melts away.",
"rating": "good",
"show_in_info": true,
"base_mods": { "environmental_protection": [ 5 ], "material_thickness": [ 5 ], "warmth": [ 20 ] }
"base_mods": { }
},
{
"type": "effect_type",
Expand Down
36 changes: 18 additions & 18 deletions data/mods/Magiclysm/enchanted/enchanted_wands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "TOOL",
"id": "wand_magic_missile_minor",
"name": "minor wand of magic missile",
"plural": "minor wands of magic missile",
"name_plural": "minor wands of magic missile",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts magic missile.",
"use_action": { "type": "cast_spell", "spell_id": "magic_missile", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -29,7 +29,7 @@
"type": "TOOL",
"id": "wand_magic_missile_lesser",
"name": "lesser wand of magic missile",
"plural": "lesser wands of magic missile",
"name_plural": "lesser wands of magic missile",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts magic missile.",
Expand All @@ -39,7 +39,7 @@
"type": "TOOL",
"id": "wand_magic_missile_greater",
"name": "greater wand of magic missile",
"plural": "greater wands of magic missile",
"name_plural": "greater wands of magic missile",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts magic missile.",
Expand All @@ -49,7 +49,7 @@
"type": "TOOL",
"id": "wand_fireball_minor",
"name": "minor wand of fireball",
"plural": "minor wands of fireball",
"name_plural": "minor wands of fireball",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts fireball.",
"use_action": { "type": "cast_spell", "spell_id": "fireball", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -58,7 +58,7 @@
"type": "TOOL",
"id": "wand_fireball_lesser",
"name": "lesser wand of fireball",
"plural": "lesser wands of fireball",
"name_plural": "lesser wands of fireball",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts fireball.",
Expand All @@ -68,7 +68,7 @@
"type": "TOOL",
"id": "wand_fireball_greater",
"name": "greater wand of fireball",
"plural": "greater wands of fireball",
"name_plural": "greater wands of fireball",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts fireball.",
Expand All @@ -78,7 +78,7 @@
"type": "TOOL",
"id": "wand_mana_beam_minor",
"name": "minor wand of mana beam",
"plural": "minor wands of mana beam",
"name_plural": "minor wands of mana beam",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts mana beam.",
"use_action": { "type": "cast_spell", "spell_id": "magus_mana_beam", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -87,7 +87,7 @@
"type": "TOOL",
"id": "wand_mana_beam_lesser",
"name": "lesser wand of mana beam",
"plural": "lesser wands of mana beam",
"name_plural": "lesser wands of mana beam",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts mana beam.",
Expand All @@ -97,7 +97,7 @@
"type": "TOOL",
"id": "wand_mana_beam_greater",
"name": "greater wand of mana beam",
"plural": "greater wands of mana beam",
"name_plural": "greater wands of mana beam",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts mana beam.",
Expand All @@ -107,7 +107,7 @@
"type": "TOOL",
"id": "wand_point_flare_minor",
"name": "minor wand of point flare",
"plural": "minor wands of point flare",
"name_plural": "minor wands of point flare",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts point flare.",
"use_action": { "type": "cast_spell", "spell_id": "point_flare", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -116,7 +116,7 @@
"type": "TOOL",
"id": "wand_point_flare_lesser",
"name": "lesser wand of point flare",
"plural": "lesser wands of point flare",
"name_plural": "lesser wands of point flare",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts point flare.",
Expand All @@ -126,7 +126,7 @@
"type": "TOOL",
"id": "wand_point_flare_greater",
"name": "greater wand of point flare",
"plural": "greater wands of point flare",
"name_plural": "greater wands of point flare",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts point flare.",
Expand All @@ -136,7 +136,7 @@
"type": "TOOL",
"id": "wand_iceball_minor",
"name": "minor wand of iceball",
"plural": "minor wands of iceball",
"name_plural": "minor wands of iceball",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts iceball.",
"use_action": { "type": "cast_spell", "spell_id": "iceball", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -145,7 +145,7 @@
"type": "TOOL",
"id": "wand_iceball_lesser",
"name": "lesser wand of iceball",
"plural": "lesser wands of iceball",
"name_plural": "lesser wands of iceball",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts iceball.",
Expand All @@ -155,7 +155,7 @@
"type": "TOOL",
"id": "wand_iceball_greater",
"name": "greater wand of iceball",
"plural": "greater wands of iceball",
"name_plural": "greater wands of iceball",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts iceball.",
Expand All @@ -165,7 +165,7 @@
"type": "TOOL",
"id": "wand_cone_cold_minor",
"name": "minor wand of cone of cold",
"plural": "minor wands of cone of cold",
"name_plural": "minor wands of cone of cold",
"copy-from": "spell_wand",
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts cone of cold.",
"use_action": { "type": "cast_spell", "spell_id": "cone_cold", "no_fail": true, "level": 5, "need_wielding": true }
Expand All @@ -174,7 +174,7 @@
"type": "TOOL",
"id": "wand_cone_cold_lesser",
"name": "lesser wand of cone of cold",
"plural": "lesser wands of cone of cold",
"name_plural": "lesser wands of cone of cold",
"copy-from": "spell_wand",
"price": 20000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts cone of cold.",
Expand All @@ -184,7 +184,7 @@
"type": "TOOL",
"id": "wand_cone_cold_greater",
"name": "greater wand of cone of cold",
"plural": "greater wands of cone of cold",
"name_plural": "greater wands of cone of cold",
"copy-from": "spell_wand",
"price": 30000,
"description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts cone of cold.",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/itemgroups/itemgroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{
"id": "coffee_display_2",
"type": "item_group",
"item": [ [ "mana_potion_lesser", 10 ] ]
"items": [ [ "mana_potion_lesser", 10 ] ]
},
{
"type": "item_group",
Expand Down
32 changes: 10 additions & 22 deletions data/mods/Magiclysm/items/class_runes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"symbol": "=",
"color": "pink",
"name": "Biomancer rune",
"plural": "Biomancer runes",
"description": "This magical pebble has an insignia of rended flesh and bones on it. It is necessary for Biomancers to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -16,8 +15,7 @@
"id": "rune_biomancer_weapon",
"type": "GENERIC",
"name": "Biomancer spear",
"plural": "Biomancer spears",
"\\": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.",
"//": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.",
"description": "A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune embedded at the base of the head.",
"weight": 988,
"volume": "1250 ml",
Expand All @@ -38,7 +36,6 @@
"symbol": "=",
"color": "blue",
"name": "Technomancer rune",
"plural": "Technomancer runes",
"description": "This magical pebble has an insignia of clockwork and gears on it. It is necessary for Technomancers to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -49,8 +46,7 @@
"id": "rune_technomancer_weapon",
"type": "GENERIC",
"name": "Technomancer toolbar",
"plural": "Technomancer toolbars",
"\\": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment",
"//": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment",
"description": "This staff incorporates a sturdy cresent wrench on top of a prybar and a hammer on the other in a convienent package. There is a Technomancer rune embedded in the hammerhead.",
"weight": 1536,
"volume": "1750 ml",
Expand All @@ -71,7 +67,7 @@
"symbol": "=",
"color": "magenta",
"name": "Magus rune",
"plural": "Magi runes",
"name_plural": "Magi runes",
"description": "This magical pebble has an insignia of crystal and mana orbs on it. It is necessary for Magi to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -82,8 +78,8 @@
"id": "rune_magus_weapon",
"type": "GENERIC",
"name": "Magus staff",
"plural": "Magus staves",
"\\": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.",
"name_plural": "Magus staves",
"//": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.",
"description": "A quarterstaff with runes carved into it and two glass jars, heat-tempered and infused with mana for durability, to act as mana receptacles. There are two Magi runes embedded at the tips.",
"weight": 1530,
"volume": "1500 ml",
Expand All @@ -102,7 +98,6 @@
"symbol": "=",
"color": "green",
"name": "Earthshaper rune",
"plural": "Earthshaper runes",
"description": "This magical pebble has an insignia of steel and rocks on it. It is necessary for Earthshapers to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -116,7 +111,7 @@
"color": "light_gray",
"name": "Earthshaper cestus",
"name_plural": "Earthshaper cesti",
"\\": "Equivalent to cestus +1 with BRUTAL and WBLOCK1",
"//": "Equivalent to cestus +1 with BRUTAL and WBLOCK1",
"description": "A stone battle glove with carved runes encasing the hand, protecting it while increasing striking power. There is an Earthshaper rune embedded in the palm.",
"material": [ "stone", "leather", "steel" ],
"volume": "500 ml",
Expand All @@ -133,7 +128,6 @@
"symbol": "=",
"color": "red",
"name": "Kelvinist rune",
"plural": "Kelvinist runes",
"description": "This magical pebble has an insignia of ice and flames on it. It is necessary for Kelvinists to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -144,8 +138,7 @@
"id": "rune_kelvinist_weapon",
"type": "GENERIC",
"name": "Kelvinist flamberge",
"plural": "Kelvinist flamberges",
"\\": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.",
"//": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.",
"description": "A sword with an undulating blade, reminiscent of a flame. There is a Kelvinist rune embedded in the pommel.",
"weight": 1530,
"volume": "1250 ml",
Expand All @@ -167,7 +160,6 @@
"symbol": "=",
"color": "yellow",
"name": "Stormshaper rune",
"plural": "Stormshaper runes",
"description": "This magical pebble has an insignia of lightning and storm clouds on it. It is necessary for Stormshapers to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -178,8 +170,7 @@
"id": "rune_stormshaper_weapon",
"type": "GENERIC",
"name": "Stormshaper axe",
"plural": "Stormshaper axes",
"\\": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons",
"//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons",
"description": "A forged copper axe with silver trimmings and a wooden handle. There is a Stormshaper rune embedded in the eye.",
"weight": 3330,
"volume": "2 L",
Expand All @@ -201,7 +192,6 @@
"symbol": "=",
"color": "brown",
"name": "Druid rune",
"plural": "Druid runes",
"description": "This magical pebble has an insignia of nature and trees on it. It is necessary for Druids to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -214,7 +204,7 @@
"symbol": "(",
"color": "yellow",
"name": "Druid composite bow",
"\\": "Equivalent to composite bow +1 for dispersion/reload/weight/range/encumb/bash, with two mod slots added equivalent to other weapons getting techniques",
"//": "Equivalent to composite bow +1 for dispersion/reload/weight/range/encumb/bash, with two mod slots added equivalent to other weapons getting techniques",
"description": "A bow made of multiple materials to maximize energy efficiency. There are two Druid runes embedded at the tips.",
"price": 32000,
"material": [ "wood", "bone" ],
Expand Down Expand Up @@ -252,7 +242,6 @@
"symbol": "=",
"color": "light_red",
"name": "Animist rune",
"plural": "Animist runes",
"description": "This magical pebble has an insignia of summoners on it. It is necessary for Animists to channel magic into their crafts.",
"volume": "5ml",
"weight": 1,
Expand All @@ -264,7 +253,7 @@
"type": "GENERIC",
"name": "Animist athame",
"name_plural": "Animist athames",
"\\": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1",
"//": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1",
"description": "A steel ritual knife used by Animists to draw blood for summoning. Their school rune is embedded in the crossguard.",
"weight": 504,
"volume": "500 ml",
Expand All @@ -284,7 +273,6 @@
"symbol": "=",
"color": "black",
"name": "alchemist rune",
"plural": "alchemist runes",
"description": "This magical pebble has an insignia of alchemy and potions on it. While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.",
"volume": "5ml",
"weight": 1,
Expand Down
Loading