Merge branch 'master' into feature/blocking_play

conf/battle/homunc.conf

@@ -95,3 +95,13 @@ idletime_hom_option: 0x1F
 // Only applies to renewal mode.
 // Official: 10%
 homunculus_exp_gain: 10
+
+// The hunger rate, less than or equal to, at which a homunculus' hunger delay changes. (Note 2)
+// See 'homunculus_starving_delay' for the delay value.
+// Set to 0 to disable.
+// Official: 10
+homunculus_starving_rate: 10
+
+// Homunculi normally lose hunger every 60 seconds but when the 'homunculus_starving_rate' is met the hunger delay drops to 20 seconds (in milliseconds).
+// Official: 20 seconds
+homunculus_starving_delay: 20000

conf/battle/misc.conf

@@ -114,6 +114,9 @@ at_timeout: 0
 // Makes player cannot be attacked when autotrade? (turns player's state.monster_ignore) (Note 1)
 at_monsterignore: no
 
+// Should autotrade trigger OnPCLogout script events? (Note 1)
+at_logout_event: yes
+
 // Auction system, fee per hour. Default is 12000
 auction_feeperhour: 12000
 

conf/battle/player.conf

@@ -272,8 +272,7 @@ fame_pharmacy_10: 50
 idletime_option: 0x1F
 
 // Adjust the summoner class' special traits.
-// 0: Summoners behave like other classes.
-// 1: Summoners belong to brute race instead of demi-human
-// 2: Summoners are small size instead of medium
-// 3: Both of the above (official value)
-summoner_trait: 3
+// - Summoners belong to brute race category. They have their own race RC_PLAYER_DORAM (11) to be differentiated from monster race RC_BRUTE (2).
+// - Summoners are small size (0) instead of medium (1)
+summoner_race: 11
+summoner_size: 0

conf/char_athena.conf

@@ -284,4 +284,10 @@ mail_return_days: 15
 // Default: 15
 mail_delete_days: 15
 
+// Does the Retrieve All button ignore unread mail status?
+// no: Only return attachments from read mail
+// yes: Return attachments from all mail
+// Default: yes
+mail_retrieve: yes
+
 import: conf/import/char_conf.txt

conf/login_athena.conf

@@ -163,6 +163,10 @@ dnsbl_servers: bl.blocklist.de, socks.dnsbl.sorbs.net
 // Note: see 'doc/md5_hashcheck.txt' for more details.
 client_hash_check: off
 
+// Enable web authentication token system
+// This is required for new clients that get data via an additional API over HTTP
+use_web_auth_token: yes
+
 // Client MD5 hashes
 // The client with the specified hash can be used to log in by players with
 // a group_id equal to or greater than the given value.

conf/msg_conf/map_msg.conf

@@ -1719,5 +1719,9 @@
 1511: >    HUNTING   : %d
 1512: >    PLAYTIME  : %d
 
+// @changegm
+1513: Currently in WoE hours, unable to delegate Guild leader
+1514: You have to wait for a while before delegating a new Guild leader
+
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt

conf/msg_conf/map_msg_spn.conf

@@ -1666,5 +1666,9 @@
 1503: Has entrado en una zona PK.
 1504: Has entrado en una zona PK (segura hasta el nivel %d).
 
+// @changegm
+1513: No puedes delegar el liderazgo del clan durante el horario de WoE
+1514: Debes esperar un tiempo antes de poder designar un nuevo líder de clan
+
 //Traducciones personalizadas
 import: conf/msg_conf/import/map_msg_spn_conf.txt

db/const.txt

@@ -48,7 +48,7 @@ RDMOPT_ATTR_TOLERACE_SAINT	31
 RDMOPT_ATTR_TOLERACE_DARKNESS	32
 RDMOPT_ATTR_TOLERACE_TELEKINESIS	33
 RDMOPT_ATTR_TOLERACE_UNDEAD	34
-RDMOPT_ATTR_TOLERACE_ALL	35
+RDMOPT_ATTR_TOLERACE_ALLBUTNOTHING	35
 RDMOPT_DAMAGE_PROPERTY_NOTHING_USER	36
 RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET	37
 RDMOPT_DAMAGE_PROPERTY_WATER_USER	38
@@ -99,7 +99,7 @@ RDMOPT_BODY_ATTR_SAINT	82
 RDMOPT_BODY_ATTR_DARKNESS	83
 RDMOPT_BODY_ATTR_TELEKINESIS	84
 RDMOPT_BODY_ATTR_UNDEAD	85
-RDMOPT_BODY_ATTR_ALL	86
+//RDMOPT_BODY_ATTR_ALL	86
 RDMOPT_RACE_TOLERACE_NOTHING	87
 RDMOPT_RACE_TOLERACE_UNDEAD	88
 RDMOPT_RACE_TOLERACE_ANIMAL	89
@@ -186,8 +186,8 @@ RDMOPT_HEAL_MODIFY_PERCENT	169
 RDMOPT_DEC_SPELL_CAST_TIME	170
 RDMOPT_DEC_SPELL_DELAY_TIME	171
 RDMOPT_DEC_SP_CONSUMPTION	172
-RDMOPT_HP_DRAIN	173
-RDMOPT_SP_DRAIN	174
+//RDMOPT_HP_DRAIN	173
+//RDMOPT_SP_DRAIN	174
 RDMOPT_WEAPON_ATTR_NOTHING	175
 RDMOPT_WEAPON_ATTR_WATER	176
 RDMOPT_WEAPON_ATTR_GROUND	177
@@ -206,7 +206,44 @@ RDMOPT_MDAMAGE_SIZE_LARGE_TARGET	189
 RDMOPT_MDAMAGE_SIZE_SMALL_USER	190
 RDMOPT_MDAMAGE_SIZE_MIDIUM_USER	191
 RDMOPT_MDAMAGE_SIZE_LARGE_USER	192
-//RDMOPT_ATTR_TOLERACE_ALL	193
+RDMOPT_ATTR_TOLERACE_ALL	193
+RDMOPT_RACE_WEAPON_TOLERACE_NOTHING	194
+RDMOPT_RACE_WEAPON_TOLERACE_UNDEAD	195
+RDMOPT_RACE_WEAPON_TOLERACE_ANIMAL	196
+RDMOPT_RACE_WEAPON_TOLERACE_PLANT	197
+RDMOPT_RACE_WEAPON_TOLERACE_INSECT	198
+RDMOPT_RACE_WEAPON_TOLERACE_FISHS	199
+RDMOPT_RACE_WEAPON_TOLERACE_DEVIL	200
+RDMOPT_RACE_WEAPON_TOLERACE_HUMAN	201
+RDMOPT_RACE_WEAPON_TOLERACE_ANGEL	202
+RDMOPT_RACE_WEAPON_TOLERACE_DRAGON	203
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_TARGET	204
+//RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_USER	205
+RDMOPT_RACE_TOLERACE_PLAYER_HUMAN	206
+RDMOPT_RACE_TOLERACE_PLAYER_DORAM	207
+RDMOPT_RACE_DAMAGE_PLAYER_HUMAN	208
+RDMOPT_RACE_DAMAGE_PLAYER_DORAM	209
+RDMOPT_RACE_MDAMAGE_PLAYER_HUMAN	210
+RDMOPT_RACE_MDAMAGE_PLAYER_DORAM	211
+RDMOPT_RACE_CRI_PERCENT_PLAYER_HUMAN	212
+RDMOPT_RACE_CRI_PERCENT_PLAYER_DORAM	213
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_HUMAN	214
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_DORAM	215
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_HUMAN	216
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_DORAM	217
+//RDMOPT_REFLECT_DAMAGE_PERCENT	218
+RDMOPT_MELEE_ATTACK_DAMAGE_TARGET	219
+RDMOPT_MELEE_ATTACK_DAMAGE_USER	220
+//RDMOPT_ADDSKILLMDAMAGE_NOTHING	221
+//RDMOPT_ADDSKILLMDAMAGE_WATER	222
+//RDMOPT_ADDSKILLMDAMAGE_GROUND	223
+//RDMOPT_ADDSKILLMDAMAGE_FIRE	224
+//RDMOPT_ADDSKILLMDAMAGE_WIND	225
+//RDMOPT_ADDSKILLMDAMAGE_POISON	226
+//RDMOPT_ADDSKILLMDAMAGE_SAINT	227
+//RDMOPT_ADDSKILLMDAMAGE_DARKNESS	228
+//RDMOPT_ADDSKILLMDAMAGE_TELEKINESIS	229
+//RDMOPT_ADDSKILLMDAMAGE_UNDEAD	230
 
 SWORDCLAN	1
 ARCWANDCLAN	2

db/import-tmpl/item_db.txt

@@ -26,7 +26,7 @@
 //5264,Aussie_Flag_Hat,Australian Flag Hat,4,20,,500,,4,,0,0xFFFFFFFF,63,2,256,,0,1,304,{ bonus bAllStats,2; },{},{}
 //5356,Pumpkin_Hat_H,Pumpkin Hat,4,20,,200,,2,,0,0xFFFFFFFF,63,2,256,,0,1,206,{ bonus bAllStats,2; bonus2 bSubRace,RC_Demon,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{}
 //5384,Santa_Hat_1,Twin Pompom By JB,4,20,,200,,2,,1,0xFFFFFFFF,63,2,256,,20,1,390,{ bonus bLuk,3; bonus2 bResEff,Eff_Curse,2000; bonus bVariableCastrate,-2; bonus bAspdRate,4; bonus2 bAddMonsterDropItem,539,100; bonus2 bAddMonsterDropItem,529,200; bonus2 bAddMonsterDropItem,530,200; autobonus "{ bonus bCritical,10; }",10,5000; },{},{}
-//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,63,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; },{},{}
+//5811,Santa_Beard,Santa Beard,4,20,,100,,5,,0,0xFFFFFFFF,63,2,1,,0,0,25,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Player_Doram,5; },{},{}
 
 //11702,Moon_Cookie,Moon Cookie,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_end SC_POISON; sc_end SC_SILENCE; sc_end SC_BLIND; sc_end SC_CONFUSION; sc_end SC_CURSE; sc_end SC_HALLUCINATION; itemskill "AL_BLESSING",7; },{},{}
 //12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,180000,15; },{},{}

db/import-tmpl/quest_db.yml

@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.

db/pre-re/item_combo_db.txt

@@ -66,18 +66,18 @@
 2357:2421:2524:5171,{ bonus bAllStats,1; }
 2358:5153,{ bonus bLuk,6; bonus bFlee,5; bonus bInt,2; }
 2359:2654,{ bonus bUseSPrate,-20; bonus bMaxHP,300; }
-2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
+2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
 2371:2522,{ bonus bAgi,5; bonus bFlee,10; }
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
 2375:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
-2376:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2377:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
-2378:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2379:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2380:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2381:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
-2382:2437:2540,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2376:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2377:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
+2378:2435:2538,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2379:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2380:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2381:2436:2539,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2382:2437:2540,{ bonus2 bSubRace,RC_All,-300; bonus2 bSubRace,RC_DemiHuman,300; bonus2 bSubRace,RC_Player_Human,300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
 2387:2440:2744,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; }
 2390:2749,{ bonus bFlee2,5; }
 2394:2444:2549,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; }
@@ -137,7 +137,7 @@
 4153:4247:4273,{ bonus3 bAddMonsterDropItem,544,RC_Fish,3000; bonus2 bAddEle,Ele_Water,30; }
 4168:4169,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus bCastrate,-10; }
 4172:4210:4230:4257:4272,{ bonus bAgi,5; bonus bStr,5; bonus bAspdRate,5; bonus bSpeedRate,25; bonus bSPDrainValue,1; if(BaseClass==Job_Thief) bonus bNoGemStone; }
-4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; } }
+4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; bonus2 bComaRace,RC_Player_Doram,100; } }
 4178:4234:4252:4297:4381,{ bonus bDex,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",5; bonus2 bSkillAtk,"DC_THROWARROW",10; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",10; if(BaseJob==Job_Bard||BaseJob==Job_Dancer) bonus3 bAutoSpellWhenHit,"CG_TAROTCARD",2,50; }
 4185:4217:4280:4293:4312,{ bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass==Job_Acolyte) { bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; } }
 4185:4293:4312:4332,{ bonus bStr,3; bonus bMaxSP,80; bonus bBaseAtk,25; bonus3 bAutoSpell,"AL_CRUCIS",5,10; bonus2 bSkillAtk,"MO_EXTREMITYFIST",10; if(BaseJob==Job_Monk) { bonus bUseSPrate,-10; bonus bNoCastCancel; } }
@@ -152,7 +152,7 @@
 4268:4277,{ bonus bBaseAtk,20; bonus bLuk,3; }
 4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; }
 4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; }
-4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player,2; }
+4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player_Human,2; }
 5040:5442,{ bonus bAspdRate,3; bonus bCastrate,3; }
 5068:5653,{ bonus bStr,1; bonus bAtkRate,5; }
 5074:5653,{ bonus bStr,1; bonus bAspdRate,2; }

db/pre-re/mob_skill_db.txt

@@ -714,12 +714,11 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RUN,idle,354,7,10000,0,30000,no,master,alchemist,,,,,,,26,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,afterskill,354,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,yes,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,yes,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
-//1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,0,0,yes,self,always,0,,,,,,,
-//1142,Marine Sphere@NPC_SPEEDUP,any,332,1,10000,0,700,yes,self,always,0,,,,,,,
+1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
 1143,Marionette@HT_FREEZINGTRAP,idle,121,5,500,0,300000,yes,around2,always,0,,,,,,29,
 1143,Marionette@MG_FIREWALL,chase,18,5,500,500,5000,yes,target,always,0,,,,,,2,
 1143,Marionette@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,6,

db/pre-re/pet_db.yml

@@ -461,8 +461,8 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bAddRace,RC_Demihuman,2;
         bonus2 bMagicAddRace,RC_DemiHuman,2;
-        bonus2 bAddRace,RC_Player,2;
-        bonus2 bMagicAddRace,RC_Player,2;
+        bonus2 bAddRace,RC_Player_Human,2;
+        bonus2 bMagicAddRace,RC_Player_Human,2;
       }
   - Mob: ALICE
     TameItem: Sway_Apron
@@ -478,7 +478,7 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus bMdef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player,1;
+        bonus2 bSubRace,RC_Player_Human,1;
       }
   - Mob: EVENT_RICECAKE
     EggItem: Rice_Cake_Egg
@@ -522,7 +522,7 @@ Body:
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus bDef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player,1;
+        bonus2 bSubRace,RC_Player_Human,1;
       }
   - Mob: ECLIPSE_P
     EggItem: Spring_Rabbit_Egg
@@ -670,7 +670,7 @@ Body:
       
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player,3;
+        bonus2 bAddRace,RC_Player_Human,3;
       }
   - Mob: SUCCUBUS
     TameItem: Boy's_Naivety
@@ -839,6 +839,7 @@ Body:
       
       if( .@i >= PET_INTIMATE_LOYAL ){
         bonus2 bSubRace,RC_Brute,3;
+        bonus2 bSubRace,RC_Player_Doram,3;
       }
   - Mob: BACSOJIN_
     TameItem: Shiny_Wing_Gown

db/pre-re/quest_db.yml

@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.

db/pre-re/skill_db.yml

@@ -9404,6 +9404,7 @@ Body:
         Time: 55000
       - Level: 10
         Time: 60000
+    Duration2: 1000
     Requires:
       SpCost: 50
       Weapon:
@@ -27433,6 +27434,7 @@ Body:
     HitCount: 1
     Requires:
       SpCost: 40
+      State: Cart
   - Id: 2552
     Name: RL_RICHS_COIN
     Description: Rich's Coin

db/quest_db.yml

@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.

db/re/item_combo_db.txt

@@ -56,21 +56,23 @@
 1580:2186,{ bonus bAspdRate,15; }
 1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
 1616:2515,{ bonus bSpeedRate,25; }
+1617:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,min(5, getequiprefinerycnt(EQI_HAND_R)-5); bonus2 bSubEle,Ele_Neutral,min(30, getequiprefinerycnt(EQI_GARMENT)*3); }
 1618:2509:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1618:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
+1618:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1618:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,10*.@r; if (.@r>=10) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",15; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",15; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",70; bonus2 bSkillAtk,"WZ_JUPITEL",70; } if (BaseLevel>=100) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",30; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",30; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",140; bonus2 bSkillAtk,"WZ_JUPITEL",140; } }
 1618:20813,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; }
 1618:20813:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1618:20847,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_GARMENT); .@weapon = min(.@weapon,10); bonus bMaxHP,1000; bonus bMatk,(-50+(20*.@weapon)); bonus bDelayrate,-(3*(.@weapon/3)); bonus2 bSubEle,Ele_Neutral,(min(.@eq,10)/2); }
+1619:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1620:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,10*.@r; if (.@r>=10) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",15; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",15; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",70; bonus2 bSkillAtk,"WZ_JUPITEL",70; } if (BaseLevel>=100) { bonus bVariableCastrate,-3; bonus2 bSkillAtk,"WL_EARTHSTRAIN",30; bonus2 bSkillAtk,"WL_CHAINLIGHTNING",30; bonus2 bSkillAtk,"WZ_HEAVENDRIVE",140; bonus2 bSkillAtk,"WZ_JUPITEL",140; } }
 1620:20813,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; }
 1620:20813:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
 1620:2509:19139,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatkRate,1; if (.@r >= 5) { bonus bMatkRate,2; if (.@r >= 7) { bonus bMatkRate,2; } } }
 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1620:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatk,.@r; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
+1620:19020,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10; if (.@r >= 10) { autobonus "{ bonus bVariableCastrate,-50; }",100,5000,BF_MAGIC; /* Confirm: Success rate? */ } }
 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R); }
 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; }
 1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; }
@@ -182,18 +184,18 @@
 2358:5153,{ bonus bLuk,6; bonus bFlee,5; bonus bInt,2; }
 2359:2654,{ bonus bUseSPrate,-20; bonus bMaxHP,300; }
 2365:2881,{ bonus bDelayRate,-15; }
-2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
+2369:2428:2533:5306,{ bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus bMaxHPrate,20; bonus2 bResEff,Eff_Freeze,10000; skill "WZ_FROSTNOVA",10; }
 2371:2522,{ bonus bAgi,5; bonus bFlee,10; }
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
 2375:2729,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; }
-2376:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2377:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
-2378:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2379:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2380:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bVariableCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2381:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
-2382:2437:2540,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player,200; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2376:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bVit,3; bonus bMaxHPRate,12; bonus bHealpower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2377:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor; }
+2378:2435:2538,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bAgi,3; bonus bMaxHPRate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2379:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2380:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bVariableCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2381:2436:2539,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
+2382:2437:2540,{ bonus2 bSubRace,RC_All,-200; bonus2 bSubRace,RC_DemiHuman,200; bonus2 bSubRace,RC_Player_Human,200; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }
 2387:2440:2744,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bVariableCastrate,-3; bonus bDelayrate,-15; }
 2390:2749,{ bonus bFlee2,5; }
 2394:2444:2549,{ bonus2 bAddClass,Class_All,5; bonus bMatkRate,5; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSkillHeal2,"AM_POTIONPITCHER",3; bonus2 bSkillHeal2,"AL_HEAL",3; bonus2 bSkillHeal2,"PR_SANCTUARY",3; }
@@ -275,9 +277,9 @@
 2481:2731,{ bonus bMatkRate,getequiprefinerycnt(EQI_SHOES)/2; bonus bVariableCastrate,-(getequiprefinerycnt(EQI_SHOES)/2); }
 2481:10031,{ bonus bCritical,(getequiprefinerycnt(EQI_SHOES)/2)*10; }
 2482:2585:2895:2896:15045:18578,{ bonus bMaxHP,500; bonus bMaxSP,300; bonus bBaseAtk,10; bonus bDef,10; }
-2483:2586:15046,{ bonus bVit,5; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; }
-2484:2586:15047,{ bonus bDex,5; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; }
-2485:2587:15048,{ bonus bInt,5; bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; }
+2483:2586:15046,{ bonus bVit,5; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player_Human,15; }
+2484:2586:15047,{ bonus bDex,5; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player_Human,15; }
+2485:2587:15048,{ bonus bInt,5; bonus bMdef,10; bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player_Human,15; }
 2507:15146,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bMaxSPrate,10+.@r; bonus bFlee,10+.@r; }
 2507:15163,{ bonus bVariableCastrate,-(2*getequiprefinerycnt(EQI_ARMOR)); bonus bNoCastCancel; }
 2509:15146,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bMaxHPrate,10+.@r; bonus bMatkRate,2+.@r; }
@@ -295,7 +297,7 @@
 2527:13001,{ bonus2 bAddRace,RC_Dragon,5; }
 2527:13030,{ bonus2 bAddRace,RC_Dragon,5; }
 2535:15163,{ bonus5 bAutoSpell,"AL_HEAL",1,(10*getequiprefinerycnt(EQI_ARMOR)),BF_MAGIC,0; }
-2584:5579,{ .@r = getequiprefinerycnt(EQI_GARMENT); if(.@r>=5) { skill "TF_DOUBLE",1; bonus bDoubleRate,25; } else if(.@r>=7) { .@bonus = max(getskilllv("TF_DOUBLE"),5); skill "TF_DOUBLE",.@bonus; bonus bDoubleRate,.@bonus*5; } }
+2584:5579,{ .@r = getequiprefinerycnt(EQI_GARMENT); if(.@r>=7) { .@bonus = max(getskilllv("TF_DOUBLE"),5); skill "TF_DOUBLE",.@bonus; bonus bDoubleRate,.@bonus*5; } else if(.@r>=5) { skill "TF_DOUBLE",1; bonus bDoubleRate,25; } }
 2597:28342,{ bonus bCritAtkRate,5; bonus bCritical,10; .@r = getequiprefinerycnt(EQI_GARMENT); if (.@r > 7) bonus bCritAtkRate,4; else if (.@r > 5) bonus bCritAtkRate,3; }
 //2598:Ramor Shield,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_Undead,.@r; bonus2 bSubRace,RC_DemiHuman,.@r; }
 2607:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
@@ -365,7 +367,7 @@
 2782:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"WZ_WATERBALL",.@a,(.@a*10); }
 2826:2827:5577,{ autobonus "{ bonus bAspdRate,2; }",50,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; bonus bMaxHP,BaseLevel*15; bonus bMaxSP,(BaseLevel*12)/10; bonus2 bAddClass,Class_All,3; }
 28513:18848,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); .@a = min(.@r,10); bonus bAllStats,.@a; bonus bFixedCastrate,-50; if (.@r>=7) { bonus2 bMagicAddClass,Class_Boss,20; } }
-28513:18849,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bAllStats,.@r; bonus2 bMagicAddClass,Class_Boss,10; bonus bFixedCastrate,-50; if (.@r>=7) { bonus2 bMagicAddClass,Class_Boss,20; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; } if (.@r>=9) { bonus2 bMagicAddClass,Class_Boss,20; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } }
+28513:18849,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bAllStats,.@r; bonus2 bMagicAddClass,Class_Boss,10; bonus bFixedCastrate,-50; if (.@r>=7) { bonus2 bMagicAddClass,Class_Boss,20; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; } if (.@r>=9) { bonus2 bMagicAddClass,Class_Boss,20; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } }
 28513:2980,{ bonus bBaseAtk,50; bonus bMatk,50; bonus bAspd,2; bonus3 bAutoSpell,"SO_EARTHGRAVE",1,20; bonus3 bAutoSpell,"SO_VARETYR_SPEAR",1,20; bonus3 bAutoSpell,"WL_RECOGNIZEDSPELL",1,10; bonus3 bAutoSpell,"WZ_QUAGMIRE",3,50; }
 28520:15061,{ .@r = getequiprefinerycnt(EQI_ARMOR); if (.@r >= 7) { .@val = 5000; } else { .@val = 2500; } bonus2 bResEff,Eff_Stun,.@val; bonus2 bResEff,Eff_Silence,.@val; }
 28520:15061:18728:20700:2495,{ bonus bFlee2,30; bonus2 bSubEle,Ele_Water,15; bonus2 bResEff,Eff_Freeze,10000; }
@@ -373,13 +375,13 @@
 28520:20700,{ if (getequiprefinerycnt(EQI_GARMENT)>=7) .@val = 2; else .@val = 1; bonus2 bSubEle,Ele_Fire,25*.@val; bonus2 bSubEle,Ele_Water,25*.@val; }
 28520:2495,{ if (getequiprefinerycnt(EQI_SHOES)>=7) .@val = 2; else .@val = 1; bonus bMaxHPrate,10*.@val; bonus bMaxSPrate,10*.@val; }
 28520:4525,{ bonus bMdef,15; bonus bFlee,100; bonus bMaxHPrate,15; skill "RG_TUNNELDRIVE",1; bonus bIntravision; }
-28521:1387,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; if (.@r>=7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"WS_CARTTERMINATION",5; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,10; bonus2 bSkillAtk,"WS_CARTTERMINATION",10; } }
-28521:1490,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; if (.@r>=7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"LK_SPIRALPIERCE",5; bonus2 bSkillAtk,"RK_SONICWAVE",5; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,10; bonus2 bSkillAtk,"LK_SPIRALPIERCE",10; bonus2 bSkillAtk,"RK_SONICWAVE",10; } }
+28521:1387,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; if (.@r>=7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"WS_CARTTERMINATION",5; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,10; bonus2 bSkillAtk,"WS_CARTTERMINATION",10; } }
+28521:1490,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; if (.@r>=7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"LK_SPIRALPIERCE",5; bonus2 bSkillAtk,"RK_SONICWAVE",5; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,10; bonus2 bSkillAtk,"LK_SPIRALPIERCE",10; bonus2 bSkillAtk,"RK_SONICWAVE",10; } }
 28521:18122,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bLongAtkRate,2*(readparam(bStr)/10); if (.@r>=7) { bonus2 bAddClass,Class_Boss,5; bonus2 bSkillAtk,"RA_ARROWSTORM",5; bonus2 bSkillAtk,"RA_AIMEDBOLT",5; } if (.@r>=9) { bonus2 bAddClass,Class_Boss,10; bonus2 bSkillAtk,"RA_ARROWSTORM",10; bonus2 bSkillAtk,"RA_AIMEDBOLT",10; } }
 2855:5360,{ bonus bCritAtkRate,10; if(getequiprefinerycnt(EQI_HEAD_TOP)>5) bonus bCritical,5; }
 2913:2710,{ bonus bBaseAtk,10; }
 28910:20800,{ bonus bLongAtkDef,-35; }
-28918:2998,{ bonus2 bSubRace,RC_Undead,4; bonus2 bSubRace,RC_Demon,4; bonus2 bSubRace,RC_Demihuman,3; bonus2 bSubRace,RC_Player,3; }
+28918:2998,{ bonus2 bSubRace,RC_Undead,4; bonus2 bSubRace,RC_Demon,4; bonus2 bSubRace,RC_Demihuman,3; bonus2 bSubRace,RC_Player_Human,3; }
 28929:4058,{ .@r = getequiprefinerycnt(EQI_HAND_L); bonus2 bExpAddRace,RC_DemiHuman,5; if (.@r>=6) bonus2 bExpAddRace,RC_DemiHuman,5; if (.@r>=8) bonus2 bExpAddRace,RC_DemiHuman,5; }
 28929:4066,{ .@r = getequiprefinerycnt(EQI_HAND_L); bonus2 bExpAddRace,RC_Brute,5; if (.@r>=6) bonus2 bExpAddRace,RC_Brute,5; if (.@r>=8) bonus2 bExpAddRace,RC_Brute,5; }
 28929:4074,{ .@r = getequiprefinerycnt(EQI_HAND_L); bonus2 bExpAddRace,RC_Insect,5; if (.@r>=6) bonus2 bExpAddRace,RC_Insect,5; if (.@r>=8) bonus2 bExpAddRace,RC_Insect,5; }
@@ -440,9 +442,9 @@
 29607:32107,{ .@r= getequiprefinerycnt(EQI_HAND_R)/3; bonus2 bMagicAtkEle,Ele_Neutral,5*.@r; bonus2 bSkillAtk,"WM_METALICSOUND",5*.@r; }
 29607:32108,{ .@r= getequiprefinerycnt(EQI_HAND_R)/3; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",5*.@r; bonus bLongAtkRate,2*.@r; }
 2963:15073,{ bonus bAspdRate,5; }
-2963:15074,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
+2963:15074,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
 2963:20944,{ bonus bDelayrate,-5; }
-2964:15073,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
+2964:15073,{ bonus bDelayrate,-5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
 2964:15074,{ bonus bVariableCastrate,-5; }
 2964:20943,{ bonus bUseSPrate,-5; }
 2966:2967:13092,{ bonus bBaseAtk,-(getequiprefinerycnt(EQI_HAND_R)*10); }
@@ -473,11 +475,11 @@
 2983:4269,{ bonus bInt,-3; bonus bSPrecovRate,-20; bonus bMaxSP,150; }
 2984:4151,{ bonus2 bSubRace,RC_Plant,-10; bonus2 bExpAddRace,RC_Plant,5; }
 2984:4164,{ bonus2 bSubRace,RC_Fish,-10; bonus2 bExpAddRace,RC_Fish,5; }
-2984:4204,{ bonus2 bSubRace,RC_Brute,-10; bonus2 bExpAddRace,RC_Brute,5; }
+2984:4204,{ bonus2 bSubRace,RC_Brute,-10; bonus2 bSubRace,RC_Player_Doram,-10; bonus2 bExpAddRace,RC_Brute,5; }
 2984:4221,{ bonus2 bSubRace,RC_Insect,-10; bonus2 bExpAddRace,RC_Insect,5; }
 2984:4235,{ bonus2 bSubRace,RC_Angel,-10; bonus2 bExpAddRace,RC_Angel,5; }
 2984:4239,{ bonus2 bSubRace,RC_Formless,-10; bonus2 bExpAddRace,RC_Formless,5; }
-2984:4245,{ bonus2 bSubRace,RC_DemiHuman,-10; bonus2 bSubRace,RC_Player,-10; bonus2 bExpAddRace,RC_DemiHuman,5; }
+2984:4245,{ bonus2 bSubRace,RC_DemiHuman,-10; bonus2 bSubRace,RC_Player_Human,-10; bonus2 bExpAddRace,RC_DemiHuman,5; }
 2984:4249,{ bonus2 bSubRace,RC_Demon,-10; bonus2 bExpAddRace,RC_Demon,5; }
 2984:4267,{ bonus2 bSubRace,RC_Dragon,-10; bonus2 bExpAddRace,RC_Dragon,5; }
 2984:4275,{ bonus2 bSubRace,RC_Undead,-10; bonus2 bExpAddRace,RC_Undead,5; }
@@ -537,7 +539,7 @@
 4168:4169,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus bVariableCastrate,-10; }
 4169:4488,{ if(getequiprefinerycnt(EQI_SHOES) >= 15) { bonus bMaxHPrate,15; bonus bMaxSPrate,15; } else { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } }
 4172:4210:4230:4257:4272,{ bonus bAgi,5; bonus bStr,5; bonus bAspdRate,5; bonus bSpeedRate,25; bonus bSPDrainValue,1; if(BaseClass==Job_Thief) bonus bNoGemStone; }
-4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; } }
+4178:4199:4234:4252:4297,{ bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass==Job_Archer) { bonus2 bExpAddRace,RC_Brute,5; bonus2 bComaRace,RC_Brute,100; bonus2 bComaRace,RC_Player_Doram,100; } }
 4178:4234:4252:4297:4381,{ bonus bDex,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",5; bonus2 bSkillAtk,"DC_THROWARROW",10; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",10; if(BaseJob==Job_Bard||BaseJob==Job_Dancer) bonus3 bAutoSpellWhenHit,"CG_TAROTCARD",2,50; }
 4185:4217:4280:4293:4312,{ bonus bVit,10; bonus bVariableCastrate,-10; bonus bUseSPRate,-10; if(BaseClass==Job_Acolyte) { bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; } }
 4185:4293:4312:4332,{ bonus bStr,3; bonus bMaxSP,80; bonus bBaseAtk,25; bonus3 bAutoSpell,"AL_CRUCIS",5,10; bonus2 bSkillAtk,"MO_EXTREMITYFIST",10; if(BaseJob==Job_Monk) { bonus bUseSPrate,-10; bonus bNoCastCancel; } }
@@ -551,7 +553,7 @@
 4220:4246:4311:4319:4331,{ bonus bStr,10; bonus bMaxHPrate,20; bonus bHPrecovRate,50; bonus3 bAutoSpell,"BS_WEAPONPERFECT",1,3; bonus2 bAddMonsterDropItem,501,500; if(BaseClass==Job_Swordman) bonus2 bAddItemGroupHealRate,IG_Potion,50; }
 4020:27328,{ bonus bBaseAtk,15; bonus2 bAddEle,Ele_Dark,20; }
 4023:27328,{ bonus bInt,3; bonus bMaxSP,100; bonus bMatkRate,5; }
-4066:27328,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player,15; }
+4066:27328,{ bonus2 bSubRace,RC_DemiHuman,15; bonus2 bSubRace,RC_Player_Human,15; }
 4067:27328,{ bonus bDef,100; }
 4071:27328,{ bonus bHit,15; bonus bFlee,15; bonus bCritAtkRate,15; }
 4077:27328,{ bonus bVariableCastrate,-25; }
@@ -567,7 +569,7 @@
 4305:27119,{ bonus2 bSubSize,Size_All,5; bonus bHit,25; bonus2 bAddSize,Size_All,20; }
 4311:4319:4331:4371,{ bonus bInt,1; bonus bStr,1; bonus bDef,2; bonus bSPrecovRate,10; bonus2 bSkillAtk,"PA_SHIELDCHAIN",10; bonus2 bSkillAtk,"PA_SACRIFICE",10; bonus bVariableCastrate,-10; if(BaseJob==Job_Crusader) bonus bDefEle,Ele_Holy; }
 4323:4324,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,250; }
-4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player,2; }
+4435:4436,{ bonus2 bSPGainRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_Player_Human,2; }
 4335:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"WZ_EARTHSPIKE",.@a,(.@a*10); bonus3 bAutoSpell,"WZ_HEAVENDRIVE",.@a,(.@a*10); }
 4345:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",.@a,(.@a*10); bonus3 bAutoSpell,"MG_THUNDERSTORM",.@a,(.@a*10); }
 4350:19156,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r < 4) { .@a = 4; } else { .@a = min(.@r,10); } bonus3 bAutoSpell,"MG_COLDBOLT",.@a,(.@a*10); bonus3 bAutoSpell,"WZ_FROSTNOVA",.@a,(.@a*10); }
@@ -593,8 +595,8 @@
 4643:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
 4644:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
 4645:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
-4653:4654,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreMdefRaceRate,RC_Brute,50; bonus2 bIgnoreMdefRaceRate,RC_Undead,50; }
-4653:4655,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreDefRaceRate,RC_Brute,50; bonus2 bIgnoreDefRaceRate,RC_Undead,50; }
+4653:4654,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Player_Doram,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreMdefRaceRate,RC_Brute,50; bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,50; bonus2 bIgnoreMdefRaceRate,RC_Undead,50; }
+4653:4655,{ bonus2 bSubRace,RC_Brute,5; bonus2 bSubRace,RC_Player_Doram,5; bonus2 bSubRace,RC_Undead,5; bonus2 bIgnoreDefRaceRate,RC_Brute,50; bonus2 bIgnoreDefRaceRate,RC_Player_Doram,50; bonus2 bIgnoreDefRaceRate,RC_Undead,50; }
 4656:4657,{ /* Unofficial chance */ bonus3 bAutoSpellWhenHit,"NPC_WIDESLEEP",2,10; bonus2 bSubEle,Ele_Neutral,5; }
 4671:4692,{ autobonus "{ bonus bMatk,100; }",30,6000,BF_MAGIC,"{ active_transform 3242,6000; }"; }
 4672:4693,{ autobonus "{ bonus bAtk,100; }",30,6000,BF_WEAPON,"{ active_transform 3243,6000; }"; }
@@ -752,19 +754,19 @@
 18140:1755:19048,{ bonus bLongAtkRate,20; bonus3 bAutoSpell,"NJ_HUUJIN",5,(readparam(bInt)>39) ? -300 : -100; if (getequiprefinerycnt(EQI_HAND_R) >= 10)  bonus bAspd,1; }
 18140:19019,{ bonus bLongAtkRate,45; }
 18149:19210,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_HEAD_TOP); bonus bLongAtkRate,5; if (.@weapon >= 7 && .@eq >= 7) { .@val = 20; } if ((.@weapon + .@eq) >= 18) { bonus2 bAddClass,Class_All,10; } if ((.@weapon + .@eq) >= 22) { .@val += 30; } if (.@val) { bonus2 bSkillAtk,"RA_ARROWSTORM",.@val; } }
-18174:22190,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_SHOES); bonus2 bAddClass,Class_All,10; if (.@weapon >= 7 && .@eq >= 7) { bonus bAspd,2; } if ((.@weapon + .@eq) >= 18) { bonus bCritAtkRate,10; } if ((.@weapon + .@eq) >= 22) { autobonus "{ bonus bBaseAtk,100; bonus bCritAtkRate,15; bonus2 bAddRace,RC_Insect,50; bonus2 bAddRace,RC_Brute,50; }",20,10000,BF_LONG|BF_WEAPON|BF_NORMAL; /* fix me: unknown rates */ } }
+18174:22190,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_SHOES); bonus2 bAddClass,Class_All,10; if (.@weapon >= 7 && .@eq >= 7) { bonus bAspd,2; } if ((.@weapon + .@eq) >= 18) { bonus bCritAtkRate,10; } if ((.@weapon + .@eq) >= 22) { autobonus "{ bonus bBaseAtk,100; bonus bCritAtkRate,15; bonus2 bAddRace,RC_Insect,50; bonus2 bAddRace,RC_Brute,50; bonus2 bAddRace,RC_Player_Doram,50; }",20,10000,BF_LONG|BF_WEAPON|BF_NORMAL; /* fix me: unknown rates */ } }
 18507:18539,{ bonus bUseSPrate,-3; }
 18559:18560,{ bonus bCritAtkRate,5; }
 18563:18564,{ bonus bFixedCastrate,-10; }
 18652:32227,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); if (.@r>=6) { bonus bDelayrate,-5; bonus bAspdRate,5; bonus2 bAddClass,Class_All,5; bonus2 bIgnoreDefClassRate,Class_All,25; } if (.@r>=8) { bonus bDelayrate,-10; bonus bAspdRate,10; bonus2 bAddClass,Class_All,5; bonus2 bIgnoreDefClassRate,Class_All,25; } }
 18776:20710,{ bonus bBaseAtk,10; }
 18776:22015,{ bonus bMatk,20; }
-18823:19246,{ .@atk = 40; .@aspd = 3; .@dmg = 2; .@agi = readparam(bAgi); if (.@agi > 107) { .@atk += 60; .@aspd += 5; .@dmg += 2; } if (.@agi > 119) { .@atk += 80; .@aspd += 7; .@dmg += 4; } bonus bBaseAtk,.@atk; bonus bAspdRate,.@aspd; bonus2 bSubRace,RC_Player,.@dmg; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; }
+18823:19246,{ .@atk = 40; .@aspd = 3; .@dmg = 2; .@agi = readparam(bAgi); if (.@agi > 107) { .@atk += 60; .@aspd += 5; .@dmg += 2; } if (.@agi > 119) { .@atk += 80; .@aspd += 7; .@dmg += 4; } bonus bBaseAtk,.@atk; bonus bAspdRate,.@aspd; bonus2 bSubRace,RC_Player_Human,.@dmg; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; }
 18823:28372,{ bonus2 bSkillVariableCast,"CR_GRANDCROSS",-1500; bonus2 bSkillAtk,"LG_RAYOFGENESIS",BaseLevel/30 + BaseLevel; bonus2 bSkillUseSP,"LG_RAYOFGENESIS",-10; }
 18823:28551,{ bonus2 bSkillDelay,"LG_OVERBRAND",-2000; bonus bLongAtkRate,getskilllv("LG_CANNONSPEAR") * 2; bonus bLongAtkRate,getskilllv("LG_OVERBRAND") * 2; bonus2 bSkillAtk,"LG_CANNONSPEAR",30; bonus2 bSkillAtk,"LG_OVERBRAND",20; }
-18849:32237,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bFixedCast,-300; if (.@r > 0) { bonus bMatk,(10*.@r); if (.@r >= 7) { bonus2 bMagicAddRace,RC_DemiHuman,10; bonus2 bMagicAddRace,RC_Player,10; bonus2 bMagicAddRace,RC_Demon,10; if (.@r >= 9) { bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bMagicAtkEle,Ele_Wind,10; bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Fire,10; bonus2 bMagicAtkEle,Ele_Neutral,10; if (.@r >= 11) { bonus2 bMagicAddClass,Class_Boss,20; } } } } }
+18849:32237,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bFixedCast,-300; if (.@r > 0) { bonus bMatk,(10*.@r); if (.@r >= 7) { bonus2 bMagicAddRace,RC_DemiHuman,10; bonus2 bMagicAddRace,RC_Player_Human,10; bonus2 bMagicAddRace,RC_Demon,10; if (.@r >= 9) { bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bMagicAtkEle,Ele_Wind,10; bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Fire,10; bonus2 bMagicAtkEle,Ele_Neutral,10; if (.@r >= 11) { bonus2 bMagicAddClass,Class_Boss,20; } } } } }
 18867:1720,{ bonus bLongAtkRate,3+(getequiprefinerycnt(EQI_HAND_R) > 6 ? 5:0); }
-18868:28320,{ bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddRace,RC_Player,10; }
+18868:28320,{ bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddRace,RC_Player_Human,10; }
 18933:19082,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",(5*.@r); }
 18933:2268,{ bonus bDelayrate,-5; }
 18933:4229,{ bonus bVariableCastrate,-10; }
@@ -780,7 +782,7 @@
 18985:28321:28322,{ bonus2 bSkillAtk,"HT_BLITZBEAT",200; }
 18985:28322,{ bonus2 bSkillAtk,"SN_FALCONASSAULT",50; }
 18997:28326:28327,{ bonus bSpeedRate,10; bonus bBaseAtk,50; bonus bMatk,50; if(getequiprefinerycnt(EQI_HEAD_TOP)>=9){ bonus bMaxHPrate,10; bonus bMaxSPrate,50; } }
-19024:19381,{ bonus bMdef,5; bonus bDef,50; bonus bAspdRate,5; bonus bVit,5; bonus2 bSubRace,RC_Player,3; if (readparam(bVit)>=108) { bonus bMdef,5; bonus bDef,50; bonus bAspdRate,5; bonus bVit,5; } if (readparam(bVit)>=120) { bonus bMdef,10; bonus bDef,100; bonus bVit,10; } }
+19024:19381,{ bonus bMdef,5; bonus bDef,50; bonus bAspdRate,5; bonus bVit,5; bonus2 bSubRace,RC_Player_Human,3; if (readparam(bVit)>=108) { bonus bMdef,5; bonus bDef,50; bonus bAspdRate,5; bonus bVit,5; } if (readparam(bVit)>=120) { bonus bMdef,10; bonus bDef,100; bonus bVit,10; } }
 19026:20756,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace,RC_Fish,10; bonus3 bAddMonsterDropItem,544,RC_Fish,(5+.@r); bonus3 bAddMonsterDropItem,551,RC_Fish,(5+.@r); bonus2 bAddItemHealRate,544,5*(1+.@r); bonus2 bAddItemHealRate,551,5*(1+.@r); }
 19026:22059,{ bonus2 bCriticalAddRace,RC_Fish,(10+getequiprefinerycnt(EQI_SHOES)); }
 19038:19039,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP)+getequiprefinerycnt(EQI_HEAD_MID); if((.@r==7)||(.@r==8)){ bonus bCritical,12; bonus bHit,12; } if(.@r>=9){ bonus bMaxHP,1200; bonus bMaxSP,120; } }
@@ -789,10 +791,10 @@
 19114:5548,{ bonus2 bSubSize,Size_All,5; }
 19117:22101,{ bonus2 bDropAddRace,RC_All,5; bonus2 bExpAddRace,RC_All,5; if(getequiprefinerycnt(EQI_SHOES) >= 12) { bonus bFixedCast,-400; } }
 19118:22101,{ bonus2 bDropAddRace,RC_All,4; bonus2 bExpAddRace,RC_All,4; if(getequiprefinerycnt(EQI_SHOES) >= 12) { bonus bFixedCast,-400; } }
-19138:19327,{ .@cast = -(readparam(bInt)/8); .@sub = 2; .@heal = 5; if (.@i >= 120) { .@cast -= 10; .@sub += 6; .@heal += 25; } else if (.@i >= 108) { .@cast -= 4; .@sub += 2; .@heal += 10; } bonus bVariableCastrate,.@cast; bonus2 bSubRace,RC_DemiHuman,.@sub; bonus2 bSubRace,RC_Player,.@sub; bonus bHealPower,.@heal; bonus bAddItemHealRate,.@heal; bonus2 bVariableCastrate,"AB_CHEAL",-100; bonus2 bResEff,EFF_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; }
-19139:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; bonus2 bMagicAtkEle,Ele_Earth,20; bonus2 bMagicAtkEle,Ele_Wind,20; if (.@r>=7) { bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; } if (.@r>=9) { bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; } }
-19139:20813,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus bFixedCastrate,-50; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player,1; if (.@r>=5) { bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } if (.@r>=7) { bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } }
-19139:22170,{ bonus bVit,4; bonus bInt,5; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; }
+19138:19327,{ .@cast = -(readparam(bInt)/8); .@sub = 2; .@heal = 5; if (.@i >= 120) { .@cast -= 10; .@sub += 6; .@heal += 25; } else if (.@i >= 108) { .@cast -= 4; .@sub += 2; .@heal += 10; } bonus bVariableCastrate,.@cast; bonus2 bSubRace,RC_DemiHuman,.@sub; bonus2 bSubRace,RC_Player_Human,.@sub; bonus bHealPower,.@heal; bonus bAddItemHealRate,.@heal; bonus2 bVariableCastrate,"AB_CHEAL",-100; bonus2 bResEff,EFF_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; }
+19139:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; bonus2 bMagicAtkEle,Ele_Earth,20; bonus2 bMagicAtkEle,Ele_Wind,20; if (.@r>=7) { bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; } if (.@r>=9) { bonus bVit,4; bonus bVariableCastrate,-6; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; } }
+19139:20813,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus bFixedCastrate,-50; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player_Human,1; if (.@r>=5) { bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } if (.@r>=7) { bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } }
+19139:22170,{ bonus bVit,4; bonus bInt,5; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; }
 19172:28500,{ bonus bDelayrate,-15; }
 19172:4403,{ bonus bDelayrate,30; }
 19189:29316,{ autobonus3 "{ bonus bCritical,5; }",1000,60000,"BS_ADRENALINE"; }
@@ -842,15 +844,22 @@
 19203:29350,{ bonus bBaseAtk,15; bonus bMatk,15; if (getskilllv("OB_OBOROGENSOU") == 5) bonus bVariableCastrate,-7; autobonus3 "{ bonus bCritAtkRate,10; }",1000,60000,"KG_KAGEMUSYA"; autobonus "{ bonus bNoSizeFix; }",30,3000,BF_WEAPON;  }
 19203:29351,{ bonus bBaseAtk,20; bonus bMatk,20; if (getskilllv("OB_OBOROGENSOU") == 5) bonus bVariableCastrate,-15; autobonus3 "{ bonus bCritAtkRate,30; }",1000,60000,"KG_KAGEMUSYA"; autobonus "{ bonus bNoSizeFix; }",50,5000,BF_WEAPON;  }
 19204:29352,{ bonus bMaxHP,500; bonus bBaseAtk,10; }
-19204:29353,{ bonus bMaxHP,1000; bonus bBaseAtk,20; skill "WS_CARTBOOST",1; autobonus3 "{ bonus bBaseAtk,30; }",1000,60000,"WS_CARTBOOST"; }
-19204:29354,{ bonus bMaxHP,1500; bonus bBaseAtk,40; skill "WS_CARTBOOST",3; autobonus3 "{ bonus bBaseAtk,50; }",1000,120000,"WS_CARTBOOST"; }
+19204:29353,{ bonus bMaxHP,1000; bonus bBaseAtk,20; skill "GN_CARTBOOST",1; autobonus3 "{ bonus bBaseAtk,30; }",1000,60000,"GN_CARTBOOST"; }
+19204:29354,{ bonus bMaxHP,1500; bonus bBaseAtk,40; skill "GN_CARTBOOST",3; autobonus3 "{ bonus bBaseAtk,50; }",1000,120000,"GN_CARTBOOST"; }
 19205:29355,{ bonus2 bSkillAtk,"SU_CN_METEOR",10; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",10; }
 19205:29356,{ bonus2 bSkillAtk,"SU_CN_METEOR",20; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",20; bonus bFixedCast,-200; }
 19205:29357,{ bonus2 bSkillAtk,"SU_CN_METEOR",60; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",60; bonus bFixedCast,-500; }
 19247:28762,{ bonus bMatk,50; .@eq = getequiprefinerycnt(EQI_HEAD_TOP); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { bonus bVariableCastrate,-10; } if ((.@eq + .@weapon) >= 18) { bonus2 bMagicAddSize,Size_Small,15; bonus2 bMagicAddSize,Size_Medium,15; if ((.@eq + .@weapon) >= 22) { autobonus "{ bonus bMatk,50; bonus2 bMagicAtkEle,Ele_Fire,20; }",5,10000,BF_MAGIC; /* unknown rate */ } } }
+19266:1617,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1618,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1619,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:1620,{.@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,.@r*10;}
+19266:2509,{.@r = getequiprefinerycnt(EQI_GARMENT); bonus bVariableCastrate,-5*(.@r/2);}
+19266:20813,{.@r = getequiprefinerycnt(EQI_GARMENT); bonus bVariableCastrate,-5*(.@r/2);}
+19266:19139,{.@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bDelayRate,-.@r;}
 19272:4365,{ bonus bVariableCastrate,-100; bonus2 bSkillCooldown,"WL_TELEKINESIS_INTENSE",-120000; }
-19299:4463,{ .@type = getiteminfo(getequipid(EQI_COMPOUND_ON),11); if (.@type == W_BOOK || .@type == W_STAFF || .@type == W_2HSTAFF) { bonus2 bMagicAddRace,RC_Player, getequiprefinerycnt(EQI_HAND_R)*2; } }
-19299:5966,{ .@a = readparam(bDex); bonus bMatk,10; bonus bVariableCastrate,-2; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; if (.@a>=108) { bonus bMatk,20; bonus bVariableCastrate,-3; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } if (.@a>=120) { bonus bMatk,30; bonus bVariableCastrate,-5; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; } }
+19299:4463,{ .@type = getiteminfo(getequipid(EQI_COMPOUND_ON),11); if (.@type == W_BOOK || .@type == W_STAFF || .@type == W_2HSTAFF) { bonus2 bMagicAddRace,RC_Player_Human, getequiprefinerycnt(EQI_HAND_R)*2; } }
+19299:5966,{ .@a = readparam(bDex); bonus bMatk,10; bonus bVariableCastrate,-2; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; if (.@a>=108) { bonus bMatk,20; bonus bVariableCastrate,-3; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } if (.@a>=120) { bonus bMatk,30; bonus bVariableCastrate,-5; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; } }
 19326:4187,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bExpAddRace,RC_DEMON,5; if (.@r>=6) bonus2 bExpAddRace,RC_DEMON,5; if (.@r>=8) bonus2 bExpAddRace,RC_DEMON,5; }
 19326:4190,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bExpAddRace,RC_Undead,5; if (.@r>=6) bonus2 bExpAddRace,RC_Undead,5; if (.@r>=8) bonus2 bExpAddRace,RC_Undead,5; }
 19326:4224,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bExpAddRace,RC_Brute,5; if (.@r>=6) bonus2 bExpAddRace,RC_Brute,5; if (.@r>=8) bonus2 bExpAddRace,RC_Brute,5; }
@@ -869,10 +878,10 @@
 19397:29582,{ bonus2 bSkillAtk,"SP_SWHOO",10; bonus2 bSkillAtk,"SL_SMA",10; bonus2 bSkillAtk,"SP_SPA",10; }
 19397:29583,{ bonus2 bSkillAtk,"SP_SWHOO",20; bonus2 bSkillAtk,"SL_SMA",20; bonus2 bSkillAtk,"SP_SPA",20; bonus2 bSkillCooldown,"SP_SOULREAPER",-10000; }
 19397:29584,{ bonus2 bSkillAtk,"SP_SWHOO",40; bonus2 bSkillAtk,"SL_SMA",40; bonus2 bSkillAtk,"SP_SPA",40; bonus2 bSkillCooldown,"SP_SOULREAPER",-10000; }
-19428:20948:32238:32239,{ bonus bInt,5; bonus bMaxSPrate,10; bonus bDef,100; bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Neutral,10; .@head = getequiprefinerycnt(EQI_HEAD_TOP); .@garment = getequiprefinerycnt(EQI_GARMENT); if (.@head >= 7 && .@garment >= 7) { .@matk = 40; } if ((.@head + .@garment) >= 18) { .@matk += 40; bonus2 bMagicAtkEle,Ele_Ghost,15; bonus2 bMagicAtkEle,Ele_Wind,15; bonus2 bMagicAtkEle,Ele_Holy,15; if ((.@head + .@garment) >= 22) { bonus bMatkRate,10; bonus2 bIgnoreMdefRaceRate,RC_Formless,50; bonus2 bIgnoreMdefRaceRate,RC_Demon,50; bonus2 bIgnoreMdefRaceRate,RC_Brute,50; } } bonus bMatk,.@matk; }
+19428:20948:32238:32239,{ bonus bInt,5; bonus bMaxSPrate,10; bonus bDef,100; bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Neutral,10; .@head = getequiprefinerycnt(EQI_HEAD_TOP); .@garment = getequiprefinerycnt(EQI_GARMENT); if (.@head >= 7 && .@garment >= 7) { .@matk = 40; } if ((.@head + .@garment) >= 18) { .@matk += 40; bonus2 bMagicAtkEle,Ele_Ghost,15; bonus2 bMagicAtkEle,Ele_Wind,15; bonus2 bMagicAtkEle,Ele_Holy,15; if ((.@head + .@garment) >= 22) { bonus bMatkRate,10; bonus2 bIgnoreMdefRaceRate,RC_Formless,50; bonus2 bIgnoreMdefRaceRate,RC_Demon,50; bonus2 bIgnoreMdefRaceRate,RC_Brute,50; bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,50; } } bonus bMatk,.@matk; }
 20135:20136,{ bonus bAllStats,12; }
 20701:2165,{ .@a = getequiprefinerycnt(EQI_GARMENT); .@b = getequiprefinerycnt(EQI_HAND_L); bonus2 bAddEle,Ele_Earth,.@b; bonus2 bSubRace,RC_Fish,.@a; }
-20714:28320,{ .@val = min(12,getequiprefinerycnt(EQI_GARMENT)); bonus2 bAddRace,RC_DemiHuman,.@val; bonus2 bAddRace,RC_Player,.@val; }
+20714:28320,{ .@val = min(12,getequiprefinerycnt(EQI_GARMENT)); bonus2 bAddRace,RC_DemiHuman,.@val; bonus2 bAddRace,RC_Player_Human,.@val; }
 20717:22000,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
 20717:22001,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
 20717:22002,{ bonus bMaxHPRate,15; bonus bMaxSPRate,5; }
@@ -938,25 +947,25 @@
 20831:4596,{ bonus bMatk,-5*(readparam(bInt)/10); }
 20838:26109,{ bonus2 bSkillAtk,"SO_PSYCHIC_WAVE",10; .@eq = getequiprefinerycnt(EQI_GARMENT); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { bonus2 bSkillAtk,"SO_EARTHGRAVE",40; } if ((.@eq + .@weapon) >= 18) { bonus2 bMagicAtkEle,Ele_Neutral,10; bonus2 bMagicAtkEle,Ele_Earth,10; if ((.@eq + .@weapon) >= 22) { bonus2 bMagicAtkEle,Ele_Water,10; } } }
 20840:28725,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_GARMENT); .@val = 80; if (.@weapon >= 7 && .@eq >= 7) { .@val += 80; } if ((.@weapon + .@eq) >= 18) { .@val += 40; } if ((.@weapon + .@eq) >= 22) { bonus2 bMagicAtkEle,Ele_Fire,15; } bonus bMatk,.@val; }
-20846:22000,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bBaseAtk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22001,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bMatk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22002,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22003,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAddItemHealRate,10; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22004,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bLongAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22005,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bCritAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22006,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bBaseAtk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22007,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAddItemHealRate,10; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22008,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bLongAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22009,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bMatk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22010,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
-20846:22011,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bCritAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,5; }
+20846:22000,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bBaseAtk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22001,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bMatk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22002,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22003,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAddItemHealRate,10; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22004,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bLongAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22005,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bCritAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22006,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bBaseAtk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22007,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAddItemHealRate,10; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22008,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bLongAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22009,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bMatk,30; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22010,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
+20846:22011,{ bonus bMaxHPrate,15; bonus bMdef,10; bonus bCritAtkRate,5; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player_Human,5; }
 20847:28745,{ .@weapon = getequiprefinerycnt(EQI_HAND_R); .@eq = getequiprefinerycnt(EQI_GARMENT); .@val = 10; if (.@weapon >= 7 && .@eq >= 7) { bonus bCritAtkRate,15; } if ((.@weapon + .@eq) >= 18) { .@val += 15; if ((.@weapon + .@eq) >= 22) { skill "TF_DOUBLE",4; bonus bDoubleRate,20; } } bonus bAspdRate,.@val; }
 20859:4121,{ bonus bPerfectHitAddRate,50; bonus2 bResEff,Eff_Stone,10000; }
 20863:4593,{ bonus bLongAtkRate,-1*readparam(bDex)/10; }
 20922:4306,{ bonus2 bSubEle,Ele_Neutral,20; bonus bMaxHPrate,10; bonus bMdef,10; }
-20925:22035,{ bonus bAgi,10; bonus bInt,10; bonus bVariableCastrate,-10; bonus2 bSubRace,RC_Player,5; }
-20925:22036,{ bonus bStr,10; bonus bDex,10; bonus bDelayrate,-20; bonus2 bSubRace,RC_Player,5; }
-20925:22037,{ bonus bVit,10; bonus bLuk,10; bonus bHealPower,20; bonus2 bSubRace,RC_Player,5; bonus bUseSPrate,-10; }
+20925:22035,{ bonus bAgi,10; bonus bInt,10; bonus bVariableCastrate,-10; bonus2 bSubRace,RC_Player_Human,5; }
+20925:22036,{ bonus bStr,10; bonus bDex,10; bonus bDelayrate,-20; bonus2 bSubRace,RC_Player_Human,5; }
+20925:22037,{ bonus bVit,10; bonus bLuk,10; bonus bHealPower,20; bonus2 bSubRace,RC_Player_Human,5; bonus bUseSPrate,-10; }
 20931:1752,{ bonus2 bSubEle,Ele_Fire,75; }
 20931:1754,{ bonus2 bSubEle,Ele_Water,75; }
 20931:1755,{ bonus2 bSubEle,Ele_Wind,75; }
@@ -986,8 +995,8 @@
 22101:29152,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bLongAtkRate,2; } if(.@r >= 9) { bonus bLongAtkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
 22101:29153,{ bonus bMaxHPRate,5; bonus bMaxSPRate,5; .@r = getequiprefinerycnt(EQI_SHOES); if(.@r >= 7) { bonus bCritAtkRate,2; } if(.@r >= 9) { bonus bCritAtkRate,3; } if(.@r >= 12) { bonus bDelayrate,-5; } }
 22104:1646,{ .@r = getequiprefinerycnt(EQI_HAND_R); .@b = getskilllv("WZ_FROSTNOVA"); .@c = getskilllv("WZ_WATERBALL"); bonus2 bMagicAtkEle,Ele_Water,4*.@r; bonus2 bIgnoreMdefClassRate,Class_Normal,5*.@b; bonus2 bIgnoreMdefClassRate,Class_Boss,5*.@b; bonus2 bSkillAtk,"WZ_WATERBALL",(30*.@c)+(20*.@r); }
-22106:1387,{ .@r = getequiprefinerycnt(EQI_SHOES); .@b = getequiprefinerycnt(EQI_HAND_R); if (.@r>=7) { bonus2 bSubRace,RC_DemiHuman,30; bonus2 bSubRace,RC_Player,30; if (.@b>=7) { bonus2 bSkillAtk,"WS_CARTTERMINATION",8; bonus2 bAddClass,Class_Boss,20; } if (.@b>=9) { bonus2 bSkillAtk,"WS_CARTTERMINATION",12; bonus2 bAddClass,Class_Boss,30; } } }
-22106:1490,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,40; bonus2 bSubRace,RC_Player,40; bonus4 bAutoSpellOnSkill,"LK_SPIRALPIERCE","RK_SONICWAVE",getskilllv("RK_SONICWAVE"),10000; if (.@r>=7) { bonus2 bSkillAtk,"RK_SONICWAVE",20; bonus2 bSkillAtk,"LK_SPIRALPIERCE",20; bonus2 bSubClass,Class_Boss,20; } if (.@r>=9) { bonus2 bSkillAtk,"RK_SONICWAVE",30; bonus2 bSkillAtk,"LK_SPIRALPIERCE",30; bonus2 bSubClass,Class_Boss,30; } }
+22106:1387,{ .@r = getequiprefinerycnt(EQI_SHOES); .@b = getequiprefinerycnt(EQI_HAND_R); if (.@r>=7) { bonus2 bSubRace,RC_DemiHuman,30; bonus2 bSubRace,RC_Player_Human,30; if (.@b>=7) { bonus2 bSkillAtk,"WS_CARTTERMINATION",8; bonus2 bAddClass,Class_Boss,20; } if (.@b>=9) { bonus2 bSkillAtk,"WS_CARTTERMINATION",12; bonus2 bAddClass,Class_Boss,30; } } }
+22106:1490,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,40; bonus2 bSubRace,RC_Player_Human,40; bonus4 bAutoSpellOnSkill,"LK_SPIRALPIERCE","RK_SONICWAVE",getskilllv("RK_SONICWAVE"),10000; if (.@r>=7) { bonus2 bSkillAtk,"RK_SONICWAVE",20; bonus2 bSkillAtk,"LK_SPIRALPIERCE",20; bonus2 bSubClass,Class_Boss,20; } if (.@r>=9) { bonus2 bSkillAtk,"RK_SONICWAVE",30; bonus2 bSkillAtk,"LK_SPIRALPIERCE",30; bonus2 bSubClass,Class_Boss,30; } }
 22106:18122,{ .@r = getequiprefinerycnt(EQI_SHOES); .@b = getequiprefinerycnt(EQI_HAND_R); if (.@r>=7) { bonus bLongAtkRate,3*(readparam(bStr)/10); if (.@b>=7) { bonus2 bSkillAtk,"RA_ARROWSTORM",20; bonus2 bSkillAtk,"RA_AIMEDBOLT",20; bonus2 bAddClass,Class_Boss,20; } if (.@b>=9) { bonus2 bSkillAtk,"RA_ARROWSTORM",30; bonus2 bSkillAtk,"RA_AIMEDBOLT",30; bonus2 bAddClass,Class_Boss,30; } } }
 22106:2160,{ .@r = getequiprefinerycnt(EQI_SHOES); if (.@r > 6) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } if (.@r > 8) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } }
 22120:1631,{ .@r = getequiprefinerycnt(EQI_HAND_R); .@cast = -5*getskilllv("AB_ORATIO"); bonus2 bVariableCastrate,"AB_JUDEX",.@cast; bonus2 bVariableCastrate,"AB_ADORAMUS",.@cast; if (.@r >= 7) { .@magic = 30; if (.@r >= 9) { .@magic += 20; .@dmg = 20; } bonus2 bMagicAddRace,RC_Demon,.@magic; bonus2 bMagicAddRace,RC_Undead,.@magic; bonus2 bMagicAddEle,Ele_Undead,.@magic; bonus2 bMagicAddEle,Ele_Dark,.@magic; } bonus2 bSkillAtk,"AB_ADORAMUS",.@dmg + 10*(getskilllv("AB_LAUDAAGNUS")+getskilllv("AB_LAUDARAMUS")+getskilllv("AB_CLEARANCE")); }
@@ -1008,12 +1017,12 @@
 22126:28471:28472,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
 22133:26007,{ bonus bAspdRate,8; .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { .@val = 20; } if ((.@eq + .@weapon) >= 18) { bonus bLongAtkRate,10; if ((.@eq + .@weapon) >= 22) { .@val += 30; } } if (.@val) { bonus2 bSkillAtk,"LG_BANISHINGPOINT",.@val; } }
 22133:32005,{ bonus bBaseAtk,40; .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { .@val = 20; } if ((.@eq + .@weapon) >= 18) { bonus2 bAddClass,Class_All,10; if ((.@eq + .@weapon) >= 22) { .@val += 20; } } if (.@val) { bonus2 bSkillAtk,"RK_HUNDREDSPEAR",.@val; } }
-22138:20815,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bSubEle,Ele_Holy,30-(2*getskilllv("CR_TRUST")); bonus2 bSubEle,Ele_Dark,30; bonus bFixedCastrate,-50; if (.@r > 8) .@val = 20; else if (.@r > 6) .@val = 10; bonus2 bMagicAtkEle,Ele_Fire,.@val; bonus2 bMagicAtkEle,Ele_Neutral,.@val; bonus2 bMagicAtkEle,Ele_Dark,.@val; }
-22138:20815:1643,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bMagicAtkEle,Ele_Fire,4*getskilllv("WZ_FIREPILLAR"); bonus2 bMagicAtkEle,Ele_Neutral,6*getskilllv("HW_GRAVITATION"); if (.@r > 8) .@val = 2; else if (.@r > 6) .@val = 1; bonus2 bSkillAtk,"WL_HELLINFERNO",100*.@val; bonus2 bMagicAddRace,RC_DemiHuman,20*.@val; bonus2 bMagicAddRace,RC_Player,20*.@val; }
+22138:20815,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bSubEle,Ele_Holy,30-(2*getskilllv("CR_TRUST")); bonus2 bSubEle,Ele_Dark,30; bonus bFixedCastrate,-50; if (.@r > 8) .@val = 20; else if (.@r > 6) .@val = 10; bonus2 bMagicAtkEle,Ele_Fire,.@val; bonus2 bMagicAtkEle,Ele_Neutral,.@val; bonus2 bMagicAtkEle,Ele_Dark,.@val; }
+22138:20815:1643,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bMagicAtkEle,Ele_Fire,4*getskilllv("WZ_FIREPILLAR"); bonus2 bMagicAtkEle,Ele_Neutral,6*getskilllv("HW_GRAVITATION"); if (.@r > 8) .@val = 2; else if (.@r > 6) .@val = 1; bonus2 bSkillAtk,"WL_HELLINFERNO",100*.@val; bonus2 bMagicAddRace,RC_DemiHuman,20*.@val; bonus2 bMagicAddRace,RC_Player_Human,20*.@val; }
 22138:4876,{ bonus2 bMagicAtkEle,Ele_Fire,-50; bonus2 bMagicAtkEle,Ele_Neutral,-50; bonus2 bMagicAtkEle,Ele_Dark,-50; }
-22170:1618,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
-22170:1620,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
-22170:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; if (.@r>=7) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } if (.@r>=9) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } }
+22170:1618,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player_Human,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
+22170:1620,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player_Human,10; bonus2 bIgnoreMdefClassRate,Class_All,50; if (.@r>=10) { bonus2 bMagicAtkEle,Ele_Neutral,80; bonus2 bMagicAddRace,RC_Demihuman,20; bonus2 bMagicAddRace,RC_Player_Human,20; bonus2 bSkillCooldown,"WL_EARTHSTRAIN",-2400; bonus2 bSkillCooldown,"WL_CHAINLIGHTNING",-1000; autobonus "{ bonus2 bSkillAtk,\"WL_CHAINLIGHTNING\",100; }",60,5000,BF_MAGIC; } }
+22170:19020,{ .@r = getequiprefinerycnt(EQI_HEAD_TOP); bonus bMatkRate,10; if (.@r>=7) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } if (.@r>=9) { bonus2 bMagicAtkEle,Ele_Earth,10; bonus2 bMagicAtkEle,Ele_Wind,10; } }
 22171:13345,{ autobonus "{ bonus bStr,20; bonus bLongAtkRate,10; }",20,7000,BF_WEAPON; /* unknown rate */ }
 //22171:26154,{ autobonus "{ bonus bInt,20; bonus bMatkRate,15; }",20,7000,BF_MAGIC; /* unknown rate */ }
 22171:26155,{ autobonus "{ bonus bLuk,20; bonus bMatkRate,15; bonus2 bAddClass,Class_All,15; }",20,7000,BF_MAGIC|BF_WEAPON; /* unknown rate */ }
@@ -1024,9 +1033,9 @@
 //22171:28631,{ autobonus "{ bonus bStr,20; bonus2 bAddClass,Class_All,15; }",3,7000,BF_WEAPON; /* unknown rate */ }
 22171:28763:28764,{ autobonus "{ bonus bStr,20; bonus2 bAddClass,Class_All,10; }",20,7000,BF_WEAPON; /* unknown rate */ }
 22171:32302,{ autobonus "{ bonus bDex,20; bonus bLongAtkRate,10; }",20,7000,BF_WEAPON; /* unknown rate */ }
-22172:15042,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bSpeedRate,25; bonus bCritAtkRate,4*(readparam(bluk)/20); if (.@r>=7) { bonus bAspdRate,8; bonus2 bSubRace,RC_DemiHuman,8; bonus2 bSubRace,RC_Player,8; bonus2 bSkillAtk,"HT_BLITZBEAT",40; bonus2 bSkillAtk,"SN_SHARPSHOOTING",50; } if (.@r>=9) { bonus bAspdRate,4; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; bonus2 bSkillAtk,"HT_BLITZBEAT",20; bonus2 bSkillAtk,"SN_SHARPSHOOTING",25; } }
-22172:15043,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bHPGainValue,500; bonus bSpeedRate,25; bonus2 bSkillAtk,"RA_CLUSTERBOMB",30*(readparam(bint)/20); bonus2 bSkillUseSP,"RA_ELECTRICSHOCKER",30; if (.@r>=7) { bonus bFlee2,6; bonus2 bSubRace,RC_DemiHuman,8; bonus2 bSubRace,RC_Player,8; bonus2 bSkillAtk,"RA_CLUSTERBOMB",400; bonus2 bSkillAtk,"RA_AIMEDBOLT",20; } if (.@r>=9) { bonus bFlee2,3; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; bonus2 bSkillAtk,"RA_CLUSTERBOMB",200; bonus2 bSkillAtk,"RA_AIMEDBOLT",10; } }
-22190:28254,{ bonus2 bAddClass,Class_All,10; .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { bonus bLongAtkRate,5; } if ((.@eq + .@weapon) >= 18) { bonus2 bSkillAtk,"RL_FIRE_RAIN",20; bonus2 bSkillCooldown,"RL_FIRE_RAIN",-2000; if ((.@eq + .@weapon) >= 22) { autobonus3 "{ bonus bBaseAtk,50; bonus2 bAddRace,RC_Brute,50; bonus2 bAddRace,RC_Demon,50; }",5,10000,"RL_R_TRIP"; /* unknown rate */ } } }
+22172:15042,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bSpeedRate,25; bonus bCritAtkRate,4*(readparam(bluk)/20); if (.@r>=7) { bonus bAspdRate,8; bonus2 bSubRace,RC_DemiHuman,8; bonus2 bSubRace,RC_Player_Human,8; bonus2 bSkillAtk,"HT_BLITZBEAT",40; bonus2 bSkillAtk,"SN_SHARPSHOOTING",50; } if (.@r>=9) { bonus bAspdRate,4; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; bonus2 bSkillAtk,"HT_BLITZBEAT",20; bonus2 bSkillAtk,"SN_SHARPSHOOTING",25; } }
+22172:15043,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus bHPGainValue,500; bonus bSpeedRate,25; bonus2 bSkillAtk,"RA_CLUSTERBOMB",30*(readparam(bint)/20); bonus2 bSkillUseSP,"RA_ELECTRICSHOCKER",30; if (.@r>=7) { bonus bFlee2,6; bonus2 bSubRace,RC_DemiHuman,8; bonus2 bSubRace,RC_Player_Human,8; bonus2 bSkillAtk,"RA_CLUSTERBOMB",400; bonus2 bSkillAtk,"RA_AIMEDBOLT",20; } if (.@r>=9) { bonus bFlee2,3; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; bonus2 bSkillAtk,"RA_CLUSTERBOMB",200; bonus2 bSkillAtk,"RA_AIMEDBOLT",10; } }
+22190:28254,{ bonus2 bAddClass,Class_All,10; .@eq = getequiprefinerycnt(EQI_SHOES); .@weapon = getequiprefinerycnt(EQI_HAND_R); if (.@eq >= 7 && .@weapon >= 7) { bonus bLongAtkRate,5; } if ((.@eq + .@weapon) >= 18) { bonus2 bSkillAtk,"RL_FIRE_RAIN",20; bonus2 bSkillCooldown,"RL_FIRE_RAIN",-2000; if ((.@eq + .@weapon) >= 22) { autobonus3 "{ bonus bBaseAtk,50; bonus2 bAddRace,RC_Brute,50; bonus2 bAddRace,RC_Player_Doram,50; bonus2 bAddRace,RC_Demon,50; }",5,10000,"RL_R_TRIP"; /* unknown rate */ } } }
 24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
 24018:24019:24020,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus2 bAddClass,Class_All,1; } }
 24021:24022:24023,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bMatkRate,1; } }
@@ -1086,7 +1095,7 @@
 24154:24155,{ bonus bDef,getequiprefinerycnt(EQI_SHADOW_ARMOR); if (getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) bonus bUnbreakableArmor; }
 24156:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_DemiHuman; }
 24157:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_Demon; }
-24158:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_Brute; }
+24158:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) { bonus bIgnoreDefRace,RC_Brute; bonus bIgnoreDefRace,RC_Player_Doram; } }
 24159:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_Insect; }
 24160:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_Fish; }
 24161:24166:24167,{ bonus bBaseAtk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreDefRace,RC_Dragon; }
@@ -1098,7 +1107,7 @@
 24168:24169:24329,{ if (getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 25) { bonus bIgnoreMDefRace,RC_DemiHuman; } }
 24168:24169:24170,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_DemiHuman; }
 24168:24169:24171,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_Demon; }
-24168:24169:24172,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_Brute; }
+24168:24169:24172,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) { bonus bIgnoreMDefRace,RC_Brute; bonus bIgnoreMDefRace,RC_Player_Doram; } }
 24168:24169:24173,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_Insect; }
 24168:24169:24174,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_Fish; }
 24168:24169:24175,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMDefRace,RC_Dragon; }
@@ -1109,16 +1118,16 @@
 24168:24169:24345:24346:24423:24424,{ if ((getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)) >= 54) { bonus2 bIgnoreDefClassRate,Class_Normal,20; } }
 24180:24181:24182:24183:24184:24185,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus bAllStats,1; if(.@r>=45) { bonus bMaxHPrate,(.@r-60); bonus bNoWalkDelay; } }
 24180:24181:24182:24183:24184:24321,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus bAllStats,1; if (.@r >= 45) { bonus bMaxHPrate,(.@r-60); bonus bNoWalkDelay; } }
-24186:24198,{ bonus2 bSubEle,Ele_Neutral,2; }
-24187:24199,{ bonus2 bSubEle,Ele_Dark,2; }
-24188:24200,{ bonus2 bSubEle,Ele_Water,2; }
-24189:24201,{ bonus2 bSubEle,Ele_Earth,2; }
-24190:24202,{ bonus2 bSubEle,Ele_Fire,2; }
-24191:24203,{ bonus2 bSubEle,Ele_Wind,2; }
-24192:24204,{ bonus2 bSubEle,Ele_Poison,2; }
-24193:24205,{ bonus2 bSubEle,Ele_Holy,2; }
-24194:24206,{ bonus2 bSubEle,Ele_Ghost,2; }
-24195:24207,{ bonus2 bSubEle,Ele_Undead,2; }
+24186:24198,{ bonus2 bSubDefEle,Ele_Neutral,2; bonus2 bMagicSubDefEle,Ele_Neutral,2; }
+24187:24199,{ bonus2 bSubDefEle,Ele_Dark,2; bonus2 bMagicSubDefEle,Ele_Dark,2; }
+24188:24200,{ bonus2 bSubDefEle,Ele_Water,2; bonus2 bMagicSubDefEle,Ele_Water,2; }
+24189:24201,{ bonus2 bSubDefEle,Ele_Earth,2; bonus2 bMagicSubDefEle,Ele_Earth,2; }
+24190:24202,{ bonus2 bSubDefEle,Ele_Fire,2; bonus2 bMagicSubDefEle,Ele_Fire,2; }
+24191:24203,{ bonus2 bSubDefEle,Ele_Wind,2; bonus2 bMagicSubDefEle,Ele_Wind,2; }
+24192:24204,{ bonus2 bSubDefEle,Ele_Poison,2; bonus2 bMagicSubDefEle,Ele_Poison,2; }
+24193:24205,{ bonus2 bSubDefEle,Ele_Holy,2; bonus2 bMagicSubDefEle,Ele_Holy,2; }
+24194:24206,{ bonus2 bSubDefEle,Ele_Ghost,2; bonus2 bMagicSubDefEle,Ele_Ghost,2; }
+24195:24207,{ bonus2 bSubDefEle,Ele_Undead,2; bonus2 bMagicSubDefEle,Ele_Undead,2; }
 24196:24197,{ bonus bFlee,5; if(getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ARMOR)>=15) bonus bSpeedAddRate,3; }
 24197:24320,{ bonus bFlee,5; if ((getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHOES)) >= 15) { bonus bSpeedRate,25; /* unknown value */ } }
 24208:24209,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:1); }
@@ -1162,7 +1171,7 @@
 24345:24346:24347,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_DemiHuman; bonus bIgnoreMDefRace,RC_Undead; } }
 24345:24346:24348,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_Demon; bonus bIgnoreMDefRace,RC_Angel; } }
 24345:24346:24349,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_Formless; bonus bIgnoreMDefRace,RC_Dragon; } }
-24345:24346:24350,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_Plant; bonus bIgnoreMDefRace,RC_Brute; } }
+24345:24346:24350,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_Plant; bonus bIgnoreMDefRace,RC_Brute; bonus bIgnoreMDefRace,RC_Player_Doram; } }
 24345:24346:24351,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bMDef,5; if (.@r >= 25) { bonus bIgnoreMDefRace,RC_Fish; bonus bIgnoreMDefRace,RC_Insect; } }
 24360:24361:24362,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON) + getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L); .@rate = 20 + 10*(.@r/10); if (.@r >= 25) { .@hp = 500; } else { .@hp = 100; } autobonus "{ bonus2 bHPRegenRate,"+.@hp+",1000; }",.@rate,5000; }
 24363:24364:24365,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON) + getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L); .@rate = 10 + 10*(.@r/15); if (.@r >= 25) { .@hp = 250; } else { .@hp = 100; } autobonus "{ bonus2 bHPRegenRate,"+.@hp+",1000; }",.@rate,5000,BF_MAGIC; }
@@ -1171,15 +1180,15 @@
 24373:24374:24375,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_DemiHuman; bonus bIgnoreDefRace,RC_Undead; } }
 24373:24374:24376,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_Demon; bonus bIgnoreDefRace,RC_Angel; } }
 24373:24374:24377,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_Formless; bonus bIgnoreDefRace,RC_Dragon; } }
-24373:24374:24378,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_Plant; bonus bIgnoreDefRace,RC_Brute; } }
+24373:24374:24378,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_Plant; bonus bIgnoreDefRace,RC_Brute; bonus bIgnoreDefRace,RC_Player_Doram; } }
 24373:24374:24379,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES) + getequiprefinerycnt(EQI_SHADOW_ARMOR); bonus bDef,5; if (.@r >= 25) { bonus bIgnoreDefRace,RC_Fish; bonus bIgnoreDefRace,RC_Insect; } }
 24380:24381:24382,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON) + getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L); .@rate = 20 + 10*(.@r/10); if (.@r >= 25) { .@sp = 30; } else { .@sp = 10; } autobonus "{ bonus2 bSPRegenRate,"+.@sp+",1000; }",.@rate,5000; }
 24383:24384:24385,{ .@r = getequiprefinerycnt(EQI_SHADOW_WEAPON) + getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L); .@rate = 10 + 10*(.@r/15); if (.@r >= 25) { .@sp = 30; } else { .@sp = 10; } autobonus "{ bonus2 bSPRegenRate,"+.@sp+",1000; }",.@rate,5000,BF_MAGIC; }
-24387:24388:24389:24390:24391:24392,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); .@val = 20 + min(30,.@r); if (BaseLevel >= 130) { .@val += 6; } else if (BaseLevel >= 125) { .@val += 3; } bonus2 bIgnoreDefRaceRate,RC_All,.@val; bonus2 bIgnoreMdefRaceRate,RC_All,.@val; bonus2 bIgnoreDefRaceRate,RC_Player,-.@val; bonus2 bIgnoreMdefRaceRate,RC_Player,-.@val; }
+24387:24388:24389:24390:24391:24392,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); .@val = 20 + min(30,.@r); if (BaseLevel >= 130) { .@val += 6; } else if (BaseLevel >= 125) { .@val += 3; } bonus2 bIgnoreDefRaceRate,RC_All,.@val; bonus2 bIgnoreMdefRaceRate,RC_All,.@val; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-.@val; bonus2 bIgnoreMdefRaceRate,RC_Player_Human,-.@val; }
 24393:24394:24395,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES); bonus bBaseAtk,.@r*2; if (.@r >= 25) { bonus2 bAddClass,Class_All,5; } else if (.@r >= 23) { bonus2 bAddClass,Class_All,2; } }
 24396:24397:24398,{ .@r = getequiprefinerycnt(EQI_SHADOW_ARMOR) + getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES); bonus bMatk,.@r*2; if (.@r >= 25) { bonus bMatkRate,5; } else if (.@r >= 23) { bonus bMatkRate,2; } }
 24399:24400,{ .@r = getequiprefinerycnt(EQI_SHADOW_SHIELD) + getequiprefinerycnt(EQI_SHADOW_SHOES); if (.@r >= 16) { bonus bDef,100; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } else { bonus bDef,50; bonus bMaxHPrate,2; bonus bMaxSPrate,2; } }
-24416:24417:24418:24419:24420:24421,{ bonus bAspd,2; bonus bVariableCastrate,-10; bonus2 bIgnoreDefRaceRate,RC_All,70; bonus2 bIgnoreMdefRaceRate,RC_All,70; bonus2 bIgnoreDefRaceRate,RC_Player,-70; bonus2 bIgnoreMdefRaceRate,RC_Player,-70; }
+24416:24417:24418:24419:24420:24421,{ bonus bAspd,2; bonus bVariableCastrate,-10; bonus2 bIgnoreDefRaceRate,RC_All,70; bonus2 bIgnoreMdefRaceRate,RC_All,70; bonus2 bIgnoreDefRaceRate,RC_Player_Human,-70; bonus2 bIgnoreMdefRaceRate,RC_Player_Human,-70; }
 29027:29145:29159,{ bonus2 bExpAddRace,RC_All,3; }
 29047:29359:29360,{ bonus bCritAtkRate,6; }
 29047:29359:29360:29361,{ bonus bCritical,10; }
@@ -1206,17 +1215,17 @@
 27170:27173,{ bonus2 bSkillAtk,"GS_SPREADATTACK",50; }
 27171:27174,{ bonus2 bSkillAtk,"GS_RAPIDSHOWER",50; }
 27172:27175,{ bonus2 bAddSize,Size_Small,10; bonus2 bMagicAddSize,Size_Small,10; }
-27196:27199,{ bonus2 bMagicAddSize,Size_Small,5; bonus2 bMagicAddRace,RC_Brute,5; }
+27196:27199,{ bonus2 bMagicAddSize,Size_Small,5; bonus2 bMagicAddRace,RC_Brute,5; bonus2 bMagicAddRace,RC_Player_Doram,5; }
 27196:27331,{ bonus bDelayrate,-3; }
-27197:27198,{ bonus2 bAddSize,Size_Small,5; bonus2 bAddRace,RC_Brute,5; }
+27197:27198,{ bonus2 bAddSize,Size_Small,5; bonus2 bAddRace,RC_Brute,5; bonus2 bAddRace,RC_Player_Doram,5; }
 27197:27333,{ bonus2 bAddClass,Class_All,5; }
 // 27321:27326,{ bonus bMaxHPrate,50; }
 27322:27323,{ bonus bMaxSPrate,5; bonus bMaxHPrate,5; }
 27324:27325,{ bonus2 bMagicAtkEle,Ele_Water,10; bonus2 bSubDefEle,Ele_Fire,10; }
-28022:28509,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bAspdRate,10; if (.@r >= 9) { bonus bCritAtkRate,10; if (.@r >= 11) { bonus2 bAddRace,RC_Brute,25; } } }
+28022:28509,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bAspdRate,10; if (.@r >= 9) { bonus bCritAtkRate,10; if (.@r >= 11) { bonus2 bAddRace,RC_Brute,25; bonus2 bAddRace,RC_Player_Doram,25; } } }
 28315:28317,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
 28316:28318,{ bonus2 bAddClass,Class_All,4; bonus bMatkRate,4; }
-28320:22016,{ .@val = min(12,getequiprefinerycnt(EQI_SHOES)); bonus2 bAddRace,RC_DemiHuman,.@val; bonus2 bAddRace,RC_Player,.@val; }
+28320:22016,{ .@val = min(12,getequiprefinerycnt(EQI_SHOES)); bonus2 bAddRace,RC_DemiHuman,.@val; bonus2 bAddRace,RC_Player_Human,.@val; }
 28321:28322,{ bonus bUseSPrate,-(getskilllv("HT_BEASTBANE") * 2); }
 28326:28327,{ bonus bInt,8; bonus bStr,8; }
 28358:18521,{ skill "AS_CLOAKING",1; }
@@ -1235,19 +1244,19 @@
 28491:4817,{ bonus bHit,15; bonus bCriticalLong,10; }
 28491:4818,{ bonus bHit,15; bonus bCriticalLong,10; }
 28499:28920,{ bonus bFlee2,10; }
-28501:4807,{ bonus bAspd,1; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Brute,1; bonus2 bSubRace,RC_Fish,1; bonus2 bSubRace,RC_Player,1; bonus2 bSubRace,RC_Demon,1; bonus2 bSubRace,RC_Undead,1; }
-28501:4842,{ bonus bAspd,1; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Brute,1; bonus2 bSubRace,RC_Fish,1; bonus2 bSubRace,RC_Player,1; bonus2 bSubRace,RC_Demon,1; bonus2 bSubRace,RC_Undead,1; }
-28502:2201,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player,((2*.@b)+2); bonus bHealPower,10*.@c; }
-28502:2202,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player,((2*.@b)+2); bonus bHealPower,10*.@c; }
-28502:2203,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player,((2*.@b)+2); bonus bHealPower,10*.@c; }
-28502:2204,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player,((2*.@b)+2); bonus bHealPower,10*.@c; }
+28501:4807,{ bonus bAspd,1; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Brute,1; bonus2 bSubRace,RC_Player_Doram,1; bonus2 bSubRace,RC_Fish,1; bonus2 bSubRace,RC_Player_Human,1; bonus2 bSubRace,RC_Demon,1; bonus2 bSubRace,RC_Undead,1; }
+28501:4842,{ bonus bAspd,1; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Brute,1; bonus2 bSubRace,RC_Player_Doram,1; bonus2 bSubRace,RC_Fish,1; bonus2 bSubRace,RC_Player_Human,1; bonus2 bSubRace,RC_Demon,1; bonus2 bSubRace,RC_Undead,1; }
+28502:2201,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player_Human,((2*.@b)+2); bonus bHealPower,10*.@c; }
+28502:2202,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player_Human,((2*.@b)+2); bonus bHealPower,10*.@c; }
+28502:2203,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player_Human,((2*.@b)+2); bonus bHealPower,10*.@c; }
+28502:2204,{ .@a = (readparam(bStr)+readparam(bLuk))/80; .@b = (readparam(bAgi)+readparam(bVit))/80; .@c = (readparam(bInt)+readparam(bDex))/80; bonus bMaxHPrate,5*.@b; bonus2 bAddClass,Class_All,6*.@a; bonus bMatk,120*.@c; bonus bCritical,5*.@a; bonus bAspdRate,5*.@b; bonus bVariableCastrate,-3*.@c; bonus bCritAtkRate,10*.@a; bonus2 bSubRace,RC_DemiHuman,((2*.@b)+2); bonus2 bSubRace,RC_Player_Human,((2*.@b)+2); bonus bHealPower,10*.@c; }
 28506:1414,{ .@r = getequiprefinerycnt(EQI_HAND_R); if (.@r>=7) { .@val = 30; if (.@r>=9) { .@val += 20; bonus2 bAddClass,Class_Boss,.@val; bonus2 bAddEle,Ele_Water,.@val; bonus2 bAddEle,Ele_Wind,.@val; bonus2 bAddRace,RC_Fish,.@val; bonus2 bAddRace,RC_Insect,.@val; bonus2 bSkillAtk,"RK_WINDCUTTER",.@val; if (.@r>=10) { bonus2 bVariableCastrate,"RK_WINDCUTTER",-50; } } } }
 28506:1449,{ .@r = getequiprefinerycnt(EQI_HAND_R); if (.@r>=7) { .@val = 30; if (.@r>=9) { .@val += 20; bonus2 bAddClass,Class_Boss,.@val; bonus2 bAddEle,Ele_Water,.@val; bonus2 bAddEle,Ele_Wind,.@val; bonus2 bAddRace,RC_Fish,.@val; bonus2 bAddRace,RC_Insect,.@val; bonus2 bSkillAtk,"RK_WINDCUTTER",.@val; if (.@r>=10) { bonus2 bVariableCastrate,"RK_WINDCUTTER",-50; } } } }
-28506:15037,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus2 bResEff,Eff_Freeze,10000; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; if (.@r>=7) { bonus bMaxHPrate,15; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } if (.@r>=9) { bonus bMaxHPrate,15; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player,2; } }
+28506:15037,{ .@r = getequiprefinerycnt(EQI_ARMOR); bonus2 bResEff,Eff_Freeze,10000; bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; if (.@r>=7) { bonus bMaxHPrate,15; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } if (.@r>=9) { bonus bMaxHPrate,15; bonus2 bSubRace,RC_DemiHuman,2; bonus2 bSubRace,RC_Player_Human,2; } }
 28506:15037:2476:2575:2884,{ autobonus3 "{bonus bDelayrate,-70;}",1000,10000,"LK_AURABLADE","{specialeffect2 EF_ENHANCE;}"; }
-28506:2476,{ .@r = getequiprefinerycnt(EQI_SHOES); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player,3; if (.@r>=7) { bonus bAspdRate,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player,1; } if (.@r>=9) { bonus bAspdRate,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player,1; } }
-28506:2575,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSkillUseSP,"RK_WINDCUTTER",18; bonus2 bSubRace,RC_Player,3; if (.@r>=7) { bonus bLongAtkDef,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player,1; } if (.@r>=9) { bonus bLongAtkDef,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player,1; } }
-28506:2884,{ bonus2 bAddClass,Class_All,5; bonus bMaxSPrate,5; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player,4; }
+28506:2476,{ .@r = getequiprefinerycnt(EQI_SHOES); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSubRace,RC_Player_Human,3; if (.@r>=7) { bonus bAspdRate,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player_Human,1; } if (.@r>=9) { bonus bAspdRate,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player_Human,1; } }
+28506:2575,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSubRace,RC_DemiHuman,3; bonus2 bSkillUseSP,"RK_WINDCUTTER",18; bonus2 bSubRace,RC_Player_Human,3; if (.@r>=7) { bonus bLongAtkDef,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player_Human,1; } if (.@r>=9) { bonus bLongAtkDef,10; bonus2 bSubRace,RC_DemiHuman,1; bonus2 bSubRace,RC_Player_Human,1; } }
+28506:2884,{ bonus2 bAddClass,Class_All,5; bonus bMaxSPrate,5; bonus bAspdRate,5; bonus2 bSubRace,RC_DemiHuman,4; bonus2 bSubRace,RC_Player_Human,4; }
 28508:28612,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bAspdRate,8; bonus bCritAtkRate,(5*(.@r/2)); if (.@r >= 9) { bonus bCritical,15; bonus2 bResEff,Eff_Curse,10000; if (.@r >= 11) { bonus bBaseAtk,100; } } }
 28509:28626,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bAspdRate,8; bonus bCritAtkRate,(5*(.@r/2)); if (.@r >= 9) { bonus bCritical,15; if (.@r >= 11) { bonus bBaseAtk,100; } } }
 28594:4875,{ bonus bStr,40; bonus bMaxHPrate,10; }

db/re/item_randomopt_db.txt

@@ -36,9 +36,7 @@ RDMOPT_ATTR_TOLERACE_SAINT,{ bonus2 bSubEle,Ele_Holy,getrandomoptinfo(ROA_VALUE)
 RDMOPT_ATTR_TOLERACE_DARKNESS,{ bonus2 bSubEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_ATTR_TOLERACE_TELEKINESIS,{ bonus2 bSubEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_ATTR_TOLERACE_UNDEAD,{ bonus2 bSubEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_ATTR_TOLERACE_ALL,{ bonus2 bSubEle,Ele_All,getrandomoptinfo(ROA_VALUE); }
-// TODO: Confirm if damage reduction is implemented correctly.
-// kRO desc : <ELEMENT> 몬스터로부터 받는 물리 데미지 %d%% 감소.
+RDMOPT_ATTR_TOLERACE_ALLBUTNOTHING,{ for(.@i = Ele_Water; .@i < Ele_Undead; ++.@i) bonus2 bSubEle,.@i,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_NOTHING_USER,{ bonus2 bSubDefEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_NOTHING_TARGET,{ bonus2 bAddEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_WATER_USER,{ bonus2 bSubDefEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
@@ -59,25 +57,25 @@ RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus2 bSubDefEle,Ele_Ghost,getrandomo
 RDMOPT_DAMAGE_PROPERTY_TELEKINESIS_TARGET,{ bonus2 bAddEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_UNDEAD_USER,{ bonus2 bSubDefEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_PROPERTY_UNDEAD_TARGET,{ bonus2 bAddEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER,{ bonus3 bSubEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_NOTHING_USER,{ bonus2 bMagicSubDefEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_NOTHING_TARGET,{ bonus2 bMagicAddEle,Ele_Neutral,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_WATER_USER,{ bonus3 bSubEle,Ele_Water,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_WATER_USER,{ bonus2 bMagicSubDefEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_WATER_TARGET,{ bonus2 bMagicAddEle,Ele_Water,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_GROUND_USER,{ bonus3 bSubEle,Ele_Earth,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_GROUND_USER,{ bonus2 bMagicSubDefEle,Ele_Earth,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_GROUND_TARGET,{ bonus2 bMagicAddEle,Ele_Earth,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_FIRE_USER,{ bonus3 bSubEle,Ele_Fire,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_FIRE_USER,{ bonus2 bMagicSubDefEle,Ele_Fire,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_FIRE_TARGET,{ bonus2 bMagicAddEle,Ele_Fire,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_WIND_USER,{ bonus3 bSubEle,Ele_Wind,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_WIND_USER,{ bonus2 bMagicSubDefEle,Ele_Wind,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_WIND_TARGET,{ bonus2 bMagicAddEle,Ele_Wind,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_POISON_USER,{ bonus3 bSubEle,Ele_Poison,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_POISON_USER,{ bonus2 bMagicSubDefEle,Ele_Poison,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_POISON_TARGET,{ bonus2 bMagicAddEle,Ele_Poison,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_SAINT_USER,{ bonus3 bSubEle,Ele_Holy,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_SAINT_USER,{ bonus2 bMagicSubDefEle,Ele_Holy,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_SAINT_TARGET,{ bonus2 bMagicAddEle,Ele_Holy,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER,{ bonus3 bSubEle,Ele_Dark,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_DARKNESS_USER,{ bonus2 bMagicSubDefEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_DARKNESS_TARGET,{ bonus2 bMagicAddEle,Ele_Dark,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus3 bSubEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_USER,{ bonus2 bMagicSubDefEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_TELEKINESIS_TARGET,{ bonus2 bMagicAddEle,Ele_Ghost,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER,{ bonus3 bSubEle,Ele_Undead,getrandomoptinfo(ROA_VALUE),BF_MAGIC; }
+RDMOPT_MDAMAGE_PROPERTY_UNDEAD_USER,{ bonus2 bMagicSubDefEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_PROPERTY_UNDEAD_TARGET,{ bonus2 bMagicAddEle,Ele_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_BODY_ATTR_NOTHING,{ bonus bDefEle,Ele_Neutral; }
 RDMOPT_BODY_ATTR_WATER,{ bonus bDefEle,Ele_Water; }
@@ -89,7 +87,7 @@ RDMOPT_BODY_ATTR_SAINT,{ bonus bDefEle,Ele_Holy; }
 RDMOPT_BODY_ATTR_DARKNESS,{ bonus bDefEle,Ele_Dark; }
 RDMOPT_BODY_ATTR_TELEKINESIS,{ bonus bDefEle,Ele_Ghost; }
 RDMOPT_BODY_ATTR_UNDEAD,{ bonus bDefEle,Ele_Undead; }
-//RDMOPT_BODY_ATTR_ALL,{ /* Needs more info */ }
+//RDMOPT_BODY_ATTR_ALL,{}
 RDMOPT_RACE_TOLERACE_NOTHING,{ bonus2 bSubRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_UNDEAD,{ bonus2 bSubRace,RC_Undead,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_ANIMAL,{ bonus2 bSubRace,RC_Brute,getrandomoptinfo(ROA_VALUE); }
@@ -97,7 +95,7 @@ RDMOPT_RACE_TOLERACE_PLANT,{ bonus2 bSubRace,RC_Plant,getrandomoptinfo(ROA_VALUE
 RDMOPT_RACE_TOLERACE_INSECT,{ bonus2 bSubRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_FISHS,{ bonus2 bSubRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_DEVIL,{ bonus2 bSubRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_TOLERACE_HUMAN,{ bonus2 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bSubRace,RC_Player,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_TOLERACE_HUMAN,{ bonus2 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_ANGEL,{ bonus2 bSubRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_TOLERACE_DRAGON,{ bonus2 bSubRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_NOTHING,{ bonus2 bAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -107,7 +105,7 @@ RDMOPT_RACE_DAMAGE_PLANT,{ bonus2 bAddRace,RC_Plant,getrandomoptinfo(ROA_VALUE);
 RDMOPT_RACE_DAMAGE_INSECT,{ bonus2 bAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_FISHS,{ bonus2 bAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_DEVIL,{ bonus2 bAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_DAMAGE_HUMAN,{ bonus2 bAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bAddRace,RC_Player,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_HUMAN,{ bonus2 bAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_ANGEL,{ bonus2 bAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_DAMAGE_DRAGON,{ bonus2 bAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_NOTHING,{ bonus2 bMagicAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -117,7 +115,7 @@ RDMOPT_RACE_MDAMAGE_PLANT,{ bonus2 bMagicAddRace,RC_Plant,getrandomoptinfo(ROA_V
 RDMOPT_RACE_MDAMAGE_INSECT,{ bonus2 bMagicAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_FISHS,{ bonus2 bMagicAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_DEVIL,{ bonus2 bMagicAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_MDAMAGE_HUMAN,{ bonus2 bMagicAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bMagicAddRace,RC_Player,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_MDAMAGE_HUMAN,{ bonus2 bMagicAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_ANGEL,{ bonus2 bMagicAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_MDAMAGE_DRAGON,{ bonus2 bMagicAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_CRI_PERCENT_NOTHING,{ bonus2 bCriticalAddRace,RC_Formless,getrandomoptinfo(ROA_VALUE)/10; }
@@ -127,7 +125,7 @@ RDMOPT_RACE_CRI_PERCENT_PLANT,{ bonus2 bCriticalAddRace,RC_Plant,getrandomoptinf
 RDMOPT_RACE_CRI_PERCENT_INSECT,{ bonus2 bCriticalAddRace,RC_Insect,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_FISHS,{ bonus2 bCriticalAddRace,RC_Fish,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_DEVIL,{ bonus2 bCriticalAddRace,RC_Demon,getrandomoptinfo(ROA_VALUE)/10; }
-RDMOPT_RACE_CRI_PERCENT_HUMAN,{ bonus2 bCriticalAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE)/10; bonus2 bCriticalAddRace,RC_Player,getrandomoptinfo(ROA_VALUE)/10; }
+RDMOPT_RACE_CRI_PERCENT_HUMAN,{ bonus2 bCriticalAddRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_ANGEL,{ bonus2 bCriticalAddRace,RC_Angel,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_CRI_PERCENT_DRAGON,{ bonus2 bCriticalAddRace,RC_Dragon,getrandomoptinfo(ROA_VALUE)/10; }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_NOTHING,{ bonus2 bIgnoreDefRaceRate,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -137,7 +135,7 @@ RDMOPT_RACE_IGNORE_DEF_PERCENT_PLANT,{ bonus2 bIgnoreDefRaceRate,RC_Plant,getran
 RDMOPT_RACE_IGNORE_DEF_PERCENT_INSECT,{ bonus2 bIgnoreDefRaceRate,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_FISHS,{ bonus2 bIgnoreDefRaceRate,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_DEVIL,{ bonus2 bIgnoreDefRaceRate,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bIgnoreDefRaceRate,RC_Player,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_ANGEL,{ bonus2 bIgnoreDefRaceRate,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_DEF_PERCENT_DRAGON,{ bonus2 bIgnoreDefRaceRate,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_NOTHING,{ bonus2 bIgnoreMdefRaceRate,RC_Formless,getrandomoptinfo(ROA_VALUE); }
@@ -147,7 +145,7 @@ RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLANT,{ bonus2 bIgnoreMdefRaceRate,RC_Plant,getr
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_INSECT,{ bonus2 bIgnoreMdefRaceRate,RC_Insect,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_FISHS,{ bonus2 bIgnoreMdefRaceRate,RC_Fish,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_DEVIL,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); bonus2 bIgnoreMdefRaceRate,RC_Player,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_ANGEL,{ bonus2 bIgnoreMdefRaceRate,RC_Angel,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RACE_IGNORE_MDEF_PERCENT_DRAGON,{ bonus2 bIgnoreMdefRaceRate,RC_Dragon,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_CLASS_DAMAGE_NORMAL_TARGET,{ bonus2 bAddClass,Class_Normal,getrandomoptinfo(ROA_VALUE); }
@@ -168,7 +166,7 @@ RDMOPT_DAMAGE_SIZE_MIDIUM_USER,{ bonus2 bSubSize,Size_Medium,getrandomoptinfo(RO
 RDMOPT_DAMAGE_SIZE_LARGE_USER,{ bonus2 bSubSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_DAMAGE_SIZE_PERFECT,{ bonus bNoSizeFix,1; }
 RDMOPT_DAMAGE_CRI_TARGET,{ bonus bCritAtkRate,getrandomoptinfo(ROA_VALUE); }
-RDMOPT_DAMAGE_CRI_USER,{ bonus bCriticalDef,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_DAMAGE_CRI_USER,{ bonus bCritDefRate,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RANGE_ATTACK_DAMAGE_TARGET,{ bonus bLongAtkRate,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_RANGE_ATTACK_DAMAGE_USER,{ bonus bLongAtkDef,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_HEAL_VALUE,{ bonus bHealPower,getrandomoptinfo(ROA_VALUE); }
@@ -193,8 +191,34 @@ RDMOPT_BODY_INDESTRUCTIBLE,{ bonus bUnbreakableArmor,1; }
 RDMOPT_MDAMAGE_SIZE_SMALL_TARGET,{ bonus2 bMagicAddSize,Size_Small,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_SIZE_MIDIUM_TARGET,{ bonus2 bMagicAddSize,Size_Medium,getrandomoptinfo(ROA_VALUE); }
 RDMOPT_MDAMAGE_SIZE_LARGE_TARGET,{ bonus2 bMagicAddSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
-//RDMOPT_MDAMAGE_SIZE_SMALL_USER,{}
-//RDMOPT_MDAMAGE_SIZE_MIDIUM_USER,{}
-//RDMOPT_MDAMAGE_SIZE_LARGE_USER,{}
-//redefined?
-//RDMOPT_ATTR_TOLERACE_ALL,{}
+RDMOPT_MDAMAGE_SIZE_SMALL_USER,{ bonus2 bMagicSubSize,Size_Small,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MDAMAGE_SIZE_MIDIUM_USER,{ bonus2 bMagicSubSize,Size_Medium,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MDAMAGE_SIZE_LARGE_USER,{ bonus2 bMagicSubSize,Size_Large,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_ATTR_TOLERACE_ALL,{ bonus2 bSubEle,Ele_All,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_WEAPON_TOLERACE_NOTHING,{ bonus3 bSubRace,RC_Formless,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_UNDEAD,{ bonus3 bSubRace,RC_Undead,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_ANIMAL,{ bonus3 bSubRace,RC_Brute,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_PLANT,{ bonus3 bSubRace,RC_Plant,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_INSECT,{ bonus3 bSubRace,RC_Insect,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_FISHS,{ bonus3 bSubRace,RC_Fish,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_DEVIL,{ bonus3 bSubRace,RC_Demon,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_HUMAN,{ bonus3 bSubRace,RC_DemiHuman,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_ANGEL,{ bonus3 bSubRace,RC_Angel,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+RDMOPT_RACE_WEAPON_TOLERACE_DRAGON,{ bonus3 bSubRace,RC_Dragon,getrandomoptinfo(ROA_VALUE),BF_WEAPON; }
+// RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_TARGET,{}
+// RDMOPT_RANGE_WEAPON_ATTACK_DAMAGE_USER,{}
+RDMOPT_RACE_TOLERACE_PLAYER_HUMAN,{ bonus2 bSubRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_TOLERACE_PLAYER_DORAM,{ bonus2 bSubRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_PLAYER_HUMAN,{ bonus2 bAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_DAMAGE_PLAYER_DORAM,{ bonus2 bAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_MDAMAGE_PLAYER_HUMAN,{ bonus2 bMagicAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE);  }
+RDMOPT_RACE_MDAMAGE_PLAYER_DORAM,{ bonus2 bMagicAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_CRI_PERCENT_PLAYER_HUMAN,{ bonus2 bCriticalAddRace,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_CRI_PERCENT_PLAYER_DORAM,{ bonus2 bCriticalAddRace,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_HUMAN,{ bonus2 bIgnoreDefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_DEF_PERCENT_PLAYER_DORAM,{ bonus2 bIgnoreDefRaceRate,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_HUMAN,{ bonus2 bIgnoreMdefRaceRate,RC_Player_Human,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_RACE_IGNORE_MDEF_PERCENT_PLAYER_DORAM,{ bonus2 bIgnoreMdefRaceRate,RC_Player_Doram,getrandomoptinfo(ROA_VALUE); }
+// RDMOPT_REFLECT_DAMAGE_PERCENT,{}
+RDMOPT_MELEE_ATTACK_DAMAGE_TARGET,{ bonus bShortAtkRate,getrandomoptinfo(ROA_VALUE); }
+RDMOPT_MELEE_ATTACK_DAMAGE_USER,{ bonus bNearAtkDef,getrandomoptinfo(ROA_VALUE); }

db/re/job_exp.txt

@@ -2,26 +2,28 @@
 // Only official levels included, check db/import-tmpl/job_exp.txt for an expanded list
 //
 // Structure of Database:
-// Max Level,Class list,Type,Exp for Lv 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175
+// Max Level,Class list,Type,Exp for Lv 1,2,3,...,200
 //
 // Type:
 //	0 = Base Exp, 1 = Job Exp
 
 //Base - Normal and Baby Jobs
-99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049:4050:4051:4052:4222:4225:4226:4227:4228:4238,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,57000,59000,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,99999999
+99,0:1:2:3:4:5:6:7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:23:24:25:4023:4024:4025:4026:4027:4028:4029:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4045:4046:4047:4048:4049:4050:4051:4052:4222:4225:4226:4227:4228:4238,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,59000,61500,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,99999999
 
-//Base - Adv Jobs
-99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999
+//Base - Trans classes
+99,4001:4002:4003:4004:4005:4006:4007:4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,0,600,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,99999999
 
-//Base - 3rd Jobs, Baby 3rds, Oboro/Kagerou, Rebellion, Summoner, Star Emperor, Soul Reaper
-//Note: (First 98 values [Level 1 - 98] are only used by Summoner Class, because 3rd classes start at level 99.)
-175,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4218:4220:4223:4224:4229:4239:4240:4241:4242:4243:4244,0,55,90,150,220,320,380,420,455,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,75600,83700,91800,99900,108000,116100,124200,132300,140400,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//Base - Extended classes - Values for level 1 - 99 are unused and are simply copy-pasted from Normal classes values.
+200,4190:4191:4211:4212:4215:4239:4240:4223:4224:4229:4239:4240:4241:4242:4243:4244,0,550,900,1500,2200,3200,3800,4200,4550,5000,5500,6000,6100,6350,6700,7350,8000,8400,8800,9200,9700,10300,11000,11800,13000,14000,15000,16000,17000,18000,19000,20000,21000,22000,23200,24000,26000,27500,29000,30000,31500,33000,34000,36000,37500,38000,40000,42000,44500,47000,49000,51000,53000,55000,59000,61500,61500,63000,65000,67000,69000,70000,73000,77000,80000,84000,88000,91000,95000,110000,128000,140000,155000,163000,170000,180000,188000,195000,200000,230000,260000,300000,350000,400000,480000,550000,600000,680000,750000,900000,1000000,1200000,1500000,1800000,2100000,2400000,2800000,3300000,4000000,1272747,1354202,1440870,1533085,1631202,1735598,1846676,1964863,2090614,2224413,2366775,2518248,2679415,2850897,3033354,3227488,3434047,3653826,3887670,4136480,4401214,4755467,5138234,5551810,5998675,6481508,7003204,7566891,8175950,8834032,9545083,10313366,11143488,12040427,13009560,14056699,15188122,16410613,17731503,19158711,20700795,22367001,24167320,26112547,28214345,30485317,32939080,35590346,38455012,41550255,44894635,48508204,52412629,56631321,61189576,66114724,71436298,77186205,83398922,90111701,97364791,105201683,113669366,122818613,132704283,143385650,154926760,167396814,180870583,195428856,211158924,229155105,246519309,266361648,287801097,310966207,352013746,398479560,451078861,510621270,578023277,654322349,740692899,838464361,949141656,1074428354,1216252896,1376798278,1558535650,1764262355,1997144985,2260768123,2559189515,2897002530,3279406863,3712288568,4202310658,4757015664,5384941731,6095754039,6900363572,99999999
 
-//Base - Expanded Super Novice & Expanded Super Baby
-160,4190:4191,0,660,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,7070000,7400000,7770000,8150000,8550000,9100000,9610000,10150000,10570000,11180000,12000000,12200000,12930000,13150000,14030000,14420000,15420000,15670000,16870000,17140000,18720000,19020000,20590000,20930000,22690000,23310000,25290000,26020000,27860000,28535000,30990000,31680000,33560000,34942000,36372000,38350000,39890000,41545000,43330000,45400000,48100000,50410000,53370000,56250000,59230000,62590000,66120000,70200000,75330000,81100000,95000000,98000000,103000000,107000000,112000000,116000000,121000000,125000000,130000000,134000000,139000000,145000000,152200000,160840000,171200000,191930000,202290000,214720000,229640000,247550000,283370000,301280000,322770000,348560000,379500000,441390000,99999999
+//Base - Third classes - Values for level 1 - 99 are unused and are simply copy-pasted from Trans classes values.
+200,4054:4055:4056:4057:4058:4059:4066:4067:4068:4069:4070:4071:4072:4060:4061:4062:4063:4064:4065:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112,0,600,1080,1800,2640,3840,4560,5040,5460,6000,6600,7200,7320,7620,8040,8820,9600,10080,10560,11040,12610,13390,14300,15340,16900,18460,19500,20800,22100,23400,24700,26000,27300,28600,30160,31200,33800,35750,37700,39000,44100,46200,47600,50400,52500,53200,56000,58800,62300,65800,68600,71400,74200,77000,79800,82600,86100,88200,91000,93800,103500,105000,109500,115500,120000,126000,132000,136500,142500,165000,192000,210000,232500,244500,255000,270000,282000,292500,300000,345000,416000,480000,560000,640000,768000,880000,960000,1088000,1200000,1440000,1700000,2040000,2550000,3060000,3570000,4080000,4760000,5610000,6800000,1272747,1354202,1440870,1533085,1631202,1735598,1846676,1964863,2090614,2224413,2366775,2518248,2679415,2850897,3033354,3227488,3434047,3653826,3887670,4136480,4401214,4755467,5138234,5551810,5998675,6481508,7003204,7566891,8175950,8834032,9545083,10313366,11143488,12040427,13009560,14056699,15188122,16410613,17731503,19158711,20700795,22367001,24167320,26112547,28214345,30485317,32939080,35590346,38455012,41550255,44894635,48508204,52412629,56631321,61189576,66114724,71436298,77186205,83398922,90111701,97364791,105201683,113669366,122818613,132704283,143385650,154926760,167396814,180870583,195428856,211158924,229155105,246519309,266361648,287801097,310966207,352013746,398479560,451078861,510621270,578023277,654322349,740692899,838464361,949141656,1074428354,1216252896,1376798278,1558535650,1764262355,1997144985,2260768123,2559189515,2897002530,3279406863,3712288568,4202310658,4757015664,5384941731,6095754039,6900363572,99999999
+
+//Base- Summoner
+200,4218:4220,0,55,90,150,220,320,380,420,455,500,550,600,700,800,900,1000,1100,1200,1400,1500,1800,2100,2400,2700,3000,3300,3600,3900,4200,4500,5400,6300,7200,8100,9000,9900,10800,11700,12600,13500,16200,18900,21600,24300,27000,29700,32400,35100,37800,40500,43200,45900,48600,51300,54000,56700,59400,62100,64800,67500,70200,72900,75600,78300,81000,83700,86400,89100,91800,94500,103950,114345,125779,138356,152201,167421,184163,202579,222836,240662,259914,280707,303163,327416,353609,381897,412448,445443,481078,519564,561129,606019,654500,706860,763408,824480,890438,961673,1038606,1121694,1211429,1308343,1413010,1526050,1648134,1779984,1922382,2076172,2242265,2421646,2615377,2824607,3050575,3294621,3558190,3842845,4150272,4482293,4840876,5228146,5646397,6098108,6585956,7112832,7681858,8296406,8960118,9676927,10451081,11287167,12190140,13165351,14218579,15356065,16584550,17911314,19344219,20891756,22563096,24368143,26317594,28423001,30696841,33152588,35804795,38669178,41762712,45103728,48712026,52608988,56817707,61363123,66272172,71573945,77299860,83483848,90162555,97375559,105165603,113578851,122665159,132478371,143076640,154522771,166884592,177548517,188893867,200964185,222383346,234614430,247518223,261131725,275493969,290646137,306631674,347137718,392994610,444909197,503681701,570218053,645543857,730820200,827361548,936656008,1060388266,1200465555,1359047054,1538577169,1741823213,1971918059,2232408434,2527309588,2861167184,3239127369,3667016094,4151428920,4699832680,5320680577,6023542481,6819252442,99999999
 
 //Job - Novice & Baby Novice
-10,0:4023,1,10,18,28,40,91,151,205,268,340,999999999
+10,0:4023,1,55,90,150,150,320,380,420,455,500,999999999
 
 //Job - 1st Classes & Baby 1st Classes, Taekwon
 50,1:2:3:4:5:6:4024:4025:4026:4027:4028:4029:4046:4050:4225,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,999999999
@@ -29,29 +31,29 @@
 //Job - 2nd Classes & Baby 2nd Classes, Soul Linker
 50,7:8:9:10:11:12:13:14:15:16:17:18:19:20:21:4030:4031:4032:4033:4034:4035:4036:4037:4038:4039:4040:4041:4042:4043:4044:4049:4051:4052:4227,1,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,32000,33300,35100,40500,44100,46300,48500,50700,56000,59400,63500,68100,75000,85700,90500,96600,102600,108600,119700,126000,132300,138600,146100,157500,170600,180400,190300,196800,214900,225200,232000,245700,255900,279300,294000,308700,327000,345400,999999999
 
-//Job - Novice High
-10,4001,1,11,20,31,44,100,166,226,295,374,999999999
+//Job - Ninja, Gunslinger
+70,24:25:4222:4228,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,999999999
 
-//Job - Adv First Classes
-50,4002:4003:4004:4005:4006:4007,1,100,200,350,550,800,1100,1450,1850,2300,2800,3350,3950,4600,5300,6050,6850,7700,8600,9550,10550,11600,12700,13850,15050,16300,17600,18950,20350,21800,23300,24850,26450,28100,29800,31550,33350,35200,37100,39050,41050,43100,45200,47350,49550,51800,54100,56450,58850,61300,999999999
+//Job - Star Gladiator
+50,4047:4048:4226:4238,1,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,101400,112000,118800,127000,136200,150000,171400,181000,193200,205200,217200,239400,252000,264600,277200,292200,315000,341200,360800,380600,393600,429800,450400,464000,491400,511800,558600,588000,617400,654000,690800,999999999
 
-//Job - Adv Second Classes
-70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,3800,6200,10400,15200,22900,27100,30000,32500,35700,41300,45000,45800,47600,50300,58700,63900,67100,70300,73500,90600,96200,102700,110200,121400,144700,152900,163100,173300,183500,213500,224700,236000,247200,260700,299800,324800,343600,362300,374800,474400,497000,512100,542200,564800,644300,678200,712100,754500,796900,873100,911900,950600,989400,1028100,1143300,1199900,1233800,1279100,1324300,1486900,1515900,1603000,1719200,1806300,2040300,2244300,2415900,2746000,3326000,999999999
+//Job - High Novice
+10,4001,1,12,22,35,50,113,188,256,335,425,999999999
 
-//Job - 3rd Jobs & Baby 3rds, Oboro/Kagerou, Rebellion, Star Emperor, Soul Reaper
-60,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229:4239:4240:4241:4242:4243:4244,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,131668000,145518000,160753000,177511000,195944000,216220000,238523000,263056000,290042000,319726000,999999999
+//Job - Trans 1st Classes
+50,4002:4003:4004:4005:4006:4007,1,340,550,760,990,1250,1600,1980,2340,2740,3140,3950,4510,5210,5950,7000,8150,9130,10220,11480,12780,14090,15560,16980,18620,20280,21780,24510,27000,29000,31000,36000,39000,41000,45000,49000,51900,55000,59450,64630,70030,74940,79800,84630,89610,95170,100420,107250,112070,118120,999999999
 
-//Job - Expanded Super Novice & Expanded Super Baby
-50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
+//Job - Trans 2nd Classes
+70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,1803,2972,5036,7434,11312,13520,15117,16540,18350,21441,23596,24256,25461,27174,32029,35216,37349,39521,41734,51958,55721,60081,65113,72448,87216,93081,100283,107620,115094,135249,143768,152508,161343,171856,199607,218415,233368,248529,259675,331968,351261,365552,390909,411275,473857,503777,534248,571719,609886,674886,711926,749561,787957,826965,928824,984554,1022494,1070636,1119554,1269585,1307290,1396228,1512414,1604928,1830969,2034180,2211611,2538936,3105953,999999
 
-//Job - Ninja/Gunslinger
-70,24:25:4222:4228,1,200,300,400,600,700,1000,1200,1400,1700,1900,2400,2700,3200,3600,4200,4900,5500,6100,6900,7700,8400,9300,10100,11100,12100,13000,14600,16100,17500,18600,21500,23300,24700,27000,29000,30000,32400,35000,38100,41100,44000,46700,49600,52500,55600,58900,62700,65500,69200,72300,81200,84100,89300,95500,100900,107800,114900,120700,128600,150500,176900,196100,219600,234200,247900,266400,281300,296600,308000,999999999
+//Job - 3rd Jobs & Baby 3rds, Oboro, Kagerou, Rebellion, Star Emperor, Soul Reaper
+70,4054:4055:4056:4057:4058:4059:4060:4061:4062:4063:4064:4065:4066:4067:4068:4069:4070:4071:4072:4073:4074:4075:4076:4077:4078:4079:4080:4081:4082:4083:4084:4085:4086:4087:4096:4097:4098:4099:4100:4101:4102:4103:4104:4105:4106:4107:4108:4109:4110:4111:4112:4211:4212:4215:4223:4224:4229:4239:4240:4241:4242:4243:4244,1,12800,16384,20971,26843,34359,43980,56294,72057,92233,118059,151115,193428,247588,316912,405648,519229,664613,850705,1088903,1393796,1784059,2283596,2923003,3741444,4231573,4785909,5412863,6121948,6923924,7830958,8856813,10017056,11329290,12813427,14491986,16390436,18537584,20966007,23712554,26818899,30332175,34305690,38799735,43882500,49631108,56132783,63486178,71802867,81209043,91847428,103879441,117487647,132878529,150285617,169973033,192239500,217422874,245905271,278118862,319836691,367812195,422984024,486431628,559396372,632361116,705325860,778290604,851255348,924220092,999999999
 
-//Job - Star Gladiator
-50,4047:4048:4226:4238,1,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,50700,101400,112000,118800,127000,136200,150000,171400,181000,193200,205200,217200,239400,252000,264600,277200,292200,315000,341200,360800,380600,393600,429800,450400,464000,491400,511800,558600,588000,617400,654000,690800,999999999
+//Job - Expanded Super Novice & Expanded Super Baby
+50,4190:4191,1,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,11072000,11848000,13467000,14337000,16243000,17216000,19446000,20781000,23070000,24453000,27568000,29118000,31820000,34125000,37048000,40204000,42972000,45937000,49110000,52696000,57158000,61305000,67167000,72285000,77647000,83624000,91113000,98548000,107630000,119077000,999999999
 
 //Job - Super Novice & Baby Super Novice
-99,23:4045,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,97180,590120,600120,610120,620120,630120,640120,650120,660120,670120,680120,690120,700120,710120,720120,730120,740120,750120,760120,770120,780120,790120,800120,810120,820120,830120,840120,850120,860120,870120,880120,890120,900120,910120,920120,930120,940120,950120,960120,970120,980120,990120,1000120,1010120,1020120,1030120,1040120,1050120,1060120,1070120,999999999
+99,23:4045,1,60,130,260,460,780,1060,1300,1560,1910,2290,2680,2990,3340,3740,4360,4970,5530,6120,6700,8090,8920,9970,11080,12690,14440,15850,17400,19220,21060,22870,24910,26840,29080,31320,33300,37110,40500,43570,46180,53510,57200,60310,65690,70090,72130,77540,83320,90120,590120,600120,610120,620120,630120,640120,650120,660120,670120,680120,690120,700120,710120,720120,730120,740120,750120,760120,770120,780120,790120,800120,810120,820120,830120,840120,850120,860120,870120,880120,890120,900120,910120,920120,930120,940120,950120,960120,970120,980120,990120,1000120,1010120,1020120,1030120,1040120,1050120,1060120,1070120,1080120,999999999
 
 //Job - Summoner
-50,4218:4220,1,60,130,260,460,780,1060,1300,1560,1910,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,31500,34900,38300,41700,45100,48500,51900,55000,72000,89000,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7254000,7870000,9015000,9530000,999999999
+70,4218:4220,1,60,130,260,460,780,1060,1300,1560,1910,2500,4200,7000,10300,15900,18900,20900,22600,24900,28800,33100,35100,40500,44100,46300,48500,50700,56000,59000,63500,68100,75000,85700,90500,106000,112000,355000,615000,917000,1253000,1595000,2007000,2430000,2868000,3420000,3863000,4504000,4998000,5769000,6321000,7585200,9860760,13805064,20707596,33132154,53011447,72890740,92770033,112649326,132528619,319836691,367812195,422984024,486431628,559396372,632361116,705325860,778290604,851255348,924220092,999999999

db/re/mob_db.txt

@@ -2347,7 +2347,7 @@
 //3187,E2_G_S_NYDHOG
 //3188,E2_FELOCK
 //3189,WOLF_MOON
-3190,MM_SARAH,Sarah,Sarah Irene,160,100000000,1,0,0,12,1090,1665,276,255,43,161,6,188,225,136,10,12,0,0,20,0x87700A4,2000,500,500,0,0,0,0,0,0,0,0,15121,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4610,1
+3190,MM_SARAH,Sarah,Sarah Irene,160,100000000,1,0,0,12,1090,1665,276,255,43,161,6,188,225,136,10,12,0,0,20,0xE7F00A4,2000,500,500,0,0,0,0,0,0,0,0,15121,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4610,1
 3191,MM_M_GIGAN1,Gigantes,Gigantes,160,6653400,1,0,1,2,4635,120,64,112,156,151,30,62,265,21,10,12,1,6,47,0x62D3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27183,1
 3192,MM_M_GIGAN2,Gigantes,Gigantes,160,9870000,1,0,0,2,5128,89,89,175,212,138,43,21,227,15,10,12,1,6,47,0x62A3885,250,500,500,600,0,0,0,0,0,0,0,15121,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27183,1
 3193,MM_M_GIGAN3,Ancient Medium Gigantes,Ancient Medium Gigantes,160,1126300,1,0,0,2,3967,165,113,155,121,125,45,35,271,15,10,12,1,6,47,0x6283885,300,500,500,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27183,1
@@ -4071,7 +4071,56 @@
 //20941,GROTE
 //20942,PIERROTZOIST
 //20943,DEATH_WITCH
-
+//20944,JP_E_MONSTER_151
+//20945,JP_E_MONSTER_152
+//20946,JP_E_MONSTER_153
+//20947,JP_E_MONSTER_154
+//20948,JP_E_MONSTER_155
+//20949,JP_E_MONSTER_156
+//20950,JP_E_MONSTER_157
+//20951,JP_E_MONSTER_158
+//20952,JP_E_MONSTER_159
+//20953,JP_E_MONSTER_160
+//20954,JP_E_MONSTER_161
+//20955,JP_E_MONSTER_162
+//20956,JP_E_MONSTER_163
+//20957,JP_E_MONSTER_164
+//20958,JP_E_MONSTER_165
+//20959,JP_E_MONSTER_166
+//20960,JP_E_MONSTER_167
+//20961,JP_E_MONSTER_168
+//20962,JP_E_MONSTER_169
+//20963,JP_E_MONSTER_170
+//20964,JP_E_MONSTER_171
+//20965,JP_E_MONSTER_172
+//20966,JP_E_MONSTER_173
+//20967,JP_E_MONSTER_174
+//20968,JP_E_MONSTER_175
+//20969,JP_E_MONSTER_176
+//20970,JP_E_MONSTER_177
+//20971,JP_E_MONSTER_178
+//20972,JP_E_MONSTER_179
+//20973,JP_E_MONSTER_180
+//20974,JP_E_MONSTER_181
+//20975,JP_E_MONSTER_182
+//20976,JP_E_MONSTER_183
+//20977,JP_E_MONSTER_184
+//20978,JP_E_MONSTER_185
+//20979,JP_E_MONSTER_186
+//20980,JP_E_MONSTER_187
+//20981,JP_E_MONSTER_188
+//20982,JP_E_MONSTER_189
+//20983,JP_E_MONSTER_190
+//20984,JP_E_MONSTER_191
+//20985,JP_E_MONSTER_192
+//20986,JP_E_MONSTER_193
+//20987,JP_E_MONSTER_194
+//20988,JP_E_MONSTER_195
+//20989,JP_E_MONSTER_196
+//20990,JP_E_MONSTER_197
+//20991,JP_E_MONSTER_198
+//20992,JP_E_MONSTER_199
+//20993,JP_E_MONSTER_200
 //20994,MD_BETELGEUSE
 //20995,MD_G_DEADSOUL
 //20996,MD_NAGHT_SIEGER

db/re/mob_skill_db.txt

@@ -714,12 +714,11 @@
 1141,Marina@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
 1141,Marina@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,19,,,,,,
 1141,Marina@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
-1142,Marine Sphere@NPC_RUN,idle,354,7,10000,0,30000,no,master,alchemist,,,,,,,26,
-1142,Marine Sphere@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,afterskill,354,,,,,,,
+1142,Marine Sphere@NPC_RANDOMMOVE,idle,331,1,10000,0,30000,yes,target,alchemist,,,,,,,,
+1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,3000,0,yes,self,alchemist,,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,99,,,,,,,
 1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
-//1142,Marine Sphere@NPC_SELFDESTRUCTION,idle,173,1,10000,0,0,yes,self,always,0,,,,,,,
-//1142,Marine Sphere@NPC_SPEEDUP,any,332,1,10000,0,700,yes,self,always,0,,,,,,,
+1142,Marine Sphere@NPC_SPEEDUP,idle,332,1,10000,0,700,yes,target,always,,,,,,,,
 1143,Marionette@HT_FREEZINGTRAP,idle,121,5,500,0,300000,yes,around2,always,0,,,,,,29,
 1143,Marionette@MG_FIREWALL,chase,18,5,500,500,5000,yes,target,always,0,,,,,,2,
 1143,Marionette@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,6,
@@ -11185,8 +11184,8 @@
 
 3038,Hidden Mob 7@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 3038,Hidden Mob 7@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-// 3038,Hidden Mob 7@NPC_HELLBURNING,idle,719,1,10000,0,3000,yes,self,always,0,,,,,,,
-// 3038,Hidden Mob 7@NPC_HELLBURNING,attack,719,1,10000,0,3000,yes,self,always,0,,,,,,,
+3038,Hidden Mob 7@NPC_HELLBURNING,idle,719,1,10000,0,3000,yes,self,always,0,,,,,,,
+3038,Hidden Mob 7@NPC_HELLBURNING,attack,719,1,10000,0,3000,yes,self,always,0,,,,,,,
 
 // Jitterbug instance
 3069,Ferre@NPC_GROUNDATTACK,attack,185,5,1000,0,5000,no,target,always,0,,,,,,,

db/re/pet_db.yml

@@ -675,13 +675,13 @@ Body:
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bAddRace,RC_Demihuman,3;
         bonus2 bMagicAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player,3;
-        bonus2 bMagicAddRace,RC_Player,3;
+        bonus2 bAddRace,RC_Player_Human,3;
+        bonus2 bMagicAddRace,RC_Player_Human,3;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus2 bAddRace,RC_Demihuman,2;
         bonus2 bMagicAddRace,RC_DemiHuman,2;
-        bonus2 bAddRace,RC_Player,2;
-        bonus2 bMagicAddRace,RC_Player,2;
+        bonus2 bAddRace,RC_Player_Human,2;
+        bonus2 bMagicAddRace,RC_Player_Human,2;
       }
   - Mob: ALICE
     TameItem: Sway_Apron
@@ -697,11 +697,11 @@ Body:
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bMdef,2;
         bonus2 bSubRace,RC_DemiHuman,2;
-        bonus2 bSubRace,RC_Player,2;
+        bonus2 bSubRace,RC_Player_Human,2;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus bMdef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player,1;
+        bonus2 bSubRace,RC_Player_Human,1;
       }
     Evolution:
       - Target: ALIZA
@@ -760,11 +760,11 @@ Body:
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bDef,2;
         bonus2 bSubRace,RC_DemiHuman,2;
-        bonus2 bSubRace,RC_Player,2;
+        bonus2 bSubRace,RC_Player_Human,2;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus bDef,1;
         bonus2 bSubRace,RC_DemiHuman,1;
-        bonus2 bSubRace,RC_Player,1;
+        bonus2 bSubRace,RC_Player_Human,1;
       }
   - Mob: ECLIPSE_P
     EggItem: Spring_Rabbit_Egg
@@ -933,10 +933,10 @@ Body:
       
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bAddRace,RC_DemiHuman,5;
-        bonus2 bAddRace,RC_Player,5;
+        bonus2 bAddRace,RC_Player_Human,5;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus2 bAddRace,RC_DemiHuman,3;
-        bonus2 bAddRace,RC_Player,3;
+        bonus2 bAddRace,RC_Player_Human,3;
       }
   - Mob: SUCCUBUS
     TameItem: Boy's_Naivety
@@ -1143,8 +1143,10 @@ Body:
       
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus2 bSubRace,RC_Brute,5;
+        bonus2 bSubRace,RC_Player_Doram,5;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus2 bSubRace,RC_Brute,3;
+        bonus2 bSubRace,RC_Player_Doram,3;
       }
   - Mob: BACSOJIN_
     TameItem: Shiny_Wing_Gown

db/re/quest_db.yml

@@ -30,8 +30,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.
@@ -2245,24 +2255,74 @@ Body:
     Title: The Royal Richard
   - Id: 5404
     Title: "[Repeat]Warrior Discipline-Human"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: DemiHuman
+        MinLevel: 140
   - Id: 5405
     Title: "[Repeat]Warrior Discipline-Animal"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Brute
+        MinLevel: 140
   - Id: 5406
     Title: "[Repeat]Warrior Discipline-Insect"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Insect
+        MinLevel: 140
   - Id: 5407
     Title: "[Repeat]Warrior Discipline-Fish"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Fish
+        MinLevel: 140
   - Id: 5408
     Title: "[Repeat]Warrior Discipline-Plant"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Plant
+        MinLevel: 140
   - Id: 5409
     Title: "[Repeat]Warrior Discipline-Devil"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Demon
+        MinLevel: 140
   - Id: 5410
     Title: "[Repeat]Warrior Discipline-Angel"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Angel
+        MinLevel: 140
   - Id: 5411
     Title: "[Repeat]Warrior Discipline-Immortal"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Undead
+        MinLevel: 140
   - Id: 5412
     Title: "[Repeat]Warrior Discipline-Intangible"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Formless
+        MinLevel: 140
   - Id: 5413
     Title: "[Repeat]Warrior Discipline-Dragon"
+    Targets:
+      - Id: 1
+        Count: 50
+        Race: Dragon
+        MinLevel: 140
   - Id: 5414
     Title: "[Stand by]Warrior Discipline"
     TimeLimit: 4h

db/re/skill_db.yml

@@ -9711,6 +9711,7 @@ Body:
         Time: 55000
       - Level: 10
         Time: 60000
+    Duration2: 1000
     Requires:
       SpCost: 50
       Weapon:
@@ -16824,6 +16825,28 @@ Body:
     Flags:
       IsNpc: true
     HitCount: 1
+  - Id: 719
+    Name: NPC_HELLBURNING
+    Description: Hell Burning
+    MaxLevel: 1
+    Type: Magic
+    TargetType: Self
+    Flags:
+      IsNpc: true
+      IgnoreLandProtector: true
+    Hit: Single
+    HitCount: 1
+    Element: Fire
+    Duration1: 3000
+    Unit:
+      Id: Hellburning
+      Layout: 1
+      Interval: 20
+      Target: Enemy
+      Flag:
+        NoOverlap: true
+        PathCheck: true
+        RangedSingleUnit: true
   - Id: 720
     Name: NPC_JACKFROST
     Description: Jack Frost 2
@@ -19601,25 +19624,25 @@ Body:
     Element: Holy
     SplashArea:
       - Level: 1
-        Area: 1
+        Area: 3
       - Level: 2
-        Area: 1
+        Area: 3
       - Level: 3
-        Area: 1
+        Area: 3
       - Level: 4
-        Area: 1
+        Area: 3
       - Level: 5
-        Area: 1
+        Area: 3
       - Level: 6
-        Area: 1
+        Area: 3
       - Level: 7
-        Area: 2
+        Area: 5
       - Level: 8
-        Area: 2
+        Area: 5
       - Level: 9
-        Area: 2
+        Area: 5
       - Level: 10
-        Area: 2
+        Area: 5
     CopyFlags:
       Skill:
         Reproduce: true
@@ -24328,6 +24351,16 @@ Body:
           Amount: 1
         - Level: 5
           Amount: 1
+        - Level: 6
+          Amount: 0
+        - Level: 7
+          Amount: 0
+        - Level: 8
+          Amount: 0
+        - Level: 9
+          Amount: 0
+        - Level: 10
+          Amount: 0
   - Id: 2337
     Name: SR_WINDMILL
     Description: Windmill
@@ -28776,7 +28809,7 @@ Body:
         Revolver: true
       Ammo:
         Bullet: true
-      AmmoAmount: 10
+      AmmoAmount: 3
   - Id: 2562
     Name: RL_H_MINE
     Description: Howling Mine

doc/atcommands.txt

@@ -1360,7 +1360,7 @@ Affected files:
 -- atcommand: atcommand_athena.conf, groups.conf
 -- battleconf: battle_athena.conf, battle_conf.txt
 -- instancedb: instance_db.txt
--- itemdb: item_db.txt, item_group_db.txt, item_trade.txt, item_noequip.txt, item_nouse.txt, item_combo_db.txt, item_avail.txt, item_stack.txt, item_delay.txt, item_buyingstore.txt, item_flag.txt
+-- itemdb: item_db.txt, item_group_db.txt, item_trade.txt, item_noequip.txt, item_nouse.txt, item_combo_db.txt, item_avail.txt, item_stack.txt, item_delay.txt, item_buyingstore.txt, item_flag.txt, item_randomopt_db.txt, item_randomopt_group.txt
 -- mobdb: mob_db.txt, mob_item_ratio.txt, mob_chat_db.txt, mob_avail.txt, mob_race2_db.txt, mob_branch.txt, mob_poring.txt, mob_boss.txt, mob_pouch.txt, mob_classchange.txt, pet_db.yml, homunculus_db.txt, homun_skill_tree.txt, exp_homun.txt, mercenary_db.txt, mercenary_skill_db.txt, elemental_db.txt, elemental_skill_db.txt
 -- motd: motd.txt
 -- msgconf: atcommand_athena.conf

doc/item_bonus.txt

@@ -22,7 +22,7 @@ This list contains all available constants referenced in the 'bonus' commands.
 
 * Race (r)
 	RC_Angel, RC_Brute, RC_DemiHuman, RC_Demon, RC_Dragon, RC_Fish, RC_Formless,
-	RC_Insect, RC_Plant, RC_Player, RC_Undead, RC_All
+	RC_Insect, RC_Plant, RC_Player_Human (RC_Player deprecated), RC_Player_Doram, RC_Undead, RC_All
 
 * Monster Race (mr)
 	RC2_Goblin, RC2_Kobold, RC2_Orc, RC2_Golem, RC2_Guardian, RC2_Ninja,
@@ -171,6 +171,7 @@ bonus2 bSkillAtk,sk,n;    		Increases damage of skill sk by n%
 bonus bShortAtkRate,n;			Increases damage of short ranged attacks by n%
 bonus bLongAtkRate,n;     		Increases damage of long ranged attacks by n%
 bonus bCritAtkRate,n;     		Increases critical damage by +n%
+bonus bCritDefRate,n;			Decreases critical damage received by n%
 bonus bCriticalDef,n;     		Decreases the chance of being hit by critical hits by n%
 bonus2 bWeaponAtk,w,n;    		Adds n ATK when weapon of type w is equipped
 bonus2 bWeaponDamageRate,w,n;	Adds n% damage to normal attacks when weapon of type w is equipped
@@ -227,11 +228,13 @@ bonus3 bAddEle,e,x,bf;    		+x% physical damage against element e with trigger c
 bonus2 bMagicAddEle,e,x;  		+x% magical damage against element e
 bonus2 bSubEle,e,x;       		+x% damage reduction against attack element e
 bonus3 bSubEle,e,x,bf;    		+x% damage reduction against attack element e with trigger criteria bf
-bonus2 bSubDefEle,e,x;    		+x% damage reduction from enemy with defense element e
+bonus2 bSubDefEle,e,x;    		+x% physical damage reduction from enemy with defense element e
+bonus2 bMagicSubDefEle,e,x;		+x% magic damage reduction from enemy with defense element e
 
 bonus2 bAddRace,r,x;      		+x% physical damage against race r
 bonus2 bMagicAddRace,r,x; 		+x% magical damage against race r
 bonus2 bSubRace,r,x;      		+x% damage reduction against race r
+bonus3 bSubRace,r,x,bf;    		+x% damage reduction against race r with trigger criteria bf 
 
 bonus2 bAddClass,c,x;     		+x% physical damage against class c
 bonus2 bMagicAddClass,c,x;		+x% magical damage against class c
@@ -240,6 +243,7 @@ bonus2 bSubClass,c,x;     		+x% damage reduction against class c
 bonus2 bAddSize,s,x;      		+x% physical damage against size s
 bonus2 bMagicAddSize,s,x; 		+x% magical damage against size s
 bonus2 bSubSize,s,x;      		+x% damage reduction against size s
+bonus2 bMagicSubSize,s,x;      	+x% magic damage reduction against size s
 bonus bNoSizeFix;       		Ignores the size modifier when calculating damage
 
 bonus2 bAddDamageClass,mid,x;     	+x% physical damage against monster mid

doc/script_commands.txt

@@ -1641,7 +1641,7 @@ S_CheckFull:
 
 Example 2: callsub used repeatedly, with different arguments
 // notice how the Zeny check/delete is reused, instead of copy-pasting for every warp
-	switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Beacon Island, Pharos") {
+	switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Beacon Island, Pharos")) {
 		case 1:	callsub S_DunWarp,"hu_fild05",192,207;
 		case 2:	callsub S_DunWarp,"ama_in02",119,181;
 		case 3:	callsub S_DunWarp,"moc_fild20",164,145;
@@ -5060,18 +5060,19 @@ See 'getitem2' for an explanation of the expanded parameters.
 
 *countbound({<bound type>{,<char_id>}})
 
-This function will return the number of bounded items in the character's
-inventory, and sets an array @bound_items[] containing all item IDs of the
-counted items. If a bound type is specified, only those items will be counted.
+This function will return the number of different bounded items in the character's
+inventory, and sets the arrays @bound_items[] and @bound_amount[] containing all item IDs of the
+counted items and their respective amount. If a bound type is specified, only those items will be counted.
 
 For a list of bound types see 'getitembound'.
 
 Example:
-	mes "You currently have " + countbound() + " bounded items.";
+	.@total_type = countbound();
+	mes "You currently have " + .@total_type + " different type of bounded items.";
 	next;
 	mes "The list of bounded items include:";
-	for(.@i = 0; .@i < getarraysize(@bound_items); .@i++)
-		mes getitemname(@bound_items[.@i]);
+	for(.@i = 0; .@i < .@total_type; .@i++)
+		mes "x" + @bound_amount[.@i] + " " + getitemname(@bound_items[.@i]);
 	close;
 
 ---------------------------------------
@@ -5807,9 +5808,9 @@ Increase AGI Lv 5, and display appropriate effects.
 *npcskilleffect <skill id>,<number>,<x>,<y>;
 *npcskilleffect "<skill name>",<number>,<x>,<y>;
 
-This command behaves identically to 'skilleffect', however, the effect will not
-be centered on the invoking character's sprite, nor on the NPC sprite, if any,
-but will be centered at map coordinates given on the same map as the invoking
+This command behaves identically to 'skilleffect', however, ground type skill
+effects will be centered at the map coordinates given on the same map as the
+attached character and all other skill types will be centered on the attached
 character.
 
 ---------------------------------------
@@ -6863,9 +6864,6 @@ given amount of seconds passes, the script resumes. The color format
 is in RGB (RRGGBB). The color is currently ignored by the client and
 appears always green.
 
-Note: If a player is attached to the NPC, they are detached from the NPC
-as soon as the progress bar activates.
-
 ---------------------------------------
 //
 5,1.- End of time-related commands
@@ -7977,6 +7975,20 @@ Returns "Unknown" if unit is not found.
 
 ---------------------------------------
 
+*setunittitle <GID>,<title>;
+
+Apply a <title> to the given <GID>.
+
+Note: This only works on non-player types. It also will only work on mobs if battle_config.show_mob_info is not enabled.
+
+---------------------------------------
+
+*getunittitle <GID>;
+
+Returns the title of the given <GID>.
+
+---------------------------------------
+
 *getunitdata <GID>,<arrayname>;
 *setunitdata <GID>,<parameter>,<new value>;
 
@@ -8043,6 +8055,7 @@ Parameters (indexes) for monsters are:
 	UMOB_TARGETID
 	UMOB_ROBE
 	UMOB_BODY2
+	UMOB_GROUP_ID
 
 -----
 
@@ -8087,6 +8100,7 @@ Parameter (indexes) for homunculi are:
 	UHOM_ADELAY
 	UHOM_DMOTION
 	UHOM_TARGETID
+	UHOM_GROUP_ID
 
 -----
 
@@ -8128,6 +8142,7 @@ Parameter (indexes) for pets are:
 	UPET_AMOTION
 	UPET_ADELAY
 	UPET_DMOTION
+	UPET_GROUP_ID
 
 -----
 
@@ -8169,6 +8184,7 @@ Parameter (indexes) for mercenaries are:
 	UMER_ADELAY
 	UMER_DMOTION
 	UMER_TARGETID
+	UMER_GROUP_ID
 
 -----
 
@@ -8212,6 +8228,7 @@ Parameter (indexes) for elementals are:
 	UELE_ADELAY
 	UELE_DMOTION
 	UELE_TARGETID
+	UELE_GROUP_ID
 
 -----
 
@@ -8261,6 +8278,7 @@ Parameter (indexes) for NPCs are:
 	UNPC_ROBE
 	UNPC_BODY2
 	UNPC_DEADSIT
+	UNPC_GROUP_ID
 
 *Notes:
 		- *_SIZE: small (0); medium (1); large (2)

doc/yaml/db/quest_db.yml

@@ -13,8 +13,18 @@
 #                   Specify without "+" for the exact time the quest expires using "d" (optionnal), [0-23]"h" (required), [0-59]"mn" (optionnal), [0-59]"s" (optionnal) format.
 #                   Please note the number before "d" only shift the exact timer to the given day(s).
 #   Targets:        Quest objective target. (Default: null)
-#     - Mob         Monster to kill.
-#       Count       Amount of monsters to kill.
+#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
+#                   If Mob is supplied, Count is required and the other fields are ignored.
+#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
+#                   If Id is supplied, Count is required for each new entry.
+#     - Mob         Monster to kill (aegis monster name).
+#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id          Unique target index for the quest Id. Requires a positive number.
+#       Race        Monster race target (default All). Valids race are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+#       Size        Monster size target (default All). Valids size are Small, Medium, Large, All.
+#       Element     Monster element target (default All). Valids elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
 #   Drops:          Quest item drop targets. (Default: null)
 #     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
 #       Item        Item to drop.

npc/custom/official/GeffenMagicTournament.txt

@@ -1944,74 +1944,76 @@ OnStart:
 	switch ('GMT_1QUE) {
 		case 11:
 			hideonnpc instance_npcname("Arhi#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2549,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2549,1,.@label$);
 			break;
 		case 12:
 			hideonnpc instance_npcname("Dio Anemos#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2550,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2550,1,.@label$);
 			break;
 		case 13:
 			if ('GMTQuest == 1) {
 				hideonnpc instance_npcname("Geffen Gangster#n1");
-				'BossID = monster(.@map$,114,50,"--ja--",2553,1,.@label$);
+				monster(.@map$,114,50,"--ja--",2553,1,.@label$);
 			} else if ('GMTQuest == 2) {
 				hideonnpc instance_npcname("Geffen Bully#n1");
-				'BossID = monster(.@map$,114,50,"--ja--",2552,1,.@label$);
+				monster(.@map$,114,50,"--ja--",2552,1,.@label$);
 			} else {
 				hideonnpc instance_npcname("Geffen Shoplifter#n1");
-				'BossID = monster(.@map$,114,50,"--ja--",2551,1,.@label$);
+				monster(.@map$,114,50,"--ja--",2551,1,.@label$);
 			}
 			break;
 		case 14:
 			hideonnpc instance_npcname("Faymont#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2554,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2554,1,.@label$);
 			break;
 		case 15:
 			hideonnpc instance_npcname("Ordre#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2555,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2555,1,.@label$);
 			break;
 		case 16:
 			hideonnpc instance_npcname("Blut Hase#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2556,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2556,1,.@label$);
 			break;
 		case 17:
 			hideonnpc instance_npcname("Kuro Akuma#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2557,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2557,1,.@label$);
 			break;
 		case 18:
 			hideonnpc instance_npcname("Ifodes#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2558,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2558,1,.@label$);
 			break;
 		case 19:
 			hideonnpc instance_npcname("Licheniyes#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2559,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2559,1,.@label$);
 			break;
 		case 20:
 			hideonnpc instance_npcname("Odoric#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2560,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2560,1,.@label$);
 			break;
 		case 21:
 			hideonnpc instance_npcname("Ju#1");
-			'BossID = monster(.@map$,114,50,"--ja--",2561,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2561,1,.@label$);
 			break;
 		case 22:
 			if ('half) {
 				hideonnpc instance_npcname("Dwigh#1");
-				'BossID = monster(.@map$,114,50,"--ja--",2562,1,.@label$);
+				monster(.@map$,114,50,"--ja--",2562,1,.@label$);
 			}
 			else {
 				hideonnpc instance_npcname("Fay Kanavian#1");
-				'BossID = monster(.@map$,114,50,"--ja--",2563,1,.@label$);
+				monster(.@map$,114,50,"--ja--",2563,1,.@label$);
 				donpcevent instance_npcname("#GMTHomun")+"::OnSummon";
 			}
 			
 			break;
 		case 23:
 			hideonnpc instance_npcname("Fenrir#f");
-			'BossID = monster(.@map$,114,50,"--ja--",2564,1,.@label$);
+			monster(.@map$,114,50,"--ja--",2564,1,.@label$);
+			'BossID = $@mobid[0];
 			donpcevent instance_npcname("Geffen Academy Master")+"::OnTalk3";
 			end;
 	}
+	'BossID = $@mobid[0];
 		
 	donpcevent instance_npcname("Geffen Academy Master")+"::OnTalk1";
 	end;
@@ -2089,7 +2091,8 @@ OnTimeout2:
 	mapannounce instance_mapname("1@ge_st"), "<Magic Tournament Broadcast>: Time's up! The judges will decide the victor for this round!",bc_blue;	
 	
 	setcell instance_mapname("1@ge_st"), 50, 50, 50, 50, cell_walkable, 1;
-	unitwarp 'BossID, instance_mapname("1@ge_st"), 50, 50;
+	if (unitexists('BossID))
+		unitwarp 'BossID, instance_mapname("1@ge_st"), 50, 50;
 	killmonster instance_mapname("1@ge_st"), instance_npcname("#GMTcontroller")+"::OnTimeout";
 	'BossID = 0;
 	
@@ -2231,7 +2234,8 @@ end;
 
 OnSummon:
 	initnpctimer;
-	'HomID = monster (instance_mapname("1@ge_st"), 114,50,"--ja--",2565,1, instance_npcname("#GMTHomun")+"::OnHomDead");
+	monster (instance_mapname("1@ge_st"), 114,50,"--ja--",2565,1, instance_npcname("#GMTHomun")+"::OnHomDead");
+	'HomID = $@mobid[0];
 	end;
 
 OnTimer10000:

npc/custom/woe_controller.txt

@@ -62,13 +62,16 @@ OnInit:
 //  [2] Mail all rewards.
 //      - If not set, players receive items in their inventory.
 //      - Only ONE item can be sent via mail for PACKETVER < 20150513 while later clients are limited to MAIL_MAX_ITEM (5).
-//      - Note that offline players do NOT receive rewards.
+//      - If this setting is not set, offline players do NOT receive rewards in any case.
 //  [4] Only reward Guild Masters.
 //      - If not set, all guild members are rewarded.
 //      - If mailing is enabled (option 2), offline Guild Masters WILL receive rewards.
 //  [8] Duplicate IP check.
 //      - Members in a guild with the same IP address are not rewarded.
 //      - If Guild Masters is enabled (option 4), this feature is not used.
+//  [16] Mail online player only.
+//      - Only available when mailing is enabled (option 2).
+//      - When enabled, offline players do NOT receive rewards.
 // -----------------------------------------------------------
 
 	// Combine values as needed (e.g. 1|8 = 1+8 = 9).
@@ -313,23 +316,26 @@ OnReward:
 				.@size_guild = .@k;
 			}
 			for(set .@j,0; .@j<.@size_guild; set .@j,.@j+1) {
+				.@online = isloggedin(.@aid[.@j],.@cid[.@j]);
 				if (.Options&2) {
-					.@charid = .@cid[.@j];
-					.@sender$ = "no-reply";
-					.@title$ = "** Siege Reward: "+getcastlename(.Castles$[.@i])+" **";
-					.@body$ = "Brave one,\r\n \r\n Congratulations!\r\n Your guild has successfully occupied\r\n territory in the War of Emperium on\r\n "+.@str$+".\r\n \r\n \r\n \r\n \r\n [ Your reward is attached. ]";
+					if (.@online || !(.Options&16)) {
+						.@charid = .@cid[.@j];
+						.@sender$ = "no-reply";
+						.@title$ = "** Siege Reward: "+getcastlename(.Castles$[.@i])+" **";
+						.@body$ = "Brave one,\r\n \r\n Congratulations!\r\n Your guild has successfully occupied\r\n territory in the War of Emperium on\r\n "+.@str$+".\r\n \r\n \r\n \r\n \r\n [ Your reward is attached. ]";
 
-					if (.reward_id_size)
-						mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny, .reward_id, .reward_amount;
-					else
-						mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny;
+						if (.reward_id_size)
+							mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny, .reward_id, .reward_amount;
+						else
+							mail .@charid, .@sender$, .@title$, .@body$, .reward_zeny;
 
-					if (PACKETVER < 20150513 && !getd(".@str_"+.@cid[.@j]) && isloggedin(.@aid[.@j],.@cid[.@j])) {
-						setd ".@str_"+.@cid[.@j],1;
-						message rid2name(.@aid[.@j]),"You've got mail!";
+						if (PACKETVER < 20150513 && !getd(".@str_"+.@cid[.@j]) && .@online) {
+							setd ".@str_"+.@cid[.@j],1;
+							message rid2name(.@aid[.@j]),"You've got mail!";
+						}
 					}
 				}
-				else if (isloggedin(.@aid[.@j],.@cid[.@j])) {
+				else if (.@online) {
 					attachrid( .@aid[.@j], true );
 					.@name$ = strcharinfo( 0 );
 					.@castle_name$ = getcastlename(.Castles$[.@i]);

npc/instances/SealedShrine.txt

@@ -225,7 +225,7 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
 			close;
 		case IE_OK:
 			mapannounce "monk_test","[" + strcharinfo(0) + "] member of the [" + getpartyname(.@party_id) + "] party has entered the Sealed Shrine.",bc_map,"0x00ff99";
-			setquest 3040;
+			if (checkre(RENEWAL)) setquest 3040;
 			//warp "1@cata",100,224;
 			close;
 		}
@@ -1147,6 +1147,7 @@ OnInstanceInit:
 2@cata,80,63,4	script	Ancient Hero's Soul#2F	411,{
 	cutin "ins_cata_champ_s",2;
 	if (checkquest(3041)>=0) erasequest 3041;
+	if (!checkre(RENEWAL)) setquest 3040;
 	mes "[Ancient Hero's Soul]";
 	mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete.";
 	next;

npc/jobs/2-1/priest.txt

@@ -946,7 +946,8 @@ job_prist,24,187,4	script	Peter S. Alberto	110,{
 			mes "Now...";
 			mes "Go for it!";
 			close2;
-			changequest 8011,8012;
+			if(checkquest(8012) == -1)
+				changequest 8011,8012;
 			warp "job_prist",24,44;
 			donpcevent "Zombie_Generator#prst::OnEnable";
 			donpcevent "Peter S. Alberto::OnDisable";

npc/other/monster_race.txt

@@ -1208,7 +1208,7 @@ hugel,62,69,1	script	Eckar Erenes#double	798,{
 			close;
 		}
 	}
-	if (!$@mon_time_2_2) {
+	if ($@mon_time_2_2 == 1) {
 		mes "[Eckar Erenes]";
 		mes "Right now, a Monster Race";
 		mes "is in progress. It's too late to place a wager, but if you'd like";

npc/quests/guildrelay.txt

@@ -70,9 +70,10 @@
 	}
 	if (getcharid(2) == .@GID) {
 		if (is_guild_leader() == true) {
+			.@time = atoi( gettimestr("%H%M",5) );
 			if (guildrelay_q == 100) {
-				if (guildtime > 22) {
-					if ((gettime(DT_HOUR) > 1) && (gettime(DT_HOUR) < guildtime)) {
+				if (guildtime > 2299) {
+					if (.@time > 0101 && .@time < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -128,8 +129,8 @@
 						close;
 					}
 				}
-				else if (guildtime > 22) {
-					if ((gettime(DT_HOUR) > 0) && (gettime(DT_HOUR) < guildtime)) {
+				else if (guildtime > 2200) {
+					if (.@time > 0001 && .@time < guildtime) {
 						mes "[" + .@name$ + "]";
 						mes "Oh, you're back. So did you";
 						mes "rest up enough? I'm sure the";
@@ -185,7 +186,7 @@
 						close;
 					}
 				}
-				else if ((gettime(DT_HOUR) - guildtime) > 2) {
+				else if ((.@time - guildtime) > 0200) {
 					mes "[" + .@name$ + "]";
 					mes "Oh, you're back. So did you";
 					mes "rest up enough? I'm sure the";
@@ -242,7 +243,7 @@
 				}
 			}
 			else if (guildrelay_q == 150) {
-				if (((guildtime > 22) && (gettime(DT_HOUR) > 1) && (gettime(DT_HOUR) < guildtime)) || ((guildtime > 21) && (gettime(DT_HOUR) > 0) && (gettime(DT_HOUR) < guildtime)) || ((gettime(DT_HOUR) - guildtime) > 2)) {
+				if ((guildtime > 2299 && .@time > 0101 && .@time < guildtime) || (guildtime > 2199 && .@time > 0001 && .@time < guildtime) || ((.@time - guildtime) > 0200)) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, you look well rested,";
 					mes "master. It is now time for";
@@ -306,12 +307,12 @@
 				}
 			}
 			else if (guildrelay_q == 25) {
-				if (((guildtime > 22) && ((gettime(DT_HOUR) > 4) && (gettime(DT_HOUR) < guildtime)))
-				|| ((guildtime > 21) && ((gettime(DT_HOUR) > 3) && (gettime(DT_HOUR) < guildtime)))
-				|| ((guildtime > 20) && ((gettime(DT_HOUR) > 2) && (gettime(DT_HOUR) < guildtime)))
-				|| ((guildtime > 19) && ((gettime(DT_HOUR) > 1) && (gettime(DT_HOUR) < guildtime)))
-				|| ((guildtime > 18) && ((gettime(DT_HOUR) > 0) && (gettime(DT_HOUR) < guildtime)))
-				|| ((gettime(DT_HOUR) - guildtime) > 5)) {
+				if ((guildtime > 2299 && .@time > 0401 && .@time < guildtime)
+				|| (guildtime > 2199 && .@time > 0301 && .@time < guildtime)
+				|| (guildtime > 2059 && .@time > 0201 && .@time < guildtime)
+				|| (guildtime > 1999 && .@time > 0101 && .@time < guildtime)
+				|| (guildtime > 1899 && .@time > 0001 && .@time < guildtime)
+				|| ((.@time - guildtime) > 0500)) {
 					mes "[" + .@name$ + "]";
 					mes "Ah, have you rested well,";
 					mes "master? Please excuse my";
@@ -415,7 +416,7 @@
 					mes "Hand me the spirit, and allow";
 					mes "me to give you your guild's reward.";
 					delitem 7239,1; //Soul_Of_Proceeding
-					set guildtime,gettime(DT_HOUR);
+					set guildtime,.@time;
 					set guildrelay_q,100;
 					set .@incen_item,rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 25)) {
@@ -483,7 +484,7 @@
 					mes "challenges that you will all";
 					mes "face together. Good work!";
 					delitem 7245,1; //Soul_Of_Friendship
-					set guildtime,gettime(DT_HOUR);
+					set guildtime, atoi( gettimestr("%H%M",5) );
 					set guildrelay_q,150;
 					set .@incen_item,rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 16)) {
@@ -576,7 +577,7 @@
 					mes "Tristan III, and share it with";
 					mes "guild. Once again, good work.";
 					delitem 7251,1; //Soul_Of_Victory
-					set guildtime,gettime(DT_HOUR);
+					set guildtime, atoi( gettimestr("%H%M",5) );
 					set guildrelay_q,25;
 					set .@incen_item,rand(1,100);
 					if ((.@incen_item > 0) && (.@incen_item < 26)) {
@@ -1411,11 +1412,12 @@
 				mes "don't you worry about it.";
 				delitem 7235,1; //Soul_Of_Courage
 				set guildrelay_q,4;
-				set guildtime,gettime(DT_HOUR);
+				set guildtime, atoi( gettimestr("%H%M",5) );
 				close;
 			}
-			if ((guildtime > 22) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(DT_HOUR) > 2) && (gettime(DT_HOUR) < guildtime)) {
+			.@time = atoi( gettimestr("%H%M",5) );
+			if ((guildtime > 2259) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+				if ((.@time > 0201) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1428,8 +1430,8 @@
 					close;
 				}
 			}
-			if ((guildtime > 21) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(DT_HOUR) > 0101) && (gettime(DT_HOUR) < guildtime)) {
+			if ((guildtime > 2159) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+				if ((.@time > 0101) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1442,8 +1444,8 @@
 					close;
 				}
 			}
-			if ((guildtime > 20) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
-				if ((gettime(DT_HOUR) > 0001) && (gettime(DT_HOUR) < guildtime)) {
+			if ((guildtime > 2059) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+				if ((.@time > 0001) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "I guess enough time";
 					mes "has passed. You ready";
@@ -1456,7 +1458,7 @@
 					close;
 				}
 			}
-			if ((gettime(DT_HOUR) - guildtime > 0300) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+			if ((.@time - guildtime > 0300) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
 				mes "[" + .@name$ + "]";
 				mes "I guess enough time";
 				mes "has passed. You ready";
@@ -1797,11 +1799,12 @@
 				mes "in order to be successful.";
 				delitem 7240,1; //Soul_Of_Confidence
 				set guildrelay_q,9;
-				set guildtime,gettime(DT_HOUR);
+				set guildtime, atoi( gettimestr("%H%M",5) );
 				close;
 			}
-			if ((guildtime > 22) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(DT_HOUR) > 02) && (gettime(DT_HOUR) < guildtime)) {
+			.@time = atoi( gettimestr("%H%M",5) );
+			if ((guildtime > 2259) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+				if ((.@time > 0201) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1831,8 +1834,8 @@
 					close;
 				}
 			}
-			else if ((guildtime > 21) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(DT_HOUR) > 01) && (gettime(DT_HOUR) < guildtime)) {
+			else if ((guildtime > 2159) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+				if ((.@time > 0101) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1862,8 +1865,8 @@
 					close;
 				}
 			}
-			else if ((guildtime > 20) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
-				if ((gettime(DT_HOUR) > 0) && (gettime(DT_HOUR) < guildtime)) {
+			else if ((guildtime > 2059) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+				if ((.@time > 0001) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "So did you spend some";
 					mes "quality time with your";
@@ -1893,7 +1896,7 @@
 					close;
 				}
 			}
-			else if ((gettime(DT_HOUR) - guildtime > 3) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+			else if ((.@time - guildtime > 0300) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
 				mes "[" + .@name$ + "]";
 				mes "So did you spend some";
 				mes "quality time with your";
@@ -2766,11 +2769,12 @@
 				mes "to your feelings this time...";
 				delitem 7249,1; //Soul_Of_Service
 				set guildrelay_q,21;
-				set guildtime,gettime(DT_HOUR);
+				set guildtime, atoi( gettimestr("%H%M",5) );
 				close;
 			}
-			if ((guildtime > 22) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(DT_HOUR) > 2) && (gettime(DT_HOUR) < guildtime)) {
+			.@time = atoi( gettimestr("%H%M",5) );
+			if ((guildtime > 2259) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+				if ((.@time > 0201) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2791,8 +2795,8 @@
 					close;
 				}
 			}
-			if ((guildtime > 21) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(DT_HOUR) > 1) && (gettime(DT_HOUR) < guildtime)) {
+			if ((guildtime > 2159) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+				if ((.@time > 0101) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2813,8 +2817,8 @@
 					close;
 				}
 			}
-			if ((guildtime > 20) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
-				if ((gettime(DT_HOUR) > 0) && (gettime(DT_HOUR) < guildtime)) {
+			if ((guildtime > 2059) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+				if ((.@time > 0001) && (.@time < guildtime)) {
 					mes "[" + .@name$ + "]";
 					mes "Yes. You've come at just";
 					mes "the right time. Remember";
@@ -2835,7 +2839,7 @@
 					close;
 				}
 			}
-			if ((gettime(DT_HOUR) - guildtime > 3) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+			if ((.@time - guildtime > 0300) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
 				mes "[" + .@name$ + "]";
 				mes "Yes. You've come at just";
 				mes "the right time. Remember";

npc/re/custom/lasagna/lasa_dun.txt

@@ -2,28 +2,30 @@
 //= Lasagna Dungeons Monsters Spawn Script
 //===== Changelogs: ==========================================
 //= 1.0 First Version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // lasa_dun01 - Dragon's Nest
 //==================================================
-lasa_dun01	monster	Trans Spore	3501,40
-lasa_dun01	monster	Scout Basilisk	3502,40
+lasa_dun01	monster	Trans Spore	3501,30
+lasa_dun01	monster	Scout Basilisk	3502,60
 lasa_dun01	boss_monster	Big Eggring	3505,1,3600000,1800000,1
 
 //==================================================
 // lasa_dun02 - Dragon's Nest
 //==================================================
-lasa_dun02	monster	Combat Basilisk	3503,40
-lasa_dun02	monster	Jungle Madragora	3506,40
+lasa_dun02	monster	Combat Basilisk	3503,60
+lasa_dun02	monster	Jungle Madragora	3506,30
 
 //==================================================
 // lasa_dun03 - Dragon's Nest
 //==================================================
-lasa_dun03	monster	Combat Basilisk	3504,80
-lasa_dun03	monster	Fruits Pom Spider	3507,80
+lasa_dun03	monster	Combat Basilisk	3504,110
+lasa_dun03	monster	Fruits Pom Spider	3507,60
 
 //==================================================
 // lasa_dun_q - Dragon's Nest
 //==================================================
-lasa_dun_q	monster	Scout Basilisk	3502,40
+lasa_dun_q	monster	Scout Basilisk	3502,70
+lasa_dun_q	monster	Trans Spore	3501,30

npc/re/custom/lasagna/lasa_fild.txt

@@ -2,6 +2,7 @@
 //= Lasagna Fild Monster Spawn Script
 //===== Changelogs: ==========================================
 //= 1.0 First Version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -18,7 +19,7 @@ lasa_fild01,140,365,15,15	monster	Red Plant	1078,5
 //==================================================
 // lasa_fild01 - Ravioli Forest
 //==================================================
-lasa_fild02,0,0	monster	Wild Hornet	3498,40
-lasa_fild02,0,0	monster	Sweet Roda Frog	3499,40
-lasa_fild02,0,0	monster	Hunter Desert Wolf	3500,40
-lasa_fild02,0,0	monster	Combat Basilisk	3502,5
+lasa_fild02,0,0	monster	Wild Hornet	3498,90
+lasa_fild02,0,0	monster	Sweet Roda Frog	3499,100
+lasa_fild02,0,0	monster	Hunter Desert Wolf	3500,100
+lasa_fild02,0,0	monster	Combat Basilisk	3502,10

npc/re/custom/lasagna/lasagna_npcs.txt

@@ -1057,7 +1057,7 @@ lasagna,224,126,5	script	Healer Haru#doram07t	4_DR_M_02,{
 			setquest 7722;// EMT
 			completequest 7722;// EMT
 		}
-		skill "NV_FIRSTAID",1,SKILL_PERM;
+		skill "NV_FIRSTAID",1,SKILL_PERM_GRANT;
 		next;
 		mes "[Healer Haru]";
 		mes "Well, then. I'll let you in on something juicy while I'm at it.";

npc/re/instances/SarahAndFenrir.txt

@@ -666,8 +666,10 @@ OnTimer15500:
 1@glast,199,237,0	script	#glast_move_03	WARPNPC,2,2,{
 	end;
 OnTouch:
-	if (is_party_leader() == true)
-		warpparty 'map_glast$,197,263, getcharid(1), 'map_glast$,1,1;
+	if (is_party_leader() == true) {
+		// warpparty 'map_glast$,197,263, getcharid(1), 'map_glast$,1,1;	// using mapwarp for now
+		mapwarp 'map_glast$,'map_glast$,197,263;
+	}
 	end;
 }
 
@@ -675,8 +677,10 @@ OnTouch:
 1@glast,199,294,0	script	#glast_move_03a	WARPNPC,3,3,{
 	end;
 OnTouch:
-	if (is_party_leader() == true)
-		warpparty 'map_glast$,188,334, getcharid(1), 'map_glast$,1,1;
+	if (is_party_leader() == true) {
+		// warpparty 'map_glast$,188,334, getcharid(1), 'map_glast$,1,1;
+		mapwarp 'map_glast$,'map_glast$,188,334;
+	}
 	end;
 }
 
@@ -694,7 +698,8 @@ OnTouch:
 OnTouch:
 	if (is_party_leader() == true) {
 		donpcevent instance_npcname("#sarah_wrath") + "::OnStop";
-		warpparty 'map_glast$,349,282, getcharid(1), 'map_glast$,1,1;
+		// warpparty 'map_glast$,349,282, getcharid(1), 'map_glast$,1,1;
+		mapwarp 'map_glast$,'map_glast$,349,282;
 	}
 	end;
 }
@@ -763,12 +768,13 @@ OnTouch:
 		npctalk "Fenrith Fenrir: We don't have much time! We have to go search for it now! Let's go in!", 'fenrir_3$;
 		sleep2 2000;
 		setpcblock PCBLOCK_NPC, false;
-		if ('skip_left_part == 0) {// 5 mins have passed?
+		if ('skip_left_part == 0 && is_party_leader() == true) {// 5 mins have passed?
 			donpcevent instance_npcname("#fenrir_left_final_2") + "::OnStop";
 			disablenpc 'fenrir_3$;
 			enablenpc 'fenrir_4$;
 			enablenpc instance_npcname("#glast_event_9");
-			warpparty 'map_glast$,41,348, getcharid(1), 'map_glast$,1,1;
+			// warpparty 'map_glast$,41,348, getcharid(1), 'map_glast$,1,1;
+			mapwarp 'map_glast$,'map_glast$,41,348;
 		}
 	}
 	end;

npc/re/mapflag/nobranch.txt

@@ -11,9 +11,13 @@
 //= 1.3 Added dali02 [Nova]
 //= 1.4 Added Nightmare Glastheim [Ridley8819]
 //= 1.5 Added WOE:TE maps [Cydh]
+//= 1.6 Added Para Market maps [mazvi]
 //============================================================
 
-// 3rd Class Job Maps & Paradise
+// Paradise Market =============
+paramk	mapflag	nobranch
+
+// 3rd Class Job Maps & Paradise 
 moc_para01	mapflag	nobranch
 job3_arch01	mapflag	nobranch
 job3_arch02	mapflag	nobranch

npc/re/mapflag/nomemo.txt

@@ -9,8 +9,12 @@
 //= 1.2 Added dali, dali02 [Nova]
 //= 1.3 Added Nightmare Glastheim [Ridley8819]
 //= 1.4 Added GVG TE Maps. [Cydh]
+//= 1.5 Added Para Market maps [mazvi]
 //============================================================
 
+// Paradise Market =============
+paramk	mapflag	nomemo
+
 // Episode 13 ====================
 job3_arch01	mapflag	nomemo
 job3_arch02	mapflag	nomemo

npc/re/mapflag/nopenalty.txt

@@ -11,8 +11,12 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added Izlude duplicates. [Euphy]
+//= 1.2 Added Para Market maps [mazvi]
 //============================================================
 
+// Paradise Market =============
+paramk	mapflag	nopenalty
+
 // Towns ====================
 brasilis	mapflag	nopenalty
 bra_in01	mapflag	nopenalty

npc/re/mapflag/nopvp.txt

@@ -11,8 +11,12 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added Izlude duplicates. [Euphy]
+//= 1.2 Added Para Market maps [mazvi]
 //============================================================
 
+// Paradise Market =============
+paramk	mapflag	pvp	off
+
 // Instances ===================
 1@mist	mapflag	pvp	off
 1@cash	mapflag	pvp	off

npc/re/mapflag/noteleport.txt

@@ -12,8 +12,12 @@
 //= 1.0 Renewal split. [Euphy]
 //= 1.1 Added dali, dali02 [Nova]
 //= 1.2 Added WOE:TE maps [Cydh,Capuche]
+//= 1.3 Added Para Market maps [mazvi]
 //============================================================
 
+// Paradise Market =============
+paramk	mapflag	noteleport
+
 // Cities ========================
 moc_para01	mapflag	noteleport
 

npc/re/mobs/championmobs.txt

@@ -3,106 +3,111 @@
 //===== By: ==================================================
 //= nanakiwurtz
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
-abbey02,0,0	monster	Swift Zombie Slaughter	2603,2,300000
-gl_prison,0,0	monster	Solid Zombie Prisoner	2604,2,300000
+abbey02,0,0	monster	Swift Zombie Slaughter	2603,3,300000
+gl_prison,0,0	monster	Solid Zombie Prisoner	2604,1,300000
 gld_dun04,0,0	monster	Zombie Master Ringleader	2605,2,300000
 pay_dun00,0,0	monster	Furious Zombie	2606,2,300000
 schg_dun01,0,0	monster	Elusive Zakudam	2607,2,300000
 prt_fild03,0,0	monster	Swift Yoyo	2608,2,300000
-ayo_fild02,0,0	monster	Solid Yoyo	2609,2,300000
-pay_fild06,0,0	monster	Wormtail Ringleader	2610,2,300000
-um_fild02,0,0	monster	Furious Wootan Fighter	2611,2,300000
+ayo_fild02,0,0	monster	Solid Yoyo	2609,1,300000
+pay_fild06,0,0	monster	Wormtail Ringleader	2610,3,300000
+um_fild02,0,0	monster	Furious Wootan Fighter	2611,1,300000
 mosk_dun01,0,0	monster	Elusive Wood Goblin	2612,2,300000
 moc_fild03,0,0	monster	Swift Wolf	2613,2,300000
 gl_step,0,0	monster	Solid Wind Ghost	2614,2,300000
+gef_dun03,0,0	monster	Solid Wind Ghost	2614,1,300000
 pay_fild01,0,0	monster	Willow Ringleader	2615,2,300000
-um_fild04,0,0	monster	Furious Wild Rose	2616,2,300000
+um_fild04,0,0	monster	Furious Wild Rose	2616,1,300000
 gon_dun03,0,0	monster	Elusive Evil Nymph	2617,2,300000
-gl_sew01,0,0	monster	Solid Whisper	2618,2,300000
+gl_sew01,0,0	monster	Solid Whisper	2618,1,300000
 treasure_n2,0,0	monster	Weak Skeleton Ringleader	2619,2,300000
 gl_cas02,0,0	monster	Furious Wanderer	2620,2,300000
 gefenia04,0,0	monster	Elusive Violy	2621,2,300000
 gefenia03,0,0	monster	Swift Violy	2622,2,300000
 gefenia02,0,0	monster	Solid Violy	2623,2,300000
 ein_fild04,0,0	monster	Venomous Ringleader	2624,2,300000
-juperos_01,0,0	monster	Furious Venatu	2625,2,300000
+juperos_01,0,0	monster	Furious Venatu	2625,3,300000
 mosk_dun03,0,0	monster	Elusive Vavayaga	2626,2,300000
 ra_san01,0,0	monster	Swift Vanberk	2627,2,300000
 iz_dun01,0,0	monster	Solid Vadon	2628,2,300000
 ein_fild02,0,0	monster	Ungoliant Ringleader	2629,2,300000
-bra_fild01,0,0	monster	Furious Toucan	2630,2,300000
+bra_fild01,0,0	monster	Furious Toucan	2630,3,300000
 ma_fild01,0,0	monster	Elusive Tiyanak	2631,2,300000
 prt_sewb4,0,0	monster	Solid Thief Bug	2632,2,300000
-prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,2,300000
+prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,3,300000
 prt_sewb2,0,0	monster	Furious Thief Bug	2634,2,300000
 beach_dun3,0,0	monster	Elusive Thara Frog	2635,2,300000
 ein_fild03,0,0	monster	Swift Teddy Bear	2636,2,300000
-man_fild03,0,0	monster	Solid Tatacho	2637,2,300000
+man_fild03,0,0	monster	Solid Tatacho	2637,1,300000
 mjo_dun01,0,0	monster	Tarou Ringleader	2638,2,300000
 ayo_dun02,0,0	monster	Furious Tamruan	2639,2,300000
 gl_sew03,0,0	monster	Elusive Sting	2640,2,300000
 lhz_fild02,0,0	monster	Swift Stem Worm	2641,2,300000
-moc_fild13,0,0	monster	Solid Steel Chonchon	2642,2,300000
+moc_fild13,0,0	monster	Solid Steel Chonchon	2642,3,300000
 ve_fild07,0,0	monster	Stapo Ringleader	2643,2,300000
 beach_dun2,0,0	monster	Furious Stalactic Golem	2644,2,300000
-prt_fild02,0,0	monster	Elusive Stainer	2645,2,300000
+prt_fild02,0,0	monster	Elusive Stainer	2645,3,300000
 treasure_n1,0,0	monster	Swift Spore	2646,2,300000
 tur_dun02,0,0	monster	Solid Solider	2647,2,300000
-pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,2,300000
+pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,3,300000
 pay_dun01,0,0	monster	Furious Soldier Skeleton	2649,2,300000
-tha_t09,0,0	monster	Elusive Lady Solace	2650,2,300000
+tha_t09,0,0	monster	Elusive Lady Solace	2650,2,300000	//--Remove after Thanatos Ravamped Patch
 pay_dun03,0,0	monster	Swift Sohee	2651,2,300000
 ice_dun02,0,0	monster	Solid Snowier	2652,2,300000
-pay_fild02,0,0	monster	Boa Ringleader	2653,2,300000
+pay_fild02,0,0	monster	Boa Ringleader	2653,3,300000
 ayo_fild01,0,0	monster	Furious Smokie	2654,2,300000
-yuno_fild06,0,0	monster	Elusive Sleeper	2655,2,300000
+yuno_fild06,0,0	monster	Elusive Sleeper	2655,1,300000
 yuno_fild02,0,0	monster	Swift Sleeper	2656,2,300000
-odin_tem02,0,0	monster	Solid Skogul	2657,2,300000
+odin_tem02,0,0	monster	Solid Skogul	2657,1,300000
 gld2_pay,0,0	monster	Skeleton General Ringleader	2658,2,300000
 gld_dun01_2,0,0	monster	Furious Skeleton General	2659,2,300000
 mjo_dun03,0,0	monster	Elusive Skeleton Worker	2660,2,300000
-ice_dun01,0,0	monster	Swift Siroma	2661,2,300000
-mosk_fild02,0,0	monster	Solid Side Winder	2662,2,300000
+ice_dun01,0,0	monster	Swift Siroma	2661,1,300000
+mosk_fild02,0,0	monster	Solid Side Winder	2662,1,300000
 mjolnir_03,0,0	monster	Side Winder Ringleader	2663,2,300000
 ama_dun03,0,0	monster	Furious Shinobi	2664,2,300000
-tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,300000
-hu_fild06,0,0	monster	Swift Shellfish	2666,2,300000
-lhz_dun03,0,0	monster	Solid Cecil Damon	2667,2,300000
+tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,300000	//--Remove after Thanatos Ravamped Patch
+hu_fild06,0,0	monster	Swift Shellfish	2666,1,300000
+lhz_dun03,0,0	monster	Solid Cecil Damon	2667,3,300000
 cmd_fild04,0,0	monster	Sea Otter Ringleader	2668,2,300000
 iz_dun05,0,0	monster	Furious Lamp Rey	2669,2,300000
-moc_fild18,0,0	monster	Elusive Scorpion	2670,2,300000
+moc_fild18,0,0	monster	Elusive Scorpion	2670,3,300000
 mjolnir_09,0,0	monster	Swift Savage Babe	2671,2,300000
 prt_maze01,0,0	monster	Solid Savage	2672,2,300000
-mjolnir_07,0,0	monster	Savage Ringleader	2673,2,300000
+mjolnir_07,0,0	monster	Savage Ringleader	2673,3,300000
 moc_fild16,0,0	monster	Furious Sandman	2674,2,300000
 thor_v03,0,0	monster	Elusive Salamander	2675,2,300000
-treasure01,0,0	monster	Swift Sailor Skeleton	2676,2,300000
+treasure02,0,0	monster	Swift Sailor Skeleton	2676,1,300000
 ra_fild12,0,0	monster	Solid Roween	2677,2,300000
 prt_fild00,0,0	monster	Roda Frog Ringleader	2678,2,300000
 gef_fild01,0,0	monster	Furious Roda Frog	2679,2,300000
 prt_fild07,0,0	monster	Elusive Rocker	2680,2,300000
 tha_t01,0,0	monster	Swift Rideword	2681,2,300000
+//tha_t01,0,0	monster	Swift Rideword	2681,1,300000	//--Applied after Thanatos Revamped Patch.
 c_tower1,0,0	monster	Solid Rideword	2682,2,300000
 gon_fild01,0,0	monster	Dumpling Child Ringleader	2683,2,300000
-tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,300000
+tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,300000	//--Remove after Thanatos Ravamped Patch
 tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,2,300000
+//tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,1,300000	//--Applied after Thanatos Revamped Patch.
 tha_t07,0,0	monster	Swift Baroness of Retribution	2686,2,300000
+//tha_t07,0,0	monster	Swift Baroness of Retribution	2686,1,300000	//--Applied after Thanatos Revamped Patch.
 in_sphinx2,0,0	monster	Solid Requiem	2687,2,300000
-lhz_dun01,0,0	monster	Remover Ringleader	2688,2,300000
+lhz_dun01,0,0	monster	Remover Ringleader	2688,3,300000
 mal_dun01,0,0	monster	Elusive Red Eruma	2689,2,300000
 gl_knt02,0,0	monster	Swift Raydric	2690,2,300000
 gl_knt01,0,0	monster	Solid Raydric	2691,2,300000
-lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,2,300000
+lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,3,300000
 dic_dun03,0,0	monster	Furious Rake Scaraba	2693,2,300000
 cmd_fild07,0,0	monster	Elusive Raggler	2694,2,300000
-lhz_fild01,0,0	monster	Swift Rafflesia	2695,2,300000
+lhz_fild01,0,0	monster	Swift Rafflesia	2695,3,300000
 lhz_fild01,0,0	monster	Poring Ringleader	2696,2,300000
 lhz_fild01,0,0	monster	Furious Poring	2697,2,300000
 lhz_fild01,0,0	monster	Elusive Poring	2698,2,300000
@@ -111,8 +116,8 @@ ein_fild09,0,0	monster	Solid Porcellio	2700,2,300000
 prt_maze03,0,0	monster	Poporing Ringleader	2701,2,300000
 prt_maze02,0,0	monster	Furious Poporing	2702,2,300000
 pay_fild04,0,0	monster	Elusive Poporing	2703,2,300000
-ama_dun02,0,0	monster	Swift Poison Toad	2704,2,300000
-mjolnir_06,0,0	monster	Solid Poison Spore	2705,2,300000
+ama_dun02,0,0	monster	Swift Poison Toad	2704,1,300000
+mjolnir_06,0,0	monster	Solid Poison Spore	2705,3,300000
 odin_tem03,0,0	monster	Plasma Ringleader	2706,2,300000
 iz_dun00,0,0	monster	Furious Plankton	2707,2,300000
 ein_dun01,0,0	monster	Elusive Pitman	2708,2,300000
@@ -127,13 +132,14 @@ treasure02,0,0	monster	Penomena Ringleader	2716,2,300000
 alde_dun03,0,0	monster	Furious Penomena	2717,2,300000
 moc_fild02,0,0	monster	Elusive Peco Peco	2718,2,300000
 in_sphinx5,0,0	monster	Swift Pasana	2719,2,300000
-um_fild03,0,0	monster	Solid Parasite	2720,2,300000
+um_fild03,0,0	monster	Solid Parasite	2720,1,300000
 tha_t05,0,0	monster	Owl Duke Ringleader	2721,2,300000
+//tha_t05,0,0	monster	Owl Duke Ringleader	2721,3,300000	//--Applied after Thanatos Revamped Patch.
 gef_fild10,0,0	monster	Furious Orc Warrior	2722,2,300000
 orcsdun01,0,0	monster	Elusive Orc Zombie	2723,2,300000
 orcsdun02,0,0	monster	Swift Orc Skeleton	2724,2,300000
-gef_fild03,0,0	monster	Solid Orc Lady	2725,2,300000
-tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,300000
+gef_fild03,0,0	monster	Solid Orc Lady	2725,3,300000
+tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,300000	//--Remove after Thanatos Ravamped Patch
 ein_fild05,0,0	monster	Furious Noxious	2727,2,300000
 hu_fild05,0,0	monster	Elusive Novus	2728,2,300000
 hu_fild04,0,0	monster	Swift Novus	2729,2,300000
@@ -148,15 +154,15 @@ xmas_dun02,0,0	monster	Furious Myst Case	2737,2,300000
 ve_fild04,0,0	monster	Elusive Muscipular	2738,2,300000
 moc_pryd03,0,0	monster	Swift Mummy	2739,2,300000
 moc_pryd02,0,0	monster	Solid Mummy	2740,2,300000
-moc_fild01,0,0	monster	Muka Ringleader	2741,2,300000
-moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,2,300000
+moc_fild01,0,0	monster	Muka Ringleader	2741,3,300000
+moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,3,300000
 moc_fild21,0,0	monster	Elusive Incarnation of Morocc	2743,2,300000
-moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,2,300000
+moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,1,300000
 ein_fild06,0,0	monster	Solid Holden	2745,2,300000
 ama_dun01,0,0	monster	Miyabi Doll Ringleader	2746,2,300000
 moc_prydn1,0,0	monster	Furious Minorous	2747,2,300000
 moc_pryd05,0,0	monster	Elusive Minorous	2748,2,300000
-in_sphinx4,0,0	monster	Swift Minorous	2749,2,300000
+in_sphinx4,0,0	monster	Swift Minorous	2749,1,300000
 ein_dun02,0,0	monster	Solid Mineral	2750,2,300000
 bif_fild01,0,0	monster	Miming Ringleader	2751,2,300000
 moc_prydn2,0,0	monster	Furious Mimic	2752,2,300000
@@ -165,63 +171,63 @@ cmd_fild09,0,0	monster	Swift Metaller	2754,2,300000
 ein_fild08,0,0	monster	Solid Metaling	2755,2,300000
 ein_fild07,0,0	monster	Metaling Ringleader	2756,2,300000
 iz_dun04,0,0	monster	Furious Merman	2757,2,300000
-ecl_fild01,0,0	monster	Elusive Menblatt	2758,2,300000
+ecl_fild01,0,0	monster	Elusive Menblatt	2758,1,300000
 beach_dun,0,0	monster	Swift Medusa	2759,2,300000
 mjo_dun02,0,0	monster	Solid Martin	2760,2,300000
-gl_in01,0,0	monster	Marionette Ringleader	2761,2,300000
-xmas_fild01,0,0	monster	Furious Marin	2762,2,300000
-in_sphinx3,0,0	monster	Elusive Marduk	2763,2,300000
+gl_in01,0,0	monster	Marionette Ringleader	2761,1,300000
+xmas_fild01,0,0	monster	Furious Marin	2762,1,300000
+in_sphinx3,0,0	monster	Elusive Marduk	2763,1,300000
 prt_maze03,0,0	monster	Swift Mantis	2764,2,300000
 gef_fild04,0,0	monster	Solid Mandragora	2765,2,300000
 ma_dun01,0,0	monster	Manananggal Ringleader	2766,2,300000
-gl_dun02,0,0	monster	Furious Majoruros	2767,2,300000
+gl_dun02,0,0	monster	Furious Majoruros	2767,1,300000
 prt_fild09,0,0	monster	Elusive Magnolia	2768,2,300000
 ve_fild03,0,0	monster	Swift Magmaring	2769,2,300000
-prt_fild08,0,0	monster	Solid Lunatic	2770,3,300000
+prt_fild08,0,0	monster	Solid Lunatic	2770,1,300000
 prt_fild01,0,0	monster	Lunatic Ringleader	2771,2,300000
-niflheim,0,0	monster	Furious Lude	2772,2,300000
-spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,2,300000
-nif_fild02,0,0	monster	Swift Loli Ruri	2774,2,300000
-gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,2,300000
+niflheim,0,0	monster	Furious Lude	2772,1,300000
+spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,1,300000
+nif_fild02,0,0	monster	Swift Loli Ruri	2774,1,300000
+gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,1,300000
 new_1-3,0,0	monster	Baby Poring Ringleader	2776,2,300000
 bif_fild02,0,0	monster	Furious Little Fatum	2777,2,300000
 lou_dun01,0,0	monster	Elusive Jing Guai	2778,2,300000
-mosk_dun02,0,0	monster	Swift Les	2779,2,300000
+mosk_dun02,0,0	monster	Swift Les	2779,1,300000
 gld_dun01,0,0	monster	Solid Leib Olmai	2780,2,300000
 ayo_dun01,0,0	monster	Leaf Cat Ringleader	2781,2,300000
 //teg_dun02,0,0	monster	[PH] 분노의 로그 휘케바인	2782,2,300000,0
 //teg_dun01,0,0	monster	[PH] 떠도는 어세신 에르메스	2783,2,300000,0
-ra_fild06,0,0	monster	Swift Kobold Archer	2784,2,300000
-ra_fild05,0,0	monster	Solid Kobold	2785,2,300000
-thor_v02,0,0	monster	Knocker Ringleader	2786,2,300000
+ra_fild06,0,0	monster	Swift Kobold Archer	2784,3,300000
+ra_fild05,0,0	monster	Solid Kobold	2785,3,300000
+thor_v02,0,0	monster	Knocker Ringleader	2786,1,300000
 mjolnir_08,0,0	monster	Furious Beetle King	2787,2,300000
 thor_v01,0,0	monster	Elusive Kasa	2788,2,300000
 ama_fild01,0,0	monster	Swift Karakasa	2789,2,300000
 moc_pryd04,0,0	monster	Solid Isis	2790,2,300000
 ra_san02,0,0	monster	Isilla Ringleader	2791,2,300000
 gl_prison1,0,0	monster	Furious Injustice	2792,2,300000
-lou_fild01,0,0	monster	Elusive Mi Gao	2793,2,300000
+lou_fild01,0,0	monster	Elusive Mi Gao	2793,1,300000
 ice_dun03,0,0	monster	Swift Ice Titan	2794,2,300000
-bra_dun02,0,0	monster	Solid Iara	2795,2,300000
-lou_dun02,0,0	monster	Yao Jun Ringleader	2796,2,300000
-gef_dun00,0,0	monster	Furious Hunter Fly	2797,2,300000
+bra_dun02,0,0	monster	Solid Iara	2795,3,300000
+lou_dun02,0,0	monster	Yao Jun Ringleader	2796,1,300000
+gef_dun00,0,0	monster	Furious Hunter Fly	2797,1,300000
 prt_fild05,0,0	monster	Elusive Hornet	2798,2,300000
 dic_dun01,0,0	monster	Swift Uni-horn Scaraba	2799,2,300000
 pay_fild09,0,0	monster	Solid Horn	2800,2,300000
 ra_san03,0,0	monster	Hodremlin Ringleader	2801,2,300000
 moc_fild17,0,0	monster	Furious Hode	2802,2,300000
-ra_fild04,0,0	monster	Elusive Hill Wind	2803,2,300000
-ra_fild03,0,0	monster	Swift Hill Wind	2804,2,300000
+ra_fild04,0,0	monster	Elusive Hill Wind	2803,3,300000
+ra_fild03,0,0	monster	Swift Hill Wind	2804,3,300000
 alde_dun02,0,0	monster	Solid High Orc	2805,2,300000
-yuno_fild04,0,0	monster	Harpy Ringleader	2806,2,300000
-yuno_fild03,0,0	monster	Furious Harpy	2807,2,300000
+yuno_fild04,0,0	monster	Harpy Ringleader	2806,3,300000
+yuno_fild03,0,0	monster	Furious Harpy	2807,3,300000
 cmd_fild01,0,0	monster	Elusive Grove	2808,2,300000
 pay_fild10,0,0	monster	Swift Greatest General	2809,2,300000
 yuno_fild09,0,0	monster	Solid Grand Peco	2810,2,300000
 yuno_fild08,0,0	monster	Grand Peco Ringleader	2811,2,300000
 cmd_fild06,0,0	monster	Furious Golem	2812,2,300000
-prt_fild11,0,0	monster	Elusive Goblin	2813,2,300000
-gef_fild11,0,0	monster	Swift Goblin	2814,2,300000
+prt_fild11,0,0	monster	Elusive Goblin	2813,3,300000
+gef_fild11,0,0	monster	Swift Goblin	2814,3,300000
 yuno_fild11,0,0	monster	Solid Goat	2815,2,300000
 yuno_fild07,0,0	monster	Goat Ringleader	2816,2,300000
 gld2_prt,0,0	monster	Furious Dark Hammer Kobold	2817,2,300000
@@ -229,83 +235,85 @@ gld_dun03_2,0,0	monster	Elusive Dark Hammer Kobold	2818,2,300000
 gld2_gef,0,0	monster	Swift Dark Shadow	2819,2,300000
 gld_dun04_2,0,0	monster	Solid Dark Shadow	2820,2,300000
 gld_dun02,0,0	monster	Giant Hornet Ringleader	2821,2,300000
-nameless_n,0,0	monster	Furious Ghoul	2822,2,300000
+nameless_n,0,0	monster	Furious Ghoul	2822,1,300000
 gef_dun01,0,0	monster	Elusive Ghoul	2823,2,300000
-yuno_fild12,0,0	monster	Swift Geographer	2824,2,300000
+yuno_fild12,0,0	monster	Swift Geographer	2824,1,300000
 yuno_fild01,0,0	monster	Solid Geographer	2825,2,300000
-glast_01,0,0	monster	Gargoyle Ringleader	2826,2,300000
-gl_sew02,0,0	monster	Furious Gargoyle	2827,2,300000
-ve_fild01,0,0	monster	Elusive Galion	2828,2,300000
-cmd_fild02,0,0	monster	Swift Seal	2829,2,300000
-tur_dun05,0,0	monster	Solid Freezer	2830,2,300000
-tur_dun03,0,0	monster	Freezer Ringleader	2831,2,300000
+glast_01,0,0	monster	Gargoyle Ringleader	2826,1,300000
+gl_sew02,0,0	monster	Furious Gargoyle	2827,1,300000
+ve_fild01,0,0	monster	Elusive Galion	2828,1,300000
+cmd_fild02,0,0	monster	Swift Seal	2829,3,300000
+tur_dun05,0,0	monster	Solid Freezer	2830,1,300000
+tur_dun03,0,0	monster	Freezer Ringleader	2831,1,300000
 abyss_01,0,0	monster	Furious Ferus	2832,2,300000
-prt_sewb1,0,0	monster	Elusive Familiar	2833,2,300000
+prt_sewb1,0,0	monster	Elusive Familiar	2833,1,300000
 gefenia01,0,0	monster	Swift False Angel	2834,2,300000
 prt_fild06,0,0	monster	Solid Fabre	2835,2,300000
-pay_fild03,0,0	monster	Fabre Ringleader	2836,2,300000
-mag_dun01,0,0	monster	Furious Explosion	2837,2,300000
+pay_fild03,0,0	monster	Fabre Ringleader	2836,3,300000
+mag_dun01,0,0	monster	Furious Explosion	2837,1,300000
 gl_church,0,0	monster	Elusive Evil Druid	2838,2,300000
-prt_fild10,0,0	monster	Swift Elder Willow	2839,2,300000
-mjolnir_02,0,0	monster	Solid Elder Willow	2840,2,300000
-ra_san04,0,0	monster	Echio Ringleader	2841,2,300000
+prt_fild10,0,0	monster	Swift Elder Willow	2839,3,300000
+mjolnir_02,0,0	monster	Solid Elder Willow	2840,3,300000
+ra_san04,0,0	monster	Echio Ringleader	2841,1,300000
 mjolnir_12,0,0	monster	Furious Dustiness	2842,2,300000
 um_fild01,0,0	monster	Swift Dryad	2843,2,300000
 ve_fild02,0,0	monster	Solid Drosera	2844,2,300000
-moc_fild07,0,0	monster	Drops Ringleader	2845,2,300000
-mjolnir_04,0,0	monster	Furious Driller	2846,2,300000
-in_sphinx1,0,0	monster	Elusive Drainliar	2847,2,300000
-tur_dun01,0,0	monster	Swift Dragon Tail	2848,2,300000
+moc_fild07,0,0	monster	Drops Ringleader	2845,3,300000
+mjolnir_04,0,0	monster	Furious Driller	2846,3,300000
+in_sphinx1,0,0	monster	Elusive Drainliar	2847,1,300000
+tur_dun01,0,0	monster	Swift Dragon Tail	2848,1,300000
 nyd_dun01,0,0	monster	Solid Draco	2849,2,300000
 dic_fild02,0,0	monster	Dolomedes Ringleader	2850,2,300000
 pay_dun04,0,0	monster	Furious Dokebi	2851,2,300000
 nif_fild01,0,0	monster	Elusive Disguise	2852,2,300000
-jupe_core,0,0	monster	Swift Dimik	2853,2,300000
+jupe_core,0,0	monster	Swift Dimik	2853,3,300000
 gef_dun02,0,0	monster	Solid Deviruchi	2854,2,300000
 ra_fild01,0,0	monster	Baby Desert Wolf Ringleader	2855,2,300000
-moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,2,300000
+moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,3,300000
 cmd_fild08,0,0	monster	Elusive Deniro	2857,2,300000
+anthell01,0,0	monster	Elusive Deniro	2857,3,300000
 tha_t06,0,0	monster	Swift Death Word	2858,2,300000
+//tha_t06,0,0	monster	Swift Death Word	2858,3,300000	//--Applied after Thanatos Revamped Patch.
 tha_t04,0,0	monster	Solid Death Word	2859,2,300000
 tha_t03,0,0	monster	Death Word Ringleader	2860,2,300000
 gl_chyard,0,0	monster	Furious Dark Priest	2861,2,300000
-lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,2,300000
+lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,1,300000
 gef_fild05,0,0	monster	Swift Creamy	2863,2,300000
 iz_dun02,0,0	monster	Solid Cornutus	2864,2,300000
 xmas_dun01,0,0	monster	Cookie Ringleader	2865,2,300000
 kh_kiehl01,0,0	monster	Furious Constant	2866,2,300000
 dew_dun01,0,0	monster	Elusive Comodo	2867,2,300000
 gef_fild09,0,0	monster	Swift Coco	2868,2,300000
-gef_fild02,0,0	monster	Solid Coco	2869,2,300000
+gef_fild02,0,0	monster	Solid Coco	2869,3,300000
 c_tower4,0,0	monster	Clock Ringleader	2870,2,300000
-c_tower2,0,0	monster	Furious Clock	2871,2,300000
+c_tower2,0,0	monster	Furious Clock	2871,1,300000
 gef_fild00,0,0	monster	Elusive Chonchon	2872,2,300000
 dic_fild01,0,0	monster	Swift Centipede	2873,2,300000
-ecl_tdun01,0,0	monster	Solid Cenere	2874,2,300000
-lhz_dun04,0,0	monster	Celia Ringleader	2875,2,300000
+ecl_tdun01,0,0	monster	Solid Cenere	2874,1,300000
+lhz_dun04,0,0	monster	Celia Ringleader	2875,3,300000
 gld_dun03,0,0	monster	Furious Caterpillar	2876,2,300000
 gl_cas01,0,0	monster	Elusive Carat	2877,2,300000
 mjolnir_01,0,0	monster	Swift Caramel	2878,2,300000
 ma_fild02,0,0	monster	Solid Bungisngis	2879,2,300000
-odin_tem01,0,0	monster	Breeze Ringleader	2880,2,300000
-lhz_fild03,0,0	monster	Furious Breeze	2881,2,300000
+odin_tem01,0,0	monster	Breeze Ringleader	2880,1,300000
+lhz_fild03,0,0	monster	Furious Breeze	2881,3,300000
 man_fild02,0,0	monster	Elusive Bradium Golem	2882,2,300000
 gon_dun01,0,0	monster	Swift Bloody Butterfly	2883,2,300000
 pay_fild07,0,0	monster	Bigfoot Ringleader	2884,2,300000
-alde_dun04,0,0	monster	Furious Bathory	2885,2,300000
+alde_dun04,0,0	monster	Furious Bathory	2885,1,300000
 arug_dun01,0,0	monster	Elusive Banshee Master	2886,2,300000
-abbey01,0,0	monster	Swift Banshee	2887,2,300000
+abbey01,0,0	monster	Swift Banshee	2887,3,300000
 dew_dun02,0,0	monster	Solid Banaspaty	2888,2,300000
-tur_dun04,0,0	monster	Assaulter Ringleader	2889,2,300000
+tur_dun04,0,0	monster	Assaulter Ringleader	2889,1,300000
 mjolnir_10,0,0	monster	Furious Argos	2890,2,300000
 mjolnir_11,0,0	monster	Elusive Argiope	2891,2,300000
 mjolnir_05,0,0	monster	Swift Argiope	2892,2,300000
-gl_dun01,0,0	monster	Solid Arclouze	2893,2,300000
-alde_dun01,0,0	monster	Arclouze Ringleader	2894,2,300000
-juperos_02,0,0	monster	Furious Apocalypse	2895,2,300000
+gl_dun01,0,0	monster	Solid Arclouze	2893,1,300000
+alde_dun01,0,0	monster	Arclouze Ringleader	2894,1,300000
+juperos_02,0,0	monster	Furious Apocalypse	2895,3,300000
 dic_dun02,0,0	monster	Elusive Antler Scaraba	2896,2,300000
-ecl_tdun03,0,0	monster	Swift Antique Book	2897,2,300000
-ecl_tdun02,0,0	monster	Solid Antique Book	2898,2,300000
+ecl_tdun03,0,0	monster	Swift Antique Book	2897,1,300000
+ecl_tdun02,0,0	monster	Solid Antique Book	2898,1,300000
 gl_sew04,0,0	monster	Furious Anolian	2899,2,300000
 gld2_ald,0,0	monster	Elusive Angra Mantis	2900,2,300000
 gld_dun02_2,0,0	monster	Swift Angra Mantis	2901,2,300000
@@ -314,10 +322,10 @@ tha_t02,0,0	monster	Ancient Mimic Ringleader	2903,2,300000
 ra_fild08,0,0	monster	Furious Anacondaq	2904,2,300000
 prt_fild04,0,0	monster	Elusive Ambernite	2905,2,300000
 dew_fild01,0,0	monster	Swift Rafflesia Arnoldi	2906,2,300000
-cmd_fild03,0,0	monster	Solid Alligator	2907,2,300000
-kh_dun01,0,0	monster	Aliza Ringleader	2908,2,300000
-kh_dun02,0,0	monster	Furious Alicel	2909,2,300000
-c_tower3,0,0	monster	Elusive Alarm	2910,2,300000
+cmd_fild03,0,0	monster	Solid Alligator	2907,3,300000
+kh_dun01,0,0	monster	Aliza Ringleader	2908,1,300000
+kh_dun02,0,0	monster	Furious Alicel	2909,1,300000
+c_tower3,0,0	monster	Elusive Alarm	2910,1,300000
 ra_san05,0,0	monster	Swift Agav	2911,2,300000
 abyss_03,0,0	monster	Solid Acidus	2912,2,300000
 abyss_02,0,0	monster	Acidus Ringleader	2913,2,300000

npc/re/mobs/dungeons/abbey.txt

@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated spawns [Playtester]
 //= 1.2 More official spawns [Playtester]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -25,9 +26,9 @@ nameless_n,0,0	monster	Flame Skull	1869,3,5000
 //==================================================
 // abbey01 - Cursed Monastery
 //==================================================
-abbey01,0,0	monster	Banshee	1867,93,5000
-abbey01,0,0	monster	Ghoul	1036,56,5000
-abbey01,0,0	monster	Ragged Zombie	1865,33,5000
+abbey01,0,0	monster	Banshee	1867,96,5000
+abbey01,0,0	monster	Ghoul	1036,57,5000
+abbey01,0,0	monster	Ragged Zombie	1865,34,5000
 abbey01,0,0	monster	Zombie Slaughter	1864,30,5000
 abbey01,0,0	monster	Hellhound	1866,25,5000
 abbey01,0,0	monster	Flame Skull	1869,21,5000

npc/re/mobs/dungeons/alde_dun.txt

@@ -3,20 +3,21 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Moved Clock Tower spawns to their own file. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // alde_dun01 - Clock Tower B1f 
 //==================================================
-alde_dun01,0,0	monster	Arclouze	1194,50,5000
-alde_dun01,0,0	monster	Drainliar	1111,40,5000
+alde_dun01,0,0	monster	Arclouze	1194,58,5000
+alde_dun01,0,0	monster	Drainliar	1111,47,5000
 
 //==================================================
 // alde_dun02 - Clock Tower B2f 
@@ -36,6 +37,6 @@ alde_dun03,0,0	monster	Drainliar	1111,55,5000
 //==================================================
 // alde_dun04 - Clock Tower B4f
 //==================================================
-alde_dun04,0,0	monster	Bathory	1102,50,5000
-alde_dun04,0,0	monster	Whisper	1179,10,5000
-alde_dun04,0,0	monster	Joker	1131,10,5000
+alde_dun04,0,0	monster	Bathory	1102,57,5000
+alde_dun04,0,0	monster	Whisper	1179,11,5000
+alde_dun04,0,0	monster	Joker	1131,11,5000

npc/re/mobs/dungeons/ama_dun.txt

@@ -3,19 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ama_dun01 - Tatami Maze
 //==================================================
-ama_dun01,0,0	monster	Miyabi Doll	1404,65,5000
-ama_dun01,0,0	monster	Firelock Soldier	1403,45,5000
+ama_dun01,0,0	monster	Miyabi Doll	1404,91,5000
+ama_dun01,0,0	monster	Firelock Soldier	1403,63,5000
 ama_dun01,0,0	monster	Shinobi	1401,2,5000
 
 //==================================================
@@ -31,10 +32,10 @@ ama_dun02,0,0	monster	The Paper	1375,1,5000
 //==================================================
 // ama_dun03 - Amatsu Underground Shrine
 //==================================================
-ama_dun03,0,0	monster	Shinobi	1401,55,5000
-ama_dun03,0,0	monster	Tengu	1405,55,5000
-ama_dun03,0,0	monster	Firelock Soldier	1403,25,5000
-ama_dun03,0,0	monster	The Paper	1375,20,5000
+ama_dun03,0,0	monster	Shinobi	1401,65,5000
+ama_dun03,0,0	monster	Tengu	1405,65,5000
+ama_dun03,0,0	monster	Firelock Soldier	1403,29,5000
+ama_dun03,0,0	monster	The Paper	1375,23,5000
 ama_dun03,0,0	monster	Mimic	1191,5,5000
 ama_dun03,0,0	monster	Miyabi Doll	1404,1,5000
 ama_dun03,0,0,0,0	boss_monster	Samurai Specter	1492,1,5460000,600000,0

npc/re/mobs/dungeons/ayo_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,20 +12,21 @@
 //= 1.3 Official jRO 10.3 spawns [Playtester]
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.6 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ayo_dun01 - Ancient Shrine Maze
 //==================================================
-ayo_dun01,0,0	monster	Leaf Cat	1586,65,5000
-ayo_dun01,0,0	monster	Ghoul	1036,30,5000
-ayo_dun01,0,0	monster	Whisper	1179,10,5000
-ayo_dun01,0,0	monster	Kraben	1587,5,5000
+ayo_dun01,0,0	monster	Leaf Cat	1586,104,5000
+ayo_dun01,0,0	monster	Ghoul	1036,48,5000
+ayo_dun01,0,0	monster	Whisper	1179,16,5000
+ayo_dun01,0,0	monster	Kraben	1587,8,5000
 
 //==================================================
 // ayo_dun02 - Inside Ancient Shrine
 //==================================================
-ayo_dun02,0,0	monster	Tamruan	1584,100,5000
-ayo_dun02,0,0	monster	Whisper	1179,20,5000
-ayo_dun02,0,0	monster	Kraben	1587,20,5000
+ayo_dun02,0,0	monster	Tamruan	1584,116,5000
+ayo_dun02,0,0	monster	Whisper	1179,23,5000
+ayo_dun02,0,0	monster	Kraben	1587,23,5000
 ayo_dun02,150,90,15,30	boss_monster	Lady Tanee	1688,1,25200000,600000,0

npc/re/mobs/dungeons/c_tower.txt

@@ -3,39 +3,40 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Split from combined Alde and CT spawn file. [L0ne_W0lf]
 //= 1.1 Added nightmare clock tower. [Ridley8819]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // c_tower1 - Clock Tower 1f
 //==================================================
-c_tower1,0,0	monster	Rideword	1195,70,5000
-c_tower1,0,0	monster	Punk	1199,70,5000
+c_tower1,0,0	monster	Rideword	1195,107,5000
+c_tower1,0,0	monster	Punk	1199,107,5000
 c_tower1,0,0	monster	Bathory	1102,1,5000
 c_tower1,0,0	monster	Clock Tower Manager	1270,1,5000
 
 //==================================================
 // c_tower2 - Clock Tower 2f
 //==================================================
-c_tower2,0,0	monster	Clock	1269,40,5000
-c_tower2,0,0	monster	Punk	1199,40,5000
-c_tower2,0,0	monster	Rideword	1195,12,5000
-c_tower2,0,0	monster	Mimic	1191,3,5000
+c_tower2,0,0	monster	Clock	1269,55,5000
+c_tower2,0,0	monster	Punk	1199,55,5000
+c_tower2,0,0	monster	Rideword	1195,16,5000
+c_tower2,0,0	monster	Mimic	1191,4,5000
 c_tower2,0,0	monster	Elder	1377,2,5000
 c_tower2,0,0	monster	Clock Tower Manager	1270,1,5000
 
 //==================================================
 // c_tower3 - Clock Tower 3f
 //==================================================
-c_tower3,0,0	monster	Alarm	1193,80,5000
-c_tower3,0,0	monster	Mimic	1191,7,5000
-c_tower3,0,0	monster	Rideword	1195,6,5000
-c_tower3,0,0	monster	Clock Tower Manager	1270,3,5000
+c_tower3,0,0	monster	Alarm	1193,109,5000
+c_tower3,0,0	monster	Mimic	1191,9,5000
+c_tower3,0,0	monster	Rideword	1195,8,5000
+c_tower3,0,0	monster	Clock Tower Manager	1270,4,5000
 
 //==================================================
 // c_tower4 - Clock Tower 4f
@@ -52,21 +53,21 @@ c_tower4,0,0	monster	Elder	1377,2,5000
 //==================================================
 // c_tower2_ - Clock Tower Nightmare 2f
 //==================================================
-c_tower2_,0,0	monster	Mimic (Nightmare)	2479,3,5000,0,0
-c_tower2_,0,0	monster	Rideword (Nightmare)	2478,4,300000,0,0
-c_tower2_,0,0	monster	Rideword (Nightmare)	2478,1,60000,0,0
-c_tower2_,0,0	monster	Neo Punk	2919,40,5000
-c_tower2_,0,0	monster	Big Ben	2916,40,5000
+c_tower2_,0,0	monster	Mimic (Nightmare)	2479,4,5000,0,0
+c_tower2_,0,0	monster	Rideword (Nightmare)	2478,16,5000,0,0
+c_tower2_,0,0	monster	Neo Punk	2919,55,5000
+c_tower2_,0,0	monster	Big Ben	2916,55,5000
 c_tower2_,0,0	monster	Time Keeper	2918,1,5000
 c_tower2_,0,0	monster	Arc Elder	2920,2,3600000
+c_tower2_,0,0	monster	Owl Viscount	2921,1,5000,1800000
 
 //==================================================
 // c_tower3_ - Clock Tower Nightmare 3f
 //==================================================
-c_tower3_,0,0	monster	Mimic (Nightmare)	2479,8,5000,0,0
+c_tower3_,0,0	monster	Mimic (Nightmare)	2479,9,5000,0,0
 c_tower3_,0,0	monster	Rideword (Nightmare)	2478,8,5000,0,0
-c_tower3_,0,0	monster	Big Bell	2917,110,5000
-c_tower3_,0,0	monster	Time Keeper	2918,3,5000
-c_tower3_,0,0	monster	Owl Viscount	2921,1,5000,1800000
-c_tower3_,0,0	monster	Owl Marquis	2923,1,5000,5000
+c_tower3_,0,0	monster	Big Bell	2917,109,5000
+c_tower3_,0,0	monster	Time Keeper	2918,2,5000
+c_tower3_,0,0	monster	Owl Viscount	2921,3,5000,1800000
+c_tower3_,0,0	monster	Owl Marquis	2923,3,5000,5000
 c_tower3_,0,0,0,0	boss_monster	Time Holder	3074,1,7200000,0,0

npc/re/mobs/dungeons/dew_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -11,20 +11,17 @@
 //===== Additional Comments: =================================
 //= 1.0 First Release
 //= 1.1 Updated spawn delays. [Euphy]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // dew_dun01 - Volcanic Island of Krakatoa
 //==================================================
-dew_dun01,0,0	monster	Comodo	2152,70,5000
-dew_dun01,0,0	monster	Ancient Worm	1305,25,5000
-dew_dun01,0,0	monster	Gullinbursti	1311,10,5000
+dew_dun01,0,0	monster	Comodo	2152,100,5000
 dew_dun01,0,0,0,0	boss_monster	Leak	2156,1,7200000,0,1
 
 //==================================================
 // dew_dun02 - Tina Grace Cave
 //==================================================
-dew_dun02,0,0	monster	Banaspaty	2154,50,5000
-dew_dun02,0,0	monster	Gajomart	1309,30,5000
-dew_dun02,0,0	monster	Am Mut	1301,20,5000
-dew_dun02,0,0	monster	Butoijo	2155,30,5000
+dew_dun02,0,0	monster	Banaspaty	2154,70,5000
+dew_dun02,0,0	monster	Butoijo	2155,40,5000

npc/re/mobs/dungeons/ecl_tdun.txt

@@ -3,37 +3,36 @@
 //===== By: ==================================================
 //= refis
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
 //= jRO monster spawns, taken from Auriga.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ecl_tdun01 - Bifrost Tower F1
 //==================================================
-ecl_tdun01.gat,0,0	monster	Cenere	2365,5,5000
-ecl_tdun01.gat,0,0	monster	Antique Book	2366,5,5000
-ecl_tdun01.gat,0,0	monster	Blue Lichtern	2367,5,5000
+ecl_tdun01,0,0	monster	Cenere	2365,15,5000
+ecl_tdun01,0,0	monster	Antique Book	2366,10,5000
+ecl_tdun01,0,0	monster	Blue Lichtern	2367,5,5000
+ecl_tdun01,0,0	monster	Yellow Lichtern	2368,5,5000
 
 //==================================================
 // ecl_tdun02 - Bifrost Tower F2
 //==================================================
-ecl_tdun02.gat,0,0	monster	Cenere	2365,10,5000
-ecl_tdun02.gat,0,0	monster	Antique Book	2366,10,5000
-ecl_tdun02.gat,0,0	monster	Blue Lichtern	2367,15,5000
-ecl_tdun02.gat,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun02,0,0	monster	Cenere	2365,15,5000
+ecl_tdun02,0,0	monster	Antique Book	2366,15,5000
+ecl_tdun02,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun02,0,0	monster	Red Lichtern	2369,5,5000
 
 //==================================================
 // ecl_tdun03 - Bifrost Tower F3
 //==================================================
-ecl_tdun03.gat,0,0	monster	Cenere	2365,15,5000
-ecl_tdun03.gat,0,0	monster	Antique Book	2366,15,5000
-ecl_tdun03.gat,0,0	monster	Blue Lichtern	2367,5,5000
-ecl_tdun03.gat,0,0	monster	Yellow Lichtern	2368,15,5000
-ecl_tdun03.gat,0,0	monster	Red Lichtern	2369,10,5000
-ecl_tdun03.gat,0,0	monster	Green Lichtern	2370,15,5000
-ecl_tdun03.gat,0,0	monster	Faithful Manager	2371,5,5000
+ecl_tdun03,0,0	monster	Antique Book	2366,15,5000
+ecl_tdun03,0,0	monster	Yellow Lichtern	2368,5,5000
+ecl_tdun03,0,0	monster	Green Lichtern	2370,5,5000
+ecl_tdun03,0,0	monster	Faithful Manager	2371,3,5000

npc/re/mobs/dungeons/gef_dun.txt

@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -63,10 +64,8 @@ gef_dun02,185,83,3,3	monster	Shining Plant	1083,1,1800000,900000
 //==================================================
 // gef_dun03 - Geffenia
 //==================================================
-gef_dun03,0,0	monster	Wraith	1192,8,5000
-gef_dun03,0,0	monster	Wind Ghost	1263,3,5000
-gef_dun03,0,0	monster	Wraith Dead	1291,2,5000
-gef_dun03,0,0	monster	Wraith Dead	1291,2,60000,30000
+gef_dun03,0,0	monster	Wraith	1192,14,5000
+gef_dun03,0,0	monster	Wind Ghost	1263,5,5000
 gef_dun03,0,0	monster	Hellion Revenant	1626,1,600000,300000
-gef_dun03,0,0	monster	Shining Plant	1083,3,1800000,900000
-gef_dun03,0,0	monster	White Plant	1082,10,180000,90000
+gef_dun03,0,0	monster	Shining Plant	1083,5,1800000,900000
+gef_dun03,0,0	monster	White Plant	1082,18,180000,90000

npc/re/mobs/dungeons/gefenia.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib, rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,14 +12,15 @@
 //= Updated spawns, information from emperium.org [MasterOfMuppets]
 //= Kept the old spawns incase someone would want them.
 //= Aegis ep 10.1 spawns [MasterOfMuppets]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // gefenia01 - Geffenia
 //==================================================
-gefenia01,0,0	monster	False Angel	1371,60,5000
-gefenia01,0,0	monster	Violy	1390,30,5000
-gefenia01,0,0	monster	Mini Demon	1292,20,5000
+gefenia01,0,0	monster	False Angel	1371,63,5000
+gefenia01,0,0	monster	Violy	1390,31,5000
+gefenia01,0,0	monster	Mini Demon	1292,21,5000
 gefenia01,0,0	monster	Abysmal Knight	1219,10,5000
 gefenia01,0,0	monster	Incubus	1374,10,5000
 gefenia01,0,0	monster	Succubus	1370,10,5000
@@ -45,10 +46,10 @@ gefenia02,0,0	monster	Executioner	1205,1,18000000,14400000
 //==================================================
 // gefenia03 - Geffenia
 //==================================================
-gefenia03,0,0	monster	False Angel	1371,40,5000
-gefenia03,0,0	monster	Violy	1390,40,5000
-gefenia03,0,0	monster	Mini Demon	1292,30,5000
-gefenia03,0,0	monster	Incubus	1374,20,5000
+gefenia03,0,0	monster	False Angel	1371,42,5000
+gefenia03,0,0	monster	Violy	1390,42,5000
+gefenia03,0,0	monster	Mini Demon	1292,31,5000
+gefenia03,0,0	monster	Incubus	1374,21,5000
 gefenia03,0,0	monster	Abysmal Knight	1219,10,5000
 gefenia03,0,0	monster	Succubus	1370,10,5000
 gefenia03,0,0	monster	Bloody Knight	1268,1,3600000,3000000

npc/re/mobs/dungeons/glastheim.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -13,6 +13,7 @@
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.6 Added Nightmare Glastheim [Ridley8819]
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -29,12 +30,12 @@ glast_01,233,209,15,15	monster	Blue Plant	1079,2,900000,450000
 // gl_cas01 - Glast Heim 1f
 //==================================================
 gl_cas01,0,0	monster	Carat	1267,50,5000
-gl_cas01,0,0	monster	Dark Frame	1260,20,5000
-gl_cas01,0,0	monster	Owl Duke	1320,20,5000
-gl_cas01,0,0	monster	Rideword	1195,15,5000
-gl_cas01,0,0	monster	Sage Worm	1281,10,5000
-gl_cas01,0,0	monster	Whisper	1179,10,5000
-gl_cas01,0,0	monster	Owl Baron	1295,6,5000
+gl_cas01,0,0	monster	Dark Frame	1260,35,5000
+gl_cas01,0,0	monster	Owl Duke	1320,35,5000
+gl_cas01,0,0	monster	Rideword	1195,26,5000
+gl_cas01,0,0	monster	Sage Worm	1281,17,5000
+gl_cas01,0,0	monster	Whisper	1179,17,5000
+gl_cas01,0,0	monster	Owl Baron	1295,10,5000
 gl_cas01,0,0	monster	Alice	1275,1,5000
 
 //==================================================
@@ -57,53 +58,51 @@ gl_cas02,0,0	monster	Ogretooth	1204,1,7200000,3600000
 //==================================================
 // gl_church - Glast Heim St. Abbey
 //==================================================
-gl_church,0,0	monster	Evil Druid	1117,60,5000
-gl_church,0,0	monster	Wraith	1192,55,5000
-gl_church,0,0	monster	Mimic	1191,9,5000
-gl_church,0,0	monster	Evil Druid	1117,1,5000
-gl_church,0,0	monster	Wraith Dead	1291,1,3600000,1800000
+gl_church,0,0	monster	Evil Druid	1117,85,5000
+gl_church,0,0	monster	Wraith	1192,78,5000
+gl_church,0,0	monster	Mimic	1191,12,5000
 
 //==================================================
 // gl_chyard - Glast Heim Churchyard
 //==================================================
-gl_chyard,0,0	monster	Dark Priest	1198,60,5000
-gl_chyard,0,0	monster	Wraith	1192,35,5000
-gl_chyard,0,0	monster	Evil Druid	1117,10,5000
-gl_chyard,0,0	monster	Mimic	1191,3,5000
-gl_chyard,0,0	monster	Hunter Fly	1035,3,5000
+gl_chyard,0,0	monster	Dark Priest	1198,95,5000
+gl_chyard,0,0	monster	Wraith	1192,55,5000
+gl_chyard,0,0	monster	Evil Druid	1117,15,5000
+gl_chyard,0,0	monster	Mimic	1191,4,5000
+gl_chyard,0,0	monster	Hunter Fly	1035,4,5000
 gl_chyard,0,0,0,0	boss_monster	Dark Lord	1272,1,3600000,600000,1
 gl_chyard,0,0	monster	Dark Illusion	1302,1,3600000,1800000
 
 //==================================================
 // gl_dun01 - The Lowest Cave in Glast Heim
 //==================================================
-gl_dun01,0,0	monster	Arclouze	1194,50,5000
-gl_dun01,0,0	monster	Sting	1207,40,5000
+gl_dun01,0,0	monster	Arclouze	1194,53,5000
+gl_dun01,0,0	monster	Sting	1207,43,5000
 
 //==================================================
 // gl_dun02 - The Lowest Cave in Glast Heim
 //==================================================
-gl_dun02,0,0	monster	Majoruros	1310,45,5000
-gl_dun02,0,0	monster	Gargoyle	1253,15,5000
+gl_dun02,0,0	monster	Majoruros	1310,52,5000
+gl_dun02,0,0	monster	Gargoyle	1253,17,5000
 
 //==================================================
 // gl_in01 - Inside Glast Heim
 //==================================================
-gl_in01,0,0	monster	Marionette	1143,20,5000
-gl_in01,0,0	monster	Sage Worm	1281,14,5000
-gl_in01,0,0	monster	Dark Frame	1260,10,5000
-gl_in01,0,0	monster	Rideword	1195,8,5000
+gl_in01,0,0	monster	Marionette	1143,25,5000
+gl_in01,0,0	monster	Sage Worm	1281,17,5000
+gl_in01,0,0	monster	Dark Frame	1260,12,5000
+gl_in01,0,0	monster	Rideword	1195,10,5000
 gl_in01,0,0	monster	Wanderer	1208,1,5000
 gl_in01,0,0	monster	Alice	1275,1,5000
 
 //==================================================
 // gl_knt01 - Inside Glast Heim Chivalry
 //==================================================
-gl_knt01,0,0	monster	Raydric	1163,90,5000
-gl_knt01,0,0	monster	Rideword	1195,21,5000
-gl_knt01,0,0	monster	Raydric Archer	1276,10,5000
-gl_knt01,0,0	monster	Abysmal Knight	1219,10,5000
-gl_knt01,0,0	monster	Khalitzburg	1132,10,5000
+gl_knt01,0,0	monster	Raydric	1163,126,5000
+gl_knt01,0,0	monster	Rideword	1195,29,5000
+gl_knt01,0,0	monster	Raydric Archer	1276,14,5000
+gl_knt01,0,0	monster	Abysmal Knight	1219,14,5000
+gl_knt01,0,0	monster	Khalitzburg	1132,14,5000
 gl_knt01,0,0	monster	Alice	1275,1,5000
 gl_knt01,21,278	monster	Giant Whisper	1186,1,3600000,1800000
 gl_knt01,9,184	monster	Black Mushroom	1084,1,3600000,1800000
@@ -122,10 +121,10 @@ gl_knt01,4,185	monster	Black Mushroom	1084,1,3600000,1800000
 //==================================================
 // gl_knt02 - Inside Glast Heim Chivalry
 //==================================================
-gl_knt02,0,0	monster	Raydric	1163,80,5000
-gl_knt02,0,0	monster	Khalitzburg	1132,40,5000
-gl_knt02,0,0	monster	Raydric Archer	1276,30,5000
-gl_knt02,0,0	monster	Abysmal Knight	1219,6,5000
+gl_knt02,0,0	monster	Raydric	1163,101,5000
+gl_knt02,0,0	monster	Khalitzburg	1132,50,5000
+gl_knt02,0,0	monster	Raydric Archer	1276,38,5000
+gl_knt02,0,0	monster	Abysmal Knight	1219,7,5000
 gl_knt02,0,0	monster	Alice	1275,1,5000
 gl_knt02,0,0	monster	Mysteltainn	1203,1,1800000,1200000
 gl_knt02,0,0	monster	Bloody Knight	1268,1,3600000,1800000
@@ -133,10 +132,10 @@ gl_knt02,0,0	monster	Bloody Knight	1268,1,3600000,1800000
 //==================================================
 // gl_prison - Glast Heim Underprison
 //==================================================
-gl_prison,0,0	monster	Zombie Prisoner	1197,30,5000
-gl_prison,0,0	monster	Injustice	1257,20,5000
-gl_prison,0,0	monster	Rybio	1201,15,5000
-gl_prison,0,0	monster	Hunter Fly	1035,10,5000
+gl_prison,0,0	monster	Zombie Prisoner	1197,38,5000
+gl_prison,0,0	monster	Injustice	1257,25,5000
+gl_prison,0,0	monster	Rybio	1201,19,5000
+gl_prison,0,0	monster	Hunter Fly	1035,12,5000
 
 //==================================================
 // gl_prison1 - Glast Heim Underprison
@@ -152,49 +151,54 @@ gl_prison1,0,0	monster	Zealotus	1200,1,3600000,1800000
 //==================================================
 // gl_sew01 - Glast Heim Culvert
 //==================================================
-gl_sew01,0,0	monster	Whisper	1179,40,5000
-gl_sew01,0,0	monster	Gargoyle	1253,30,5000
-gl_sew01,0,0	monster	Arclouze	1194,10,5000
+gl_sew01,0,0	monster	Whisper	1179,66,5000
+gl_sew01,0,0	monster	Gargoyle	1253,49,5000
+gl_sew01,0,0	monster	Arclouze	1194,16,5000
 
 //==================================================
 // gl_sew02 - Glast Heim Culvert
 //==================================================
-gl_sew02,0,0	monster	Gargoyle	1253,55,5000
-gl_sew02,0,0	monster	Cramp	1209,15,5000
+gl_sew02,0,0	monster	Gargoyle	1253,89,5000
+gl_sew02,0,0	monster	Cramp	1209,24,5000
 
 //==================================================
 // gl_sew03 - Glast Heim Culvert
 //==================================================
-gl_sew03,0,0	monster	Sting	1207,70,5000
-gl_sew03,0,0	monster	Gargoyle	1253,40,5000
+gl_sew03,0,0	monster	Sting	1207,99,5000
+gl_sew03,0,0	monster	Gargoyle	1253,56,5000
 
 //==================================================
 // gl_sew04 - Glast Heim Culvert
 //==================================================
-gl_sew04,0,0	monster	Anolian	1206,100,5000
-gl_sew04,0,0	monster	Gargoyle	1253,20,5000
-gl_sew04,0,0	monster	Drainliar	1111,10,5000
+gl_sew04,0,0	monster	Anolian	1206,126,5000
+gl_sew04,0,0	monster	Gargoyle	1253,25,5000
+gl_sew04,0,0	monster	Drainliar	1111,12,5000
 
 //==================================================
 // gl_step - Glast Heim Staircase Dungeon
 //==================================================
-gl_step,0,0	monster	Wind Ghost	1263,100,5000
-gl_step,0,0	monster	Raydric Archer	1276,10,5000
-gl_step,0,0	monster	Mimic	1191,5,5000
+gl_step,0,0	monster	Wind Ghost	1263,138,5000
+gl_step,0,0	monster	Raydric Archer	1276,13,5000
+gl_step,0,0	monster	Mimic	1191,6,5000
 
 //==================================================
 // gl_cas02_ - Nightmare Mode 2f
 //==================================================
-gl_cas02_,0,0	monster	Evil Druid (Nightmare)	2480,20,0,0,0
-gl_cas02_,0,0	monster	Chimera (Nightmare)	2485,10,0,0,0
-gl_cas02_,0,0	monster	Mimic (Nightmare)	2479,40,0,0,0
-gl_cas02_,0,0	monster	Rideword (Nightmare)	2478,40,0,0,0
-gl_cas02_,0,0	monster	Wanderer (Nightmare)	2477,120,0,0,0
+gl_cas02_,0,0	monster	Evil Druid (Nightmare)	2480,4,0,0,0
+gl_cas02_,0,0	monster	Chimera (Nightmare)	2485,1,0,0,0
+gl_cas02_,0,0	monster	Mimic (Nightmare)	2479,19,0,0,0
+gl_cas02_,0,0	monster	Rideword (Nightmare)	2478,10,0,0,0
+gl_cas02_,0,0	monster	Wanderer (Nightmare)	2477,60,0,0,0
+gl_cas02_,0,0	monster	Mysteltainn	1203,1,7200000,3600000
+gl_cas02_,0,0	monster	Alice	1275,1,5000
+gl_cas02_,102,180	monster	Whisper	1185,1,1800000,900000
 gl_cas02_,0,0	monster	Baphomet (Nightmare)	2483,1,7200000,0,0
 
 //==================================================
 // gl_chyard_ - Nightmare Mode Churchyard
 //==================================================
-gl_chyard_,0,0	monster	Wraith Dead (Nightmare)	2481,200,0,0,0
-gl_chyard_,0,0	monster	Evil Druid (Nightmare)	2480,5,60000,0,0
-gl_chyard_,0,0	monster	Mimic (Nightmare)	2479,5,60000,0,0
+gl_chyard_,0,0	monster	Wraith Dead (Nightmare)	2481,91,0,0,0
+gl_chyard_,0,0	monster	Wraith Dead	1291,31,0,0,0
+gl_chyard_,0,0	monster	Evil Druid (Nightmare)	2480,22,60000,0,0
+gl_chyard_,0,0	monster	Mimic (Nightmare)	2479,34,60000,0,0
+gl_chyard_,0,0,0,0	boss_monster	Dark Lord	1272,1,3600000,600000,1

npc/re/mobs/dungeons/gon_dun.txt

@@ -3,38 +3,39 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // gon_dun01 - Shrine of Kunlun Queen
 //==================================================
-gon_dun01,0,0	monster	Bloody Butterfly	1408,55,5000
-gon_dun01,0,0	monster	Enchanted Peach Tree	1410,35,5000
-gon_dun01,0,0	monster	Zipper Bear	1417,30,5000
-gon_dun01,0,0	monster	Yellow Plant	1081,10,5000
-gon_dun01,0,0	monster	White Plant	1082,10,5000
+gon_dun01,0,0	monster	Bloody Butterfly	1408,60,5000
+gon_dun01,0,0	monster	Enchanted Peach Tree	1410,38,5000
+gon_dun01,0,0	monster	Zipper Bear	1417,33,5000
+gon_dun01,0,0	monster	Yellow Plant	1081,11,5000
+gon_dun01,0,0	monster	White Plant	1082,11,5000
 gon_dun01,0,0	monster	Red Plant	1078,5,5000
 
 //==================================================
 // gon_dun02 - Hermit's Checkers
 //==================================================
-gon_dun02,0,0	monster	Enchanted Peach Tree	1410,21,5000
-gon_dun02,0,0	monster	Taoist Hermit	1412,20,5000
-gon_dun02,0,0	monster	Bloody Butterfly	1408,20,5000
-gon_dun02,0,0	monster	Baby Leopard	1415,6,5000
-gon_dun02,0,0	monster	Yellow Plant	1081,10,5000
+gon_dun02,0,0	monster	Enchanted Peach Tree	1410,27,5000
+gon_dun02,0,0	monster	Taoist Hermit	1412,26,5000
+gon_dun02,0,0	monster	Bloody Butterfly	1408,26,5000
+gon_dun02,0,0	monster	Baby Leopard	1415,7,5000
+gon_dun02,0,0	monster	Yellow Plant	1081,13,5000
 
 //==================================================
 // gon_dun03 - Arcadia
 //==================================================
-gon_dun03,0,0	monster	Evil Nymph	1416,50,5000
-gon_dun03,0,0	monster	Taoist Hermit	1412,30,5000
-gon_dun03,0,0	monster	Hermit Plant	1413,20,5000
+gon_dun03,0,0	monster	Evil Nymph	1416,67,5000
+gon_dun03,0,0	monster	Taoist Hermit	1412,40,5000
+gon_dun03,0,0	monster	Hermit Plant	1413,26,5000
 gon_dun03,0,0,0,0	boss_monster	Evil Snake Lord	1418,1,5650000,600000,0
-gon_dun03,0,0	monster	White Plant	1082,10,5000
+gon_dun03,0,0	monster	White Plant	1082,13,5000

npc/re/mobs/dungeons/ice_dun.txt

@@ -3,19 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version from jAthena [Playtester]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Removed Ktullanux spawn, quest implemented [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ice_dun01 - Ice Cave
 //==================================================
-ice_dun01,0,0	monster	Siroma	1776,75,5000
+ice_dun01,0,0	monster	Siroma	1776,76,5000
 ice_dun01,0,0	monster	Roween	1782,5,5000
 ice_dun01,0,0	monster	Muscipular	1780,5,5000
 ice_dun01,0,0	monster	Gazeti	1778,2,5000

npc/re/mobs/dungeons/in_sphinx.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,46 +11,47 @@
 //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // in_sphinx1 - Sphinx
 //==================================================
-in_sphinx1,0,0	monster	Drainliar	1111,40,5000
-in_sphinx1,0,0	monster	Requiem	1164,20,5000
-in_sphinx1,0,0	monster	Zerom	1178,20,5000
-in_sphinx1,0,0	monster	Matyr	1146,10,5000
+in_sphinx1,0,0	monster	Drainliar	1111,76,5000
+in_sphinx1,0,0	monster	Requiem	1164,38,5000
+in_sphinx1,0,0	monster	Zerom	1178,38,5000
+in_sphinx1,0,0	monster	Matyr	1146,19,5000
 
 //==================================================
 // in_sphinx2 - Sphinx
 //==================================================
-in_sphinx2,0,0	monster	Requiem	1164,50,5000
-in_sphinx2,0,0	monster	Zerom	1178,50,5000
-in_sphinx2,0,0	monster	Matyr	1146,20,5000
-in_sphinx2,0,0	monster	Drainliar	1111,15,5000
+in_sphinx2,0,0	monster	Requiem	1164,80,5000
+in_sphinx2,0,0	monster	Zerom	1178,80,5000
+in_sphinx2,0,0	monster	Matyr	1146,32,5000
+in_sphinx2,0,0	monster	Drainliar	1111,24,5000
 
 //==================================================
 // in_sphinx3 - Sphinx
 //==================================================
-in_sphinx3,0,0	monster	Marduk	1140,65,5000
-in_sphinx3,0,0	monster	Matyr	1146,15,5000
-in_sphinx3,0,0	monster	Mimic	1191,5,5000
-in_sphinx3,0,0	monster	Pasana	1154,5,5000
+in_sphinx3,0,0	monster	Marduk	1140,82,5000
+in_sphinx3,0,0	monster	Matyr	1146,18,5000
+in_sphinx3,0,0	monster	Mimic	1191,6,5000
+in_sphinx3,0,0	monster	Pasana	1154,6,5000
 
 //==================================================
 // in_sphinx4 - Sphinx
 //==================================================
-in_sphinx4,0,0	monster	Minorous	1149,50,5000
-in_sphinx4,0,0	monster	Pasana	1154,20,5000
-in_sphinx4,0,0	monster	Anubis	1098,15,5000
-in_sphinx4,0,0	monster	Mimic	1191,4,5000
+in_sphinx4,0,0	monster	Minorous	1149,77,5000
+in_sphinx4,0,0	monster	Pasana	1154,30,5000
+in_sphinx4,0,0	monster	Anubis	1098,23,5000
+in_sphinx4,0,0	monster	Mimic	1191,6,5000
 
 //==================================================
 // in_sphinx5 - Sphinx
 //==================================================
-in_sphinx5,0,0	monster	Pasana	1154,70,5000
-in_sphinx5,0,0	monster	Side Winder	1037,20,5000
-in_sphinx5,0,0	monster	Matyr	1146,10,5000
-in_sphinx5,0,0	monster	Anubis	1098,10,5000
+in_sphinx5,0,0	monster	Pasana	1154,79,5000
+in_sphinx5,0,0	monster	Side Winder	1037,22,5000
+in_sphinx5,0,0	monster	Matyr	1146,11,5000
+in_sphinx5,0,0	monster	Anubis	1098,11,5000
 in_sphinx5,0,0	monster	Mimic	1191,7,5000
 in_sphinx5,0,0,0,0	boss_monster	Pharaoh	1157,1,3600000,600000,1

npc/re/mobs/dungeons/iz_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,17 +11,18 @@
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
 //= 1.4 Official F6 spawns.
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // iz_dun00 - Undersea Tunnel
 //==================================================
-iz_dun00,0,0	monster	Plankton	1161,65,5000
-iz_dun00,0,0	monster	Marina	1141,45,5000
-iz_dun00,0,0	monster	Vadon	1066,15,5000
-iz_dun00,0,0	monster	Kukre	1070,15,5000
-iz_dun00,0,0	monster	Hydra	1068,15,5000
-iz_dun00,0,0	monster	Black Mushroom	1084,5,180000,90000
+iz_dun00,0,0	monster	Plankton	1161,88,5000
+iz_dun00,0,0	monster	Marina	1141,61,5000
+iz_dun00,0,0	monster	Vadon	1066,20,5000
+iz_dun00,0,0	monster	Kukre	1070,20,5000
+iz_dun00,0,0	monster	Hydra	1068,20,5000
+iz_dun00,0,0	monster	Black Mushroom	1084,6,180000,90000
 
 //==================================================
 // iz_dun01 - Undersea Tunnel
@@ -86,10 +87,10 @@ iz_dun03,197,144	monster	Hydra	1068,1,2960000,150000
 //==================================================
 // iz_dun04 - Undersea Tunnel
 //==================================================
-iz_dun04,0,0	monster	Merman	1264,52,5000
-iz_dun04,0,0	monster	Strouf	1065,50,5000
-iz_dun04,0,0	monster	Marine Sphere	1142,10,5000
-iz_dun04,0,0	monster	Swordfish	1069,10,5000
+iz_dun04,0,0	monster	Merman	1264,61,5000
+iz_dun04,0,0	monster	Strouf	1065,58,5000
+iz_dun04,0,0	monster	Marine Sphere	1142,11,5000
+iz_dun04,0,0	monster	Swordfish	1069,11,5000
 iz_dun04,0,0	monster	Deviace	1108,3,5000
 iz_dun04,80,246	monster	Hydra	1068,1,294000,150000
 iz_dun04,79,246	monster	Hydra	1068,1,300000,150000

npc/re/mobs/dungeons/kh_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,26 +11,27 @@
 //= 1.1 Added official mob types [Playtester]
 //= 1.2 Updated amounts [Playtester]
 //= 1.3 More accurate spawns [Playtester]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // kh_dun01 - Robot Factory level 1 
 //==================================================
-kh_dun01,0,0	monster	Aliza	1737,45,5000
-kh_dun01,0,0	monster	Alice	1275,25,5000
-kh_dun01,0,0	monster	Constant	1738,8,5000
-kh_dun01,0,0	monster	Constant	1745,5,5000
+kh_dun01,0,0	monster	Aliza	1737,55,5000
+kh_dun01,0,0	monster	Alice	1275,30,5000
+kh_dun01,0,0	monster	Constant	1738,9,5000
+kh_dun01,0,0	monster	Constant	1745,6,5000
 kh_dun01,0,0	monster	Alicel	1735,3,5000
 kh_dun01,0,0	monster	Aliot	1736,3,5000
 
 //==================================================
 // kh_dun02 - Robot Factory level 2
 //==================================================
-kh_dun02,0,0	monster	Alicel	1735,30,5000
-kh_dun02,0,0	monster	Aliot	1736,25,5000
-kh_dun02,0,0	monster	Constant	1738,15,5000
-kh_dun02,0,0	monster	Aliza	1737,10,5000
-kh_dun02,0,0	monster	Constant	1745,5,5000
+kh_dun02,0,0	monster	Alicel	1735,41,5000
+kh_dun02,0,0	monster	Aliot	1736,34,5000
+kh_dun02,0,0	monster	Constant	1738,20,5000
+kh_dun02,0,0	monster	Aliza	1737,13,5000
+kh_dun02,0,0	monster	Constant	1745,6,5000
 kh_dun02,0,0,0,0	boss_monster	Kiel D-01	1734,1,7200000,600000,0
 
 //==================================================

npc/re/mobs/dungeons/lhz_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= The Prometheus Project, rAthena Dev Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -23,12 +23,13 @@
 //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
 //= 1.9 Added Bio4 spawns. [Chilly]
 //= 2.0 Updated Bio4 spawns.
+//= 2.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // lhz_dun01 - Somatology Laboratory
 //==================================================
-lhz_dun01,0,0	monster	Remover	1682,100,5000
+lhz_dun01,0,0	monster	Remover	1682,101,5000
 lhz_dun01,0,0	monster	Anopheles	1627,70,5000
 lhz_dun01,0,0	monster	Metaling	1613,50,5000
 lhz_dun01,0,0	monster	Kavach Icarus	1656,13,5000

npc/re/mobs/dungeons/lou_dun.txt

@@ -3,23 +3,24 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Updated by MasterOfMuppets
 //= 1.2 Added Bacsojin and Chung E [MasterOfMuppets]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // lou_dun01 - The Royal Tomb 
 //==================================================
-lou_dun01,0,0	monster	Jing Guai	1517,45,5000
-lou_dun01,0,0	monster	Grizzly	1381,15,5000
-lou_dun01,0,0	monster	Mi Gao	1516,15,5000
-lou_dun01,0,0	monster	Horong	1129,15,5000
-lou_dun01,0,0	monster	Side Winder	1037,10,5000
+lou_dun01,0,0	monster	Jing Guai	1517,52,5000
+lou_dun01,0,0	monster	Grizzly	1381,17,5000
+lou_dun01,0,0	monster	Mi Gao	1516,17,5000
+lou_dun01,0,0	monster	Horong	1129,17,5000
+lou_dun01,0,0	monster	Side Winder	1037,11,5000
 lou_dun01,0,0	monster	Leib Olmai	1306,1,300000,120000
 lou_dun01,197,77,10,10	monster	Black Mushroom	1084,5,5000
 lou_dun01,0,0	monster	Shining Plant	1083,5,5000
@@ -27,17 +28,17 @@ lou_dun01,0,0	monster	Shining Plant	1083,5,5000
 //==================================================
 // lou_dun02 - Inside the Royal Tomb
 //==================================================
-lou_dun02,0,0	monster	Yao Jun	1512,40,5000
-lou_dun02,0,0	monster	Munak	1026,25,5000
-lou_dun02,0,0	monster	Mimic	1191,5,5000
-lou_dun02,0,0	monster	Zhu Po Long	1514,5,5000
+lou_dun02,0,0	monster	Yao Jun	1512,56,5000
+lou_dun02,0,0	monster	Munak	1026,35,5000
+lou_dun02,0,0	monster	Mimic	1191,7,5000
+lou_dun02,0,0	monster	Zhu Po Long	1514,7,5000
 
 //==================================================
 // lou_dun03 - Suei Long Gon 
 //==================================================
-lou_dun03,0,0	monster	Zhu Po Long	1514,25,5000
-lou_dun03,0,0	monster	Yao Jun	1512,25,5000
-lou_dun03,0,0	monster	Mao Guai	1513,15,5000
-lou_dun03,0,0	monster	Green Maiden	1631,5,5000
+lou_dun03,0,0	monster	Zhu Po Long	1514,30,5000
+lou_dun03,0,0	monster	Yao Jun	1512,30,5000
+lou_dun03,0,0	monster	Mao Guai	1513,18,5000
+lou_dun03,0,0	monster	Green Maiden	1631,6,5000
 lou_dun03,0,0	monster	Green Maiden	1631,5,3000000,1800000
 lou_dun03,0,0,0,0	boss_monster	White Lady	1630,1,7000000,600000,1

npc/re/mobs/dungeons/mjo_dun.txt

@@ -3,33 +3,34 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // mjo_dun01 - Mjolnir Dead Pit
 //==================================================
-mjo_dun01,0,0	monster	Tarou	1175,60,5000
-mjo_dun01,0,0	monster	Familiar	1005,30,5000
-mjo_dun01,0,0	monster	Martin	1145,20,5000
+mjo_dun01,0,0	monster	Tarou	1175,63,5000
+mjo_dun01,0,0	monster	Familiar	1005,31,5000
+mjo_dun01,0,0	monster	Martin	1145,21,5000
 
 //==================================================
 // mjo_dun02 - Mjolnir Dead Pit
 //==================================================
-mjo_dun02,0,0	monster	Martin	1145,60,5000
-mjo_dun02,0,0	monster	Giearth	1121,35,5000
-mjo_dun02,0,0	monster	Drainliar	1111,20,5000
-mjo_dun02,0,0	monster	Skeleton Worker	1169,20,5000
+mjo_dun02,0,0	monster	Martin	1145,71,5000
+mjo_dun02,0,0	monster	Giearth	1121,41,5000
+mjo_dun02,0,0	monster	Drainliar	1111,23,5000
+mjo_dun02,0,0	monster	Skeleton Worker	1169,23,5000
 
 //==================================================
 // mjo_dun03 - Mjolnir Dead Pit
 //==================================================
-mjo_dun03,0,0	monster	Skeleton Worker	1169,70,5000
-mjo_dun03,0,0	monster	Myst	1151,35,5000
+mjo_dun03,0,0	monster	Skeleton Worker	1169,78,5000
+mjo_dun03,0,0	monster	Myst	1151,39,5000
 mjo_dun03,0,0	monster	Giearth	1121,5,5000
 mjo_dun03,0,0	monster	Martin	1145,5,5000
 mjo_dun03,0,0	monster	Cramp	1209,3,5000

npc/re/mobs/dungeons/moc_pryd.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,20 +11,21 @@
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.4 Added Nightmare spawns. [Euphy]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // moc_pryd01 - Inside Pyramid F1
 //==================================================
-moc_pryd01,0,0	monster	Familiar	1005,50,5000
-moc_pryd01,0,0	monster	Poporing	1031,20,5000
+moc_pryd01,0,0	monster	Familiar	1005,72,5000
+moc_pryd01,0,0	monster	Poporing	1031,28,5000
 
 //==================================================
 // moc_pryd02 - Inside Pyramid F2
 //==================================================
-moc_pryd02,0,0	monster	Mummy	1041,30,5000
-moc_pryd02,0,0	monster	Soldier Skeleton	1028,30,5000
-moc_pryd02,0,0	monster	Archer Skeleton	1016,30,5000
+moc_pryd02,0,0	monster	Mummy	1041,31,5000
+moc_pryd02,0,0	monster	Soldier Skeleton	1028,31,5000
+moc_pryd02,0,0	monster	Archer Skeleton	1016,31,5000
 moc_pryd02,0,0	monster	Drainliar	1111,20,5000
 moc_pryd02,0,0	monster	Poporing	1031,20,5000
 moc_pryd02,0,0	monster	Isis	1029,5,5000
@@ -41,41 +42,41 @@ moc_pryd03,0,0	monster	Mimic	1191,5,5000
 //==================================================
 // moc_pryd04 - Inside Pyramid F4
 //==================================================
-moc_pryd04,0,0	monster	Isis	1029,50,5000
-moc_pryd04,0,0	monster	Mummy	1041,25,5000
-moc_pryd04,0,0	monster	Matyr	1146,20,5000
-moc_pryd04,0,0	monster	Mimic	1191,15,5000
+moc_pryd04,0,0	monster	Isis	1029,62,5000
+moc_pryd04,0,0	monster	Mummy	1041,31,5000
+moc_pryd04,0,0	monster	Matyr	1146,24,5000
+moc_pryd04,0,0	monster	Mimic	1191,18,5000
 moc_pryd04,0,0	monster	Ancient Mummy	1297,3,5000
 moc_pryd04,0,0,0,0	boss_monster	Osiris	1038,1,3600000,600000,0
 
 //==================================================
 // moc_pryd05 - Inside Pyramid B1
 //==================================================
-moc_pryd05,0,0	monster	Minorous	1149,60,5000
-moc_pryd05,0,0	monster	Verit	1032,50,5000
-moc_pryd05,0,0	monster	Mummy	1041,10,5000
+moc_pryd05,0,0	monster	Minorous	1149,78,5000
+moc_pryd05,0,0	monster	Verit	1032,65,5000
+moc_pryd05,0,0	monster	Mummy	1041,13,5000
 
 //==================================================
 // moc_pryd06 - Inside Pyramid B2
 //==================================================
-moc_pryd06,0,0	monster	Mimic	1191,30,5000
-moc_pryd06,0,0	monster	Verit	1032,30,5000
-moc_pryd06,0,0	monster	Arclouze	1194,20,5000
-moc_pryd06,0,0	monster	Ancient Mummy	1297,20,5000
+moc_pryd06,0,0	monster	Mimic	1191,35,5000
+moc_pryd06,0,0	monster	Verit	1032,35,5000
+moc_pryd06,0,0	monster	Arclouze	1194,23,5000
+moc_pryd06,0,0	monster	Ancient Mummy	1297,23,5000
 moc_pryd06,102,85,1,1	boss_monster	Amon Ra	1511,1,3600000,600000,0
 
 //==================================================
 // moc_prydn1 - Nightmare Mode B1
 //==================================================
-moc_prydn1,0,0	monster	Nightmare Minorous	2353,60,5000
-moc_prydn1,0,0	monster	Nightmare Mummy	2354,10,5000
-moc_prydn1,0,0	monster	Nightmare Verit	2355,50,5000
+moc_prydn1,0,0	monster	Nightmare Minorous	2353,78,5000
+moc_prydn1,0,0	monster	Nightmare Mummy	2354,13,5000
+moc_prydn1,0,0	monster	Nightmare Verit	2355,65,5000
 
 //==================================================
 // moc_prydn2 - Nightmare Mode B2
 //==================================================
-moc_prydn2,0,0	monster	Nightmare Mimic	2356,30,5000
-moc_prydn2,0,0	monster	Nightmare Verit	2355,30,5000
-moc_prydn2,0,0	monster	Nightmare Arclouze	2358,20,5000
-moc_prydn2,0,0	monster	Nightmare Ancient Mummy	2360,20,5000
+moc_prydn2,0,0	monster	Nightmare Mimic	2356,35,5000
+moc_prydn2,0,0	monster	Nightmare Verit	2355,35,5000
+moc_prydn2,0,0	monster	Nightmare Arclouze	2358,23,5000
+moc_prydn2,0,0	monster	Nightmare Ancient Mummy	2360,23,5000
 moc_prydn2,102,85,1,1	boss_monster	Nightmare Amon Ra	2362,1,3600000,600000,1

npc/re/mobs/dungeons/mosk_dun.txt

@@ -3,39 +3,40 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 //= 1.1 Swapped named according to mob db. [L0ne_W0lf]
 //= 1.2 Fixed the mob names (iRO names) [Playtester]
-//= 1.2 Updated spawns kinda. [Kisuka]
+//= 1.3 Updated spawns kinda. [Kisuka]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // mosk_dun01 - Les Forest
 //==================================================
-mosk_dun01,0,0	monster	Wood Goblin	1880,66,5000
-mosk_dun01,0,0	monster	Les	1881,33,5000
-mosk_dun01,0,0	monster	Poporing	1031,20,5000
-mosk_dun01,0,0	monster	Mantis	1139,10,5000
+mosk_dun01,0,0	monster	Wood Goblin	1880,74,5000
+mosk_dun01,0,0	monster	Les	1881,37,5000
+mosk_dun01,0,0	monster	Poporing	1031,22,5000
+mosk_dun01,0,0	monster	Mantis	1139,11,5000
 
 //==================================================
 // mosk_dun02 - Temny Forest
 //==================================================
-mosk_dun02,0,0	monster	Les	1881,40,5000
-mosk_dun02,0,0	monster	Wood Goblin	1880,30,5000
-mosk_dun02,0,0	monster	Baba Yaga	1882,20,5000
+mosk_dun02,0,0	monster	Les	1881,47,5000
+mosk_dun02,0,0	monster	Wood Goblin	1880,35,5000
+mosk_dun02,0,0	monster	Baba Yaga	1882,23,5000
 mosk_dun02,0,0	monster	Uzhas	1883,5,5000
 
 //==================================================
 // mosk_dun03 - Dremuci Forest
 //==================================================
-mosk_dun03,0,0	monster	Baba Yaga	1882,60,5000
-mosk_dun03,0,0	monster	Uzhas	1883,35,5000
-mosk_dun03,0,0	monster	Mavka	1884,15,5000
+mosk_dun03,0,0	monster	Baba Yaga	1882,68,5000
+mosk_dun03,0,0	monster	Uzhas	1883,39,5000
+mosk_dun03,0,0	monster	Mavka	1884,17,5000
 mosk_dun03,207,221,5,5	boss_monster	Gopinich	1885,1,7200000,600000,1
-mosk_dun03,0,0	monster	Yellow Plant	1081,10,5000
-mosk_dun03,0,0	monster	White Plant	1082,10,5000
+mosk_dun03,0,0	monster	Yellow Plant	1081,11,5000
+mosk_dun03,0,0	monster	White Plant	1082,11,5000
 mosk_dun03,0,0	monster	Shining Plant	1083,5,10000

npc/re/mobs/dungeons/odin.txt

@@ -3,53 +3,54 @@
 //===== By: ==================================================
 //= Poki#3 (0.1)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // odin_tem01 - Odin Shrine
 //==================================================
-odin_tem01,0,0	monster	Plasma	1693,10,5000
-odin_tem01,0,0	monster	Breeze	1692,10,5000
-odin_tem01,0,0	monster	Frus	1753,5,5000
-odin_tem01,0,0	monster	Skogul	1752,5,5000
-odin_tem01,0,0	monster	Plasma	1697,3,5000
-odin_tem01,0,0	monster	Plasma	1695,3,5000
-odin_tem01,0,0	monster	Plasma	1696,3,5000
-odin_tem01,0,0	monster	Plasma	1694,3,5000
-odin_tem01,0,0	monster	Green Plant	1080,5,60000,30000
-odin_tem01,0,0	monster	Yellow Plant	1081,5,60000,30000
-odin_tem01,0,0	monster	Blue Plant	1079,5,600000,300000
+odin_tem01,0,0	monster	Plasma	1693,14,5000
+odin_tem01,0,0	monster	Breeze	1692,14,5000
+odin_tem01,0,0	monster	Frus	1753,7,5000
+odin_tem01,0,0	monster	Skogul	1752,7,5000
+odin_tem01,0,0	monster	Plasma	1697,4,5000
+odin_tem01,0,0	monster	Plasma	1695,4,5000
+odin_tem01,0,0	monster	Plasma	1696,4,5000
+odin_tem01,0,0	monster	Plasma	1694,4,5000
+odin_tem01,0,0	monster	Green Plant	1080,7,60000,30000
+odin_tem01,0,0	monster	Yellow Plant	1081,7,60000,30000
+odin_tem01,0,0	monster	Blue Plant	1079,7,600000,300000
 
 //==================================================
 // odin_tem02 - Odin Shrine
 //==================================================
-odin_tem02,0,0	monster	Skogul	1752,30,5000
-odin_tem02,0,0	monster	Frus	1753,30,5000
-odin_tem02,0,0	monster	Plasma	1693,15,5000
-odin_tem02,0,0	monster	Frus	1762,3,5000
+odin_tem02,0,0	monster	Skogul	1752,40,5000
+odin_tem02,0,0	monster	Frus	1753,40,5000
+odin_tem02,0,0	monster	Plasma	1693,20,5000
+odin_tem02,0,0	monster	Frus	1762,4,5000
 odin_tem02,0,0	monster	Skogul	1761,2,5000
 odin_tem02,0,0	monster	Skeggiold	1754,1,5000
 odin_tem02,0,0	monster	Skeggiold	1755,1,5000
-odin_tem02,0,0	monster	Blue Plant	1079,10,1800000,900000
+odin_tem02,0,0	monster	Blue Plant	1079,13,1800000,900000
 
 //==================================================
 // odin_tem03 - Odin Shrine
 //==================================================
-odin_tem03,0,0	monster	Plasma	1693,20,5000
-odin_tem03,0,0	monster	Skeggiold	1754,16,5000
-odin_tem03,0,0	monster	Skeggiold	1755,16,5000
-odin_tem03,0,0	monster	Skogul	1761,5,5000
-odin_tem03,0,0	monster	Frus	1762,5,5000
+odin_tem03,0,0	monster	Plasma	1693,24,5000
+odin_tem03,0,0	monster	Skeggiold	1754,19,5000
+odin_tem03,0,0	monster	Skeggiold	1755,19,5000
+odin_tem03,0,0	monster	Skogul	1761,6,5000
+odin_tem03,0,0	monster	Frus	1762,6,5000
 odin_tem03,0,0	monster	Skogul	1752,4,5000
 odin_tem03,0,0	monster	Frus	1753,4,5000
 odin_tem03,0,0	monster	Valkyrie	1765,2,5400000,1800000
 odin_tem03,0,0,0,0	boss_monster	Valkyrie Randgris	1751,1,28800000,600000,1
-odin_tem03,0,0	monster	Blue Plant	1079,15,1800000,900000
-odin_tem03,0,0	monster	Shining Plant	1083,15,1800000,900000
+odin_tem03,0,0	monster	Blue Plant	1079,18,1800000,900000
+odin_tem03,0,0	monster	Shining Plant	1083,18,1800000,900000

npc/re/mobs/dungeons/pay_dun.txt

@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Small spawn update [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -25,9 +26,9 @@ pay_dun00,140,140,5,5	monster	Black Mushroom	1084,3,360000,180000
 //==================================================
 // pay_dun01 - Payon Cave
 //==================================================
-pay_dun01,0,0	monster	Soldier Skeleton	1028,50,5000
-pay_dun01,0,0	monster	Archer Skeleton	1016,30,5000
-pay_dun01,0,0	monster	Eggyra	1116,15,5000
+pay_dun01,0,0	monster	Soldier Skeleton	1028,53,5000
+pay_dun01,0,0	monster	Archer Skeleton	1016,32,5000
+pay_dun01,0,0	monster	Eggyra	1116,16,5000
 pay_dun01,0,0	monster	Drainliar	1111,5,5000
 pay_dun01,235,54,10,10	monster	Black Mushroom	1084,7,900000,450000
 pay_dun01,0,0	monster	Red Plant	1078,10,180000,90000

npc/re/mobs/dungeons/prt_maze.txt

@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Some small fixes [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -63,15 +64,15 @@ prt_maze01,168,60,3,3	monster	Red Mushroom	1085,2,180000,90000
 //==================================================
 // prt_maze02 - Labyrinth Forest
 //==================================================
-prt_maze02,0,0	monster	Poporing	1031,25,5000
-prt_maze02,0,0	monster	Bigfoot	1060,5,5000
+prt_maze02,0,0	monster	Poporing	1031,32,5000
+prt_maze02,0,0	monster	Bigfoot	1060,6,5000
 prt_maze02,0,0	monster	Sasquatch	1243,1,900000,40000
 prt_maze02,0,0	monster	Leib Olmai	1306,1,1800000,900000
 
 //==================================================
 // prt_maze03 - Labyrinth Forest
 //==================================================
-prt_maze03,0,0	monster	Poporing	1031,45,5000
+prt_maze03,0,0	monster	Poporing	1031,52,5000
 prt_maze03,0,0	monster	Hunter Fly	1035,30,5000
 prt_maze03,170,170,70,70	monster	Mantis	1139,30,60000,30000
 prt_maze03,100,100,80,80	monster	Baphomet Jr.	1101,25,5000,0,0

npc/re/mobs/dungeons/prt_q.txt

@@ -2,13 +2,18 @@
 //= Episode 16.1 Monsters Spawn Script
 //===== Description: =========================================
 //= Spawns monsters in prt_q.
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 // Prontera Invasion
 prt_q,0,0	monster	Zombie Guard	3452,60
 prt_q,0,0	monster	Ghoul	1036,10
 prt_q,0,0	monster	Immortal Corps	3451,30
-prt_q,0,0	monster	Hunter Fly	1035,15
+prt_q,0,0	monster	Hunter Fly	1035,10
 prt_q,0,0	monster	Immortal Commander	3490,1

npc/re/mobs/dungeons/prt_sew.txt

@@ -3,28 +3,29 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // prt_sewb1 - Prontera Culvert 
 //==================================================
-prt_sewb1,0,0	monster	Thief Bug	1051,30,5000
-prt_sewb1,0,0	monster	Thief Bug Egg	1048,80,5000
-prt_sewb1,0,0	monster	Tarou	1175,10,5000
-prt_sewb1,0,0	monster	Familiar	1005,10,5000
+prt_sewb1,0,0	monster	Thief Bug	1051,40,5000
+prt_sewb1,0,0	monster	Thief Bug Egg	1048,106,5000
+prt_sewb1,0,0	monster	Tarou	1175,13,5000
+prt_sewb1,0,0	monster	Familiar	1005,66,5000
 
 //==================================================
 // prt_sewb2 - Prontera Culvert
 //==================================================
 prt_sewb2,0,0	monster	Thief Bug	1051,70,5000
 prt_sewb2,0,0	monster	Tarou	1175,60,5000
-prt_sewb2,0,0	monster	Plankton	1161,30,5000
+prt_sewb2,0,0	monster	Plankton	1161,5,5000
 prt_sewb2,0,0	monster	Thief Bug Egg	1048,20,5000
 prt_sewb2,0,0	monster	Spore	1014,20,5000
 prt_sewb2,0,0	monster	Thief Bug Female	1053,10,5000

npc/re/mobs/dungeons/ra_san.txt

@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version with guessed amounts [Playtester]
 //= 1.1 More accurate spawns [Playtester]
 //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -24,25 +25,25 @@ ra_san01,0,0	monster	Hodremlin	1773,6,5000
 //==================================================
 // ra_san02 - Holy Ground 
 //==================================================
-ra_san02,0,0	monster	Isilla	1772,85,5000
-ra_san02,0,0	monster	Vanberk	1771,30,5000
-ra_san02,0,0	monster	Gremlin	1632,10,5000
-ra_san02,0,0	monster	Beholder	1633,10,5000
+ra_san02,0,0	monster	Isilla	1772,110,5000
+ra_san02,0,0	monster	Vanberk	1771,38,5000
+ra_san02,0,0	monster	Gremlin	1632,12,5000
+ra_san02,0,0	monster	Beholder	1633,12,5000
 ra_san02,0,0	monster	Hodremlin	1773,3,5000
 ra_san02,0,0	monster	Seeker	1774,2,5000
 
 //==================================================
 // ra_san03 - Holy Ground
 //==================================================
-ra_san03,0,0	monster	Hodremlin	1773,60,5000
-ra_san03,0,0	monster	Seeker	1774,40,5000
-ra_san03,0,0	monster	Gremlin	1632,5,5000
-ra_san03,0,0	monster	Beholder	1633,5,5000
+ra_san03,0,0	monster	Hodremlin	1773,86,5000
+ra_san03,0,0	monster	Seeker	1774,57,5000
+ra_san03,0,0	monster	Gremlin	1632,7,5000
+ra_san03,0,0	monster	Beholder	1633,7,5000
 
 //==================================================
 // ra_san04 - Holy Ground
 //==================================================
-ra_san04,0,0	monster	Echio	1770,60,5000
+ra_san04,0,0	monster	Echio	1770,62,5000
 ra_san04,0,0	monster	Agav	1769,20,5000
 ra_san04,0,0	monster	Seeker	1774,10,5000
 ra_san04,0,0	monster	Hodremlin	1773,10,5000
@@ -50,9 +51,9 @@ ra_san04,0,0	monster	Hodremlin	1773,10,5000
 //==================================================
 // ra_san05 - Holy Ground
 //==================================================
-ra_san05,0,0	monster	Agav	1769,80,5000
-ra_san05,0,0	monster	Echio	1770,30,5000
-ra_san05,0,0	monster	Seeker	1774,20,5000
-ra_san05,0,0	monster	Hodremlin	1773,20,5000
+ra_san05,0,0	monster	Agav	1769,84,5000
+ra_san05,0,0	monster	Echio	1770,31,5000
+ra_san05,0,0	monster	Seeker	1774,21,5000
+ra_san05,0,0	monster	Hodremlin	1773,21,5000
 ra_san05,0,0	monster	Isilla	1772,10,5000
 ra_san05,0,0,0,0	boss_monster	Gloom Under Night	1768,1,18000000,600000,0

npc/re/mobs/dungeons/rockridge.txt

@@ -1,23 +1,29 @@
 //===== rAthena Script =======================================
 //= Rock Ridge Monsters Spawn Script
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version. [Capuche]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 // Rock Ridge Mine
-rockmi1,0,0	monster	Thief Bug	1051,3
-rockmi1,0,0	monster	Gaster	3740,18
-rockmi1,0,0	monster	Elite Buffalo Bandit	3747,3
-rockmi1,0,0	monster	Elite Buffalo Bandit	3748,8
-rockmi1,0,0	monster	Elite Buffalo Bandit	3749,6
+rockmi1,0,0	monster	Thief Bug	1051,10
+rockmi1,0,0	monster	Gaster	3740,40
+rockmi1,0,0	monster	Elite Buffalo Bandit	3747,10
+rockmi1,0,0	monster	Elite Buffalo Bandit	3748,20
+rockmi1,0,0	monster	Elite Buffalo Bandit	3749,30
 rockmi1,0,0	boss_monster	Spider Chariot	3741,1,7200000,600000,1
 
 // Rock Ridge Mine
 rockmi2,100,36,20,20	monster	Purple Ore	3742,31
 
 // Culvert
-harboro2,0,0	monster	Swamp Arclouze	3787,29
-harboro2,0,0	monster	Brown Rat	3788,29
+harboro2,0,0	monster	Swamp Arclouze	3787,30
+harboro2,0,0	monster	Brown Rat	3788,30
 harboro2,0,0	monster	Anopheles	1627,10
-harboro2,0,0	monster	Black Mushroom	1084,19
+harboro2,0,0	monster	Black Mushroom	1084,20
+harboro2,0,0	monster	Thief Bug	1051,10
 harboro2,50,259,10,6	monster	Sea Anemone	3743,20

npc/re/mobs/dungeons/tha_t.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,6 +11,7 @@
 //= 1.1 More official spawns [Playtester]
 //= 1.2 Updated by using Tharis' Homun AI, by Tharis [Vicious]
 //= 1.3 Official Aegis X.3 spawns [Playtester]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -150,3 +151,141 @@ tha_t12,0,0	monster	Mistress of Shelter	1701,5,5000
 tha_t12,0,0	monster	Lady Solace	1703,5,5000
 tha_t12,0,0	monster	Plasma	1693,5,5000
 tha_t12,0,0	monster	Odium of Thanatos	1709,4,5000
+
+
+//============================================================
+//= Post Thanatos Revamped Patch.
+//============================================================
+//==================================================
+// tha_t01 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t01,0,0	monster	Rideword	1195,37,5000
+//tha_t01,0,0	monster	Mimic	1191,37,5000
+//tha_t01,0,0	monster	Plasma	1695,37,5000
+//tha_t01,0,0	monster	Alice	1275,9,5000
+//tha_t01,0,0	monster	Lady Solace	1703,7,5000
+
+//==================================================
+// tha_t02 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t02,0,0	monster	Ancient Mimic	1699,100,5000
+//tha_t02,0,0	monster	Mimic	1191,37,5000
+//tha_t02,0,0	monster	Plasma	1697,25,5000
+//tha_t02,0,0	monster	Death Word	1698,12,5000
+//tha_t02,0,0	monster	Rideword	1195,12,5000
+//tha_t02,0,0	monster	Elder	1377,12,5000
+//tha_t02,0,0	monster	Alice	1275,12,5000
+//tha_t02,0,0	monster	Baroness of Retribution	1702,5,5000
+
+//==================================================
+// tha_t03 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t03,0,0	monster	Death Word	1698,92,5000
+//tha_t03,0,0	monster	Rideword	1195,34,5000
+//tha_t03,0,0	monster	Plasma	1696,23,5000
+//tha_t03,0,0	monster	Mimic	1191,11,5000
+//tha_t03,0,0	monster	Ancient Mimic	1699,11,5000
+//tha_t03,0,0	monster	Elder	1377,11,5000
+//tha_t03,0,0	monster	Mistress of Shelter	1701,4,5000
+
+//==================================================
+// tha_t04 - Thanatos Tower - Lower Level
+//==================================================
+//tha_t04,0,0	monster	Death Word	1698,20,5000
+//tha_t04,0,0	monster	Rideword	1195,20,5000
+//tha_t04,0,0	monster	Mimic	1191,20,5000
+//tha_t04,0,0	monster	Ancient Mimic	1699,20,5000
+//tha_t04,0,0	monster	Elder	1377,20,5000
+//tha_t04,0,0	monster	Plasma	1694,20,5000
+//tha_t04,0,0	monster	Owl Duke	1320,10,5000
+//tha_t04,0,0	monster	Owl Baron	1295,10,5000
+//tha_t04,0,0	monster	Dame of Sentinel	1700,4,5000
+
+//==================================================
+// tha_t05 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t05,0,0	monster	Owl Duke	1320,80,5000
+//tha_t05,0,0	monster	Death Word	1698,40,5000
+//tha_t05,0,0	monster	Ancient Mimic	1699,40,5000
+//tha_t05,0,0	monster	Owl Baron	1295,20,5000
+//tha_t05,0,0	monster	Elder	1377,20,5000
+//tha_t05,0,0	monster	Plasma	1696,10,5000
+//tha_t05,0,0	monster	Plasma	1695,10,5000
+//tha_t05,0,0	monster	Plasma	1697,10,5000
+//tha_t05,0,0	monster	Plasma	1694,10,5000
+//tha_t05,0,0	monster	Dolor of Thanatos	1707,2,5000
+
+//==================================================
+// tha_t06 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t06,0,0	monster	Death Word	1698,40,5000
+//tha_t06,0,0	monster	Owl Duke	1320,40,5000
+//tha_t06,0,0	monster	Owl Baron	1295,40,5000
+//tha_t06,0,0	monster	Ancient Mimic	1699,40,5000
+//tha_t06,0,0	monster	Elder	1377,20,5000
+//tha_t06,0,0	monster	Plasma	1696,10,5000
+//tha_t06,0,0	monster	Plasma	1695,10,5000
+//tha_t06,0,0	monster	Plasma	1697,10,5000
+//tha_t06,0,0	monster	Plasma	1694,10,5000
+//tha_t06,0,0	monster	Maero of Thanatos	1706,2,5000
+
+//==================================================
+// tha_t07 - Thanatos Tower - Upper Level 
+//==================================================
+//tha_t07,0,0	monster	Baroness of Retribution	1702,15,5000
+//tha_t07,0,0	monster	Death Word	1698,10,5000
+//tha_t07,0,0	monster	Ancient Mimic	1699,10,5000
+//tha_t07,0,0	monster	Dame of Sentinel	1700,11,5000
+//tha_t07,0,0	monster	Mistress of Shelter	1701,11,5000
+//tha_t07,0,0	monster	Lady Solace	1703,11,5000
+//tha_t07,0,0	monster	Despero of Thanatos	1705,2,5000
+
+//==================================================
+// tha_t08 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t08,0,0	monster	Baroness of Retribution	1702,20,5000
+//tha_t08,0,0	monster	Death Word	1698,10,5000
+//tha_t08,0,0	monster	Dame of Sentinel	1700,5,5000
+//tha_t08,0,0	monster	Odium of Thanatos	1704,7,5000
+//tha_t08,0,0	monster	Despero of Thanatos	1705,7,5000
+//tha_t08,0,0	monster	Maero of Thanatos	1706,7,5000
+//tha_t08,0,0	monster	Dolor of Thanatos	1707,7,5000
+
+//==================================================
+// tha_t09 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t09,0,0	monster	Void Mimic	20779,5,5000
+//tha_t09,0,0	monster	Book of Death	20780,5,5000
+//tha_t09,0,0	monster	Eldest	20781,5,5000
+//tha_t09,0,0	monster	Crow Duke	20782,10,5000
+//tha_t09,0,0	monster	Crow Braon	20783,15,5000
+
+//==================================================
+// tha_t10 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t10,0,0	monster	Void Mimic	20779,15,5000
+//tha_t10,0,0	monster	Book of Death	20780,15,5000
+//tha_t10,0,0	monster	Eldest	20781,13,5000
+//tha_t10,0,0	monster	Emphatizer	20773,5,5000
+//tha_t10,0,0	monster	Happy Giver	20774,5,5000
+
+//==================================================
+// tha_t11 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t11,0,0	monster	Void Mimic	20779,3,5000
+//tha_t11,0,0	monster	Book of Death	20780,3,5000
+//tha_t11,0,0	monster	Emphatizer	20773,14,5000
+//tha_t11,0,0	monster	Happy Giver	20774,14,5000
+//tha_t11,0,0	monster	Pray Giver	20844,15,5000
+//tha_t11,0,0	monster	Smile Giver	20845,15,5000
+//tha_t11,0,0	monster	Resentful of Thanatos	20777,2,5000
+//tha_t11,0,0	monster	Horror of Thanatos	20776,2,5000
+
+//==================================================
+// tha_t12 - Thanatos Tower - Upper Level
+//==================================================
+//tha_t12,0,0	monster	Book of Death	20780,3,5000
+//tha_t12,0,0	monster	Anger of Thanatos	20775,13,5000
+//tha_t12,0,0	monster	Horror of Thanatos	20776,15,5000
+//tha_t12,0,0	monster	Resentful of Thanatos	20777,14,5000
+//tha_t12,0,0	monster	Regret of Thanatos	20778,15,5000

npc/re/mobs/dungeons/thor_v.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -14,14 +14,15 @@
 //= 1.2 Updated spawns according to RODE [Playtester]
 //= 1.3 More official spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // thor_v01 - Thor Volcano Dungeon
 //==================================================
-thor_v01,0,0	monster	Kasa	1833,45,5000
-thor_v01,0,0	monster	Imp	1837,25,5000
-thor_v01,0,0	monster	Magmaring	1836,10,5000
+thor_v01,0,0	monster	Kasa	1833,49,5000
+thor_v01,0,0	monster	Imp	1837,27,5000
+thor_v01,0,0	monster	Magmaring	1836,11,5000
 thor_v01,0,0	monster	Salamander	1831,7,5000
 thor_v01,0,0	monster	Bow Guardian	1830,5,5000
 thor_v01,0,0	monster	Sword Guardian	1829,5,5000
@@ -43,13 +44,11 @@ thor_v02,0,0	monster	Sword Guardian	1829,1,7200000
 //==================================================
 // thor_v03 - Thor Volcano Dungeon
 //==================================================
-thor_v03,0,0	monster	Salamander	1831,60,5000
-thor_v03,0,0	monster	Kasa	1833,40,5000
-thor_v03,0,0	monster	Bow Guardian	1830,10,5000
-thor_v03,0,0	monster	Sword Guardian	1829,10,5000
+thor_v03,0,0	monster	Salamander	1831,66,5000
+thor_v03,0,0	monster	Kasa	1833,44,5000
+thor_v03,0,0	monster	Bow Guardian	1830,11,5000
+thor_v03,0,0	monster	Sword Guardian	1829,11,5000
 thor_v03,0,0	monster	Byrogue	1839,5,5000
-thor_v03,0,0	monster	Sword Guardian	1829,5,5000
-thor_v03,0,0	monster	Bow Guardian	1830,5,5000
 thor_v03,0,0	monster	Bow Guardian	1830,5,1800000
 thor_v03,0,0	monster	Sword Guardian	1829,5,1800000
 thor_v03,0,0,0,0	boss_monster	Ifrit	1832,1,39600000,600000,0

npc/re/mobs/dungeons/treasure.txt

@@ -3,21 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.4 Added 14.2 Novice Version as part of Academy update. [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // treasure01 - Sunken Ship
 //==================================================
-treasure01,0,0	monster	Pirate Skeleton	1071,43,5000
-treasure01,0,0	monster	Kukre	1070,20,5000
-treasure01,0,0	monster	Whisper	1179,15,5000
-treasure01,0,0	monster	Poison Spore	1077,12,5000
+treasure01,0,0	monster	Pirate Skeleton	1071,56,5000
+treasure01,0,0	monster	Kukre	1070,10,5000
 treasure01,68,66,13,11	monster	Hydra	1068,4,180000,90000
 treasure01,107,39,15,15	monster	Hydra	1068,1,180000,90000
 treasure01,67,161	monster	Hydra	1068,1,263000,100000
@@ -90,13 +89,11 @@ treasure01,168,40	monster	Hydra	1068,1,322000,100000
 //==================================================
 // treasure02 - Sunken Ship
 //==================================================
-treasure02,0,0	monster	Penomena	1216,38,5000
-treasure02,0,0	monster	Pirate Skeleton	1071,20,5000
+treasure02,0,0	monster	Pirate Skeleton	1071,40,5000
 treasure02,0,0	monster	Kukre	1070,20,5000
-treasure02,0,0	monster	Whisper	1179,14,5000
-treasure02,0,0	monster	Mimic	1191,8,5000
+treasure02,0,0	monster	Whisper	1179,10,5000
+treasure02,0,0	monster	Mimic	1191,1,5000
 treasure02,0,0	monster	Marionette	1143,1,5000
-treasure02,0,0	monster	Wanderer	1208,1,5000
 treasure02,100,136	monster	Hydra	1068,1,300000,100000
 treasure02,101,136	monster	Hydra	1068,1,300000,100000
 treasure02,102,136	monster	Hydra	1068,1,300000,100000

npc/re/mobs/dungeons/tur_dun.txt

@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -22,8 +23,8 @@ tur_dun01,0,0	monster	Permeter	1314,10,5000
 //==================================================
 // tur_dun02 - Turtle Island Dungeon
 //==================================================
-tur_dun02,0,0	monster	Solider	1316,40,5000
-tur_dun02,0,0	monster	Permeter	1314,40,5000
+tur_dun02,0,0	monster	Solider	1316,41,5000
+tur_dun02,0,0	monster	Permeter	1314,41,5000
 tur_dun02,0,0	monster	Freezer	1319,20,5000
 tur_dun02,0,0	monster	Pest	1256,15,5000
 
@@ -38,7 +39,7 @@ tur_dun03,0,0	monster	Heater	1318,10,5000
 //==================================================
 // tur_dun04 - Turtle Palace
 //==================================================
-tur_dun04,0,0	monster	Assaulter	1315,41,5000
+tur_dun04,0,0	monster	Assaulter	1315,42,5000
 tur_dun04,0,0	monster	Heater	1318,33,5000
 tur_dun04,0,0	monster	Freezer	1319,15,5000
 tur_dun04,0,0	monster	Permeter	1314,4,5000
@@ -47,6 +48,6 @@ tur_dun04,99,93,20,20	boss_monster	Turtle General	1312,1,3600000,600000,0
 //==================================================
 // tur_dun05 - Underground Swamp Zone
 //==================================================
-tur_dun05,0,0	monster	Freezer	1319,5,5000
-tur_dun05,0,0	monster	Permeter	1314,3,5000
+tur_dun05,0,0	monster	Freezer	1319,7,5000
+tur_dun05,0,0	monster	Permeter	1314,4,5000
 tur_dun05,0,0	monster	Assaulter	1315,1,5000

npc/re/mobs/dungeons/xmas_dun.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,18 +11,19 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Small spawn update [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // xmas_dun01 - Toy Factory Warehouse
 //==================================================
-xmas_dun01,0,0	monster	Cookie	1265,40,5000
-xmas_dun01,0,0	monster	Christmas Cookie	1246,40,5000
-xmas_dun01,0,0	monster	Marin	1242,20,5000
-xmas_dun01,0,0	monster	Poporing	1031,20,5000
-xmas_dun01,0,0	monster	Drops	1113,10,5000
-xmas_dun01,0,0	monster	Poring	1002,10,5000
-xmas_dun01,0,0	monster	Myst Case	1249,5,5000
+xmas_dun01,0,0	monster	Cookie	1265,49,5000
+xmas_dun01,0,0	monster	Christmas Cookie	1246,49,5000
+xmas_dun01,0,0	monster	Marin	1242,24,5000
+xmas_dun01,0,0	monster	Poporing	1031,24,5000
+xmas_dun01,0,0	monster	Drops	1113,12,5000
+xmas_dun01,0,0	monster	Poring	1002,12,5000
+xmas_dun01,0,0	monster	Myst Case	1249,6,5000
 xmas_dun01,0,0	monster	Chepet	1250,1,1200000,900000
 xmas_dun01,0,0	monster	Mastering	1090,1,1800000,900000
 xmas_dun01,0,0	monster	Angeling	1096,1,3600000,1800000
@@ -30,8 +31,8 @@ xmas_dun01,0,0	monster	Angeling	1096,1,3600000,1800000
 //==================================================
 // xmas_dun02 - Toy Monitoring Room
 //==================================================
-xmas_dun02,0,0	monster	Myst Case	1249,50,5000
-xmas_dun02,0,0	monster	Cruiser	1248,35,5000
-xmas_dun02,0,0	monster	Cookie	1265,20,5000
-xmas_dun02,0,0	monster	Christmas Cookie	1246,20,5000
+xmas_dun02,0,0	monster	Myst Case	1249,70,5000
+xmas_dun02,0,0	monster	Cruiser	1248,49,5000
+xmas_dun02,0,0	monster	Cookie	1265,28,5000
+xmas_dun02,0,0	monster	Christmas Cookie	1246,28,5000
 xmas_dun02,0,0,0,0	boss_monster	Stormy Knight	1251,1,3600000,600000,0

npc/re/mobs/fields/amatsu.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,14 +11,15 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Small update [Playtester]
 //= 1.4 Updated to Renewal Spawns [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ama_fild01 - Amatsu Field
 //==================================================
-ama_fild01,0,0	monster	Bigfoot	1060,15,5000
-ama_fild01,0,0	monster	Karakasa	1400,50,5000
-ama_fild01,0,0	monster	Kapha	1406,40,5000
+ama_fild01,0,0	monster	Bigfoot	1060,14,5000
+ama_fild01,0,0	monster	Karakasa	1400,72,5000
+ama_fild01,0,0	monster	Kapha	1406,57,5000
 ama_fild01,0,0	monster	Miyabi Doll	1404,2,5000
 ama_fild01,0,0	monster	Poison Toad	1402,1,5000
 ama_fild01,173,313	monster	Hydra	1068,1,60000,30000

npc/re/mobs/fields/ayothaya.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -13,20 +13,21 @@
 //= 1.4 Official kRO 10.1 spawns [Playtester]
 //= 1.5 Updated to Renewal Spawns [Kisuka]
 //= 1.6 Renewal spawn update.
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ayo_fild01 - Ayothaya Field
 //==================================================
-ayo_fild01,0,0	monster	Smokie	1056,30,5000
-ayo_fild01,0,0	monster	Coco	1104,30,5000
-ayo_fild01,0,0	monster	Yoyo	1057,30,5000
+ayo_fild01,0,0	monster	Smokie	1056,40,5000
+ayo_fild01,0,0	monster	Coco	1104,40,5000
+ayo_fild01,0,0	monster	Yoyo	1057,40,5000
 ayo_fild01,0,0	monster	Green Plant	1080,10,10000
 
 //==================================================
 // ayo_fild02 - Ayothaya Field
 //==================================================
-ayo_fild02,0,0	monster	Yoyo	1057,45,5000
-ayo_fild02,0,0	monster	Leaf Cat	1586,35,5000
-ayo_fild02,0,0	monster	Kraben	1587,5,5000
+ayo_fild02,0,0	monster	Yoyo	1057,82,5000
+ayo_fild02,0,0	monster	Leaf Cat	1586,63,5000
+ayo_fild02,0,0	monster	Kraben	1587,9,5000
 ayo_fild02,0,0	monster	Yellow Plant	1081,10,10000

npc/re/mobs/fields/comodo.txt

@@ -3,20 +3,21 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Updated to renewal spawns. [L0ne_W0lf]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // cmd_fild01 - Papuchicha Forest
 //==================================================
-cmd_fild01,0,0	monster	Grove	1687,150,5000
-cmd_fild01,0,0	monster	Flora	1118,50,5000
+cmd_fild01,0,0	monster	Grove	1687,202,5000
+cmd_fild01,0,0	monster	Flora	1118,67,5000
 cmd_fild01,313,213,10,10	monster	Shining Plant	1083,1,1800000,900000
 cmd_fild01,313,213,10,10	monster	Blue Plant	1079,1,1800000,900000
 cmd_fild01,171,339,10,10	monster	Blue Plant	1079,2,1800000,900000
@@ -27,19 +28,19 @@ cmd_fild01,0,0	monster	Green Plant	1080,5,1800000,900000
 //==================================================
 // cmd_fild02 - Kokomo beach
 //==================================================
-cmd_fild02,0,0	monster	Seal	1317,120,5000
-cmd_fild02,0,0	monster	Galapago	1391,30,5000
-cmd_fild02,0,0	monster	Shellfish	1074,20,5000
-cmd_fild02,0,0	monster	Crab	1073,20,5000
-cmd_fild02,0,0	monster	Aster	1266,10,5000
+cmd_fild02,0,0	monster	Seal	1317,162,5000
+cmd_fild02,0,0	monster	Galapago	1391,40,5000
+cmd_fild02,0,0	monster	Shellfish	1074,27,5000
+cmd_fild02,0,0	monster	Crab	1073,27,5000
+cmd_fild02,0,0	monster	Aster	1266,13,5000
 cmd_fild02,0,0	monster	Mobster	1313,1,5000
 
 //==================================================
 // cmd_fild03 - Zenhai Marsh
 //==================================================
-cmd_fild03,0,0	monster	Alligator	1271,150,5000
-cmd_fild03,0,0	monster	Flora	1118,50,5000
-cmd_fild03,0,0	monster	Mutant Dragonoid	1262,4
+cmd_fild03,0,0	monster	Alligator	1271,194,5000
+cmd_fild03,0,0	monster	Flora	1118,64,5000
+cmd_fild03,0,0	monster	Mutant Dragonoid	1262,5,5000
 cmd_fild03,0,0	monster	Toad	1089,1,3600000,1800000
 cmd_fild03,356,232,3,3	monster	Shining Plant	1083,1,1800000,900000
 cmd_fild03,262,289,3,3	monster	Shining Plant	1083,1,1800000,900000
@@ -48,11 +49,11 @@ cmd_fild03,145,191,3,3	monster	Shining Plant	1083,1,1800000,900000
 //==================================================
 // cmd_fild04 - Kokomo beach
 //==================================================
-cmd_fild04,0,0	monster	Sea Otter	1323,120,5000
-cmd_fild04,0,0	monster	Galapago	1391,30,5000
-cmd_fild04,0,0	monster	Shellfish	1074,20,5000
-cmd_fild04,0,0	monster	Crab	1073,20,5000
-cmd_fild04,0,0	monster	Aster	1266,10,5000
+cmd_fild04,0,0	monster	Sea Otter	1323,149,5000
+cmd_fild04,0,0	monster	Galapago	1391,37,5000
+cmd_fild04,0,0	monster	Shellfish	1074,24,5000
+cmd_fild04,0,0	monster	Crab	1073,24,5000
+cmd_fild04,0,0	monster	Aster	1266,12,5000
 
 //==================================================
 // cmd_fild05 - Disabled on Renewal
@@ -61,26 +62,26 @@ cmd_fild04,0,0	monster	Aster	1266,10,5000
 //==================================================
 // cmd_fild06 - Fortress Saint Darmain (West)
 //==================================================
-cmd_fild06,0,0	monster	Golem	1040,150,5000
-cmd_fild06,0,0	monster	Metaller	1058,50,5000
+cmd_fild06,0,0	monster	Golem	1040,165,5000
+cmd_fild06,0,0	monster	Metaller	1058,55,5000
 cmd_fild06,293,235,5,5	monster	Yellow Plant	1081,2,1800000,900000
 cmd_fild06,84,375,10,10	monster	Yellow Plant	1081,3,1800000,900000
 
 //==================================================
 // cmd_fild07 - Beacon Island, Pharos 
 //==================================================
-cmd_fild07,0,0	monster	Raggler	1254,100,5000
-cmd_fild07,0,0	monster	Aster	1266,30,5000
-cmd_fild07,0,0	monster	Shellfish	1074,30,5000
-cmd_fild07,0,0	monster	Crab	1073,30,5000
+cmd_fild07,0,0	monster	Raggler	1254,116,5000
+cmd_fild07,0,0	monster	Aster	1266,34,5000
+cmd_fild07,0,0	monster	Shellfish	1074,34,5000
+cmd_fild07,0,0	monster	Crab	1073,34,5000
 
 //==================================================
 // cmd_fild08 - Fortress Saint Darmain (East)
 //==================================================
-cmd_fild08,0,0	monster	Deniro	1105,50,5000
-cmd_fild08,0,0	monster	Piere	1160,50,5000
-cmd_fild08,0,0	monster	Andre	1095,50,5000
-cmd_fild08,0,0	monster	Ant Egg	1097,30,5000
+cmd_fild08,0,0	monster	Deniro	1105,62,5000
+cmd_fild08,0,0	monster	Piere	1160,62,5000
+cmd_fild08,0,0	monster	Andre	1095,62,5000
+cmd_fild08,0,0	monster	Ant Egg	1097,37,5000
 cmd_fild08,0,0	monster	Golem	1040,2,5000
 cmd_fild08,60,143,10,10	monster	Yellow Plant	1081,4,1800000,900000
 cmd_fild08,130,201,10,10	monster	Yellow Plant	1081,4,1800000,900000
@@ -88,8 +89,8 @@ cmd_fild08,130,201,10,10	monster	Yellow Plant	1081,4,1800000,900000
 //==================================================
 // cmd_fild09 - Fortress Saint Darmain (South)
 //==================================================
-cmd_fild09,0,0	monster	Metaller	1058,145,5000
-cmd_fild09,0,0	monster	Deniro	1105,15,5000
-cmd_fild09,0,0	monster	Piere	1160,15,5000
-cmd_fild09,0,0	monster	Andre	1095,15,5000
+cmd_fild09,0,0	monster	Metaller	1058,155,5000
+cmd_fild09,0,0	monster	Deniro	1105,16,5000
+cmd_fild09,0,0	monster	Piere	1160,16,5000
+cmd_fild09,0,0	monster	Andre	1095,16,5000
 cmd_fild09,0,0	monster	Ant Egg	1097,10,5000

npc/re/mobs/fields/dewata.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -11,11 +11,12 @@
 //===== Additional Comments: =================================
 //= 1.0 First Release
 //= 1.1 Updated spawn delays. [Euphy]
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // dew_fild01 - Dewata Field Tribal Village
 //==================================================
-dew_fild01,0,0	monster	Alnoldi	2151,60,5000
-dew_fild01,0,0	monster	Argiope	1099,45,5000
-dew_fild01,0,0	monster	Cendrawasih	2153,10,5000
+dew_fild01,0,0	monster	Alnoldi	2151,100,5000
+dew_fild01,0,0	monster	Argiope	1099,75,5000
+dew_fild01,0,0	monster	Cendrawasih	2153,16,5000

npc/re/mobs/fields/dicastes.txt

@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Official spawns from Aegis [Kisuka]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -22,7 +23,7 @@ dic_fild01,0,0	monster	Dolomedes	2092,20,5000
 // dic_fild02 - At the Foot of the Kamidal Mountain
 //==================================================
 dic_fild02,0,0	monster	Bradium Golem	2024,3,5000
-dic_fild02,0,0	monster	Centipede	1987,35,5000
+dic_fild02,0,0	monster	Centipede	1987,38,5000
 dic_fild02,0,0	monster	Centipede Larva	1999,10,5000
-dic_fild02,0,0	monster	Tatacho	1986,25,5000
-dic_fild02,0,0	monster	Dolomedes	2092,80,5000
+dic_fild02,0,0	monster	Tatacho	1986,27,5000
+dic_fild02,0,0	monster	Dolomedes	2092,87,5000

npc/re/mobs/fields/eclage.txt

@@ -3,17 +3,18 @@
 //===== By: ==================================================
 //= refis
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
 //= jRO monster spawns, taken from Auriga.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Euphy]
+//= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ecl_fild01 - Blooming Flower Land
 //==================================================
-ecl_fild01.gat,0,0	monster	Menblatt	2363,60,5000
-ecl_fild01.gat,0,0	monster	Petal	2364,20,5000
+ecl_fild01,0,0	monster	Menblatt	2363,73,5000
+ecl_fild01,0,0	monster	Petal	2364,73,5000

npc/re/mobs/fields/einbroch.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -21,6 +21,7 @@
 //= 1.5 Adjusted some spawns according to official info [Playtester]
 //= 1.6 More accurate spawns [Playtester]
 //= 1.7 Updated to Renewal Spawns [Kisuka]
+//= 1.8 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
@@ -44,11 +45,11 @@ ein_fild03,0,0	monster	Green Plant	1080,15,60000,30000
 //==================================================
 // ein_fild04 - Einbroch Field
 //==================================================
-ein_fild04,0,0	monster	Venomous	1621,100,5000
-ein_fild04,0,0	monster	Noxious	1620,30,5000
-ein_fild04,0,0	monster	Teddy Bear	1622,20,5000
-ein_fild04,0,0	monster	Demon Pungus	1378,15,5000
-ein_fild04,0,0	monster	Pitman	1616,10,5000
+ein_fild04,0,0	monster	Venomous	1621,124,5000
+ein_fild04,0,0	monster	Noxious	1620,37,5000
+ein_fild04,0,0	monster	Teddy Bear	1622,24,5000
+ein_fild04,0,0	monster	Demon Pungus	1378,18,5000
+ein_fild04,0,0	monster	Pitman	1616,12,5000
 ein_fild04,0,0	monster	Red Plant	1078,10,60000,30000
 ein_fild04,0,0	monster	Yellow Plant	1081,10,60000,30000
 ein_fild04,0,0	monster	Green Plant	1080,10,60000,30000
@@ -69,36 +70,35 @@ ein_fild06,0,0	monster	Holden	1628,100,5000
 ein_fild06,0,0	monster	Metaling	1613,30,5000
 ein_fild06,0,0	monster	Red Plant	1078,10,120000,60000
 ein_fild06,0,0	monster	Yellow Plant	1081,10,120000,60000
-ein_fild06,0,0	monster	Black Mushroom	1084,5,120000,60000
 
 //==================================================
 // ein_fild07 - Einbroch Field
 //==================================================
-ein_fild07,0,0	monster	Metaling	1613,90,5000
-ein_fild07,0,0	monster	Porcellio	1619,30,5000
-ein_fild07,0,0	monster	Holden	1628,10,5000
+ein_fild07,0,0	monster	Metaling	1613,109,5000
+ein_fild07,0,0	monster	Porcellio	1619,36,5000
+ein_fild07,0,0	monster	Holden	1628,12,5000
 ein_fild07,0,0	monster	Ungoliant	1618,1,86400000,86000000
 ein_fild07,0,0	monster	Red Plant	1078,10,120000,60000
 ein_fild07,0,0	monster	Yellow Plant	1081,10,120000,60000
-ein_fild07,0,0	monster	Red Mushroom	1085,10,120000,60000
+ein_fild07,0,0	monster	Red Mushroom	1085,12,120000,60000
 
 //==================================================
 // ein_fild08 - Einbroch Field
 //==================================================
-ein_fild08,0,0	monster	Metaling	1613,100,5000
-ein_fild08,0,0	monster	Porcellio	1619,30,5000
+ein_fild08,0,0	monster	Metaling	1613,139,5000
+ein_fild08,0,0	monster	Porcellio	1619,41,5000
 ein_fild08,0,0	monster	Red Plant	1078,10,120000,60000
 ein_fild08,0,0	monster	Yellow Plant	1081,10,120000,60000
-ein_fild08,0,0	monster	Red Mushroom	1085,10,120000,60000
+ein_fild08,0,0	monster	Red Mushroom	1085,13,120000,60000
 
 //==================================================
 // ein_fild09 - Einbroch Field
 //==================================================
-ein_fild09,0,0	monster	Porcellio	1619,70,5000
-ein_fild09,0,0	monster	Metaling	1613,30,5000
+ein_fild09,0,0	monster	Porcellio	1619,97,5000
+ein_fild09,0,0	monster	Metaling	1613,41,5000
 ein_fild09,0,0	monster	Red Plant	1078,10,120000,60000
 ein_fild09,0,0	monster	Yellow Plant	1081,10,120000,60000
-ein_fild09,0,0	monster	Red Mushroom	1085,10,120000,60000
+ein_fild09,0,0	monster	Red Mushroom	1085,13,120000,60000
 
 //==================================================
 // ein_fild10 - Disabled on Renewal

npc/re/mobs/fields/geffen.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,14 +12,15 @@
 //= 1.4 More accurate spawns [Playtester]
 //= 1.5 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.6 Updated to renewal spawns. [L0ne_W0lf]
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // gef_fild00 - Geffen Field
 //==================================================
-gef_fild00,0,0	monster	Chonchon	1011,140,5000
-gef_fild00,0,0	monster	Poring	1002,30,5000
-gef_fild00,0,0	monster	Fabre	1007,30,5000
+gef_fild00,0,0	monster	Chonchon	1011,160,5000
+gef_fild00,0,0	monster	Poring	1002,34,5000
+gef_fild00,0,0	monster	Fabre	1007,34,5000
 gef_fild00,95,128	monster	Blue Plant	1079,1,900000,450000
 gef_fild00,124,321	monster	Blue Plant	1079,1,900000,450000
 gef_fild00,54,212,5,5	monster	Green Plant	1080,3,360000,180000
@@ -28,20 +29,20 @@ gef_fild00,54,186,5,5	monster	Green Plant	1080,3,360000,180000
 //==================================================
 // gef_fild01 - Geffen Field
 //==================================================
-gef_fild01,0,0	monster	Roda Frog	1012,80,5000
-gef_fild01,0,0	monster	Ambernite	1094,20,5000
+gef_fild01,0,0	monster	Roda Frog	1012,112,5000
+gef_fild01,0,0	monster	Ambernite	1094,28,5000
 gef_fild01,0,0	monster	Toad	1089,1,3600000,1800000
 gef_fild01,215,225,10,10	monster	Green Plant	1080,5,360000,180000
 
 //==================================================
 // gef_fild02 - Geffen Field
 //==================================================
-gef_fild02,0,0	monster	Coco	1104,140,5000
-gef_fild02,0,0	monster	Poporing	1031,20,5000
-gef_fild02,0,0	monster	Horn	1128,20,5000
-gef_fild02,0,0	monster	Elder Willow	1033,20,5000
+gef_fild02,0,0	monster	Coco	1104,172,5000
+gef_fild02,0,0	monster	Poporing	1031,24,5000
+gef_fild02,0,0	monster	Horn	1128,24,5000
+gef_fild02,0,0	monster	Elder Willow	1033,24,5000
 gef_fild02,227,316,6,6	monster	Green Plant	1080,8,360000,180000
-gef_fild02,87,48,6,6	monster	Red Mushroom	1085,5,360000,180000
+gef_fild02,87,48,6,6	monster	Red Mushroom	1085,6,360000,180000
 gef_fild02,215,209,2,1	monster	Blue Plant	1079,2,360000,180000
 gef_fild02,207,214,1,1	monster	Blue Plant	1079,1,360000,180000
 gef_fild02,220,214,1,1	monster	Blue Plant	1079,1,360000,180000
@@ -50,9 +51,9 @@ gef_fild02,164,194,1,1	monster	Shining Plant	1083,1,1800000,900000
 //==================================================
 // gef_fild03 - Geffen Field
 //==================================================
-gef_fild03,0,0	monster	Orc Lady	1273,130,5000
-gef_fild03,0,0	monster	Orc Warrior	1023,60,5000
-gef_fild03,0,0	monster	Orc Baby	1686,20,5000
+gef_fild03,0,0	monster	Orc Lady	1273,160,5000
+gef_fild03,0,0	monster	Orc Warrior	1023,73,5000
+gef_fild03,0,0	monster	Orc Baby	1686,24,5000
 gef_fild03,0,0,0,0	boss_monster	Orc Hero	1087,1,3600000,600000,1
 gef_fild03,45,350,3,3	monster	Green Plant	1080,1,180000,90000
 gef_fild03,66,300,3,3	monster	Green Plant	1080,1,180000,90000
@@ -89,7 +90,7 @@ gef_fild04,152,82,5,2	monster	Green Plant	1080,3,360000,180000
 //==================================================
 // gef_fild05 - Geffen Field
 //==================================================
-gef_fild05,0,0	monster	Creamy	1018,140,5000
+gef_fild05,0,0	monster	Creamy	1018,143,5000
 gef_fild05,0,0	monster	Stainer	1174,20,5000
 gef_fild05,0,0	monster	Smokie	1056,20,5000
 gef_fild05,0,0	monster	Thief Bug Egg	1048,10,5000
@@ -113,15 +114,15 @@ gef_fild05,130,293	monster	Red Plant	1078,1,180000,90000
 //==================================================
 // gef_fild06 - Geffen Field
 //==================================================
-gef_fild06,0,0	monster	Petite	1155,130,5000
-gef_fild06,0,0	monster	Mantis	1139,30,5000
-gef_fild06,0,0	monster	Side Winder	1037,30,5000
+gef_fild06,0,0	monster	Petite	1155,158,5000
+gef_fild06,0,0	monster	Mantis	1139,36,5000
+gef_fild06,0,0	monster	Side Winder	1037,36,5000
 gef_fild06,0,0	monster	Shining Plant	1083,4,1800000,900000
 
 //==================================================
 // gef_fild07 - Geffen Field
 //==================================================
-gef_fild07,0,0	monster	Pupa	1008,130,5000
+gef_fild07,0,0	monster	Pupa	1008,134,5000
 gef_fild07,0,0	monster	Poring	1002,20,5000
 gef_fild07,0,0	monster	Fabre	1007,20,5000
 gef_fild07,0,0	monster	Chonchon	1011,20,5000
@@ -133,9 +134,9 @@ gef_fild07,269,289,3,3	monster	Green Plant	1080,3,360000,180000
 //==================================================
 // gef_fild08 - Geffen Field
 //==================================================
-gef_fild08,0,0	monster	Petite	1156,130,5000
-gef_fild08,0,0	monster	Mantis	1139,30,5000
-gef_fild08,0,0	monster	Flora	1118,30,5000
+gef_fild08,0,0	monster	Petite	1156,163,5000
+gef_fild08,0,0	monster	Mantis	1139,37,5000
+gef_fild08,0,0	monster	Flora	1118,37,5000
 gef_fild08,65,341	monster	Blue Plant	1079,1,900000,450000
 gef_fild08,111,319	monster	Blue Plant	1079,1,900000,450000
 gef_fild08,59,91	monster	Blue Plant	1079,1,900000,450000
@@ -148,8 +149,8 @@ gef_fild08,162,247	monster	Blue Plant	1079,1,900000,450000
 //==================================================
 // gef_fild09 - Geffen Field
 //==================================================
-gef_fild09,0,0	monster	Ambernite	1094,80,5000
-gef_fild09,0,0	monster	Roda Frog	1012,20,5000
+gef_fild09,0,0	monster	Roda Frog	1012,24,5000
+gef_fild09,0,0	monster	Coco	1104,98,5000
 gef_fild09,51,43	monster	Red Mushroom	1085,1,180000,90000
 gef_fild09,125,53	monster	Red Mushroom	1085,1,180000,90000
 gef_fild09,148,74	monster	Red Mushroom	1085,1,180000,90000
@@ -165,9 +166,9 @@ gef_fild09,277,201,5,5	monster	Blue Plant	1079,3,900000,450000
 //==================================================
 // gef_fild10 - Geffen Field
 //==================================================
-gef_fild10,0,0	monster	Orc Warrior	1023,130,5000
-gef_fild10,0,0	monster	Orc Lady	1273,40,5000
-gef_fild10,0,0	monster	Orc Baby	1686,20,5000
+gef_fild10,0,0	monster	Orc Warrior	1023,179,5000
+gef_fild10,0,0	monster	Orc Lady	1273,55,5000
+gef_fild10,0,0	monster	Orc Baby	1686,27,5000
 gef_fild10,0,0,0,0	boss_monster	Orc Lord	1190,1,7200000,600000,0
 gef_fild10,46,350,5,5	monster	Blue Plant	1079,3,900000,450000
 gef_fild10,287,61,5,5	monster	Blue Plant	1079,3,900000,450000
@@ -176,18 +177,11 @@ gef_fild10,300,253,5,5	monster	Green Plant	1080,3,360000,180000
 //==================================================
 // gef_fild11 - Geffen Field
 //==================================================
-gef_fild11,0,0	monster	Goblin	1122,50,5000
-gef_fild11,0,0	monster	Goblin	1123,50,5000
-gef_fild11,0,0	monster	Goblin	1124,50,5000
-gef_fild11,0,0	monster	Goblin	1125,50,5000
+gef_fild11,0,0	monster	Goblin	1122,58,5000
+gef_fild11,0,0	monster	Goblin	1123,58,5000
+gef_fild11,0,0	monster	Goblin	1124,58,5000
+gef_fild11,0,0	monster	Goblin	1125,58,5000
 gef_fild11,0,0	monster	Goblin Leader	1299,1,1800000,1200000
-gef_fild11,101,277,4,1	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,176,288,1,4	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,253,357,1,4	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,247,249,1,4	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,257,209,1,4	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,174,240,1,3	monster	Black Mushroom	1084,3,360000,180000
-gef_fild11,283,100,4,1	monster	Black Mushroom	1084,3,360000,180000
 
 //==================================================
 // gef_fild12 - Disabled on Renewal

npc/re/mobs/fields/gonryun.txt

@@ -3,19 +3,20 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns [Playtester]
 //= 1.2 Updated to Renewal Spawns [Kisuka]
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // gon_fild01 - Kunlun Field
 //==================================================
-gon_fild01,0,0	monster	Dumpling Child	1409,55,5000
-gon_fild01,0,0	monster	Baby Leopard	1415,40,5000
-gon_fild01,0,0	monster	Side Winder	1037,10,5000
+gon_fild01,0,0	monster	Dumpling Child	1409,70,5000
+gon_fild01,0,0	monster	Baby Leopard	1415,51,5000
+gon_fild01,0,0	monster	Side Winder	1037,12,5000
 gon_fild01,0,0	monster	Green Plant	1080,5,5000
 gon_fild01,0,0	monster	Shining Plant	1083,1,5000

npc/re/mobs/fields/hugel.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -18,23 +18,24 @@
 //= 1.2 Some 11.1 spawn updates [Playtester]
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Updated to Renewal Spawns [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // hu_fild01 - Thanatos Tower
 //==================================================
-hu_fild01,0,0	monster	Novus	1715,100,5000
-hu_fild01,0,0	monster	Novus	1718,35,5000
+hu_fild01,0,0	monster	Novus	1715,105,5000
+hu_fild01,0,0	monster	Novus	1718,36,5000
 hu_fild01,0,0	monster	Geographer	1368,10,5000
 hu_fild01,0,0	monster	Dragon Egg	1721,10,5000
 
 //==================================================
 // hu_fild02 - Hugel Field
 //==================================================
-hu_fild02,0,0	monster	Novus	1715,100,5000
-hu_fild02,0,0	monster	Novus	1718,30,5000
-hu_fild02,0,0	monster	Geographer	1368,30,5000
-hu_fild02,0,0	monster	Dragon Egg	1721,20,5000
+hu_fild02,0,0	monster	Novus	1715,126,5000
+hu_fild02,0,0	monster	Novus	1718,37,5000
+hu_fild02,0,0	monster	Geographer	1368,37,5000
+hu_fild02,0,0	monster	Dragon Egg	1721,25,5000
 hu_fild02,0,0	monster	Gryphon	1259,3,3600000
 
 //==================================================
@@ -48,7 +49,6 @@ hu_fild04,0,0	monster	Novus	1718,100,5000
 hu_fild04,0,0	monster	Novus	1715,30,5000
 hu_fild04,0,0	monster	Geographer	1368,30,5000
 hu_fild04,0,0	monster	Dragon Egg	1721,20,5000
-hu_fild04,0,0	monster	Green Plant	1080,10
 hu_fild04,0,0	monster	Yellow Plant	1081,10
 hu_fild04,206,210,30,18	monster	Blue Plant	1079,4,120000,600000
 hu_fild04,206,120,10,10	monster	Blue Plant	1079,2,120000,600000
@@ -63,9 +63,9 @@ hu_fild05,0,0	monster	Dragon Egg	1721,20,5000
 //==================================================
 // hu_fild06 - Hugel Field
 //==================================================
-hu_fild06,0,0	monster	Shellfish	1074,50,5000
-hu_fild06,0,0	monster	Crab	1073,20,5000
-hu_fild06,0,0	monster	Aster	1266,20,5000
+hu_fild06,0,0	monster	Shellfish	1074,87,5000
+hu_fild06,0,0	monster	Crab	1073,35,5000
+hu_fild06,0,0	monster	Aster	1266,35,5000
 hu_fild06,234,251,14,120	monster	Green Plant	1080,10,600000
 hu_fild06,234,251,14,120	monster	Yellow Plant	1081,10,600000
 

npc/re/mobs/fields/lighthalzen.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib, rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -15,14 +15,15 @@
 //= 1.4 Fully updated X.4 spawns [Playtester]
 //= 1.5 More accurate spawns [Playtester]
 //= 1.6 Updated to Renewal Spawns [Kisuka]
+//= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // lhz_fild01 - Lighthalzen Field
 //==================================================
-lhz_fild01,0,0	monster	Rafflesia	1162,130,5000
-lhz_fild01,0,0	monster	Stem Worm	1215,35,5000
-lhz_fild01,0,0	monster	Metaling	1613,35,5000
+lhz_fild01,0,0	monster	Rafflesia	1162,170,5000
+lhz_fild01,0,0	monster	Stem Worm	1215,45,5000
+lhz_fild01,0,0	monster	Metaling	1613,45,5000
 lhz_fild01,0,0	monster	Red Plant	1078,10,60000,30000
 lhz_fild01,0,0	monster	Yellow Plant	1081,10,60000,30000
 lhz_fild01,0,0	monster	Green Plant	1080,10,60000,30000

npc/re/mobs/fields/louyang.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Evera/Lorri
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,13 +11,13 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Updated to Renewal Spawns [Kisuka]
 //= 1.4 Renewal spawn update.
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // lou_fild01 - Luoyang Field
 //==================================================
-lou_fild01,0,0	monster	Mi Gao	1516,40,5000
-lou_fild01,0,0	monster	Mantis	1139,19,5000
-lou_fild01,0,0	monster	Geographer	1368,19,5000
-lou_fild01,0,0	monster	Black Mushroom	1084,5,5000
+lou_fild01,0,0	monster	Mi Gao	1516,60,5000
+lou_fild01,0,0	monster	Mantis	1139,28,5000
+lou_fild01,0,0	monster	Geographer	1368,28,5000
 lou_fild01,0,0	monster	Yellow Plant	1081,10,10000

npc/re/mobs/fields/lutie.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -11,12 +11,13 @@
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.4 Updated to Renewal Spawns [Kisuka]
+//= 1.5 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // xmas_fild01 - Lutie Field
 //==================================================
-xmas_fild01,0,0	monster	Marin	1242,35,5000
-xmas_fild01,0,0	monster	Sasquatch	1243,5,5000
+xmas_fild01,0,0	monster	Marin	1242,65,5000
+xmas_fild01,0,0	monster	Sasquatch	1243,9,5000
 xmas_fild01,0,0	monster	Garm Baby	1515,1,5000
 xmas_fild01,0,0,0,0	boss_monster	Garm	1252,1,7200000,600000,1

npc/re/mobs/fields/malaya.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -12,20 +12,21 @@
 //= 1.0 First Release
 //= 1.1 Renewal spawn update.
 //= 1.2 Updated spawns.
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // ma_fild01 - Barrio Maligawa
 //==================================================
-ma_fild01,0,0	monster	Tikbalang	2313,50,5000
-ma_fild01,0,0	monster	Tiyanak	2314,50,5000
-ma_fild01,0,0	monster	Jejeling	2316,30,5000
+ma_fild01,0,0	monster	Tikbalang	2313,67,5000
+ma_fild01,0,0	monster	Tiyanak	2314,67,5000
+ma_fild01,0,0	monster	Jejeling	2316,40,5000
 
 //==================================================
 // ma_fild02 - Malaya Forest
 //==================================================
-ma_fild02,0,0	monster	Bungisngis	2309,40,5000
-ma_fild02,0,0	monster	Engkanto	2310,25,5000
-ma_fild02,0,0	monster	Mangkukulam	2312,30,5000
-ma_fild02,0,0	monster	Jejeling	2316,20,5000
-ma_fild02,0,0	monster	Wakwak	2315,25,5000
+ma_fild02,0,0	monster	Bungisngis	2309,54,5000
+ma_fild02,0,0	monster	Engkanto	2310,34,5000
+ma_fild02,0,0	monster	Mangkukulam	2312,41,5000
+ma_fild02,0,0	monster	Jejeling	2316,27,5000
+ma_fild02,0,0	monster	Wakwak	2315,34,5000

npc/re/mobs/fields/manuk.txt

@@ -3,34 +3,35 @@
 //===== By: ==================================================
 //= alexx, MaC
 //===== Current Version: =====================================
-//= 1.1a
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Official spawn ammounts from Aegis script [alexx]
 //= 1.1 Added 13.2 mob spawn update [scriptor]
 //= 1.1a Corrected fild2 mobs spawning on fild1. (bugreport:4248)
+//= 1.2 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // man_fild01 - Manuk Field
 //==================================================
-man_fild01,0,0	monster	Nepenthes	1988,105,5000
-man_fild01,0,0	monster	Centipede Larva	1999,30,5000
-man_fild01,0,0	monster	Hillslion	1989,10,5000
+man_fild01,0,0	monster	Nepenthes	1988,148,5000
+man_fild01,0,0	monster	Centipede Larva	1999,42,5000
+man_fild01,0,0	monster	Hillslion	1989,14,5000
 man_fild01,0,0	monster	Centipede	1987,2,5000
 
 //==================================================
 // man_fild02 - Manuk Field
 //==================================================
-man_fild02,0,0	monster	Bradium Golem	2024,50,5000
-man_fild02,0,0	monster	Centipede	1987,35,5000
-man_fild02,0,0	monster	Tatacho	1986,25,5000
+man_fild02,0,0	monster	Bradium Golem	2024,75,5000
+man_fild02,0,0	monster	Centipede	1987,52,5000
+man_fild02,0,0	monster	Tatacho	1986,37,5000
 
 //==================================================
 // man_fild03 - Manuk Field
 //==================================================
-man_fild03,0,0	monster	Hillslion	1989,25,5000
-man_fild03,0,0	monster	Tatacho	1986,25,5000
-man_fild03,0,0	monster	Centipede	1987,25,5000
+man_fild03,0,0	monster	Hillslion	1989,33,5000
+man_fild03,0,0	monster	Tatacho	1986,33,5000
+man_fild03,0,0	monster	Centipede	1987,33,5000
 man_fild03,0,0	monster	Hardrock Mammoth	1990,1,14400000

npc/re/mobs/fields/mjolnir.txt

@@ -3,21 +3,22 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.2 Official kRO 10.1 spawns [Playtester]
 //= 1.3 Updated to renewal spawns. [L0ne_W0lf]
+//= 1.4 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // mjolnir_01 - Mt.Mjolnir
 //==================================================
-mjolnir_01,0,0	monster	Caramel	1103,140,5000
-mjolnir_01,0,0	monster	Stainer	1174,20,5000
-mjolnir_01,0,0	monster	Creamy	1018,20,5000
-mjolnir_01,0,0	monster	Bigfoot	1060,20,5000
+mjolnir_01,0,0	monster	Caramel	1103,167,5000
+mjolnir_01,0,0	monster	Stainer	1174,23,5000
+mjolnir_01,0,0	monster	Creamy	1018,23,5000
+mjolnir_01,0,0	monster	Bigfoot	1060,23,5000
 mjolnir_01,75,85,25,25	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_01,78,219,25,25	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_01,75,85,25,25	monster	Green Plant	1080,5,180000,90000
@@ -27,10 +28,10 @@ mjolnir_01,311,271,25,25	monster	Blue Plant	1079,5,360000,180000
 //==================================================
 // mjolnir_02 - Mt.Mjolnir
 //==================================================
-mjolnir_02,0,0	monster	Horn	1128,140,5000
-mjolnir_02,0,0	monster	Poporing	1031,20,5000
-mjolnir_02,0,0	monster	Elder Willow	1033,20,5000
-mjolnir_02,0,0	monster	Yoyo	1057,20,5000
+mjolnir_02,0,0	monster	Horn	1128,33,5000
+mjolnir_02,0,0	monster	Poporing	1031,22,5000
+mjolnir_02,0,0	monster	Elder Willow	1033,154,5000
+mjolnir_02,0,0	monster	Yoyo	1057,22,5000
 mjolnir_02,86,270	monster	Green Plant	1080,1,180000,90000
 mjolnir_02,80,211	monster	Green Plant	1080,1,180000,90000
 mjolnir_02,86,270	monster	Green Plant	1080,1,180000,90000
@@ -69,9 +70,9 @@ mjolnir_02,188,192,10,10	monster	Blue Plant	1079,2,360000,180000
 //==================================================
 // mjolnir_03 - Mt.Mjolnir
 //==================================================
-mjolnir_03,0,0	monster	Side Winder	1037,130,5000
-mjolnir_03,0,0	monster	Driller	1380,35,5000
-mjolnir_03,0,0	monster	Mantis	1139,35,5000
+mjolnir_03,0,0	monster	Side Winder	1037,140,5000
+mjolnir_03,0,0	monster	Driller	1380,37,5000
+mjolnir_03,0,0	monster	Mantis	1139,37,5000
 mjolnir_03,211,216,10,10	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_03,280,252,10,10	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_03,135,94	monster	Green Plant	1080,1,180000,90000
@@ -91,9 +92,9 @@ mjolnir_03,91,161	monster	Green Plant	1080,1,180000,90000
 //==================================================
 // mjolnir_04 - Mt.Mjolnir
 //==================================================
-mjolnir_04,0,0	monster	Driller	1380,130,5000
-mjolnir_04,0,0	monster	Mantis	1139,35,5000
-mjolnir_04,0,0	monster	Side Winder	1037,35,5000
+mjolnir_04,0,0	monster	Driller	1380,162,5000
+mjolnir_04,0,0	monster	Mantis	1139,43,5000
+mjolnir_04,0,0	monster	Side Winder	1037,43,5000
 mjolnir_04,0,0,0,0	boss_monster	Mistress	1059,1,7200000,600000,1
 mjolnir_04,200,200,30,30	monster	Shining Plant	1083,3,1800000,900000
 mjolnir_04,177,34	monster	Green Plant	1080,1,180000,90000
@@ -117,9 +118,9 @@ mjolnir_04,205,33	monster	Green Plant	1080,1,180000,90000
 //==================================================
 // mjolnir_05 - Mt.Mjolnir
 //==================================================
-mjolnir_05,0,0	monster	Argiope	1099,130,5000
-mjolnir_05,0,0	monster	Mantis	1139,35,5000
-mjolnir_05,0,0	monster	Driller	1380,35,5000
+mjolnir_05,0,0	monster	Argiope	1099,166,5000
+mjolnir_05,0,0	monster	Mantis	1139,44,5000
+mjolnir_05,0,0	monster	Driller	1380,44,5000
 mjolnir_05,200,240,40,40	monster	Blue Plant	1079,3,360000,180000
 mjolnir_05,200,240,40,40	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_05,134,103,20,20	monster	Blue Plant	1079,3,360000,180000
@@ -129,9 +130,9 @@ mjolnir_05,0,0	monster	Red Plant	1078,10,180000,90000
 //==================================================
 // mjolnir_06 - Mt.Mjolnir
 //==================================================
-mjolnir_06,0,0	monster	Poison Spore	1077,140,5000
+mjolnir_06,0,0	monster	Poison Spore	1077,100,5000
 mjolnir_06,0,0	monster	Creamy	1018,30,5000
-mjolnir_06,0,0	monster	Smokie	1056,30,5000
+mjolnir_06,0,0	monster	Smokie	1056,70,5000
 mjolnir_06,162,285	monster	Blue Plant	1079,1,360000,180000
 mjolnir_06,162,255	monster	Blue Plant	1079,1,360000,180000
 mjolnir_06,304,98	monster	Red Mushroom	1085,1,180000,90000
@@ -146,9 +147,9 @@ mjolnir_06,55,276	monster	Red Mushroom	1085,1,180000,90000
 //==================================================
 // mjolnir_07 - Mt.Mjolnir
 //==================================================
-mjolnir_07,0,0	monster	Savage	1166,140,5000
-mjolnir_07,0,0	monster	Beetle King	1494,30,5000
-mjolnir_07,0,0	monster	Flora	1118,30,5000
+mjolnir_07,0,0	monster	Savage	1166,161,5000
+mjolnir_07,0,0	monster	Beetle King	1494,34,5000
+mjolnir_07,0,0	monster	Flora	1118,34,5000
 mjolnir_07,314,133	monster	Green Plant	1080,1,180000,90000
 mjolnir_07,299,145	monster	Green Plant	1080,1,180000,90000
 mjolnir_07,272,152	monster	Green Plant	1080,1,180000,90000
@@ -163,9 +164,9 @@ mjolnir_07,249,214	monster	Blue Plant	1079,2,360000,180000
 //==================================================
 // mjolnir_08 - Mt.Mjolnir 
 //==================================================
-mjolnir_08,0,0	monster	Beetle King	1494,140,5000
-mjolnir_08,0,0	monster	Savage	1166,30,5000
-mjolnir_08,0,0	monster	Flora	1118,30,5000
+mjolnir_08,0,0	monster	Beetle King	1494,169,5000
+mjolnir_08,0,0	monster	Savage	1166,36,5000
+mjolnir_08,0,0	monster	Flora	1118,36,5000
 mjolnir_08,280,280,20,40	monster	Blue Plant	1079,2,360000,180000
 mjolnir_08,207,83	monster	Green Plant	1080,1,180000,90000
 mjolnir_08,176,153	monster	Green Plant	1080,1,180000,90000
@@ -177,9 +178,9 @@ mjolnir_08,149,328	monster	Green Plant	1080,1,180000,90000
 //==================================================
 // mjolnir_09 - Mt.Mjolnir
 //==================================================
-mjolnir_09,0,0	monster	Savage Babe	1167,140,5000
-mjolnir_09,0,0	monster	Willow	1010,30,5000
-mjolnir_09,0,0	monster	Hornet	1004,30,5000
+mjolnir_09,0,0	monster	Savage Babe	1167,159,5000
+mjolnir_09,0,0	monster	Willow	1010,34,5000
+mjolnir_09,0,0	monster	Hornet	1004,34,5000
 mjolnir_09,205,352	monster	Red Mushroom	1085,1,180000,90000
 mjolnir_09,199,344	monster	Red Mushroom	1085,1,180000,90000
 mjolnir_09,210,331	monster	Red Mushroom	1085,1,180000,90000
@@ -195,18 +196,18 @@ mjolnir_09,125,82	monster	Red Mushroom	1085,1,180000,90000
 //==================================================
 // mjolnir_10 - Mt.Mjolnir
 //==================================================
-mjolnir_10,0,0	monster	Argos	1100,140,5000
-mjolnir_10,0,0	monster	Beetle King	1494,30,5000
-mjolnir_10,0,0	monster	Flora	1118,30,5000
+mjolnir_10,0,0	monster	Argos	1100,194,5000
+mjolnir_10,0,0	monster	Beetle King	1494,41,5000
+mjolnir_10,0,0	monster	Flora	1118,41,5000
 mjolnir_10,123,331,10,10	monster	Shining Plant	1083,1,1800000,900000
 mjolnir_10,0,0	monster	Green Plant	1080,10,180000,90000
 
 //==================================================
 // mjolnir_11 - Mt.Mjolnir 
 //==================================================
-mjolnir_11,0,0	monster	Argiope	1099,130,5000
-mjolnir_11,0,0	monster	Argos	1100,35,5000
-mjolnir_11,0,0	monster	Flora	1118,35,5000
+mjolnir_11,0,0	monster	Argiope	1099,170,5000
+mjolnir_11,0,0	monster	Argos	1100,45,5000
+mjolnir_11,0,0	monster	Flora	1118,45,5000
 mjolnir_11,112,276	monster	Green Plant	1080,1,180000,90000
 mjolnir_11,159,283	monster	Green Plant	1080,1,180000,90000
 mjolnir_11,116,240	monster	Green Plant	1080,1,180000,90000
@@ -224,6 +225,6 @@ mjolnir_11,295,271	monster	Green Plant	1080,1,180000,90000
 //==================================================
 // mjolnir_12 - Mt.Mjolnir 
 //==================================================
-mjolnir_12,0,0	monster	Dustiness	1114,130,5000
-mjolnir_12,0,0	monster	Hunter Fly	1035,35,5000
-mjolnir_12,0,0	monster	Mantis	1139,35,5000
+mjolnir_12,0,0	monster	Dustiness	1114,162,5000
+mjolnir_12,0,0	monster	Hunter Fly	1035,43,5000
+mjolnir_12,0,0	monster	Mantis	1139,43,5000

npc/re/mobs/fields/morocc.txt

@@ -16,22 +16,23 @@
 //=     Added 30s spawn time for all Morocc Shadows.
 //= 1.7 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.8 Updated to renewal spawns. [L0ne_W0lf]
+//= 1.9 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // moc_fild01 - Sograt Desert 
 //==================================================
-moc_fild01,0,0	monster	Peco Peco	1019,130,5000
-moc_fild01,0,0	monster	Muka	1055,50,5000
-moc_fild01,0,0	monster	Peco Peco Egg	1047,20,5000
+moc_fild01,0,0	monster	Peco Peco	1019,93,5000
+moc_fild01,0,0	monster	Muka	1055,202,5000
+moc_fild01,0,0	monster	Peco Peco Egg	1047,31,5000
 moc_fild01,194,51,10,10	monster	Yellow Plant	1081,10,900000,450000
 
 //==================================================
 // moc_fild02 - Sograt Desert 
 //==================================================
-moc_fild02,0,0	monster	Muka	1055,130,5000
-moc_fild02,0,0	monster	Peco Peco	1019,60,5000
-moc_fild02,0,0	monster	Peco Peco Egg	1047,10,5000
+moc_fild02,0,0	monster	Muka	1055,58,5000
+moc_fild02,0,0	monster	Peco Peco	1019,153,5000
+moc_fild02,0,0	monster	Peco Peco Egg	1047,11,5000
 moc_fild02,89,315	monster	Yellow Plant	1081,1,180000,90000
 moc_fild02,99,261	monster	Yellow Plant	1081,1,180000,90000
 moc_fild02,94,195	monster	Yellow Plant	1081,1,180000,90000
@@ -50,9 +51,9 @@ moc_fild02,337,35	monster	Green Plant	1080,1,180000,90000
 //==================================================
 // moc_fild03 - Sograt Desert 
 //==================================================
-moc_fild03,0,0	monster	Wolf	1013,140,5000
-moc_fild03,0,0	monster	Argos	1100,20,5000
-moc_fild03,0,0	monster	Steel Chonchon	1042,20,5000
+moc_fild03,0,0	monster	Wolf	1013,164,5000
+moc_fild03,0,0	monster	Argos	1100,23,5000
+moc_fild03,0,0	monster	Steel Chonchon	1042,23,5000
 moc_fild03,77,311,5,5	monster	Green Plant	1080,2,180000,90000
 moc_fild03,108,199,5,5	monster	Green Plant	1080,2,180000,90000
 moc_fild03,96,65,5,5	monster	Green Plant	1080,2,180000,90000
@@ -76,11 +77,11 @@ moc_fild03,200,263,5,5	monster	Green Plant	1080,2,180000,90000
 //==================================================
 // moc_fild07 - Sograt Desert 
 //==================================================
-moc_fild07,0,0	monster	Drops	1113,140,5000
-moc_fild07,0,0	monster	Chonchon	1011,30,5000
-moc_fild07,0,0	monster	Picky	1050,15,5000
-moc_fild07,0,0	monster	Peco Peco Egg	1047,10,5000
-moc_fild07,0,0	monster	Picky	1049,10,5000
+moc_fild07,0,0	monster	Drops	1113,214,5000
+moc_fild07,0,0	monster	Chonchon	1011,46,5000
+moc_fild07,0,0	monster	Picky	1050,23,5000
+moc_fild07,0,0	monster	Peco Peco Egg	1047,15,5000
+moc_fild07,0,0	monster	Picky	1049,15,5000
 moc_fild07,162,333,12,12	monster	Yellow Plant	1081,5,360000,180000
 
 //==================================================
@@ -98,18 +99,18 @@ moc_fild07,162,333,12,12	monster	Yellow Plant	1081,5,360000,180000
 //==================================================
 // moc_fild11 - Sograt Desert
 //==================================================
-moc_fild11,0,0	monster	Baby Desert Wolf	1107,140,5000
-moc_fild11,0,0	monster	Condor	1009,30,5000
-moc_fild11,0,0	monster	Scorpion	1001,30,5000
+moc_fild11,0,0	monster	Baby Desert Wolf	1107,137,5000
+moc_fild11,0,0	monster	Condor	1009,137,5000
+moc_fild11,0,0	monster	Scorpion	1001,41,5000
 
 //==================================================
 // moc_fild12 - Sograt Desert 
 //==================================================
-moc_fild12,0,0	monster	Picky	1049,50,5000
-moc_fild12,0,0	monster	Picky	1050,50,5000
-moc_fild12,0,0	monster	Peco Peco Egg	1047,35,5000
-moc_fild12,0,0	monster	Drops	1113,30,5000
-moc_fild12,0,0	monster	Condor	1009,30,5000
+moc_fild12,0,0	monster	Picky	1049,65,5000
+moc_fild12,0,0	monster	Picky	1050,65,5000
+moc_fild12,0,0	monster	Peco Peco Egg	1047,45,5000
+moc_fild12,0,0	monster	Drops	1113,39,5000
+moc_fild12,0,0	monster	Condor	1009,39,5000
 moc_fild12,181,336,40,20	monster	Yellow Plant	1081,10,180000,90000
 
 //==================================================
@@ -161,9 +162,9 @@ moc_fild16,0,0	monster	Frilldora	1119,10,5000
 //==================================================
 // moc_fild17 - Sograt Desert 
 //==================================================
-moc_fild17,0,0	monster	Hode	1127,130,5000
-moc_fild17,0,0	monster	Sandman	1165,30,5000
-moc_fild17,0,0	monster	Frilldora	1119,10,5000
+moc_fild17,0,0	monster	Hode	1127,170,5000
+moc_fild17,0,0	monster	Sandman	1165,39,5000
+moc_fild17,0,0	monster	Frilldora	1119,13,5000
 moc_fild17,0,0,0,0	boss_monster	Phreeoni	1159,1,7200000,600000,1
 moc_fild17,40,258	monster	Yellow Plant	1081,1,180000,90000
 moc_fild17,144,151	monster	Yellow Plant	1081,1,180000,90000
@@ -176,9 +177,9 @@ moc_fild17,359,258	monster	Yellow Plant	1081,1,180000,90000
 //==================================================
 // moc_fild18 - Sograt Desert
 //==================================================
-moc_fild18,0,0	monster	Scorpion	1001,140,5000
-moc_fild18,0,0	monster	Condor	1009,30,5000
-moc_fild18,0,0	monster	Baby Desert Wolf	1107,30,5000
+moc_fild18,0,0	monster	Scorpion	1001,160,5000
+moc_fild18,0,0	monster	Condor	1009,34,5000
+moc_fild18,0,0	monster	Baby Desert Wolf	1107,34,5000
 moc_fild18,0,0	monster	Dragon Fly	1091,1,3600000,1800000
 moc_fild18,143,352	monster	Yellow Plant	1081,1,180000,90000
 moc_fild18,72,333	monster	Yellow Plant	1081,1,180000,90000
@@ -204,16 +205,16 @@ moc_fild20,0,0	monster	Incarnation of Morocc	1921,1,30000
 //==================================================
 // moc_fild21 - Dimensional Gorge 
 //==================================================
-moc_fild21,0,0	monster	Incarnation of Morocc	1918,46,30000
-moc_fild21,0,0	monster	Incarnation of Morocc	1919,46,30000
-moc_fild21,0,0	monster	Incarnation of Morocc	1920,46,30000
-moc_fild21,0,0	monster	Incarnation of Morocc	1921,34,30000
+moc_fild21,0,0	monster	Incarnation of Morocc	1918,79,30000
+moc_fild21,0,0	monster	Incarnation of Morocc	1919,79,30000
+moc_fild21,0,0	monster	Incarnation of Morocc	1920,79,30000
+moc_fild21,0,0	monster	Incarnation of Morocc	1921,58,30000
 
 //==================================================
 // moc_fild22 - Dimensional Gorge 
 //==================================================
-moc_fild22,0,0	monster	Incarnation of Morocc	1918,60,30000
-moc_fild22,0,0	monster	Incarnation of Morocc	1919,60,30000
-moc_fild22,0,0	monster	Incarnation of Morocc	1920,60,30000
-moc_fild22,0,0	monster	Incarnation of Morocc	1921,25,10000
+moc_fild22,0,0	monster	Incarnation of Morocc	1918,73,30000
+moc_fild22,0,0	monster	Incarnation of Morocc	1919,73,30000
+moc_fild22,0,0	monster	Incarnation of Morocc	1920,73,30000
+moc_fild22,0,0	monster	Incarnation of Morocc	1921,50,10000
 moc_fild22,0,0,0,0	boss_monster	Wounded Morocc	1917,1,43200000,600000,0

npc/re/mobs/fields/moscovia.txt

@@ -3,21 +3,22 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
 //= 1.1 Updated to Renewal Spawns [Kisuka]
 //= 1.2 Renewal spawn update.
+//= 1.3 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // mosk_fild02 - Okrestnosti of Moscovia
 //==================================================
-mosk_fild02,0,0	monster	Side Winder	1037,40,5000
-mosk_fild02,0,0	monster	Argiope	1099,30,5000
-mosk_fild02,0,0	monster	Mantis	1139,10,5000
-mosk_fild02,0,0	monster	Geographer	1368,5,5000
+mosk_fild02,0,0	monster	Side Winder	1037,56,5000
+mosk_fild02,0,0	monster	Argiope	1099,42,5000
+mosk_fild02,0,0	monster	Mantis	1139,14,5000
+mosk_fild02,0,0	monster	Geographer	1368,7,5000
 mosk_fild02,0,0	monster	Yellow Plant	1081,5,10000
 mosk_fild02,0,0	monster	White Plant	1082,5,10000

npc/re/mobs/fields/niflheim.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -14,25 +14,26 @@
 //= 1.5 Implemented the town invasion. [MasterOfMuppets]
 //= 1.6 Official kRO 10.1 spawns [Playtester]
 //= 1.7 Updated to Renewal Spawns [Kisuka]
+//= 1.8 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // niflheim - Niflheim, Realm of the Dead
 //==================================================
-niflheim,0,0	monster	Lude	1509,20,5000
-niflheim,0,0	monster	Quve	1508,20,5000
-niflheim,0,0	monster	Gibbet	1503,10,5000
-niflheim,0,0	monster	Heirozoist	1510,10,5000
-niflheim,0,0	monster	Dullahan	1504,5,5000
+niflheim,0,0	monster	Lude	1509,35,5000
+niflheim,0,0	monster	Quve	1508,35,5000
+niflheim,0,0	monster	Gibbet	1503,17,5000
+niflheim,0,0	monster	Heirozoist	1510,17,5000
+niflheim,0,0	monster	Dullahan	1504,8,5000
 
 //==================================================
 // nif_fild01 - Skellington, a Solitary Village in Niflheim
 //==================================================
-nif_fild01,0,0	monster	Disguise	1506,50,5000
-nif_fild01,0,0	monster	Quve	1508,30,5000
-nif_fild01,0,0	monster	Dullahan	1504,20,5000
-nif_fild01,0,0	monster	Gibbet	1503,10,5000
-nif_fild01,0,0	monster	Heirozoist	1510,10,5000
+nif_fild01,0,0	monster	Disguise	1506,56,5000
+nif_fild01,0,0	monster	Quve	1508,33,5000
+nif_fild01,0,0	monster	Dullahan	1504,22,5000
+nif_fild01,0,0	monster	Gibbet	1503,11,5000
+nif_fild01,0,0	monster	Heirozoist	1510,11,5000
 
 //==================================================
 // nif_fild02 - Vally of Gyoll

npc/re/mobs/fields/payon.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
@@ -12,35 +12,21 @@
 //= 1.3 More accurate spawns [Playtester]
 //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf]
 //= 1.5 Updated to renewal spawns. [L0ne_W0lf]
+//= 1.6 Correct Spawn by Navigation's mob data. [attackjom]
 //============================================================
 
 //==================================================
 // pay_fild01 - Payon Forest
 //==================================================
-pay_fild01,0,0	monster	Willow	1010,140,5000
-pay_fild01,0,0	monster	Poring	1002,30,5000
-pay_fild01,0,0	monster	Fabre	1007,30,5000
-pay_fild01,340,89	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,336,116	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,231,258	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,215,323	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,340,89	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,225,310	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,129,288	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,75,269	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,80,226	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,89,177	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,95,85	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,57,85	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,64,113	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,64,190	monster	Black Mushroom	1084,1,180000,90000
-pay_fild01,70,246	monster	Black Mushroom	1084,1,180000,90000
+pay_fild01,0,0	monster	Willow	1010,181,5000
+pay_fild01,0,0	monster	Poring	1002,38,5000
+pay_fild01,0,0	monster	Fabre	1007,38,5000
 pay_fild01,0,0	monster	Green Plant	1080,5,180000,90000
 
 //==================================================
 // pay_fild02 - Payon Forest 
 //==================================================
-pay_fild02,0,0	monster	Boa	1025,140,5000
+pay_fild02,0,0	monster	Boa	1025,142,5000
 pay_fild02,0,0	monster	Wormtail	1024,30,5000
 pay_fild02,0,0	monster	Spore	1014,30,5000
 pay_fild02,105,256,10,10	monster	Green Plant	1080,4,360000,180000
@@ -59,10 +45,10 @@ pay_fild03,372,64,15,15	monster	Green Plant	1080,4,180000,90000
 //==================================================
 // pay_fild04 - Sograt Desert
 //==================================================
-pay_fild04,0,0	monster	Poporing	1031,130,5000
-pay_fild04,0,0	monster	Marin	1242,30,5000
-pay_fild04,0,0	monster	Drops	1113,20,5000
-pay_fild04,0,0	monster	Poring	1002,15,5000
+pay_fild04,0,0	monster	Poporing	1031,141,5000
+pay_fild04,0,0	monster	Marin	1242,32,5000
+pay_fild04,0,0	monster	Drops	1113,21,5000
+pay_fild04,0,0	monster	Poring	1002,16,5000
 pay_fild04,0,0	monster	Angeling	1096,1,3600000,1800000
 pay_fild04,0,0	monster	Ghostring	1120,1,3600000,1800000
 pay_fild04,0,0	monster	Mastering	1090,1,3600000,1800000
@@ -87,36 +73,36 @@ pay_fild06,268,155,20,20	monster	Shining Plant	1083,1,1800000,900000
 //==================================================
 // pay_fild07 - Payon Forest
 //==================================================
-pay_fild07,0,0	monster	Bigfoot	1060,130,5000
-pay_fild07,0,0	monster	Caramel	1103,30,5000
-pay_fild07,0,0	monster	Stainer	1174,20,5000
-pay_fild07,0,0	monster	Creamy	1018,20,5000
+pay_fild07,0,0	monster	Bigfoot	1060,174,5000
+pay_fild07,0,0	monster	Caramel	1103,40,5000
+pay_fild07,0,0	monster	Stainer	1174,26,5000
+pay_fild07,0,0	monster	Creamy	1018,26,5000
 pay_fild07,171,331,20,20	monster	Green Plant	1080,8,900000,450000
 
 //==================================================
 // pay_fild08 - Payon Forest
 //==================================================
-pay_fild08,0,0	monster	Spore	1014,140,5000
-pay_fild08,0,0	monster	Wormtail	1024,30,5000
-pay_fild08,0,0	monster	Boa	1025,30,5000
+pay_fild08,0,0	monster	Spore	1014,148,5000
+pay_fild08,0,0	monster	Wormtail	1024,31,5000
+pay_fild08,0,0	monster	Boa	1025,31,5000
 pay_fild08,0,0	monster	Green Plant	1080,10,60000,30000
 pay_fild08,143,156,40,40	monster	Shining Plant	1083,1,3600000,1800000
 
 //==================================================
 // pay_fild09 - Payon Forest
 //==================================================
-pay_fild09,0,0	monster	Elder Willow	1033,140,5000
-pay_fild09,0,0	monster	Horn	1128,30,5000
-pay_fild09,0,0	monster	Coco	1104,30,5000
+pay_fild09,0,0	monster	Elder Willow	1033,25,5000
+pay_fild09,0,0	monster	Horn	1128,181,5000
+pay_fild09,0,0	monster	Coco	1104,38,5000
 pay_fild09,198,217,30,30	monster	Green Plant	1080,10,360000,180000
 pay_fild09,198,217,30,30	monster	Shining Plant	1083,1,1800000,900000
 
 //==================================================
 // pay_fild10 - Payon Forest
 //==================================================
-pay_fild10,0,0	monster	Greatest General	1277,100,5000
-pay_fild10,0,0	monster	Beetle King	1494,50,5000
-pay_fild10,0,0	monster	Savage	1166,50,5000
+pay_fild10,0,0	monster	Greatest General	1277,129,5000
+pay_fild10,0,0	monster	Beetle King	1494,64,5000
+pay_fild10,0,0	monster	Savage	1166,64,5000
 pay_fild10,0,0,0,0	boss_monster	Eddga	1115,1,7200000,600000,1
 pay_fild10,213,157,10,10	monster	Green Plant	1080,5,360000,180000
 pay_fild10,281,307,10,10	monster	Green Plant	1080,5,360000,180000