Skip to content

Commit

Permalink
Magiclysm name to object (#38867)
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup authored Mar 18, 2020
1 parent 0d109a4 commit 1fedc7f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 38 deletions.
6 changes: 2 additions & 4 deletions data/mods/Magiclysm/enchanted/enchanted_bracers.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
"copy-from": "mbracer_steel_single",
"type": "TOOL_ARMOR",
"id": "mbracer_lightning_lesser",
"name": "lesser bracer of lightning",
"name_plural": "lesser bracers of lightning",
"name": { "str": "lesser bracer of lightning", "str_pl": "lesser bracers of lightning" },
"description": "A light but extremely sturdy steel bracer with an ornate bundle of lightning bolts engraved on the top, silver accentuates the intricate design. It protects your body with a light aura to reduce electrical damage you take, as well as being able to release a Jolt spell 3 times a day.",
"initial_charges": 72,
"max_charges": 72,
Expand All @@ -85,8 +84,7 @@
"copy-from": "mbracer_steel_single",
"type": "TOOL_ARMOR",
"id": "mbracer_lightning_greater",
"name": "greater bracer of lightning",
"name_plural": "greater bracers of lightning",
"name": { "str": "greater bracer of lightning", "str_pl": "greater bracers of lightning" },
"description": "A light but extremely sturdy steel bracer with an ornate bundle of lightning bolts engraved on the top, gold accentuates the intricate design. It protects your body with a strong aura to reduce electrical damage you take, as well as being able to release a Lightning Bolt spell 3 times a day.",
"initial_charges": 72,
"max_charges": 72,
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Magiclysm/enchanted/enchanted_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
"id": "heat_cube_torch_on",
"copy-from": "heat_cube",
"type": "TOOL",
"name": "heat cube (torch on)",
"name_plural": "heat cubes (torch on)",
"name": { "str": "heat cube (torch on)", "str_pl": "heat cubes (torch on)" },
"description": "The heat cube in the torch configuration, where it emits warmth and a bright flame that does not burn.",
"turns_per_charge": 360,
"revert_to": "heat_cube",
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Magiclysm/enchanted/enchanted_unarmed.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@
"id": "gauntlet_pounding",
"symbol": "3",
"color": "light_gray",
"name": "gauntlet of pounding",
"name_plural": "gauntlets of pounding",
"name": { "str": "gauntlet of pounding", "str_pl": "gauntlets of pounding" },
"description": "A large gleaming metal gauntlet covered in magical symbols that allows you to land astoundingly powerful blows.",
"material": [ "superalloy" ],
"volume": "1 L",
Expand Down
36 changes: 12 additions & 24 deletions data/mods/Magiclysm/enchanted/enchanted_wands.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
{
"type": "TOOL",
"id": "wand_magic_missile_lesser",
"name": "lesser wand of magic missile",
"name_plural": "lesser wands of magic missile",
"name": { "str": "lesser wand of magic missile", "str_pl": "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 @@ -56,8 +55,7 @@
{
"type": "TOOL",
"id": "wand_magic_missile_greater",
"name": "greater wand of magic missile",
"name_plural": "greater wands of magic missile",
"name": { "str": "greater wand of magic missile", "str_pl": "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 @@ -75,8 +73,7 @@
{
"type": "TOOL",
"id": "wand_fireball_lesser",
"name": "lesser wand of fireball",
"name_plural": "lesser wands of fireball",
"name": { "str": "lesser wand of fireball", "str_pl": "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 @@ -85,8 +82,7 @@
{
"type": "TOOL",
"id": "wand_fireball_greater",
"name": "greater wand of fireball",
"name_plural": "greater wands of fireball",
"name": { "str": "greater wand of fireball", "str_pl": "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 @@ -104,8 +100,7 @@
{
"type": "TOOL",
"id": "wand_mana_beam_lesser",
"name": "lesser wand of mana beam",
"name_plural": "lesser wands of mana beam",
"name": { "str": "lesser wand of mana beam", "str_pl": "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 @@ -114,8 +109,7 @@
{
"type": "TOOL",
"id": "wand_mana_beam_greater",
"name": "greater wand of mana beam",
"name_plural": "greater wands of mana beam",
"name": { "str": "greater wand of mana beam", "str_pl": "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 @@ -133,8 +127,7 @@
{
"type": "TOOL",
"id": "wand_point_flare_lesser",
"name": "lesser wand of point flare",
"name_plural": "lesser wands of point flare",
"name": { "str": "lesser wand of point flare", "str_pl": "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 @@ -143,8 +136,7 @@
{
"type": "TOOL",
"id": "wand_point_flare_greater",
"name": "greater wand of point flare",
"name_plural": "greater wands of point flare",
"name": { "str": "greater wand of point flare", "str_pl": "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 @@ -162,8 +154,7 @@
{
"type": "TOOL",
"id": "wand_hoaryblast_lesser",
"name": "lesser wand of hoary blast",
"name_plural": "lesser wands of hoary blast",
"name": { "str": "lesser wand of hoary blast", "str_pl": "lesser wands of hoary blast" },
"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 hoary blast.",
Expand All @@ -172,8 +163,7 @@
{
"type": "TOOL",
"id": "wand_hoaryblast_greater",
"name": "greater wand of hoary blast",
"name_plural": "greater wands of hoary blast",
"name": { "str": "greater wand of hoary blast", "str_pl": "greater wands of hoary blast" },
"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 hoary blast.",
Expand All @@ -191,8 +181,7 @@
{
"type": "TOOL",
"id": "wand_cone_cold_lesser",
"name": "lesser wand of cone of cold",
"name_plural": "lesser wands of cone of cold",
"name": { "str": "lesser wand of cone of cold", "str_pl": "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 @@ -201,8 +190,7 @@
{
"type": "TOOL",
"id": "wand_cone_cold_greater",
"name": "greater wand of cone of cold",
"name_plural": "greater wands of cone of cold",
"name": { "str": "greater wand of cone of cold", "str_pl": "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
3 changes: 1 addition & 2 deletions data/mods/Magiclysm/items/alchemy_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@
"id": "adrenal_gland_large",
"copy-from": "meat",
"type": "COMESTIBLE",
"name": "large adrenal gland",
"name_plural": "large adrenal glands",
"name": { "str": "large adrenal gland" },
"description": "An organ located above the kidneys responsible for secretion of adrenaline, cortisol, and aldosterone. This one is huge, whether by nature or mutation.",
"delete": { "flags": [ "SMOKABLE" ] },
"price": 2000
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Magiclysm/items/comestibles.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"weight": "15 g",
"color": "brown",
"symbol": "0",
"name": "hairball",
"name_plural": "hairballs",
"name": { "str": "hairball" },
"description": "A big, ugly ball of animal spit and licked-off hairs. Don't swallow it.",
"price": 0,
"flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
Expand Down
3 changes: 1 addition & 2 deletions data/mods/Magiclysm/items/enchanted.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "brown",
"name": "lesser staff of the magi",
"name_plural": "lesser staves of the magi",
"name": { "str": "lesser staff of the magi", "str_pl": "lesser staves of the magi" },
"description": "A beautifully carved staff, made of enchanted wood and mithril. It faintly glows with magic when you cast spells, but it is not a sturdy melee weapon.",
"price": 40000,
"material": "wood",
Expand Down

0 comments on commit 1fedc7f

Please sign in to comment.