Magic Ring reqs and Mana Pearl fix

- added 80 int as req to magic ring
- added min lvl 80 to ring like led suggested
- added a magic experience check to it with same magic experience needed as manapearl, should it have more, same or less? for more there would be no azibit message
- mana pearl stats changed without anyone doing something and equip script was gone so i re-added this and made stats i remember (how and why this sudden item changes happen? saw some others where this happened as well)
- changed internal name of Magic Ring from MageRing to MagicRing

13 files changed, 52 insertions, 18 deletions

diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index c5c19c0f..bdd40fde 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -76,7 +76,7 @@ AmethystRing 4013
 SimpleRing 4014
 HeartNecklace 677
 GuardianWings 5252
-MageRing 5253
+MagicRing 5253
 ManaPearl 5270
 AssassinRing 5268
 AssassinAmulet 5269
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index b9f1709c..61adb43f 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -1811,8 +1811,8 @@ item_db: (
 },
 {
 	Id: 5253
-	AegisName: "MageRing"
-	Name: "MageRing"
+	AegisName: "MagicRing"
+	Name: "MagicRing"
 	Type: "IT_ARMOR"
 	Buy: 0
 	Sell: 0
@@ -1820,9 +1820,14 @@ item_db: (
 	Def: 0
 	Slots: 0
 	Loc: "EQP_ACC_R"
+	EquipLv: 80
 	Refine: false
 	ViewSprite: 5253
+	OnEquipScript: <"
+		callfunc "RequireStat", bInt, 80, EQI_ACC_R;
+	">
 	Script: <"
+		callfunc "MagicRingItem", EQI_ACC_R;
 		bonus bInt, 1;
 	">
 },
@@ -1831,9 +1836,9 @@ item_db: (
 	AegisName: "ManaPearl"
 	Name: "Mana Pearl"
 	Type: "IT_ARMOR"
-	Buy: 1000
-	Sell: 1
-	Weight: 3
+	Buy: 0
+	Sell: 0
+	Weight: 0
 	Matk: 22
 	Def: 0
 	Slots: 0
@@ -1841,6 +1846,7 @@ item_db: (
 	Refine: false
 	ViewSprite: 5272
 	Script: <"
+		callfunc "ManaPearlItem", EQI_ARMOR;
 		bonus bInt, 1;
 		bonus bMatkRate, 22; // @EVOL2
 		bonus bMaxSP, 55;
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index 30d84c04..5d94dc8a 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -24,7 +24,7 @@
 4014,   SimpleRing,             5,      100000,     2500,       5,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      0,      {},                                                                     {}
 //ID,   Name,                   Type,   Price,      Sell,       Weight,     ATK,    DEF,    Range,  Mbonus, Slot,   Gender, Loc,        wLV,    eLV,    View,   Mode,   {UseScript},                                                            {EquipScript}
 5252,   GuardianWings,          5,      0,          0,          1,          0,      0,      0,      0,      0,      2,      16,         0,      0,      0,      0,      {},                                                                     {}
-5253,   MageRing,               5,      0,          0,          3,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      0,      {},                                                                     {bonus bInt, 1;}
+5253,   MagicRing,              5,      0,          0,          3,          0,      0,      0,      0,      0,      2,      128,        0,      80,     0,      0,      {},                                                                     {set @bStat, Int; set @minbStatVal, 80; callfunc "RequireStat"; callfunc "MagicRingItem"; bonus bInt, 1;}
 //5268, AssassinRing,           5,      1000,       1,          5,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      0,      {},                                                                     {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bCritical, 5; bonus bAspdRate, 5;}
 //5269, AssassinAmulet,         5,      1000,       1,          10,         0,      0,      0,      0,      0,      2,      16,         0,      0,      0,      0,      {},                                                                     {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bDoubleAddRate, 5; bonus bHit, 25;}
-5270,   ManaPearl,              5,      1000,       1,          3,          0,      0,      0,      22,     0,      2,      16,         0,      0,      0,      0,      {},                                                                     {bonus bInt, 1; bonus bMaxSP, 55; bonus bMdef, 22; bonus bSPrecovRate, 33;}
+5270,   ManaPearl,              5,      0,          0,          0,          0,      0,      0,      22,     0,      2,      16,         0,      0,      0,      0,      {},                                                                     {callfunc "ManaPearlItem"; bonus bInt, 1; bonus bMaxSP, 55; bonus bMdef, 22; bonus bSPrecovRate, 33;}
diff --git a/world/map/langs/lang_de.txt b/world/map/langs/lang_de.txt
index 91937e13..a3b956c0 100644
--- a/world/map/langs/lang_de.txt
+++ b/world/map/langs/lang_de.txt
@@ -4139,7 +4139,7 @@ Luvia?
 MTJarofOwnBlood
 
 
-MageRing
+MagicRing
 
 
 MagentaHint
diff --git a/world/map/langs/lang_en.txt b/world/map/langs/lang_en.txt
index c3723151..ff35ad75 100644
--- a/world/map/langs/lang_en.txt
+++ b/world/map/langs/lang_en.txt
@@ -4139,8 +4139,8 @@ Luvia?
 MTJarofOwnBlood
 MTJarofOwnBlood
 
-MageRing
-MageRing
+MagicRing
+MagicRing
 
 MagentaHint
 MagentaHint
diff --git a/world/map/langs/lang_es.txt b/world/map/langs/lang_es.txt
index 08bcedf5..69c077f0 100644
--- a/world/map/langs/lang_es.txt
+++ b/world/map/langs/lang_es.txt
@@ -4139,7 +4139,7 @@ Luvia?
 MTJarofOwnBlood
 
 
-MageRing
+MagicRing
 
 
 MagentaHint
diff --git a/world/map/langs/lang_fr.txt b/world/map/langs/lang_fr.txt
index 9b3702ea..b170eb34 100644
--- a/world/map/langs/lang_fr.txt
+++ b/world/map/langs/lang_fr.txt
@@ -4138,7 +4138,7 @@ Luvia?
 MTJarofOwnBlood
 
 
-MageRing
+MagicRing
 
 
 MagentaHint
diff --git a/world/map/langs/lang_pt_BR.txt b/world/map/langs/lang_pt_BR.txt
index e05f2e19..137d872c 100644
--- a/world/map/langs/lang_pt_BR.txt
+++ b/world/map/langs/lang_pt_BR.txt
@@ -4139,7 +4139,7 @@ Luvia?
 MTJarofOwnBlood
 
 
-MageRing
+MagicRing
 
 
 MagentaHint
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index 8eff2988..a872117c 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -144,9 +144,9 @@ L_GetEamuletConfirm:
         "Yes, I'm positive.", L_GetEamulet;
 
 L_GetEamulet:
-    if (countitem("MageRing") < 3) goto L_Missing;
+    if (countitem("MagicRing") < 3) goto L_Missing;
     if (countitem("Bloodstone") < 13) goto L_Missing;
-    delitem "MageRing", 3;
+    delitem "MagicRing", 3;
     delitem "Bloodstone", 13;
     getitem "EnchantersAmulet", 1;
     mes "[Trader]";
diff --git a/world/map/npc/099-7/boss.txt b/world/map/npc/099-7/boss.txt
index afbec8fe..cdda0b40 100644
--- a/world/map/npc/099-7/boss.txt
+++ b/world/map/npc/099-7/boss.txt
@@ -704,7 +704,7 @@ L_Amulet:
     close;
 
 L_Ring:
-    getitem "MageRing", 1;
+    getitem "MagicRing", 1;
     mes "[Chest]";
     mes "You opened it and found...! A Magic Ring! Lucky!";
     close;
diff --git a/world/map/npc/099-7/chronos.txt b/world/map/npc/099-7/chronos.txt
index 5150a34b..a2623aeb 100644
--- a/world/map/npc/099-7/chronos.txt
+++ b/world/map/npc/099-7/chronos.txt
@@ -293,7 +293,7 @@ OnInit:
                                    "Carbon Gas Mask", "Groovy Hat", "Jazzy Hat", "Anniversary Hat", "Chic Santa Hat", "Reading Glasses", "Eggshell Hat", "Smoking Pipe", "Scarab Armlet",
                                    "Mask of Blinking Evil (Green)", "Mask of Blinking Evil (Red)", "Mask of Blinking Evil (Blue)", "Mask of Blinking Evil (Pink)", "Mask of Blinking Evil (Yellow)", "Mask of Blinking Hocus", "Golden Platemail", "Earmuffs";
 
-    setarray $@chronos_3_medal$, "BlinkingEvilHalloween", "MoonshroomHat", "WhiteEvokersRobeBlue", "BlackEvokersRobeBlue", "ApprenticeRobe", "GoldenWarlordPlate", "MageRing";
+    setarray $@chronos_3_medal$, "BlinkingEvilHalloween", "MoonshroomHat", "WhiteEvokersRobeBlue", "BlackEvokersRobeBlue", "ApprenticeRobe", "GoldenWarlordPlate", "MagicRing";
     setarray $@chronos_3_medal_n$, "Mask of Blinking Evil (Orange)", "Moonshroom Hat", "White Evoker's Robe (Blue)", "Black Evoker's Robe (Blue)", "Apprentice Robe", "Golden Warlord Plate", "Magic Ring";
 
     setarray $@chronos_4_medal$, "OverlordsHelmet", "DarkTalisman", "Aureole", "PaladinsHelmet", "EnchantersAmulet", "DragonShield",
diff --git a/world/map/npc/items/magicring_item.txt b/world/map/npc/items/magicring_item.txt
new file mode 100644
index 00000000..2c2eb7aa
--- /dev/null
+++ b/world/map/npc/items/magicring_item.txt
@@ -0,0 +1,27 @@
+// Variables passed to this script:
+//  @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script.
+
+function|script|MagicRingItem
+{
+
+    set @debug_mask, 65535;
+    set @debug_shift, 0;
+    set @mexp, ((MAGIC_EXPERIENCE & @debug_mask) >> @debug_shift);
+
+    set @magicring_mexp_needed, 5404;
+
+    if ( @mexp >= @magicring_mexp_needed )
+        goto L_Return;
+
+    message strcharinfo(0), "You are not expirienced enough to use the Magic Ring.";
+
+    // This is for debug
+    if (debug)
+        goto L_Return;
+
+    callfunc "UnequipLater";
+    goto L_Return;
+
+L_Return:
+    return;
+}
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index b0a5f0c2..448e0947 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -59,6 +59,7 @@ npc: npc/items/drugs.txt
 npc: npc/items/max_stat.txt
 npc: npc/items/nobow_item.txt
 npc: npc/items/love_potion.txt
+npc: npc/items/magicring_item.txt
 npc: npc/items/manapearl_item.txt
 npc: npc/items/underworld_troll.txt
 npc: npc/items/silver_bell.txt