summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-3/malindou.txt1
-rw-r--r--npc/config/magic.txt2
-rw-r--r--npc/functions/util.txt31
-rw-r--r--npc/items/books.txt19
4 files changed, 1 insertions, 52 deletions
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 7f452be41..83a60e2d8 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -568,6 +568,7 @@ OnInit:
// Magic v3
$REBIRTH_WINNER$="Crazyfefe";
+ DelChrRegFromEveryPlayer("MAGIC_SUBCLASS");
/*
ReplaceSkillFromEveryPlayer(MG_FIREBALL, TMW2_FIREARROW); // 1 MSP
diff --git a/npc/config/magic.txt b/npc/config/magic.txt
index da1484ef3..8b7cf25bc 100644
--- a/npc/config/magic.txt
+++ b/npc/config/magic.txt
@@ -12,8 +12,6 @@
// Last Mana Skill used
// MAGIC_LVL
// Maximum tier of usable magic, capped by Mana Stone
-// MAGIC_SUBCLASS
-// Bitmasked magic subclass.
// AdjustSpellpower(power=100, {target=@skillTarget{, type=HARM_MAGI}})
function script AdjustSpellpower {
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 9ac8d1fc5..9b5d63d02 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -664,37 +664,6 @@ function script mstone {
readparam(Sp) == readparam(MaxSp));
}
-/*
-// Gets how many subclasses were actually filled
-// total_subclass( )
-function script total_subclass {
- .@i=0;
- if (MAGIC_SUBCLASS & CL_PALADIN)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_TANKER)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_BERSERKER)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_RANGER)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_SNIPER)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_WIZARD)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_SAGE)
- .@i+=1;
- if (MAGIC_SUBCLASS & CL_PRIEST)
- .@i+=1;
- return .@i;
-}
-
-// Gets how many subclasses were actually allowed
-// max_subclass()
-function script max_subclass {
- return (MAGIC_LVL/2);
-}
-*/
-
// MAGIC_PTS → Amount of used Magic Skill Points
// sk_maxpoints() → Max Magic Skill Points you may use
// Returns how many points you can use
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 84bbc6232..83a887993 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -205,25 +205,6 @@ OnInit:
next;
break;
case 3:
- /*
- mesc l("You currently have @@/@@ subclass(es).", total_subclass(),max_subclass());
- if (MAGIC_SUBCLASS & CL_PALADIN)
- mesc lg("Paladin");
- if (MAGIC_SUBCLASS & CL_TANKER)
- mesc lg("Tanker");
- if (MAGIC_SUBCLASS & CL_BERSERKER)
- mesc lg("Berserker");
- if (MAGIC_SUBCLASS & CL_RANGER)
- mesc lg("Ranger");
- if (MAGIC_SUBCLASS & CL_SNIPER)
- mesc lg("Sniper");
- if (MAGIC_SUBCLASS & CL_WIZARD)
- mesc lg("Wizard");
- if (MAGIC_SUBCLASS & CL_SAGE)
- mesc lg("Sage");
- if (MAGIC_SUBCLASS & CL_PRIEST)
- mesc lg("Priest");
- */
mesc l("You have @@/@@ magic skill points available.", b(sk_points()), sk_maxpoints());
next;
break;