Merge branch 'master' into feature/store_taxes

conf/battle/feature.conf

@@ -67,3 +67,11 @@ feature.roulette: off
 // Achievement (Note 1)
 // Requires: 2015-05-13aRagexe or later
 feature.achievement: on
+
+// Homunculues Autofeeding (Note 1)
+// Requires: 2017-09-20bRagexeRE or later
+feature.homunculus_autofeed: off
+
+// At which rate should homunculus autofeeding trigger?
+// Default: 30
+feature.homunculus_autofeed_rate: 30

conf/battle/player.conf

@@ -75,8 +75,13 @@ max_extended_aspd: 193
 // Maximum walk speed rate (200 would be capped to twice the normal speed)
 max_walk_speed: 300
 
-// Maximum HP. (Default is 1000000)
-max_hp: 1000000
+// Maximum HPs depending on base level. Default values are:
+// Lv 99:  330000
+// Lv150:  660000
+// Lv175: 1100000
+max_hp_lv99: 330000
+max_hp_lv150: 660000
+max_hp: 1100000
 
 // Maximum SP. (Default is 1000000)
 max_sp: 1000000
@@ -261,3 +266,10 @@ fame_pharmacy_10: 50
 // Be mindful that the more options used, the easier it becomes to cheat features that rely on idletime (e.g. checkidle()).
 // Default: walk (0x1) + useskilltoid (0x2) + useskilltopos (0x4) + useitem (0x8) + attack (0x10) = 0x1F
 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

conf/char_athena.conf

@@ -189,6 +189,14 @@ char_del_option: 2
 // 3: Character cannot be deleted as long as he remains in a party or guild(default)
 char_del_restriction: 3
 
+// Restrict certain class from being created. (Only functional on 20151001aRagexe or later)
+// 0: No character creation is allowed
+// 1: Only novice is allowed to be created    (pre-renewal default)
+// 2: Only summoner is allowed to be created
+// 3: Both novice and summoner can be created (renewal default)
+// Uncomment to customize the restriction
+//allowed_job_flag: 3
+
 // What folder the DB files are in (item_db.txt, etc.)
 db_path: db
 

db/re/item_db.txt

@@ -3047,7 +3047,7 @@
 4875,Bear's_Power,Bear's Power,6,20,,10,,,,,,,,,,,,,{ autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \"Bigfoot Power !\"; }"; },{},{}
 4876,Runaway_Magic,Runaway Magic,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bInt,200; bonus2 bSPLossRate,200,1000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_LAMADAN; }"; },{},{ heal 0,-2000; }
 4877,Speed_Of_Light,Speed of Light,6,20,,10,,,,,,,,,,,,,{ /*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }"; },{},{ heal 0,-300; }
-4878,Muscle_Fool,Muscle Fool,6,20,,10,,,,,,,,,,,,,{ autobonus2 "{ bonus bDef,1000; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }"; },{},{ heal 0,-300; }
+4878,Muscle_Fool,Muscle Fool,6,20,,10,,,,,,,,,,,,,{ autobonus2 "{ bonus bVit,200; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }"; },{},{ heal 0,-300; }
 4879,Hawkeye,Hawkeye,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bDex,200; bonus2 bSPLossRate,50,1000; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_BASH3D6; }"; },{},{ heal 0,-300; }
 4880,Lucky_Day,Lucky Day,6,20,,10,,,,,,,,,,,,,{ autobonus "{ bonus bLuk,200; }",10,5000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_DANCE_BLADE_ATK; }"; },{},{ heal 0,-300; }
 4881,Attack_Delay_4,Attack Delay 4,6,10,,,,,,,,,,,,,,,{ bonus bAspdRate,10; },{},{}
@@ -4049,7 +4049,14 @@
 5893,RCC2013_2ND_CROWN,RCC2013 2ND CROWN,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1107,{ bonus bAllStats,4; skill "AL_TELEPORT",1; },{ sc_start SC_SPEEDUP0,-1,25; },{ sc_end SC_SPEEDUP0; }
 5894,RCC2013_3RD_CROWN,RCC2013 3RD CROWN,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1108,{ bonus bAllStats,3; skill "AL_TELEPORT",1; },{ sc_start SC_SPEEDUP0,-1,25; },{ sc_end SC_SPEEDUP0; }
 5895,RCC2013_ANV_Hat,RCC2013 ANV Hat,4,20,,2500,,7,,1,0xFFFFFFFF,63,2,256,,1,0,1109,{ bonus bAllStats,1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2; },{},{}
-5906,Oni_Horns_,Oni Horns,4,0,,20,,10,,1,0x00001000,63,2,256,,100,1,1127,{ bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; } },{},{}
+5900,Divine_Guard_Hat,Divine Guard Hat,4,0,,200,,10,,1,0x00004000,56,2,256,,100,1,1121,{ .@r = getrefine(); bonus2 bSubSize,Size_All,5; if(.@r>=7) { .@level = getskilllv("AL_HEAL"); bonus3 bAutoSpellWhenHit,"AL_HEAL",(.@level ? .@level : 5),10; } if(.@r>=9) { bonus2 bSkillAtk,"LG_RAYOFGENESIS",20; } },{},{}
+5901,Focus_Beret,Focus Beret,4,0,,200,,10,,1,0x00008000,56,2,256,,100,1,1122,{ .@r = getrefine(); bonus4 bAutoSpellOnSkill,"SR_DRAGONCOMBO","SR_FALLENEMPIRE",max(getskilllv("SR_FALLENEMPIRE"),1),100; if(.@r>=7) { autobonus "{ bonus bAspd,2; }",30,5000,0,"{ specialeffect2 EF_ENHANCE; }"; } if(.@r>=9) { bonus2 bSkillAtk,"SR_FALLENEMPIRE",30; } },{},{}
+5902,Harvester_Hat,Harvester Hat,4,0,,200,,10,,1,0x00040000,56,2,256,,100,1,1123,{ .@r = getrefine(); bonus2 bAddMonsterDropItem,6211,100; bonus2 bAddMonsterDropItem,6212,100; if(.@r>=7) { bonus2 bAddMonsterDropItem,6210,50; } if(.@r>=9) { bonus2 bSkillAtk,"GN_CARTCANNON",15; } },{},{}
+5903,Deadman_Bandana,Deadman Bandana,4,0,,200,,15,,1,0x00810204,63,2,256,,99,1,1124,{ .@r = getrefine(); .@rate = 1; bonus bCritical,.@r*2; bonus bFixedCastrate,-2; bonus3 bAutoSpellWhenHit,"SL_SWOO",getskilllv("SL_SWOO"),(.@rate*10); if (.@r>=7) { bonus bMatk,20; .@rate += 3; } if(.@r>=9) { bonus bVariableCastrate,-20; bonus2 bSkillUseSP,"SL_STUN",5; bonus2 bSkillUseSP,"SL_SMA",5; } },{},{}
+5904,Inconspicuous_Hat,Inconspicuous Hat,4,0,,200,,10,,1,0x00020000,56,2,256,,100,1,1125,{ .@r = getrefine(); if (.@r>=9) { .@matk = 5; } bonus bMatkRate,(7+.@matk); if (.@r>=7) { bonus bMatk,(readparam(bInt)/5)*2; } },{},{}
+5905,Lyrica_Hat,Lyrica Hat,4,0,,200,,10,,1,0x00080000,56,2,256,,100,1,1126,{ .@r = getrefine(); bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15; if(.@r>=7) { bonus bFixedCastrate,4*(getskilllv("WM_LESSON")); } if(.@r>=9) { bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",10; } },{},{}
+5906,Oni_Horns_,Oni Horns,4,0,,20,,10,,1,0x00001000,56,2,256,,100,1,1127,{ bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; } },{},{}
+5907,Sea_Captain_Hat,Sea Captain Hat,4,0,,200,,20,,1,0x00000400,56,2,256,,100,1,1128,{ bonus2 bSkillAtk,"NC_AXEBOOMERANG",20; .@dmg = 20; .@r = getrefine(); if (.@r>=7) { .@dmg += getskilllv("BS_WEAPONRESEARCH"); } if (.@r>=9) { .@dmg += getskilllv("NC_TRAININGAXE"); } bonus2 bSkillAtk,"NC_AXETORNADO",.@dmg; },{},{}
 5914,Earmuff_Flowerform,C Flutter Butterfly,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1378,{ hateffect HAT_EF_FLUTTER_BUTTERFLY,true; },{},{ hateffect HAT_EF_FLUTTER_BUTTERFLY,false; }
 5917,Yellow_Scarf,Yellow Scarf,4,0,,100,,,,0,0xFFFFFFFF,63,2,1,,90,0,1170,{ bonus bLongAtkDef,3; },{},{}
 5918,Gambler_Seal,Gambler Seal,4,0,,500,,,,0,0xFFFFFFFF,63,2,512,,,0,1202,{ bonus bCritical,3; bonus bCritAtkRate,3; bonus2 bSubSkill,"RA_ARROWSTORM",10; bonus2 bSubSkill,"SR_GATEOFHELL",10; .@dex = readparam(bDex); .@luk = readparam(bLuk); bonus bCritAtkRate,-(.@dex/10)*2; bonus bCritical,.@luk/10; bonus bBaseAtk,(.@luk/10)*2; bonus bMatk,(.@luk/10)*2; if (.@luk > 120) { bonus bCritical,10; bonus bCritAtkRate,10; bonus2 bSubSkill,"RA_ARROWSTORM",30; bonus2 bSubSkill,"SR_GATEOFHELL",30; } else if (.@luk > 108) { bonus bCritical,5; bonus bCritAtkRate,10; } },{},{}
@@ -8536,12 +8543,12 @@
 14612,M_Mdef_Potion,M Mdef Potion,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,120000,3; },{},{}
 14613,RWC_Scroll_2012,RWC Scroll 2012,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_RWC_Scroll_2012); },{},{}
 14614,Ex_Def_Potion,Ex Def Potion,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,1800000,3; sc_start SC_MDEF_RATE,1800000,3; },{},{}
-14616,STR_Biscuit_Stick,Bar Cookie Of Strength,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_STRFOOD,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111); },{},{}
-14617,VIT_Biscuit_Stick,Bar Cookie Of Vitality,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_VITFOOD,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1; },{},{}
-14618,AGI_Biscuit_Stick,Bar Cookie Of Agility,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_AGIFOOD,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33); },{},{}
-14619,INT_Biscuit_Stick,Bar Cookie Of Intelligence,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INTFOOD,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111); },{},{}
-14620,DEX_Biscuit_Stick,Bar Cookie Of Dexterity,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DEXFOOD,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33); },{},{}
-14621,LUK_Biscuit_Stick,Bar Cookie Of Lucky,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_LUKFOOD,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33); },{},{}
+14616,STR_Biscuit_Stick,Bar Cookie Of Strength,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_STR_CASH,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111); },{},{}
+14617,VIT_Biscuit_Stick,Bar Cookie Of Vitality,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_VIT_CASH,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1; },{},{}
+14618,AGI_Biscuit_Stick,Bar Cookie Of Agility,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_AGI_CASH,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33); },{},{}
+14619,INT_Biscuit_Stick,Bar Cookie Of Intelligence,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_INT_CASH,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111); },{},{}
+14620,DEX_Biscuit_Stick,Bar Cookie Of Dexterity,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_DEX_CASH,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33); },{},{}
+14621,LUK_Biscuit_Stick,Bar Cookie Of Lucky,18,1,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_FOOD_LUK_CASH,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33); },{},{}
 14623,Golden_Treasure_Box_,Golden Treasure Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*getitem callfunc("F_Rand",Devilring card, Angeling card, 11 weapons smelting ticket, armor smelting 11 ticket , horns of the buffalo, ring of recovery, pink bunny costume hair band)*/ },{},{}
 14624,Blue_Scroll,Blue Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Blue_Scroll); },{},{}
 14626,Indigo_Scroll,Indigo Scroll,2,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Indigo_Scroll); },{},{}
@@ -10884,13 +10891,13 @@
 //===================================================================
 // New Shoes
 //===================================================================
-22000,Temporal_Str_Boots,Temporal Boots Of Strength,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22000,Temporal_Str_Boots,Temporal Boots Of Strength,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bAtk,50; },{},{}
 22001,Temporal_Int_Boots,Temporal Boots Of Intelligence,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}
 22002,Temporal_Agi_Boots,Temporal Boots Of Agility,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1; },{},{}
 22003,Temporal_Vit_Boots,Temporal Boots Of Vitality,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
 22004,Temporal_Dex_Boots,Temporal Boots Of Dexterity,4,20,,600,,25,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
 22005,Temporal_Luk_Boots,Temporal Boots Of Luck,4,20,,600,,20,,0,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30; },{},{}
-22006,Temporal_Str_Boots_,Temporal Boots Of Strength,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50; },{},{}
+22006,Temporal_Str_Boots_,Temporal Boots Of Strength,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bAtk,50; },{},{}
 22007,Temporal_Vit_Boots_,Temporal Boots Of Vitality,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8; },{},{}
 22008,Temporal_Dex_Boots_,Temporal Boots Of Dexterity,4,20,,600,,25,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; } },{},{}
 22009,Temporal_Int_Boots_,Temporal Boots Of Intelligence,4,20,,600,,20,,1,0xFFFFFFFF,56,2,64,,99,1,,{ .@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60; },{},{}

db/re/item_trade.txt

@@ -508,6 +508,14 @@
 5823,467,100	// Love_Arrow
 5855,499,100	// Fishing_Rod
 5864,475,100	// Shadow_Booster
+5900,467,100	// Divine Guard Hat
+5901,467,100	// Focus Beret
+5902,467,100	// Harvester Hat
+5903,467,100	// Deadman Bandana
+5904,467,100	// Inconspicuous Hat
+5905,467,100	// Lyrica Hat
+5906,467,100	// Oni Horns
+5907,467,100	// Sea Captain Hat
 6000,475,100	// Dark_Ashes
 6005,467,100	// New_Year_Rice_Cake
 6006,499,100	// Rice_Cake_Delivery_Box

doc/script_commands.txt

@@ -2809,21 +2809,36 @@ This command sets a bunch of arrays with a complete list of whatever the
 invoking character has in their inventory, including all the data needed to
 recreate these items perfectly if they are destroyed. Here's what you get:
 
-@inventorylist_id[]        - array of item ids.
-@inventorylist_amount[]    - their corresponding item amounts.
-@inventorylist_equip[]     - on which position the item is equipped (see EQP_* constants)
-                             It will contain 0 if the item is not equipped.
-@inventorylist_refine[]    - for how much it is refined.
-@inventorylist_identify[]  - whether it is identified.
-@inventorylist_attribute[] - whether it is broken.
-@inventorylist_card1[]     - These four arrays contain card data for the items.
-@inventorylist_card2[]       These data slots are also used to store names
-@inventorylist_card3[]       inscribed on the items, so you can explicitly check
-@inventorylist_card4[]       if the character owns an item made by a specific
-                             craftsman.
-@inventorylist_expire[]    - expire time (Unix time stamp). 0 means never expires.
-@inventorylist_bound[]     - the bound type of the items (see BOUND_* constants)
-@inventorylist_count       - the number of items in these lists.
+@inventorylist_id[]                - array of item ids.
+@inventorylist_amount[]            - their corresponding item amounts.
+@inventorylist_equip[]             - on which position the item is equipped (see EQP_* constants)
+                                     It will contain 0 if the item is not equipped.
+@inventorylist_refine[]            - for how much it is refined.
+@inventorylist_identify[]          - whether it is identified.
+@inventorylist_attribute[]         - whether it is broken.
+@inventorylist_card1[]             - These four arrays contain card data for the items.
+@inventorylist_card2[]               These data slots are also used to store names
+@inventorylist_card3[]               inscribed on the items, so you can explicitly check
+@inventorylist_card4[]               if the character owns an item made by a specific
+                                     craftsman.
+@inventorylist_expire[]            - expire time (Unix time stamp). 0 means never expires.
+@inventorylist_bound[]             - the bound type of the items (see BOUND_* constants)
+@inventorylist_count               - the number of items in these lists.
+@inventorylist_option_id1[]        - first array of random option IDs
+@inventorylist_option_value1[]     - first array of random option values
+@inventorylist_option_parameter1[] - first array of random option parameters
+@inventorylist_option_id2[]        - second array of random option IDs
+@inventorylist_option_value2[]     - second array of random option values
+@inventorylist_option_parameter2[] - second array of random option parameters
+@inventorylist_option_id3[]        - third array of random option IDs
+@inventorylist_option_value3[]     - third array of random option values
+@inventorylist_option_parameter3[] - third array of random option parameters
+@inventorylist_option_id4[]        - fourth array of random option IDs
+@inventorylist_option_value4[]     - fourth array of random option values
+@inventorylist_option_parameter4[] - fourth array of random option parameters
+@inventorylist_option_id5[]        - fifth array of random option IDs
+@inventorylist_option_value5[]     - fifth array of random option values
+@inventorylist_option_parameter5[] - fifth array of random option parameters
 
 This could be handy to save/restore a character's inventory, since no other
 command returns such a complete set of data, and could also be the only way to
@@ -7632,6 +7647,7 @@ Parameters (indexes) for monsters are:
 	UMOB_AMOTION
 	UMOB_ADELAY
 	UMOB_DMOTION
+	UMOB_TARGETID
 
 -----
 
@@ -7675,6 +7691,7 @@ Parameter (indexes) for homunculi are:
 	UHOM_AMOTION
 	UHOM_ADELAY
 	UHOM_DMOTION
+	UHOM_TARGETID
 
 -----
 
@@ -7756,6 +7773,7 @@ Parameter (indexes) for mercenaries are:
 	UMER_AMOTION
 	UMER_ADELAY
 	UMER_DMOTION
+	UMER_TARGETID
 
 -----
 
@@ -7798,6 +7816,7 @@ Parameter (indexes) for elementals are:
 	UELE_AMOTION
 	UELE_ADELAY
 	UELE_DMOTION
+	UELE_TARGETID
 
 -----
 

npc/airports/airships.txt

@@ -413,7 +413,7 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		mes "last time I had a real vacation";
 		mes "or even a day off. Yeap, some";
 		mes "booze, some chips, some TV";
-		mes "and serius R&R is in order.";
+		mes "and serious R&R is in order.";
 		emotion ET_CRY;
 		close;
 	case 2:
@@ -451,8 +451,8 @@ airplane,221,158,2	script	Pilot#airplane	852,{
 		next;
 		emotion ET_HUK;
 		mes "[Pilot]";
-		mes "Still, they where real";
-		mes "serius, really thought";
+		mes "Still, they were real";
+		mes "serious, really thought";
 		mes "ahead. I mean, they had us";
 		mes "training while the Airships";
 		mes "were still being invented.";
@@ -502,7 +502,7 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 			else {
 				mes "[Fruitz]";
 				mes "A total of ^FF0000" + .@input + "^000000 Apples";
-				mes "will cost you ^FF0000" + .@pay + " Zeny^000000 zeny.";
+				mes "will cost you ^FF0000" + .@pay + "^000000 zeny.";
 				mes "Would you like to continue?";
 				next;
 				if (select("Yes:No") == 2) {

npc/airports/izlude.txt

@@ -16,7 +16,7 @@
 	mes "[Airship Staff]";
 	mes "Welcome! Would you like";
 	mes "to board the Airship that";
-	mes "departs on the flight wich stops";
+	mes "departs on the flight which stops";
 	mes "in Juno and Rachel?";
 	next;
 	if (select("Board the Airship to Juno/Rachel.:Cancel.") == 1) {

npc/cities/aldebaran.txt

@@ -542,7 +542,7 @@ aldebaran,143,136,4	script	Bell Keeper#A	89,{
 //============================================================
 aldeba_in,232,241,4	script	RS125#alde	48,{
 	mes "[RS125]";
-	mes "I may sound unhuman rather robotic";
+	mes "I may sound inhuman rather robotic";
 	mes "however, I hope you will not be afraid of me. I am as humane as you are.";
 	next;
 	mes "[RS125]";
@@ -558,7 +558,7 @@ aldeba_in,232,241,4	script	RS125#alde	48,{
 		next;
 		mes "[RS125]";
 		mes "He became so popular for his exciting play,";
-		mes "so everytime when the 'Al De Baran Turbo Track' was held once every 4 years,";
+		mes "so every time when the 'Al De Baran Turbo Track' was held once every 4 years,";
 		mes "many people from all over the continent came to this city only to see my brother.";
 		mes "I was his manager at the time and I was so stressed out because of his fans.";
 		next;
@@ -577,7 +577,7 @@ aldeba_in,232,241,4	script	RS125#alde	48,{
 		close;
 	}
 	mes "[RS125]";
-	mes "I want to travel around the world one of thesedays.";
+	mes "I want to travel around the world one of these days.";
 	mes "If I can see the ocean from the port of Alberta, it must be so wonderful.";
 	mes "After the next year's athletic competition, I will go on a round-the-world tour with my brother.";
 	close;
@@ -624,7 +624,7 @@ aldeba_in,223,121,4	script	Threatening-Looking Man	63,{
 	}
 	mes "[Threatening-Looking Man]";
 	mes "Get out, now!";
-	mes "If you a cop, show me a warrent,";
+	mes "If you a cop, show me a warrant,";
 	mes "if you are a member of my family, prove it with your birth mark!";
 	close;
 }
@@ -1303,7 +1303,7 @@ aldeba_in,88,161,3	script	Kafra Employee#reserve2	4_F_KAFRA3,{
 			mes "[Kafra Employee]";
 			mes "I'm sorry~ but~";
 			mes "Please, visit Kafra warehouse and store your items until you have free space of ^0000FF1100^000000 and come back.";
-			mes "I appolize for inconvinence~";
+			mes "I apologize for inconvenience~";
 			close;
 		}
 		mes "Your special reserve points are ^FF0000"+ RESRVPTS +"^000000~";
@@ -1548,11 +1548,11 @@ function	script	F_ClockTowerGate	{
 		mes "The Key is the Intensiveness of Ancient Alchemy,";
 		mes "By hearsay When used once,";
 		mes "It will be released from being spelled";
-		mes "And be disapeared.";
+		mes "And be disappeared.";
 		next;
 		mes "[Gatekeeper Boy]";
 		mes "If that key";
-		mes "Comes into your porssession,";
+		mes "Comes into your possession,";
 		mes "Please show me.";
 		mes "The one who possesses the Key";
 		mes "Will have access to go through";

npc/cities/amatsu.txt

@@ -181,7 +181,7 @@ amatsu,179,107,4	script	John#ama	86,{
 	mes "business here...";
 	next;
 	mes "[John]";
-	mes "Af first, I thought, 'What";
+	mes "At first, I thought, 'What";
 	mes "a great chance!' when the";
 	mes "trade between the Rune-Midgard";
 	mes "Kingdom and Amatsu started.";
@@ -545,9 +545,9 @@ amatsu,262,197,1	script	Legendary Tree	111,{
 	}
 	else if (jap_tree == 3) {
 		mes "^3355FFUnlike other cherry trees,";
-		mes "this tree has a strong fragnance.";
+		mes "this tree has a strong fragrance.";
 		mes "I just fell into a relaxed";
-		mes "mood. The fragnance eased";
+		mes "mood. The fragrance eased";
 		mes "my burdens and I felt";
 		mes "very comfortable.^000000";
 		next;
@@ -559,7 +559,7 @@ amatsu,262,197,1	script	Legendary Tree	111,{
 		close;
 	}
 	else if (jap_tree == 4) {
-		mes "^3355FFThis strong fragnance";
+		mes "^3355FFThis strong fragrance";
 		mes "is making me dizzy. Not like";
 		mes "other cherry trees, this tree's";
 		mes "shimmering white petals";
@@ -569,7 +569,7 @@ amatsu,262,197,1	script	Legendary Tree	111,{
 		mes "being drained if I stay here";
 		mes "longer. After a glimpse of";
 		mes "the cherry tree, I thought to";
-		mes "mayself, 'I must get out of here quickly.'^000000";
+		mes "myself, 'I must get out of here quickly.'^000000";
 		close;
 	}
 	mes "^3355FFThere was a cherry tree";

npc/cities/ayothaya.txt

@@ -32,7 +32,7 @@
 		mes "We Ayotayans are a pious people who value peace and sincerity. We endeavor to lead simple, yet noble, lives in harmony with nature.";
 		next;
 		mes "[Aibakthing]";
-		mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemon and Chillis, which has a tantalizing aroma and flavor beyond imagining.";
+		mes "Our traditional cuisine is world famous. It's no surprise when we serve dishes like Tom Yum Goong, made of Shrimp, Lemon and Chillies, which has a tantalizing aroma and flavor beyond imagining.";
 		next;
 		mes "[Aibakthing]";
 		mes "For those who crave adventure, there is an age old story about the Sa-mhing Tiger, an evil creature that haunts our temple ruins.";

npc/cities/comodo.txt

@@ -436,7 +436,7 @@ moc_fild12,35,303,4	script	Serutero#cmd	59,{
 		mes "[Serutero]";
 		mes "Comodo grew in power and";
 		mes "influence and eventually annexed Sandaruman. More and more people";
-		mes "moved from the fortress to Comodo until Sandaruman Fotress was";
+		mes "moved from the fortress to Comodo until Sandaruman fortress was";
 		mes "essentially abandoned.";
 		next;
 		mes "[Serutero]";

npc/cities/einbech.txt

@@ -427,7 +427,7 @@ ein_in01,279,92,3	script	Tavern Lady#ein	854,{
 	mes "that women want gentle,";
 	mes "sensitive men with whom";
 	mes "they can share their feelings";
-	mes "and drink chamoille tea over";
+	mes "and drink chamomile tea over";
 	mes "freshly knit doilies?";
 	close;
 }
@@ -750,7 +750,7 @@ einbech,148,242,5	script	Jung#ein	855,{
 	mes "I'm one of the few";
 	mes "people who's lived";
 	mes "in both Einbech and";
-	mes "Einbrock for a long time.";
+	mes "Einbroch for a long time.";
 	mes "So I guess I'm one of the";
 	mes "best guides of this area.";
 	next;
@@ -954,7 +954,7 @@ einbech,148,246,5	script	Franz#ein	851,{
 			mes "a short lived teddy bear";
 			mes "fad. However, a series of";
 			mes "mysterious accidents and";
-			mes "murders where entire familes";
+			mes "murders where entire families";
 			mes "were killed also occurred.";
 			next;
 			mes "[Franz]";

npc/cities/einbroch.txt

@@ -482,7 +482,7 @@ airport,176,41,4	script	Old Man#air	88,{
 	mes "These ores are a great";
 	mes "material to use in making";
 	mes "flower vases. My friend, who";
-	mes "happens to be a dollmaker,";
+	mes "happens to be a doll maker,";
 	mes "told me that. He makes these dolls using all sorts of materials.";
 	next;
 	mes "[Zhen Lan]";
@@ -787,7 +787,7 @@ ein_in01,206,224,3	script	Hotel Employee#ein	855,{
 	mes "[Hotel Employee]";
 	mes "Good day, welcome to the";
 	mes "Einbroch Hotel. The staff is";
-	mes "always striving to accomodate";
+	mes "always striving to accommodate";
 	mes "our guests with the highest";
 	mes "standards in cleanliness,";
 	mes "service and convenience~";
@@ -834,7 +834,7 @@ ein_in01,206,224,3	script	Hotel Employee#ein	855,{
 			else {
 				mes "[Hotel Employee]";
 				mes "I'm sorry, but the";
-				mes "acommodation fee is";
+				mes "accommodation fee is";
 				mes "5,000 zeny. Next time,";
 				mes "please make sure that you";
 				mes "bring enough zeny, okay?";

npc/cities/geffen.txt

@@ -154,7 +154,7 @@ geffen,111,48,0	script	Stacey	101,{
 		mes "[Stacey]";
 		if (Sex == SEX_MALE) {
 			mes "It's...";
-			mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!";
+			mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistible to all the girls!";
 			next;
 			emotion ET_THROB;
 			mes "[Stacey]";
@@ -1129,7 +1129,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 			mes "So you want to know about money, eh? Let me commune with the spirits of the supernatural realm...";
 			next;
 			mes "[Psychic Advisor]";
-			mes "Ah yes. They are telling me that it's best to be moderate in all things. Certainly, you must make sure that your expeditures don't exceed your budget.";
+			mes "Ah yes. They are telling me that it's best to be moderate in all things. Certainly, you must make sure that your expenditures don't exceed your budget.";
 			next;
 			mes "[Psychic Advisor]";
 			mes "However, you should also avoid gambling with your money. By that, I mean you should save and invest carefully. Don't be tempted into risky get-rich-quick schemes!";
@@ -1359,7 +1359,7 @@ geffen_in,109,72,2	script	Monster Scholar	90,{
 	case 2:
 		mes "[Estheres]";
 		mes "Recent news?";
-		mes "Well, the Juno Monster Musuem is now open to the public. They have a fascinating exhibit and various monsters are now on display!";
+		mes "Well, the Juno Monster Museum is now open to the public. They have a fascinating exhibit and various monsters are now on display!";
 		next;
 		mes "[Estheres]";
 		mes "I mean, I've read about all sorts of monsters in the Prontera and Juno Libraries, and encountered a few in the wild, but now I get a chance to see some strong monsters in real life!";
@@ -1408,7 +1408,7 @@ geffen_in,109,72,2	script	Monster Scholar	90,{
 
 geffen,203,146,5	script	Citizen	97,{
 	mes "[Citizen]";
-	mes "There was a skillful weaponsmith";
+	mes "There was a skillful weapon smith";
 	mes "in Al De Baran who had 4 sons.";
 	mes "Unfortunately he lost all of his sons";
 	mes "while developing a powerful weapon.";
@@ -1416,7 +1416,7 @@ geffen,203,146,5	script	Citizen	97,{
 	next;
 	mes "[Citizen]";
 	mes "How sad it will be for the father...";
-	mes "Because of the incident, the weaponsmith";
+	mes "Because of the incident, the weapon smith";
 	mes "retired from his work and hid himself somewhere.";
 	mes "After that, no one could ever see";
 	mes "the powerful weapon that he and his sons were developing.";

npc/cities/gonryun.txt

@@ -211,7 +211,7 @@ gonryun,268,88,3	script	Liang Zhun Bu#gon	776,{
 	mes "off every invasion! As long";
 	mes "as we believe in ourselves,";
 	mes "we shall never forget the";
-	mes "Trumphal Song that has helped us in our struggles.";
+	mes "Triumphal Song that has helped us in our struggles.";
 	close;
 }
 

npc/cities/hugel.txt

@@ -52,7 +52,7 @@ hugel,126,151,3	script	Emily	90,{
 	mes "For some reason, my older";
 	mes "sister wants to move out of";
 	mes "Hugel as soon as she can. She";
-	mes "Says that she's getting creeped";
+	mes "Says that she's getting crept";
 	mes "out by the people that live here.";
 	mes "Don't you think that sounds weird?";
 	close;

npc/cities/izlude.txt

@@ -99,7 +99,7 @@
 		mes "Some people may think Izlude is just a satellite city of Prontera, and not really that important...";
 		next;
 		mes "[Charfri]";
-		mes "But Izlude is a beautiful town right next to the ocean, as well as beautiful Bylan Island.";
+		mes "But Izlude is a beautiful town right next to the ocean, as well as beautiful Byalan Island.";
 		next;
 		mes "[Charfri]";
 		mes "You'll have to board on a ship at the port to get to Byalan Island. There are dangerous dungeons on that island, so don't go snooping around just anywhere.";
@@ -130,7 +130,7 @@
 		mes "The Arena here is THE place for capable young people from all over the Rune-Midgarts Kingdom to challenge themselves and test their skills.";
 		next;
 		mes "[Cuskoal]";
-		mes "You can battle with monsters of differing levels. So, the number of stages you survive will be a testiment to your battle prowess.";
+		mes "You can battle with monsters of differing levels. So, the number of stages you survive will be a testament to your battle prowess.";
 		next;
 		mes "[Cuskoal]";
 		mes "So, whaddya say?";
@@ -243,7 +243,7 @@
 		mes "Here in Izlude, we are responsible for maintaining peace not only on land but also at sea. That's why this city has a huge telescope.";
 		next;
 		mes "[Kylick]";
-		mes "This telecope constantly watches over the sea, so that we can prevent any serious trouble from happening. You know...";
+		mes "This telescope constantly watches over the sea, so that we can prevent any serious trouble from happening. You know...";
 		next;
 		mes "[Kylick]";
 		mes "An ounce of";

npc/cities/jawaii.txt

@@ -180,7 +180,7 @@ jawaii,240,146,5	script	Jawaii Resident#desc1	724,{
 jawaii,168,247,5	script	Jawaii Resident#desc2	724,{
 	mes "[Waja Waja]";
 	mes "Ah, you must be a tourist.";
-	mes "If you're lost, just head West. Accomodations for newlyweds";
+	mes "If you're lost, just head West. Accommodations for newlyweds";
 	mes "are located in the western part of Jawaii. The lodging here is";
 	mes "pretty amazing.";
 	next;
@@ -276,7 +276,7 @@ jawaii,108,199,5	script	Employee#antroom	74,{
 	mes "young couples in this room.";
 	next;
 	mes "[Pine Oran]";
-	mes "All the rooms may have the same basic structure, but each of them has their own unqiue interior to suit the tastes of different people.";
+	mes "All the rooms may have the same basic structure, but each of them has their own unique interior to suit the tastes of different people.";
 	next;
 	mes "[Pine Oran]";
 	mes "If you would like to lodge here, it is required to pay a 1,000 zeny fee for each person before entering. Since you're here to make fond memories of your honeymoon,";
@@ -1073,7 +1073,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	46,{
 			mes "of this.";
 			next;
 			mes "^3355FFYou receive a crooked glass";
-			mes "filled with purple fluid. Although it smells pleasnt, you have a strange feeling of disgust as you draw it closer to your face.";
+			mes "filled with purple fluid. Although it smells pleasant, you have a strange feeling of disgust as you draw it closer to your face.";
 			next;
 			mes "[Bartender]";
 			mes "If you don't want to drink it, tell me now. But it might be good to try it once, just to experience it.";
@@ -1250,7 +1250,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 		mes "or not, right buddy? Right?!";
 		mes "Come on! Drink with me!!";
 		next;
-		mes "^3355FFSuddenly he treated me as a close friend. It's a little embarassing, but it's not a bad idea to accept";
+		mes "^3355FFSuddenly he treated me as a close friend. It's a little embarrassing, but it's not a bad idea to accept";
 		mes "a free drink...^000000";
 		next;
 		mes "^3355FF* Gulp Gulp Gulp *^000000";

npc/cities/lighthalzen.txt

@@ -202,7 +202,7 @@ lighthalzen,89,73,3	script	Sameer#zen15	854,{
 	mes "of morality. In fact, I have";
 	mes "no need for a woman. All";
 	mes "I need are my ship models,";
-	mes "teen novels and dominos.";
+	mes "teen novels and dominoes.";
 	next;
 	mes "[Sameer]";
 	mes "I'm a completely well";
@@ -450,7 +450,7 @@ lighthalzen,138,50,7	script	Mauro#zen3	847,{
 	mes "[Mauro]";
 	mes "Bah! If it weren't for";
 	mes "us, Lighthalzen wouldn't";
-	mes "be as properous as it is";
+	mes "be as prosperous as it is";
 	mes "today! Those kids don't";
 	mes "know that they owe their";
 	mes "lives of luxury to us...";
@@ -462,7 +462,7 @@ lighthalzen,132,103,5	script	Sefith#li_01	734,{
 	mes "Good looks. Intelligence.";
 	mes "Excellent manners. A strong,";
 	mes "manly chin and overpowering,";
-	mes "piercing eyes. Perfectly balanced passion and charimsma. All the";
+	mes "piercing eyes. Perfectly balanced passion and charisma. All the";
 	mes "good things that ladies want.";
 	next;
 	mes "[Sefith]";
@@ -525,7 +525,7 @@ lhz_in02,34,212,4	script	Maggie#05	91,{
 	mes "amount for the lease and the";
 	mes "laws here won't let me raise";
 	mes "the price of my flowers. Why";
-	mes "are the city officals so greedy?";
+	mes "are the city officials so greedy?";
 	close;
 }
 
@@ -633,7 +633,7 @@ lighthalzen,182,102,3	script	Lucius#zen5	866,{
 	mes "You seem to be fairly";
 	mes "well-off. Money is good";
 	mes "to have, but be careful not";
-	mes "to become obssessed with it.";
+	mes "to become obsessed with it.";
 	next;
 	mes "[Lucius]";
 	mes "When you have the chance,";
@@ -877,7 +877,7 @@ lhz_in02,287,273,3	script	Customer#amano11	50,{
 	mes "[Terry]";
 	mes "Yeah, this is a real cozy";
 	mes "joint. I recommend it to";
-	mes "all you tourists, acutally.";
+	mes "all you tourists, actually.";
 	mes "Now why don't you kick";
 	mes "back and chill with me?";
 	close;
@@ -1499,7 +1499,7 @@ lhz_in01,116,45,7	script	Joshua#aya	704,{
 	mes "complexion and smooth";
 	mes "skin. That's right. Come";
 	mes "right to Joshua, babes.";
-	mes "I got my pheremone spray";
+	mes "I got my pheromone spray";
 	mes "on and I'm ready to cruise~";
 	close;
 }
@@ -2612,7 +2612,7 @@ lighthalzen,176,65,5	script	Kimmy#zen3	862,{
 	mes "beautiful clothing and";
 	mes "accessory shops. This";
 	mes "place is heaven to a";
-	mes "trendsetter like me~!";
+	mes "trend-setter like me~!";
 	next;
 	mes "[Kimmy]";
 	mes "I don't know if you";
@@ -2812,7 +2812,7 @@ lighthalzen,77,203,3	script	Victor Perfecto#zen9	869,{
 	mes "Still, it's pretty";
 	mes "depressing to think";
 	mes "that the beauty of nature";
-	mes "can be manmade and";
+	mes "can be man-made and";
 	mes "equated to zeny, you know?";
 	close;
 }

npc/cities/lutie.txt

@@ -291,7 +291,7 @@ xmas,117,304,4	script	Poze	713,{
 		mes "Oh, there is someone who knows how Snowysnow came to be able to speak. That person would be ^3355FFUncle Hairy Cantata^000000...";
 		next;
 		mes "[Poze]";
-		mes "One day when apprentice of the great alchemist visted Lutie, I came to listen in on a conversation between him and Uncle Hairy.";
+		mes "One day when apprentice of the great alchemist visited Lutie, I came to listen in on a conversation between him and Uncle Hairy.";
 		next;
 		mes "[Poze]";
 		mes "Long ago, a great alchemist came by Snowysnow's hometown and happened to meet Snowysnow dying, melting down into water. However, Snowysnow was miraculously revived by that Alchemist.";

npc/cities/manuk.txt

@@ -20,7 +20,7 @@
 manuk,304,195,5	script	Soldier#ep13pa829	454,{
 	if (isequipped(2782) == 1) {
 		mes "[Food Provider]";
-		mes "The Manuk family subsists mostly on refining Gray Hollows that were burried a long time ago deep down under the ground.";
+		mes "The Manuk family subsists mostly on refining Gray Hollows that were buried a long time ago deep down under the ground.";
 		close;
 	}
 	else {
@@ -324,7 +324,7 @@ man_in01,393,134,3	script	Worker#ep13bsg2	454,{
 man_in01,377,143,5	script	Worker#ep13bsg3	454,{
 	if (isequipped(2782) == 1) {
 		mes "[Worker]";
-		mes "Hmm... It's working just fine... No probems at all...";
+		mes "Hmm... It's working just fine... No problems at all...";
 		close;
 	}
 	else {

npc/cities/morocc.txt

@@ -48,7 +48,7 @@ OnTouch_:
 
 morocc,202,244,0	script	Volunteer - Morroc#01	745,{
 	mes "[Morroc Volunteer]";
-	mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us valunteers to help restorations.";
+	mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us volunteers to help restorations.";
 	next;
 	mes "[Morroc Volunteer]";
 	mes "As important as it seems, everyone's being careful but there are always some that really don't realize the situation, don't you think?";
@@ -303,7 +303,7 @@ moc_ruins,121,116,4	script	Picky Lady#moc	66,{
 	mes "Or, how little Picky wears that tiny egg shell sometimes?..";
 	next;
 	mes "[Syvia]";
-	mes "I can't believe what just has happened.. Our town used to be the one with those cute little monsters, not that kinda of visious dreadful Evil sleeping in! Whew...";
+	mes "I can't believe what just has happened.. Our town used to be the one with those cute little monsters, not that kinda of vicious dreadful Evil sleeping in! Whew...";
 	next;
 	mes "[Syvia]";
 	mes "I'm so scared... I just wanna ease my mind watching over those cute little Porings...";
@@ -375,7 +375,7 @@ moc_ruins,155,107,4	script	Ant Man#moc	47,{
 		next;
 		mes "[Akira]";
 		mes "Andre is colored in Ivory, Yellowish Green is Piere, and the Red one is Deniro.";
-		mes "It's really easy to distinguish those from Bitata, the commen ants because they look very different.";
+		mes "It's really easy to distinguish those from Bitata, the common ants because they look very different.";
 		next;
 		mes "[Akira]";
 		mes "Oh, and those ants are greedy as Porings and will try to steal your items, so keep that in mind.";
@@ -388,7 +388,7 @@ moc_ruins,155,107,4	script	Ant Man#moc	47,{
 		mes "There's also an old man called Guias, the spirit of the earth. He's pretty hard to deal with.";
 		next;
 		mes "[Akira]";
-		mes "Sharp teeth and strong jaws of the ants would be something that you should be careful of, but the shovelling skills of that old granpa is very strong that you should watch out.";
+		mes "Sharp teeth and strong jaws of the ants would be something that you should be careful of, but the shovelling skills of that old grandpa is very strong that you should watch out.";
 		next;
 		mes "[Akira]";
 		mes "...Well, what am I talking about? What is left to be afraid when the Satan of Morroc is revived? Huh..huhhuh...";
@@ -414,7 +414,7 @@ moc_ruins,143,43,4	script	Assassin Boy#moc	118,{
 		next;
 		mes "[Slayer Kid]";
 		mes "Well.. Maybe it'd too late now..";
-		mes "Now that the whole town's destroyed... I don't even care what happenes next...";
+		mes "Now that the whole town's destroyed... I don't even care what happens next...";
 		close;
 	case 2:
 		mes "[Slayer Kid]";
@@ -566,9 +566,9 @@ moc_ruins,173,70,4	script	Uncle Morroc#moc	48,{
 moc_fild16,199,212,4	script	 Uncle Assassin#moc	55,{
 	mes "[Hashisid]";
 	mes "...Assassins are trained";
-	mes "to approach their enemies steathily,";
+	mes "to approach their enemies stealthily,";
 	mes " as well as";
-	mes "to shroad their intent.";
+	mes "to shroud their intent.";
 	mes "For this purpose,";
 	mes "we never";
 	mes "look our targets in the eye.";
@@ -612,7 +612,7 @@ moc_fild16,199,212,4	script	 Uncle Assassin#moc	55,{
 		mes "strong smell...";
 		mes "If you ever,";
 		mes "try eating those";
-		mes "smelly garlic bread with spicies,";
+		mes "smelly garlic bread with spices,";
 		next;
 		mes "[Hashisid]";
 		mes "and try hiding against";
@@ -666,7 +666,7 @@ moc_fild16,211,254,4	script	Assassin#07rhea_30	118,{
 		next;
 		mes "[La Conte]";
 		mes "Sonic Blow is the skill";
-		mes "that inflicts 8 contineous hits of";
+		mes "that inflicts 8 continuous hits of";
 		mes "Neutral damage.";
 		close;
 	case 2:
@@ -721,7 +721,7 @@ morocc_in,166,76,3	script	Bartender#02	46,{
 	mes "[Bartender]";
 	mes "What are you going to order?";
 	next;
-	switch(select("Tropical Sograt:Vemillion the Beach:Nothing.")) {
+	switch(select("Tropical Sograt:Vermilion on the Beach:Nothing.")) {
 	case 1:
 		if (Zeny >= 1000 ) {
 			set Zeny, Zeny-1000;

npc/cities/payon.txt

@@ -157,11 +157,11 @@ payon,249,156,1	script	Woman#payon	66,{
 	case 1:
 		mes "[Woman]";
 		mes "Oh come on, don't be a coward.";
-		mes "It's just a simple cave filled with normal monsters. It's quite safe. We've even established an Archer Village near that cave to prevent misfortunate incidents. Hohoohoho~ ";
+		mes "It's just a simple cave filled with normal monsters. It's quite safe. We've even established an Archer Village near that cave to prevent misfortune incidents. Hohoohoho~ ";
 		break;
 	case 2:
 		mes "[Woman]";
-		mes "Oh don't worry about any preparations. There's a Tool Dealer right in front of the cave, so you can purchase anything you need from my husban, er, that guy~";
+		mes "Oh don't worry about any preparations. There's a Tool Dealer right in front of the cave, so you can purchase anything you need from my husband, er, that guy~";
 		break;
 	case 3:
 		mes "[Woman]";
@@ -947,7 +947,7 @@ OnTouch_:
 			next;
 			mes "[Chief]";
 			mes "However, we welcome people";
-			mes "who have proven to be capable to take the challange of the Hunter class.";
+			mes "who have proven to be capable to take the challenge of the Hunter class.";
 			break;
 		}
 		next;

npc/cities/prontera.txt

@@ -219,7 +219,7 @@ prontera,78,150,3	script	Dairenne#pront	90,{
 	next;
 	if (select("Talk:Cancel") == 1) {
 		mes "[Towngirl Dairenne]";
-		mes "I wonder if you are interested in parties or dresses. Hehehe. These days, the hot topic is definitely the colorful, extravagent, magnificent dresses you can wear.";
+		mes "I wonder if you are interested in parties or dresses. Hehehe. These days, the hot topic is definitely the colorful, extravagant, magnificent dresses you can wear.";
 		next;
 		mes "[Towngirl Dairenne]";
 		mes "To get such dazzling colors, I heard you have to use a dye that you can only get in Morroc. But I also heard that the price is beyond imagination.";
@@ -308,10 +308,10 @@ prt_in,180,20,2	script	Bartender#pront	61,{
 	mes "I can't keep my business busy without my special menu 'Crunch Crunch Sour' and 'Savory Yum Yum'...*Sigh*";
 	while(1) {
 		next;
-		switch(select("'Cunch Crunch Sour'?:'Savory Yum Yum'?:Cancel.")) {
+		switch(select("'Crunch Crunch Sour'?:'Savory Yum Yum'?:Cancel.")) {
 		case 1:
 			mes "[Bartender]";
-			mes "The basic ingredients of my Crunch Crunch Sour are the ants roadming inside the Ant Hell in the desert.";
+			mes "The basic ingredients of my Crunch Crunch Sour are the ants roaming inside the Ant Hell in the desert.";
 			mes "Rumor has it that the numbers of the ants have been greatly increased and they have become more violent, so that no one wants to get in the place.";
 			next;
 			mes "[Bartender]";
@@ -361,7 +361,7 @@ prt_in,173,24,2	script	Shevild#pront	85,{
 			mes "Yes. Few days ago, I have entered a mysterious maze following a group of hunters at the north of Prontera.";
 			next;
 			mes "[Shevild]";
-			mes "They said that they could get lots and lots of rare items from the maze even if the maze was filled with awfully strong mosters.";
+			mes "They said that they could get lots and lots of rare items from the maze even if the maze was filled with awfully strong monsters.";
 			mes "So we went there but as soon as we entered, we were just stuck inside the maze, you know.";
 			next;
 			mes "[Shevild]";
@@ -380,7 +380,7 @@ prt_in,173,24,2	script	Shevild#pront	85,{
 
 		case 2:
 			mes "[Shevild]";
-			mes "When you go outside of Prontrea heading to north east, you will arrive at the peaceful ruins. I have been there a while ago, to deliver something to a priest.";
+			mes "When you go outside of Prontera heading to north east, you will arrive at the peaceful ruins. I have been there a while ago, to deliver something to a priest.";
 			mes "I had to pass a forest on the way to the ruins, and the forest was filled with monkeys and raccoons.";
 			next;
 			mes "[Shevild]";

npc/cities/rachel.txt

@@ -53,7 +53,7 @@ ra_san04,137,48,3	script	Loomin-1st Class Secret	111,{
 	mes "^333333The pope was born together";
 	mes "with a twin brother, a fair";
 	mes "skinned boy with pale skin";
-	mes "and silver blonde hair. This";
+	mes "and silver blond hair. This";
 	mes "had never happened before";
 	mes "and presented a unique problem";
 	mes " ";
@@ -112,7 +112,7 @@ rachel,74,150,7	script	Girl#1	914,{
 	mes "[Girl]";
 	mes "I've never seen our pope";
 	mes "before, I hear that she has";
-	mes "silver blonde hair and really";
+	mes "silver blond hair and really";
 	mes "white skin. Daddy says that";
 	mes "only one girl is like that";
 	mes "in every generation.";
@@ -329,7 +329,7 @@ rachel,197,137,3	script	Bard#aru	51,{
 	mes "[Bard]";
 	mes "Can I fulfill this hope~?";
 	mes "Meeting the girl with";
-	mes "skin as white as lillies,";
+	mes "skin as white as lilies,";
 	mes "eyes sparkling like stars~";
 	mes "Yes, I'm talking about the pope~";
 	mes "Pope, yeah~ Pope, yeah~";

npc/cities/splendide.txt

@@ -399,7 +399,7 @@ spl_in01,190,314,5	script	Security Officer#tre	461,{
 		mes "Those who are guilty and prisoners are detained here.";
 		next;
 		mes "[Security Officer]";
-		mes "If you do something supicious, you must be detained here too, so you'd better to be careful!";
+		mes "If you do something suspicious, you must be detained here too, so you'd better to be careful!";
 		close;
 	}
 	else {
@@ -461,7 +461,7 @@ OnTouch:
 spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 	cutin "god_nelluad02",2;
 	mes "[Poet Nell]";
-	mes "Hi~~ do you hear the beautiful music comeing from afar~?";
+	mes "Hi~~ do you hear the beautiful music coming from afar~?";
 	next;
 	select("Who are you?");
 	cutin "god_nelluad01",2;
@@ -473,7 +473,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 	mes "I cam here the other day, requesting to take notes of this new world and they allow me to follow the adventurers here.";
 	next;
 	mes "[Poet Nell]";
-	mes "I became familliar with the Lapine.";
+	mes "I became familiar with the Lapine.";
 	mes "It was quite awkward at first... Since I didn't knew their language.";
 	mes "But, one I started to play my instruments... they loved it.";
 	next;
@@ -502,7 +502,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 			cutin "god_nelluad02",2;
 			mes "[Poet Nell]";
 			mes "Chaos in Eternity...";
-			mes "This is a great piece but I wouldn't reccomend it while dining...";
+			mes "This is a great piece but I wouldn't recommend it while dining...";
 			soundeffect "chaos_of_eternity.wav",0;
 			break;
 		case 3:
@@ -520,7 +520,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 			mes "This song has quite an interesting story~";
 			next;
 			soundeffect "ring_of_nibelungen.wav",0;
-			mes "^4d4dff There was a niver named Rhein that";
+			mes "^4d4dff There was a river named Rhein that";
 			mes "that would shine as if made of gold.";
 			mes "It's secret hidden from all since";
 			mes "before this story was told...^000000";
@@ -573,7 +573,7 @@ spl_in01,172,225,3	script	Wandering Poet#ep13	51,{
 spl_in01,182,213,1	script	Resting Laphine#ep13_1	438,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Resting Laphine]";
-		mes "The poet on the stagie is mysterious.";
+		mes "The poet on the stage is mysterious.";
 		mes "The moment you came here...";
 		mes "He arrived and started playing music.";
 		next;
@@ -636,7 +636,7 @@ spl_in01,162,202,5	script	Laphine taking notes#1	436,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[Laphine taking notes]";
 		mes "We are quite impressed by the poet.";
-		mes "We Laphine love music aswell.";
+		mes "We Laphine love music as well.";
 		mes "I never imagined that I would ever hear such exotic music.";
 		next;
 		mes "[Laphine taking notes]";
@@ -739,7 +739,7 @@ spl_in01,154,207,5	script	Laphine Staff#ep13_2	440,{
 spl_in01,122,314,5	script	High-Ranked Soldier#ep13	461,{
 	if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
 		mes "[High-Ranked Soldier]";
-		mes "Are ther any new supplies?";
+		mes "Are there any new supplies?";
 		next;
 		mes "[Laphine Soldier]";
 		mes "This sword just arrived...";

npc/cities/umbala.txt

@@ -266,7 +266,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 		mes "Can donate some money for";
 		mes "re-constructing my parents' house?";
 		mes "You Rune-Midgardians are all";
-		mes "richier than Utans! I beg you!";
+		mes "richer than Utans! I beg you!";
 		emotion ET_SMILE;
 		next;
 		if (select("(Nod head):(Shake head)") == 1) {

npc/cities/veins.txt

@@ -707,7 +707,7 @@ ve_in,318,121,3	script	Towner#ve23	943,{
 	mes "[Towner]";
 	mes "Veins is famous for its";
 	mes "wide variety of delicious,";
-	mes "irresistable liquor. Just one";
+	mes "irresistible liquor. Just one";
 	mes "sip's enough to hook you.";
 	next;
 	mes "[Towner]";

npc/cities/yuno.txt

@@ -236,7 +236,7 @@ yuno,157,205,4	script	Juno Artisan#juno	54,{
 		close;
 	case 4:
 		mes "[Artisan]";
-		mes "Although Juno is known as a city of Sages, I hope you understand that ordinary people live and propser here as well. Please enjoy the unique atmosphere that Juno has to offer.";
+		mes "Although Juno is known as a city of Sages, I hope you understand that ordinary people live and prosper here as well. Please enjoy the unique atmosphere that Juno has to offer.";
 		close;
 	}
 }

npc/custom/card_remover.txt

@@ -61,7 +61,7 @@ prt_in,28,73,4	script	Wise Old Woman#eAcustom	78,{
 		mes "[Wise Old Woman]";
 		mes "This item has " + .@cardcount + " cards compounded on it. To perform my magic, I will need " + (.zenycost+(.@cardcount * .percardcost)) + " zeny, a ^0000FFStar Crumb^000000, and a ^0000FFYellow Gemstone^000000.";
 		next;
-		if(select("Very well. Do it.:Nevermind.") == 2) {
+		if(select("Very well. Do it.:Never mind.") == 2) {
 			mes "[Wise Old Woman]";
 			mes "Very well. Return at once if you seek my services.";
 			close;

npc/custom/etc/bank.txt

@@ -20,7 +20,7 @@ prontera,132,217,5	script	Banker	109,{
 	mes "[Banker]";
 	mes "Welcome to the First Bank of Prontera. How can I help you today?";
 	next;
-	switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's my current balance?:Cancel")) {
+	switch(select("I'd like to make a deposit.:I'd like to make a withdrawal.:What's my current balance?:Cancel")) {
 	case 1:
 		mes "[Banker]";
 		mes "Very well... How much would you like to deposit? The maximum you can deposit at once is 999,999 Zeny.";
@@ -71,12 +71,12 @@ prontera,132,217,5	script	Banker	109,{
 		}
 		else if ((@cost > Zeny) && ((Zeny + @withdrawl) > @cost)) {
 			mes "[Banker]";
-			mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawl?";
+			mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawal?";
 			next;
 			switch(select("Yes please.:No, Thanks")){
 			case 1:
 				mes "[Banker]";
-				mes "Removing " + @cost + " from your withdrawl to cover the deposit fee...";
+				mes "Removing " + @cost + " from your withdrawal to cover the deposit fee...";
 				set @withdrawl,@withdrawl - @cost;
 				set #bankstorage,#bankstorage - @cost;
 				set @cost,0;

npc/custom/etc/blackjack.txt

@@ -90,7 +90,7 @@ sM_0c:
 	mes "[Dealer]";
 	mes "The 'Double Down' option allows you to double your current bet,";
 	mes "but with the drawback that you will only be able to pull one";
-	mes "additional card.  This option is only available at the beggining of";
+	mes "additional card.  This option is only available at the beginning of";
 	mes "each round.";
 	next;
 	mes "[Dealer]";
@@ -117,8 +117,8 @@ sM_0d:
 	mes "point total over 21 and would have lost.";
 	next;
 	mes "[Dealer]";
-	mes "It is because of the flexibilty you have with the 'Ace' that makes";
-	mes "it the most powerfull card in the game.";
+	mes "It is because of the flexibility you have with the 'Ace' that makes";
+	mes "it the most powerful card in the game.";
 	goto sM_Menu0;
 M_End:
 	mes "[Dealer]";

npc/custom/etc/marriage.txt

@@ -658,7 +658,7 @@ OnTimer60000:
 	else
 		set $@msg$, $wed_groom$;
 
-	npctalk @name$ +" : Registration timed out. Is it that noone wants to marry "+$@msg$+"..?";
+	npctalk @name$ +" : Registration timed out. Is there no one who wants to marry "+$@msg$+"..?";
 	emotion ET_SCRATCH;
 	
 	set $wed_groom$,"";
@@ -748,7 +748,7 @@ function SF_Principles {
 	next;
 	mes "["+@name$+"]";
 	if ($@wed_allow == 1)
-		mes "Altough normally only males can wed females (and viceversa), our local Priest is more open-minded than that and he permits all pairings regardless of gender.";
+		mes "Although normally only males can wed females (and vice versa), our local Priest is more open-minded than that and he permits all pairings regardless of gender.";
 	else
 		mes "Males may only wed with females, and females only with males, the church will not consent any other kind of partnerships.";
 	next;

npc/custom/etc/monster_arena.txt

@@ -59,7 +59,7 @@ L_Info:
 	mes "Talk to the Monster Trainer, he will ask you to heal your pet.";
 	next;
 	mes "[Monster Arena]";
-	mes "To do this, click the Nurse repearedly until it says your pet is healed.";
+	mes "To do this, click the Nurse repeatedly until it says your pet is healed.";
 	next;
 	mes "[Monster Arena]";
 	mes "The more monsters you kill, the more exp you get and the quicker you can upgrade.";

npc/custom/etc/penal_servitude.txt

@@ -138,7 +138,7 @@ sec_in02,137,57,1	script	Overseer	708,{
 	mes "I want you to gather ^FF0000"+PRISON_Q+" Orange Net Mushroom^000000.";
 	if ( countitem(1069)<PRISON_Q ) close;//Items: Orange_Net_Mushroom,
 	mes "OK... hand me all the shrooms...";
-	mes "Let me see... "+countitem(1069)+" of almost eadible ones...";//Items: Orange_Net_Mushroom,
+	mes "Let me see... "+countitem(1069)+" of almost edible ones...";//Items: Orange_Net_Mushroom,
 	mes "And "+countitem(1070)+" useless deadly ones.";//Items: Orange_Gooey_Mushroom_,
 	next;
 	mes "[Oliver]";

npc/custom/etc/quest_warper.txt

@@ -271,7 +271,7 @@ SpecialWarpMenu:
 	case 2:
 		next;
 		mes "Set the map in the ^0000FFmapname^000000 format.";
-		mes "When this warpmap is set the option for players will show once they meet the requirments.";
+		mes "When this warpmap is set the option for players will show once they meet the requirements.";
 		mes "To disable Special Warp Menu option, clear this!";
 		input $QW_SP_WarpMap$;
 		goto SpecialWarpMenu;
@@ -541,7 +541,7 @@ L_Short_on_zeny:
 	
 //===========================Stamp=Card============================
 stampcard:
-// Counting of the ammount of places you have unlocked
+// Counting of the amount of places you have unlocked
 	next;
 	mes "Let me check what Towns you have.";
 	callfunc "QWS_TownStamps";

npc/custom/events/disguise.txt

@@ -93,7 +93,7 @@ prontera,160,155,4	script	Disguise Event	795,{
 				input .@amount;
 				mes .@n$;
 				if (.@amount<=0 || .@amount>=10000) {
-					mes "That amount is invalid. Using default ammount of 1.";
+					mes "That amount is invalid. Using default amount of 1.";
 					set .@amount,1;
 					next;
 					mes .@n$;
@@ -116,7 +116,7 @@ prontera,160,155,4	script	Disguise Event	795,{
 	mes "At the start of the event, I will";
 	mes "disguise myself as a random";
 	mes "monster. You have to shout";
-	mes "that monter's name out loud.";
+	mes "that monster's name out loud.";
 	next;
 	mes "If you are correct, you will receive";
 	mes "a prize. If not, keep trying!";

npc/custom/events/holiday/hallow06.txt

@@ -103,7 +103,7 @@ L_Treat:
 	emotion ET_CONGRATULATION;
 	next;
 	mes "[Hallows' Eve Event]";
-	mes "Enjoy the rest of your halloween.";
+	mes "Enjoy the rest of your Halloween.";
 	emotion ET_SCISSOR, playerattached();
 	close;
 

npc/custom/events/holiday/uneasy_cemetery.txt

@@ -63,7 +63,7 @@ L_Start_Undead:
 	monster "prontera",268,349,"Zombie",1015,30,"Uneasy_Check::OnZombieDead";
 	monster "prontera",269,350,"Ghoul",1036,5,"Uneasy_Check::OnZombieDead";
 //announce
-	mapannounce "prontera","[Mother Mathana]: The cememtery has become restless!  In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0;
+	mapannounce "prontera","[Mother Mathana]: The cemetery has become restless!  In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0;
 }
 
 prontera,257,313,5	script	Mother Mathana	79,{
@@ -79,7 +79,7 @@ L_Undead_Walk:
 	if ($UNEASY_DL == 0) mes "THEY could return tomorrow's night again!";
 	if ($UNEASY_DL == 0 && $UNEASY_H$==strcharinfo(0)) mes "Thank you, "+$UNEASY_H$+"! Now we'll manage to rest till the next midnight!";
 	if ($UNEASY_DL == 0 && $UNEASY_H$!=strcharinfo(0)) mes "But due to "+$UNEASY_H$+"'s help we'll manage to rest till the next midnight!";
-	mes "To calm down the restless cemetery, we should pour all these graves with the Holy Water. But our sisters and broters have run out of it.";
+	mes "To calm down the restless cemetery, we should pour all these graves with the Holy Water. But our sisters and brothers have run out of it.";
 	mes "Could you supply us with Holy Water?";
 	next;
 	menu "Yes, have all my Holy Water!",-, "Nope, I need it.",M_NO, "I don't have any.",M_DONT_HAVE;
@@ -105,7 +105,7 @@ L_Undead_Walk:
 	mes "[Mother Mathana]";
 	mes "Our Church is going to thank you personally...";
 	next;
-	if (Sex==SEX_MALE) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
+	if (Sex==SEX_MALE) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsome "+$UNEASY_H$+" as a Prontera savior!",0;
 	else mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
 	mes "[Mother Mathana]";
 	mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";

npc/custom/events/holiday/valentinesdayexp.txt

@@ -44,20 +44,20 @@ prontera,156,172,4	script	Tine	58,{
 
 M_INFO:
 	mes "[Tine]";
-	mes "The magic effect posesses only handmade chocolate from grand-grand-grand-whoever recipes!";
+	mes "The magic effect possesses only handmade chocolate from grand-grand-grand-whoever recipes!";
 	next;
 	mes "[Tine]";
 	mes "It being known that Black Handmade Chocolate works on married guys... And the White one on the married girls!";
 	mes "If you lose your wedding ring... then alas, it won't work on you.";
 	next;
 	mes "[Tine]";
-	mes "On having a Chocolate, you should put off your ring then... put it back... And if your partner is online, then magc would last till the next hour!";
+	mes "On having a Chocolate, you should put off your ring then... put it back... And if your partner is online, then magic would last till the next hour!";
 	next;
 	mes "[Tine]";
-	mes "Rumors bark that guys and gals have +50% EXP bonuses on FIVE different races of the monsters... Exluding bloody bosses, of course.";
+	mes "Rumors bark that guys and gals have +50% EXP bonuses on FIVE different races of the monsters... Excluding bloody bosses, of course.";
 	next;
 	mes "[Tine]";
-	mes "There's a fameous confectioner in the Castle of Prontera! He's the one you need.";
+	mes "There's a famous confectioner in the Castle of Prontera! He's the one you need.";
 	close;
 
 OnInit:
@@ -135,7 +135,7 @@ alberta,29,243,4	script	Jainie#val1	53,{
 	mes "I made them by myself. Now I need some Milk for my special White Chocolate.";
 	next;
 	mes "[Jainie]";
-	mes "You know ... In cetain countries, there's a tradition of presenting chocolates to a person that you love...";
+	mes "You know ... In certain countries, there's a tradition of presenting chocolates to a person that you love...";
 	mes "They call it ^3355FFValentine's Day^000000.";
 	next;
 	mes "[Jainie]";

npc/custom/jobmaster.txt

@@ -282,8 +282,8 @@ function	Job_Menu	{
 		if ((.@class == Job_Super_Novice || .@class == Job_Super_Baby) &&
 				BaseLevel < .SNovice) {
 			// Special Level Requirement because Super Novice and
-			// Supber Baby can both be selected in one of the first class
-			// changes. That's why the Levelrequirement is after and not before
+			// Super Baby can both be selected in one of the first class
+			// changes. That's why the Level Requirement is after and not before
 			// the selection.
 			mes "A base level of " + .SNovice +
 				" is required to turn into a " + jobname(.@class) + ".";
@@ -328,7 +328,7 @@ function	Confirm_Change	{
 	.@class = getarg(0, -1);
 	.@back = getarg(1, false);
 	if( .@class < 0 ) {
-		mes "Unknow Class Error.";
+		mes "Unknown Class Error.";
 		close;
 	}
 	mes "Do you want to change into ^0055FF"+jobname(.@class)+"^000000 class?";

npc/custom/official/GeffenMagicTournament.txt

@@ -289,7 +289,7 @@ L_Shield:
 			mes "There are two types of Rings are available for exchange.";
 			next;
 L_Ring:
-				switch(select("Phyisical Enhancer Ring ^3355FF<1350 Coins>^000000:Magic Intensifier Ring ^3355FF<1350 Coins>^000000:Go back to previous menu")){
+				switch(select("Physical Enhancer Ring ^3355FF<1350 Coins>^000000:Magic Intensifier Ring ^3355FF<1350 Coins>^000000:Go back to previous menu")){
 					case 1:
 						.@item = 2963;
 						.@cost = 1350;
@@ -2525,7 +2525,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I'm so relieved!";
 	sleep 3000;
-	npctalk "I was able to beat a weak competitior.";
+	npctalk "I was able to beat a weak competitor.";
 	sleep 3000;
 	npctalk "Yahoo!";
 	sleep 5000;
@@ -2685,7 +2685,7 @@ OnDefeat:
 OnVictory:
 	hideoffnpc instance_npcname("Geffen Bully#n1");
 	sleep 1000;
-	npctalk "You! Hou much zeny do you have left?";
+	npctalk "You! How much zeny do you have left?";
 	sleep 3000;
 	npctalk "You messed with me once before!";
 	sleep 3000;

npc/custom/quests/bandit_beard.txt

@@ -112,15 +112,15 @@ izlude_in,123,175,4	script	Master Tailor#bandit	50,{
 	mes "What? A Bearded Man sent you...";
 	mes "Well I'm sorry to say that I am out of ^8080FFThread^000000.";
 	mes "But I have the address to where I get the shipments.";
-	mes "It is in Al de Baran Karfa Inc. warehouse area.";
+	mes "It is in Al de Baran Kafra Inc. warehouse area.";
 	mes "The address is: Al de Baran 59, 221";
 	mes "See you later.";
 	set BEARD_QUEST, 2;
 	close;
 }
-// Karfa Thread Clerk---
-aldeba_in,70,179,5	script	Karfa Clerk#bandit	113,{
-	mes "[Karfa Clerk]";
+// Kafra Thread Clerk---
+aldeba_in,70,179,5	script	Kafra Clerk#bandit	113,{
+	mes "[Kafra Clerk]";
 	if(BEARD_QUEST == 3 ) goto L_REPEAT;
 	if(BEARD_QUEST > 3 ) goto L_DONE;
 
@@ -130,25 +130,25 @@ aldeba_in,70,179,5	script	Karfa Clerk#bandit	113,{
 
 	menu "What's in the boxes?",-,"Nothing.",M_NOPE;
 
-	mes "[Karfa Clerk]";
+	mes "[Kafra Clerk]";
 	mes "They're empty.";
 M_NOPE:
 	close;
 
 L_DELIVERY:
 
-	mes "[Karfa Clerk]";
+	mes "[Kafra Clerk]";
 	mes "Sorry but we have not received any ^8080FFThread^000000.";
 	mes "Our shipments have been put off until its safe.";
 	mes "You see we get our ^8080FFThread^000000 from Alberta and a monsters keeps attacking our merchants.";
 	next;
-	mes "[Karfa Clerk]";
+	mes "[Kafra Clerk]";
 	mes "Now this monsters has not been doing this before.";
 	mes "It may have to do with the warmer months.";
 	mes "Please help us out!";
 	set BEARD_QUEST,3;
 	next;
-	mes "[Karfa Clerk]";
+	mes "[Kafra Clerk]";
 L_REPEAT:
 	mes "Oh by the way, that Thread Merchant is somewhere around Alberta 60 and 100...";
 L_DONE:
@@ -213,16 +213,16 @@ alberta,1,1,1	script	BRDQ_MOBS	-1,{
 OnStart:
 	set $@beardMob,10;
 	set $@beardMobD,0;
-	monster "alberta",65,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",66,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",67,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",68,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",66,121,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",67,121,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",68,121,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",66,122,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",67,122,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
-	monster "alberta",68,122,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",65,120,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",66,120,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",67,120,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",68,120,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",66,121,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",67,121,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",68,121,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",66,122,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",67,122,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
+	monster "alberta",68,122,"Thief Bug Male",1054,1,"BRDQ_MOBS::OnDie";
 	end;
 OnDie:
 	set $@beardmob, $@beardmob - 1;

npc/custom/quests/elvenear.txt

@@ -63,6 +63,6 @@ L_Cancel:
 	mes "[Elven Ears quest]";
 	mes "Aw, what a shame";
 	mes "Giving up already?";
-	mes "Oh well maybe you will participate in tommorow's quest.";
+	mes "Oh well maybe you will participate in tomorrow's quest.";
 	close;
 }

npc/custom/quests/event_6_new_hats.txt

@@ -259,7 +259,7 @@ L_ITEM_1a:
 	close;
 L_ITEM_2a:
 	mes "[Pac]";
-	mes "Oh, dear. You need 300 Jellopys...";
+	mes "Oh, dear. You need 300 Jellopies...";
 	close;
 L1_29:
 	mes "[Pac]";
@@ -312,7 +312,7 @@ L2:
 	menu "Poring Hat",L2_26,"Sphinx Hat",L2_29;
 L2_26:
 	mes "[Pac]";
-	mes "You need 1 Poring Doll and 300 Jellopys for Poring Hat.";
+	mes "You need 1 Poring Doll and 300 Jellopies for Poring Hat.";
 	close;
 L2_29:
 	mes "[Pac]";

npc/custom/quests/jewel_case.txt

@@ -17,7 +17,7 @@ lighthalzen,108,229,2	script	La Fenn	766,{
 	mes "[La Fenn]";
 	if(BaseLevel<99) {
 		if(Q_99LVL) {
-			mes "You... You got younger!!! But you are defenitely YOU!";
+			mes "You... You got younger!!! But you are definitely YOU!";
 			mes "I couldn't think you were able to meet my condition...";
 			emotion ET_SCRATCH;
 			next;

npc/custom/quests/may_hats.txt

@@ -18,7 +18,7 @@ gonryun,187,140,4	script	Yakima	850,{
 	mes "[Yakima]";
 	mes callfunc("F_Hi");
 	mes "I can make some items for you.";
-	mes "They are quite rare novadays...";
+	mes "They are quite rare nowadays...";
 	specialeffect EF_HITBODY;
 	next;
 	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_EXIT;
@@ -107,8 +107,8 @@ M_3:
 
 M_4:
 	mes "[Yakima]";
-	mes "It's a fresh style! Ancessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
-	mes "It fits to Merchant classonly.";
+	mes "It's a fresh style! Accessory and a bag all in one! You'd get +2 STR... It's different from that sabby nest!";
+	mes "It fits to Merchant class only.";
 	emotion ET_SMILE;
 	next;
 	mes "[Yakima]";

npc/custom/quests/tha_statues.txt

@@ -149,7 +149,7 @@ tha_t11,16,16,4	script	Mihane	111,{
 	close;
 nook:
 	mes "[Mihane]";
-	mes "Sorry, You must start over from the begining.";
+	mes "Sorry, You must start over from the beginning.";
 	next;
 	set TSQ_CHK,0;
 	close;
@@ -166,7 +166,7 @@ tha_t11,85,85,4	script	Seranes	111,{
 	close;
 nook:
 	mes "[Seranes]";
-	mes "You did not follow the good order, starts again from the begining.";
+	mes "You did not follow the good order, starts again from the beginning.";
 	next;
 	set TSQ_CHK,0;
 	close;

npc/custom/quests/thq/THQS_ChattingNPC.txt

@@ -19,7 +19,7 @@ yuno,48,101,6	script	Notice	722,{
 	mes " ";
 	mes "Welcome to the Treasure Hunter's Guild House.";
 	mes "Feel free to drop in and look around";
-	mes "and feel free to become a memeber if you wish.";
+	mes "and feel free to become a member if you wish.";
 	mes " ";
 	mes "For membership applications please talk to Keegan";
 	mes "up the stairs and down the hall.";
@@ -58,7 +58,7 @@ yuno_in01,33,162,3	script	Smile Helper	92,{
 yuno_in01,22,162,6	script	Female Assasin	725,{
 	mes "[Sharlet]";
 	if (Event_THQS > 0) goto N_Member;
-	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
+	mes "Umm sorry I'm not gonna waste my time talking to you if you aren't even a member!";
 	close;
 N_Member:
 	set @TEMP,rand(1,2);
@@ -75,11 +75,11 @@ N_Chat2:
 	mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest.";
 	close;
 }
-//another usless member
+//another useless member
 yuno_in01,25,162,6	script	Female Wizard	123,{
 	mes "[Sasha]";
 	if (Event_THQS > 0) goto N_Member;
-	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
+	mes "Umm sorry I'm not gonna waste my time talking to you if you aren't even a member!";
 	close;
 N_Member:
 	set @TEMP,rand(2);
@@ -87,7 +87,7 @@ N_Member:
 	mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+".";
 	mes "Did you hear about that goat man running around in the trees?";
 	mes " ";
-	mes "Aperently his name is Baphomet and he has been runing around the Forest Maze out side of prontera for quite some time now.";
+	mes "Apparently his name is Baphomet and he has been running around the Forest Maze out side of Prontera for quite some time now.";
 	close;
 N_Chat:
 	mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest.";

npc/custom/quests/thq/THQS_GuildNPC.txt

@@ -17,7 +17,7 @@ yuno_in01,124,164,6	script	Guild Leader	108,{
 	mes "[Keegan]";
 	mes "What brings you here? Have something to say?";
 	next;
-	menu "I want to be a Treasure Hunter",-,"Take a New Quest.",N_NQuest,"Take me to the Official Shop.",N_OShop,"Nevermind.",N_NVM;
+	menu "I want to be a Treasure Hunter",-,"Take a New Quest.",N_NQuest,"Take me to the Official Shop.",N_OShop,"Never mind.",N_NVM;
 	if(Event_THQS==1) goto N_AlreadyReg;
 	mes "[Keegan]";
 	mes "Well "+strcharinfo(0)+" if you want to be a Treasure Hunter first you must.";
@@ -46,7 +46,7 @@ N_NoZeny:
 	close;
 N_HighPrice:
 	mes "[Keegan]";
-	mes "Well if you can't afford a small ^FF000025,000z^000000 you shouldent be a Treasure Hunter yet.";
+	mes "Well if you can't afford a small ^FF000025,000z^000000 you shouldn't be a Treasure Hunter yet.";
 	close;
 N_AlreadyReg:
 	mes "[Keegan]";
@@ -77,7 +77,7 @@ N_OShop:
 	end;
 N_NeedMem:
 	mes "[Keegan]";
-	mes "Im sorry only members may visit our private shop.";
+	mes "I'm sorry only members may visit our private shop.";
 	close;
 N_NVM:
 	mes "[Keegan]";

npc/custom/quests/thq/THQS_QuestNPC.txt

@@ -65,13 +65,13 @@ N_NewQuest:
 	mes "[Guy]";
 	mes "Ahh welcome fellow Treasure Hunter.";
 	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
-	mes "Would you like me to asign you a Quest?";
+	mes "Would you like me to assign you a Quest?";
 	next;
 	menu "Yes I would like a Quest Please.",-,"Sorry Guy no time today.",N_NoTime;
 	
 	mes "[Guy]";
 	mes "Ok lets see what quest we can give you today.";
-	mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
+	mes "The quest names in ^FF0000This Colour^000000 mean that they are more challenging then the rest, but have better rewards.";
 	next;
 	set #THQ_DELAY,(GetTime(DT_YEAR)*12*31*24+GetTime(DT_MONTH)*31*24+GetTime(DT_DAYOFMONTH)*24+GetTime(DT_HOUR) + 1); //you can get another quest after 1 hour [Lupus]
 	emotion ET_BEST;
@@ -122,10 +122,10 @@ N_JobList1:
 	mes "^FF0000------------^000000";
 	mes "This is an easy and low payed quest.";
 	mes " ";
-	mes "A wife came in asking us to find his husband, she seems to come in alot asking us to find him over and over again.";
+	mes "A wife came in asking us to find his husband, she seems to come in a lot asking us to find him over and over again.";
 	next;
 	mes "[Guy]";
-	mes "But he always seems to be around the same place so there isn't much looking involved,check the mountains 1 west and 1 north of prontera.";
+	mes "But he always seems to be around the same place so there isn't much looking involved,check the mountains 1 west and 1 north of Prontera.";
 	set one_qset,1;
 	goto L_QuestGiven;
 
@@ -146,19 +146,19 @@ N_HitList:
 	mes "^FF0000------------^000000";
 	mes "In this quest you get to see some action.";
 	mes " ";
-	mes "There has been a farmer that keeps having all his crops eaten by ^FF0000Thief Bugs, Porings, and Lunitics^000000 here is a lost of what I need you to do. He is waiting East of Prontera.";
+	mes "There has been a farmer that keeps having all his crops eaten by ^FF0000Thief Bugs, Porings, and Lunatics^000000 here is a lost of what I need you to do. He is waiting East of Prontera.";
 	next;
 	mes "[Guy]";
-	mes "Ok go to the east and bash those little bastards like there is no tommorow. When you are done with that list you have just discard it, but you will NOT get another one!.";
+	mes "Ok go to the east and bash those little bastards like there is no tomorrow. When you are done with that list you have just discard it, but you will NOT get another one!.";
 	set one_qset,3;
 	goto L_QuestGiven;
 
 N_SadWidow:
 	mes "^FF0000The Sad Widow^000000";
 	mes "^FF0000*************^000000";
-	mes "This is just another quest with possable well pay.";
+	mes "This is just another quest with possible well pay.";
 	mes " ";
-	mes "There is an old Widow in pontera, she recently lost her husband due to a monster attack.She has requested a Guild member to come talk to her at the Pontera Graveyard.";
+	mes "There is an old Widow in Prontera, she recently lost her husband due to a monster attack.She has requested a Guild member to come talk to her at the Prontera Graveyard.";
 	set one_qset,4;
 	goto L_QuestGiven;
 
@@ -203,7 +203,7 @@ N_WanderMan:
 	mes "^FF0000**************^000000";
 	mes "There is a woman in Payon that is in desperate for aid.";
 	mes " ";
-	mes "There is a woman in Payon named Molly please get to her as soon as possable the letter she sent here sounded like someone was killing her.";
+	mes "There is a woman in Payon named Molly please get to her as soon as possible the letter she sent here sounded like someone was killing her.";
 	set two_qset,4;
 	goto L_QuestGiven;
 
@@ -217,7 +217,7 @@ N_JobList3:
 	mes "^FF0000------------^000000";
 	mes "Have you ever been to Hell?";
 	mes " ";
-	mes "A man outside of ^FF0000Ant Hell^000000 has requested your audiance, I suggest you hurry.";
+	mes "A man outside of ^FF0000Ant Hell^000000 has requested your audience, I suggest you hurry.";
 	set three_qset,1;
 	goto L_QuestGiven;
 
@@ -234,20 +234,20 @@ N_Delivery1:
 N_ProntCulvert:
 	mes "^FF0000Prontera Culvert^000000";
 	mes "^FF0000----------------^000000";
-	mes "The bugs,They are everywere!.";
+	mes "The bugs,They are everywhere!.";
 	mes " ";
-	mes "The ^FF0000Prontera Culvert^000000 is out of control!Sign up as a volenteer to clean out some of the culvert.";
+	mes "The ^FF0000Prontera Culvert^000000 is out of control!Sign up as a volunteer to clean out some of the culvert.";
 	next;
-	mes "I know it seems like there is no stoping them but however many you kill does makes a differance. After you have signed up, inside the Culvert there will be a Knight that will give you a quest.";
+	mes "I know it seems like there is no stopping them but however many you kill does makes a difference. After you have signed up, inside the Culvert there will be a Knight that will give you a quest.";
 	set three_qset,3;
 	goto L_QuestGiven;
 
 N_CoalMine:
 	mes "^FF0000Trouble at the Coal Mine^000000";
 	mes "^FF0000************************^000000";
-	mes "The fun...err...trouble never stops in Rune Midgar.";
+	mes "The fun...err...trouble never stops in Rune Midgard.";
 	mes " ";
-	mes "Recently there was an acident at the coal mines. There was a huge chasm that released some undead Evil Druids.";
+	mes "Recently there was an accident at the coal mines. There was a huge chasm that released some undead Evil Druids.";
 	next;
 	mes "The Evil Druids started to turn all the workers into the undead. We do not know why, but we do not want to find out, contact a man named Rudolfo outside the Coal Mines.";
 	set three_qset,4;
@@ -282,7 +282,7 @@ N_Shoot:
 	mes "^FF0000----------^000000";
 	mes "A little girl is in trouble.";
 	mes " ";
-	mes "There is a little girl in trouble, her name is Dassy and she is ^FF0000east of the prontera fountan^000000.";
+	mes "There is a little girl in trouble, her name is Dassy and she is ^FF0000east of the Prontera fountain^000000.";
 	set four_qset,3;
 	goto L_QuestGiven;
 
@@ -305,7 +305,7 @@ N_JobList5:
 	mes "^FF0000-----------^000000";
 	mes "Easy for some very hard for others.";
 	mes " ";
-	mes "A man named Lithin wish's to give you a quest, you can find him north of prontera inside of ^FF0000The Hidden Temple^000000";
+	mes "A man named Lithin wishes to give you a quest, you can find him north of Prontera inside of ^FF0000The Hidden Temple^000000";
 	set five_qset,1;
 	goto L_QuestGiven;
 
@@ -314,7 +314,7 @@ N_PyrPRT1:
 	mes "^FF0000---------^000000";
 	mes "Its funny cause no one knows how these were really made.";
 	mes " ";
-	mes "Aperently the Pyramids have are beganing to be infested with undead activity,outside the pyramids a man will be waiting for you. He did no give us his name but he asked for you to hurry.";
+	mes "Apparently the Pyramids have are beginning to be infested with undead activity,outside the pyramids a man will be waiting for you. He did no give us his name but he asked for you to hurry.";
 	set five_qset,2;
 	goto L_QuestGiven;
 
@@ -331,9 +331,9 @@ N_Thinkfirst:
 N_Ghost:
 	mes "^FF0000The not so friendly ghost^000000";
 	mes "^FF0000*************************^000000";
-	mes "Well no one ever said Casper was nice behind the sceens.";
+	mes "Well no one ever said Casper was nice behind the scenes.";
 	mes " ";
-	mes "A wizard on the 3rd floor of geffen tower want's to talk to you about the anchient ruins underneath the city.";
+	mes "A wizard on the 3rd floor of Geffen tower wants to talk to you about the ancient ruins underneath the city.";
 	set five_qset,4;
 	goto L_QuestGiven;
 
@@ -342,12 +342,12 @@ N_JobList6:
 	mes "[Guy]";
 	mes "Ok you have a couple quests that can be done here.";
 	next;
-	menu "Package for thiefs",-,"Pyramid's part 2",N_PyrPRT2,"Special delivery",N_Delivery2,"^FF0000Geffenia^000000",N_Gef;
-	mes "^FF0000Package for thiefs^000000";
+	menu "Package for thieves",-,"Pyramid's part 2",N_PyrPRT2,"Special delivery",N_Delivery2,"^FF0000Geffenia^000000",N_Gef;
+	mes "^FF0000Package for thieves^000000";
 	mes "^FF0000------------------^000000";
 	mes "How ironic.";
 	mes " ";
-	mes "Deliver this Box to the Thiefs guild.";
+	mes "Deliver this Box to the Thieves guild.";
 	getitem 1083,1; //Delivery_Box__
 	set six_qset,1;
 	goto L_QuestGiven;
@@ -366,7 +366,7 @@ N_Delivery2:
 	mes "^FF0000----------------^000000";
 	mes "Well most of what we do is run packages, this is no different from other's.";
 	mes " ";
-	mes "Take this box, DO NOT OPEN IT! To a little girl in Lutie named Chirach she should be around santa.";
+	mes "Take this box, DO NOT OPEN IT! To a little girl in Lutie named Chirach she should be around Santa.";
 	getitem 1083,1; //Delivery_Box__
 	set six_qset,3;
 	goto L_QuestGiven;
@@ -374,9 +374,9 @@ N_Delivery2:
 N_Gef:
 	mes "^FF0000Geffenia^000000";
 	mes "^FF0000********^000000";
-	mes "The little children of Geffen have been haveing strange nightmares.";
+	mes "The little children of Geffen have been having strange nightmares.";
 	mes " ";
-	mes "We belive that the ruins underneath geffen are causeing this problem, talk to a Wizard named Zuuzuu inside Geffen Tower for your mission.";
+	mes "We believe that the ruins underneath Geffen are causing this problem, talk to a Wizard named Zuuzuu inside Geffen Tower for your mission.";
 	set six_qset,4;
 	goto L_QuestGiven;
 
@@ -390,7 +390,7 @@ N_JobList7:
 	mes "^FF0000-----------^000000";
 	mes "Can't say no to some good apple juice.";
 	mes " ";
-	mes "There is a little girl up in prontera Square a bit north from the fountain, go talk to her.";
+	mes "There is a little girl up in Prontera Square a bit north from the fountain, go talk to her.";
 	set seven_qset,1;
 	goto L_QuestGiven;
 
@@ -407,9 +407,9 @@ N_Delivery3:
 N_GTB:
 	mes "^FF0000Golden Thief Bug^000000";
 	mes "^FF0000****************^000000";
-	mes "The prontera Culvert has never been the same...";
+	mes "The Prontera Culvert has never been the same...";
 	mes " ";
-	mes "Well there have been reports of a Golden Thief Bug running around the bottem on the Culvert. Talk to a Knight inside the Culvert.";
+	mes "Well there have been reports of a Golden Thief Bug running around the bottom of the Culvert. Talk to a Knight inside the Culvert.";
 	set seven_qset,3;
 	goto L_QuestGiven;
 
@@ -418,7 +418,7 @@ N_EvilPirates:
 	mes "^FF0000************^000000";
 	mes "A ghost ship has washed up on shore on an island outside of Izlude.";
 	mes " ";
-	mes "A female assasin has a quest for you, she is waiting outside the Ghost Ship.There have been reports of evil undead pirates lurking around inside the ship.";
+	mes "A female assassin has a quest for you, she is waiting outside the Ghost Ship. There have been reports of evil undead pirates lurking around inside the ship.";
 	set seven_qset,4;
 	goto L_QuestGiven;
 
@@ -432,7 +432,7 @@ N_JobList8:
 	mes "^FF0000------------^000000";
 	mes "Sound gross to some good to others.";
 	mes " ";
-	mes "There is a little girl up in prontera Square a bit north from the fountain, go talk to her.";
+	mes "There is a little girl up in Prontera Square a bit north from the fountain, go talk to her.";
 	set eight_qset,1;
 	goto L_QuestGiven;
 
@@ -469,7 +469,7 @@ N_JobList9:
 	mes "[Guy]";
 	mes "Ok you have a couple quests that can be done here.";
 	next;
-	menu "Smelly Box",-,"Payon Cave",N_PayonC,"^FF0000Sohee's Everywere!^000000",N_Sohee,"^FF0000Moonlight Flower^000000",N_Moonlight;
+	menu "Smelly Box",-,"Payon Cave",N_PayonC,"^FF0000Sohee's Everywhere!^000000",N_Sohee,"^FF0000Moonlight Flower^000000",N_Moonlight;
 	mes "^FF0000Smelly Box^000000";
 	mes "^FF0000----------^000000";
 	mes "Oh god please get this out of here fast.";
@@ -480,30 +480,30 @@ N_JobList9:
 	goto L_QuestGiven;
 
 N_Sohee:
-	mes "^FF0000Sohee's Everywere!^000000";
+	mes "^FF0000Sohee's Everywhere!^000000";
 	mes "^FF0000******************^000000" ;
-	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
+	mes "Hmmm seems a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
 	mes "Well what we know about Payon is that a while ago there was a freak fire that burnt down the old school.";
 	next;
 	mes "The strange thing about what happened was that the children inside did not seem to die from the flames.";
-	mes "Speak to the little school girl somewere in Payon.";
+	mes "Speak to the little school girl somewhere in Payon.";
 	set nine_qset,2;
 	goto L_QuestGiven;
 
 N_Moonlight:
 	mes "^FF0000Moonlight Flower^000000";
 	mes "^FF0000****************^000000" ;
-	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
+	mes "Hmmm seems a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
-	mes "Well I don't know much about this, it has to do with the deepest reagions of Payon Cave, We don't know much because no one ever seems to make it back alive.";
+	mes "Well I don't know much about this, it has to do with the deepest regions of Payon Cave, We don't know much because no one ever seems to make it back alive.";
 	set nine_qset,3;
 	goto L_QuestGiven;
 
 N_PayonC:
 	mes "^FF0000Payon Cave^000000";
 	mes "^FF0000----------^000000" ;
-	mes "Hmmm seem's a man named Jack wants to speak to you in the Archer Guild House.";
+	mes "Hmmm seems a man named Jack wants to speak to you in the Archer Guild House.";
 	mes " ";
 	mes "The farther we go into the cave the stranger it gets.";
 	set nine_qset,4;
@@ -520,7 +520,7 @@ N_JobList10:
 	mes "^FF0000-------------^000000";
 	mes "Package to Morroc";
 	mes " ";
-	mes "There is nothing writen on this box but a notice to deliver it to a man Kreg.";
+	mes "There is nothing written on this box but a notice to deliver it to a man Kreg.";
 	getitem 1082,1; //Delivery_Box_
 	set ten_qset,1;
 	goto L_QuestGiven;
@@ -539,7 +539,7 @@ N_Phreeoni:
 	mes "^FF0000********^000000";
 	mes "He is big and Pink and you run and hide!";
 	mes " ";
-	mes "This guy just poped into some hole one day, He dosent look that tough but you would be supprised. Talk to a man named Caral outside of Ant Hell.";
+	mes "This guy just poped into some hole one day, He doesn't look that tough but you would be surprised. Talk to a man named Caral outside of Ant Hell.";
 	set ten_qset,3;
 	goto L_QuestGiven;
 

npc/custom/quests/thq/THQS_Quests.txt

@@ -50,7 +50,7 @@ N_QuestStart:
 		mes "Weren't you supposed to deliver me a box? Where is it?";
 		close;
 	}
-	mes "Ahh, you must be from the Treasure Hunter Agensy. Do you have my bow??";
+	mes "Ahh, you must be from the Treasure Hunter Agency. Do you have my bow??";
 	mes " ";
 	mes "Ahh, good,thank you for your time. Take this Treasure Token.";
 	delitem 1072,1;
@@ -64,7 +64,7 @@ prt_fild06,37,192,6	script	Farmer	125,{
 	if (one_qset == 3 && countitem(909) > 19 && countitem(955) > 19 && countitem(914) > 19 && countitem(705) > 19) goto N_QuestComp;
 	if (one_qset==3) goto N_QuestStart;
 	mes "[Billy-Bob]";
-	mes "Arrrg!... Those Bastard Bugs have eaten everything, this place donest even look like my farm anymore!!";
+	mes "Arrrg!... Those Bastard Bugs have eaten everything, this place doesn't even look like my farm anymore!!";
 	close;
 N_QuestComp:
 	mes "[Billy-Bob]";
@@ -82,8 +82,8 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Billy-Bob]";
-	mes "Those Bastard Bugs are Everywere!!!";
-	mes "You must be from the guild! OK, bring me 20 Worm Peelings, 20 Jellopys, 20 fluff and 20 Clovers.";
+	mes "Those Bastard Bugs are Everywhere!!!";
+	mes "You must be from the guild! OK, bring me 20 Worm Peelings, 20 Jellopies, 20 fluff and 20 Clovers.";
 	close;
 }
 //1-4
@@ -108,7 +108,7 @@ N_QuestStart:
 	mes "[Old Lady]";
 	mes "So your the one that has come to help me?";
 	mes " ";
-	mes "Ok well this is what I wanted you to do,this greave beside me is my husbands grave and I promised him that I would bury some Mementos with him, The problem is that I have no Mementos...";
+	mes "Ok well this is what I wanted you to do, this greave beside me is my husbands grave and I promised him that I would bury some Mementos with him, The problem is that I have no Mementos...";
 	next;
 	mes "[Old Lady]";
 	mes "Bring me 15 Mementos, please.";
@@ -132,7 +132,7 @@ N_QuestComp:
 	mes " ";
 	mes "Sorry to inform you but you have been evicted, please move out within 3-5 days.";
 	mes " ";
-	mes "-Managment";
+	mes "-Management";
 	next;
 	mes "[Erika]";
 	mes "Oh... um... Well fuck, that bastard thinks he can kick me out!!!!! He's got another thing coming!";
@@ -193,7 +193,7 @@ N_QuestComp:
 N_QuestStart:
 	mes "[Lenith]";
 	mes "Hello, my name is Lenith and I have a quest for you.";
-	mes "Well resently a bunch of stupid bears stole the supers off all my bee's nests...Stupid bears.";
+	mes "Well recently a bunch of stupid bears stole the supers off all my bee's nests...Stupid bears.";
 	mes " ";
 	mes "What I need you to do is find me some more honey so these bee's can get through the winter. I will need about 20 Honey.";
 	close;
@@ -219,7 +219,7 @@ N_QuestComp:
 N_QuestStart:
 	mes "[Molly]";
 	mes "Wow you must be the brave man from the treasure hunter guild!";
-	mes "Ok here is whats happening, I don't know what started it but there is a strange Ronan Skeleton running aroung the woods 2 East from here.";
+	mes "Ok here is whats happening, I don't know what started it but there is a strange Ronan Skeleton running around the woods 2 East from here.";
 	next;
 	mes "[Molly]";
 	mes "We have try to kill him in the past but it was not...ummm...It was a bad idea. What I want you to do is go there and bring me back his Skull as proof of you killing him.";
@@ -266,7 +266,7 @@ yuno_fild01,186,162,6	script	Flank	73,{
 	close;
 N_QuestComp:
 	mes "[Flank]";
-	mes "Perfect right on time, now I must be going to plant this bomb.... Err I meen give this package to my mother for her birthday.";
+	mes "Perfect right on time, now I must be going to plant this bomb.... Err I mean give this package to my mother for her birthday.";
 	next;
 	mes "[Flank]";
 	mes "Thanks";
@@ -283,24 +283,24 @@ N_QuestStart:
 	close;
 }
 //3-3 Goes to 7-3 using callfunc
-prt_sewb1,120,245,6	script	Sewer Managment Knight	705,{
+prt_sewb1,120,245,6	script	Sewer Management Knight	705,{
 	if (three_qset == 3 && countitem(955) > 149) goto N_QuestComp;
 	if (three_qset == 3) goto N_QuestStart;
 	if (seven_qset == 3) goto N_QuestStart2;
-	mes "[Sewer Managmant]";
+	mes "[Sewer Management]";
 	mes "Live dosent get any worse for me,working in the bug filled Culvert every day...";
 	close;
 N_QuestComp:
-	mes "[Sewer Managment]";
+	mes "[Sewer Management]";
 	mes "Well that looked like it was no trouble for you.";
-	mes "Thanks have these 4 Treause Tokens.";
+	mes "Thanks have these 4 Treasure Tokens.";
 	delitem 955,150;
 	set #Treasure_Token,#Treasure_Token+4;
 	set three_qset,0;
 	set On_Quest,0;
 	close;
 N_QuestStart:
-	mes "[Sewer Managmant]";
+	mes "[Sewer Management]";
 	mes "For a while now we have had monster, mostly bugs infesting the culvert...";
 	mes " ";
 	mes "What I want you to do is kinda clean some of it out, every little bit counts.";
@@ -320,7 +320,7 @@ mjolnir_02,87,357,6	script	Man#01	51,{
 N_QuestComp:
 	mes "[Rudolfo]";
 	mes "Well its good to see that you have come back alive.";
-	mes "I had my doughts but thank you for your help.";
+	mes "I had my doubts but thank you for your help.";
 	mes " ";
 	mes "Here have these 4 Treasure Tokens.";
 	delitem 1041,50;
@@ -332,7 +332,7 @@ N_QuestStart:
 	mes "[Rudolfo]";
 	mes "Hello, you must be from the Treasure Hunter Guild.";
 	mes " ";
-	mes "They must have filled you in on what is happening on the lower levels of this Coal Mine, I know its desturbing and we are still trying to figure out why and how 2 Evil Druids got down there.";
+	mes "They must have filled you in on what is happening on the lower levels of this Coal Mine, I know its disturbing and we are still trying to figure out why and how 2 Evil Druids got down there.";
 	mes " ";
 	mes "Well what I want you to do is bring me 50 Lantern's as proof that you have cleaned some of them out, any loot you find down there you may keep other then what I have asked you to get for me.";
 	close;
@@ -343,7 +343,7 @@ pay_arche,45,138,6	script	Flora	724,{
 	if (four_qset == 1 && countitem(957) > 49) goto N_QuestComp;
 	if (four_qset == 1) goto N_QuestStart;
 	mes "[Flora]";
-	mes "Well hello be carfull in the cave, we have heard reports of Undead monster funning around.";
+	mes "Well hello be careful in the cave, we have heard reports of Undead monster funning around.";
 	close;
 N_QuestComp:
 	mes "[Flora]";
@@ -359,9 +359,9 @@ N_QuestStart:
 	mes "[Flora]";
 	mes "Well hello there.";
 	mes " ";
-	mes "Well this is what I need you to do, bring me 50 Decayed Nails - awile back Payon Cave used to be a safe place to go...But now things have gone out of controll and Zombies have invaded the first floor...";
+	mes "Well this is what I need you to do, bring me 50 Decayed Nails - a while back Payon Cave used to be a safe place to go...But now things have gone out of control and Zombies have invaded the first floor...";
 	mes " ";
-	mes "There is also these new monsters that have just poped out of no were, we call them Flaming Bastards...Be carfull if you arn't powerfull yet because they are very strong.";
+	mes "There is also these new monsters that have just popped out of no were, we call them Flaming Bastards...Be careful if you aren't powerful yet because they are very strong.";
 	next;
 	mes "[Flora]";
 	mes "Good Luck";
@@ -383,10 +383,10 @@ N_QuestComp:
 	mes "[Zed]";
 	mes "Dear god took you long enough you bastard!";
 	mes "You know how much my time is worth!!!!";
-	mes "Your slow and I'm never gona recomend a job for you, Gimmie my staff and get out of me face!";
+	mes "Your slow and I'm never gonna recommend a job for you, Gimmie my staff and get out of me face!";
 	next;
 	mes "[Zed]";
-	mes "Well you can take this crapy Treausre Token.";
+	mes "Well you can take this crappy Treasure Token.";
 	delitem 1999,1;
 	set On_Quest,0;
 	set four_qset,0;
@@ -479,7 +479,7 @@ N_QuestStart:
 	mes "Well hello.";
 	mes "Welcome to the Forest Maze, I have a task for you.";
 	mes " ";
-	mes "Ever heard of a moster called a Savage? It looks like a boar but it makes very annoying noices.";
+	mes "Ever heard of a monster called a Savage? It looks like a boar but it makes very annoying noises.";
 	mes "What I want you to do is bring me 15 Manes from the savages.";
 	close;
 }
@@ -512,26 +512,26 @@ N_QuestStart2:
 	callfunc "six_qset2";
 }
 //5-3;
-geffen,57,130,6	script	Blonde Girl	724,{
+geffen,57,130,6	script	Blond Girl	724,{
 	if (five_qset == 3 && countitem(744) > 0) goto N_QuestComp;
 	if (five_qset == 3) goto N_QuestStart;
-	mes "[Blonde Girl]";
+	mes "[Blond Girl]";
 	mes "I wonder what happened to my flowers";
 	close;
 N_QuestComp:
-	mes "[Blonde Girl]";
+	mes "[Blond Girl]";
 	mes "Oh are these my flower! To bad I don't want them anymore...";
 	mes " ";
 	mes "You can keep them is you want.";
 	next;
-	mes "[Blonde Girl]";
+	mes "[Blond Girl]";
 	mes "Here take this Treasure Token as a reward.";
 	set five_qset,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 N_QuestStart:
-	mes "[Blonde Girl]";
+	mes "[Blond Girl]";
 	mes "Hello, did you bring me flowers!?!";
 	close;
 }
@@ -555,9 +555,9 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Wizard]";
-	mes "Hello, the reason why I brought you here was because of a long time ago I made a friend, which happened to be a Whipser.";
+	mes "Hello, the reason why I brought you here was because of a long time ago I made a friend, which happened to be a Whisper.";
 	mes "He told me that he was always bullied by the other ghosts down there and I haven't seen him in a while.";
-	mes "Thinking of the worse case here, I want vengance!";
+	mes "Thinking of the worse case here, I want vengeance!";
 	mes " ";
 	mes "Bring me 50 Fabrics!";
 	close;
@@ -568,7 +568,7 @@ moc_prydb1,47,132,6	script	Thief	48,{
 	if (six_qset == 1 && countitem(1083) > 0) goto N_QuestComp;
 	if (six_qset == 1) goto N_QuestStart;
 	mes "[Thief]";
-	mes "Welcome to the Thiefs Guild.";
+	mes "Welcome to the Thieves Guild.";
 	close;
 N_QuestComp:
 	mes "[Thief]";
@@ -591,8 +591,8 @@ function	script	six_qset2	{
 	if (six_qset == 2 && countitem(930) > 29) goto N_QuestComp2;
 	mes "[Strange Man]";
 	mes "Another quest for you I have.";
-	mes "Futher into the pyramid you must go.";
-	mes "Fighting Mummys is future for you.";
+	mes "Further into the pyramid you must go.";
+	mes "Fighting Mummies is future for you.";
 	mes " ";
 	mes "Bring back for me their wrappings you must.";
 	mes "It is 30 Rotten bandages I desire.";
@@ -637,7 +637,7 @@ gef_tower,52,87,6	script	Wizard#02	735,{
 	if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
 	if (six_qset == 4) goto N_QuestStart;
 	mes "[Zuuzuu]";
-	mes "Hello, welcome to geffen tower.";
+	mes "Hello, welcome to Geffen tower.";
 	close;
 N_QuestComp:
 	mes "[Wizard]";
@@ -651,14 +651,14 @@ N_QuestComp:
 	next;
 	mes "[Zuuzuu]";
 	mes "Oh dear god!!!";
-	mes "One of those evil mosters has followed you up here, Kill it, Kill it!!!";
+	mes "One of those evil monsters has followed you up here, Kill it, Kill it!!!";
 	next;
 	monster "gef_tower",42,89,"Evil Nightmare",1061,1;
 	close;
 N_QuestStart:
 	mes "[Zuuzuu]";
 	mes "Hello, the reason I sent for a young adventurer was because of the problems we are having under the tower.";
-	mes "There seem to be more ghosts day after day down there. What I need you to do is go down there and find these mosters we call Nightmares.";
+	mes "There seem to be more ghosts day after day down there. What I need you to do is go down there and find these monsters we call Nightmares.";
 	mes " ";
 	mes "You must slay them and bring me 20 of there horse shoes.";
 	close;
@@ -717,16 +717,16 @@ N_QuestStart:
 //7-3
 function	script	seven_qset-3	{
 	if (seven_qset == 3 && countitem(969) > 0) goto N_QuestComp2;
-	mes "[Sewer Managment]";
-	mes "Well there have been reports of a Golden Thief Bug running around the bottem on the Culvert";
+	mes "[Sewer Management]";
+	mes "Well there have been reports of a Golden Thief Bug running around the bottom on the Culvert";
 	mes " ";
 	mes "Bring me 1 Gold Bar from him.";
 	close;
 N_QuestComp2:
-	mes "[Sewer Managment]";
+	mes "[Sewer Management]";
 	mes "Thank you for helping me.";
 	next;
-	mes "[Sewer Managment]";
+	mes "[Sewer Management]";
 	mes "Here take these 4 Treasure Tokens.";
 	delitem 969,1;
 	set seven_qset,0;
@@ -754,7 +754,7 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Scarlet]";
-	mes "Good your here. Ok there are reports of an old captain named Drake abored this ship. Kill Him!";
+	mes "Good your here. Ok there are reports of an old captain named Drake aborted this ship. Kill Him!";
 	mes " ";
 	mes "Bring me his Saber as proof!";
 	close;
@@ -824,7 +824,7 @@ N_QuestComp:
 N_QuestStart:
 	mes "[Zack]";
 	mes "Hello,the reason why I brought you here was because of a very strange monster known as Baphomet.";
-	mes "People say that Baphomet guilds the gate to the under-world but I don't belive them, Kill Baphomet!";
+	mes "People say that Baphomet guilds the gate to the under-world but I don't believe them, Kill Baphomet!";
 	mes " ";
 	mes "Bring me his Evil Horn!";
 	close;
@@ -864,7 +864,7 @@ geffen_in,168,124,6	script	Mage	48,{
 	close;
 N_QuestComp:
 	mes "[Mage]";
-	mes "Thank you for this delivery. Sorry about the smell, Its a box of Toad Tounges";
+	mes "Thank you for this delivery. Sorry about the smell, Its a box of Toad Tongues";
 	next;
 	mes "[Mage]";
 	mes "Here take this Treasure Token as a reward.";
@@ -875,7 +875,7 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Mage]";
-	mes "Hello "+strcharinfo(0)+", Where is my box of Toad Tounges?.";
+	mes "Hello "+strcharinfo(0)+", Where is my box of Toad Tongues?.";
 	close;
 }
 //9-2;
@@ -927,7 +927,7 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Jack]";
-	mes "Well I don't know much about this, it has to do with the deepest reagions of Payon Cave. We don't know much because no one ever seems to make it back alive. We suspect a monster we call the Moonlight Flower";
+	mes "Well I don't know much about this, it has to do with the deepest regions of Payon Cave. We don't know much because no one ever seems to make it back alive. We suspect a monster we call the Moonlight Flower";
 	mes " ";
 	mes "Bring me back 1 Nine Tales!";
 	close;
@@ -935,7 +935,7 @@ N_QuestStart2:
 //9-4
 	if (nine_qset == 4 && countitem(901) > 39) goto N_QuestComp2;
 	mes "[Jack]";
-	mes "Hello, we need you to investigate some crap in the 3rd level of payon.";
+	mes "Hello, we need you to investigate some crap in the 3rd level of Payon.";
 	mes " ";
 	mes "Bring me back 40 Daenggie's.";
 	close;
@@ -995,7 +995,7 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Man]";
-	mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!";
+	mes "Tony the Tiger is on Crack! He must be stopped, KILL HIM!";
 	mes " ";
 	mes "Bring me back 1 Tiger's_Skin!";
 	close;
@@ -1020,9 +1020,9 @@ N_QuestComp:
 	close;
 N_QuestStart:
 	mes "[Caral]";
-	mes "Phreeoni the Pink Fluff is terrorizing little novices! He must be stoped, KILL HIM!";
+	mes "Phreeoni the Pink Fluff is terrorizing little novices! He must be stopped, KILL HIM!";
 	mes " ";
-	mes "Bring me back 1 Tounge!";
+	mes "Bring me back 1 Tongue!";
 	close;
 }
 //10-4

npc/custom/quests/thq/THQS_TTShop.txt

@@ -20,10 +20,10 @@ prt_in,159,172,0	warp	thqwrp	3,3,yuno_in01,123,155
 
 prt_in,164,174,1	script	Treasure Hunter's Shop	65,{
 	mes "[Ash]";
-	mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop.";
+	mes "Ahh, "+strcharinfo(0)+"! Welcome to the Official Treasure Hunter's Guild Shop.";
 	mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
 	next;
-	menu "How does this place work?",-,"What do you have in stock?",N_Shop,"Nevermind",N_NVM;
+	menu "How does this place work?",-,"What do you have in stock?",N_Shop,"Never mind",N_NVM;
 	mes "[Ash]";
 	mes "Well you see here you can exchange your treasure hunter tokens for zeny or rare weapons forged by our blacksmiths.";
 	mes " ";
@@ -43,11 +43,11 @@ N_Shop:
 	mes " ";
 	mes "(Note T stands for a Treasure Token.)";
 	next;
-	menu "Trade for Zeny",-,"Trade for Weapons",N_BuyWeps,"Trade for Cards",N_BuyCards,"Nevermind",N_NVM;
+	menu "Trade for Zeny",-,"Trade for Weapons",N_BuyWeps,"Trade for Cards",N_BuyCards,"Never mind",N_NVM;
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "1000z - 1T",-,"10000z - 10T",N_10T,"100000z - 100T",N_100T,"Nevermind",N_NVM;
+	menu "1000z - 1T",-,"10000z - 10T",N_10T,"100000z - 100T",N_100T,"Never mind",N_NVM;
 	if (#Treasure_Token > 0) goto N_GetZeny1k;
 	mes "You don't have enough tokens!";
 	close;
@@ -76,12 +76,12 @@ N_BuyWeps:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Axe's",-,"1 Handed Swords",N_1HandSword,"2 Handed Swords",N_2HandSword,"Book's",N_Book,"Bow's",N_Bow,"Katar's",N_Katar,"Knuckle's",N_Knuckle,"Mace's",N_Mace,"Whips",N_Whip,"Wands",N_Wand,"Nevermind",N_NVM;
+	menu "Axe's",-,"1 Handed Swords",N_1HandSword,"2 Handed Swords",N_2HandSword,"Book's",N_Book,"Bow's",N_Bow,"Katar's",N_Katar,"Knuckle's",N_Knuckle,"Mace's",N_Mace,"Whips",N_Whip,"Wands",N_Wand,"Never mind",N_NVM;
 
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Sabbath - 160T",-,"Slaughter - 160T",N_Slau,"Tomahawk - 180T",N_Toma,"Great Axe - 200T",N_GreatA,"Guillotine - 200T",N_Guill,"Nevermind",N_NVM;
+	menu "Sabbath - 160T",-,"Slaughter - 160T",N_Slau,"Tomahawk - 180T",N_Toma,"Great Axe - 200T",N_GreatA,"Guillotine - 200T",N_Guill,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 160) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-160;
@@ -122,7 +122,7 @@ N_1HandSword:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Edge - 130T",-,"Solar Sword - 150T",N_SolarS,"Caesar's Sword - 170T",N_CaesarS,"Nagan - 180T",N_Nagan,"Immaterial Sword - 200T",N_ImmatS,"Excalibur - 200T",N_Excal,"Byeollungum - 240T",N_Byeoll,"Talefing - 320T",N_Talef,"Nevermind",N_NVM;
+	menu "Edge - 130T",-,"Solar Sword - 150T",N_SolarS,"Caesar's Sword - 170T",N_CaesarS,"Nagan - 180T",N_Nagan,"Immaterial Sword - 200T",N_ImmatS,"Excalibur - 200T",N_Excal,"Byeollungum - 240T",N_Byeoll,"Talefing - 320T",N_Talef,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 130) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-130;
@@ -177,7 +177,7 @@ N_2HandSword:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Dragon Slayer - 140T",-,"Schweizersabel - 200T",N_Schwe,"Katzbalger - 300T",N_Katzb,"Muramasa - 300T",N_Murama,"Masamune - 400T",N_Masamu,"Balmung - 2000T",N_Balmu,"Nevermind",N_NVM;
+	menu "Dragon Slayer - 140T",-,"Schweizersabel - 200T",N_Schwe,"Katzbalger - 300T",N_Katzb,"Muramasa - 300T",N_Murama,"Masamune - 400T",N_Masamu,"Balmung - 2000T",N_Balmu,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 140) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-140;
@@ -220,7 +220,7 @@ N_Book:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Book of the Burning Sun - 80T",-,"Book of the Rough Seas - 80T",N_RoughSea,"Book of the Dry Winds - 80T",N_DryWinds,"Book of the Ripe Earth - 80T",N_RipeEarth,"Book of the Revelations - 80T",N_Revela,"Bible - 90T",N_Bible,"Tablet - 120T",N_Tablet,"Nevermind",N_NVM;
+	menu "Book of the Burning Sun - 80T",-,"Book of the Rough Seas - 80T",N_RoughSea,"Book of the Dry Winds - 80T",N_DryWinds,"Book of the Ripe Earth - 80T",N_RipeEarth,"Book of the Revelations - 80T",N_Revela,"Bible - 90T",N_Bible,"Tablet - 120T",N_Tablet,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 80) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-80;
@@ -268,7 +268,7 @@ N_Bow:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Rudra's Bow - 150T",-,"Roguemaster's Bow - 150T",N_Rogue,"Nevermind",N_NVM;
+	menu "Rudra's Bow - 150T",-,"Roguemaster's Bow - 150T",N_Rogue,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 150) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-150;
@@ -286,7 +286,7 @@ N_Katar:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Katar of the Blazing Rage - 70T",-,"Katar of the Cold Icicle - 70T",N_ColdIce,"Katar of the Piercing Wind - 70T",N_PiercWind,"Katar of the Dusty Thornbush - 70T",N_DustyT,"Sharpened Legbone of Ghoul - 125T",N_Legbone,"Infiltrator - 150T",N_Infiltra,"Nevermind",N_NVM;
+	menu "Katar of the Blazing Rage - 70T",-,"Katar of the Cold Icicle - 70T",N_ColdIce,"Katar of the Piercing Wind - 70T",N_PiercWind,"Katar of the Dusty Thornbush - 70T",N_DustyT,"Sharpened Legbone of Ghoul - 125T",N_Legbone,"Infiltrator - 150T",N_Infiltra,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 70) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-70;
@@ -328,7 +328,7 @@ N_Knuckle:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Kaiser Knuckle - 75T",-,"Berserk - 75T",N_Berserk,"Nevermind",N_NVM;
+	menu "Kaiser Knuckle - 75T",-,"Berserk - 75T",N_Berserk,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 75) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-75;
@@ -346,7 +346,7 @@ N_Mace:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Spike - 65T",-,"Slash - 90T",N_Slash,"Grand Cross - 100T",N_GrandC,"Quadrille - 110T",N_Quadr,"Mjolnir - 1000T",N_MJ,"Nevermind",N_NVM;
+	menu "Spike - 65T",-,"Slash - 90T",N_Slash,"Grand Cross - 100T",N_GrandC,"Quadrille - 110T",N_Quadr,"Mjolnir - 1000T",N_MJ,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 65) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-65;
@@ -382,7 +382,7 @@ N_Whip:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Rapture Rose - 50T",-,"Chemeti - 65T",N_Chemeti,"Nevermind",N_NVM;
+	menu "Rapture Rose - 50T",-,"Chemeti - 65T",N_Chemeti,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 50) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-50;
@@ -400,7 +400,7 @@ N_Wand:
 	mes "[Ash]";
 	mes "This is what we have to offer.";
 	next;
-	menu "Mighty Staff - 90T",-,"Wizardry Staff - 150T",N_Wizardry,"Bone Wand - 110T",N_BoneW,"Staff of Soul - 120T",N_SOSoul,"Nevermind",N_NVM;
+	menu "Mighty Staff - 90T",-,"Wizardry Staff - 150T",N_Wizardry,"Bone Wand - 110T",N_BoneW,"Staff of Soul - 120T",N_SOSoul,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 90) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-90;
@@ -433,7 +433,7 @@ N_BuyCards:
 	menu "Poring Card - 2T",-,"Pasana Card - 420T",N_CPasana,"Dokebi Card - 420T",N_CDok,"Swordfish Card - 420T",N_CSFish,
 		"Sandman Card - 420T",N_CSMan,"Drainliar Card - 360T",N_CDrain,"Kaho Card - 360T",N_CKaho,"Mandragora Card - 360T",N_CMand,
 		"Vadon Card - 360T",N_CVadon,"Mummy Card - 540T",N_CMummy,"Zenorc Card - 240T",N_CZeno,"Condor Card - 240T",N_CCond,
-		"Zombie Card - 210T",N_CZomb,"Nevermind",N_NVM;
+		"Zombie Card - 210T",N_CZomb,"Never mind",N_NVM;
 
 	if (#Treasure_Token < 2) goto N_NeedToken;
 	set #Treasure_Token,#Treasure_Token-2;

npc/custom/quests/umbalian_language.txt

@@ -156,7 +156,7 @@ L_AGAIN:
 
 yuno,157,366,2	script	Wise Man Fabius	743,{
 	mes "[Fabius]";
-	if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled
+	if(event_umbala >= 3) set umb_lang,2; //You already learned Umbalian language from Umbalian Chief. So this Quest is disabled
 	if(umb_lang<2) goto L_QUEST;
 	mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!";
 	close;
@@ -166,13 +166,13 @@ L_QUEST:
 	delitem 7118,1;	//Items: Torn Scroll,
 	delitem 7117,1;//Items: Torn Spell Book,
 	emotion ET_THANKS;
-	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";
+	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggdrasil.";
 	next;
 	mes "[Fabius]";
 	mes "But enough talk, you're just eager to get your reward aren't you?  Well it may not sound much, but my reward for you is knowledge...";
 	next;
 	mes "[Fabius]";
-	mes "Actually it is knowledge of the Umbalian people. They are connected to this world of Midgard in some special way, we just can't confirm it yet. There is a theory that they may be like the elves and protect the ancient tree of Yggsadril.";
+	mes "Actually it is knowledge of the Umbalian people. They are connected to this world of Midgard in some special way, we just can't confirm it yet. There is a theory that they may be like the elves and protect the ancient tree of Yggdrasil.";
 	next;
 	mes "[Fabius]";
 	mes "And I, a great wise man of Yuno, will teach you their language!";
@@ -192,7 +192,7 @@ L_DONE:
 	mes "Argh! My three students ran off with my references! Hey you! Can you get them back for me? I'll gladly reward you.";
 	next;
 	mes "[Fabius]";
-	mes "From what I know, they're in different seperate towns making something out of themselves.";
+	mes "From what I know, they're in different separate towns making something out of themselves.";
 	if(umb_marie==0 && umb_mason==0 && umb_mojo==0) goto L_NOT_MET;
 	if(umb_marie==1) mes "Oh... You found Marie in Amatsu.";
 	if(umb_mojo==1) mes "You saw Mojo in Aldebaran?";

npc/custom/woe_controller.txt

@@ -359,7 +359,7 @@ while(1) {
 						set .Size, getarraysize($WOE_CONTROL);
 					case 3:
 						mes "[New Session]";
-						mes ((.@d)?"Session added.":"Cancelled.");
+						mes ((.@d)?"Session added.":"cancelled.");
 						next;
 						set .@d,1;
 					case 2:
@@ -391,7 +391,7 @@ while(1) {
 			set .@j, select(" ~ ^FF0000Delete session...^000000: ~ ^777777Cancel^000000");
 			mes "[Remove Session]";
 			if (.@j == 2)
-				mes "Cancelled.";
+				mes "cancelled.";
 			else {
 				deletearray $WOE_CONTROL[.@i*4],4;
 				set .Size, getarraysize($WOE_CONTROL);
@@ -409,7 +409,7 @@ while(1) {
 			next;
 			set .@i, select(" ~ ^0055FFReload settings...^000000: ~ ^777777Cancel^000000");
 			mes "[Reload Settings]";
-			if (.@i == 2) mes "Cancelled.";
+			if (.@i == 2) mes "cancelled.";
 			else {
 				set .Init,1;
 				donpcevent "WOE_CONTROL::OnMinute00";
@@ -431,7 +431,7 @@ while(1) {
 			set .@i, select(" ~ ^FF0000End session...^000000:"+((.Options&1)?" ~ ^FF0000End session without rewards...^000000":"")+": ~ ^777777Cancel^000000");
 			mes "[Force Agit End]";
 			if (.@i == 3)
-				mes "Cancelled.";
+				mes "cancelled.";
 			else {
 				set .ForceEnd, .@i;
 				donpcevent "WOE_CONTROL::OnWOEEnd";

npc/re/custom/lasagna/lasagna_npcs.txt

@@ -1360,6 +1360,10 @@ izlude,195,213,5	script	Con-Chliina Crewman#doi	4_M_MERCAT1,{
 	end;
 }
 malangdo,218,81,5	duplicate(Con-Chliina Crewman#doi)	Con-Chliina Crewman#dom	4_M_MERCAT1
+izlude_a,195,213,5	duplicate(Con-Chliina Crewman#doi)	Con-Chliina Crewman#doia	4_M_MERCAT1
+izlude_b,195,213,5	duplicate(Con-Chliina Crewman#doi)	Con-Chliina Crewman#doib	4_M_MERCAT1
+izlude_c,195,213,5	duplicate(Con-Chliina Crewman#doi)	Con-Chliina Crewman#doic	4_M_MERCAT1
+izlude_d,195,213,5	duplicate(Con-Chliina Crewman#doi)	Con-Chliina Crewman#doid	4_M_MERCAT1
 
 izlude,138,183,3	script	Vigilante Penne#doect01	4_DR_SOLDIER,{
 	if (Class == Job_Summoner) {

npc/re/instances/HorrorToyFactory.txt

@@ -58,7 +58,7 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 		next;
 		select("I couldn't even imagine, seeing this mood...");
 		mes "[Catherine Jet Johnson]";
-		mes "Yes, because we couldn't earn a livng by packaging toys forever. The situations got tough after the villagers left in ones and twos.";
+		mes "Yes, because we couldn't earn a living by packaging toys forever. The situations got tough after the villagers left in ones and twos.";
 		next;
 		mes "[Catherine Jet Johnson]";
 		mes "I was the one who worked as an assistant beside the doll craftsman who made dolls to the end.";
@@ -70,31 +70,31 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 		mes "On the day when the factory is decided to be closed, the doll maker dressed the last doll he made and shed tears.";
 		next;
 		mes "[Catherine Jet Johnson]";
-		mes "Perhaps he thought he wouldn't make a doll anymore.";
+		mes "Perhaps he thought he wouldn't make dolls anymore.";
 		next;
 		mes "[Catherine Jet Johnson]";
 		mes "He named the last doll ^0000ffCeline Kimi^000000 and stopped all the lines in the factory.";
 		next;
 		select("Did he give a doll a name?");
 		mes "[Catherine Jet Johnson]";
-		mes "Sometimes there can be the work as if it were their child to doll makers. Kimi was the one for him.";
+		mes "Sometimes so much work goes into a doll as if it were their child to doll makers. Kimi was the one for him.";
 		next;
 		mes "[Catherine Jet Johnson]";
 		mes "I guess his earnestness breathed life to Kimi.";
 		next;
 		select("Do you mean the doll is alive?");
 		mes "[Catherine Jet Johnson]";
-		mes "Yes, ^0000ffShe^000000 became a living creature. I don't know the reason, but she is striding in the toy factory with heavy sorrow and rage.";
+		mes "Yes, ^0000ffShe^000000 became a living creature. I don't know how, but she is striding in the toy factory with heavy sorrow and rage.";
 		next;
 		mes "[Catherine Jet Johnson]";
-		mes "When I first saw her, she was standing beside the doll maker who died and collapsed. She stood there with an unknowable expression.";
+		mes "When I first saw her, she was standing beside the doll maker who died and collapsed. She stood there with a bare expression.";
 		next;
 		mes "[Catherine Jet Johnson]";
-		mes "That's the end. I was outside when I woke up again after I had been blacked out. My face has become like this.";
+		mes "That's the end. I was outside when I woke up again after I had blacked out. My face has become like this.";
 		next;
 		select("Did Kimi do that?");
 		mes "[Catherine Jet Johnson]";
-		mes "I don't know.. She would do it, or it could be a different problem. I have no memory with this.";
+		mes "I don't know.. She would do it, or it could be a different problem. I have no memory of it.";
 		next;
 		select("Do you blame her?");
 		mes "[Catherine Jet Johnson]";
@@ -114,9 +114,9 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 		mes "[Catherine Jet Johnson]";
 		mes "Heh? You would do me a favor?";
 		next;
-		select("Let's get into the factory with me.");
+		select("Let's get into the factory.");
 		mes "[Catherine Jet Johnson]";
-		mes "We.. Well, I cannot help you at all except for providing you with directions. Besides, there can be a big danger to you.";
+		mes "We.. Well, I cannot help you at all except for providing you with directions. Besides, this can be very dangerous to you.";
 		next;
 		select("You can reunite with Kimi, can't you?");
 		mes "[Catherine Jet Johnson]";
@@ -141,14 +141,14 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 	}
 	next;
 	if (getcharid(1) < 1) {
-		mes "^0000ffYou need to organize a party having more than a member to get into Horror Toy Factory.^000000";
+		mes "^0000ffYou need to organize a party having more than one member to get into Horror Toy Factory.^000000";
 		close;
 	}
 	switch( checkquest(12331,PLAYTIME) ) {
 	case -1:
 		if (getpartyleader(getcharid(1),2) != getcharid(0)) {
 			mes "[Catherine Jet Johnson]";
-			mes "Eh.. Give me a second. I am talking to the person in charge. Please wait for a while.";
+			mes "Eh.. Give me a second. I am talking to the person in charge. Please wait a little bit.";
 			close;
 		}
 		if (select( "Unlock Horror Toy Factory", "Cancel" ) == 1) {
@@ -160,10 +160,10 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 	case 0:
 	case 1:
 		mes "[Catherine Jet Johnson]";
-		mes "The smell of preservative from the factory has not been going away. You cannot stand longer there under this state.";
+		mes "The smell of preservative from the factory has not gone away. You cannot enter under this state.";
 		next;
 		mes "[Catherine Jet Johnson]";
-		mes "I will keep you from entering before the scent of preservative is completely gone away.";
+		mes "I will keep you from entering until the scent of preservative is completely gone.";
 		close;
 	case 2:
 		mes "^0000ffThe smell of preservative has gone away. You can talk to Catherine Jet Johnson.^000000";
@@ -175,7 +175,7 @@ xmas,237,303,3	script	Catherine Jet Johnson	4_F_SKULL06GIRL,{
 xmas,233,305,4	script	Factory Dimension Telep	PORTAL,{
 	if (getstatus(SC_MONSTER_TRANSFORM,1) > 0) {
 		mes "[Factory Dimension Teleporter]";
-		mes "There are some work study programs as monster workers during the Horror Toy Factory tour. Therefore, ^ff0000You are limited to enter when you are in transformation.^000000";
+		mes "There are some work study programs as monster workers during the Horror Toy Factory tour. Therefore, ^ff0000you are unable to enter when you are transformed.^000000";
 		close;
 	}
 	if (BaseLevel < 140) {
@@ -185,7 +185,7 @@ xmas,233,305,4	script	Factory Dimension Telep	PORTAL,{
 	}
 	if (getcharid(1) < 1) {
 		mes "[Factory Dimension Teleporter]";
-		mes "You don't have any fellows? Please organize a party and come again if you go alone.";
+		mes "You don't have any support? Please organize a party and come again if you go in alone.";
 		close;
 	}
 	switch( checkquest(12331,PLAYTIME) ) {
@@ -199,10 +199,10 @@ xmas,233,305,4	script	Factory Dimension Telep	PORTAL,{
 			close;
 		case 1:// dummy
 			mes "[Factory Dimension Teleporter]";
-			mes "You don't have any fellows? Please organize a party and come again if you go alone.";
+			mes "You don't have any support? Please organize a party and come again if you go in alone.";
 			close;
 		case 0:
-			mapannounce "xmas", getpartyname( getcharid(1) ) +" party's party member "+ strcharinfo(0) +" enters Horror Toy Factory.", bc_map, "0x00ff99";
+			mapannounce "xmas", getpartyname( getcharid(1) ) +" party's party member "+ strcharinfo(0) +" has entered the Horror Toy Factory.", bc_map, "0x00ff99";
 			setquest 12331;// Trail of Toy Factory
 			end;
 		}
@@ -220,10 +220,10 @@ xmas,233,305,4	script	Factory Dimension Telep	PORTAL,{
 1@xm_d,112,20,6	script	Catherine Jet Johnson#0	4_F_SKULL06GIRL,{
 	if (getstatus(SC_MONSTER_TRANSFORM,1) > 0) {
 		mes "[Catherine Jet Johnson]";
-		mes "You cannot come to here if you are under the effect of a monstre transformation.";
+		mes "You cannot come here if you are under the effect of a monster transformation.";
 		next;
 		mes "[Catherine Jet Johnson]";
-		mes "Please wait until the transformation is finished. You cannot move to another area before you become normal.";
+		mes "Please wait until the transformation is finished. You cannot move to another area until you become normal.";
 		close;
 	}
 	if (getpartyleader(getcharid(1),2) != getcharid(0)) {
@@ -269,7 +269,7 @@ OnStart:
 	sleep 5000;
 	npctalk "Catherine Jet Johnson: I think other spirits have inhabited the empty factory for too long.";
 	sleep 3000;
-	mapannounce 'xm_d_map$, "Factory announcement: Waste and other debries should be kept clear from work areas. This is to keep you safe at all times.", bc_map, "0x00ff44";
+	mapannounce 'xm_d_map$, "Factory announcement: Waste and other debris should be kept clear from work areas. This is to keep you safe at all times.", bc_map, "0x00ff44";
 	sleep 3000;
 	npctalk "Catherine Jet Johnson: It's just like when humans worked here.";
 	sleep 3000;
@@ -281,18 +281,18 @@ OnStart:
 	sleep 3000;
 	npctalk "Catherine Jet Johnson: Ah, maybe we should restore those toys and gift boxes to their original condition.";
 	sleep 5000;
-	npctalk "Catherine Jet Johnson: Eh? I... I mean... To return them as they were.. Yes... We need to fight them? I don't how exactly.";
+	npctalk "Catherine Jet Johnson: Eh? I... I mean... To return them as they were.. Yes... We need to fight them? I don't know how exactly.";
 	sleep 2000;
 	mapannounce 'xm_d_map$, "Factory announcement: All employees must wear a proper uniform and identification. Please check with security if you do not have yours.", bc_map, "0x00ff44";
 	sleep 3000;
-	npctalk "Catherine Jet Johnson: Good heavens, I home the guards are still human. There were boxes of uniforms near here in the past..";
+	npctalk "Catherine Jet Johnson: Good heavens, I hope the guards are still human. There were boxes of uniforms near here in the past..";
 	enablenpc instance_npcname("Employees' Uniform Box#1");
 	enablenpc instance_npcname("Employees' Uniform Box#2");
 	enablenpc instance_npcname("Employees' Uniform Box#3");
 	sleep 5000;
 	npctalk "Catherine Jet Johnson: Ah, they are behind me. You'd better change into the uniform. Fortunately, I still have my employee card.";
 	sleep 5000;
-	npctalk "Catherine Jet Johnson: I will find my way around here. Let's meet near the second production line. Cheer up its a toy factory. It can't be all that bad!!";
+	npctalk "Catherine Jet Johnson: I will find my way around here. Let's meet near the second production line. Cheer up, it's a toy factory. It can't be all that bad!!";
 	sleep 6000;
 	disablenpc instance_npcname("Catherine Jet Johnson#01");
 	disablenpc instance_npcname("#bgm01");
@@ -311,7 +311,7 @@ OnStart2:
 	enablenpc instance_npcname("Employees' Uniform Box#3");
 	mapannounce 'xm_d_map$, "Factory announcement: Wake up, toy factory working time has come...", bc_map, "0x00ff44";
 	sleep 6000;
-	mapannounce 'xm_d_map$, "Factory announcement: Waste and other debries should be kept clear from work areas. This is to keep you safe at all times.", bc_map, "0x00ff44";
+	mapannounce 'xm_d_map$, "Factory announcement: Waste and other debris should be kept clear from work areas. This is to keep you safe at all times.", bc_map, "0x00ff44";
 	sleep 6000;
 	mapannounce 'xm_d_map$, "Factory announcement: Let's make presents for every child's dream today.", bc_map, "0x00ff44";
 	donpcevent instance_npcname("#fac1ct") + "::OnStart";
@@ -345,12 +345,12 @@ OnInstanceInit:
 	playBGM "52";
 	.@mob_id_transform = getstatus(SC_MONSTER_TRANSFORM,1);
 	if (.@mob_id_transform == 1246 || .@mob_id_transform < 1) {
-		mes "^0000ffYou put on a factory uniform. There still seem to be a few uniforms left in the box.^000000";
+		mes "^0000ffYou put on a factory uniform. There still seems to be a few uniforms left in the box.^000000";
 		transform 1246,180000;// COOKIE_XMAS
 		close;
 	}
-	mes "^ff0000In transformation";
-	mes "You cannot use uniform box when already transformed.^000000";
+	mes "^ff0000You are in transformation.";
+	mes "You cannot use the uniform box when already transformed.^000000";
 	close;
 OnInstanceInit:
 	disablenpc instance_npcname( strnpcinfo(0) );
@@ -376,7 +376,7 @@ OnMyMobDead:
 OnTimer1000:
 	killmonster 'xm_d_map$, instance_npcname("#fac1ct") + "::OnMyMobDead";
 	enablenpc instance_npcname("#fac1bs");
-	mapannounce 'xm_d_map$, "Coordinator's announcement: Huh? Where's everyone! How dare workers to be absent from the line!", bc_map, "0xff8800";
+	mapannounce 'xm_d_map$, "Coordinator's announcement: Huh? Where's everyone! How dare workers be absent from the line!", bc_map, "0xff8800";
 	for ( .@i = 61; .@i <= 89; .@i++ )
 		disablenpc instance_npcname( "alert#"+ .@i );
 	stopnpctimer;
@@ -413,7 +413,7 @@ OnAlert:
 	.@npc_name$ = instance_npcname("#fac1bs");
 	.@event$ = .@npc_name$ + "::OnMyMobDead";
 	killmonster 'xm_d_map$, .@event$;
-	npctalk "Coordinator: Guard! Where is guard! Humans are invading!!";
+	npctalk "Coordinator: Guard! Where is a guard! Humans are invading!!";
 	sleep 3000;
 	disablenpc .@npc_name$;
 	for ( .@i = 0; .@i <= 10; .@i++ ) {
@@ -429,7 +429,7 @@ OnTimer60000:
 	.@npc_name$ = instance_npcname("#fac1bs");
 	killmonster 'xm_d_map$, .@npc_name$ + "::OnMyMobDead";
 	enablenpc .@npc_name$;
-	npctalk "Coordinator: This kind of things happens a lot these days...";
+	npctalk "Coordinator: This kind of thing happens a lot these days...";
 	stopnpctimer;
 	end;
 
@@ -446,7 +446,7 @@ OnInstanceInit:
 		transform 1249,180000;// MYSTCASE
 	}
 	else if (.@mob_id_transform == 1249)
-		mes "^009900The box is in your hands. You cannot carry more than one boxe.^000000";
+		mes "^009900The box is in your hands. You cannot carry more than one box.^000000";
 	else
 		mes "^ff0000You are not in uniform. The Coordinator won't let you pick it up.^000000";
 	close;
@@ -479,21 +479,21 @@ OnTouch:
 OnStart:
 	.@r = rand(1,10);
 	if (.@r == 1)
-		mapannounce 'xm_d_map$, "Factory announcement: Outsiders are spotted on the product line. Guard, please move out immediately.",bc_map,"0x00ffff";
+		mapannounce 'xm_d_map$, "Factory announcement: Outsiders are spotted on the product line. Guards, please move out immediately.",bc_map,"0x00ffff";
 	else if (.@r == 2)
 		mapannounce 'xm_d_map$, "Factory announcement: Invaders have been identified. Distinction Code AX0829. Type: Human. Chase them away.", bc_map, "0x00ffff";
 	else if (.@r == 3)
-		mapannounce 'xm_d_map$, "Guard's announcement: Please immediately leave here, outsiders.", bc_map, "0xffff00";
+		mapannounce 'xm_d_map$, "Guard's announcement: Please leave here immediately, outsiders.", bc_map, "0xffff00";
 	else if (.@r == 4)
 		mapannounce 'xm_d_map$, "Factory announcement: Outsiders, hold up your hands and surrender. Otherwise, I will shoot you.", bc_map, "0x00ffff";
 	else if (.@r == 5)
-		mapannounce 'xm_d_map$, "Factory announcement: Dispatch the guard. Suppress the invaders.", bc_map, "0x00ffff";
+		mapannounce 'xm_d_map$, "Factory announcement: Dispatch the guards. Suppress the invaders.", bc_map, "0x00ffff";
 	else if (.@r == 6)
 		mapannounce 'xm_d_map$, "CAUTION: The plant manger is coming to inspect. Wipe out the outsiders.", bc_map, "0xff4444";
 	else if (.@r == 7)
-		mapannounce 'xm_d_map$, "Factory announcement: Not good news. Outside creatures are detected. Guard, please mobilize.", bc_map, "0x00ff88";
+		mapannounce 'xm_d_map$, "Factory announcement: Not good news. Outside creatures are detected. Guards, please mobilize.", bc_map, "0x00ff88";
 	else if (.@r == 8)
-		mapannounce 'xm_d_map$, "Factory announcement: Outsiders or invaders are obstacles to operate the factory. You can kill them if it is necessary.", bc_map, "0xff9999";
+		mapannounce 'xm_d_map$, "Factory announcement: Outsiders or invaders are obstacles to factory's operation. You can kill them if necessary.", bc_map, "0xff9999";
 	else if (.@r == 9)
 		mapannounce 'xm_d_map$, "Factory announcement: Okay that's it, party's over! Get out of my house!", bc_map, "0x00ffff";
 	else
@@ -599,7 +599,7 @@ OnMyMobDead:
 		mes "[Catherine Jet Johnson]";
 		mes "Lucky you got here safely.";
 		next;
-		switch( select( "Quit the story", "Listen to her tatics.", "I know what to do. Proceed quickly!" ) ) {
+		switch( select( "Quit the story", "Listen to her tactics.", "I know what to do. Proceed quickly!" ) ) {
 		case 1:
 			mes "[Catherine Jet Johnson]";
 			mes "Oh, dear. Let me know when you are ready.";
@@ -637,13 +637,13 @@ S_Skip:
 		sleep 5000;
 		npctalk "Catherine Jet Johnson: Ah, I realized something while coming here. Some...Children...";
 		sleep 5000;
-		npctalk "Catherine Jet Johnson: How can I say.. There were lots of souls looking very scary, but awfully sad.";
+		npctalk "Catherine Jet Johnson: How can I say.. There were lots of very scary, but awfully sad, looking souls.";
 		sleep 5000;
 		npctalk "Catherine Jet Johnson: How pitiful they are, but please make them rest if they attack you. Fortunately, they won't come at me.";
 		sleep 5000;
 		npctalk "Catherine Jet Johnson: If you see a worker toy on duty while searching here, would you ask it about the doll maker?";
 		sleep 5000;
-		npctalk "Catherine Jet Johnson: He might be sent to Heaven if they recall the memory of doll maker. That the only hope.";
+		npctalk "Catherine Jet Johnson: He might be sent to Heaven if they recall the memory of doll maker. That's the best hope.";
 		sleep 5000;
 		npctalk "Catherine Jet Johnson: If you find all clues, search other places. I will look for the spot where I met the doll maker last time I was here.";
 		sleep 5000;
@@ -758,12 +758,12 @@ OnInstanceInit:
 			npctalk "Worker: I wish he wouldn't pass away. Ah... Ahah... I feel better.";
 			break;
 		case 2:
-			npctalk "Worker: Did Kimi kill the craftman grandpa? Who said that? That's not true. Kimi was going to save him!";
+			npctalk "Worker: Did Kimi kill the craftsman grandpa? Who said that? That's not true. Kimi was going to save him!";
 			sleep2 3000;
-			npctalk "Worker: Ah... B.. By the way, why my body becomes...";
+			npctalk "Worker: Ah... B.. By the way, why my does my body become...";
 			break;
 		case 3:
-			npctalk "Worker: He had chronic cardiac disease, but it suddenly started to fit on the day he died. Kimi found him and gave him first aid, but..";
+			npctalk "Worker: He had a chronic cardiac disease, but it was so sudden when it started and he died. Kimi found him and gave him first aid, but..";
 			sleep2 3000;
 			npctalk "Worker: Ah.. Did you do something to me? I feel strange...";
 			break;
@@ -788,16 +788,16 @@ OnInstanceInit:
 			npctalk "Worker: Perhaps Grandpa's affection made her move and become alive. Ahah.. I'm sleepy..";
 			break;
 		case 8:
-			npctalk "Worker: Grandpa good man! Kimi pity! Kimi loves Grandpa! Granpa died. I'm sad!";
+			npctalk "Worker: Grandpa was a good man! Pity on Kimi! Kimi loved Grandpa! But Grandpa died. I'm sad!";
 			sleep2 3000;
 			break;
 		case 9:
 			npctalk "Worker: He was so amazed to see Kimi's opening eyes and his heart... It became like that.";
 			sleep2 3000;
-			npctalk "Worker: Anyhow, why my body... It's likely to float in the air.... Something strange.";
+			npctalk "Worker: Anyhow, why my is my body... It's likely to float in the air.... Something strange.";
 			break;
 		case 10:
-			npctalk "Worker: Kimi didn't hurt Grandpa! Kimi's wanted to save Grandpa! People are scared of Kimi Kimi is kind! Kimi is a good girl!";
+			npctalk "Worker: Kimi didn't hurt Grandpa! Kimi's wanted to save Grandpa! People are scared of Kimi, but Kimi is kind! Kimi is a good girl!";
 			sleep2 3000;
 			npctalk "Worker: Grandpa... I miss him. Grandpa, Grandpa...";
 			break;
@@ -920,7 +920,7 @@ OnStart:
 	sleep 5000;
 	mapannounce 'xm_d_map$, "Factory announcement: Delivery employees, please stand by.", bc_map, "0x00ff44";
 	sleep 3000;
-	npctalk "Antonio: Oh! Wohuhu! A bunch of presents are dealayed. Let's have a party today?!", .@antonio$;
+	npctalk "Antonio: Oh! Wohuhu! A bunch of presents are delayed. Let's have a party today?!", .@antonio$;
 	sleep 4000;
 	npctalk "Antonio: Hey, human. You can follow me if you'd like to help. I'm okay unless you disturb me!", .@antonio$;
 	sleep 4000;
@@ -1059,7 +1059,7 @@ OnInstanceInit:
 
 1@xm_d,233,183,3	script	Celine Kimi#0	4_F_KIMI,{
 	mes "[Celine Kimi]";
-	mes "Did you come here as well? Why all the humans are anxious to destroy what we built?";
+	mes "Did you come here as well? Why are all of the humans so anxious to destroy what we built?";
 	close;
 OnInstanceInit:
 	disablenpc instance_npcname( strnpcinfo(0) );
@@ -1094,7 +1094,7 @@ OnInstanceInit:
 OnStart:
 	.@kimi$ = instance_npcname("Celine Kimi#0");
 	sleep 2000;
-	npctalk "Catherine Jet Johnson: Kimi! Listen to me. I didn't come to blame you here.";
+	npctalk "Catherine Jet Johnson: Kimi! Listen to me. I didn't come here to blame you.";
 	sleep 3000;
 	npctalk "Celine Kimi: Everyone hates me!... You don't like me as well? This ugly and creepy doll likes me...", .@kimi$;
 	sleep 4000;
@@ -1104,7 +1104,7 @@ OnStart:
 	sleep 1000;
 	npctalk "Celine Kimi: Don't lie. If that's true, why didn't he see me with love in his eyes?", .@kimi$;
 	sleep 4000;
-	npctalk "Celine Kimi: Why didn't call my name? [Kimi] [Kimi!] I was anxious to hear the Grandpa's voice.", .@kimi$;
+	npctalk "Celine Kimi: Why didn't he say my name? [Kimi] [Kimi!] I was anxious to hear the Grandpa's voice.", .@kimi$;
 	sleep 4000;
 	mapannounce 'xm_d_map$, "Phantom's yell: Yes, Kimi~ Father was frightened! He was scared of you~", bc_map, "0xff8800";
 	sleep 3000;
@@ -1118,7 +1118,7 @@ OnStart:
 	sleep 3000;
 	npctalk "Celine Kimi: D.. Did I.. kill him?...", .@kimi$;
 	sleep 2000;
-	npctalk "Catherine Jet Johnson: No, Kimi! I've realized that. I misunderstood you. Just he had a disease!";
+	npctalk "Catherine Jet Johnson: No, Kimi! I've realized that. I misunderstood you. He was sick!";
 	sleep 3000;
 	npctalk "Celine Kimi: D.. Di.. Did I... kill... him?", .@kimi$;
 	sleep 2000;
@@ -1128,10 +1128,10 @@ OnStart:
 	sleep 1000;
 	mapannounce 'xm_d_map$, "Phantom's yell: Don't you agree you are frightening? No one loves you, Kimi~", bc_map, "0xff8800";
 	sleep 3000;
-	npctalk "Celine Kimi: Because of me, granpa was dead...", .@kimi$;
+	npctalk "Celine Kimi: Because of me, grandpa is dead...", .@kimi$;
 	specialeffect EF_MAPPILLAR2, AREA, .@kimi$;
 	sleep 3000;
-	npctalk "Catherine Jet Johnson: It became serious. Kimi is suffering. It would be dangerous under this condition!";
+	npctalk "Catherine Jet Johnson: It has become serious. Kimi is suffering. It would be dangerous under this condition!";
 	specialeffect EF_MAPPILLAR2, AREA, .@kimi$;
 	sleep 1000;
 	mapannounce 'xm_d_map$, "Phantom's yell: Rage~ Sorrow~ No one cries for you, Kimi~", bc_map, "0xff8800";
@@ -1183,15 +1183,15 @@ OnEnd:
 OnTalk:
 	.@chat_r = rand(1,10);
 	if (.@chat_r == 1)
-		unittalk 'celene_id, "I will burn you with hell inferno.";
+		unittalk 'celene_id, "I will burn you with hell's inferno.";
 	else if (.@chat_r == 2)
 		unittalk 'celene_id, "Will you bear this flame?!";
 	else if (.@chat_r == 3)
-		unittalk 'celene_id, "I shouldn't have done, but...";
+		unittalk 'celene_id, "I shouldn't have, but...";
 	else if (.@chat_r == 4)
 		unittalk 'celene_id, "It's boiling!... Bear it if you can.";
 	else if (.@chat_r == 5)
-		unittalk 'celene_id, "Breathe as much as you can. It'll be the last breath you make.";
+		unittalk 'celene_id, "Breathe as much as you can. It'll be the last breath you take.";
 	else if (.@chat_r == 6)
 		unittalk 'celene_id, "Frankly, I don't like fire.";
 	else
@@ -1382,11 +1382,11 @@ OnInstanceInit:
 
 1@xm_d,233,183,3	script	Celine Kimi#2	4_F_KIMI,{
 	mes "[Celine Kimi]";
-	mes "You also... come here to kill me?";
+	mes "You also... came here to kill me?";
 	close;
 
 OnStart:
-	npctalk "Celine Kimi: You also... come here to kill me?";
+	npctalk "Celine Kimi: You also... came here to kill me?";
 	specialeffect EF_MAPPILLAR2;
 	sleep 5000;
 	disablenpc instance_npcname("Celine Kimi#2");
@@ -1413,7 +1413,7 @@ OnStart:
 		initnpctimer;
 	end;
 OnTimer3000:
-	mapannounce 'xm_d_map$, "Celine Kimi and her phantom are shared their strength. They will be stronger than ever!",bc_map,"0xff6666";
+	mapannounce 'xm_d_map$, "Celine Kimi and her phantom have shared their strength. They will be stronger than ever!",bc_map,"0xff6666";
 	stopnpctimer;
 	end;
 
@@ -1454,15 +1454,15 @@ OnInstanceInit:
 	end;
 OnStart:
 	sleep 1000;
-	npctalk "Catherine Jet Johnson: Unfortunately, I am failed to persuade Kimi.";
+	npctalk "Catherine Jet Johnson: Unfortunately, I have failed to persuade Kimi.";
 	sleep 3000;
-	npctalk "Catherine Jet Johnson: What was the voice of phantom? Why it torments Kimi so harshly...";
+	npctalk "Catherine Jet Johnson: What was the voice of that phantom? Why does it torment Kimi so harshly...";
 	sleep 4000;
-	npctalk "Catherine Jet Johnson: I guess that the curse of my face was form the unidentified voice.";
+	npctalk "Catherine Jet Johnson: I guess that the curse of my face was from the unidentified voice.";
 	sleep 4000;
-	npctalk "Catherine Jet Johnson: Anyway, even Kimi, saying hates everyone, has collected her recollections here a lot.";
+	npctalk "Catherine Jet Johnson: Anyway, even Kimi hates everyone and has collected her recollections here a lot.";
 	sleep 6000;
-	npctalk "Catherine Jet Johnson: I will put this thing safely even if her soul will return and she won't be disappointed.";
+	npctalk "Catherine Jet Johnson: I will end this thing safely even if her soul will return and she won't be disappointed.";
 	sleep 5000;
 	npctalk "Catherine Jet Johnson: Thanks to you, everything that I have wondered is completely resolved. Please call me again if you are going to send her to Heaven next time.";
 	sleep 5000;
@@ -1652,7 +1652,7 @@ OnInstanceInit:
 		case 2:
 			transform 1246,180000;
 			enablenpc instance_npcname("#fac1bs");
-			mapannounce 'xm_d_map$, "Coordinator's announcement: Huh? Where's everyone! How dare you workers to be absent their line and muck around!",bc_map,"0xff8800";
+			mapannounce 'xm_d_map$, "Coordinator's announcement: Huh? Where's everyone! How dare the workers be absent from their line and muck around!",bc_map,"0xff8800";
 			warp 'xm_d_map$,70,125;
 			break;
 		case 3:

npc/re/merchants/bio4_reward.txt

@@ -18,11 +18,11 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 	next;
 	if (select("Ignore him", "Talk with him") == 1) {
 		mes "[Weird old man]";
-		mes "You, Very bad young man!";
+		mes "You, very bad young man!";
 		close;
 	}
 	mes "["+ strcharinfo(0) +"]";
-	mes "Sir, Are you alright??";
+	mes "Sir, are you alright??";
 	next;
 	mes "[Weird old man]";
 	mes "....?? You are not like other young people. You have good manners! You know what happened to me..?";
@@ -30,16 +30,16 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 	switch(rand(1,2)) {
 	case 1:
 		mes "[Weird old man]";
-		mes "I was on the way to visit my son who lives in Rune Midgarts. It's really far away, so I took the airplane, and..";
+		mes "I was on the way to visit my son who lives in Rune Midgard. It's really far away, so I took the airplane, and..";
 		next;
 		mes "[Weird old man]";
-		mes "those young people...so noisy.... I was standing but non of them offered me a seat..and they were just talking in loud voices which bothered everyone.";
+		mes "those young people...so noisy.... I was standing but none of them offered me a seat..and they were just talking loudly which bothered everyone.";
 		next;
 		mes "[Weird old man]";
-		mes "I could lecture them if I were 10 years younger than now..";
+		mes "I could lecture them if I were 10 years younger..";
 		next;
 		mes "[Weird old man]";
-		mes "Pffff.. Never like the time passing....";
+		mes "Pffff.. Never liked the passing of time....";
 		next;
 		mes "[Weird old man]";
 		mes "So, you... what would you do??";
@@ -50,16 +50,16 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 		break;
 	case 2:
 		mes "[Weird old man]";
-		mes "I was on the way to visit my son who lives in Rune Midgarts. It's really far away, so I took the airplane, and..";
+		mes "I was on the way to visit my son who lives in Rune Midgard. It's really far away, so I took the airplane, and..";
 		next;
 		mes "[Weird old man]";
-		mes "those young people...so noisy.... I was standing but non of them offered me a seat..and they were just talking in loud voices which bothered everyone.";
+		mes "those young people...so noisy.... I was standing but none of them offered me a seat..and they were just talking loudly which bothered everyone.";
 		next;
 		mes "[Weird old man]";
-		mes "I could lecture them if I were 10 years younger than now..";
+		mes "I could lecture them if I were 10 years younger..";
 		next;
 		mes "[Weird old man]";
-		mes "Pffff.. Never like the time passing....";
+		mes "Pffff.. Never liked the passing of time....";
 		next;
 		mes "[Weird old man]";
 		mes "So, you... what would you do??";
@@ -73,44 +73,44 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 		switch(rand(1,2)) {
 		case 1:
 			mes "[Weird old man]";
-			mes "Oh, and then! you know what...?";
+			mes "Oh, and then you know what...?";
 			next;
 			mes "[Weird old man]";
-			mes "Once I was walking in the town, and some boy were spitting on the street, and were bothering girls who were passing by...tut tut!";
+			mes "Once I was walking in the town and some boys were spitting on the street and were bothering girls who were passing by...tut tut!";
 			next;
 			mes "[Weird old man]";
-			mes "The world is going to the dogs.. How will it be?? It was even a day time when they were doing it..tut tut.";
+			mes "The world is going to the dogs.. How will it be?? It was even day time when they were doing it..tut tut.";
 			next;
 			switch(rand(1,2)) {
 			case 1:
 				mes "[Weird old man]";
-				mes "Oh, and then! you know what...?";
+				mes "Oh, and then you know what...?";
 				next;
 				break;
 			case 2:
 				mes "[Weird old man]";
-				mes "Oh, and then! you know what...?";
+				mes "Oh, and then you know what...?";
 				next;
 				mes "[Weird old man]";
 				mes "Lately young people are not so patient!!!!";
 				next;
 				mes "[Weird old man]";
-				mes "That often, they say they will quit.. they say they can't more. How will they live all the lift with that kind of mentality..tut tut.";
+				mes "So often they say they will quit.. they say they can't do more. How will they live life with that kind of mentality..tut tut.";
 				next;
 				mes "[Weird old man]";
-				mes "It's not easy to find a job, it is very difficult to be hired. But then they even cannot stand a week there, and leave the work already.";
+				mes "It's not easy to find a job. It is very difficult to be hired but then they even cannot stand a week there and leave the work place.";
 				next;
 				mes "[Weird old man]";
 				mes "How impatient and irresponsible!!";
 				next;
 				mes "[Weird old man]";
-				mes "Oh, and then! you know what...?";
+				mes "Oh, and then you know what...?";
 				next;
 				break;
 			}
 		case 2:
 			mes "[Weird old man]";
-			mes "Oh, and then! you know what...?";
+			mes "Oh, and then you know what...?";
 			next;
 			break;
 		}
@@ -121,17 +121,17 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 	mes "Hm......You are not like common young people, you seem pretty patient too. I like that!!!";
 	next;
 	mes "[Weird old man]";
-	mes "Now I am just an old, weak man but when I was young, I was a famous merchant in the town.";
+	mes "Now I am just an weak old man but when I was young I was a famous merchant in the town.";
 	next;
 	mes "[Weird old man]";
 	mes "It's been a while since I stopped the business,";
 	mes "but a former client of mine contacted me and asked me";
 	next;
 	mes "[Weird old man]";
-	mes "If I could get him some unknown objects named 'Will of Warrior', 'Thirst for Blood', 'Chill of the Dead'.";
+	mes "If I could get him some unknown objects named 'Will of Warrior', 'Thirst for Blood', and 'Chill of the Dead'.";
 	next;
 	mes "[Weird old man]";
-	mes "I liked your politeness which is not like most of young people, so if you get me those, I will dare to give you some stuffs that I consider as my treasures.";
+	mes "I like your politeness which most young people don't have, so if you get me those, I will give you some stuff that I consider as my treasure.";
 	next;
 	while(1) {
 		switch(select("When I gather them, I will come back", "Show me the armors", "Show me the weapons")) {
@@ -160,7 +160,7 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 				switch(select(
 					"Show me other items.",
 					""+.@armor$[1]+"Giant Shield^000000",
-					""+.@armor$[2]+"Acient Book of Geffenia-Water^000000",
+					""+.@armor$[2]+"Ancient Book of Geffenia-Water^000000",
 					""+.@armor$[3]+"Bible of Promise(2nd Vol.)^000000",
 					""+.@armor$[4]+"Salvage Cape^000000",
 					""+.@armor$[5]+"Assassin's Handcuffs^000000",
@@ -180,7 +180,7 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 					callsub L_Reward, 2160, 100, 50, 35; //Giant_Shield
 					break;
 				case 3:
-					mes "<<Acient Book of Geffenia-Water[1]>>";
+					mes "<<Ancient Book of Geffenia-Water[1]>>";
 					mes "INT + 1, MDEF + 2. If Original INT point is 120, MATK + 10, MHP + 800.";
 					mes "When equipping with Lacryma Stick, the casting % from Storm Gust, Frost Misty and Jack frost will discount equivalent to 4 times Refine Lv.";
 					mes "Shield / Def 30 / Weight 100 / Required Lv 100 / Socket 1 / for Warlock";
@@ -194,7 +194,7 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 					break;
 				case 5:
 					mes "<<Salvage Cape[0]>>";
-					mes "Allow to use 'Cicada Skin Shed'(Lv 1). Cool time for this skill will be 30 seconds. When equiping it, SP consumption for using any skill will be doubled, When taking it off, SP - 1200.";
+					mes "Allow to use 'Cicada Skin Shed'(Lv 1). Cool down time for this skill will be 30 seconds. When equipping it, SP consumption for using any skill will be doubled, When taking it off, SP - 1200.";
 					mes "Garment / Def 1 / Weight 40 / Required Lv 130 / Socket 0 / for Archbishop";
 					callsub L_Reward, 2582, 300, 300, 400; //Salvage_Cape
 					break;
@@ -316,13 +316,13 @@ lighthalzen,342,291,4	script	Weird old man#Bio4Reward	4_M_EINOLD,{
 				case 10:
 					mes "<<Aztoe Nail[0]>>";
 					mes "MATK + 80. For Physical Melee Attack, cast Freezing to the target with a certain chance. The chance is affected by Refine Lv.";
-					mes "Dagger / ATK 160 / Weight 50 / Wind Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Theif Classes";
+					mes "Dagger / ATK 160 / Weight 50 / Wind Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Thief Classes";
 					callsub L_Reward, 13069, 50, 100, 35; //Aztoe_Nail
 					break;
 				case 11:
 					mes "<<Scarletto Nail[0]>>";
 					mes "MATK + 80. For Physical Melee Attack, cast Stone curse to the target with a certain chance. The chance is affected by Refine Lv.";
-					mes "Dagger / ATK 160 / Weight 50 / Fire Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Theif Classes";
+					mes "Dagger / ATK 160 / Weight 50 / Fire Property / Weapon Lv 4 / Required Lv 110 / Socket 0 / for High Swordman/Merchant/Thief Classes";
 					callsub L_Reward, 13070, 50, 100, 35; //Scarletto_Nail
 					break;
 				case 12:
@@ -394,7 +394,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	mes "[Pudding]";
 	mes "... .... ...";
 	next;
-	switch(select("Umba umba humbaa", "What are you doing here?", "Which are the equipments found so far?", "Here you are, Sir.")) {
+	switch(select("Umba umba humbaa", "What are you doing here?", "Which are the equipments found so far?", "Here you are, sir.")) {
 	case 1:
 		emotion ET_FRET;
 		mes "[Pudding]";
@@ -402,7 +402,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		close;
 	case 2:
 		mes "[Pudding]";
-		mes "As you can see, I'm a training Sorcerer, and my name is Pudding.";
+		mes "As you can see I'm a training Sorcerer, and my name is Pudding.";
 		next;
 		select("....?");
 		emotion ET_FRET;
@@ -411,17 +411,17 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		next;
 		emotion ET_OK;
 		mes "[Pudding]";
-		mes "Couple of days ago, while I was undergoing discipline, I felt a strange, bizzare tinge. So I followed that and it brought me here.";
+		mes "A couple of days ago while I was undergoing discipline, I felt a strange, bizarre tinge. So I followed that and it brought me here.";
 		next;
 		select("I see.");
 		mes "[Pudding]";
-		mes "OK, let me continue. I am so bothered if you disturb me while I'm talking.";
+		mes "OK, let me continue. I become bothered if you disturb me while I'm talking.";
 		next;
 		mes "[Pudding]";
-		mes "And I entered to the laboratory here in order to investigate, and oh gosh! I found those monsters which were like doppelgangers from 'Geffen Dungeon'. It was full of them.";
+		mes "And I entered to the laboratory here in order to investigate and oh gosh! I found those monsters which were like doppelgangers from 'Geffen Dungeon'. It was full of them.";
 		next;
 		mes "[Pudding]";
-		mes "From those monsters, I could find rare items like '^F2766EWill of Warrior^000000' '^952420Thirst for Blood^000000' '^88C6F7Chill of the Dead^000000' which you cannot find from any other place.";
+		mes "From those monsters, I could find rare items like '^F2766EWill of Warrior^000000', '^952420Thirst for Blood^000000', and '^88C6F7Chill of the Dead^000000' which you cannot find in any other place.";
 		next;
 		emotion ET_QUESTION;
 		mes "[Pudding]";
@@ -443,7 +443,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			break;
 		}
 		mes "[Pudding]";
-		mes "Those '^F2766EWill of Warrior^000000' and '^952420Thirst for Blood^000000'..... are aggresive but warm materials.";
+		mes "Those '^F2766EWill of Warrior^000000' and '^952420Thirst for Blood^000000'..... are aggressive but warm materials.";
 		next;
 		mes "[Pudding]";
 		mes "So '^F2766EWill of Warrior^000000' can dwell a special power to the 4th slot of an equipment,";
@@ -453,8 +453,8 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		next;
 		mes "[Pudding]";
 		mes "Whereas!!!";
-		mes "'^88C6F7Chill of the Dead^000000' is a cold type material.";
-		mes "which allows to return the power from '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000' so it let the equipment to be 'ZERO'.";
+		mes "'^88C6F7Chill of the Dead^000000' is a cold type material";
+		mes "which allows the return of power from '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000' so makes the equipment no longer enchanted.";
 		next;
 		mes "[Pudding]";
 		mes "What do you say? Doesn't it sound interesting? But, there's a problem...";
@@ -466,7 +466,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		emotion ET_QUESTION, playerattached();
 		emotion ET_FRET;
 		mes "[Pudding]";
-		mes "Gee.. I told you not to cut while I talk, didn't I? Well, I will answer that becuase that's important.";
+		mes "Gee.. I told you not to cut while I talk, didn't I? Well, I will answer that because that's important.";
 		next;
 		mes "[Pudding]";
 		mes "If you bring me 10 '^F2766EWill of Warrior^000000' or 10 '^952420Thirst for Blood^000000', I will dwell some power to certain equipments that you can find in the Lab..";
@@ -475,7 +475,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		mes "And if you are not satisfied with the power you got, bring me 10 '^88C6F7Chill of the Dead^000000', and I will take off that power.";
 		next;
 		mes "[Pudding]";
-		mes "WHat do you say? Having both options.....quite nice, huh?";
+		mes "What do you say? Having both options.....quite nice, huh?";
 		next;
 		mes "[Pudding]";
 		mes "If you obtain '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', and obtain also equipment which is capable to accept their power, bring them to me. I will be waiting.";
@@ -500,7 +500,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			case 2:
 				mes "< Armor List >";
 				mes "Giant Shield[1]";
-				mes "Acient Book of Geffenia-Water[1]";
+				mes "Ancient Book of Geffenia-Water[1]";
 				mes "Bible of Promise(2nd Vol.)[1]";
 				mes "Salvage Cape[0]";
 				mes "Assassin's Handcuffs[1]";
@@ -592,7 +592,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	case 3:
 		if (!getequipisequiped(EQI_HAND_L)) {
 			mes "[Pudding]";
-			mes "Well.. You are not equipping anything on the left hand.";
+			mes "Well.. You have nothing equipped on the left hand.";
 			close;
 		}
 		.@part = EQI_HAND_L;
@@ -600,7 +600,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	case 4:
 		if (!getequipisequiped(EQI_HAND_R)) {
 			mes "[Pudding]";
-			mes "Well.. You are not equipping anything on the right hand.";
+			mes "Well.. You have nothing equipped on the right hand.";
 			close;
 		}
 		.@part = EQI_HAND_R;
@@ -632,7 +632,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	case 8:
 		if (!getequipisequiped(EQI_HEAD_TOP)) {
 			mes "[Pudding]";
-			mes "Hey.. Are you not wearing any Helm?";
+			mes "Hey.. Are you not wearing any helm?";
 			close;
 		}
 		.@part = EQI_HEAD_TOP;
@@ -659,7 +659,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			.@lhz_max_num = 4200;
 	} else {
 		mes "[Pudding]";
-		mes "Before! I need to check if this equipment can accept the power.";
+		mes "First! I need to check if this equipment can accept the power.";
 		next;
 		specialeffect2 EF_SPHERE;
 		progressbar "ffff00", 2;
@@ -688,7 +688,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	else
 		.@menu_in$[3] = "Not enough ^999999'Chill of the Dead'^000000";
 	mes "[Pudding]";
-	mes "OK! Which power do you want to dwell in your equipment?";
+	mes "OK! Which power do you want to dwell into your equipment?";
 	next;
 	switch(select("I say no! I don't need that!!", .@menu_in$[1], .@menu_in$[2], .@menu_in$[3])) {
 	case 1:
@@ -698,12 +698,12 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	case 2:
 		if (countitem(6469) < 10) {
 			mes "[Pudding]";
-			mes "Not enough '^F2766EWill of Warrior^000000', You need to bring 10 '^F2766EWill of Warrior^000000'";
+			mes "Not enough '^F2766EWill of Warrior^000000'. You need to bring 10 '^F2766EWill of Warrior^000000'";
 			close;
 		}
 		else if (getequipcardid(.@part, 3) > 0) {
 			mes "[Pudding]";
-			mes "This equipment already got the power of '^F2766EWill of Warrior^000000'.";
+			mes "This equipment already has the power of '^F2766EWill of Warrior^000000'.";
 			close;
 		} else {
 			.@socket_type = 4;
@@ -712,12 +712,12 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 	case 3:
 		if (countitem(6470) < 10) {
 			mes "[Pudding]";
-			mes "Not enough '^952420Thirst for Blood^000000', You need to bring 10 '^952420Thirst for Blood^000000'";
+			mes "Not enough '^952420Thirst for Blood^000000'. You need to bring 10 '^952420Thirst for Blood^000000'";
 			close;
 		}
 		else if (getequipcardid(.@part, 2) > 0) {
 			mes "[Pudding]";
-			mes "This equipment already got the power of '^952420Thirst for Blood^000000'.";
+			mes "This equipment already has the power of '^952420Thirst for Blood^000000'.";
 			close;
 		} else {
 			.@socket_type = 3;
@@ -747,7 +747,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		mes "[Pudding]";
 		mes "Alright, which power do you want to remove?";
 		next;
-		.@menu = select("No, I don't wannna remove any.", .@menu_clear$[1], .@menu_clear$[2]);
+		.@menu = select("No, I don't wanna remove any.", .@menu_clear$[1], .@menu_clear$[2]);
 		switch(.@menu){
 		case 1:
 			mes "[Pudding]";
@@ -757,7 +757,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		case 3:
 			if (countitem(6471) < 10) {
 				mes "[Pudding]";
-				mes "Not enough '^88C6F7Chill of the Dead^000000', You need to bring 10 '^88C6F7Chill of the Dead^000000'";
+				mes "Not enough '^88C6F7Chill of the Dead^000000'. You need to bring 10 '^88C6F7Chill of the Dead^000000'";
 				close;
 			}
 			if ( (.@menu==3 && .@3thzptsodyd == 1) || (.@menu==2 && .@4thzptsodyd == 1) ) {
@@ -786,24 +786,24 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		}
 	}
 	mes "[Pudding]";
-	mes "Before I dwell the power, let me explain to you cautions.";
+	mes "Before I dwell the power, let me caution you.";
 	next;
 	mes "[Pudding]";
-	mes "While dwelling the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', the equipment would be not capable to accept that and will be destryed..";
+	mes "While I dwell the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000', the equipment could be not capable of accepting it and will be destroyed as a result..";
 	next;
 	mes "[Pudding]";
 	mes "^9D2628If the equipment is destroyed, you will also lose the cards you inserted in it, and the refine Lv will be removed too.^000000";
 	next;
 	mes "[Pudding]";
-	mes "Alright. will you really wish to dwell the power into the equipment?";
+	mes "Alright. Do you really wish to dwell the power into the equipment?";
 	next;
 	if (select("Wait, I will think again.", "Sure, carry on.") == 1) {
 		mes "[Pudding]";
-		mes "OK. I will be hoping to see you again.";
+		mes "OK. I hope to see you again.";
 		close;
 	}
 	mes "[Pudding]";
-	mes "I wish you made a correct decision...";
+	mes "I hope you made the correct decision...";
 	next;
 	if (.@socket_type >= 3) {
 		switch(.@type){
@@ -978,7 +978,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
 			emotion ET_DELIGHT;
 			mes "[Pudding]";
-			mes "Fortunately the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" has been dwelt well in your equipment...";
+			mes "Fortunately, the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" has been dwelt well into your equipment...";
 			close;
 		}
 	}

npc/re/quests/quests_15_1.txt

@@ -471,7 +471,7 @@ moc_para01,133,170,4	script	Commander Arquien#e152a1	4_F_EDEN_MASTER,{
 			cutin "Arquien_n_atnad04.bmp",2;
 			mes "[Nile]";
 			mes "What.. was.. the name. Ah.. I don't know.";
-			mes "It is commonly being referred to as the 'Fantasmagorica' plan.";
+			mes "It is commonly being referred to as the 'Phantasmagorika' plan.";
 			mes "Rekenber of Lighthalzen is the sponser of the excavation recruitment and support.";
 			next;
 			select("So?");
@@ -494,7 +494,7 @@ moc_para01,133,170,4	script	Commander Arquien#e152a1	4_F_EDEN_MASTER,{
 			}
 			cutin "Arquien_n_atnad01.bmp",2;
 			mes "[Nile]";
-			mes "Sure. We also wanted to participate in the Fantasmagorica.";
+			mes "Sure. We also wanted to participate in the Phantasmagorika.";
 		}
 		else {
 			cutin "Arquien_n_atnad02.bmp",2;
@@ -510,7 +510,7 @@ moc_para01,133,170,4	script	Commander Arquien#e152a1	4_F_EDEN_MASTER,{
 			cutin "Arquien_n_atnad01.bmp",2;
 			mes "[Nile]";
 			mes "Should I continue talking?";
-			mes "We also wanted to participate in the Fantasmagorica.";
+			mes "We also wanted to participate in the Phantasmagorika.";
 		}
 		mes "Of course under the name of Paradise Squad.";
 		next;
@@ -535,7 +535,7 @@ moc_para01,133,170,4	script	Commander Arquien#e152a1	4_F_EDEN_MASTER,{
 		mes "Not a bad proposition. Honestly it's a good opportunity.";
 		mes "We introduce people and get paid, you work and get paid.";
 		next;
-		select("Wanting to participate in Fantasmagorica?");
+		select("Wanting to participate in Phantasmagorika?");
 		mes "[Nile]";
 		mes "It can be summarized as such.";
 		mes "Basically you're participating in the site excavation work but";
@@ -547,7 +547,7 @@ moc_para01,133,170,4	script	Commander Arquien#e152a1	4_F_EDEN_MASTER,{
 		next;
 		mes "[Nile]";
 		mes "I want one thing.";
-		mes "There are several excavation teams and organizations currently participating in the Fantasmagorica excavation.";
+		mes "There are several excavation teams and organizations currently participating in the Phantasmagorika excavation.";
 		mes "I would like you to work in an excavation team Rahim introduces.";
 		next;
 		cutin "Arquien_n_atnad02.bmp",2;
@@ -1496,6 +1496,7 @@ verus04,172,149,3	script	Commander Arquien#e152v0	4_F_EDEN_MASTER,{
 			close3;
 		}
 	}
+	close3;
 }
 
 // Note : 2 players can use the npc at the same time
@@ -3343,7 +3344,7 @@ verus02,60,30,1	script	Strewn paper#e152a01	4_ENERGY_BLUE,{
 		close;
 	}
 	progressbar "00ff00",3;
-	hideonnpc strnpcinfo(0);
+	disablenpc strnpcinfo(0);
 	getitem 6757,1;// The_Memory_Recorder
 	if (VER_MAIN == 19) {
 		mes "You find a object never seen before as you go through the clutter of documents and office supplies.";
@@ -3360,7 +3361,8 @@ verus02,60,30,1	script	Strewn paper#e152a01	4_ENERGY_BLUE,{
 	close;
 
 OnTimer60000:
-	hideoffnpc strnpcinfo(0);
+	stopnpctimer;
+	enablenpc strnpcinfo(0);
 	end;
 }
 verus02,178,32,3	duplicate(Strewn paper#e152a01)	Strewn paper#e152a02	4_ENERGY_BLUE
@@ -3427,7 +3429,7 @@ un_bunker,382,335,3	script	Box#e152p00	4_ENERGY_BLUE,{
 		close;
 	}
 	if (VER_MAIN == 27 || isbegin_quest(7652) > 0) {// Collect Memory Records of Laboratories
-		if (countitem(6824) < 5) {
+		if (countitem(6824) > 4) {
 			mes "Enough Memory Records are collected.";
 			mes "No need to keep on crawling and searching.";
 			close;
@@ -3440,13 +3442,18 @@ un_bunker,382,335,3	script	Box#e152p00	4_ENERGY_BLUE,{
 		if (select( "Check below.", "Quit." ) == 1) {
 			progressbar "00ff00",3;
 			mes "Found a Memory Record under the desk.";
-			hideonnpc strnpcinfo(0);
 			getitem 6824,1;// Experimental_Dong_Memory_Record
+			initnpctimer;
+			disablenpc strnpcinfo(0);
 		}
 		close;
 	}
 	mes "Nothing special is found.";
 	close;
+OnTimer30000:
+	stopnpctimer;
+	enablenpc strnpcinfo(0);
+	end;
 }
 un_bunker,87,167,3	duplicate(Box#e152p00)	Under desk#e152p01	4_ENERGY_BLUE
 un_bunker,316,243,3	duplicate(Box#e152p00)	Under desk#e152p02	4_ENERGY_BLUE
@@ -3852,10 +3859,12 @@ verus04,133,212,4	script	Police Chief Kesler#EP15_1	2_M_SWORDMASTER,{
 		mes "- You are carrying too many items to continue. -";
 		close;
 	}
-	.@playtime_5318 = checkquest(5318,PLAYTIME);
-	.@quest_5309 = isbegin_quest(5309);
+	.@playtime_5318 = checkquest(5318,PLAYTIME);	// Come Back Tomorrow
+	.@quest_5309 = isbegin_quest(5309);				// Police Chief's Request
 	mes "[Police Chief Kesler]";
 	if (VER_MAIN < 5 || .@playtime_5318 == 2) {
+		if (.@playtime_5318 == 2)
+			erasequest 5318;
 		emotion ET_DELIGHT;
 		mes "Nice to meet you. I'm Kesler, chief of the Phantasmagorika Police.";
 	}
@@ -3863,8 +3872,6 @@ verus04,133,212,4	script	Police Chief Kesler#EP15_1	2_M_SWORDMASTER,{
 		emotion ET_PROFUSELY_SWEAT;
 		mes "Welcome to the Phantasmagorika Police.";
 	}
-	if (.@playtime_5318 == 2)
-		erasequest 5318;
 	next;
 	if (countitem(6753) > 0)// Token_Of_Destruction
 		.@string$ = "I brought Doom Tokens.";
@@ -3935,7 +3942,7 @@ verus04,133,212,4	script	Police Chief Kesler#EP15_1	2_M_SWORDMASTER,{
 			}
 			if (.@quest_5309 == 2)
 				erasequest 5309;
-			setquest 5309;
+			setquest 5309;// Police Chief's Request
 			mes "[Police Chief Kesler]";
 			mes "Thank you.";
 			close;
@@ -4161,10 +4168,8 @@ verus03,36,113,4	script	Police Officer Salgran#EP15	2_M_THIEFMASTER,{
 				next;
 				if (select( "Help.", "Maybe next time." ) == 2) {
 					emotion ET_OHNO;
-					if (isbegin_quest(5305) == 0) {
-						setquest 5305;// Police Officer Salgran
-						completequest 5305;// Police Officer Salgran
-					}
+					setquest 5305;// Police Officer Salgran
+					completequest 5305;// Police Officer Salgran
 					setquest 5310;// Salgran's Problem
 					mes "[Police Officer Salgran]";
 					mes "You must be busy. All right, then tell the Chief that everything's good in my sector.";
@@ -4188,10 +4193,8 @@ verus03,36,113,4	script	Police Officer Salgran#EP15	2_M_THIEFMASTER,{
 				if (select( "OK", "Maybe next time." ) == 2) {
 					// inaccurate
 					emotion ET_OHNO;
-					if (isbegin_quest(5305) == 0) {
-						setquest 5305;// Police Officer Salgran
-						completequest 5305;// Police Officer Salgran
-					}
+					setquest 5305;// Police Officer Salgran
+					completequest 5305;// Police Officer Salgran
 					setquest 5310;// Salgran's Problem
 					mes "[Police Officer Salgran]";
 					mes "You must be busy. All right, then tell the Chief that everything's good in my sector.";
@@ -4270,7 +4273,6 @@ verus03,36,113,4	script	Police Officer Salgran#EP15	2_M_THIEFMASTER,{
 	close;
 }
 
-
 verus03,116,36,6	script	Police Officer Gerev#EP15_1D	4_M_ALCHE_A,{
 	if (checkweight(1301,1) == 0) {
 		mes "- You are carrying too many items to continue. -";
@@ -4324,10 +4326,8 @@ verus03,116,36,6	script	Police Officer Gerev#EP15_1D	4_M_ALCHE_A,{
 				mes "Ah, Chief Kesler sent you. If I didn't know him, I'd have thought he was too busy to come see me. I bet I'm busier than him, though.";
 				next;
 				if (select( "I can help.", "Sorry I can't be of help." ) == 2) {
-					if (isbegin_quest(5306) == 0) {
-						setquest 5306;
-						completequest 5306;
-					}
+					setquest 5306;
+					completequest 5306;
 					setquest 5311;// Gerev's Problem
 					mes "[Police Officer Gerev]";
 					mes "You're willing to help the Chief, but not me. Why not because I'm not a chief?";
@@ -4355,10 +4355,8 @@ verus03,116,36,6	script	Police Officer Gerev#EP15_1D	4_M_ALCHE_A,{
 				next;
 				if (select( "Sure thing.", "Maybe next time." ) == 2) {
 					emotion ET_FRET;
-					if (isbegin_quest(5306) == 0) {
-						setquest 5306;
-						completequest 5306;
-					}
+					setquest 5306;
+					completequest 5306;
 					setquest 5311;
 					mes "[Police Officer Gerev]";
 					mes "*Snort* I knew it. Just go tell Chief Kesler everything's quiet in my sector.";
@@ -4424,13 +4422,15 @@ verus03,116,36,6	script	Police Officer Gerev#EP15_1D	4_M_ALCHE_A,{
 				mes "[Police Officer Gerev]";
 				mes "I must be stressed out again. I feel my stomach tightening...";
 				close;
-			case 3:// can redo
+			case 3:
 				erasequest 5315;// Gerev's Request
 				trap_doom_prayers = 0;
 				if (isbegin_quest(5306) == 0) {
 					setquest 5306;
 					completequest 5306;
 				}
+				// note: officially 'setquest 5311;' is commented
+				setquest 5311;
 				close;
 			case 4:
 				emotion ET_OTL;
@@ -4491,10 +4491,8 @@ verus03,81,241,6	script	Police Officer Seiden#EP15_1	4_M_ORIENT02,{
 				next;
 				if (select( "Sure.", "Not now." ) == 2) {
 					emotion ET_SCRATCH;
-					if (isbegin_quest(5307) == 0) {
-						setquest 5307;
-						completequest 5307;
-					}
+					setquest 5307;
+					completequest 5307;
 					setquest 5312;// Seiden's Problem
 					mes "[Police Officer Seiden]";
 					mes "I don't understand. My friend swore this never failed on people, hm... Oh well, tell Chief Kesler everything's good on my end.";
@@ -4515,10 +4513,8 @@ verus03,81,241,6	script	Police Officer Seiden#EP15_1	4_M_ORIENT02,{
 				next;
 				if (select( "I'll be back.", "Maybe next time." ) == 2) {
 					emotion ET_SCRATCH;
-					if (isbegin_quest(5307) == 0) {
-						setquest 5307;
-						completequest 5307;
-					}
+					setquest 5307;
+					completequest 5307;
 					setquest 5312;// Seiden's Problem
 					mes "[Police Officer Seiden]";
 					mes "I don't understand. My friend swore this never failed on people, hm... Oh well, tell Chief Kesler everything's good on my end.";
@@ -4747,10 +4743,8 @@ verus04,202,258,4	script	Police Officer Piffs#EP15_1	4_M_SAGE_C,{
 				mes "I'm running short on some supplies, but I can't leave my post unattended. Can you help me?";
 				next;
 				if (select("Sure thing.", "Not now.") == 2) {
-					if (isbegin_quest(5308) == 0) {
-						setquest 5308;// Police Officer Piffs
-						completequest 5308;
-					}
+					setquest 5308;// Police Officer Piffs
+					completequest 5308;
 					setquest 5313;// Piffs's Problem
 					mes "[Police Officer Piffs]";
 					mes "I understand. If you change your mind, though, come back to me.";
@@ -4864,10 +4858,9 @@ verus04,187,219,4	script	Thicket#EP15_1D_01	4_CREEPER,{
 			mes "You've decided to forget about it.";
 			close;
 		}
-		if (rand(2)) {
-			progressbar "00ff00",2;
+		progressbar "00ff00",2;
+		if (rand(2))
 			mes "No herbs were found in the thicket.";
-		}
 		else {
 			getitem 6754,1;// Collected_Medicinal_Herbs
 			mes "Gathered the herb.";

sql-files/item_db_re.sql

@@ -3079,7 +3079,7 @@ REPLACE INTO `item_db_re` VALUES (4873,'Attack_Delay_3','DelayafterAttack3Lv',6,
 REPLACE INTO `item_db_re` VALUES (4875,'Bear\'s_Power','Bear\'s Power',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \\\"Bigfoot Power !\\\"; }";',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (4876,'Runaway_Magic','Runaway Magic',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bInt,200; bonus2 bSPLossRate,200,1000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_LAMADAN; }";',NULL,'heal 0,-2000;');
 REPLACE INTO `item_db_re` VALUES (4877,'Speed_Of_Light','Speed of Light',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/*TODO: Confirm the rate*/ autobonus "{ bonus bAspdRate,100; bonus bFlee,100; bonus2 bHPLossRate,400,1000; bonus2 bSPLossRate,50,1000;}",10,5000,BF_WEAPON,"{ specialeffect2 EF_AGIUP2; }";',NULL,'heal 0,-300;');
-REPLACE INTO `item_db_re` VALUES (4878,'Muscle_Fool','Muscle Fool',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus2 "{ bonus bDef,1000; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }";',NULL,'heal 0,-300;');
+REPLACE INTO `item_db_re` VALUES (4878,'Muscle_Fool','Muscle Fool',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus2 "{ bonus bVit,200; bonus2 bAddRace,RC_All,-50; bonus bMatkRate,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD3; }";',NULL,'heal 0,-300;');
 REPLACE INTO `item_db_re` VALUES (4879,'Hawkeye','Hawkeye',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bDex,200; bonus2 bSPLossRate,50,1000; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_BASH3D6; }";',NULL,'heal 0,-300;');
 REPLACE INTO `item_db_re` VALUES (4880,'Lucky_Day','Lucky Day',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'autobonus "{ bonus bLuk,200; }",10,5000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_DANCE_BLADE_ATK; }";',NULL,'heal 0,-300;');
 REPLACE INTO `item_db_re` VALUES (4881,'Attack_Delay_4','Attack Delay 4',6,10,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'bonus bAspdRate,10;',NULL,NULL);
@@ -4081,7 +4081,14 @@ REPLACE INTO `item_db_re` VALUES (5892,'RCC2013_1ST_CROWN','RCC2013 1ST CROWN',4
 REPLACE INTO `item_db_re` VALUES (5893,'RCC2013_2ND_CROWN','RCC2013 2ND CROWN',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1107,'bonus bAllStats,4; skill "AL_TELEPORT",1;','sc_start SC_SPEEDUP0,-1,25;','sc_end SC_SPEEDUP0;');
 REPLACE INTO `item_db_re` VALUES (5894,'RCC2013_3RD_CROWN','RCC2013 3RD CROWN',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1108,'bonus bAllStats,3; skill "AL_TELEPORT",1;','sc_start SC_SPEEDUP0,-1,25;','sc_end SC_SPEEDUP0;');
 REPLACE INTO `item_db_re` VALUES (5895,'RCC2013_ANV_Hat','RCC2013 ANV Hat',4,20,NULL,2500,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'1',0,1109,'bonus bAllStats,1; bonus2 bAddClass,Class_All,2; bonus bMatkRate,2;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (5906,'Oni_Horns_','Oni Horns',4,0,NULL,20,NULL,10,NULL,1,0x00001000,63,2,256,NULL,'100',1,1127,'bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5900,'Divine_Guard_Hat','Divine Guard Hat',4,0,NULL,200,NULL,10,NULL,1,0x00004000,56,2,256,NULL,'100',1,1121,'.@r = getrefine(); bonus2 bSubSize,Size_All,5; if(.@r>=7) { .@level = getskilllv("AL_HEAL"); bonus3 bAutoSpellWhenHit,"AL_HEAL",(.@level ? .@level : 5),10; } if(.@r>=9) { bonus2 bSkillAtk,"LG_RAYOFGENESIS",20; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5901,'Focus_Beret','Focus Beret',4,0,NULL,200,NULL,10,NULL,1,0x00008000,56,2,256,NULL,'100',1,1122,'.@r = getrefine(); bonus4 bAutoSpellOnSkill,"SR_DRAGONCOMBO","SR_FALLENEMPIRE",max(getskilllv("SR_FALLENEMPIRE"),1),100; if(.@r>=7) { autobonus "{ bonus bAspd,2; }",30,5000,0,"{ specialeffect2 EF_ENHANCE; }"; } if(.@r>=9) { bonus2 bSkillAtk,"SR_FALLENEMPIRE",30; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5902,'Harvester_Hat','Harvester Hat',4,0,NULL,200,NULL,10,NULL,1,0x00040000,56,2,256,NULL,'100',1,1123,'.@r = getrefine(); bonus2 bAddMonsterDropItem,6211,100; bonus2 bAddMonsterDropItem,6212,100; if(.@r>=7) { bonus2 bAddMonsterDropItem,6210,50; } if(.@r>=9) { bonus2 bSkillAtk,"GN_CARTCANNON",15; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5903,'Deadman_Bandana','Deadman Bandana',4,0,NULL,200,NULL,15,NULL,1,0x00810204,63,2,256,NULL,'99',1,1124,'.@r = getrefine(); .@rate = 1; bonus bCritical,.@r*2; bonus bFixedCastrate,-2; bonus3 bAutoSpellWhenHit,"SL_SWOO",getskilllv("SL_SWOO"),(.@rate*10); if (.@r>=7) { bonus bMatk,20; .@rate += 3; } if(.@r>=9) { bonus bVariableCastrate,-20; bonus2 bSkillUseSP,"SL_STUN",5; bonus2 bSkillUseSP,"SL_SMA",5; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5904,'Inconspicuous_Hat','Inconspicuous Hat',4,0,NULL,200,NULL,10,NULL,1,0x00020000,56,2,256,NULL,'100',1,1125,'.@r = getrefine(); if (.@r>=9) { .@matk = 5; } bonus bMatkRate,(7+.@matk); if (.@r>=7) { bonus bMatk,(readparam(bInt)/5)*2; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5905,'Lyrica_Hat','Lyrica Hat',4,0,NULL,200,NULL,10,NULL,1,0x00080000,56,2,256,NULL,'100',1,1126,'.@r = getrefine(); bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15; if(.@r>=7) { bonus bFixedCastrate,4*(getskilllv("WM_LESSON")); } if(.@r>=9) { bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5906,'Oni_Horns_','Oni Horns',4,0,NULL,20,NULL,10,NULL,1,0x00001000,56,2,256,NULL,'100',1,1127,'bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING")); .@r = getrefine(); if(.@r > 6){ bonus bAtk,20; bonus bHit,5; } if(.@r > 9){ bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10; }',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (5907,'Sea_Captain_Hat','Sea Captain Hat',4,0,NULL,200,NULL,20,NULL,1,0x00000400,56,2,256,NULL,'100',1,1128,'bonus2 bSkillAtk,"NC_AXEBOOMERANG",20; .@dmg = 20; .@r = getrefine(); if (.@r>=7) { .@dmg += getskilllv("BS_WEAPONRESEARCH"); } if (.@r>=9) { .@dmg += getskilllv("NC_TRAININGAXE"); } bonus2 bSkillAtk,"NC_AXETORNADO",.@dmg;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5914,'Earmuff_Flowerform','C Flutter Butterfly',4,0,NULL,0,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,4096,NULL,'1',0,1378,'hateffect HAT_EF_FLUTTER_BUTTERFLY,true;',NULL,'hateffect HAT_EF_FLUTTER_BUTTERFLY,false;');
 REPLACE INTO `item_db_re` VALUES (5917,'Yellow_Scarf','Yellow Scarf',4,0,NULL,100,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,1,NULL,'90',0,1170,'bonus bLongAtkDef,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (5918,'Gambler_Seal','Gambler Seal',4,0,NULL,500,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,512,NULL,NULL,0,1202,'bonus bCritical,3; bonus bCritAtkRate,3; bonus2 bSubSkill,"RA_ARROWSTORM",10; bonus2 bSubSkill,"SR_GATEOFHELL",10; .@dex = readparam(bDex); .@luk = readparam(bLuk); bonus bCritAtkRate,-(.@dex/10)*2; bonus bCritical,.@luk/10; bonus bBaseAtk,(.@luk/10)*2; bonus bMatk,(.@luk/10)*2; if (.@luk > 120) { bonus bCritical,10; bonus bCritAtkRate,10; bonus2 bSubSkill,"RA_ARROWSTORM",30; bonus2 bSubSkill,"SR_GATEOFHELL",30; } else if (.@luk > 108) { bonus bCritical,5; bonus bCritAtkRate,10; }',NULL,NULL);
@@ -8568,12 +8575,12 @@ REPLACE INTO `item_db_re` VALUES (14611,'M_Def_Potion','M Def Potion',11,0,NULL,
 REPLACE INTO `item_db_re` VALUES (14612,'M_Mdef_Potion','M Mdef Potion',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,120000,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14613,'RWC_Scroll_2012','RWC Scroll 2012',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_RWC_Scroll_2012);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14614,'Ex_Def_Potion','Ex Def Potion',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,1800000,3; sc_start SC_MDEF_RATE,1800000,3;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14616,'STR_Biscuit_Stick','Bar Cookie Of Strength',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_STRFOOD,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14617,'VIT_Biscuit_Stick','Bar Cookie Of Vitality',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_VITFOOD,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14618,'AGI_Biscuit_Stick','Bar Cookie Of Agility',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_AGIFOOD,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14619,'INT_Biscuit_Stick','Bar Cookie Of Intelligence',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_INTFOOD,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14620,'DEX_Biscuit_Stick','Bar Cookie Of Dexterity',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_DEXFOOD,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33);',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14621,'LUK_Biscuit_Stick','Bar Cookie Of Lucky',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_LUKFOOD,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14616,'STR_Biscuit_Stick','Bar Cookie Of Strength',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_STR_CASH,1800000,15; sc_start SC_ATKPOTION,600000,rand(11,111);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14617,'VIT_Biscuit_Stick','Bar Cookie Of Vitality',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_VIT_CASH,1800000,15; bonus_script "{ bonus bHPRecovRate,rand(11,33); }",1800,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14618,'AGI_Biscuit_Stick','Bar Cookie Of Agility',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_AGI_CASH,1800000,15; sc_start SC_FLEEFOOD,600000,rand(11,33);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14619,'INT_Biscuit_Stick','Bar Cookie Of Intelligence',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_INT_CASH,1800000,15; sc_start SC_MATKPOTION,600000,rand(11,111);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14620,'DEX_Biscuit_Stick','Bar Cookie Of Dexterity',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_DEX_CASH,1800000,15; sc_start SC_HITFOOD,600000,rand(11,33);',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14621,'LUK_Biscuit_Stick','Bar Cookie Of Lucky',18,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_FOOD_LUK_CASH,1800000,15; sc_start SC_CRIFOOD,600000,rand(11,33);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14623,'Golden_Treasure_Box_','Golden Treasure Box',18,10,NULL,10,NULL,NULL,NULL,0,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'/*getitem callfunc("F_Rand",Devilring card, Angeling card, 11 weapons smelting ticket, armor smelting 11 ticket , horns of the buffalo, ring of recovery, pink bunny costume hair band)*/',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14624,'Blue_Scroll','Blue Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Blue_Scroll);',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14626,'Indigo_Scroll','Indigo Scroll',2,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getgroupitem(IG_Indigo_Scroll);',NULL,NULL);
@@ -10916,13 +10923,13 @@ REPLACE INTO `item_db_re` VALUES (21019,'Onimaru','Onimaru',5,0,NULL,4200,'75',N
 #===================================================================
 # New Shoes
 #===================================================================
-REPLACE INTO `item_db_re` VALUES (22000,'Temporal_Str_Boots','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22000,'Temporal_Str_Boots','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bAtk,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22001,'Temporal_Int_Boots','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22002,'Temporal_Agi_Boots','Temporal Boots Of Agility',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAspdRate,3*(.@r/3); if(readparam(bAgi)>=120) bonus bAspd,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22003,'Temporal_Vit_Boots','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22004,'Temporal_Dex_Boots','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22005,'Temporal_Luk_Boots','Temporal Boots Of Luck',4,20,NULL,600,NULL,20,NULL,0,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMdef,5; bonus bCritAtkRate,2*(.@r/3); if(readparam(bLuk)>=120) bonus bCritAtkRate,30;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (22006,'Temporal_Str_Boots_','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bBaseAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bBaseAtk,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (22006,'Temporal_Str_Boots_','Temporal Boots Of Strength',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bAtk,7*(.@r/3); if(readparam(bStr)>=120) bonus bAtk,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22007,'Temporal_Vit_Boots_','Temporal Boots Of Vitality',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(300*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); if(readparam(bVit)>=120) bonus bMaxHPrate,8;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22008,'Temporal_Dex_Boots_','Temporal Boots Of Dexterity',4,20,NULL,600,NULL,25,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bDex,3*(.@r/3); if(readparam(bDex)>=120){ bonus bLongAtkRate,5; bonus bFixedCast,-500; }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (22009,'Temporal_Int_Boots_','Temporal Boots Of Intelligence',4,20,NULL,600,NULL,20,NULL,1,0xFFFFFFFF,56,2,64,NULL,'99',1,NULL,'.@r = getrefine(); bonus bMdef,5; bonus bMaxHP,300+(100*(.@r/3)); bonus bMaxSP,30+(10*(.@r/3)); bonus bMatk,10*(.@r/3); if(readparam(bInt)>=120) bonus bMatk,60;',NULL,NULL);

sql-files/main.sql

@@ -608,6 +608,7 @@ CREATE TABLE IF NOT EXISTS `homunculus` (
   `alive` tinyint(2) NOT NULL default '1',
   `rename_flag` tinyint(2) NOT NULL default '0',
   `vaporize` tinyint(2) NOT NULL default '0',
+  `autofeed` tinyint(2) NOT NULL default '0',
   PRIMARY KEY  (`homun_id`)
 ) ENGINE=MyISAM;
 

sql-files/upgrades/upgrade_20180404.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `homunculus`
+	ADD COLUMN `autofeed` tinyint(2) NOT NULL default '0' AFTER `vaporize`;

src/char/char.cpp

@@ -1456,7 +1456,8 @@ int char_make_new_char_sql(struct char_session_data* sd, char* name_, int str, i
 	}
 
 #if PACKETVER >= 20151001
-	if (start_job != JOB_NOVICE && start_job != JOB_SUMMONER)
+	if(!(start_job == JOB_NOVICE && (charserv_config.allowed_job_flag&1)) && 
+		!(start_job == JOB_SUMMONER && (charserv_config.allowed_job_flag&2)))
 		return -2; // Invalid job
 
 	// Check for Doram based information.
@@ -2453,7 +2454,7 @@ bool char_checkdb(void){
 	}
 	//checking homunculus_db
 	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT  `homun_id`,`char_id`,`class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`,"
-		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`alive`,`rename_flag`,`vaporize` "
+		"`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`alive`,`rename_flag`,`vaporize`,`autofeed` "
 		" FROM `%s` LIMIT 1;", schema_config.homunculus_db) ){
 		Sql_ShowDebug(sql_handle);
 		return false;
@@ -2779,6 +2780,12 @@ void char_set_defaults(){
 	charserv_config.clan_remove_inactive_days = 14;
 	charserv_config.mail_return_days = 14;
 	charserv_config.mail_delete_days = 14;
+
+#if defined(RENEWAL) && PACKETVER >= 20151001
+	charserv_config.allowed_job_flag = 3;
+#else
+	charserv_config.allowed_job_flag = 1;
+#endif
 }
 
 /**
@@ -3057,6 +3064,8 @@ bool char_config_read(const char* cfgName, bool normal){
 			charserv_config.mail_return_days = atoi(w2);
 		} else if (strcmpi(w1, "mail_delete_days") == 0) {
 			charserv_config.mail_delete_days = atoi(w2);
+		} else if (strcmpi(w1, "allowed_job_flag") == 0) {
+			charserv_config.allowed_job_flag = atoi(w2);
 		} else if (strcmpi(w1, "import") == 0) {
 			char_config_read(w2, normal);
 		}

src/char/char.hpp

@@ -185,6 +185,8 @@ struct CharServ_Config {
 	int clan_remove_inactive_days;
 	int mail_return_days;
 	int mail_delete_days;
+
+	int allowed_job_flag;
 };
 extern struct CharServ_Config charserv_config;
 

src/char/int_homun.cpp

@@ -93,10 +93,10 @@ bool mapif_homunculus_save(struct s_homunculus* hd)
 	if( hd->hom_id == 0 )
 	{// new homunculus
 		if( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s` "
-			"(`char_id`, `class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`, `rename_flag`, `vaporize`) "
-			"VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%d')",
+			"(`char_id`, `class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`, `rename_flag`, `vaporize`, `autofeed`) "
+			"VALUES ('%d', '%d', '%d', '%s', '%d', '%u', '%u', '%d', '%d', %d, '%d', '%d', '%d', '%d', '%u', '%u', '%u', '%u', '%d', '%d', '%d', '%d')",
 			schema_config.homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
-			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize) )
+			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->autofeed) )
 		{
 			Sql_ShowDebug(sql_handle);
 			flag = false;
@@ -108,9 +108,9 @@ bool mapif_homunculus_save(struct s_homunculus* hd)
 	}
 	else
 	{
-		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%u',`max_hp`='%u',`sp`='%u',`max_sp`='%u',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d' WHERE `homun_id`='%d'",
+		if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `char_id`='%d', `class`='%d',`prev_class`='%d',`name`='%s',`level`='%d',`exp`='%u',`intimacy`='%u',`hunger`='%d', `str`='%d', `agi`='%d', `vit`='%d', `int`='%d', `dex`='%d', `luk`='%d', `hp`='%u',`max_hp`='%u',`sp`='%u',`max_sp`='%u',`skill_point`='%d', `rename_flag`='%d', `vaporize`='%d', `autofeed`='%d' WHERE `homun_id`='%d'",
 			schema_config.homunculus_db, hd->char_id, hd->class_, hd->prev_class, esc_name, hd->level, hd->exp, hd->intimacy, hd->hunger, hd->str, hd->agi, hd->vit, hd->int_, hd->dex, hd->luk,
-			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->hom_id) )
+			hd->hp, hd->max_hp, hd->sp, hd->max_sp, hd->skillpts, hd->rename_flag, hd->vaporize, hd->autofeed, hd->hom_id) )
 		{
 			Sql_ShowDebug(sql_handle);
 			flag = false;
@@ -155,7 +155,7 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 
 	memset(hd, 0, sizeof(*hd));
 
-	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize` FROM `%s` WHERE `homun_id`='%u'",
+	if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`prev_class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize`, `autofeed` FROM `%s` WHERE `homun_id`='%u'",
 		schema_config.homunculus_db, homun_id) )
 	{
 		Sql_ShowDebug(sql_handle);
@@ -196,6 +196,7 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
 	Sql_GetData(sql_handle, 19, &data, NULL); hd->skillpts = atoi(data);
 	Sql_GetData(sql_handle, 20, &data, NULL); hd->rename_flag = atoi(data);
 	Sql_GetData(sql_handle, 21, &data, NULL); hd->vaporize = atoi(data);
+	Sql_GetData(sql_handle, 22, &data, NULL); hd->autofeed = atoi(data) != 0;
 	Sql_FreeResult(sql_handle);
 
 	hd->intimacy = umin(hd->intimacy,100000);

src/common/mmo.h

@@ -434,6 +434,7 @@ struct s_homunculus {	//[orn]
 	int luk_value;
 
 	char spiritball; //for homun S [lighta]
+	bool autofeed;
 };
 
 struct s_mercenary {

src/map/battle.cpp

@@ -4472,10 +4472,12 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
 		if (sc->data[SC_MADNESSCANCEL])
 			ATK_ADD(wd.equipAtk, wd.equipAtk2, 100);
 		if (sc->data[SC_MAGICALBULLET]) {
-			if (sstatus->matk_max > sstatus->matk_min) {
-				ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max((sstatus->matk_min + rnd() % (sstatus->matk_max - sstatus->matk_min)) - (tstatus->mdef + tstatus->mdef2), 0));
+			short tmdef = tstatus->mdef + tstatus->mdef2;
+
+			if (sstatus->matk_min > tmdef && sstatus->matk_max > sstatus->matk_min) {
+				ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max((sstatus->matk_min + rnd() % (sstatus->matk_max - sstatus->matk_min)) - tmdef, 0));
 			} else {
-				ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max(sstatus->matk_min - (tstatus->mdef + tstatus->mdef2), 0));
+				ATK_ADD(wd.weaponAtk, wd.weaponAtk2, i64max(sstatus->matk_min - tmdef, 0));
 			}
 		}
 		if (sc->data[SC_GATLINGFEVER]) {
@@ -7450,7 +7452,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 	}
 	if (sd) {
 		uint16 r_skill = 0, sk_idx = 0;
-		if( wd.flag&BF_SHORT && sc && sc->data[SC__AUTOSHADOWSPELL] && rnd()%100 < sc->data[SC__AUTOSHADOWSPELL]->val3 &&
+		if( wd.flag&BF_WEAPON && sc && sc->data[SC__AUTOSHADOWSPELL] && rnd()%100 < sc->data[SC__AUTOSHADOWSPELL]->val3 &&
 			(r_skill = (uint16)sc->data[SC__AUTOSHADOWSPELL]->val1) && (sk_idx = skill_get_index(r_skill)) &&
 			sd->status.skill[sk_idx].id != 0 && sd->status.skill[sk_idx].flag == SKILL_FLAG_PLAGIARIZED )
 		{
@@ -8131,7 +8133,9 @@ static const struct _battle_data {
 	{ "max_walk_speed",                     &battle_config.max_walk_speed,                  300,    100,    100*DEFAULT_WALK_SPEED, },
 	{ "max_lv",                             &battle_config.max_lv,                          99,     0,      MAX_LEVEL,      },
 	{ "aura_lv",                            &battle_config.aura_lv,                         99,     0,      INT_MAX,        },
-	{ "max_hp",                             &battle_config.max_hp,                          32500,  100,    1000000000,     },
+	{ "max_hp_lv99",                        &battle_config.max_hp_lv99,                    330000,  100,    1000000000,     },
+	{ "max_hp_lv150",                       &battle_config.max_hp_lv150,                   660000,  100,    1000000000,     },
+	{ "max_hp",                             &battle_config.max_hp,                        1100000,  100,    1000000000,     },
 	{ "max_sp",                             &battle_config.max_sp,                          32500,  100,    1000000000,     },
 	{ "max_cart_weight",                    &battle_config.max_cart_weight,                 8000,   100,    1000000,        },
 	{ "max_parameter",                      &battle_config.max_parameter,                   99,     10,     SHRT_MAX,       },
@@ -8503,6 +8507,9 @@ static const struct _battle_data {
 	{ "autoloot_adjust",                    &battle_config.autoloot_adjust,                 0,      0,      1,              },
 	{ "broadcast_hide_name",                &battle_config.broadcast_hide_name,             2,      0,      NAME_LENGTH,    },
 	{ "skill_drop_items_full",              &battle_config.skill_drop_items_full,           0,      0,      1,              },
+	{ "feature.homunculus_autofeed",        &battle_config.feature_homunculus_autofeed,     1,      0,      1,              },
+	{ "feature.homunculus_autofeed_rate",   &battle_config.feature_homunculus_autofeed_rate,30,     0,    100,              },
+    { "summoner_trait",                     &battle_config.summoner_trait,                  3,      0,      3,              },
 	{ "display_tax_info",                   &battle_config.display_tax_info,                0,      0,      1,              },
 
 #include "../custom/battle_config_init.inc"
@@ -8634,6 +8641,13 @@ void battle_adjust_conf()
 	}
 #endif
 
+#if PACKETVER < 20170920
+	if( battle_config.feature_homunculus_autofeed ){
+		ShowWarning("conf/battle/feature.conf homunculus autofeeding is enabled but it requires PACKETVER 2017-09-20 or newer, disabling...\n");
+		battle_config.feature_homunculus_autofeed = 0;
+	}
+#endif
+
 #ifndef CELL_NOSTACK
 	if (battle_config.custom_cell_stack_limit != 1)
 		ShowWarning("Battle setting 'custom_cell_stack_limit' takes no effect as this server was compiled without Cell Stack Limit support.\n");

src/map/battle.hpp

@@ -265,6 +265,8 @@ struct Battle_Config
 	int arrow_decrement;
 	int max_aspd;
 	int max_walk_speed;	//Maximum walking speed after buffs [Skotlex]
+	int max_hp_lv99;
+	int max_hp_lv150;
 	int max_hp;
 	int max_sp;
 	int max_lv, aura_lv;
@@ -639,6 +641,9 @@ struct Battle_Config
 	int autoloot_adjust;
 	int broadcast_hide_name;
 	int skill_drop_items_full;
+    int feature_homunculus_autofeed;
+	int feature_homunculus_autofeed_rate;
+	int summoner_trait;
 	int display_tax_info;
 
 #include "../custom/battle_config_struct.inc"

src/map/clif.cpp

@@ -9765,23 +9765,21 @@ void clif_feel_hate_reset(struct map_session_data *sd)
 }
 
 
-/// Equip window (un)tick ack (ZC_CONFIG).
-/// 02d9 <type>.L <value>.L
-/// type:
-///     0 = open equip window
-///     value:
-///         0 = disabled
-///         1 = enabled
-void clif_equiptickack(struct map_session_data* sd, int flag)
-{
+/// Send out reply to configuration change
+/// 02d9 <type>.L <value>.L (ZC_CONFIG)
+/// type: see enum e_config_type
+/// value:
+///		false = disabled
+///		true = enabled
+void clif_configuration( struct map_session_data* sd, enum e_config_type type, bool enabled ){
 	int fd;
 	nullpo_retv(sd);
 	fd = sd->fd;
 
 	WFIFOHEAD(fd, packet_len(0x2d9));
 	WFIFOW(fd, 0) = 0x2d9;
-	WFIFOL(fd, 2) = 0;
-	WFIFOL(fd, 6) = flag;
+	WFIFOL(fd, 2) = type;
+	WFIFOL(fd, 6) = enabled;
 	WFIFOSET(fd, packet_len(0x2d9));
 }
 
@@ -10449,6 +10447,13 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		clif_partyinvitationstate(sd);
 		clif_equipcheckbox(sd);
 #endif
+#if PACKETVER >= 20170920
+		if( sd->hd ){
+			clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, sd->hd->homunculus.autofeed );
+		}else{
+			clif_configuration( sd, CONFIG_HOMUNCULUS_AUTOFEED, false );
+		}
+#endif
 
 		if (sd->guild && battle_config.guild_notice_changemap == 1)
 			clif_guild_notice(sd); // Displays after VIP
@@ -15388,7 +15393,7 @@ void clif_Mail_read(struct map_session_data *sd, int mail_id)
 
 		msg_len += 1; // Zero Termination
 
-		itemsize = 24 + 5 * MAX_ITEM_RDM_OPT;
+		itemsize = 24 + 5 * 5;
 		len = 24 + msg_len+1 + itemsize * count;
 
 		WFIFOHEAD(fd, len);
@@ -16543,19 +16548,38 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
 }
 
 
-/// Request to change equip window tick (CZ_CONFIG).
-/// 02d8 <type>.L <flag>.L
-/// type:
-///     0 = open equip window
+/// Request to a configuration.
+/// 02d8 <type>.L <flag>.L (CZ_CONFIG)
+/// type: see enum e_config_type
 /// flag:
-///     0 = disabled
-///     1 = enabled
-void clif_parse_EquipTick(int fd, struct map_session_data* sd)
-{
-	//int type = RFIFOL(fd,packet_db[cmd].pos[0]);
-	bool flag = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[1]) != 0;
-	sd->status.show_equip = flag;
-	clif_equiptickack(sd, flag);
+///     false = disabled
+///     true = enabled
+void clif_parse_configuration( int fd, struct map_session_data* sd ){
+	int cmd = RFIFOW(fd,0);
+	int type = RFIFOL(fd,packet_db[cmd].pos[0]);
+	bool flag = RFIFOL(fd,packet_db[cmd].pos[1]) != 0;
+
+	switch( type ){
+		case CONFIG_OPEN_EQUIPMENT_WINDOW:
+			sd->status.show_equip = flag;
+			break;
+		case CONFIG_PET_AUTOFEED:
+			// TODO: Implement with pet evolution system
+			break;
+		case CONFIG_HOMUNCULUS_AUTOFEED:
+			// Player can not click this if he does not have a homunculus or it is vaporized
+			if( sd->hd == nullptr || sd->hd->homunculus.vaporize ){
+				return;
+			}
+
+			sd->hd->homunculus.autofeed = flag;
+			break;
+		default:
+			ShowWarning( "clif_parse_configuration: received unknown configuration type '%d'...\n", type );
+			return;
+	}
+
+	clif_configuration( sd, static_cast<e_config_type>(type), flag );
 }
 
 /// Request to change party invitation tick.
@@ -17968,7 +17992,7 @@ static void clif_parse_SearchStoreInfo(int fd, struct map_session_data* sd)
 void clif_search_store_info_ack(struct map_session_data* sd)
 {
 #if PACKETVER >= 20150225
-	const unsigned int blocksize = MESSAGE_SIZE+26+5*MAX_ITEM_RDM_OPT;
+	const unsigned int blocksize = MESSAGE_SIZE+26+5*5;
 #else
 	const unsigned int blocksize = MESSAGE_SIZE+26;
 #endif

src/map/clif.hpp

@@ -546,6 +546,13 @@ enum e_damage_type : uint8_t {
 	DMG_TOUCH,				/// (touch skill?)
 };
 
+enum e_config_type : uint32 {
+	CONFIG_OPEN_EQUIPMENT_WINDOW = 0,
+	// Unknown
+	CONFIG_PET_AUTOFEED = 2,
+	CONFIG_HOMUNCULUS_AUTOFEED
+};
+
 int clif_setip(const char* ip);
 void clif_setbindip(const char* ip);
 void clif_setport(uint16 port);
@@ -872,7 +879,7 @@ void clif_homskillup(struct map_session_data *sd, uint16 skill_id);	//[orn]
 int clif_hom_food(struct map_session_data *sd,int foodid,int fail);	//[orn]
 void clif_send_homdata(struct map_session_data *sd, int state, int param);	//[orn]
 
-void clif_equiptickack(struct map_session_data* sd, int flag);
+void clif_configuration( struct map_session_data* sd, enum e_config_type type, bool enabled );
 void clif_partytickack(struct map_session_data* sd, bool flag);
 void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* tsd);
 void clif_equipcheckbox(struct map_session_data* sd);
@@ -1075,7 +1082,6 @@ void clif_SelectCart(struct map_session_data *sd);
 /// Achievement System
 void clif_achievement_list_all(struct map_session_data *sd);
 void clif_achievement_update(struct map_session_data *sd, struct achievement *ach, int count);
-void clif_pAchievementCheckReward(int fd, struct map_session_data *sd);
 void clif_achievement_reward_ack(int fd, unsigned char result, int ach_id);
 
 #endif /* _CLIF_HPP_ */

src/map/clif_packetdb.hpp

@@ -1123,7 +1123,7 @@
 	packet(0x02d5,2);
 	parseable_packet(0x02d6,6,clif_parse_ViewPlayerEquip,2);
 	packet(0x02d7,-1);
-	parseable_packet(0x02d8,10,clif_parse_EquipTick,2,6);
+	parseable_packet(0x02d8,10,clif_parse_configuration,2,6);
 	packet(0x02d9,10);
 	packet(0x02da,3);
 	parseable_packet(0x02db,-1,clif_parse_BattleChat,2,4);

src/map/clif_shuffle.hpp

@@ -4008,6 +4008,7 @@
 	parseable_packet(0x0281,6,clif_parse_GetCharNameRequest,2);
 // 2017-09-13bRagexeRE
 #elif PACKETVER == 20170913
+	parseable_packet(0x0281,6,clif_parse_GetCharNameRequest,2);
 	parseable_packet(0x035F,26,clif_parse_FriendsListAdd,2);
 	parseable_packet(0x0437,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15);
 	parseable_packet(0x07E4,8,clif_parse_MoveFromKafra,2,4);

src/map/homunculus.cpp

@@ -892,6 +892,10 @@ static int hom_hungry(int tid, unsigned int tick, int id, intptr_t data)
 		clif_emotion(&hd->bl, ET_OK);
 	}
 
+	if( battle_config.feature_homunculus_autofeed && hd->homunculus.autofeed && hd->homunculus.hunger <= battle_config.feature_homunculus_autofeed_rate ){
+		hom_food( sd, hd );
+	}
+
 	if (hd->homunculus.hunger < 0) {
 		hd->homunculus.hunger = 0;
 		// Delete the homunculus if intimacy <= 100

src/map/itemdb.cpp

@@ -1484,7 +1484,7 @@ static int itemdb_readdb(void){
 				ShowError("itemdb_readdb: Invalid format (OnUnequip_Script column) in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
 				continue;
 			}
-			str[21] = p + 1;
+			str[21] = p;
 			p = &str[21][strlen(str[21]) - 2];
 
 			if ( *p != '}' ) {
@@ -1494,8 +1494,10 @@ static int itemdb_readdb(void){
 				for( v = 0; v < strlen(str[21]); v++ ) {
 					if( str[21][v] == '{' )
 						lcurly++;
-					else if ( str[21][v] == '}' )
+					else if (str[21][v] == '}') {
 						rcurly++;
+						p = &str[21][v];
+					}
 				}
 
 				if( lcurly != rcurly ) {
@@ -1503,7 +1505,8 @@ static int itemdb_readdb(void){
 					continue;
 				}
 			}
-			*p = '\0';
+			str[21] = str[21] + 1;  //skip the first left curly
+			*p = '\0';              //null the last right curly
 
 			if (!itemdb_parse_dbrow(str, path, lines, SCRIPT_IGNORE_EXTERNAL_BRACKETS))
 				continue;

src/map/pc.cpp

@@ -8249,7 +8249,12 @@ bool pc_setparam(struct map_session_data *sd,int type,int val)
 		sd->battle_status.hp = cap_value(val, 1, (int)sd->battle_status.max_hp);
 		break;
 	case SP_MAXHP:
-		sd->battle_status.max_hp = cap_value(val, 1, battle_config.max_hp);
+		if (sd->status.base_level < 100)
+			sd->battle_status.max_hp = cap_value(val, 1, battle_config.max_hp_lv99);
+		else if (sd->status.base_level < 151)
+			sd->battle_status.max_hp = cap_value(val, 1, battle_config.max_hp_lv150);
+		else
+			sd->battle_status.max_hp = cap_value(val, 1, battle_config.max_hp);
 
 		if( sd->battle_status.max_hp < sd->battle_status.hp )
 		{
@@ -8888,6 +8893,9 @@ void pc_setoption(struct map_session_data *sd,int type)
 			status_change_end(&sd->bl,SC_ACCELERATION,INVALID_TIMER);
 			status_change_end(&sd->bl,SC_OVERHEAT_LIMITPOINT,INVALID_TIMER);
 			status_change_end(&sd->bl,SC_OVERHEAT,INVALID_TIMER);
+			status_change_end(&sd->bl,SC_MAGNETICFIELD,INVALID_TIMER);
+			status_change_end(&sd->bl,SC_NEUTRALBARRIER_MASTER,INVALID_TIMER);
+			status_change_end(&sd->bl,SC_STEALTHFIELD_MASTER,INVALID_TIMER);
 			pc_bonus_script_clear(sd,BSF_REM_ON_MADOGEAR);
 		}
 	}

src/map/script.cpp

@@ -13880,7 +13880,7 @@ BUILDIN_FUNC(petloot)
 BUILDIN_FUNC(getinventorylist)
 {
 	TBL_PC *sd;
-	char card_var[NAME_LENGTH];
+	char card_var[NAME_LENGTH], randopt_var[50];
 	int i,j=0,k;
 
 	if (!script_charid2sd(2,sd))
@@ -13900,6 +13900,15 @@ BUILDIN_FUNC(getinventorylist)
 			}
 			pc_setreg(sd,reference_uid(add_str("@inventorylist_expire"), j),sd->inventory.u.items_inventory[i].expire_time);
 			pc_setreg(sd,reference_uid(add_str("@inventorylist_bound"), j),sd->inventory.u.items_inventory[i].bound);
+			for (k = 0; k < MAX_ITEM_RDM_OPT; k++)
+			{
+				sprintf(randopt_var, "@inventorylist_option_id%d",k+1);
+				pc_setreg(sd,reference_uid(add_str(randopt_var), j),sd->inventory.u.items_inventory[i].option[k].id);
+				sprintf(randopt_var, "@inventorylist_option_value%d",k+1);
+				pc_setreg(sd,reference_uid(add_str(randopt_var), j),sd->inventory.u.items_inventory[i].option[k].value);
+				sprintf(randopt_var, "@inventorylist_option_parameter%d",k+1);
+				pc_setreg(sd,reference_uid(add_str(randopt_var), j),sd->inventory.u.items_inventory[i].option[k].param);
+			}
 			j++;
 		}
 	}
@@ -17562,6 +17571,7 @@ BUILDIN_FUNC(getunitdata)
 			getunitdata_sub(UMOB_AMOTION, md->status.amotion);
 			getunitdata_sub(UMOB_ADELAY, md->status.adelay);
 			getunitdata_sub(UMOB_DMOTION, md->status.dmotion);
+			getunitdata_sub(UMOB_TARGETID, md->target_id);
 			break;
 
 		case BL_HOM:
@@ -17608,6 +17618,7 @@ BUILDIN_FUNC(getunitdata)
 			getunitdata_sub(UHOM_AMOTION, hd->battle_status.amotion);
 			getunitdata_sub(UHOM_ADELAY, hd->battle_status.adelay);
 			getunitdata_sub(UHOM_DMOTION, hd->battle_status.dmotion);
+			getunitdata_sub(UHOM_TARGETID, hd->ud.target);
 			break;
 
 		case BL_PET:
@@ -17695,6 +17706,7 @@ BUILDIN_FUNC(getunitdata)
 			getunitdata_sub(UMER_AMOTION, mc->base_status.amotion);
 			getunitdata_sub(UMER_ADELAY, mc->base_status.adelay);
 			getunitdata_sub(UMER_DMOTION, mc->base_status.dmotion);
+			getunitdata_sub(UMER_TARGETID, mc->ud.target);
 			break;
 
 		case BL_ELEM:
@@ -17740,6 +17752,7 @@ BUILDIN_FUNC(getunitdata)
 			getunitdata_sub(UELE_AMOTION, ed->base_status.amotion);
 			getunitdata_sub(UELE_ADELAY, ed->base_status.adelay);
 			getunitdata_sub(UELE_DMOTION, ed->base_status.dmotion);
+			getunitdata_sub(UELE_TARGETID, ed->ud.target);
 			break;
 
 		case BL_NPC:
@@ -17935,6 +17948,15 @@ BUILDIN_FUNC(setunitdata)
 			case UMOB_AMOTION: md->base_status->amotion = (short)value; calc_status = true; break;
 			case UMOB_ADELAY: md->base_status->adelay = (short)value; calc_status = true; break;
 			case UMOB_DMOTION: md->base_status->dmotion = (short)value; calc_status = true; break;
+			case UMOB_TARGETID: {
+				struct block_list* target = map_id2bl(value);
+				if (!target) {
+					ShowWarning("buildin_setunitdata: Error in finding target for BL_MOB!\n");
+					return SCRIPT_CMD_FAILURE;
+				}
+				mob_target(md,target,0);
+				break;
+			}
 			default:
 				ShowError("buildin_setunitdata: Unknown data identifier %d for BL_MOB.\n", type);
 				return SCRIPT_CMD_FAILURE;
@@ -17988,6 +18010,15 @@ BUILDIN_FUNC(setunitdata)
 			case UHOM_AMOTION: hd->base_status.amotion = (short)value; calc_status = true; break;
 			case UHOM_ADELAY: hd->base_status.adelay = (short)value; calc_status = true; break;
 			case UHOM_DMOTION: hd->base_status.dmotion = (short)value; calc_status = true; break;
+			case UHOM_TARGETID: {
+				struct block_list* target = map_id2bl(value);
+				if (!target) {
+					ShowWarning("buildin_setunitdata: Error in finding target for BL_HOM!\n");
+					return SCRIPT_CMD_FAILURE;
+				}
+				unit_attack(&hd->bl, target->id, 1);
+				break;
+			}
 			default:
 				ShowError("buildin_setunitdata: Unknown data identifier %d for BL_HOM.\n", type);
 				return SCRIPT_CMD_FAILURE;
@@ -18087,6 +18118,15 @@ BUILDIN_FUNC(setunitdata)
 			case UMER_AMOTION: mc->base_status.amotion = (short)value; calc_status = true; break;
 			case UMER_ADELAY: mc->base_status.adelay = (short)value; calc_status = true; break;
 			case UMER_DMOTION: mc->base_status.dmotion = (short)value; calc_status = true; break;
+			case UMER_TARGETID: {
+				struct block_list* target = map_id2bl(value);
+				if (!target) {
+					ShowWarning("buildin_setunitdata: Error in finding target for BL_MER!\n");
+					return SCRIPT_CMD_FAILURE;
+				}
+				unit_attack(&mc->bl, target->id, 1);
+				break;
+			}
 			default:
 				ShowError("buildin_setunitdata: Unknown data identifier %d for BL_MER.\n", type);
 				return SCRIPT_CMD_FAILURE;
@@ -18139,6 +18179,16 @@ BUILDIN_FUNC(setunitdata)
 			case UELE_AMOTION: ed->base_status.amotion = (short)value; calc_status = true; break;
 			case UELE_ADELAY: ed->base_status.adelay = (short)value; calc_status = true; break;
 			case UELE_DMOTION: ed->base_status.dmotion = (short)value; calc_status = true; break;
+			case UELE_TARGETID: {
+				struct block_list* target = map_id2bl(value);
+				if (!target) {
+					ShowWarning("buildin_setunitdata: Error in finding target for BL_ELEM!\n");
+					return SCRIPT_CMD_FAILURE;
+				}
+				elemental_change_mode(ed, static_cast<e_mode>(EL_MODE_AGGRESSIVE));
+				unit_attack(&ed->bl, target->id, 1);
+				break;
+			}
 			default:
 				ShowError("buildin_setunitdata: Unknown data identifier %d for BL_ELEM.\n", type);
 				return SCRIPT_CMD_FAILURE;
@@ -22137,7 +22187,6 @@ BUILDIN_FUNC(getvar) {
 	else
 		script_pushstrcopy(st, conv_str_(st, data, sd));
 
-	push_val2(st->stack, C_NAME, reference_getuid(data), reference_getref(data));
 	return SCRIPT_CMD_SUCCESS;
 }
 

src/map/script.hpp

@@ -470,6 +470,7 @@ enum unitdata_mobtypes {
 	UMOB_AMOTION,
 	UMOB_ADELAY,
 	UMOB_DMOTION,
+	UMOB_TARGETID,
 };
 
 enum unitdata_homuntypes {
@@ -512,6 +513,7 @@ enum unitdata_homuntypes {
 	UHOM_AMOTION,
 	UHOM_ADELAY,
 	UHOM_DMOTION,
+	UHOM_TARGETID,
 };
 
 enum unitdata_pettypes {
@@ -591,6 +593,7 @@ enum unitdata_merctypes {
 	UMER_AMOTION,
 	UMER_ADELAY,
 	UMER_DMOTION,
+	UMER_TARGETID,
 };
 
 enum unitdata_elemtypes {
@@ -632,6 +635,7 @@ enum unitdata_elemtypes {
 	UELE_AMOTION,
 	UELE_ADELAY,
 	UELE_DMOTION,
+	UELE_TARGETID,
 };
 
 enum unitdata_npctypes {

src/map/script_constants.hpp

@@ -3095,6 +3095,7 @@
 	export_constant(UMOB_AMOTION);
 	export_constant(UMOB_ADELAY);
 	export_constant(UMOB_DMOTION);
+	export_constant(UMOB_TARGETID);
 
 	/* unit control - homunculus */
 	export_constant(UHOM_SIZE);
@@ -3136,6 +3137,7 @@
 	export_constant(UHOM_AMOTION);
 	export_constant(UHOM_ADELAY);
 	export_constant(UHOM_DMOTION);
+	export_constant(UHOM_TARGETID);
 
 	/* unit control - pet */
 	export_constant(UPET_SIZE);
@@ -3213,6 +3215,7 @@
 	export_constant(UMER_AMOTION);
 	export_constant(UMER_ADELAY);
 	export_constant(UMER_DMOTION);
+	export_constant(UMER_TARGETID);
 
 	/* unit control - elemental */
 	export_constant(UELE_SIZE);
@@ -3253,6 +3256,7 @@
 	export_constant(UELE_AMOTION);
 	export_constant(UELE_ADELAY);
 	export_constant(UELE_DMOTION);
+	export_constant(UELE_TARGETID);
 
 	/* unit control - NPC */
 	export_constant(UNPC_DISPLAY);

src/map/skill.cpp

@@ -16121,6 +16121,9 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
 	if( i < ARRAYLENGTH(sd->skillusesp) )
 		req.sp -= sd->skillusesp[i].val;
 
+	if (skill_id == sd->status.skill[sd->reproduceskill_idx].id)
+		req.sp += req.sp * 30 / 100;
+
 	req.sp = cap_value(req.sp * sp_skill_rate_bonus / 100, 0, SHRT_MAX);
 
 	if( sc ) {
@@ -19800,7 +19803,7 @@ int skill_select_menu(struct map_session_data *sd,uint16 skill_id) {
 		return 0;
 	}
 
-	lv = (aslvl + 1) / 2; // The level the skill will be autocasted
+	lv = (aslvl + 5) / 2; // The level the skill will be autocasted
 	lv = min(lv,sd->status.skill[sk_idx].lv);
 	prob = (aslvl >= 10) ? 15 : (30 - 2 * aslvl); // Probability at level 10 was increased to 15.
 	sc_start4(&sd->bl,&sd->bl,SC__AUTOSHADOWSPELL,100,id,lv,prob,0,skill_get_time(SC_AUTOSHADOWSPELL,aslvl));

src/map/status.cpp

@@ -3415,7 +3415,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 	// Give them all modes except these (useful for clones)
 	base_status->mode = static_cast<e_mode>(MD_MASK&~(MD_STATUS_IMMUNE|MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK));
 
-	base_status->size = (sd->class_&JOBL_BABY || (sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER) ? SZ_SMALL : SZ_MEDIUM;
+	base_status->size = (sd->class_&JOBL_BABY || ((battle_config.summoner_trait&2) && (sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER)) ? SZ_SMALL : SZ_MEDIUM;
 	if (battle_config.character_size && pc_isriding(sd)) { // [Lupus]
 		if (sd->class_&JOBL_BABY) {
 			if (battle_config.character_size&SZ_BIG)
@@ -3426,7 +3426,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 	}
 	base_status->aspd_rate = 1000;
 	base_status->ele_lv = 1;
-	base_status->race = ((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER) ? RC_BRUTE : RC_PLAYER;
+	base_status->race = ((battle_config.summoner_trait&1) && (sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER) ? RC_BRUTE : RC_PLAYER;
 	base_status->class_ = CLASS_NORMAL;
 
 	// Zero up structures...
@@ -3835,7 +3835,12 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 	if(battle_config.hp_rate != 100)
 		base_status->max_hp = (unsigned int)(battle_config.hp_rate * (base_status->max_hp/100.));
 
-	base_status->max_hp = cap_value(base_status->max_hp,1,(unsigned int)battle_config.max_hp);
+	if (sd->status.base_level < 100)
+		base_status->max_hp = cap_value(base_status->max_hp,1,(unsigned int)battle_config.max_hp_lv99);
+	else if (sd->status.base_level < 151)
+		base_status->max_hp = cap_value(base_status->max_hp,1,(unsigned int)battle_config.max_hp_lv150);
+	else
+		base_status->max_hp = cap_value(base_status->max_hp,1,(unsigned int)battle_config.max_hp);
 
 // ----- SP MAX CALCULATION -----
 	base_status->max_sp = sd->status.max_sp = status_calc_maxhpsp_pc(sd,base_status->int_,false);
@@ -4993,7 +4998,12 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
 			if(battle_config.hp_rate != 100)
 				status->max_hp = (unsigned int)(battle_config.hp_rate * (status->max_hp/100.));
 
-			status->max_hp = umin(status->max_hp,(unsigned int)battle_config.max_hp);
+			if (sd->status.base_level < 100)
+				status->max_hp = umin(status->max_hp,(unsigned int)battle_config.max_hp_lv99);
+			else if (sd->status.base_level < 151)
+				status->max_hp = umin(status->max_hp,(unsigned int)battle_config.max_hp_lv150);
+			else
+				status->max_hp = umin(status->max_hp,(unsigned int)battle_config.max_hp);
 		}
 		else
 			status->max_hp = status_calc_maxhp(bl, b_status->max_hp);

src/map/storage.cpp

@@ -478,6 +478,7 @@ void storage_storagesaved(struct map_session_data *sd)
 
 	if (&sd->storage)
 		sd->storage.dirty = false;
+
 	if (sd->state.storage_flag == 1) {
 		sd->state.storage_flag = 0;
 		clif_storageclose(sd);
@@ -497,7 +498,10 @@ void storage_storageclose(struct map_session_data *sd)
 		return;
 
 	if (sd->storage.dirty) {
-		storage_storagesave(sd);
+		if (save_settings&CHARSAVE_STORAGE)
+			chrif_save(sd, CSAVE_INVENTORY|CSAVE_CART);
+		else
+			storage_storagesave(sd);
 		if (sd->state.storage_flag == 1) {
 			sd->state.storage_flag = 0;
 			clif_storageclose(sd);
@@ -521,7 +525,10 @@ void storage_storage_quit(struct map_session_data* sd, int flag)
 	if (!&sd->storage)
 		return;
 
-	storage_storagesave(sd);
+	if (save_settings&CHARSAVE_STORAGE)
+		chrif_save(sd, CSAVE_INVENTORY|CSAVE_CART);
+	else
+		storage_storagesave(sd);
 }
 
 /**
@@ -1086,7 +1093,10 @@ void storage_premiumStorage_close(struct map_session_data *sd) {
 		return;
 
 	if (sd->premiumStorage.dirty) {
-		storage_premiumStorage_save(sd);
+		if (save_settings&CHARSAVE_STORAGE)
+			chrif_save(sd, CSAVE_INVENTORY|CSAVE_CART);
+		else
+			storage_premiumStorage_save(sd);
 		if (sd->state.storage_flag == 3) {
 			sd->state.storage_flag = 0;
 			clif_storageclose(sd);
@@ -1107,5 +1117,8 @@ void storage_premiumStorage_quit(struct map_session_data *sd) {
 	if (!&sd->premiumStorage)
 		return;
 
-	storage_premiumStorage_save(sd);
+	if (save_settings&CHARSAVE_STORAGE)
+		chrif_save(sd, CSAVE_INVENTORY|CSAVE_CART);
+	else
+		storage_premiumStorage_save(sd);
 }