From f963baa65e872eee709612b79ed233be9133002f Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 23 Mar 2020 18:43:33 -0500 Subject: [PATCH 01/18] added GE autostock items --- itemstostock.txt | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/itemstostock.txt b/itemstostock.txt index 31341c6aa..d7b0e405d 100644 --- a/itemstostock.txt +++ b/itemstostock.txt @@ -2,35 +2,34 @@ #format is: #itemId:amount:price_increase_percentage (as decimal) #Weapons and tools -1359:100:0.9 -1271:100:0.9 -1275:100:0.9 -1357:100:0.9 -1333:10:0.9 +1359:100:1.9 +1271:100:1.9 +1275:100:1.9 +1357:100:1.9 +1333:10:1.9 #armor -1127:50:0.9 +1127:50:1.9 #ores -453:5000:0.7 +453:5000:1.7 #herbs -199:1000:0.5 -201:1000:0.5 -203:1000:0.7 -205:1000:0.7 -207:1000:0.9 +199:1000:1.5 +201:1000:1.5 +203:1000:1.7 +205:1000:1.7 +207:1000:1.9 #vials and such -227:10000:0.9 -229:10000:0.5 +227:10000:1.9 +229:10000:1.5 #food -379:10000:0.65 +379:10000:1.65 #potions -2452:1000:0.6 +2452:1000:1.6 #secondaries -592:1000:0.6 -2970:1000:0.8 -6018:1000:0.8 -3138:1000:0.8 -223:1000:0.8 -6693:1000:0.9 -1975:1000:0.9 -225:1000:0.9 - +592:1000:1.6 +2970:1000:1.8 +6018:1000:1.8 +3138:1000:1.8 +223:1000:1.8 +6693:1000:1.9 +1975:1000:1.9 +225:1000:1.9 From 8b7fc4e196ae82ff20680c01952bf9aa46998e17 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 23 Mar 2020 21:20:05 -0500 Subject: [PATCH 02/18] Burning meat hotfix --- .../src/plugin/interaction/item/withobject/BurnMeatPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java index b59df1072..af75b1d4d 100644 --- a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java +++ b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java @@ -49,6 +49,7 @@ public final class BurnMeatPlugin extends UseWithHandler { for (int id : OBJECTS) { addHandler(id, OBJECT_TYPE, this); } + System.out.println("Burned meat plugin successfully initialized"); return this; } @@ -62,6 +63,7 @@ public final class BurnMeatPlugin extends UseWithHandler { player.getPacketDispatch().sendMessage("You can't burn this piece of food."); return true; } + player.debug("Used Item: " + usedItem + " In inventory? " + player.getInventory().containsItem(usedItem)); if (player.getInventory().containsItem(usedItem)) { player.getInventory().remove(usedItem); player.lock(3); From 8f2e63835e2bc952ea79ec175298fbeccdc53cc7 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 23 Mar 2020 21:26:23 -0500 Subject: [PATCH 03/18] I'm sorry red ;-; --- Server/src/plugin/skill/cooking/CookingPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/skill/cooking/CookingPlugin.java b/Server/src/plugin/skill/cooking/CookingPlugin.java index 4eeea6df2..da2b54211 100644 --- a/Server/src/plugin/skill/cooking/CookingPlugin.java +++ b/Server/src/plugin/skill/cooking/CookingPlugin.java @@ -30,8 +30,8 @@ public final class CookingPlugin extends UseWithHandler { * Constructs a new {@code CookingPlugin} {@code Object}. */ public CookingPlugin() { - super(2142, 4293, 10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); - } + super(4293, 10816, 2138, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); + } @Override public Plugin newInstance(Object arg) throws Throwable { From 6915f7687ac751a8386e6ef4d5901e735511e8ff Mon Sep 17 00:00:00 2001 From: 2009scape <2009scape@2009scape.com> Date: Wed, 25 Mar 2020 14:13:20 -0400 Subject: [PATCH 04/18] Ignoring future changes to the GE database --- Server/.gitignore | 1 + Server/data/eco/offer_dispatch_db.emp | Bin 3556537 -> 3583221 bytes 2 files changed, 1 insertion(+) diff --git a/Server/.gitignore b/Server/.gitignore index 031002751..ad29d7e67 100644 --- a/Server/.gitignore +++ b/Server/.gitignore @@ -13,3 +13,4 @@ data/profile/** *.eml *.userlibraries data/players/** +data/eco/offer_dispatch_db.emp diff --git a/Server/data/eco/offer_dispatch_db.emp b/Server/data/eco/offer_dispatch_db.emp index 8a564cbc2f86286ff413d4baefe487267090b426..e72a0c90ee35cc5a764251b19d5e246f2614cd35 100644 GIT binary patch delta 29645 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 SmX`@it@;yyd@JHRw*4O#pg`3C delta 2804 zcmZ{m3s93+7RT?+mnS5m2EwaEhzT!AcqM6SZBapySi1>Yp%uzhSFBTJx3Q(Qir9+V zSg^a>$`Gt;D{gh$p}tG6kG5ujT_1F<3ae|YB2z`MTIm3N2-co+1Bs69H*?_ozTf}+ z@44sR`%MPVeMJwvagNFfUewvQM}8?jW((XehsT*JnW9=CWHxy(bzKAzz9Hn1OZy}V zCz&={1sXAGA|LM^1WlPawBbSy*OZy7`Y*Eni?pUu11b`QGE2MtB*mv4yZ@icHdTva zYxR&{o`&$z50c&z2z}W>EWHmCX$i>06o)H*-rcDcAjA+7)~S`2H^uyq&<-!8<>u_V zGF=d!YVnSgCpiB>+^!BOgbYFsp@0a22!>EXs368bgfLgfSmSl9FS-!DZhP`?^ZJgj z_88eA?>I#jz+l&IfU|`9nGqZkdS;`$D|uM@f-Z~4TC&D}UB5+VvB8sY)gI49=)_lKKAfk}MqW1QF z_jX4N+wRaBOL#}aP;mZe=^(ak2Qd*s&qCS_lfz(0;p+!b z|IkvsZxJPb*_q=m?J=;@o_Ny>AfT^rK|yY=SMW8;>MZx{S&%RVn5eOyvw|OnIg6if zX>$h^C3u305?{@Nb=UudJim8Ytw4l7^+({_`RJ0;2+NWyI=urYk@FpL42G;ie(i=iqqG=STR6{n>*6R-t^6$n=)SU%^oU^4GZ ztgRrWZYw}SxVO7{=@kxhN^Qs7mA6t@5kuY9z=(}iF|5`^JACJ)b>#V-Q zWQ^0~fL@7k)0r>3!AJE_NB4}6Snp<&DjPCK7V16I-k*G#uuyJwmkA>EU+S*3d3-iO zXwY&gWP?uwmMqPZ{%jD3dl9xCTRuMko3hfKSF=Dy3<%HPY5vF$eM?Dgv&a#AH~M}= zxYz%Ju(=5tDhCcBjzpKslLwnd)r75jIb%i}LIF+}&Feq-*o^?}oSrG3i%^t{aJbsI zB>-i0na>LVspE4FPky;90Bbj9*2inAz_tgVT{Lc6G3>}Ycv1;-cr%v;L#B4^s~oO7 z6c)(rY|A{TN86|}gu%7izXjkYeVKjfSP<1AjQ#NK@&IhnnU}~X03_uI=faUzL~_&DQNJ! zGH-#oDpOwr^eFmFswt|2L!j({7ldFbVKwMOkF>HSHRf7_22%NHv!~x^eIJIL3FAXY zChReveoV6-Jf@;g&YzW&0lq($!?0h>^@)65a2%<9mTY>kzk-o@*#|rg!B(|umdv!@ z&)BVaOA>B8Q3dp!+8yi9wguqSm6iu}00k8vGQTgcF#u~fTPpAaC2NSq%qO1yC;whx zIfNPaSTq7-o67T^oSVp*Ir_|P5 z-1Q{?G}rw1_UwRxCEVH|#Bo>73&FA*;RQ6)hDNl5!b%-}gREY46 z?5!yrdgn=&FtgcuREfnCtnYF8rWYbPd^6$vn=Epg^$XnSGI&}e7kA9B zRN~mX?sn|C*Kq)Zt6d7`C!6n6e#UP9^EaRN!UEe$Ba Date: Wed, 25 Mar 2020 14:16:48 -0400 Subject: [PATCH 05/18] Ignore this too for @Ethan --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 68e0c615a..005d6aae9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ CompiledServer/**/*.jar **/.idea/workspace.xml **/.idea/* *.class +CompiledServer/ From a5be2de747713b2b4d8edef35424f44156cbaf1e Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 14:45:07 -0500 Subject: [PATCH 06/18] Enabled randoms with toggle to turn them off --- .../game/content/ame/AntiMacroHandler.java | 21 +++++++-- .../crandor/game/content/skill/Skills.java | 4 ++ .../game/node/entity/player/Player.java | 4 +- .../node/entity/player/link/GlobalData.java | 14 +++++- .../plugin/dialogue/HansDialoguePlugin.java | 46 ++++++++++++++++++- 5 files changed, 81 insertions(+), 8 deletions(-) diff --git a/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java b/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java index cd71f12f7..ba7585705 100644 --- a/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java +++ b/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java @@ -24,6 +24,11 @@ public final class AntiMacroHandler implements SavingModule { */ private static final int UPDATE_FREQUENCY = 50; + /** + * Whether randoms are disabled for this player + */ + public boolean isDisabled; + /** * The ratio of firing events, the higher the less frequent. */ @@ -52,7 +57,7 @@ public final class AntiMacroHandler implements SavingModule { /** * The experience monitors. */ - private ExperienceMonitor[] monitors = new ExperienceMonitor[Skills.SKILL_NAME.length]; + public ExperienceMonitor[] monitors = new ExperienceMonitor[Skills.SKILL_NAME.length]; /** * The chance ratio of firing random events. @@ -120,8 +125,8 @@ public final class AntiMacroHandler implements SavingModule { } if (!player.getLocks().isInteractionLocked() && !player.getLocks().isTeleportLocked() && !player.getLocks().isMovementLocked()) { for (int i = 0; i < monitors.length; i++) { - FIRE_RATIO = 250; - if (chanceRatio[i] > FIRE_RATIO) { + FIRE_RATIO = 1; + if (chanceRatio[i] > FIRE_RATIO && !isDisabled) { fireEvent(i); } ExperienceMonitor monitor = monitors[i]; @@ -162,10 +167,17 @@ public final class AntiMacroHandler implements SavingModule { for (int i = 0; i < monitors.length; i++) { monitors[i] = new ExperienceMonitor(i); } - nextPulse = GameWorld.getTicks() + UPDATE_FREQUENCY; + if(isDisabled){ + nextPulse = -1; + } else { + nextPulse = GameWorld.getTicks() + UPDATE_FREQUENCY; + } if (event != null) { event.start(player, true); } + if(!player.isArtificial() && !isDisabled) { + System.out.println("Anti-Macro: Initialized anti-macro handler for " + player.getUsername()); + } } /** @@ -249,6 +261,7 @@ public final class AntiMacroHandler implements SavingModule { event = getRandomEvent(skillId); if (event != null) { if ((event = event.create(player)).start(player, false, args)) { + System.out.println("Anti-Macro: Firing event " + event.getName() + " for player: " + player.getUsername()); resetTrigger(); return true; } diff --git a/Server/src/org/crandor/game/content/skill/Skills.java b/Server/src/org/crandor/game/content/skill/Skills.java index 16312fa73..ff3931659 100644 --- a/Server/src/org/crandor/game/content/skill/Skills.java +++ b/Server/src/org/crandor/game/content/skill/Skills.java @@ -214,6 +214,7 @@ public final class Skills { boolean hadMax = this.experience[slot] != 200000000; final double experienceAdd = (int) (experience * mod); this.experience[slot] += experienceAdd; + player.getAntiMacroHandler().monitors[slot].setExperienceAmount((int)experienceAdd); if (this.experience[slot] > 200000000) { if(hadMax && !player.isArtificial()){ Repository.sendNews(entity.asPlayer().getUsername()+" has just reached 200m experience in " + SKILL_NAME[slot] + "!"); @@ -236,6 +237,9 @@ public final class Skills { lifepoints += amount; } staticLevels[slot] = newLevel; + if(newLevel == 99 && !player.isArtificial()){ + Repository.sendNews(entity.asPlayer().getUsername() + " has just achieved level 99 " + SKILL_NAME[slot]); + } if (entity instanceof Player) { if (updateCombatLevel()) { player.getUpdateMasks().register(new AppearanceFlag(player)); diff --git a/Server/src/org/crandor/game/node/entity/player/Player.java b/Server/src/org/crandor/game/node/entity/player/Player.java index 750c501d6..414b383e2 100644 --- a/Server/src/org/crandor/game/node/entity/player/Player.java +++ b/Server/src/org/crandor/game/node/entity/player/Player.java @@ -354,10 +354,12 @@ public class Player extends Entity { @Override public void init() { - if (!isArtificial()) { + antiMacroHandler.isDisabled = savedData.getGlobalData().getMacroDisabled(); + if (!artificial) { getProperties().setSpawnLocation(ServerConstants.HOME_LOCATION); getDetails().getSession().setObject(this); getDetails().getSession().setLastPing(System.currentTimeMillis() + 10_000L); + antiMacroHandler.init(); } super.init(); LoginConfiguration.configureLobby(this); diff --git a/Server/src/org/crandor/game/node/entity/player/link/GlobalData.java b/Server/src/org/crandor/game/node/entity/player/link/GlobalData.java index 6ab4e20bf..2cb5f9621 100644 --- a/Server/src/org/crandor/game/node/entity/player/link/GlobalData.java +++ b/Server/src/org/crandor/game/node/entity/player/link/GlobalData.java @@ -301,7 +301,11 @@ public final class GlobalData implements SavingModule { private int hunterCapeCharges; private long minigameTeleportDelay; - + + /** + * Whether or not randoms are enabled + */ + private boolean macroDisabled = false; @Override public void save(ByteBuffer buffer) { @@ -392,6 +396,7 @@ public final class GlobalData implements SavingModule { SavedData.save(buffer, getSavedH(), 63); SavedData.save(buffer, getTaskAmount(), 64); SavedData.save(buffer, getTaskPoints(), 65); + SavedData.save(buffer, macroDisabled,66); buffer.put((byte) 0); } @@ -624,6 +629,9 @@ public final class GlobalData implements SavingModule { case 65: setTaskPoints(buffer.getInt()); break; + case 66: + macroDisabled = SavedData.getBoolean(buffer); + break; } } } @@ -1628,4 +1636,8 @@ public final class GlobalData implements SavingModule { public void setTaskPoints(int taskPoints) { this.taskPoints = taskPoints; } + + public void setMacroDisabled(boolean disabled){this.macroDisabled = disabled;} + + public boolean getMacroDisabled() {return this.macroDisabled;} } diff --git a/Server/src/plugin/dialogue/HansDialoguePlugin.java b/Server/src/plugin/dialogue/HansDialoguePlugin.java index 460a8d64c..5cbf860d9 100644 --- a/Server/src/plugin/dialogue/HansDialoguePlugin.java +++ b/Server/src/plugin/dialogue/HansDialoguePlugin.java @@ -73,7 +73,7 @@ public final class HansDialoguePlugin extends DialoguePlugin { stage = 50; break; case 4: - interpreter.sendOptions("Select an Option", "Have you been here as long as me?", "I'd like to learn faster!", "About Iron Man mode...", "Go Back..."); + interpreter.sendOptions("Select an Option", "Have you been here as long as me?", "I'd like to learn faster!", "About Iron Man mode...","About random events...", "Go Back..."); stage = 10; break; } @@ -106,7 +106,17 @@ public final class HansDialoguePlugin extends DialoguePlugin { stage = 110; } break; - case 4: // Go back + case 4: + if(player.getAntiMacroHandler().isDisabled == true){ + interpreter.sendOptions("Select an Option","I want to enable random events.","Nevermind."); + stage = 130; + break; + } else { + interpreter.sendOptions("Select an Option","I want to disable random events.","Nevermind."); + stage = 135; + break; + } + case 5: // Go back interpreter.sendOptions("Select an Option", "I'm looking for whoever is in charge of this place.", "I have come to kill everyone in this castle!", "I don't know. I'm lost. Where am I?", "More Options..."); stage = 1; break; @@ -242,6 +252,38 @@ public final class HansDialoguePlugin extends DialoguePlugin { } break; + case 130: + switch(buttonId){ + case 1: + npc("Voila, you should now get random events!"); + player.getGlobalData().setMacroDisabled(false); + player.getAntiMacroHandler().isDisabled = false; + player.getAntiMacroHandler().init(); + stage = 131; + break; + case 2: + player("Never mind."); + stage = 131; + break; + } + break; + case 131: + end(); + break; + case 135: + switch(buttonId){ + case 1: + npc("Voila, you shouldn't get random events now!"); + player.getGlobalData().setMacroDisabled(true); + player.getAntiMacroHandler().isDisabled = true; + stage = 131; + break; + case 2: + player("Never mind."); + stage = 131; + break; + } + break; //Change Iron man mode dialogue/code case 150: switch(buttonId){ From 8007992ca35949c91fc21eeabeb06552a1b322c3 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:00:18 -0500 Subject: [PATCH 07/18] closes #203 --- .../crandor/game/node/entity/combat/CombatSwingHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Server/src/org/crandor/game/node/entity/combat/CombatSwingHandler.java b/Server/src/org/crandor/game/node/entity/combat/CombatSwingHandler.java index 16ed3ad16..bf4e3b6cc 100644 --- a/Server/src/org/crandor/game/node/entity/combat/CombatSwingHandler.java +++ b/Server/src/org/crandor/game/node/entity/combat/CombatSwingHandler.java @@ -382,6 +382,9 @@ public abstract class CombatSwingHandler { if(state.getEstimatedHit() >= 15){state.setEstimatedHit(14);}; if(state.getSecondaryHit() >= 15){state.setSecondaryHit(14);} } + if(victim.getId() == 757){ + this.EXPERIENCE_MOD = 0.01; + } if (state.getEstimatedHit() > 0) { state.setEstimatedHit(getFormatedHit(entity, victim, state, state.getEstimatedHit())); totalHit += state.getEstimatedHit(); From 25a7134cce23eeae288f29a5f6c284e3d0884258 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:08:01 -0500 Subject: [PATCH 08/18] closes #202 --- Server/server.sql | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Server/server.sql b/Server/server.sql index 577d90b80..f811417d5 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -3,7 +3,7 @@ -- https://www.phpmyadmin.net/ -- -- Host: localhost --- Generation Time: Mar 24, 2020 at 12:14 AM +-- Generation Time: Mar 25, 2020 at 09:06 PM -- Server version: 10.4.11-MariaDB -- PHP Version: 7.4.3 @@ -17601,7 +17601,7 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (50, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1303,1,1,0.0,COMMON}~{1123,1,1,0.0,COMMON}~{1199,1,1,0.0,COMMON}~{554,300,300,0.0,COMMON}~{556,300,300,0.0,COMMON}~{565,30,30,0.0,UNCOMMON}~{560,50,50,0.0,UNCOMMON}~{563,30,50,0.0,UNCOMMON}~{884,690,690,0.0,UNCOMMON}~{9144,10,25,0.0,UNCOMMON}~{11232,5,14,0.0,UNCOMMON}~{11237,1,14,0.0,UNCOMMON}~{1737,1,1,0.0,COMMON}~{1516,150,150,0.0,UNCOMMON}~{385,4,4,0.0,UNCOMMON}~{445,100,100,0.0,UNCOMMON}~{9431,3,3,0.0,UNCOMMON}~{2361,3,3,0.0,UNCOMMON}~{2677,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,5000}~{14669,1,1,0.0,VERY_RARE,5000}', '{12158,4,4,0.06,ALWAYS}~{12159,4,4,0.03,ALWAYS}~{12160,4,4,0.63,ALWAYS}~{12163,4,4,0.02,ALWAYS}'), (52, '{534,1,1,0.0,ALWAYS}', '', ''), (53, '{536,1,1,0.0,ALWAYS}~{1749,1,1,0.0,ALWAYS}', '{1315,1,1,0.0,COMMON}~{828,20,20,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{892,4,4,0.0,UNCOMMON}~{811,8,8,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{563,4,4,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,30,690,0.0,COMMON}~{1897,3,3,0.0,UNCOMMON}~{2361,1,1,0.0,UNCOMMON}~{2727,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.215,ALWAYS}~{12158,1,1,0.185,ALWAYS}~{12159,1,1,0.4,ALWAYS}~{12160,1,1,0.165,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), -(54, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,RARE}~{565,15,15,0.0,RARE}~{560,45,45,0.0,RARE}~{554,50,50,0.0,RARE}~{563,10,12,0.0,RARE}~{563,45,45,0.0,RARE}~{561,67,79,0.0,RARE}~{562,90,90,0.0,RARE}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{9431,1,1,0.0,UNCOMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,129,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), +(54, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,RARE}~{565,15,15,0.0,RARE}~{560,45,45,0.0,RARE}~{554,50,50,0.0,RARE}~{563,10,12,0.0,RARE}~{563,45,45,0.0,RARE}~{561,67,79,0.0,RARE}~{562,90,90,0.0,RARE}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,129,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), (55, '{536,1,1,0.0,ALWAYS}~{1751,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,UNCOMMON}~{1355,1,1,0.0,UNCOMMON}~{1243,1,1,0.0,UNCOMMON}~{1211,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,RARE}~{1069,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{560,5,5,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,RARE}~{995,11,454,0.0,COMMON}~{449,1,1,0.0,UNCOMMON}~{365,1,1,0.0,UNCOMMON}~{2735,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.495,ALWAYS}~{12158,1,1,0.11,ALWAYS}~{12159,1,1,0.27,ALWAYS}~{12160,1,1,0.105,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), (59, '', '{556,4,6,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{554,6,6,0.0,UNCOMMON}~{559,7,7,0.0,UNCOMMON}~{1139,1,1,0.0,COMMON}~{877,8,8,0.0,UNCOMMON}~{882,4,11,0.0,UNCOMMON}~{839,1,1,0.0,RARE}~{1189,1,1,0.0,RARE}~{1381,1,1,0.0,RARE}~{995,1,20,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,RARE}~{1438,1,1,0.0,RARE}~{1955,2,2,0.0,RARE}~{1009,1,1,0.0,RARE}~{229,1,1,0.0,RARE}', '{0,1,1,0.88,ALWAYS}~{12158,1,1,0.079,ALWAYS}~{12159,1,1,0.008,ALWAYS}~{12160,1,1,0.025,ALWAYS}~{12163,1,1,0.007,ALWAYS}'), (60, '', '{556,4,6,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{554,6,6,0.0,UNCOMMON}~{559,7,7,0.0,UNCOMMON}~{1139,1,1,0.0,COMMON}~{877,8,8,0.0,UNCOMMON}~{882,4,11,0.0,UNCOMMON}~{839,1,1,0.0,RARE}~{1189,1,1,0.0,RARE}~{1381,1,1,0.0,RARE}~{995,1,20,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,RARE}~{1438,1,1,0.0,RARE}~{1955,2,2,0.0,RARE}~{1009,1,1,0.0,RARE}~{229,1,1,0.0,RARE}', '{0,1,1,0.88,ALWAYS}~{12158,1,1,0.079,ALWAYS}~{12159,1,1,0.008,ALWAYS}~{12160,1,1,0.025,ALWAYS}~{12163,1,1,0.007,ALWAYS}'), @@ -18625,10 +18625,10 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (4670, '{536,1,1,0.0,ALWAYS}~{1749,1,1,0.0,ALWAYS}', '{1315,1,1,0.0,COMMON}~{828,20,20,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{892,4,4,0.0,UNCOMMON}~{811,8,8,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{563,4,4,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,30,690,0.0,COMMON}~{1897,3,3,0.0,UNCOMMON}~{2361,1,1,0.0,UNCOMMON}~{2725,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.215,ALWAYS}~{12158,1,1,0.185,ALWAYS}~{12159,1,1,0.4,ALWAYS}~{12160,1,1,0.165,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), (4671, '{536,1,1,0.0,ALWAYS}~{1749,1,1,0.0,ALWAYS}', '{1315,1,1,0.0,COMMON}~{828,20,20,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{892,4,4,0.0,UNCOMMON}~{811,8,8,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{563,4,4,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,30,690,0.0,COMMON}~{1897,3,3,0.0,UNCOMMON}~{2361,1,1,0.0,UNCOMMON}~{2731,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.215,ALWAYS}~{12158,1,1,0.185,ALWAYS}~{12159,1,1,0.4,ALWAYS}~{12160,1,1,0.165,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), (4672, '{536,1,1,0.0,ALWAYS}~{1749,1,1,0.0,ALWAYS}', '{1315,1,1,0.0,COMMON}~{828,20,20,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{892,4,4,0.0,UNCOMMON}~{811,8,8,0.0,UNCOMMON}~{1303,1,1,0.0,UNCOMMON}~{563,4,4,0.0,UNCOMMON}~{560,5,5,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,30,690,0.0,COMMON}~{1897,3,3,0.0,UNCOMMON}~{2361,1,1,0.0,UNCOMMON}~{2727,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.215,ALWAYS}~{12158,1,1,0.185,ALWAYS}~{12159,1,1,0.4,ALWAYS}~{12160,1,1,0.165,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), -(4673, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{9431,1,1,0.0,UNCOMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{1897,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), -(4674, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{9431,1,1,0.0,UNCOMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{9431,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), -(4675, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{9431,1,1,0.0,UNCOMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), -(4676, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{9431,1,1,0.0,UNCOMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,COMMON,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), +(4673, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{1897,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), +(4674, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{9431,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), +(4675, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), +(4676, '{536,1,1,0.0,ALWAYS}~{1747,1,1,0.0,ALWAYS}', '{1355,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1369,1,1,0.0,UNCOMMON}~{1315,1,1,0.0,UNCOMMON}~{1123,1,1,0.0,UNCOMMON}~{1303,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1319,1,1,0.0,RARE}~{810,16,16,0.0,COMMON}~{829,30,30,0.0,COMMON}~{868,2,2,0.0,UNCOMMON}~{811,10,10,0.0,UNCOMMON}~{556,75,75,0.0,UNCOMMON}~{565,15,15,0.0,UNCOMMON}~{560,45,45,0.0,RARE}~{554,50,50,0.0,UNCOMMON}~{563,10,12,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{561,67,79,0.0,UNCOMMON}~{562,90,90,0.0,UNCOMMON}~{2361,1,2,0.0,UNCOMMON}~{2353,1,1,0.0,RARE}~{995,129,3000,0.0,COMMON}~{2739,1,1,0.0,UNCOMMON}~{1897,1,1,0.0,UNCOMMON}~{12480,1,1,0.0,RARE}~{995,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,COMMON,10000}', '{0,1,1,0.5700000000000001,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.26,ALWAYS}~{12160,1,1,0.07,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), (4677, '{536,1,1,0.0,ALWAYS}~{1753,1,1,0.0,ALWAYS}', '{1069,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,RARE}~{1365,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1243,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{555,75,150,0.0,COMMON}~{554,37,37,0.0,COMMON}~{561,15,15,0.0,COMMON}~{561,30,30,0.0,COMMON}~{563,3,3,0.0,COMMON}~{209,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{199,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,11,440,0.0,COMMON}~{365,1,1,0.0,COMMON}~{449,1,1,0.0,UNCOMMON}~{2733,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.66,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.165,ALWAYS}~{12160,1,1,0.075,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), (4678, '{536,1,1,0.0,ALWAYS}~{1753,1,1,0.0,ALWAYS}', '{1069,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,RARE}~{1365,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1243,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{555,75,150,0.0,COMMON}~{554,37,37,0.0,COMMON}~{561,15,15,0.0,COMMON}~{561,30,30,0.0,COMMON}~{563,3,3,0.0,COMMON}~{209,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{199,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,11,440,0.0,COMMON}~{365,1,1,0.0,COMMON}~{449,1,1,0.0,UNCOMMON}~{2743,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.66,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.165,ALWAYS}~{12160,1,1,0.075,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), (4679, '{536,1,1,0.0,ALWAYS}~{1753,1,1,0.0,ALWAYS}', '{1069,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,RARE}~{1365,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1243,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{555,75,150,0.0,COMMON}~{554,37,37,0.0,COMMON}~{561,15,15,0.0,COMMON}~{561,30,30,0.0,COMMON}~{563,3,3,0.0,COMMON}~{209,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{199,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,11,440,0.0,COMMON}~{365,1,1,0.0,COMMON}~{449,1,1,0.0,UNCOMMON}~{2731,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.66,ALWAYS}~{12158,1,1,0.085,ALWAYS}~{12159,1,1,0.165,ALWAYS}~{12160,1,1,0.075,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), @@ -18656,9 +18656,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (4701, '{592,1,1,0.0,ALWAYS}', '{1353,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1197,1,1,0.0,UNCOMMON}~{1313,1,1,0.0,UNCOMMON}~{1163,1,1,0.0,RARE}~{1073,1,1,0.0,RARE}~{1317,1,1,0.0,RARE}~{995,10,630,0.0,COMMON}~{554,75,75,0.0,COMMON}~{562,15,15,0.0,COMMON}~{560,5,5,0.0,COMMON}~{1734,10,10,0.0,UNCOMMON}~{361,1,1,0.0,UNCOMMON}~{2357,1,1,0.0,UNCOMMON}~{2737,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.62,ALWAYS}~{12158,1,1,0.07,ALWAYS}~{12159,1,1,0.04,ALWAYS}~{12160,1,1,0.26,ALWAYS}~{12163,1,1,0.009000000000000001,ALWAYS}'), (4702, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,RARE}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), (4703, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,COMMON}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), -(4704, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,RARE}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'); +(4704, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,RARE}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), +(4705, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,COMMON}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(4705, '{592,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1361,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1313,1,1,0.0,COMMON}~{1165,1,1,0.0,COMMON}~{1197,1,1,0.0,COMMON}~{1147,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{1113,1,1,0.0,RARE}~{1185,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{556,50,75,0.0,COMMON}~{565,7,7,0.0,UNCOMMON}~{554,37,40,0.0,COMMON}~{562,10,10,0.0,COMMON}~{563,3,5,0.0,COMMON}~{2361,1,1,0.0,COMMON}~{454,20,20,0.0,RARE}~{995,132,1100,0.0,COMMON}~{379,1,1,0.0,UNCOMMON}~{133,1,1,0.0,UNCOMMON}~{31,1,1,0.0,RARE}', '{0,1,1,0.23,ALWAYS}~{12158,1,1,0.20500000000000002,ALWAYS}~{12159,1,1,0.105,ALWAYS}~{12160,1,1,0.44,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), (4706, '{532,1,1,0.0,ALWAYS}', '{1389,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1285,1,1,0.0,COMMON}~{886,30,30,0.0,COMMON}~{884,15,15,0.0,COMMON}~{1287,1,1,0.0,RARE}~{1165,1,1,0.0,COMMON}~{1179,1,1,0.0,COMMON}~{1141,1,1,0.0,COMMON}~{1193,1,1,0.0,UNCOMMON}~{556,18,18,0.0,COMMON}~{564,3,3,0.0,COMMON}~{557,27,27,0.0,COMMON}~{561,6,6,0.0,COMMON}~{563,3,6,0.0,UNCOMMON}~{565,1,1,0.0,UNCOMMON}~{562,7,7,0.0,UNCOMMON}~{560,13,13,0.0,RARE}~{5323,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5104,1,1,0.0,COMMON}~{5292,1,1,0.0,COMMON}~{5281,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{4206,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{5106,1,1,0.0,RARE}~{5295,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{211,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{995,2,500,0.0,COMMON}~{2353,1,1,0.0,COMMON}~{7871,1,1,0.0,COMMON}~{453,1,1,0.0,UNCOMMON}~{1969,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{10976,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (4805, '{13157,1,1,0.0,ALWAYS}', '{560,1,25,0.0,COMMON}~{565,10,15,0.0,COMMON}~{554,80,80,0.0,COMMON}~{200,4,4,0.0,UNCOMMON}~{202,4,4,0.0,UNCOMMON}~{206,4,4,0.0,UNCOMMON}~{204,4,4,0.0,UNCOMMON}~{208,4,4,0.0,UNCOMMON}~{212,4,4,0.0,UNCOMMON}~{210,4,4,0.0,UNCOMMON}~{216,4,4,0.0,UNCOMMON}~{214,4,4,0.0,UNCOMMON}~{218,4,4,0.0,UNCOMMON}~{995,100,1240,0.0,COMMON}~{3385,1,1,0.0,UNCOMMON}~{3387,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.915,ALWAYS}~{12158,1,1,0.025,ALWAYS}~{12159,1,1,0.012,ALWAYS}~{12160,1,1,0.033,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), (4806, '{13157,1,1,0.0,ALWAYS}', '{560,1,25,0.0,COMMON}~{565,10,15,0.0,COMMON}~{554,80,80,0.0,COMMON}~{200,4,4,0.0,UNCOMMON}~{202,4,4,0.0,UNCOMMON}~{206,4,4,0.0,UNCOMMON}~{204,4,4,0.0,UNCOMMON}~{208,4,4,0.0,UNCOMMON}~{212,4,4,0.0,UNCOMMON}~{210,4,4,0.0,UNCOMMON}~{216,4,4,0.0,UNCOMMON}~{214,4,4,0.0,UNCOMMON}~{218,4,4,0.0,UNCOMMON}~{995,100,1240,0.0,COMMON}~{3385,1,1,0.0,UNCOMMON}~{3387,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.915,ALWAYS}~{12158,1,1,0.025,ALWAYS}~{12159,1,1,0.012,ALWAYS}~{12160,1,1,0.033,ALWAYS}~{12163,1,1,0.015,ALWAYS}'), @@ -18739,9 +18739,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5294, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5295, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5296, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(5297, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); +(5297, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(5298, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(5298, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5299, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5300, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5301, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), @@ -18785,9 +18785,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5339, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2845,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5340, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2857,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (5341, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2803,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(5360, '{592,1,1,0.0,ALWAYS}', '{1333,1,1,0.0,RARE}~{1185,1,1,0.0,UNCOMMON}~{4675,1,1,0.0,RARE}~{1673,1,1,0.0,COMMON}~{1654,1,1,0.0,COMMON}~{1635,1,1,0.0,COMMON}~{1696,1,1,0.0,COMMON}~{1639,1,1,0.0,COMMON}~{2566,1,1,0.0,UNCOMMON}~{1727,1,1,0.0,COMMON}~{1656,1,1,0.0,UNCOMMON}~{1637,1,1,0.0,COMMON}~{11072,1,1,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,1,1,0.0,UNCOMMON}~{405,1,1,0.0,UNCOMMON}~{2357,1,1,0.0,COMMON}~{444,1,1,0.0,COMMON}~{970,1,1,0.0,COMMON}~{9032,1,1,0.0,COMMON}~{1939,1,17,0.0,COMMON}~{950,1,1,0.0,COMMON}~{2007,10,10,0.0,RARE}~{2833,1,1,0.0,RARE}~{6808,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.89,ALWAYS}~{12158,1,1,0.035,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.015,ALWAYS}~{12163,1,1,0.035,ALWAYS}'); +(5360, '{592,1,1,0.0,ALWAYS}', '{1333,1,1,0.0,RARE}~{1185,1,1,0.0,UNCOMMON}~{4675,1,1,0.0,RARE}~{1673,1,1,0.0,COMMON}~{1654,1,1,0.0,COMMON}~{1635,1,1,0.0,COMMON}~{1696,1,1,0.0,COMMON}~{1639,1,1,0.0,COMMON}~{2566,1,1,0.0,UNCOMMON}~{1727,1,1,0.0,COMMON}~{1656,1,1,0.0,UNCOMMON}~{1637,1,1,0.0,COMMON}~{11072,1,1,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,1,1,0.0,UNCOMMON}~{405,1,1,0.0,UNCOMMON}~{2357,1,1,0.0,COMMON}~{444,1,1,0.0,COMMON}~{970,1,1,0.0,COMMON}~{9032,1,1,0.0,COMMON}~{1939,1,17,0.0,COMMON}~{950,1,1,0.0,COMMON}~{2007,10,10,0.0,RARE}~{2833,1,1,0.0,RARE}~{6808,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.89,ALWAYS}~{12158,1,1,0.035,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.015,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), +(5361, '{555,1,1,0.0,ALWAYS}', '{555,90,90,0.0,COMMON}~{565,4,12,0.0,COMMON}~{560,9,19,0.0,UNCOMMON}~{4695,3,10,0.0,UNCOMMON}~{4698,3,9,0.0,UNCOMMON}~{4694,3,12,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5321,1,9,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{888,90,90,0.0,COMMON}~{1111,1,1,0.0,UNCOMMON}~{1159,1,1,0.0,UNCOMMON}~{9419,1,1,0.0,UNCOMMON}~{1343,1,1,0.0,UNCOMMON}~{1147,1,1,0.0,UNCOMMON}~{1383,1,1,0.0,UNCOMMON}~{1395,1,1,0.0,UNCOMMON}~{9337,15,15,0.0,UNCOMMON}~{2487,1,1,0.0,RARE}~{1123,1,1,0.0,RARE}~{199,1,10,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,2,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{445,1,6,0.0,UNCOMMON}~{448,1,5,0.0,COMMON}~{454,1,8,0.0,UNCOMMON}~{2359,2,2,0.0,UNCOMMON}~{1624,1,4,0.0,UNCOMMON}~{377,5,12,0.0,UNCOMMON}~{383,3,6,0.0,UNCOMMON}~{385,1,1,0.0,UNCOMMON}~{995,97,692,0.0,COMMON}~{572,5,10,0.0,COMMON}~{232,20,20,0.0,UNCOMMON}~{407,1,1,0.0,UNCOMMON}~{402,10,29,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{228,5,10,0.0,UNCOMMON}~{6672,1,1,0.0,UNCOMMON}~{193,1,1,0.0,RARE}~{2,11,27,0.0,RARE}~{6691,1,1,0.0,RARE}~{2737,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.05,ALWAYS}~{12158,1,1,0.095,ALWAYS}~{12159,1,1,0.045,ALWAYS}~{12160,1,1,0.79,ALWAYS}~{12163,1,1,0.02,ALWAYS}'); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(5361, '{555,1,1,0.0,ALWAYS}', '{555,90,90,0.0,COMMON}~{565,4,12,0.0,COMMON}~{560,9,19,0.0,UNCOMMON}~{4695,3,10,0.0,UNCOMMON}~{4698,3,9,0.0,UNCOMMON}~{4694,3,12,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5321,1,9,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{888,90,90,0.0,COMMON}~{1111,1,1,0.0,UNCOMMON}~{1159,1,1,0.0,UNCOMMON}~{9419,1,1,0.0,UNCOMMON}~{1343,1,1,0.0,UNCOMMON}~{1147,1,1,0.0,UNCOMMON}~{1383,1,1,0.0,UNCOMMON}~{1395,1,1,0.0,UNCOMMON}~{9337,15,15,0.0,UNCOMMON}~{2487,1,1,0.0,RARE}~{1123,1,1,0.0,RARE}~{199,1,10,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,2,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{445,1,6,0.0,UNCOMMON}~{448,1,5,0.0,COMMON}~{454,1,8,0.0,UNCOMMON}~{2359,2,2,0.0,UNCOMMON}~{1624,1,4,0.0,UNCOMMON}~{377,5,12,0.0,UNCOMMON}~{383,3,6,0.0,UNCOMMON}~{385,1,1,0.0,UNCOMMON}~{995,97,692,0.0,COMMON}~{572,5,10,0.0,COMMON}~{232,20,20,0.0,UNCOMMON}~{407,1,1,0.0,UNCOMMON}~{402,10,29,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{228,5,10,0.0,UNCOMMON}~{6672,1,1,0.0,UNCOMMON}~{193,1,1,0.0,RARE}~{2,11,27,0.0,RARE}~{6691,1,1,0.0,RARE}~{2737,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.05,ALWAYS}~{12158,1,1,0.095,ALWAYS}~{12159,1,1,0.045,ALWAYS}~{12160,1,1,0.79,ALWAYS}~{12163,1,1,0.02,ALWAYS}'), (5362, '{536,1,1,0.0,ALWAYS}~{1753,2,2,0.0,ALWAYS}', '{11373,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,UNCOMMON}~{1215,1,1,0.0,UNCOMMON}~{1319,1,1,0.0,RARE}~{1373,1,1,0.0,RARE}~{1305,1,1,0.0,RARE}~{1145,1,1,0.0,UNCOMMON}~{1199,1,1,0.0,UNCOMMON}~{1113,1,1,0.0,RARE}~{1163,1,1,0.0,RARE}~{565,15,20,0.0,COMMON}~{4699,35,35,0.0,COMMON}~{4694,37,37,0.0,UNCOMMON}~{561,17,17,0.0,UNCOMMON}~{556,34,34,0.0,UNCOMMON}~{563,15,15,0.0,UNCOMMON}~{563,45,45,0.0,UNCOMMON}~{890,8,8,0.0,UNCOMMON}~{805,8,8,0.0,UNCOMMON}~{829,1,1,0.0,UNCOMMON}~{867,8,8,0.0,UNCOMMON}~{888,90,90,0.0,RARE}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,1,1813,0.0,COMMON}~{448,5,5,0.0,UNCOMMON}~{2011,1,2,0.0,UNCOMMON}~{2725,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.715,ALWAYS}~{12158,1,1,0.14400000000000002,ALWAYS}~{12159,1,1,0.08,ALWAYS}~{12160,1,1,0.045,ALWAYS}~{12163,1,1,0.016,ALWAYS}'), (5363, '{536,1,1,0.0,ALWAYS}~{2359,3,3,0.0,ALWAYS}', '{1373,1,1,0.0,COMMON}~{811,14,14,0.0,COMMON}~{830,8,8,0.0,COMMON}~{1432,1,1,0.0,UNCOMMON}~{9144,10,27,0.0,UNCOMMON}~{868,8,18,0.0,UNCOMMON}~{892,8,42,0.0,UNCOMMON}~{1163,1,1,0.0,UNCOMMON}~{1247,1,1,0.0,UNCOMMON}~{1149,1,1,0.0,VERY_RARE}~{565,27,27,0.0,COMMON}~{566,10,10,0.0,UNCOMMON}~{563,4,4,0.0,RARE}~{11465,1,1,0.0,UNCOMMON}~{995,283,8441,0.0,COMMON}~{385,1,6,0.0,UNCOMMON}~{11359,1,1,0.0,RARE}~{2743,1,1,0.0,UNCOMMON}~{11338,1,1,0.0,RARE,44}~{2363,2,2,0.0,RARE}~{995,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}~{11286,1,1,0.0,VERY_RARE,5000}~{11335,1,1,0.0,VERY_RARE,10000}', '{0,1,1,0.085,ALWAYS}~{12158,1,1,0.195,ALWAYS}~{12159,1,1,0.495,ALWAYS}~{12160,1,1,0.19,ALWAYS}~{12163,1,1,0.035,ALWAYS}'), (5365, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2825,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), @@ -18833,10 +18833,10 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5415, '{526,1,1,0.0,ALWAYS}~{532,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1069,1,1,0.0,COMMON}~{10589,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1197,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{563,3,3,0.0,UNCOMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,44,200,0.0,COMMON}~{995,440,440,0.0,COMMON}~{449,1,1,0.0,COMMON}~{365,1,1,0.0,COMMON}~{2725,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.075,ALWAYS}~{12160,1,1,0.085,ALWAYS}~{12163,1,1,0.03,ALWAYS}'), (5416, '{526,1,1,0.0,ALWAYS}~{532,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1069,1,1,0.0,COMMON}~{10589,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1197,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{563,3,3,0.0,UNCOMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,44,200,0.0,COMMON}~{995,440,440,0.0,COMMON}~{449,1,1,0.0,COMMON}~{365,1,1,0.0,COMMON}~{2743,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.075,ALWAYS}~{12160,1,1,0.085,ALWAYS}~{12163,1,1,0.03,ALWAYS}'), (5417, '{526,1,1,0.0,ALWAYS}~{532,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1069,1,1,0.0,COMMON}~{10589,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1197,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{563,3,3,0.0,UNCOMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,44,200,0.0,COMMON}~{995,440,440,0.0,COMMON}~{449,1,1,0.0,COMMON}~{365,1,1,0.0,COMMON}~{2727,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.075,ALWAYS}~{12160,1,1,0.085,ALWAYS}~{12163,1,1,0.03,ALWAYS}'), -(5418, '{526,1,1,0.0,ALWAYS}~{532,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1069,1,1,0.0,COMMON}~{10589,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1197,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{563,3,3,0.0,UNCOMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,44,200,0.0,COMMON}~{995,440,440,0.0,COMMON}~{449,1,1,0.0,COMMON}~{365,1,1,0.0,COMMON}~{2733,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.075,ALWAYS}~{12160,1,1,0.085,ALWAYS}~{12163,1,1,0.03,ALWAYS}'); -INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES +(5418, '{526,1,1,0.0,ALWAYS}~{532,1,1,0.0,ALWAYS}', '{1365,1,1,0.0,COMMON}~{1243,1,1,0.0,COMMON}~{1355,1,1,0.0,COMMON}~{1069,1,1,0.0,COMMON}~{10589,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1197,1,1,0.0,UNCOMMON}~{555,75,75,0.0,COMMON}~{563,3,3,0.0,UNCOMMON}~{561,15,15,0.0,UNCOMMON}~{554,37,37,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,44,200,0.0,COMMON}~{995,440,440,0.0,COMMON}~{449,1,1,0.0,COMMON}~{365,1,1,0.0,COMMON}~{2733,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.705,ALWAYS}~{12158,1,1,0.105,ALWAYS}~{12159,1,1,0.075,ALWAYS}~{12160,1,1,0.085,ALWAYS}~{12163,1,1,0.03,ALWAYS}'), (5422, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2825,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(5473, '', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5321,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5100,1,2,0.0,COMMON}~{5105,1,1,0.0,COMMON}~{5280,1,1,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5106,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{1119,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,COMMON}~{1339,1,1,0.0,UNCOMMON}~{1343,1,1,0.0,UNCOMMON}~{1345,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,UNCOMMON}~{3122,1,1,0.0,RARE}~{1347,1,1,0.0,RARE}~{1127,1,1,0.0,RARE}~{557,10,60,0.0,COMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,7,0.0,UNCOMMON}~{995,35,352,0.0,COMMON}~{384,1,8,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{402,4,10,0.0,UNCOMMON}~{1760,1,42,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(5473, '', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{211,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5321,1,1,0.0,COMMON}~{5323,1,1,0.0,COMMON}~{5100,1,2,0.0,COMMON}~{5105,1,1,0.0,COMMON}~{5280,1,1,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5106,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{1119,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,COMMON}~{1339,1,1,0.0,UNCOMMON}~{1343,1,1,0.0,UNCOMMON}~{1345,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,UNCOMMON}~{1161,1,1,0.0,UNCOMMON}~{3122,1,1,0.0,RARE}~{1347,1,1,0.0,RARE}~{1127,1,1,0.0,RARE}~{557,10,60,0.0,COMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,7,0.0,UNCOMMON}~{995,35,352,0.0,COMMON}~{384,1,8,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{402,4,10,0.0,UNCOMMON}~{1760,1,42,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); +INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5474, '{532,1,1,0.0,ALWAYS}', '{1145,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,UNCOMMON}~{3122,1,1,0.0,RARE}~{1161,1,1,0.0,RARE}~{1119,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1341,1,1,0.0,UNCOMMON}~{1357,1,1,0.0,UNCOMMON}~{1347,1,1,0.0,RARE}~{830,1,1,0.0,RARE}~{1345,1,1,0.0,RARE}~{1343,1,1,0.0,RARE}~{1339,1,1,0.0,RARE}~{807,1,1,0.0,RARE}~{557,10,60,0.0,COMMON}~{561,4,10,0.0,UNCOMMON}~{563,3,3,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,COMMON}~{5311,1,1,0.0,COMMON}~{5100,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{402,10,10,0.0,COMMON}~{1760,10,41,0.0,COMMON}~{354,3,3,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{384,2,8,0.0,RARE}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.355,ALWAYS}~{12158,1,1,0.195,ALWAYS}~{12159,1,1,0.3,ALWAYS}~{12160,1,1,0.12,ALWAYS}~{12163,1,1,0.03,ALWAYS}'), (5475, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1339,1,1,0.0,COMMON}~{1141,1,1,0.0,COMMON}~{1343,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,UNCOMMON}~{1347,1,1,0.0,RARE}~{1357,1,1,0.0,RARE}~{1345,1,1,0.0,RARE}~{3122,1,1,0.0,RARE}~{1161,1,1,0.0,RARE}~{1145,1,1,0.0,RARE}~{1121,1,1,0.0,RARE}~{1119,1,1,0.0,RARE}~{557,8,60,0.0,COMMON}~{561,5,7,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{5291,1,1,0.0,COMMON}~{5292,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,COMMON}~{5281,1,1,0.0,COMMON}~{5296,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{995,35,300,0.0,COMMON}~{384,2,8,0.0,RARE}~{454,13,13,0.0,RARE}~{402,4,10,0.0,COMMON}~{1760,10,41,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.85,ALWAYS}~{12158,1,1,0.055,ALWAYS}~{12159,1,1,0.045,ALWAYS}~{12160,1,1,0.025,ALWAYS}~{12163,1,1,0.025,ALWAYS}'), (5476, '{532,1,1,0.0,ALWAYS}', '{1339,1,1,0.0,COMMON}~{1341,1,1,0.0,UNCOMMON}~{1119,1,1,0.0,UNCOMMON}~{1121,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,COMMON}~{1357,1,1,0.0,RARE}~{1145,1,1,0.0,RARE}~{1161,1,1,0.0,UNCOMMON}~{1345,1,1,0.0,UNCOMMON}~{1201,1,1,0.0,UNCOMMON}~{1347,1,1,0.0,UNCOMMON}~{3122,1,1,0.0,UNCOMMON}~{557,8,60,0.0,COMMON}~{563,2,12,0.0,UNCOMMON}~{561,7,8,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,COMMON}~{5105,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,COMMON}~{5296,1,1,0.0,RARE}~{5295,1,1,0.0,UNCOMMON}~{203,1,1,0.0,COMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{995,8,200,0.0,COMMON}~{1759,1,42,0.0,UNCOMMON}~{453,3,6,0.0,UNCOMMON}~{353,3,3,0.0,UNCOMMON}~{401,5,5,0.0,UNCOMMON}~{383,6,7,0.0,UNCOMMON}', ''), @@ -18912,12 +18912,12 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5689, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5690, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5691, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), -(5692, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''); -INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES +(5692, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5693, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5694, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5695, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), -(5696, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), +(5696, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''); +INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5697, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5698, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), (5699, '{526,1,1,0.0,ALWAYS}~{960,1,1,0.0,ALWAYS}', '{7863,1,1,0.0,COMMON}~{10940,1,1,0.0,RARE}~{10945,1,1,0.0,RARE}~{10941,1,1,0.0,RARE}~{10933,1,1,0.0,RARE}~{7666,1,1,0.0,UNCOMMON}~{3363,1,1,0.0,UNCOMMON}~{3365,1,1,0.0,UNCOMMON}~{3367,3,3,0.0,UNCOMMON}~{884,5,5,0.0,UNCOMMON}~{886,5,5,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{558,5,5,0.0,UNCOMMON}~{12158,1,1,0.0,UNCOMMON}~{12159,1,1,0.0,RARE}~{12160,1,1,0.0,RARE}~{12163,1,1,0.0,RARE}', ''), @@ -19004,11 +19004,11 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5850, '{526,1,1,0.0,ALWAYS}~{11008,1,1,0.0,ALWAYS}', '{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{558,9,9,0.0,UNCOMMON}~{555,6,6,0.0,UNCOMMON}~{557,5,5,0.0,UNCOMMON}~{995,5,5,0.0,COMMON}~{995,10,10,0.0,COMMON}~{954,1,1,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{313,1,1,0.0,COMMON}~{436,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{946,1,1,0.0,COMMON}', ''), (5851, '{526,1,1,0.0,ALWAYS}~{11008,1,1,0.0,ALWAYS}', '{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{558,9,9,0.0,UNCOMMON}~{555,6,6,0.0,UNCOMMON}~{557,5,5,0.0,UNCOMMON}~{995,5,5,0.0,COMMON}~{995,10,10,0.0,COMMON}~{954,1,1,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{313,1,1,0.0,COMMON}~{436,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{946,1,1,0.0,COMMON}', ''), (5852, '{3186,1,1,0.0,ALWAYS}~{3166,1,1,0.0,ALWAYS}', '{7856,1,1,0.0,COMMON}', '{0,1,1,1.0,ALWAYS}~{12158,1,1,-0.006,ALWAYS}~{12159,1,1,0.002,ALWAYS}~{12160,1,1,0.002,ALWAYS}~{12163,1,1,0.002,ALWAYS}'), -(5855, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2681,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''); -INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES +(5855, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2681,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (5856, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2714,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}~{2677,1,1,0.0,RARE}', ''), (5859, '', '{2677,1,1,0.0,RARE}', ''), -(5860, '', '{2677,1,1,0.0,RARE}', ''), +(5860, '', '{2677,1,1,0.0,RARE}', ''); +INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (5873, '{526,1,1,0.0,ALWAYS}', '{555,6,6,0.0,COMMON}~{559,7,7,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{558,13,19,0.0,UNCOMMON}~{1438,1,1,0.0,UNCOMMON}~{877,8,8,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{5016,1,1,0.0,RARE}~{5018,1,1,0.0,RARE}~{1381,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,UNCOMMON}~{7907,1,1,0.0,COMMON}~{1949,1,1,0.0,UNCOMMON}~{2307,1,1,0.0,COMMON}~{1917,1,1,0.0,RARE}~{10999,1,1,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1101,1,1,0.0,COMMON}~{590,1,1,0.0,UNCOMMON}~{2690,1,1,0.0,RARE}~{995,5,49,0.0,COMMON}~{1987,3,3,0.0,UNCOMMON}', '{0,1,1,0.87,ALWAYS}~{12158,1,1,0.061,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.03,ALWAYS}~{12163,1,1,0.013000000000000001,ALWAYS}'), (5874, '{526,1,1,0.0,ALWAYS}', '{555,6,6,0.0,COMMON}~{559,7,7,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{558,13,19,0.0,UNCOMMON}~{1438,1,1,0.0,UNCOMMON}~{877,8,8,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{5016,1,1,0.0,RARE}~{5018,1,1,0.0,RARE}~{1381,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,UNCOMMON}~{7907,1,1,0.0,COMMON}~{1949,1,1,0.0,UNCOMMON}~{2307,1,1,0.0,COMMON}~{1917,1,1,0.0,RARE}~{10999,1,1,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1101,1,1,0.0,COMMON}~{590,1,1,0.0,UNCOMMON}~{2705,1,1,0.0,RARE}~{995,5,49,0.0,COMMON}~{1987,3,3,0.0,UNCOMMON}', '{0,1,1,0.87,ALWAYS}~{12158,1,1,0.061,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.03,ALWAYS}~{12163,1,1,0.013000000000000001,ALWAYS}'), (5875, '{526,1,1,0.0,ALWAYS}', '{555,6,6,0.0,COMMON}~{559,7,7,0.0,UNCOMMON}~{557,4,4,0.0,UNCOMMON}~{558,13,19,0.0,UNCOMMON}~{1438,1,1,0.0,UNCOMMON}~{877,8,8,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{5016,1,1,0.0,RARE}~{5018,1,1,0.0,RARE}~{1381,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,UNCOMMON}~{7907,1,1,0.0,COMMON}~{1949,1,1,0.0,UNCOMMON}~{2307,1,1,0.0,COMMON}~{1917,1,1,0.0,RARE}~{10999,1,1,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1101,1,1,0.0,COMMON}~{590,1,1,0.0,UNCOMMON}~{2694,1,1,0.0,RARE}~{995,5,49,0.0,COMMON}~{1987,3,3,0.0,UNCOMMON}', '{0,1,1,0.87,ALWAYS}~{12158,1,1,0.061,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.03,ALWAYS}~{12163,1,1,0.013000000000000001,ALWAYS}'), @@ -19071,9 +19071,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (6078, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2731,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6079, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2733,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6080, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2745,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(6081, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2741,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); +(6081, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2741,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(6091, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2803,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(6091, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2803,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6092, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2825,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6093, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{1381,1,1,0.0,COMMON}~{1203,1,1,0.0,COMMON}~{1137,1,1,0.0,COMMON}~{882,1,11,0.0,COMMON}~{1420,1,1,0.0,COMMON}~{1349,1,1,0.0,UNCOMMON}~{884,1,1,0.0,UNCOMMON}~{884,12,15,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1323,1,1,0.0,RARE}~{886,1,1,0.0,RARE}~{556,12,15,0.0,COMMON}~{555,2,9,0.0,COMMON}~{557,1,3,0.0,COMMON}~{554,2,2,0.0,COMMON}~{558,1,25,0.0,COMMON}~{562,3,8,0.0,UNCOMMON}~{561,1,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{560,1,50,0.0,RARE}~{995,1,65,0.0,COMMON}~{1925,1,1,0.0,UNCOMMON}~{2,3,3,0.0,UNCOMMON}~{1947,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{2349,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,RARE}~{1623,1,1,0.0,RARE}~{4440,1,1,0.0,RARE}~{2829,1,1,0.0,RARE}~{121,1,1,0.0,UNCOMMON}~{3036,1,1,0.0,UNCOMMON}~{175,1,1,0.0,UNCOMMON}~{155,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6099, '{526,1,1,0.0,ALWAYS}', '{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1351,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1203,1,1,0.0,UNCOMMON}~{1349,1,1,0.0,UNCOMMON}~{1420,1,1,0.0,UNCOMMON}~{884,58,58,0.0,UNCOMMON}~{886,5,32,0.0,COMMON}~{888,12,12,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{559,3,11,0.0,COMMON}~{562,4,4,0.0,UNCOMMON}~{556,3,3,0.0,UNCOMMON}~{554,7,84,0.0,UNCOMMON}~{558,5,7,0.0,UNCOMMON}~{561,5,5,0.0,UNCOMMON}~{563,2,2,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{6476,1,1,0.0,UNCOMMON}~{7863,1,1,0.0,UNCOMMON}~{995,1,82,0.0,COMMON}~{313,1,9,0.0,COMMON}~{3420,2,2,0.0,UNCOMMON}~{590,1,1,0.0,UNCOMMON}~{966,1,1,0.0,UNCOMMON}~{1917,1,1,0.0,UNCOMMON}~{436,1,1,0.0,UNCOMMON}~{440,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{592,1,1,0.0,UNCOMMON}~{221,1,1,0.0,UNCOMMON}~{1594,1,1,0.0,UNCOMMON}~{2331,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), @@ -19150,9 +19150,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (6261, '{526,1,1,0.0,ALWAYS}', '{808,95,100,0.0,COMMON}~{11724,1,1,0.0,VERY_RARE,5400}~{11726,1,1,0.0,VERY_RARE,5400}~{11728,1,1,0.0,VERY_RARE,5400}~{11710,1,1,0.0,VERY_RARE}~{11712,1,1,0.0,VERY_RARE}~{11714,1,1,0.0,VERY_RARE}~{564,25,30,0.0,COMMON}~{561,20,28,0.0,COMMON}~{886,95,100,0.0,COMMON}~{995,1300,1450,0.0,COMMON}~{9741,1,1,0.0,COMMON}~{1025,1,1,0.0,COMMON}~{385,2,2,0.0,COMMON}~{7054,3,3,0.0,COMMON}~{2735,1,1,0.0,RARE}', ''), (6263, '{526,1,1,0.0,ALWAYS}', '{808,95,100,0.0,COMMON}~{11724,1,1,0.0,VERY_RARE,5400}~{11726,1,1,0.0,VERY_RARE,5400}~{11728,1,1,0.0,VERY_RARE,5400}~{11710,1,1,0.0,VERY_RARE}~{11712,1,1,0.0,VERY_RARE}~{11714,1,1,0.0,VERY_RARE}~{564,25,30,0.0,COMMON}~{886,95,100,0.0,COMMON}~{995,1300,1500,0.0,COMMON}~{225,5,5,0.0,COMMON}~{1917,1,1,0.0,COMMON}~{1971,1,1,0.0,COMMON}~{385,2,2,0.0,COMMON}~{9741,1,1,0.0,COMMON}~{1025,1,1,0.0,COMMON}~{7054,3,3,0.0,COMMON}~{2733,1,1,0.0,RARE}', ''), (6265, '{526,1,1,0.0,ALWAYS}', '{808,95,100,0.0,COMMON}~{11724,1,1,0.0,VERY_RARE,5400}~{11726,1,1,0.0,VERY_RARE,5400}~{11728,1,1,0.0,VERY_RARE,5400}~{11710,1,1,0.0,VERY_RARE}~{11712,1,1,0.0,VERY_RARE}~{11714,1,1,0.0,VERY_RARE}~{564,25,30,0.0,COMMON}~{561,15,20,0.0,COMMON}~{886,95,100,0.0,COMMON}~{995,1300,1500,0.0,COMMON}~{9741,1,1,0.0,COMMON}~{1025,1,1,0.0,COMMON}~{385,2,2,0.0,COMMON}~{7054,3,3,0.0,COMMON}~{2741,1,1,0.0,RARE}', ''), -(6267, '{532,1,1,0.0,ALWAYS}', '{7844,1,1,0.0,COMMON}~{10977,1,1,0.0,RARE}~{10976,1,1,0.0,RARE}~{5323,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.8250000000000001,ALWAYS}~{12158,1,1,0.136,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.015,ALWAYS}~{12163,1,1,0.004,ALWAYS}'); +(6267, '{532,1,1,0.0,ALWAYS}', '{7844,1,1,0.0,COMMON}~{10977,1,1,0.0,RARE}~{10976,1,1,0.0,RARE}~{5323,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5321,1,1,0.0,RARE}~{5299,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.8250000000000001,ALWAYS}~{12158,1,1,0.136,ALWAYS}~{12159,1,1,0.02,ALWAYS}~{12160,1,1,0.015,ALWAYS}~{12163,1,1,0.004,ALWAYS}'), +(6268, '{3125,1,1,0.0,ALWAYS}', '{1237,1,1,0.0,COMMON}~{1239,1,1,0.0,COMMON}~{827,3,5,0.0,UNCOMMON}~{561,2,2,0.0,COMMON}~{561,5,5,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5292,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{1533,1,1,0.0,COMMON}~{1525,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{199,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{946,1,1,0.0,COMMON}~{2114,2,2,0.0,COMMON}~{6306,22,22,0.0,COMMON}~{995,22,22,0.0,COMMON}~{7847,1,1,0.0,COMMON}~{532,1,6,0.0,COMMON}~{526,1,1,0.0,COMMON}~{526,2,2,0.0,COMMON}~{1963,1,1,0.0,UNCOMMON}~{2819,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.56,ALWAYS}~{12158,1,1,0.386,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.025,ALWAYS}~{12163,1,1,0.004,ALWAYS}'); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(6268, '{3125,1,1,0.0,ALWAYS}', '{1237,1,1,0.0,COMMON}~{1239,1,1,0.0,COMMON}~{827,3,5,0.0,UNCOMMON}~{561,2,2,0.0,COMMON}~{561,5,5,0.0,COMMON}~{5100,1,1,0.0,COMMON}~{5292,1,1,0.0,COMMON}~{5293,1,1,0.0,COMMON}~{5294,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{1533,1,1,0.0,COMMON}~{1525,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{199,1,1,0.0,COMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{217,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{946,1,1,0.0,COMMON}~{2114,2,2,0.0,COMMON}~{6306,22,22,0.0,COMMON}~{995,22,22,0.0,COMMON}~{7847,1,1,0.0,COMMON}~{532,1,6,0.0,COMMON}~{526,1,1,0.0,COMMON}~{526,2,2,0.0,COMMON}~{1963,1,1,0.0,UNCOMMON}~{2819,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.56,ALWAYS}~{12158,1,1,0.386,ALWAYS}~{12159,1,1,0.025,ALWAYS}~{12160,1,1,0.025,ALWAYS}~{12163,1,1,0.004,ALWAYS}'), (6269, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2739,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6270, '{532,1,2,0.0,ALWAYS}', '{1309,1,1,0.0,COMMON}~{1207,1,1,0.0,COMMON}~{1424,1,1,0.0,COMMON}~{1281,1,1,0.0,COMMON}~{1283,1,1,0.0,COMMON}~{1217,1,1,0.0,COMMON}~{869,4,19,0.0,COMMON}~{1295,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1311,1,1,0.0,COMMON}~{1297,1,1,0.0,COMMON}~{1313,1,1,0.0,UNCOMMON}~{1209,1,1,0.0,UNCOMMON}~{1299,1,1,0.0,UNCOMMON}~{1430,1,1,0.0,UNCOMMON}~{1317,1,1,0.0,RARE}~{886,5,5,0.0,RARE}~{1213,1,1,0.0,RARE}~{1101,1,1,0.0,COMMON}~{1105,1,1,0.0,COMMON}~{1153,1,1,0.0,UNCOMMON}~{1191,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1181,1,1,0.0,RARE}~{1147,1,1,0.0,RARE}~{563,2,2,0.0,RARE}~{563,3,3,0.0,RARE}~{560,2,2,0.0,RARE}~{561,2,2,0.0,RARE}~{561,3,3,0.0,RARE}~{558,2,2,0.0,RARE}~{558,3,3,0.0,RARE}~{564,2,2,0.0,RARE}~{564,3,3,0.0,RARE}~{555,7,7,0.0,RARE}~{554,15,15,0.0,RARE}~{5101,1,1,0.0,UNCOMMON}~{5318,1,1,0.0,UNCOMMON}~{5320,3,3,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5324,4,4,0.0,UNCOMMON}~{5309,2,2,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,RARE}~{12176,1,1,0.0,RARE}~{5303,1,1,0.0,RARE}~{5280,1,1,0.0,RARE}~{5301,1,1,0.0,RARE}~{5100,1,1,0.0,RARE}~{5297,1,1,0.0,RARE}~{5302,1,1,0.0,RARE}~{5296,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{199,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{203,1,1,0.0,RARE}~{205,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{201,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{995,5,473,0.0,COMMON}~{225,1,1,0.0,COMMON}~{1446,1,1,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{2727,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6271, '{526,1,1,0.0,ALWAYS}', '{1205,1,1,0.0,UNCOMMON}~{1307,1,1,0.0,UNCOMMON}~{3190,1,1,0.0,UNCOMMON}~{1321,1,1,0.0,UNCOMMON}~{1279,1,1,0.0,UNCOMMON}~{1309,1,1,0.0,UNCOMMON}~{1375,1,1,0.0,UNCOMMON}~{807,2,2,0.0,UNCOMMON}~{1207,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1075,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{1101,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{946,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{2688,1,1,0.0,RARE}~{2727,1,1,0.0,RARE}', ''), @@ -19216,9 +19216,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (6381, '', '{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{562,1,2,0.0,UNCOMMON}~{562,8,10,0.0,UNCOMMON}~{555,32,32,0.0,UNCOMMON}~{555,35,35,0.0,UNCOMMON}~{566,1,3,0.0,UNCOMMON}~{247,1,3,0.0,UNCOMMON}~{2815,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6383, '', '{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{562,1,2,0.0,UNCOMMON}~{562,8,10,0.0,UNCOMMON}~{555,32,32,0.0,UNCOMMON}~{555,35,35,0.0,UNCOMMON}~{566,1,3,0.0,UNCOMMON}~{247,1,3,0.0,UNCOMMON}~{2817,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6389, '', '{1311,1,1,0.0,COMMON}~{1365,1,1,0.0,COMMON}~{1353,1,1,0.0,COMMON}~{4153,1,1,0.0,RARE}~{1163,1,1,0.0,UNCOMMON}~{4129,1,1,0.0,UNCOMMON}~{1157,1,1,0.0,RARE}~{554,37,37,0.0,COMMON}~{554,75,75,0.0,COMMON}~{562,15,15,0.0,COMMON}~{560,5,5,0.0,UNCOMMON}~{995,11,498,0.0,COMMON}~{7937,35,35,0.0,UNCOMMON}~{2359,3,3,0.0,UNCOMMON}~{2353,3,3,0.0,UNCOMMON}~{2357,1,1,0.0,UNCOMMON}~{1734,10,10,0.0,UNCOMMON}~{2725,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', '{0,1,1,0.74,ALWAYS}~{12158,1,1,0.09,ALWAYS}~{12159,1,1,0.05,ALWAYS}~{12160,1,1,0.05,ALWAYS}~{12163,1,1,0.07,ALWAYS}'), -(6402, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2701,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''); +(6402, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2701,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), +(6403, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2698,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(6403, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2698,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6404, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2706,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6405, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2680,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6406, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2703,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), @@ -19255,9 +19255,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (6437, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2700,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6438, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2703,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6439, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2709,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), -(6440, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2700,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''); +(6440, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2700,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), +(6441, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2679,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(6441, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2679,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6442, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2687,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6443, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2691,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), (6444, '{526,1,1,0.0,ALWAYS}', '{1203,1,1,0.0,COMMON}~{882,16,16,0.0,COMMON}~{877,8,8,0.0,COMMON}~{1139,1,1,0.0,COMMON}~{1237,1,1,0.0,COMMON}~{1173,1,1,0.0,COMMON}~{1103,1,1,0.0,UNCOMMON}~{1155,1,1,0.0,UNCOMMON}~{1189,1,1,0.0,UNCOMMON}~{1277,1,1,0.0,UNCOMMON}~{1291,1,1,0.0,UNCOMMON}~{1009,1,1,0.0,UNCOMMON}~{884,3,6,0.0,UNCOMMON}~{1381,1,1,0.0,RARE}~{1351,1,1,0.0,RARE}~{825,5,5,0.0,RARE}~{1321,1,1,0.0,RARE}~{1153,1,1,0.0,RARE}~{1141,1,1,0.0,RARE}~{1129,1,1,0.0,RARE}~{1917,1,1,0.0,COMMON}~{2307,1,1,0.0,COMMON}~{1965,1,1,0.0,COMMON}~{2138,1,1,0.0,UNCOMMON}~{556,2,10,0.0,COMMON}~{559,27,27,0.0,COMMON}~{557,4,4,0.0,RARE}~{555,6,6,0.0,COMMON}~{558,2,19,0.0,UNCOMMON}~{565,1,1,0.0,RARE}~{562,1,1,0.0,RARE}~{561,1,1,0.0,RARE}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1438,1,1,0.0,COMMON}~{1949,1,1,0.0,COMMON}~{995,1,24,0.0,COMMON}~{288,1,1,0.0,COMMON}~{1440,1,1,0.0,UNCOMMON}~{1987,1,3,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{10999,1,1,0.0,UNCOMMON}~{7812,1,1,0.0,UNCOMMON}~{9057,1,1,0.0,UNCOMMON}~{9054,1,1,0.0,UNCOMMON}~{2684,1,1,0.0,UNCOMMON}~{946,1,1,0.0,RARE}~{1448,1,1,0.0,RARE}~{438,1,1,0.0,RARE}', ''), @@ -19297,9 +19297,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (6501, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2843,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''), (6502, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2839,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''), (6503, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2829,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''), -(6512, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); +(6512, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(6513, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''); INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES -(6513, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6514, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6515, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (6516, '{532,1,1,0.0,ALWAYS}', '{1341,1,1,0.0,COMMON}~{1345,1,1,0.0,UNCOMMON}~{1361,1,1,0.0,UNCOMMON}~{1141,1,1,0.0,UNCOMMON}~{1339,1,1,0.0,UNCOMMON}~{1145,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{207,1,1,0.0,UNCOMMON}~{217,1,1,0.0,UNCOMMON}~{215,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,RARE}~{5291,1,1,0.0,UNCOMMON}~{5292,1,1,0.0,UNCOMMON}~{5293,1,1,0.0,UNCOMMON}~{5294,1,1,0.0,UNCOMMON}~{5296,1,1,0.0,UNCOMMON}~{5295,1,1,0.0,UNCOMMON}~{12176,1,1,0.0,UNCOMMON}~{5297,1,1,0.0,UNCOMMON}~{5298,1,1,0.0,UNCOMMON}~{5299,1,1,0.0,UNCOMMON}~{5300,1,1,0.0,UNCOMMON}~{5301,1,1,0.0,UNCOMMON}~{5302,1,1,0.0,UNCOMMON}~{5303,1,1,0.0,UNCOMMON}~{5323,1,1,0.0,UNCOMMON}~{5321,1,1,0.0,UNCOMMON}~{5311,1,1,0.0,UNCOMMON}~{5100,1,1,0.0,UNCOMMON}~{5104,1,1,0.0,UNCOMMON}~{5105,1,1,0.0,UNCOMMON}~{5106,1,1,0.0,UNCOMMON}~{5280,1,1,0.0,UNCOMMON}~{5281,1,1,0.0,UNCOMMON}~{5304,1,1,0.0,RARE}~{995,8,8,0.0,COMMON}~{995,35,35,0.0,COMMON}~{561,7,7,0.0,COMMON}~{557,25,25,0.0,COMMON}~{557,45,45,0.0,COMMON}~{563,2,2,0.0,UNCOMMON}~{454,3,3,0.0,UNCOMMON}~{354,3,3,0.0,UNCOMMON}~{7884,1,1,0.0,COMMON}~{10976,1,1,0.0,RARE}~{10977,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), From fb460741a6763c58179f223d517fc5cb661d7756 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:12:53 -0500 Subject: [PATCH 09/18] closes #201 --- Server/server.sql | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Server/server.sql b/Server/server.sql index f811417d5..068d6e3a6 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -3,7 +3,7 @@ -- https://www.phpmyadmin.net/ -- -- Host: localhost --- Generation Time: Mar 25, 2020 at 09:06 PM +-- Generation Time: Mar 25, 2020 at 09:12 PM -- Server version: 10.4.11-MariaDB -- PHP Version: 7.4.3 @@ -18201,13 +18201,13 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (2496, '', '{828,10,10,0.0,UNCOMMON}~{1237,1,1,0.0,UNCOMMON}~{1239,1,1,0.0,UNCOMMON}~{1241,1,1,0.0,UNCOMMON}~{1243,1,1,0.0,UNCOMMON}~{827,10,10,0.0,UNCOMMON}~{231,1,1,0.0,COMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1525,1,1,0.0,UNCOMMON}~{1533,1,1,0.0,UNCOMMON}~{3188,1,1,0.0,COMMON}~{6306,15,62,0.0,COMMON}~{444,1,1,0.0,UNCOMMON}~{1933,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{225,1,1,0.0,UNCOMMON}~{561,3,3,0.0,UNCOMMON}~{2833,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (2497, '', '{828,10,10,0.0,UNCOMMON}~{1237,1,1,0.0,UNCOMMON}~{1239,1,1,0.0,UNCOMMON}~{1241,1,1,0.0,UNCOMMON}~{1243,1,1,0.0,UNCOMMON}~{827,10,10,0.0,UNCOMMON}~{231,1,1,0.0,COMMON}~{199,1,1,0.0,UNCOMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{207,1,1,0.0,RARE}~{209,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{1525,1,1,0.0,UNCOMMON}~{1533,1,1,0.0,UNCOMMON}~{3188,1,1,0.0,COMMON}~{6306,15,62,0.0,COMMON}~{444,1,1,0.0,UNCOMMON}~{1933,1,1,0.0,UNCOMMON}~{438,1,1,0.0,UNCOMMON}~{225,1,1,0.0,UNCOMMON}~{561,3,3,0.0,UNCOMMON}~{2837,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (2547, '{526,1,1,0.0,ALWAYS}', '{199,1,2,0.0,COMMON}~{201,1,2,0.0,COMMON}~{203,1,2,0.0,COMMON}~{205,1,2,0.0,COMMON}~{211,1,2,0.0,UNCOMMON}~{209,1,2,0.0,UNCOMMON}~{213,1,2,0.0,UNCOMMON}~{207,1,2,0.0,UNCOMMON}~{2485,1,2,0.0,UNCOMMON}~{217,1,2,0.0,UNCOMMON}~{215,1,2,0.0,UNCOMMON}~{219,1,2,0.0,RARE}~{563,2,2,0.0,COMMON}~{559,9,9,0.0,COMMON}~{556,9,36,0.0,COMMON}~{557,9,9,0.0,COMMON}~{558,12,12,0.0,COMMON}~{561,3,3,0.0,UNCOMMON}~{995,2,2,0.0,COMMON}~{995,3,3,0.0,COMMON}~{9142,2,12,0.0,COMMON}~{227,1,1,0.0,COMMON}~{1291,1,1,0.0,UNCOMMON}~{231,1,1,0.0,RARE}~{1594,1,1,0.0,RARE}~{1454,1,1,0.0,RARE}~{1137,1,1,0.0,RARE}~{1627,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2591, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2592, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2593, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2594, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2595, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2596, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), -(2597, '', '{1393,1,1,0.0,UNCOMMON}~{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2591, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2592, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2593, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2594, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2595, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2596, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), +(2597, '', '{1387,1,1,0.0,UNCOMMON}~{6568,1,1,0.0,VERY_RARE}~{6526,1,1,0.0,VERY_RARE}~{557,10,80,0.0,COMMON}~{554,10,80,0.0,COMMON}~{556,10,80,0.0,UNCOMMON}~{555,10,80,0.0,UNCOMMON}~{562,5,10,0.0,UNCOMMON}~{561,1,8,0.0,UNCOMMON}~{563,2,5,0.0,UNCOMMON}~{560,1,6,0.0,RARE}~{565,1,6,0.0,RARE}~{4697,1,10,0.0,RARE}~{4699,10,40,0.0,RARE}~{1442,1,1,0.0,RARE}~{6529,1,700,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{9194,1,1,0.0,UNCOMMON}~{7936,4,10,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (2598, '', '{6529,150,800,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{12168,2,2,0.0,COMMON}~{1775,2,2,0.0,UNCOMMON}~{149,1,1,0.0,UNCOMMON}~{161,1,1,0.0,UNCOMMON}~{1780,4,12,0.0,UNCOMMON}~{1391,1,1,0.0,RARE}~{1744,3,3,0.0,RARE}~{1741,3,3,0.0,RARE}~{1738,2,8,0.0,RARE}~{7936,2,6,0.0,RARE}~{379,1,1,0.0,RARE}~{9194,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (2599, '', '{6529,150,800,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{12168,2,2,0.0,COMMON}~{1775,2,2,0.0,UNCOMMON}~{149,1,1,0.0,UNCOMMON}~{161,1,1,0.0,UNCOMMON}~{1780,4,12,0.0,UNCOMMON}~{1391,1,1,0.0,RARE}~{1744,3,3,0.0,RARE}~{1741,3,3,0.0,RARE}~{1738,2,8,0.0,RARE}~{7936,2,6,0.0,RARE}~{379,1,1,0.0,RARE}~{9194,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (2600, '', '{6529,150,800,0.0,COMMON}~{12168,1,1,0.0,COMMON}~{12168,2,2,0.0,COMMON}~{1775,2,2,0.0,UNCOMMON}~{149,1,1,0.0,UNCOMMON}~{161,1,1,0.0,UNCOMMON}~{1780,4,12,0.0,UNCOMMON}~{1391,1,1,0.0,RARE}~{1744,3,3,0.0,RARE}~{1741,3,3,0.0,RARE}~{1738,2,8,0.0,RARE}~{7936,2,6,0.0,RARE}~{379,1,1,0.0,RARE}~{9194,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), From 679c8dd680e976d6fee82987f8e8d3732b93f3fe Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:16:14 -0500 Subject: [PATCH 10/18] closes #200 --- .../src/org/crandor/game/content/skill/member/slayer/Tasks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java b/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java index 772edf6a2..45469b1f5 100644 --- a/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java +++ b/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java @@ -146,7 +146,7 @@ public enum Tasks { return true; } }),*/ - TROLLS(new Task(new int[] { 72, 3584, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1138, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942, 3840, 3841, 3842, 3843, 3845, 1933, 1934, }, new String[] { "Trolls have a crushing attack, it's bets to wear a high crushing defence." }, 1, new Master[] { Master.CHAELDAR, Master.DURADEL, Master.NIEVE }, false)), + TROLLS(new Task(new int[] { 72, 3584, 1098, 1096, 1097, 1095, 1101, 1105, 1102, 1103, 1104, 1130, 1131, 1132, 1133, 1134, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1138, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942, 3840, 3841, 3842, 3843, 3845, 1933, 1934, }, new String[] { "Trolls have a crushing attack, it's bets to wear a high crushing defence." }, 1, new Master[] { Master.CHAELDAR, Master.DURADEL, Master.NIEVE }, false)), TUROTHS(new Task(new int[] { 1626, 1627, 1628, 1629, 1630 }, new String[] { "Turoths are Slayer monsters that require a Slayer level of 55 to kill" }, 55, new Master[] { Master.CHAELDAR, Master.CHAELDAR, Master.NIEVE }, false)), TZHAAR(new Task(new int[] { 2591, 2592, 2593, 2745, 2594, 2595, 2596, 2597, 2604, 2605, 2606, 2607, 2608, 2609, 7755, 7753, 2598, 2599, 2600, 2601, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2624, 2617, 2618, 2625, 2602, 2603, 7754, 7767, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2624, 2625, 2627, 2628, 2629, 2630, 2631, 2632, 7746, 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7754, 7755, 7756, 7757, 7758, 7759, 7760, 7761, 7762, 7763, 7764, 7765, 7766, 7767, 7768, 7769, 7770, 7771, 7747, 7747, 7748, 7749, 7750, 7751, 7752, 7753, 7757, 7765, 7769, 7768 }, new String[] { "Young Tzhaar's of the century are furious with your kind." }, 1, new Master[] { Master.DURADEL }, false)), VAMPIRES(new Task(new int[] { 1023, 1220, 1223, 1225, 6214 }, new String[] { "Vampies arr equiped with large fangs", "they can do serious damage." }, 1, new Master[] { Master.MAZCHNA, Master.VANNAKA }, false)), From fa00a932a717419b9c3f1c3313885518840cde85 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:44:06 -0500 Subject: [PATCH 11/18] closes #199 --- .../content/global/consumable/Potion.java | 7 +++- .../src/plugin/consumable/PotionPlugin.java | 41 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/global/consumable/Potion.java b/Server/src/org/crandor/game/content/global/consumable/Potion.java index 7f5479dea..bb5daeee0 100644 --- a/Server/src/org/crandor/game/content/global/consumable/Potion.java +++ b/Server/src/org/crandor/game/content/global/consumable/Potion.java @@ -103,7 +103,12 @@ public class Potion extends Drink { */ public void remove(final Player player, final Item item, final int doses, boolean message) { int dose = getDose(item) - (doses == 1 ? 0 : doses - 1); - int replaceId = (int) (dose == 1 ? VIAL.getId() : effect.getItemIds()[(4 - dose) + 1]); + int replaceId; + if(item.getId() == 11465 || item.getId() == 11467){ + replaceId = (int) (dose == 1 ? VIAL.getId() : effect.getItemIds()[(2 - dose) + 1]); + } else { + replaceId = (int) (dose == 1 ? VIAL.getId() : effect.getItemIds()[(4 - dose) + 1]); + } if (replaceId != -1) { dose--; player.getInventory().replace(new Item(replaceId), item.getSlot()); diff --git a/Server/src/plugin/consumable/PotionPlugin.java b/Server/src/plugin/consumable/PotionPlugin.java index 6f688f04d..06f4a77d7 100644 --- a/Server/src/plugin/consumable/PotionPlugin.java +++ b/Server/src/plugin/consumable/PotionPlugin.java @@ -31,6 +31,7 @@ public final class PotionPlugin implements Plugin { new EnergyPotion().newInstance(arg); new FishingPotion().newInstance(arg); new PrayerPotion().newInstance(arg); + new PrayerMix().newInstance(arg); new RelicymsBalm().newInstance(arg); new RestorePotion().newInstance(arg); new SaradominBrew().newInstance(arg); @@ -315,6 +316,46 @@ public final class PotionPlugin implements Plugin { } } + /** + * Represents the barbarian prayer potion mix + * @author ceik + */ + public class PrayerMix extends Potion { + + public PrayerMix() { + /** + * empty. + */ + } + + public PrayerMix(Effect effect) { + super(effect); + super.emptyItem = VIAL; + } + + @Override + public Plugin newInstance(Object arg) throws Throwable { + Consumables.add(new PrayerMix(new Effect("Prayer mix", new int[] { 11465, 11467 }, null))); + return this; + } + + @Override + public void effect(final Player player, final Item item) { + int level = player.getSkills().getStaticLevel(Skills.PRAYER); + int amt = 7 + (level / 4); + player.getSkills().incrementPrayerPoints(amt); + int hpDeficit = player.getSkills().getLifepoints() - player.getSkills().getMaximumLifepoints(); + if(hpDeficit <= -6){ + player.getSkills().setLifepoints(player.getSkills().getLifepoints() + 6); + return; + } else if (hpDeficit <= 0){ + player.getSkills().setLifepoints(player.getSkills().getMaximumLifepoints()); + return; + } + } + + } + /** * Represents the anti-poison plugin. * @author 'Vexia From f2161044ca5ca544354b9164ad1c033f6b4fe45b Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:46:09 -0500 Subject: [PATCH 12/18] closes #198 --- .../src/org/crandor/game/content/skill/member/slayer/Tasks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java b/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java index 45469b1f5..bcfe1b3c6 100644 --- a/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java +++ b/Server/src/org/crandor/game/content/skill/member/slayer/Tasks.java @@ -20,7 +20,7 @@ public enum Tasks { BEARS(new Task(new int[] { 106, 105, 1195, 3645, 3664, 1326, 1327 }, new String[] { "A large animal with a crunching punch." }, 1, new Master[] { Master.TURAEL, Master.MAZCHNA }, false)), BIRDS(new Task(new int[] { 1475, 5120, 5121, 5122, 5123, 5133, 1475, 1476, 41, 951, 1017, 1401, 1402, 2313, 2314, 2315, 1016, 1550, 147, 1180, 1754, 1755, 1756, 2252, 4570, 4571, 1911, 6114, 46, 2693, 6113, 6112, 146, 149, 150, 450, 451, 1179, 1322, 1323, 1324, 1325, 1400, 2726, 2727, 3197, 138, 48, 4373, 4374, 4535, 139, 1751, 148, 1181, 6382, 2459, 2460, 2461, 2462, 2707, 2708, 6115, 6116, 3296, 6378, 1996, 3675, 3676, 6792, 6946, 7320, 7322, 7324, 7326, 7328, 1692, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, 6295, 6322, 6323, 6324, 6325, 6326, 6327, 6328, 6329, 6330, 6331, 6332, }, new String[] { "irds aren't the most intelligent of creatures, but watch out for their", "sharp, stabbing beaks." }, 1, new Master[] { Master.TURAEL }, false)), BLACK_DEMONS(new Task(new int[] { 84, 677, 4702, 4703, 4704, 4705, }, new String[] { "Black Demons are magic creatures that are weak to magic attacks.", "They're the strongest demon and very dangerous." }, 1, new Master[] { Master.DURADEL, Master.NIEVE }, false)), - BLACK_DRAGONS(new Task(new int[] { 54, 4673, 4674, 4675, 4676, 3376 }, new String[] { "Black dragons are the strongest dragons", "watch out for their firey breath" }, 1, new Master[] { Master.DURADEL, Master.NIEVE }, false, 40 | 80 << 16)), + BLACK_DRAGONS(new Task(new int[] { 240, 54, 4673, 4674, 4675, 4676, 3376 }, new String[] { "Black dragons are the strongest dragons", "watch out for their firey breath" }, 1, new Master[] { Master.DURADEL, Master.NIEVE }, false, 40 | 80 << 16)), BLOODVELDS(new Task(new int[] { 1618, 1619, 6215, 7643, 7642 }, new String[] { "Bloodvelds are strange demonic creatures, they use their long rasping tongue", "to feed on just about anything they can find." }, 50, new Master[] { Master.VANNAKA, Master.CHAELDAR, Master.DURADEL, Master.NIEVE }, false)), BLUE_DRAGONS(new Task(new int[] { 55, 4681, 4682, 4683, 4684, 5178, 52, 4665, 4666, }, new String[] { "Blue dragons aren't as strong as other dragons but they're still", "very powerful, watch out for their firey breath." }, 1, new Master[] { Master.CHAELDAR, Master.DURADEL, Master.NIEVE }, false)), BRINE_RATS(new Task(new int[] { 3707 }, new String[] { "Small little creatures they are, yet so very", "powerfull." }, 47, new Master[] { Master.VANNAKA, Master.CHAELDAR, Master.NIEVE }, false)), From 07b6e2059b7b943f997b03c12ceda47a66b35f59 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 15:55:49 -0500 Subject: [PATCH 13/18] closes #197 --- Server/src/plugin/quest/wlbelow/WLBelowPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/quest/wlbelow/WLBelowPlugin.java b/Server/src/plugin/quest/wlbelow/WLBelowPlugin.java index 1aa4a53de..317f9db1a 100644 --- a/Server/src/plugin/quest/wlbelow/WLBelowPlugin.java +++ b/Server/src/plugin/quest/wlbelow/WLBelowPlugin.java @@ -185,10 +185,10 @@ public class WLBelowPlugin extends OptionHandler { player.sendMessage("You need 15 chaos runes."); return true; } - if (!player.getInventory().containsItem(CHAOS_TALISMAN) && !player.getInventory().containsItem(CHAOS_TIARA)) { + /*if (!player.getInventory().containsItem(CHAOS_TALISMAN) && !player.getInventory().containsItem(CHAOS_TIARA)) { player.sendMessage("You need a chaos talisman or chaos tiara."); return true; - } + }*/ Item chaosItem = player.getInventory().containsItem(CHAOS_TALISMAN) ? CHAOS_TALISMAN : CHAOS_TIARA; if (chaosItem != null && player.getInventory().remove(CHAOS_RUNES)) { player.lock(5); From 7f0b7fc5f13e85768cdaf4f6727a73836d69a634 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 16:11:56 -0500 Subject: [PATCH 14/18] closes #194 --- .../game/content/skill/free/firemaking/FireMakingPulse.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java b/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java index 74fd32e67..98bb0eee0 100644 --- a/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java +++ b/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java @@ -89,6 +89,9 @@ public final class FireMakingPulse extends SkillPulse { player.removeAttribute("remove-log"); if (player.getInventory().remove(node)) { GroundItemManager.create(groundItem); + if (groundItem.getId() == 1521 && !player.getAchievementDiaryManager().getDiary(DiaryType.LUMBRIDGE).isComplete(0, 4)) { + player.getAchievementDiaryManager().updateTask(player, DiaryType.LUMBRIDGE, 0, 4, true); + } } } return true; @@ -116,9 +119,6 @@ public final class FireMakingPulse extends SkillPulse { if (!success()) { return false; } - if (player.getViewport().getRegion().getId() == 12850 && !player.getAchievementDiaryManager().getDiary(DiaryType.LUMBRIDGE).isComplete(0, 4)) { - player.getAchievementDiaryManager().updateTask(player, DiaryType.LUMBRIDGE, 0, 4, true); - } createFire(); return true; } From 17f5ae6da1bc130c1abf21c1447e57ec40ed5efc Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 16:29:17 -0500 Subject: [PATCH 15/18] closes #193 --- Server/src/plugin/quest/animal_mag/AvaDialogue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/plugin/quest/animal_mag/AvaDialogue.java b/Server/src/plugin/quest/animal_mag/AvaDialogue.java index d986875c6..9cffab2d1 100644 --- a/Server/src/plugin/quest/animal_mag/AvaDialogue.java +++ b/Server/src/plugin/quest/animal_mag/AvaDialogue.java @@ -57,7 +57,7 @@ public final class AvaDialogue extends DialoguePlugin { quest = player.getQuestRepository().getQuest(AnimalMagnetism.NAME); if (!quest.hasRequirements(player)) { player.getPacketDispatch().sendMessage("She doesn't seem interested in talking to you."); - return true; + return false; } switch (quest.getStage(player)) { case 0: From b89f97aea4f297eccc1a72bcfc6e19e5fa32f29d Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 16:37:48 -0500 Subject: [PATCH 16/18] Whoops --- Server/src/org/crandor/game/content/ame/AntiMacroHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java b/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java index ba7585705..718386b1a 100644 --- a/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java +++ b/Server/src/org/crandor/game/content/ame/AntiMacroHandler.java @@ -125,7 +125,7 @@ public final class AntiMacroHandler implements SavingModule { } if (!player.getLocks().isInteractionLocked() && !player.getLocks().isTeleportLocked() && !player.getLocks().isMovementLocked()) { for (int i = 0; i < monitors.length; i++) { - FIRE_RATIO = 1; + FIRE_RATIO = 250; if (chanceRatio[i] > FIRE_RATIO && !isDisabled) { fireEvent(i); } From b837912bea9549722415343dafc655075f7a95f4 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 17:02:19 -0500 Subject: [PATCH 17/18] Fixed a duplication bug with pyramid --- .../agility/pyramid/AgilityPyramidCourse.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java index 7cac5d94f..622e5101d 100644 --- a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java +++ b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java @@ -152,6 +152,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { } player.getDialogueInterpreter().sendDialogue("You climb down the steep passage. It leads to the base of the", "pyramid."); player.getProperties().setTeleportLocation(Location.create(3364, 2830, 0)); + player.setAttribute("hasptop",false); break; } return true; @@ -367,21 +368,27 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param object the object. */ private void handlePyramidTop(final Player player, final GameObject object) { - player.animate(Animation.create(3063)); - GameWorld.submit(new Pulse(3, player) { - @Override - public boolean pulse() { - player.getSkills().addExperience(Skills.AGILITY,1000); - if (player.getConfigManager().get(640) == 505 || player.getConfigManager().get(640) == 515) { - player.getPacketDispatch().sendMessage("You find nothing on top of the pyramid."); + if(player.getAttribute("hasptop",false)){ + player.getPacketDispatch().sendMessage("You've already claimed this!"); + return; + } else { + player.animate(Animation.create(3063)); + GameWorld.submit(new Pulse(3, player) { + @Override + public boolean pulse() { + player.getSkills().addExperience(Skills.AGILITY, 1000); + if (player.getConfigManager().get(640) == 505 || player.getConfigManager().get(640) == 515) { + player.getPacketDispatch().sendMessage("You find nothing on top of the pyramid."); + return true; + } + addConfig(player, 10869, 1, true); + player.setAttribute("hasptop", true); + player.getInventory().add(PYRAMID_TOP, player); + player.getDialogueInterpreter().sendItemMessage(PYRAMID_TOP, "You find a golden pyramid!"); return true; } - addConfig(player, 10869, 1, true); - player.getInventory().add(PYRAMID_TOP, player); - player.getDialogueInterpreter().sendItemMessage(PYRAMID_TOP, "You find a golden pyramid!"); - return true; - } - }); + }); + } } /** From daa4e1afba7e731b84eeb5072e41cd8e93c884b1 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Wed, 25 Mar 2020 17:13:57 -0500 Subject: [PATCH 18/18] Fixed a duplication bug with pyramid --- .../game/node/entity/player/link/ActivityData.java | 13 +++++++++++++ .../skill/agility/pyramid/AgilityPyramidCourse.java | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Server/src/org/crandor/game/node/entity/player/link/ActivityData.java b/Server/src/org/crandor/game/node/entity/player/link/ActivityData.java index 5eb902bd2..07c030fcf 100644 --- a/Server/src/org/crandor/game/node/entity/player/link/ActivityData.java +++ b/Server/src/org/crandor/game/node/entity/player/link/ActivityData.java @@ -110,6 +110,11 @@ public final class ActivityData implements SavingModule { */ private boolean hardcoreDeath; + /** + * Pyramid plunder top (is it grabbed?) + */ + boolean topGrabbed; + /** * Constructs a new {@code ActivityInfo} {@code Object}. */ @@ -160,6 +165,7 @@ public final class ActivityData implements SavingModule { SavedData.save(buffer, fogRating, 19); SavedData.save(buffer, borkKills, 20); SavedData.save(buffer, hardcoreDeath, 21); + SavedData.save(buffer, topGrabbed, 22); buffer.put((byte) 0); } @@ -239,6 +245,9 @@ public final class ActivityData implements SavingModule { case 21: hardcoreDeath = SavedData.getBoolean(buffer); break; + case 22: + topGrabbed = SavedData.getBoolean(buffer); + break; } } } @@ -649,4 +658,8 @@ public final class ActivityData implements SavingModule { public void setHardcoreDeath(boolean hardcoreDeath) { this.hardcoreDeath = hardcoreDeath; } + public void setTopGrabbed(boolean topGrabbed){ + this.topGrabbed = topGrabbed; + } + public boolean isTopGrabbed(){return topGrabbed;} } \ No newline at end of file diff --git a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java index 622e5101d..95d85d620 100644 --- a/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java +++ b/Server/src/plugin/skill/agility/pyramid/AgilityPyramidCourse.java @@ -152,7 +152,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { } player.getDialogueInterpreter().sendDialogue("You climb down the steep passage. It leads to the base of the", "pyramid."); player.getProperties().setTeleportLocation(Location.create(3364, 2830, 0)); - player.setAttribute("hasptop",false); + player.getSavedData().getActivityData().setTopGrabbed(false); break; } return true; @@ -368,7 +368,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param object the object. */ private void handlePyramidTop(final Player player, final GameObject object) { - if(player.getAttribute("hasptop",false)){ + if(player.getSavedData().getActivityData().isTopGrabbed() == true){ player.getPacketDispatch().sendMessage("You've already claimed this!"); return; } else { @@ -382,7 +382,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { return true; } addConfig(player, 10869, 1, true); - player.setAttribute("hasptop", true); + player.getSavedData().getActivityData().setTopGrabbed(true); player.getInventory().add(PYRAMID_TOP, player); player.getDialogueInterpreter().sendItemMessage(PYRAMID_TOP, "You find a golden pyramid!"); return true;