The meaning of addtoskill is different here; Make a wrapper

8 files changed, 104 insertions, 104 deletions

diff --git a/npc/002-1/elanore.txt b/npc/002-1/elanore.txt
index 3a546cd2..8a9a5da2 100644
--- a/npc/002-1/elanore.txt
+++ b/npc/002-1/elanore.txt
@@ -468,7 +468,7 @@ L_T_AdvTo3Ready:
     callsub S_Update_Var;
     getexp @xp, 0;
     if (getskilllv(SKILL_MAGIC_LIFE) < 3)
-        addtoskill SKILL_MAGIC_LIFE, 3;
+        updateskill SKILL_MAGIC_LIFE, 3;
     next;
 
     if (@Q_kadiya_status != @Q_STATUS_COMPLETED_ELANORE) goto L_Main;
diff --git a/npc/002-1/luca.txt b/npc/002-1/luca.txt
index 2350ded5..90762575 100644
--- a/npc/002-1/luca.txt
+++ b/npc/002-1/luca.txt
@@ -130,7 +130,7 @@ L_Teach0_follow:
     mes "He grins.";
     mes "[You gain 10,000 experience points]";
     mes "[You learned Skill Focus]";
-    addtoskill SKILL_POOL, 1;
+    updateskill SKILL_POOL, 1;
     getexp 10000, 0;
     next;
     goto L_Teachmore2;
diff --git a/npc/006-1/miriam.txt b/npc/006-1/miriam.txt
index 05e59d5e..58242451 100644
--- a/npc/006-1/miriam.txt
+++ b/npc/006-1/miriam.txt
@@ -304,7 +304,7 @@ L_Goodjob:
     QUEST_MIRIAM = 0;
     message strcharinfo(0), "[You gain 2500 experience points]";
     message strcharinfo(0), "[You learned Speed Skill]";
-    addtoskill SKILL_SPEED, 1;
+    updateskill SKILL_SPEED, 1;
     getexp 2500, 0;
     set QUEST_MIRIAM_cheat, 0; // reset just in case it is still set.
     close;
diff --git a/npc/009-2/nurse.txt b/npc/009-2/nurse.txt
index 0eefac54..d534f64d 100644
--- a/npc/009-2/nurse.txt
+++ b/npc/009-2/nurse.txt
@@ -414,7 +414,7 @@ L_AllCorrect:
     mes "\"You should talk to someone who can help you to focus on your skills.\"";
     next;
     getexp @ANTIDOTE_EXP, 0;
-    addtoskill SKILL_RESIST_POISON, 1;
+    updateskill SKILL_RESIST_POISON, 1;
     @Q_poison = 7;
     callsub S_Update_Var;
     goto L_close;
diff --git a/npc/016-1/gwendolyn.txt b/npc/016-1/gwendolyn.txt
index 87ad8031..ae2da9d7 100644
--- a/npc/016-1/gwendolyn.txt
+++ b/npc/016-1/gwendolyn.txt
@@ -419,7 +419,7 @@ L_target_hit:
     .@Q_hawkseye = 6;
     callsub S_Update_Var;
 
-    addtoskill SKILL_MALLARDS_EYE, 1;
+    updateskill SKILL_MALLARDS_EYE, 1;
     getexp .QUEST_HAWK_EXP, 0;
 
     mes "\"You proved that you are worthy to call yourself a graduate of the School of Archery.\"";
diff --git a/npc/033-1/birrod.txt b/npc/033-1/birrod.txt
index c23f8b83..38e624a4 100644
--- a/npc/033-1/birrod.txt
+++ b/npc/033-1/birrod.txt
@@ -212,7 +212,7 @@ L_Success52:
 
 L_Success5:
     getexp @minigame_exp, 0;
-    addtoskill SKILL_RAGING, 1;
+    updateskill SKILL_RAGING, 1;
     @state = 6;
     callsub S_Update_Mask;
     mes "You feel an exciting energy inside you.";
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index ad56d904..4c2d8196 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -102,21 +102,21 @@ L_FocusSkills:
     case -1:
         skill SKILL_POOL, max(0, @pool-1), 0; break;
     case 0:
-        addtoskill SKILL_MALLARDS_EYE, 9;
-        addtoskill SKILL_BRAWLING, 9;
-        addtoskill SKILL_SPEED, 9;
-        addtoskill SKILL_RESIST_POISON, 9;
-        addtoskill SKILL_ASTRAL_SOUL, 9;
-        addtoskill SKILL_RAGING, 9;
+        updateskill SKILL_MALLARDS_EYE, 9;
+        updateskill SKILL_BRAWLING, 9;
+        updateskill SKILL_SPEED, 9;
+        updateskill SKILL_RESIST_POISON, 9;
+        updateskill SKILL_ASTRAL_SOUL, 9;
+        updateskill SKILL_RAGING, 9;
         break;
     case -4:
         skill SKILL_POOL, 0, 0; break;
-        addtoskill SKILL_MALLARDS_EYE, 0;
-        addtoskill SKILL_BRAWLING, 0;
-        addtoskill SKILL_SPEED, 0;
-        addtoskill SKILL_RESIST_POISON, 0;
-        addtoskill SKILL_ASTRAL_SOUL, 0;
-        addtoskill SKILL_RAGING, 0;
+        updateskill SKILL_MALLARDS_EYE, 0;
+        updateskill SKILL_BRAWLING, 0;
+        updateskill SKILL_SPEED, 0;
+        updateskill SKILL_RESIST_POISON, 0;
+        updateskill SKILL_ASTRAL_SOUL, 0;
+        updateskill SKILL_RAGING, 0;
         break;
     default:
         if (FOCUSING & getpoolskillFID(@menuret)) {
@@ -163,7 +163,7 @@ L_Unfocus:
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
     if (getskilllv(SKILL_POOL) == 0)
-        addtoskill SKILL_POOL, 1;
+        updateskill SKILL_POOL, 1;
     getactivatedpoolskilllist;
     if (@skilllist_count == 0)
         goto L_Focus;
@@ -235,7 +235,7 @@ L_ChangeFocusingSkill:
     input @lvl;
     if (@lvl > 1)
         goto L_BadSkillLevel;
-    addtoskill SKILL_POOL, @lvl;
+    updateskill SKILL_POOL, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -244,7 +244,7 @@ L_ChangeMallardsEyeSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_MALLARDS_EYE, @lvl;
+    updateskill SKILL_MALLARDS_EYE, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -253,7 +253,7 @@ L_ChangeBrawlingSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_BRAWLING, @lvl;
+    updateskill SKILL_BRAWLING, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -262,7 +262,7 @@ L_ChangeSpeedSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_SPEED, @lvl;
+    updateskill SKILL_SPEED, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -271,7 +271,7 @@ L_ChangeResistPoisonSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_RESIST_POISON, @lvl;
+    updateskill SKILL_RESIST_POISON, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -280,7 +280,7 @@ L_ChangeAstralSoulSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_ASTRAL_SOUL, @lvl;
+    updateskill SKILL_ASTRAL_SOUL, @lvl;
     next;
     goto L_FocusSkills;
 
@@ -289,30 +289,30 @@ L_ChangeRagingSkill:
     input @lvl;
     if (@lvl > 9)
         goto L_BadSkillLevel;
-    addtoskill SKILL_RAGING, @lvl;
+    updateskill SKILL_RAGING, @lvl;
     next;
     goto L_FocusSkills;
 
 L_AllFocusSkills:
-    addtoskill SKILL_POOL, 1;
-    addtoskill SKILL_MALLARDS_EYE, 9;
-    addtoskill SKILL_BRAWLING, 9;
-    addtoskill SKILL_SPEED, 9;
-    addtoskill SKILL_RESIST_POISON, 9;
-    addtoskill SKILL_ASTRAL_SOUL, 9;
-    addtoskill SKILL_RAGING, 9;
+    updateskill SKILL_POOL, 1;
+    updateskill SKILL_MALLARDS_EYE, 9;
+    updateskill SKILL_BRAWLING, 9;
+    updateskill SKILL_SPEED, 9;
+    updateskill SKILL_RESIST_POISON, 9;
+    updateskill SKILL_ASTRAL_SOUL, 9;
+    updateskill SKILL_RAGING, 9;
     mes "Focus skills added.";
     next;
     goto L_FocusSkills;
 
 L_ResetFocusSkills:
-    addtoskill SKILL_POOL, 0;
-    addtoskill SKILL_MALLARDS_EYE, 0;
-    addtoskill SKILL_BRAWLING, 0;
-    addtoskill SKILL_SPEED, 0;
-    addtoskill SKILL_RESIST_POISON, 0;
-    addtoskill SKILL_ASTRAL_SOUL, 0;
-    addtoskill SKILL_RAGING, 0;
+    updateskill SKILL_POOL, 0;
+    updateskill SKILL_MALLARDS_EYE, 0;
+    updateskill SKILL_BRAWLING, 0;
+    updateskill SKILL_SPEED, 0;
+    updateskill SKILL_RESIST_POISON, 0;
+    updateskill SKILL_ASTRAL_SOUL, 0;
+    updateskill SKILL_RAGING, 0;
     mes "Focus skills removed.";
     next;
     goto L_FocusSkills;
@@ -399,19 +399,19 @@ L_ChangeGeneralMagicSkill:
 
 L_Next4:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC, 0;
+        updateskill SKILL_MAGIC, 0;
     mes "General Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeGeneralMagicSkill1:
-    addtoskill SKILL_MAGIC, 1;
+    updateskill SKILL_MAGIC, 1;
     mes "General Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeGeneralMagicSkill2:
-    addtoskill SKILL_MAGIC, 2;
+    updateskill SKILL_MAGIC, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -428,19 +428,19 @@ L_ChangeLifeMagicSkill:
 
 L_Next5:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_LIFE, 0;
+        updateskill SKILL_MAGIC_LIFE, 0;
     mes "Life Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeLifeMagicSkill1:
-    addtoskill SKILL_MAGIC_LIFE, 1;
+    updateskill SKILL_MAGIC_LIFE, 1;
     mes "Life Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeLifeMagicSkill2:
-    addtoskill SKILL_MAGIC_LIFE, 2;
+    updateskill SKILL_MAGIC_LIFE, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -457,19 +457,19 @@ L_ChangeWarMagicSkill:
 
 L_Next6:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_WAR, 0;
+        updateskill SKILL_MAGIC_WAR, 0;
     mes "War Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeWarMagicSkill1:
-    addtoskill SKILL_MAGIC_WAR, 1;
+    updateskill SKILL_MAGIC_WAR, 1;
     mes "War Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeWarMagicSkill2:
-    addtoskill SKILL_MAGIC_WAR, 2;
+    updateskill SKILL_MAGIC_WAR, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -486,19 +486,19 @@ L_ChangeTransmutationMagicSkill:
 
 L_Next7:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_TRANSMUTE, 0;
+        updateskill SKILL_MAGIC_TRANSMUTE, 0;
     mes "Transmutation Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeTransmutationMagicSkill1:
-    addtoskill SKILL_MAGIC_TRANSMUTE, 1;
+    updateskill SKILL_MAGIC_TRANSMUTE, 1;
     mes "Transmutation Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeTransmutationMagicSkill2:
-    addtoskill SKILL_MAGIC_TRANSMUTE, 2;
+    updateskill SKILL_MAGIC_TRANSMUTE, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -515,19 +515,19 @@ L_ChangeNatureMagicSkill:
 
 L_Next8:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_NATURE, 0;
+        updateskill SKILL_MAGIC_NATURE, 0;
     mes "Nature Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeNatureMagicSkill1:
-    addtoskill SKILL_MAGIC_NATURE, 1;
+    updateskill SKILL_MAGIC_NATURE, 1;
     mes "Nature Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeNatureMagicSkill2:
-    addtoskill SKILL_MAGIC_NATURE, 2;
+    updateskill SKILL_MAGIC_NATURE, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -544,19 +544,19 @@ L_ChangeAstralMagicSkill:
 
 L_Next9:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_ASTAL, 0;
+        updateskill SKILL_MAGIC_ASTAL, 0;
     mes "Astral Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeAstralMagicSkill1:
-    addtoskill SKILL_MAGIC_ASTRAL, 1;
+    updateskill SKILL_MAGIC_ASTRAL, 1;
     mes "Astral Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeAstralMagicSkill2:
-    addtoskill SKILL_MAGIC_ASTRAL, 2;
+    updateskill SKILL_MAGIC_ASTRAL, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -573,19 +573,19 @@ L_ChangeDarkMagicSkill:
 
 L_Next10:
     if (@menu == 1)
-        addtoskill SKILL_MAGIC_DARK, 0;
+        updateskill SKILL_MAGIC_DARK, 0;
     mes "Dark Magic skill changed to level 0.";
     next;
     goto L_MagicSkills;
 
 L_ChangeDarkMagicSkill1:
-    addtoskill SKILL_MAGIC_DARK, 1;
+    updateskill SKILL_MAGIC_DARK, 1;
     mes "Dark Magic skill changed to level 1.";
     next;
     goto L_MagicSkills;
 
 L_ChangeDarkMagicSkill2:
-    addtoskill SKILL_MAGIC_DARK, 2;
+    updateskill SKILL_MAGIC_DARK, 2;
     if (@mexp < 100)
         @mexp = 100;
     callsub S_Update_Mask;
@@ -600,13 +600,13 @@ S_Update_Mask:
     return;
 
 L_GetAllMagic:
-    addtoskill SKILL_MAGIC, 5;
-    addtoskill SKILL_MAGIC_LIFE, 5;
-    addtoskill SKILL_MAGIC_WAR, 5;
-    addtoskill SKILL_MAGIC_TRANSMUTE, 5;
-    addtoskill SKILL_MAGIC_NATURE, 5;
-    addtoskill SKILL_MAGIC_ASTRAL, 5;
-    addtoskill SKILL_MAGIC_DARK, 5;
+    updateskill SKILL_MAGIC, 5;
+    updateskill SKILL_MAGIC_LIFE, 5;
+    updateskill SKILL_MAGIC_WAR, 5;
+    updateskill SKILL_MAGIC_TRANSMUTE, 5;
+    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.";
@@ -614,13 +614,13 @@ L_GetAllMagic:
     goto L_MagicSkills;
 
 L_ResetMagicSkills:
-    addtoskill SKILL_MAGIC, 0;
-    addtoskill SKILL_MAGIC_LIFE, 0;
-    addtoskill SKILL_MAGIC_WAR, 0;
-    addtoskill SKILL_MAGIC_TRANSMUTE, 0;
-    addtoskill SKILL_MAGIC_NATURE, 0;
-    addtoskill SKILL_MAGIC_ASTRAL, 0;
-    addtoskill SKILL_MAGIC_DARK, 0;
+    updateskill SKILL_MAGIC, 0;
+    updateskill SKILL_MAGIC_LIFE, 0;
+    updateskill SKILL_MAGIC_WAR, 0;
+    updateskill SKILL_MAGIC_TRANSMUTE, 0;
+    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.";
@@ -629,20 +629,20 @@ L_ResetMagicSkills:
 
 L_AddAll:
     adddefaultskills();
-    addtoskill SKILL_POOL, 1;
-    addtoskill SKILL_MALLARDS_EYE, 9;
-    addtoskill SKILL_BRAWLING, 9;
-    addtoskill SKILL_SPEED, 9;
-    addtoskill SKILL_RESIST_POISON, 9;
-    addtoskill SKILL_ASTRAL_SOUL, 9;
-    addtoskill SKILL_RAGING, 9;
-    addtoskill SKILL_MAGIC, 5;
-    addtoskill SKILL_MAGIC_LIFE, 5;
-    addtoskill SKILL_MAGIC_WAR, 5;
-    addtoskill SKILL_MAGIC_TRANSMUTE, 5;
-    addtoskill SKILL_MAGIC_NATURE, 5;
-    addtoskill SKILL_MAGIC_ASTRAL, 5;
-    addtoskill SKILL_MAGIC_DARK, 5;
+    updateskill SKILL_POOL, 1;
+    updateskill SKILL_MALLARDS_EYE, 9;
+    updateskill SKILL_BRAWLING, 9;
+    updateskill SKILL_SPEED, 9;
+    updateskill SKILL_RESIST_POISON, 9;
+    updateskill SKILL_ASTRAL_SOUL, 9;
+    updateskill SKILL_RAGING, 9;
+    updateskill SKILL_MAGIC, 5;
+    updateskill SKILL_MAGIC_LIFE, 5;
+    updateskill SKILL_MAGIC_WAR, 5;
+    updateskill SKILL_MAGIC_TRANSMUTE, 5;
+    updateskill SKILL_MAGIC_NATURE, 5;
+    updateskill SKILL_MAGIC_ASTRAL, 5;
+    updateskill SKILL_MAGIC_DARK, 5;
     @mexp = 8000;
     resetstatus;
     BaseLevel = 99;
@@ -657,20 +657,20 @@ L_ResetAll:
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
     //adddefaultskills();
-    addtoskill SKILL_POOL, 0;
-    addtoskill SKILL_MALLARDS_EYE, 0;
-    addtoskill SKILL_BRAWLING, 0;
-    addtoskill SKILL_SPEED, 0;
-    addtoskill SKILL_RESIST_POISON, 0;
-    addtoskill SKILL_ASTRAL_SOUL, 0;
-    addtoskill SKILL_RAGING, 0;
-    addtoskill SKILL_MAGIC, 0;
-    addtoskill SKILL_MAGIC_LIFE, 0;
-    addtoskill SKILL_MAGIC_WAR, 0;
-    addtoskill SKILL_MAGIC_TRANSMUTE, 0;
-    addtoskill SKILL_MAGIC_NATURE, 0;
-    addtoskill SKILL_MAGIC_ASTRAL, 0;
-    addtoskill SKILL_MAGIC_DARK, 0;
+    updateskill SKILL_POOL, 0;
+    updateskill SKILL_MALLARDS_EYE, 0;
+    updateskill SKILL_BRAWLING, 0;
+    updateskill SKILL_SPEED, 0;
+    updateskill SKILL_RESIST_POISON, 0;
+    updateskill SKILL_ASTRAL_SOUL, 0;
+    updateskill SKILL_RAGING, 0;
+    updateskill SKILL_MAGIC, 0;
+    updateskill SKILL_MAGIC_LIFE, 0;
+    updateskill SKILL_MAGIC_WAR, 0;
+    updateskill SKILL_MAGIC_TRANSMUTE, 0;
+    updateskill SKILL_MAGIC_NATURE, 0;
+    updateskill SKILL_MAGIC_ASTRAL, 0;
+    updateskill SKILL_MAGIC_DARK, 0;
     @mexp = 0;
     callsub S_Update_Mask;
     resetstatus;
diff --git a/npc/functions/magic.txt b/npc/functions/magic.txt
index 10f6638d..e0962a15 100644
--- a/npc/functions/magic.txt
+++ b/npc/functions/magic.txt
@@ -146,7 +146,7 @@ function	script	SkillUp	{
         goto L_Shortcut;
 
     misceffect sfx_skillup, strcharinfo(0);
-    addtoskill @SUP_id, @SUP_lvl;
+    updateskill @SUP_id, @SUP_lvl;
     getexp @SUP_xp, 0;
     if (@SUP_xp)
         mes "[" + @SUP_xp + " experience points]";