summaryrefslogtreecommitdiff
path: root/world/map/npc/functions
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/functions')
-rwxr-xr-xworld/map/npc/functions/debug.txt20
-rw-r--r--world/map/npc/functions/mob_points.txt2
2 files changed, 9 insertions, 13 deletions
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index f9989b74..83a41060 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -576,22 +576,17 @@ L_MagicExperience:
&& @nature == 0
&& @astral == 0)
goto L_NoMagicSkills;
- if (@general == 2
- || @life == 2
- || @war == 2
- || @trans == 2
- || @nature == 2
- || @astral == 2)
- goto L_ChangeMagicExperience;
+
+ goto L_ChangeMagicExperience;
L_NoMagicSkills:
mes "You can't have magic experience, since you have no magic skills yet.";
goto L_MagicSkills;
L_ChangeMagicExperience:
- mes "Set the desired magic experience (min: 100 - max: 8000).";
+ mes "Set the desired magic experience (min: 0 - max: 8000).";
input @value;
- if (@value < 100 || @value > 8000)
+ if (@value < 0 || @value > 8000)
goto L_WrongMagicExperience;
set @mexp, @value;
callsub S_Update_Mask;
@@ -606,7 +601,7 @@ L_ChangeMagicSkills:
menu
"General Magic.", L_ChangeGeneralMagicSkill,
"Life Magic.", L_ChangeLifeMagicSkill,
- "War Magic.", L_ChangeWarMagicskill,
+ "War Magic.", L_ChangeWarMagicSkill,
"Transmutation Magic.", L_ChangeTransmutationMagicSkill,
"Nature Magic.", L_ChangeNatureMagicSkill,
"Astral Magic.", L_ChangeAstralMagicSkill,
@@ -765,7 +760,7 @@ L_ChangeAstralMagicSkill1:
setskill SKILL_MAGIC_ASTRAL, 1;
mes "Astral Magic skill changed to level 1.";
next;
- goto L_Magic;
+ goto L_MagicSkills;
L_ChangeAstralMagicSkill2:
setskill SKILL_MAGIC_ASTRAL, 2;
@@ -774,7 +769,7 @@ L_ChangeAstralMagicSkill2:
callsub S_Update_Mask;
mes "Astral Magic skill changed to level 2.";
next;
- goto L_Magic;
+ goto L_MagicSkills;
S_Update_Mask:
set MAGIC_EXPERIENCE,
@@ -855,6 +850,7 @@ L_ResetAll:
setskill SKILL_MAGIC_NATURE, 0;
setskill SKILL_MAGIC_ASTRAL, 0;
set @mexp, 0;
+ callsub S_Update_Mask;
resetstatus;
set BaseLevel, 1;
mes "All skills removed.";
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index 081aeb65..2f89010e 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -116,7 +116,7 @@ function|script|MobPoints|{
// Scorpion, Red Scorpion, Black Scorpion, Angry Scorpion
if ((@mobID == 1003)
|| (@mobID == 1004)
- || (@mobID == 1008)
+ || (@mobID == 1009)
|| (@mobID == 1057))
goto L_good;