From a3229741d15cf68e40967cab088af4fca41c044b Mon Sep 17 00:00:00 2001 From: obligaron Date: Sun, 25 Apr 2021 20:26:53 +0200 Subject: [PATCH] :paintbrush: Refurbish tables in source code (clang-format off) --- Source/controls/touch.cpp | 2 +- Source/effects.cpp | 8 ++-- Source/gamemenu.cpp | 16 +++---- Source/inv.h | 16 +++---- Source/misdat.cpp | 2 +- Source/player.h | 2 +- Source/spelldat.cpp | 92 +++++++++++++++++++-------------------- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Source/controls/touch.cpp b/Source/controls/touch.cpp index 1fbeed718..d20309e15 100644 --- a/Source/controls/touch.cpp +++ b/Source/controls/touch.cpp @@ -47,7 +47,7 @@ enum { // clang-format off MaxNumFingers = 3, // number of fingers to track per panel MaxTapTime = 250, // taps longer than this will not result in mouse click events - MaxTapMotionDistance = 10, // max distance finger motion in Vita screen pixels to be considered a tap + MaxTapMotionDistance = 10, // max distance finger motion in Vita screen pixels to be considered a tap SimulatedClickDuration = 50, // time in ms how long simulated mouse clicks should be // clang-format on }; diff --git a/Source/effects.cpp b/Source/effects.cpp index d8fdaedcc..6990b9269 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -284,10 +284,10 @@ TSFX sgSFX[] = { { sfx_MISC, "Sfx\\Towners\\Cow1.wav", nullptr }, { sfx_MISC, "Sfx\\Towners\\Cow2.wav", nullptr }, /* - { sfx_MISC, "Sfx\\Towners\\Cow3.wav", NULL }, - { sfx_MISC, "Sfx\\Towners\\Cow4.wav", NULL }, - { sfx_MISC, "Sfx\\Towners\\Cow5.wav", NULL }, - { sfx_MISC, "Sfx\\Towners\\Cow6.wav", NULL }, + { sfx_MISC, "Sfx\\Towners\\Cow3.wav", nullptr }, + { sfx_MISC, "Sfx\\Towners\\Cow4.wav", nullptr }, + { sfx_MISC, "Sfx\\Towners\\Cow5.wav", nullptr }, + { sfx_MISC, "Sfx\\Towners\\Cow6.wav", nullptr }, */ { sfx_MISC | sfx_HELLFIRE, "Sfx\\Towners\\Cow7.wav", nullptr }, { sfx_MISC | sfx_HELLFIRE, "Sfx\\Towners\\Cow8.wav", nullptr }, diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 950ced2c5..dd5769e79 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -34,35 +34,35 @@ void gamemenu_speed(bool bActivate); /** Contains the game menu items of the single player menu. */ TMenuItem sgSingleMenu[] = { // clang-format off -// dwFlags, pszStr, fnMenu + // dwFlags, pszStr, fnMenu { GMENU_ENABLED, N_("Save Game"), &gamemenu_save_game }, { GMENU_ENABLED, N_("Options"), &gamemenu_options }, { GMENU_ENABLED, N_("New Game"), &gamemenu_new_game }, { GMENU_ENABLED, N_("Load Game"), &gamemenu_load_game }, { GMENU_ENABLED, N_("Quit Game"), &gamemenu_quit_game }, - { GMENU_ENABLED, nullptr, nullptr } + { GMENU_ENABLED, nullptr, nullptr } // clang-format on }; /** Contains the game menu items of the multi player menu. */ TMenuItem sgMultiMenu[] = { // clang-format off -// dwFlags, pszStr, fnMenu + // dwFlags, pszStr, fnMenu { GMENU_ENABLED, N_("Options"), &gamemenu_options }, { GMENU_ENABLED, N_("New Game"), &gamemenu_new_game }, { GMENU_ENABLED, N_("Restart In Town"), &gamemenu_restart_town }, { GMENU_ENABLED, N_("Quit Game"), &gamemenu_quit_game }, - { GMENU_ENABLED, nullptr, nullptr }, + { GMENU_ENABLED, nullptr, nullptr }, // clang-format on }; TMenuItem sgOptionsMenu[] = { // clang-format off -// dwFlags, pszStr, fnMenu - { GMENU_ENABLED | GMENU_SLIDER, nullptr, &gamemenu_music_volume }, - { GMENU_ENABLED | GMENU_SLIDER, nullptr, &gamemenu_sound_volume }, + // dwFlags, pszStr, fnMenu + { GMENU_ENABLED | GMENU_SLIDER, nullptr, &gamemenu_music_volume }, + { GMENU_ENABLED | GMENU_SLIDER, nullptr, &gamemenu_sound_volume }, { GMENU_ENABLED | GMENU_SLIDER, N_("Gamma"), &gamemenu_gamma }, { GMENU_ENABLED | GMENU_SLIDER, N_("Speed"), &gamemenu_speed }, { GMENU_ENABLED , N_("Previous Menu"), &gamemenu_previous }, - { GMENU_ENABLED , nullptr, nullptr }, + { GMENU_ENABLED , nullptr, nullptr }, // clang-format on }; /** Specifies the menu names for music enabled and disabled. */ diff --git a/Source/inv.h b/Source/inv.h index fae44a5b7..1b5cf7821 100644 --- a/Source/inv.h +++ b/Source/inv.h @@ -50,22 +50,22 @@ enum inv_xy_slot : uint8_t { SLOTXY_CHEST_LAST = 24, // regular inventory - SLOTXY_INV_FIRST = 25, - SLOTXY_INV_LAST = 64, + SLOTXY_INV_FIRST = 25, + SLOTXY_INV_LAST = 64, // belt items - SLOTXY_BELT_FIRST = 65, - SLOTXY_BELT_LAST = 72, - NUM_XY_SLOTS = 73 + SLOTXY_BELT_FIRST = 65, + SLOTXY_BELT_LAST = 72, + NUM_XY_SLOTS = 73 // clang-format on }; enum item_color : uint8_t { // clang-format off ICOL_YELLOW = PAL16_YELLOW + 5, - ICOL_WHITE = PAL16_GRAY + 5, - ICOL_BLUE = PAL16_BLUE + 5, - ICOL_RED = PAL16_RED + 5, + ICOL_WHITE = PAL16_GRAY + 5, + ICOL_BLUE = PAL16_BLUE + 5, + ICOL_RED = PAL16_RED + 5, // clang-format on }; diff --git a/Source/misdat.cpp b/Source/misdat.cpp index 72d16cc5d..37a90babb 100644 --- a/Source/misdat.cpp +++ b/Source/misdat.cpp @@ -127,7 +127,7 @@ MissileData missiledata[] = { /** Data related to each missile graphic ID. */ MisFileData misfiledata[] = { // clang-format off - // mName, mAnimName, mAnimFAmt, mFlags, mAnimData[16], mAnimDelay[16], mAnimLen[16], mAnimWidth[16], mAnimWidth2[16] + // mName, mAnimName, mAnimFAmt, mFlags, mAnimData[16], mAnimDelay[16], mAnimLen[16], mAnimWidth[16], mAnimWidth2[16] { "Arrows", MFILE_ARROWS, 1, 2, { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, { "Fireba", MFILE_FIREBA, 16, 0, { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14 }, { 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96 }, { 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16 } }, { "Guard", MFILE_GUARD, 3, 0, { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }, { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 15, 14, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 96, 96, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 16, 16, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, diff --git a/Source/player.h b/Source/player.h index afabcdb5b..5b4b26eac 100644 --- a/Source/player.h +++ b/Source/player.h @@ -88,7 +88,7 @@ enum player_graphic : uint16_t { PFILE_BLOCK = 1 << 8, // everything except PFILE_DEATH // 0b1_0111_1111 - PFILE_NONDEATH = 0x17F + PFILE_NONDEATH = 0x17F // clang-format on }; diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp index 268c70c11..b1be536da 100644 --- a/Source/spelldat.cpp +++ b/Source/spelldat.cpp @@ -11,59 +11,59 @@ namespace devilution { /** Data related to each spell ID. */ SpellData spelldata[] = { // clang-format off - // sName, sManaCost, sType, sNameText, sSkillText, sBookLvl, sStaffLvl, sTargeted, sTownSpell, sMinInt, sSFX, sMissiles[3], sManaAdj, sMinMana, sStaffMin, sStaffMax, sBookCost, sStaffCost - { SPL_NULL, 0, STYPE_FIRE, nullptr, nullptr, 0, 0, false, false, 0, SFX_NONE, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + // sName, sManaCost, sType, sNameText, sSkillText, sBookLvl, sStaffLvl, sTargeted, sTownSpell, sMinInt, sSFX, sMissiles[3], sManaAdj, sMinMana, sStaffMin, sStaffMax, sBookCost, sStaffCost + { SPL_NULL, 0, STYPE_FIRE, nullptr, nullptr, 0, 0, false, false, 0, SFX_NONE, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, { SPL_FIREBOLT, 6, STYPE_FIRE, N_("Firebolt"), N_("Firebolt"), 1, 1, true, false, 15, IS_CAST2, { MIS_FIREBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, - { SPL_HEAL, 5, STYPE_MAGIC, N_("Healing"), nullptr, 1, 1, false, true, 17, IS_CAST8, { MIS_HEAL, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, - { SPL_LIGHTNING, 10, STYPE_LIGHTNING, N_("Lightning"), nullptr, 4, 3, true, false, 20, IS_CAST4, { MIS_LIGHTCTRL, MIS_NULL, MIS_NULL }, 1, 6, 20, 60, 3000, 150 }, - { SPL_FLASH, 30, STYPE_LIGHTNING, N_("Flash"), nullptr, 5, 4, false, false, 33, IS_CAST4, { MIS_FLASH, MIS_FLASH2, MIS_NULL }, 2, 16, 20, 40, 7500, 500 }, + { SPL_HEAL, 5, STYPE_MAGIC, N_("Healing"), nullptr, 1, 1, false, true, 17, IS_CAST8, { MIS_HEAL, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, + { SPL_LIGHTNING, 10, STYPE_LIGHTNING, N_("Lightning"), nullptr, 4, 3, true, false, 20, IS_CAST4, { MIS_LIGHTCTRL, MIS_NULL, MIS_NULL }, 1, 6, 20, 60, 3000, 150 }, + { SPL_FLASH, 30, STYPE_LIGHTNING, N_("Flash"), nullptr, 5, 4, false, false, 33, IS_CAST4, { MIS_FLASH, MIS_FLASH2, MIS_NULL }, 2, 16, 20, 40, 7500, 500 }, { SPL_IDENTIFY, 13, STYPE_MAGIC, N_("Identify"), N_("Identify"), -1, -1, false, true, 23, IS_CAST6, { MIS_IDENTIFY, MIS_NULL, MIS_NULL }, 2, 1, 8, 12, 0, 100 }, - { SPL_FIREWALL, 28, STYPE_FIRE, N_("Fire Wall"), nullptr, 3, 2, true, false, 27, IS_CAST2, { MIS_FIREWALLC, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, - { SPL_TOWN, 35, STYPE_MAGIC, N_("Town Portal"), nullptr, 3, 3, true, false, 20, IS_CAST6, { MIS_TOWN, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, - { SPL_STONE, 60, STYPE_MAGIC, N_("Stone Curse"), nullptr, 6, 5, true, false, 51, IS_CAST2, { MIS_STONE, MIS_NULL, MIS_NULL }, 3, 40, 8, 16, 12000, 800 }, - { SPL_INFRA, 40, STYPE_MAGIC, N_("Infravision"), nullptr, -1, -1, false, false, 36, IS_CAST8, { MIS_INFRA, MIS_NULL, MIS_NULL }, 5, 20, 0, 0, 0, 600 }, - { SPL_RNDTELEPORT, 12, STYPE_MAGIC, N_("Phasing"), nullptr, 7, 6, false, false, 39, IS_CAST2, { MIS_RNDTELEPORT, MIS_NULL, MIS_NULL }, 2, 4, 40, 80, 3500, 200 }, - { SPL_MANASHIELD, 33, STYPE_MAGIC, N_("Mana Shield"), nullptr, 6, 5, false, false, 25, IS_CAST2, { MIS_MANASHIELD, MIS_NULL, MIS_NULL }, 0, 33, 4, 10, 16000, 1200 }, - { SPL_FIREBALL, 16, STYPE_FIRE, N_("Fireball"), nullptr, 8, 7, true, false, 48, IS_CAST2, { MIS_FIREBALL, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_GUARDIAN, 50, STYPE_FIRE, N_("Guardian"), nullptr, 9, 8, true, false, 61, IS_CAST2, { MIS_GUARDIAN, MIS_NULL, MIS_NULL }, 2, 30, 16, 32, 14000, 950 }, - { SPL_CHAIN, 30, STYPE_LIGHTNING, N_("Chain Lightning"), nullptr, 8, 7, false, false, 54, IS_CAST2, { MIS_CHAIN, MIS_NULL, MIS_NULL }, 1, 18, 20, 60, 11000, 750 }, - { SPL_WAVE, 35, STYPE_FIRE, N_("Flame Wave"), nullptr, 9, 8, true, false, 54, IS_CAST2, { MIS_WAVE, MIS_NULL, MIS_NULL }, 3, 20, 20, 40, 10000, 650 }, - { SPL_DOOMSERP, 0, STYPE_LIGHTNING, N_("Doom Serpents"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_BLODRIT, 0, STYPE_MAGIC, N_("Blood Ritual"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_NOVA, 60, STYPE_MAGIC, N_("Nova"), nullptr, 14, 10, false, false, 87, IS_CAST4, { MIS_NOVA, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, - { SPL_INVISIBIL, 0, STYPE_MAGIC, N_("Invisibility"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_FLAME, 11, STYPE_FIRE, N_("Inferno"), nullptr, 3, 2, true, false, 20, IS_CAST2, { MIS_FLAMEC, MIS_NULL, MIS_NULL }, 1, 6, 20, 40, 2000, 100 }, - { SPL_GOLEM, 100, STYPE_FIRE, N_("Golem"), nullptr, 11, 9, false, false, 81, IS_CAST2, { MIS_GOLEM, MIS_NULL, MIS_NULL }, 6, 60, 16, 32, 18000, 1100 }, + { SPL_FIREWALL, 28, STYPE_FIRE, N_("Fire Wall"), nullptr, 3, 2, true, false, 27, IS_CAST2, { MIS_FIREWALLC, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_TOWN, 35, STYPE_MAGIC, N_("Town Portal"), nullptr, 3, 3, true, false, 20, IS_CAST6, { MIS_TOWN, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, + { SPL_STONE, 60, STYPE_MAGIC, N_("Stone Curse"), nullptr, 6, 5, true, false, 51, IS_CAST2, { MIS_STONE, MIS_NULL, MIS_NULL }, 3, 40, 8, 16, 12000, 800 }, + { SPL_INFRA, 40, STYPE_MAGIC, N_("Infravision"), nullptr, -1, -1, false, false, 36, IS_CAST8, { MIS_INFRA, MIS_NULL, MIS_NULL }, 5, 20, 0, 0, 0, 600 }, + { SPL_RNDTELEPORT, 12, STYPE_MAGIC, N_("Phasing"), nullptr, 7, 6, false, false, 39, IS_CAST2, { MIS_RNDTELEPORT, MIS_NULL, MIS_NULL }, 2, 4, 40, 80, 3500, 200 }, + { SPL_MANASHIELD, 33, STYPE_MAGIC, N_("Mana Shield"), nullptr, 6, 5, false, false, 25, IS_CAST2, { MIS_MANASHIELD, MIS_NULL, MIS_NULL }, 0, 33, 4, 10, 16000, 1200 }, + { SPL_FIREBALL, 16, STYPE_FIRE, N_("Fireball"), nullptr, 8, 7, true, false, 48, IS_CAST2, { MIS_FIREBALL, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_GUARDIAN, 50, STYPE_FIRE, N_("Guardian"), nullptr, 9, 8, true, false, 61, IS_CAST2, { MIS_GUARDIAN, MIS_NULL, MIS_NULL }, 2, 30, 16, 32, 14000, 950 }, + { SPL_CHAIN, 30, STYPE_LIGHTNING, N_("Chain Lightning"), nullptr, 8, 7, false, false, 54, IS_CAST2, { MIS_CHAIN, MIS_NULL, MIS_NULL }, 1, 18, 20, 60, 11000, 750 }, + { SPL_WAVE, 35, STYPE_FIRE, N_("Flame Wave"), nullptr, 9, 8, true, false, 54, IS_CAST2, { MIS_WAVE, MIS_NULL, MIS_NULL }, 3, 20, 20, 40, 10000, 650 }, + { SPL_DOOMSERP, 0, STYPE_LIGHTNING, N_("Doom Serpents"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_BLODRIT, 0, STYPE_MAGIC, N_("Blood Ritual"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_NOVA, 60, STYPE_MAGIC, N_("Nova"), nullptr, 14, 10, false, false, 87, IS_CAST4, { MIS_NOVA, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, + { SPL_INVISIBIL, 0, STYPE_MAGIC, N_("Invisibility"), nullptr, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_FLAME, 11, STYPE_FIRE, N_("Inferno"), nullptr, 3, 2, true, false, 20, IS_CAST2, { MIS_FLAMEC, MIS_NULL, MIS_NULL }, 1, 6, 20, 40, 2000, 100 }, + { SPL_GOLEM, 100, STYPE_FIRE, N_("Golem"), nullptr, 11, 9, false, false, 81, IS_CAST2, { MIS_GOLEM, MIS_NULL, MIS_NULL }, 6, 60, 16, 32, 18000, 1100 }, { SPL_BLODBOIL, 15, STYPE_MAGIC, N_("Rage"), N_("Rage"), -1, -1, false, false, 0, IS_CAST8, { MIS_BLODBOIL, MIS_NULL, MIS_NULL }, 1, 1, 0, 0, 0, 0 }, - { SPL_TELEPORT, 35, STYPE_MAGIC, N_("Teleport"), nullptr, 14, 12, true, false, 105, IS_CAST6, { MIS_TELEPORT, MIS_NULL, MIS_NULL }, 3, 15, 16, 32, 20000, 1250 }, - { SPL_APOCA, 150, STYPE_FIRE, N_("Apocalypse"), nullptr, 19, 15, false, false, 149, IS_CAST2, { MIS_APOCA, MIS_NULL, MIS_NULL }, 6, 90, 8, 12, 30000, 2000 }, - { SPL_ETHEREALIZE, 100, STYPE_MAGIC, N_("Etherealize"), nullptr, -1, -1, false, false, 93, IS_CAST2, { MIS_ETHEREALIZE, MIS_NULL, MIS_NULL }, 0, 100, 2, 6, 26000, 1600 }, + { SPL_TELEPORT, 35, STYPE_MAGIC, N_("Teleport"), nullptr, 14, 12, true, false, 105, IS_CAST6, { MIS_TELEPORT, MIS_NULL, MIS_NULL }, 3, 15, 16, 32, 20000, 1250 }, + { SPL_APOCA, 150, STYPE_FIRE, N_("Apocalypse"), nullptr, 19, 15, false, false, 149, IS_CAST2, { MIS_APOCA, MIS_NULL, MIS_NULL }, 6, 90, 8, 12, 30000, 2000 }, + { SPL_ETHEREALIZE, 100, STYPE_MAGIC, N_("Etherealize"), nullptr, -1, -1, false, false, 93, IS_CAST2, { MIS_ETHEREALIZE, MIS_NULL, MIS_NULL }, 0, 100, 2, 6, 26000, 1600 }, { SPL_REPAIR, 0, STYPE_MAGIC, N_("Item Repair"), N_("Item Repair"), -1, -1, false, true, -1, IS_CAST6, { MIS_REPAIR, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, { SPL_RECHARGE, 0, STYPE_MAGIC, N_("Staff Recharge"), N_("Staff Recharge"), -1, -1, false, true, -1, IS_CAST6, { MIS_RECHARGE, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, { SPL_DISARM, 0, STYPE_MAGIC, N_("Trap Disarm"), N_("Trap Disarm"), -1, -1, false, false, -1, IS_CAST6, { MIS_DISARM, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_ELEMENT, 35, STYPE_FIRE, N_("Elemental"), nullptr, 8, 6, false, false, 68, IS_CAST2, { MIS_ELEMENT, MIS_NULL, MIS_NULL }, 2, 20, 20, 60, 10500, 700 }, - { SPL_CBOLT, 6, STYPE_LIGHTNING, N_("Charged Bolt"), nullptr, 1, 1, true, false, 25, IS_CAST2, { MIS_CBOLT, MIS_NULL, MIS_NULL }, 1, 6, 40, 80, 1000, 50 }, - { SPL_HBOLT, 7, STYPE_MAGIC, N_("Holy Bolt"), nullptr, 1, 1, true, false, 20, IS_CAST2, { MIS_HBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, - { SPL_RESURRECT, 20, STYPE_MAGIC, N_("Resurrect"), nullptr, -1, 5, false, true, 30, IS_CAST8, { MIS_RESURRECT, MIS_NULL, MIS_NULL }, 0, 20, 4, 10, 4000, 250 }, - { SPL_TELEKINESIS, 15, STYPE_MAGIC, N_("Telekinesis"), nullptr, 2, 2, false, false, 33, IS_CAST2, { MIS_TELEKINESIS, MIS_NULL, MIS_NULL }, 2, 8, 20, 40, 2500, 200 }, - { SPL_HEALOTHER, 5, STYPE_MAGIC, N_("Heal Other"), nullptr, 1, 1, false, true, 17, IS_CAST8, { MIS_HEALOTHER, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, - { SPL_FLARE, 25, STYPE_MAGIC, N_("Blood Star"), nullptr, 14, 13, false, false, 70, IS_CAST2, { MIS_FLARE, MIS_NULL, MIS_NULL }, 2, 14, 20, 60, 27500, 1800 }, - { SPL_BONESPIRIT, 24, STYPE_MAGIC, N_("Bone Spirit"), nullptr, 9, 7, false, false, 34, IS_CAST2, { MIS_BONESPIRIT, MIS_NULL, MIS_NULL }, 1, 12, 20, 60, 11500, 800 }, - { SPL_MANA, 255, STYPE_MAGIC, N_("Mana"), nullptr, -1, 5, false, true, 17, IS_CAST8, { MIS_MANA, MIS_NULL, MIS_NULL }, 3, 1, 12, 24, 1000, 50 }, - { SPL_MAGI, 255, STYPE_MAGIC, N_("the Magi"), nullptr, -1, 20, false, true, 45, IS_CAST8, { MIS_MAGI, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, - { SPL_JESTER, 255, STYPE_MAGIC, N_("the Jester"), nullptr, -1, 4, true, false, 30, IS_CAST8, { MIS_JESTER, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, - { SPL_LIGHTWALL, 28, STYPE_LIGHTNING, N_("Lightning Wall"), nullptr, 3, 2, true, false, 27, IS_CAST4, { MIS_LIGHTNINGWALL, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, - { SPL_IMMOLAT, 60, STYPE_FIRE, N_("Immolation"), nullptr, 14, 10, false, false, 87, IS_CAST2, { MIS_IMMOLATION, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, - { SPL_WARP, 35, STYPE_MAGIC, N_("Warp"), nullptr, 3, 3, false, false, 25, IS_CAST6, { MIS_WARP, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, - { SPL_REFLECT, 35, STYPE_MAGIC, N_("Reflect"), nullptr, 3, 3, false, false, 25, IS_CAST6, { MIS_REFLECT, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, - { SPL_BERSERK, 35, STYPE_MAGIC, N_("Berserk"), nullptr, 3, 3, true, false, 35, IS_CAST6, { MIS_BERSERK, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, - { SPL_FIRERING, 28, STYPE_FIRE, N_("Ring of Fire"), nullptr, 5, 5, false, false, 27, IS_CAST2, { MIS_FIRERING, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_ELEMENT, 35, STYPE_FIRE, N_("Elemental"), nullptr, 8, 6, false, false, 68, IS_CAST2, { MIS_ELEMENT, MIS_NULL, MIS_NULL }, 2, 20, 20, 60, 10500, 700 }, + { SPL_CBOLT, 6, STYPE_LIGHTNING, N_("Charged Bolt"), nullptr, 1, 1, true, false, 25, IS_CAST2, { MIS_CBOLT, MIS_NULL, MIS_NULL }, 1, 6, 40, 80, 1000, 50 }, + { SPL_HBOLT, 7, STYPE_MAGIC, N_("Holy Bolt"), nullptr, 1, 1, true, false, 20, IS_CAST2, { MIS_HBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, + { SPL_RESURRECT, 20, STYPE_MAGIC, N_("Resurrect"), nullptr, -1, 5, false, true, 30, IS_CAST8, { MIS_RESURRECT, MIS_NULL, MIS_NULL }, 0, 20, 4, 10, 4000, 250 }, + { SPL_TELEKINESIS, 15, STYPE_MAGIC, N_("Telekinesis"), nullptr, 2, 2, false, false, 33, IS_CAST2, { MIS_TELEKINESIS, MIS_NULL, MIS_NULL }, 2, 8, 20, 40, 2500, 200 }, + { SPL_HEALOTHER, 5, STYPE_MAGIC, N_("Heal Other"), nullptr, 1, 1, false, true, 17, IS_CAST8, { MIS_HEALOTHER, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, + { SPL_FLARE, 25, STYPE_MAGIC, N_("Blood Star"), nullptr, 14, 13, false, false, 70, IS_CAST2, { MIS_FLARE, MIS_NULL, MIS_NULL }, 2, 14, 20, 60, 27500, 1800 }, + { SPL_BONESPIRIT, 24, STYPE_MAGIC, N_("Bone Spirit"), nullptr, 9, 7, false, false, 34, IS_CAST2, { MIS_BONESPIRIT, MIS_NULL, MIS_NULL }, 1, 12, 20, 60, 11500, 800 }, + { SPL_MANA, 255, STYPE_MAGIC, N_("Mana"), nullptr, -1, 5, false, true, 17, IS_CAST8, { MIS_MANA, MIS_NULL, MIS_NULL }, 3, 1, 12, 24, 1000, 50 }, + { SPL_MAGI, 255, STYPE_MAGIC, N_("the Magi"), nullptr, -1, 20, false, true, 45, IS_CAST8, { MIS_MAGI, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, + { SPL_JESTER, 255, STYPE_MAGIC, N_("the Jester"), nullptr, -1, 4, true, false, 30, IS_CAST8, { MIS_JESTER, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, + { SPL_LIGHTWALL, 28, STYPE_LIGHTNING, N_("Lightning Wall"), nullptr, 3, 2, true, false, 27, IS_CAST4, { MIS_LIGHTNINGWALL, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_IMMOLAT, 60, STYPE_FIRE, N_("Immolation"), nullptr, 14, 10, false, false, 87, IS_CAST2, { MIS_IMMOLATION, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, + { SPL_WARP, 35, STYPE_MAGIC, N_("Warp"), nullptr, 3, 3, false, false, 25, IS_CAST6, { MIS_WARP, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, + { SPL_REFLECT, 35, STYPE_MAGIC, N_("Reflect"), nullptr, 3, 3, false, false, 25, IS_CAST6, { MIS_REFLECT, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, + { SPL_BERSERK, 35, STYPE_MAGIC, N_("Berserk"), nullptr, 3, 3, true, false, 35, IS_CAST6, { MIS_BERSERK, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, + { SPL_FIRERING, 28, STYPE_FIRE, N_("Ring of Fire"), nullptr, 5, 5, false, false, 27, IS_CAST2, { MIS_FIRERING, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, { SPL_SEARCH, 15, STYPE_MAGIC, N_("Search"), N_("Search"), 1, 3, false, false, 25, IS_CAST6, { MIS_SEARCH, MIS_NULL, MIS_NULL }, 1, 1, 8, 12, 3000, 200 }, - { SPL_RUNEFIRE, 255, STYPE_MAGIC, N_("Rune of Fire"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEFIRE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNELIGHT, 255, STYPE_MAGIC, N_("Rune of Light"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNELIGHT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNENOVA, 255, STYPE_MAGIC, N_("Rune of Nova"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNENOVA, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNEIMMOLAT, 255, STYPE_MAGIC, N_("Rune of Immolation"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEIMMOLAT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNESTONE, 255, STYPE_MAGIC, N_("Rune of Stone"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNESTONE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNEFIRE, 255, STYPE_MAGIC, N_("Rune of Fire"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEFIRE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNELIGHT, 255, STYPE_MAGIC, N_("Rune of Light"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNELIGHT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNENOVA, 255, STYPE_MAGIC, N_("Rune of Nova"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNENOVA, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNEIMMOLAT, 255, STYPE_MAGIC, N_("Rune of Immolation"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEIMMOLAT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNESTONE, 255, STYPE_MAGIC, N_("Rune of Stone"), nullptr, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNESTONE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, // clang-format on };