From 699f036ea1c48fd996fbc4050b1230c93c7d1d6e Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 14 Apr 2021 22:58:41 -0300 Subject: Remove definitely the legacy magic experience --- npc/commands/debug.txt | 78 +++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt index a2b25447..68f7c52c 100644 --- a/npc/commands/debug.txt +++ b/npc/commands/debug.txt @@ -3,9 +3,6 @@ function script Debug { goto L_Begin; L_Begin: - @debug_mask = 65535; - @debug_shift = 0; - @mexp = ((MAGIC_EXPERIENCE & @debug_mask) >> @debug_shift); mes "What do you want to do?"; mes "Your range: "+readbattleparam(getcharid(3), UDT_ATKRANGE); mes "Bow range: "+getiteminfo(Bow, ITEMINFO_RANGE); @@ -75,15 +72,7 @@ L_FocusSkills: @poison = getskilllv(SKILL_RESIST_POISON); @astralsoul = getskilllv(SKILL_ASTRAL_SOUL); @raging = getskilllv(SKILL_RAGING); - /* - menu - "Overview of my focus skills.", L_SeeFocusSkills, - "Focus or unfocus.", L_Unfocus, - "Add focus skills.", L_ChangeFocusSkills, - "Reset focus skills.", L_ResetFocusSkills, - "Back to the main menu.", L_Begin, - "Close.", L_close; - */ + mes "Your focusing skill level is " + @pool + "."; mes "Your mallard's eye skill level is " + @mallard + "."; mes "Your brawling skill level is " + @brawling + "."; @@ -175,8 +164,7 @@ L_MagicSkills: "Close.", L_close; L_MagicSkillsOverview: - mes "Your current legacy magic experience skill is " + @mexp + "."; - mes "Your current Evolved magic exp is "+MAGIC_EXP; + mes "Your current magic exp is "+MAGIC_EXP; mes "Your level in the general magic skill is " + @general + "."; mes "Your level in the life magic skill is " + @life + "."; mes "Your level in the war magic skill is " + @war + "."; @@ -188,7 +176,7 @@ L_MagicSkillsOverview: goto L_MagicSkills; L_MagicExperience: - mes "Your current magic experience is " + @mexp + "."; + mes "Your current magic experience is " + MAGIC_EXP + "."; if (@general == 0 && @life == 0 && @war == 0 @@ -205,13 +193,12 @@ L_NoMagicSkills: goto L_MagicSkills; L_ChangeMagicExperience: - mes "Set the desired legacy magic experience (min: 0 - max: 8000)."; + mes "Set the desired magic experience (min: 0 - max: 65535)."; input @value; - if (@value < 0 || @value > 8000) + if (@value < 0 || @value > 65535) goto L_WrongMagicExperience; - @mexp = @value; - callsub S_Update_Mask; - mes "You now have " + @mexp + " legacy magic experience points."; + MAGIC_EXP = @value; + mes "You now have " + MAGIC_EXP + " magic experience points."; goto L_MagicSkills; L_WrongMagicExperience: @@ -252,9 +239,8 @@ L_ChangeGeneralMagicSkill1: L_ChangeGeneralMagicSkill2: updateskill SKILL_MAGIC, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "General Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -281,9 +267,8 @@ L_ChangeLifeMagicSkill1: L_ChangeLifeMagicSkill2: updateskill SKILL_MAGIC_LIFE, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "Life Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -310,9 +295,8 @@ L_ChangeWarMagicSkill1: L_ChangeWarMagicSkill2: updateskill SKILL_MAGIC_WAR, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "War Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -339,9 +323,8 @@ L_ChangeTransmutationMagicSkill1: L_ChangeTransmutationMagicSkill2: updateskill SKILL_MAGIC_TRANSMUTE, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "Transmutation Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -368,9 +351,8 @@ L_ChangeNatureMagicSkill1: L_ChangeNatureMagicSkill2: updateskill SKILL_MAGIC_NATURE, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "Nature Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -397,9 +379,8 @@ L_ChangeAstralMagicSkill1: L_ChangeAstralMagicSkill2: updateskill SKILL_MAGIC_ASTRAL, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "Astral Magic skill changed to level 2."; next; goto L_MagicSkills; @@ -426,19 +407,12 @@ L_ChangeDarkMagicSkill1: L_ChangeDarkMagicSkill2: updateskill SKILL_MAGIC_DARK, 2; - if (@mexp < 100) - @mexp = 100; - callsub S_Update_Mask; + if (MAGIC_EXP < 100) + MAGIC_EXP = 100; mes "Dark Magic skill changed to level 2."; next; goto L_MagicSkills; -S_Update_Mask: - set MAGIC_EXPERIENCE, - (MAGIC_EXPERIENCE & ~(@debug_mask)) - | (@mexp << @debug_shift); - return; - L_GetAllMagic: updateskill SKILL_MAGIC, 5; updateskill SKILL_MAGIC_LIFE, 5; @@ -447,8 +421,6 @@ L_GetAllMagic: updateskill SKILL_MAGIC_NATURE, 5; updateskill SKILL_MAGIC_ASTRAL, 5; updateskill SKILL_MAGIC_DARK, 5; - @mexp = 8000; - callsub S_Update_Mask; mes "Magic skills added."; next; goto L_MagicSkills; @@ -461,8 +433,6 @@ L_ResetMagicSkills: updateskill SKILL_MAGIC_NATURE, 0; updateskill SKILL_MAGIC_ASTRAL, 0; updateskill SKILL_MAGIC_DARK, 0; - @mexp = 0; - callsub S_Update_Mask; mes "Magic skills removed."; next; goto L_MagicSkills; @@ -489,7 +459,6 @@ L_AddAll: updateskill EVOL_PHYSICAL_SHIELD, 9; updateskill SKILL_ABIZIT, 1; updateskill SKILL_FLAR, 9; - @mexp = 8000; resetstatus; BaseLevel = 99; mes "All skills added to their maximum level."; @@ -517,12 +486,11 @@ L_ResetAll: updateskill SKILL_MAGIC_NATURE, 0; updateskill SKILL_MAGIC_ASTRAL, 0; updateskill SKILL_MAGIC_DARK, 0; - @mexp = 0; - callsub S_Update_Mask; + MAGIC_EXP = 0; resetstatus; BaseLevel = 1; mes "All skills removed."; - mes "Minimum number of Legacy Magic Experience points."; + mes "Magic experience reset."; mes "You are now level " + BaseLevel + "."; next; goto L_Begin; -- cgit v1.2.3-70-g09d2