Merge branch 'master' into woe_te-restrictions

# Conflicts:
#	npc/re/mapflag/nobranch.txt
#	npc/re/mapflag/nomemo.txt
#	npc/re/mapflag/noteleport.txt
#	npc/re/scripts_athena.conf
#	src/map/atcommand.c
#	src/map/map.h
#	src/map/script.c
#	src/map/script_constants.h

conf/battle/party.conf

@@ -56,3 +56,6 @@ party_even_share_bonus: 0
 // Display party name regardless if player is in a guild.
 // Official servers do not display party name unless the user is in a guild. (Note 1)
 display_party_name: no
+
+// Prevent multiple characters of the same account to join the same party. (Note 1)
+block_account_in_same_party: yes

db/const.txt

@@ -485,6 +485,10 @@ IG_Animal_Costume_Scroll	467
 IG_Midgard_Lucky_Scroll	468
 IG_Blessing_Scarlet_Egg	469
 IG_Mystical_Costume_Scroll	470
+IG_Ink_Ball	471
+IG_Something_Candy_Holder	472
+IG_Shining_Egg	473
+IG_Shining_Blue_Lucky_Egg	474
 
 EF_NONE	-1
 EF_HIT1	0

db/pre-re/mob_skill_db.txt

@@ -2936,7 +2936,7 @@
 1639,Kathryne Keyron@MG_COLDBOLT,chase,14,10,3000,1000,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,attack,17,44,3000,500,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,chase,17,44,3000,500,10000,no,target,always,0,,,,,,,
-1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@WZ_QUAGMIRE,chase,92,5,3000,0,10000,yes,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_SAFETYWALL,attack,12,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBOLT,chase,19,10,3000,1000,10000,no,target,always,0,,,,,,,
@@ -3648,7 +3648,7 @@
 1705,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1705,Thanatos Despero@KN_BOWLINGBASH,attack,62,4,1000,0,10000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -3714,7 +3714,7 @@
 1710,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1710,Thanatos Despero@KN_BOWLINGBASH,attack,62,5,1000,0,10000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -4090,7 +4090,7 @@
 1768,Gloom Under Night@NPC_POWERUP,attack,349,5,2000,700,50000,no,self,always,0,,,,,,,
 1768,Gloom Under Night@NPC_FIREBREATH,chase,654,10,2000,500,10000,no,target,myhpltmaxrate,80,,,,,,,
 1768,Gloom Under Night@SM_MAGNUM,attack,7,25,10000,0,5000,yes,self,attackpcge,2,,,,,,,
-1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,20,2000,0,5000,yes,self,always,0,,,,,,,
+1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,10,2000,0,5000,yes,self,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,attack,17,44,1000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,chase,17,44,10000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -4522,7 +4522,7 @@
 1833,Kasa@MG_FIREBALL,idle,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,chase,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,attack,17,44,5000,500,10000,no,target,always,0,,,,,,,
-1833,Kasa@WZ_SIGHTRASHER,attack,81,20,1000,0,20000,yes,self,always,0,,,,,,,
+1833,Kasa@WZ_SIGHTRASHER,attack,81,10,1000,0,20000,yes,self,always,0,,,,,,,
 1833,Kasa@LK_SPIRALPIERCE,attack,397,1,1500,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,chase,83,1,5000,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,attack,83,1,5000,1000,10000,no,target,always,0,,,,,,,
@@ -4566,7 +4566,7 @@
 1837,Imp@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,,
 1837,Imp@NPC_PULSESTRIKE,attack,661,3,1000,1000,5000,no,self,always,0,,,,,,,
 1837,Imp@MG_SIGHT,idle,10,1,500,0,5000,yes,self,always,0,,,,,,,
-1837,Imp@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1837,Imp@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1837,Imp@RG_STRIPARMOR,attack,217,1,2000,0,5000,yes,target,always,0,,,,,,29,
 1838,Knocker@HT_LANDMINE,idle,116,2,4000,1000,18000,yes,around2,always,0,,,,,,5,
 1838,Knocker@NPC_GROUNDATTACK,attack,185,2,2000,0,5000,yes,target,always,0,,,,,,,

db/pre-re/skill_db.txt

@@ -865,6 +865,28 @@
 //725,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION,Reverberation 2
 //726,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION_ATK,Reverberation Attack
 //727,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEX_AETERNA,Lex Aeterna 2
+//728,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ARROWSTORM,NPC Arrow Storm
+//729,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CHEAL,NPC Coluceo Heal
+//730,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_SR_CURSEDCIRCLE,NPC 
+//731,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DRAGONBREATH,NPC Dragon Breath
+//732,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FATALMENACE,NPC Fatal Menace
+//733,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION,NPC Magma Eruption
+//734,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION_DOTDAMAGE,NPC Magma Eruption Dot Damage
+//735,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MANDRAGORA,NPC Howling of Mandragora
+//736,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PSYCHIC_WAVE,NPC Psychic Wave
+//737,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_RAYOFGENESIS,NPC Ray of Genesis
+//738,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_VENOMIMPRESS,NPC Venom Impress
+//739,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CLOUD_KILL,NPC Cloud Kill
+//740,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_IGNITIONBREAK,NPC Ignition Break
+//741,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PHANTOMTHRUST,NPC Phantom Thrust
+//742,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_POISON_BUSTER,NPC Poison Blaster
+//743,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_HALLUCINATIONWALK,NPC Hallucination Walk
+//744,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ELECTRICWALK,NPC Electric Walk
+//745,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FIREWALK,NPC Fire Walk
+//746,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDEDISPEL,Wide Dispell
+//747,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEASH,Leash
+//748,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDELEASH,Wide Leash
+//749,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDECRITICALWOUND,Wide Critical Wound
 
 //****
 // 2nd Quest Skills
@@ -1389,7 +1411,7 @@
 8035,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_ANGRIFFS_MODUS,Attack Mode
 8036,3:4:5:6:7,6,1,0,0,0,5,1,no,0,0x0200,0,weapon,0,0x0,	MH_TINDER_BREAKER,Tinder Breaker
 8037,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_CBC,Continual Break Combo
-8038,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_EQC,Eternal Quick Combo
+8038,1,6,4,0,0,0,5,1,no,0,0x200,0,misc,0,0x0,	MH_EQC,Eternal Quick Combo
 8039,0,6,4,3,0x2,1:1:1:2:2,5,1,no,0,0,0,weapon,0,0x0,	MH_MAGMA_FLOW,Magma Flow
 8040,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_GRANITIC_ARMOR,Granitic Armor
 8041,7,6,2,3,0x2,0,5,1,no,0,0,1,weapon,0,0x0,		MH_LAVA_SLIDE,Lava Slide

db/re/item_buyingstore.txt

@@ -8,7 +8,724 @@
 //  Items are in same order as data\buyingstoreitemlist.txt, which
 //  must be edited as well for the client to accept added items.
 
-//--- 2014 / 04 / 21 - 최종수정일
+//--- 2015 / 12 / 16 - 전사자무덤
+//25127
+//25128
+//25129
+//25130
+//25131
+22687	//Fragments_Vicious_Mind
+//23016
+//23080
+4671	//V_B_Celia_Card
+4672	//V_B_Chen_Card
+4673	//V_B_Alphoccio_Card
+4674	//V_B_Eremes_Card
+4675	//V_B_Magaleta_Card
+4676	//V_B_Shecil_Card
+4677	//V_B_Howard_Card
+4678	//V_B_Katrinn_Card
+4679	//V_B_Seyren_Card
+4680	//V_B_Randel_Card
+4681	//V_B_Flamel_Card
+4682	//V_B_Gertie_Card
+4683	//V_B_Trentini_Card
+4684	//V_Eremes_Card
+4685	//V_Magaleta_Card
+4686	//V_Katrinn_Card
+4687	//V_Shecil_Card
+4688	//V_Harword_Card
+4689	//V_Seyren_Card
+4690	//V_Randel_Card
+4691	//V_Flamel_Card
+4692	//V_Celia_Card
+4693	//V_Chen_Card
+4694	//V_Gertie_Card
+4695	//V_Trentini_Card
+4696	//V_Alphoccio_Card
+//--- 2015 / 11 19 - 부서진 마법석 추가
+6905	//Broken_Magic_Stone
+//--- 2015 / 11 / 30 - 카드 추가
+4001	//Poring_Card
+4002	//Fabre_Card
+4003	//Pupa_Card
+4004	//Drops_Card
+4005	//Poring__Card
+4006	//Lunatic_Card
+4007	//Pecopeco_Egg_Card
+4008	//Picky_Card
+4009	//Chonchon_Card
+4010	//Wilow_Card
+4011	//Picky__Card
+4012	//Thief_Bug_Egg_Card
+4013	//Andre_Egg_Card
+4014	//Roda_Frog_Card
+4015	//Condor_Card
+4016	//Thief_Bug_Card
+4017	//Savage_Babe_Card
+4018	//Andre_Larva_Card
+4019	//Hornet_Card
+4020	//Farmiliar_Card
+4021	//Rocker_Card
+4022	//Spore_Card
+4023	//Desert_Wolf_Babe_Card
+4024	//Plankton_Card
+4025	//Skeleton_Card
+4026	//Thief_Bug_Female_Card
+4027	//Kukre_Card
+4028	//Tarou_Card
+4029	//Wolf_Card
+4030	//Mandragora_Card
+4031	//Pecopeco_Card
+4032	//Ambernite_Card
+4033	//Poporing_Card
+4034	//Worm_Tail_Card
+4035	//Hydra_Card
+4036	//Muka_Card
+4037	//Snake_Card
+4038	//Zombie_Card
+4039	//Stainer_Card
+4040	//Creamy_Card
+4041	//Coco_Card
+4042	//Steel_Chonchon_Card
+4043	//Andre_Card
+4044	//Smokie_Card
+4045	//Horn_Card
+4046	//Martin_Card
+4047	//Ghostring_Card
+4048	//Poison_Spore_Card
+4049	//Vadon_Card
+4050	//Thief_Bug_Male_Card
+4051	//Yoyo_Card
+4052	//Elder_Wilow_Card
+4053	//Vitata_Card
+4054	//Angeling_Card
+4055	//Marina_Card
+4056	//Dustiness_Card
+4057	//Metaller_Card
+4058	//Thara_Frog_Card
+4059	//Soldier_Andre_Card
+4060	//Goblin_Card
+4061	//Cornutus_Card
+4062	//Anacondaq_Card
+4063	//Caramel_Card
+4064	//Zerom_Card
+4065	//Kaho_Card
+4066	//Orc_Warrior_Card
+4067	//Megalodon_Card
+4068	//Scorpion_Card
+4069	//Drainliar_Card
+4070	//Eggyra_Card
+4071	//Orc_Zombie_Card
+4072	//Golem_Card
+4073	//Pirate_Skel_Card
+4074	//BigFoot_Card
+4075	//Argos_Card
+4076	//Magnolia_Card
+4077	//Phen_Card
+4078	//Savage_Card
+4079	//Mantis_Card
+4080	//Flora_Card
+4081	//Hode_Card
+4082	//Desert_Wolf_Card
+4083	//Rafflesia_Card
+4084	//Marine_Sphere_Card
+4085	//Orc_Skeleton_Card
+4086	//Soldier_Skeleton_Card
+4087	//Giearth_Card
+4088	//Frilldora_Card
+4089	//Sword_Fish_Card
+4090	//Munak_Card
+4091	//Kobold_Card
+4092	//Skel_Worker_Card
+4093	//Obeaune_Card
+4094	//Archer_Skeleton_Card
+4095	//Marse_Card
+4096	//Zenorc_Card
+4097	//Matyr_Card
+4098	//Dokebi_Card
+4099	//Pasana_Card
+4100	//Sohee_Card
+4101	//Sand_Man_Card
+4102	//Whisper_Card
+4103	//Horong_Card
+4104	//Requiem_Card
+4105	//Marc_Card
+4106	//Mummy_Card
+4107	//Verit_Card
+4108	//Myst_Card
+4109	//Jakk_Card
+4110	//Ghoul_Card
+4111	//Strouf_Card
+4112	//Marduk_Card
+4113	//Marionette_Card
+4114	//Argiope_Card
+4115	//Hunter_Fly_Card
+4116	//Isis_Card
+4117	//Side_Winder_Card
+4118	//Petit_Card
+4119	//Bathory_Card
+4120	//Petit__Card
+4121	//Phreeoni_Card
+4122	//Deviruchi_Card
+4123	//Eddga_Card
+4124	//Medusa_Card
+4125	//Deviace_Card
+4126	//Minorous_Card
+4127	//Nightmare_Card
+4128	//Golden_Bug_Card
+4129	//Baphomet__Card
+4130	//Scorpion_King_Card
+4131	//Moonlight_Flower_Card
+4132	//Mistress_Card
+4133	//Daydric_Card
+4134	//Dracula_Card
+4135	//Orc_Load_Card
+4136	//Khalitzburg_Card
+4137	//Drake_Card
+4138	//Anubis_Card
+4139	//Joker_Card
+4140	//Knight_Of_Abyss_Card
+4141	//Evil_Druid_Card
+4142	//Doppelganger_Card
+4143	//Orc_Hero_Card
+4144	//Osiris_Card
+4145	//Berzebub_Card
+4146	//Maya_Card
+4147	//Baphomet_Card
+4148	//Pharaoh_Card
+4149	//Gargoyle_Card
+4150	//Goat_Card
+4151	//Gajomart_Card
+4152	//Galapago_Card
+4153	//Crab_Card
+4154	//Rice_Cake_Boy_Card
+4155	//Goblin_Leader_Card
+4156	//Steam_Goblin_Card
+4157	//Goblin_Archer_Card
+4158	//Flying_Deleter_Card
+4159	//Nine_Tail_Card
+4160	//Antique_Firelock_Card
+4161	//Grand_Peco_Card
+4162	//Grizzly_Card
+4163	//Gryphon_Card
+4164	//Gullinbursti_Card
+4165	//Gig_Card
+4166	//Nightmare_Terror_Card
+4167	//Neraid_Card
+4168	//Dark_Lord_Card
+4169	//Dark_Illusion_Card
+4170	//Dark_Frame_Card
+4171	//Dark_Priest_Card
+4172	//The_Paper_Card
+4173	//Demon_Pungus_Card
+4174	//Deviling_Card
+4175	//Poison_Toad_Card
+4176	//Dullahan_Card
+4177	//Dryad_Card
+4178	//Dragon_Tail_Card
+4179	//Dragon_Fly_Card
+4180	//Driller_Card
+4181	//Disguise_Card
+4182	//Diabolic_Card
+4183	//Vagabond_Wolf_Card
+4184	//Lava_Golem_Card
+4185	//Rideword_Card
+4186	//Raggler_Card
+4187	//Raydric_Archer_Card
+4188	//Leib_Olmai_Card
+4189	//Wraith_Dead_Card
+4190	//Wraith_Card
+4191	//Loli_Ruri_Card
+4192	//Rotar_Zairo_Card
+4193	//Lude_Card
+4194	//Rybio_Card
+4195	//Leaf_Cat_Card
+4196	//Marin_Card
+4197	//Mastering_Card
+4198	//Maya_Puple_Card
+4199	//Merman_Card
+4200	//Megalith_Card
+4201	//Majoruros_Card
+4202	//Civil_Servant_Card
+4203	//Mutant_Dragon_Card
+4204	//Mini_Demon_Card
+4205	//Mimic_Card
+4206	//Mystcase_Card
+4207	//Mysteltainn_Card
+4208	//Miyabi_Ningyo_Card
+4209	//Violy_Card
+4210	//Wander_Man_Card
+4211	//Vocal_Card
+4212	//Bon_Gun_Card
+4213	//Brilight_Card
+4214	//Bloody_Murderer_Card
+4215	//Blazzer_Card
+4216	//Sasquatch_Card
+4217	//Live_Peach_Tree_Card
+4218	//Succubus_Card
+4219	//Sageworm_Card
+4220	//Solider_Card
+4221	//Skeleton_General_Card
+4222	//Skel_Prisoner_Card
+4223	//Stalactic_Golem_Card
+4224	//Stem_Worm_Card
+4225	//Stone_Shooter_Card
+4226	//Sting_Card
+4227	//Spring_Rabbit_Card
+4228	//Sleeper_Card
+4229	//C_Tower_Manager_Card
+4230	//Shinobi_Card
+4231	//Increase_Soil_Card
+4232	//Wild_Ginseng_Card
+4233	//Baby_Leopard_Card
+4234	//Anolian_Card
+4235	//Cookie_XMAS_Card
+4236	//Amon_Ra_Card
+4237	//Owl_Duke_Card
+4238	//Owl_Baron_Card
+4239	//Iron_Fist_Card
+4240	//Arclouse_Card
+4241	//Archangeling_Card
+4242	//Apocalips_Card
+4243	//Antonio_Card
+4244	//Alarm_Card
+4245	//Am_Mut_Card
+4246	//Assulter_Card
+4247	//Aster_Card
+4248	//Ancient_Mummy_Card
+4249	//Ancient_Worm_Card
+4250	//Executioner_Card
+4251	//Elder_Card
+4252	//Alligator_Card
+4253	//Alice_Card
+4254	//Tirfing_Card
+4255	//Orc_Lady_Card
+4256	//Orc_Archer_Card
+4257	//Wild_Rose_Card
+4258	//Wicked_Nymph_Card
+4259	//Wooden_Golem_Card
+4260	//Wootan_Shooter_Card
+4261	//Wootan_Fighter_Card
+4262	//Evil_Cloud_Hermit_Card
+4263	//Incant_Samurai_Card
+4264	//Wind_Ghost_Card
+4265	//Li_Me_Mang_Ryang_Card
+4266	//Eclipse_Card
+4267	//Explosion_Card
+4268	//Injustice_Card
+4269	//Incubus_Card
+4270	//Giant_Spider_Card
+4271	//Giant_Honet_Card
+4272	//Dancing_Dragon_Card
+4273	//Shellfish_Card
+4274	//Zombie_Master_Card
+4275	//Zombie_Prisoner_Card
+4276	//Lord_Of_Death_Card
+4277	//Zherlthsh_Card
+4278	//Gibbet_Card
+4279	//Deleter_Card
+4280	//Geographer_Card
+4281	//Zipper_Bear_Card
+4282	//Tengu_Card
+4283	//Greatest_General_Card
+4284	//Chepet_Card
+4285	//Choco_Card
+4286	//Karakasa_Card
+4287	//Kapha_Card
+4288	//Carat_Card
+4289	//Caterpillar_Card
+4290	//Cat_O_Nine_Tail_Card
+4291	//Kobold_Leader_Card
+4292	//Kobold_Archer_Card
+4293	//Cookie_Card
+4294	//Quve_Card
+4295	//Kraben_Card
+4296	//Cramp_Card
+4297	//Cruiser_Card
+4298	//Cremy_Fear_Card
+4299	//Clock_Card
+4300	//Chimera_Card
+4301	//Killer_Mantis_Card
+4302	//Tao_Gunka_Card
+4303	//Whisper_Boss_Card
+4304	//Tamruan_Card
+4305	//Turtle_General_Card
+4306	//Toad_Card
+4307	//Kind_Of_Beetle_Card
+4308	//Tri_Joint_Card
+4309	//Parasite_Card
+4310	//Panzer_Goblin_Card
+4311	//Permeter_Card
+4312	//Fur_Seal_Card
+4313	//Punk_Card
+4314	//Penomena_Card
+4315	//Pest_Card
+4316	//Fake_Angel_Card
+4317	//Mobster_Card
+4318	//Knight_Windstorm_Card
+4319	//Freezer_Card
+4320	//Bloody_Knight_Card
+4321	//Hylozoist_Card
+4322	//High_Orc_Card
+4323	//Garm_Baby_Card
+4324	//Garm_Card
+4325	//Harpy_Card
+4326	//See_Otter_Card
+4327	//Blood_Butterfly_Card
+4328	//Hyegun_Card
+4329	//Phendark_Card
+4330	//Dark_Snake_Lord_Card
+4331	//Heater_Card
+4332	//Waste_Stove_Card
+4333	//Venomous_Card
+4334	//Noxious_Card
+4335	//Pitman_Card
+4336	//Ungoliant_Card
+4337	//Porcellio_Card
+4338	//Obsidian_Card
+4339	//Mineral_Card
+4340	//Teddy_Bear_Card
+4341	//Metaling_Card
+4342	//Rsx_0806_Card
+4343	//Mole_Card
+4344	//Anopheles_Card
+4345	//Hill_Wind_Card
+4346	//Ygnizem_Card
+4347	//Armaia_Card
+4348	//Whikebain_Card
+4349	//Erend_Card
+4350	//Rawrel_Card
+4351	//Kavac_Card
+4352	//B_Ygnizem_Card
+4353	//Removal_Card
+4354	//Gemini_Card
+4355	//Gremlin_Card
+4356	//Beholder_Card
+4357	//B_Seyren_Card
+4358	//Seyren_Card
+4359	//B_Eremes_Card
+4360	//Eremes_Card
+4361	//B_Harword_Card
+4362	//Harword_Card
+4363	//B_Magaleta_Card
+4364	//Magaleta_Card
+4365	//B_Katrinn_Card
+4366	//Katrinn_Card
+4367	//B_Shecil_Card
+4368	//Shecil_Card
+4369	//Venatu_Card
+4370	//Dimik_Card
+4371	//Archdam_Card
+4372	//Bacsojin_Card
+4373	//Chung_E_Card
+4374	//Apocalips_H_Card
+4375	//Orc_Baby_Card
+4376	//Lady_Tanee_Card
+4377	//Green_Iguana_Card
+4378	//Acidus_Card
+4379	//Acidus__Card
+4380	//Ferus_Card
+4381	//Ferus__Card
+4382	//Novus__Card
+4383	//Novus_Card
+4384	//Hydro_Card
+4385	//Dragon_Egg_Card
+4386	//Detale_Card
+4387	//Ancient_Mimic_Card
+4388	//Deathword_Card
+4389	//Plasma_Card
+4390	//Breeze_Card
+4391	//Retribution_Card
+4392	//Observation_Card
+4393	//Shelter_Card
+4394	//Solace_Card
+4395	//Tha_Maero_Card
+4396	//Tha_Odium_Card
+4397	//Tha_Despero_Card
+4398	//Tha_Dolor_Card
+4399	//Thanatos_Card
+4400	//Aliza_Card
+4401	//Alicel_Card
+4402	//Aliot_Card
+4403	//Kiel_Card
+4404	//Skogul_Card
+4405	//Frus_Card
+4406	//Skeggiold_Card
+4407	//Randgris_Card
+4408	//Gloom_Under_Night_Card
+4409	//Agav_Card
+4410	//Echio_Card
+4411	//Vanberk_Card
+4412	//Isilla_Card
+4413	//Hodremlin_Card
+4414	//Seeker_Card
+4415	//Snowier_Card
+4416	//Siroma_Card
+4417	//Ice_Titan_Card
+4418	//Gazeti_Card
+4419	//Ktullanux_Card
+4420	//Muscipular_Card
+4421	//Drosera_Card
+4422	//Roween_Card
+4423	//Galion_Card
+4424	//Stapo_Card
+4425	//Atroce_Card
+4426	//Byorgue_Card
+4427	//Sword_Guardian_Card
+4428	//Bow_Guardian_Card
+4429	//Salamander_Card
+4430	//Ifrit_Card
+4431	//Kasa_Card
+4432	//Magmaring_Card
+4433	//Imp_Card
+4434	//Knocker_Card
+4435	//Zombie_Slaughter_Card
+4436	//Ragged_Zombie_Card
+4437	//Hell_Poodle_Card
+4438	//Banshee_Card
+4439	//Flame_Skull_Card
+4440	//Necromancer_Card
+4441	//Fallen_Bishop_Card
+4442	//Tatacho_Card
+4443	//Aqua_Elemental_Card
+4444	//Draco_Card
+4445	//Luciola_Vespa_Card
+4446	//Enhanced_Skeleton_Card
+4447	//Centipede_Card
+4448	//Cornus_Card
+4449	//Dark_Shadow_Card
+4450	//Banshee_Master_Card
+4451	//Ant_Buyanne_Card
+4452	//Centipede_Larva_Card
+4453	//Hilsrion_Card
+4454	//Light_Up_Card1
+4455	//Light_Up_Card2
+4456	//Nidhogg_Shadow_Card
+4457	//Nahtzigger_Card
+4458	//Duneirre_Card
+4459	//Lata_Card
+4460	//Ringco_Card
+4461	//Pillar_Card
+4462	//Hardrock_Mammos_Card
+4463	//Tendrilrion_Card
+4464	//Aunoe_Card
+4465	//Panat_Card
+4466	//Beholder_Master_Card
+4467	//Heavy_Metaling_Card
+4468	//Pinguicula_Dark_Card
+4469	//Naga_Card
+4470	//Nepenthes_Card
+4471	//Egg_Of_Draco_Card
+4472	//Bradium_Goram_Card
+4473	//Ancient_Tree_Card
+4474	//Jakudam_Card
+4475	//Cobalt_Mineral_Card
+4476	//Pinguicula_Card
+4477	//Hell_Apocalips_Card
+4478	//Light_Up_Card3
+4479	//Light_Up_Card4
+4480	//Sealed_Kiel_Card
+4481	//Sealed_Ktullanux_Card
+4482	//Sealed_B_Ygnizem_Card
+4483	//Sealed_Dracula_Card
+4484	//Sealed_Mistress_Card
+4485	//Sealed_Gloom_Card
+4486	//Sealed_Berz_Card
+4487	//Sealed_Ifrit_Card
+4488	//Sealed_D_Lord_Card
+4489	//Sealed_Pharaoh_Card
+4490	//Sealed_M_Flower_Card
+4491	//Sealed_B_Shecil_Card
+4492	//Sealed_Orc_Hero_Card
+4493	//Sealed_Tao_Card
+4494	//Sealed_TurtleG_Card
+4495	//Sealed_Amon_Ra_Card
+4496	//Sealed_Drake_Card
+4497	//Sealed_Knight_WS_Card
+4498	//Sealed_Lady_Tanee_Card
+4499	//Sealed_Samurai_Card
+4500	//Sealed_Orc_Load_Card
+4501	//Sealed_B_Magaleta_Card
+4502	//Sealed_B_Harword_Card
+4503	//Sealed_Apocalips_H_Card
+4504	//Sealed_Eddga_Card
+4505	//Scaraba_Card
+4506	//Dolomedes_Card
+4507	//Q_Scaraba_Card
+4508	//Gold_Scaraba_Card
+4509	//Gold_Q_Scaraba_Card
+4510	//Miming_Card
+4511	//Little_Fatum_Card
+4512	//Parus_Card
+4513	//Angra_Mantis_Card
+4514	//Pom_Spider_Card
+4515	//Alnoldi_Card
+4516	//Comodo_Card
+4517	//Cendrawasih_Card
+4518	//Banaspaty_Card
+4519	//Butoijo_Card
+4520	//Leak_Card
+4521	//Sedora_Card
+4522	//Sropho_Card
+4523	//Pot_Dofle_Card
+4524	//King_Dramoh_Card
+4525	//Kraken_Card
+4526	//Odd_Coelacanth_Card
+4527	//Black_Coelacanth_Card
+4528	//Mutant_Coelacanth_Card
+4529	//Cruel_Coelacanth_Card
+4530	//Siorava_Card
+4531	//Red_Eruma_Card
+4532	//Wild_Rider_Card
+4533	//Mini_Octopus_Card
+4534	//Giant_Octopus_Card
+4535	//Sealed_Rand_Card
+4536	//Sealed_Atroce_Card
+4537	//Sealed_Phreeoni_Card
+4538	//Sealed_Bacsojin_Card
+4539	//Sealed_F_Bishop_Card
+4540	//SLD_Lord_Of_Death_Card
+4541	//SLD_B_Katrinn_Card
+4542	//SLD_Detale_Card
+4543	//SLD_Garm_Card
+4544	//SLD_Dark_Snake_Card
+4545	//Novice_Poring_Card
+4546	//Val'khiri_Card
+4547	//Enhanced_Byorgue_Card
+4548	//Enhanced_Salamander_Card
+4549	//Upd_Maya_Puple_Card
+4550	//Upd_Bow_Guardian_Card
+//4551
+4552	//Manny_Card
+4553	//Sid_Card
+4554	//Diego_Card
+4555	//Scrat_Card
+4556	//Fenrir_Card
+4557	//Weakened_Fenrir_Card
+//4558
+4559	//Evil_Morocc_Card
+4560	//Clown_Alphoccio_Card
+4561	//Professor_Celia_Card
+4562	//Champion_Chen_Card
+4563	//Creator_Flamel_Card
+4564	//Stalker_Gertie_Card
+4565	//Paladin_Randel_Card
+4566	//Gypsy_Trentini_Card
+4567	//Alphoccio_Card
+4568	//Celia_Card
+4569	//Chen_Card
+4570	//Flamel_Card
+4571	//Gertie_Card
+4572	//Randel_Card
+4573	//Trentini_Card
+4574	//Daehyon_Card
+4575	//Soheon_Card
+4576	//Gioia_Card
+4577	//Elvira_Card
+4578	//Pyuriel_Card
+4579	//Lola_Card
+4580	//Kades_Card
+4581	//Rudo_Card
+4582	//Bungisngis_Card
+4583	//Engkanto_Card
+4584	//Manananggal_Card
+4585	//Mangkukulam_Card
+4586	//Tikbalang_Card
+4587	//Tiyanak_Card
+4588	//Wakwak_Card
+4589	//Jejeling_Card
+4590	//Bangungot_Card
+4591	//Bakonawa_Card
+4592	//Buwaya_Card
+4593	//Menblatt_Card
+4594	//Petal_Card
+4595	//Cenere_Card
+4596	//AntiqueBook_Card
+4597	//LichternB_Card
+4598	//LichternG_Card
+4599	//LichternR_Card
+4600	//LichternY_Card
+4601	//Amdarais_Card
+4602	//Realized_Amdarais_Card
+4603	//Corruption_Root_Card
+4604	//Realized_Corruption_Root_Card
+4605	//UndeadKnightM_Card
+4606	//UndeadKnightF_Card
+4607	//FaithfulManager_Card
+4608	//White_Knight_Card
+4609	//Khalitzburg_Knight_Card
+4610	//Sarah_Card
+4625	//Time_Holder_Card
+4626	//Big_Ben_Card
+4627	//Big_Bell_Card
+4628	//Neo_Punk_Card
+4629	//Arc_Elder_Card
+4630	//Nightmare_Timer_Keeper_Card
+4631	//Owl_Viscount_Card
+4632	//Owl_Marquees_Card
+4633	//Enhanced_Archer_Skeleton_Card
+4634	//Enhanced_Soldier_Skeleton_Card
+4635	//Enhanced_Amdarais_Card
+4636	//Bijou_Card
+4637	//Immortal_Corps_Card
+4638	//Watcher_Card
+4639	//Taffy_Card
+4640	//Frozen_Wolf_Card
+4641	//Zombie_Guard_Card
+4642	//Min_Toad_Card
+4643	//Min_Vagabond_Wolf_Card
+4644	//Min_Vocal_Card
+4645	//Min_Eclipse_Card
+4646	//Min_Chimera_Card
+4647	//Min_Osiris_Card
+4648	//Min_Eddga_Card
+4649	//Min_Phreeoni_Card
+4650	//Min_Orc_Hero_Card
+4651	//Min_Tao_Gunka_Card
+4652	//N_Amon_Ra_Card
+4653	//N_Arclouse_Card
+4654	//N_Mimic_Card
+4655	//N_Minorous_Card
+4656	//N_Mummy_Card
+4657	//N_Ancient_Mummy_Card
+4658	//N_Verit_Card
+//--- 2015 / 7 / 9 - 최종수정일
+11600	//Shining_Holy_Water
+22847	//Prontera_Medal
+22848	//Prison_Key
+22849	//Prontera_Time_Crystal
+6921	//Dehumidifiers
+6922	//Sandpaper
+6924	//Red_Eye
+6936	//Cold_Core
+6937	//Silicone_Shell
+6938	//Hedgehog_Picks
+6939	//Old_Belt
+6940	//Moving_Dark_Matter
+6941	//Fragments_Valkyrie_Power
+6942	//Will_Master
+//6961
+//6962
+6905	//Broken_Magic_Stone
+//--- 2014 / 12 / 17
+12739	//Snow_Flower
+//--- 2014 / 07 / 09
+6897	//Blue_Whale
+6898	//Whale
+6899	//Giant_Octopus
+6900	//Giant_Squid
+6901	//Sturgeon
+6902	//King_Lobster
+6903	//King_Earthworm
+22770	//Shark_Skewer
+22771	//Bluefin_Tuna_Skewer
+22772	//Sea_Bream_Skewer
+22773	//Piranha_Skewer
+22774	//Salmon_Skewer
+22775	//Eels_Skewer
+22776	//Carp_Skewer
+//--- 2014 / 04 / 21
 6691	//Fire_Feather
 6692	//Patrol_Journal
 6693	//Stone_Blessing
@@ -16,7 +733,7 @@
 6695	//Tooth_Rock_Of_Fire_Golem
 6696	//Fire_Frill
 12490	//Vivid_Notation
-22516	//Black_As_Night_Piece
+22516	//Black_As_Night_Piece_
 22534	//Closed_Mind_Box
 11563	//Hot_Tea
 11564	//Sweets
@@ -26,7 +743,7 @@
 22699	//Test_Reagent
 22679	//Death_Bin
 22687	//Fragments_Vicious_Mind
-//6615
+6615	//Siege_Guild_Coin
 //--- 2013 / 08 / 02
 6750	//Failed_Engine
 6751	//Crushed_Can_Iron_Plate
@@ -51,6 +768,7 @@
 11590	//Meat_Skewer5
 22620	//Memorial_Box
 22621	//Squid_Bbq
+
 //--- 2013 / 04 / 16
 6557	//Fancy_Fairy_Wing
 6558	//Pile_Of_Acorn
@@ -204,7 +922,7 @@
 12576	//Hunting_Arrow_Cntr
 12582	//Siege_Supply_Box
 12608	//Splendid_Box2
-//12609
+12609	//Old_Ore_Box
 12612	//Old_Coin_Pocket
 12613	//High_Coin_Pocket
 12614	//Mid_Coin_Pocket
@@ -233,6 +951,7 @@
 12699	//Tikbalang_Belt
 12700	//Insideout_Shirt
 12775	//Ancient_Spirit_Agimat
+
 //--- 2010 / 03 / 12
 601	//Wing_Of_Fly
 602	//Wing_Of_Butterfly
@@ -686,6 +1405,7 @@
 967	//Turtle_Shell
 968	//Voucher_Of_Orcish_Hero
 969	//Gold
+970	//Alchol
 971	//Detrimindexta
 972	//Karvodailnirol
 973	//Counteragent
@@ -1183,7 +1903,7 @@
 7510	//Valhalla_Flower
 7511	//Rune_Of_Darkness
 7512	//Burnt_Parts
-7513	//Pocket_Watch
+7513	//Pocket_Watch__
 7521	//Flame_Stone
 7522	//Ice_Stone
 7523	//Wind_Stone

db/re/item_combo_db.txt

@@ -32,6 +32,7 @@
 1490:19021,{ bonus2 bSkillAtk,"LK_SPIRALPIERCE",getequiprefinerycnt(EQI_HAND_R)*5; bonus4 bAutoSpellOnSkill,"LK_JOINTBEAT","LK_SPIRALPIERCE",max(getskilllv("LK_SPIRALPIERCE"),1),50+(getskilllv("LK_JOINTBEAT")*10); /* Confirm: Success rate */ }
 15141:19033,{ bonus bMaxSP,100; bonus bNoCastCancel,1; }
 15141:20779:22075,{ .@r = getequiprefinerycnt(EQI_ARMOR)+getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES); bonus bMaxHP,1000; bonus bHealPower,min(5+.@r,30); bonus bHealPower2,min(5+.@r,30); }
+15186:19168,{ bonus2 bExpAddClass,Class_All,5; bonus2 bDropAddClass,Class_All,5; }
 1535:4361,{ bonus bBreakArmorRate,900; bonus bBreakWeaponRate,900; }
 1559:5467,{ bonus bAspd,1; bonus bFlee2,3; }
 1572:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; }
@@ -348,10 +349,10 @@
 4545:18730,{ bonus bMatk,5; bonus bBaseAtk,5; }
 4605:4606,{ bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; bonus2 bHPLossRate,100,6000; bonus2 bSPLossRate,6,6000; }
 4608:4609,{ bonus2 bAddSize,Size_Medium,15; bonus2 bAddSize,Size_Large,15; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; }
-4626:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreMdefRaceRate,RC_Formless,50; bonus2 bIgnoreMdefRaceRate,RC_Demon,50; }
-4627:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
-4629:4630,{ bonus3 bAutoSpell,677,2,2; bonus2 bSubEle,Ele_Neutral,5; }
-4631:4632,{ bonus5 bAutoSpell,85,1,1,BF_SHORT,0; }
+4626:4628,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,50; }
+4627:4628,{ bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
+4629:4630,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,2; bonus2 bSubEle,Ele_Neutral,5; }
+4631:4632,{ bonus5 bAutoSpell,"WZ_VERMILION",1,1,BF_WEAPON,0; }
 4635:4636,{ bonus2 bResEff,Eff_Burning,10000; }
 4642:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
 4643:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; }
@@ -426,6 +427,21 @@
 15156:20790:22085:28380:28418,{ bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus2 bSkillAtk,"SU_CN_METEOR",200; }
 15156:20790:22085:28380:28421,{ bonus bMaxHPrate,30; bonus bMaxSPrate,9; bonus2 bSkillAtk,"SU_LUNATICCARROTBEAT",200; }
 15156:20790:22085:28381:28415,{ bonus bMaxHPrate,25; bonus bMaxSPrate,15; bonus bHealPower,30; skill "AL_HEAL",9,1; }
+15181:28443:28444,{ bonus bAtk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28445:28446,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28447:28448,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28449:28450,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28451:28452,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
+15181:28453:28454,{ bonus bMatk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28455:28456,{ bonus bMatk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28457:28458,{ bonus bMatk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28459:28460,{ bonus bMatk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28461:28462,{ bonus bMatk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
+15181:28463:28464,{ bonus bAtk,20; bonus2 bSubEle,Ele_All,2; bonus2 bSubEle,Ele_Neutral,-2; }
+15182:28465:28466,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; }
+15183:28467:28468,{ bonus bAtk,40; bonus2 bSubEle,Ele_All,4; bonus2 bSubEle,Ele_Neutral,-4; bonus2 bExpAddClass,Class_All,2; }
+15184:28469:28470,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; }
+15185:28471:28472,{ bonus bAtk,50; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; bonus2 bExpAddClass,Class_All,2; bonus bNoCastCancel,1; }
 18137:1752,{ bonus bLongAtkRate,25; }
 18137:1752:19048,{ bonus bLongAtkRate,20; bonus2 bSubEle,Ele_Fire,-10; if (getequiprefinerycnt(EQI_HAND_R) >= 10) bonus bAspd,1; }
 18137:19019,{ bonus bLongAtkRate,45; }
@@ -453,6 +469,22 @@
 20797:4174,{ bonus2 bSubEle,Ele_All,50; bonus2 bSubEle,Ele_Neutral,-50; }
 22069:2195,{ bonus2 bSubEle,Ele_Neutral,5; bonus2 bAddEle,Ele_Neutral,getequiprefinerycnt(EQI_HAND_L); }
 22069:20753,{ bonus2 bAddEle,Ele_Neutral,5; .@r = getequiprefinerycnt(EQI_GARMENT); bonus bMaxHPrate,.@r; bonus bMaxSPrate,.@r; }
+22106:2160,{ .@r = getequiprefinerycnt(EQI_SHOES); if (.@r > 6) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } if (.@r > 8) { bonus2 bSubSize,Size_Large,2; bonus2 bSubClass,Class_Boss,2; } }
+22122:28443:28444,{ bonus bAspdRate,4; bonus bHit,4; }
+22123:28445:28446,{ bonus bAspdRate,8; bonus bHit,8; }
+22124:28447:28448,{ bonus bAspdRate,8; bonus bHit,8; bonus2 bExpAddClass,Class_All,2; }
+22125:28449:28450,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; }
+22126:28451:28452,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
+22122:28453:28454,{ bonus bVariableCastrate,-3; bonus bDelayrate,-3; }
+22123:28455:28456,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; }
+22124:28457:28458,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; bonus2 bExpAddClass,Class_All,2; }
+22125:28459:28460,{ bonus bVariableCastrate,-6; bonus bDelayrate,-6; bonus2 bExpAddClass,Class_All,2; }
+22126:28461:28462,{ bonus bVariableCastrate,-8; bonus bDelayrate,-8; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
+22122:28463:28464,{ bonus bAspdRate,4; bonus bHit,4; }
+22123:28465:28466,{ bonus bAspdRate,8; bonus bHit,8; }
+22124:28467:28468,{ bonus bAspdRate,8; bonus bHit,8; bonus2 bExpAddClass,Class_All,2; }
+22125:28469:28470,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; }
+22126:28471:28472,{ bonus bAspdRate,10; bonus bHit,10; bonus2 bExpAddClass,Class_All,2; bonus bSpeedAddRate,25; }
 24012:24013:24014:24015:24016:24017,{ bonus bAllStats,9; }
 24018:24019:24020,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bAtkRate,1; } }
 24021:24022:24023,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) + getequiprefinerycnt(EQI_SHADOW_WEAPON) >= 23) { bonus bMatkRate,1; } }

db/re/item_db.txt

@@ -2155,7 +2155,7 @@
 2967,RWC_2012_Ring_,Chambered RWC 2012 Ring,4,20,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,1; },{},{}
 2968,RWC_2012_Pendant,RWC 2012 Pendant,4,20,,200,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMatkRate,1; },{},{}
 2969,RWC_2012_Pendant_,Chambered RWC 2012 Pendant,4,20,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMatkRate,1; },{},{}
-2971,Pocket_Watch,Pocket Watch,4,10,,200,,1,,1,0x800200,63,2,136,,80,1,,{},{},{}
+2971,Pocket_Watch,Pocket Watch,4,10,,200,,1,,1,0x800200,63,2,136,,80,1,,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; },{},{}
 2976,Red_Lantern,Red Lantern,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bMaxSP,-300; skill "MG_SIGHT",1; },{},{ sc_end SC_SIGHT; }
 2977,Broken_Heart,Broken Heart,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxSP,200; skill "DC_SCREAM",3; },{},{}
 2978,Kindly_Heart,Kindly Heart,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxHP,500; bonus2 bHPRegenRate,300,10000; skill "DC_SCREAM",3; },{},{}
@@ -2789,13 +2789,13 @@
 4609,Khalitzburg_Knight_Card,Khalitzburg Knight Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,20; bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Large,25; },{},{}
 4610,Sarah_Card,Sarah Card,6,10,,10,,,,,,,,16,,,,,{ bonus bAbsorbDmgMaxHP,100; },{},{}
 4625,Time_Holder_Card,Time Holder Card,6,10,,10,,,,,,,,2,,,,,{ bonus bMatkRate,20; bonus bUseSPrate,10; },{},{}
-4626,Big_Ben_Card,Big Ben Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Formless,10; bonus2 bMagicAddRace,RC_Demon,10; },{},{}
+4626,Big_Ben_Card,Big Ben Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Formless,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{}
 4627,Big_Bell_Card,Big Bell Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bAddRace,RC_Formless,10; bonus2 bAddRace,RC_Demon,10; },{},{}
 4628,Neo_Punk_Card,Neo Punk Card,6,10,,10,,,,,0xFFFFFFFF,63,2,32,,,,,{ bonus2 bSubRace,RC_Formless,20; bonus2 bSubRace,RC_Demon,20; },{},{}
-4629,Arc_Elder_Card,Arc Elder Card,6,10,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAtkEle,Ele_Earth,30; },{},{}
-4630,Nightmare_Timer_Keeper_Card,Nightmare Timer Keeper Card,6,10,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,1; },{},{}
+4629,Arc_Elder_Card,Arc Elder Card,6,10,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAtkEle,Ele_Earth,getrefine()*3; },{},{}
+4630,Nightmare_Timer_Keeper_Card,Nightmare Timer Keeper Card,6,10,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,20; },{},{}
 4631,Owl_Viscount_Card,Owl Viscount Card,6,10,,10,,,,,,,,136,,,,,{ bonus bAspdRate,3; },{},{}
-4632,Owl_Marquees_Card,Owl Marquees Card,6,10,,10,,,,,,,,136,,,,,{ bonus5 bAutoSpell,"SA_VIOLENTGALE",(getskilllv("SA_VIOLENTGALE")==5?5:1),1,BF_SHORT,0; },{},{}
+4632,Owl_Marquees_Card,Owl Marquees Card,6,10,,10,,,,,,,,136,,,,,{ bonus5 bAutoSpell,"SA_VIOLENTGALE",(getskilllv("SA_VIOLENTGALE")==5?5:1),1,BF_WEAPON,0; },{},{}
 4633,Enhanced_Archer_Skeleton_Card,Enhanced Archer Skeleton Card,6,20,,10,,,,,,,,2,,,,,{ bonus bLongAtkRate,(BaseLevel>=100?12:10); },{},{}
 4634,Enhanced_Soldier_Skeleton_Card,Enhanced Soldier Skeleton Card,6,20,,10,,,,,,,,2,,,,,{ if (BaseLevel<100) { bonus bCritical,9; } else { bonus bCritical,10; bonus bCritAtkRate,5; } },{},{}
 4635,Enhanced_Amdarais_Card,Enhanced Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ .@r = getrefine(); bonus bDef,(.@r*10); bonus bFlee,(.@r*-2); if (BaseLevel>=100) bonus bMaxHP,500; },{},{}
@@ -3868,7 +3868,7 @@
 5747,Mitra,Mitra,4,20,,100,,12,,1,0x00000100,56,2,256,,100,1,624,{ bonus bVit,1; bonus bInt,1; bonus bMdef,5; bonus bHealPower,5; if(readparam(bInt)>=120){ bonus bMatk,10; } },{},{}
 5748,Sniper_Goggle,Sniper Goggles,4,20,,100,,12,,1,0x00000800,56,2,768,,100,1,625,{ bonus bAgi,1; bonus bDex,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bLongAtkRate,4; bonus bAspd,1; } },{},{}
 5749,Driver_Band,Driver Band,4,20,,100,,12,,1,0x00000400,56,1,256,,100,1,626,{ bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; } },{},{}
-5750,Shadow_Handicraft,Shadow Crown,4,20,,100,,12,,1,0x00020000,56,2,256,,100,1,627,{ bonus bAgi,1; bonus bInt,1; bonus bMdef,1; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee,3; } },{},{}
+5750,Shadow_Handicraft,Shadow Crown,4,20,,100,,12,,1,0x00020000,56,2,256,,100,1,627,{ bonus bAgi,1; bonus bInt,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee,3; } },{},{}
 5751,Minstrel_Song_Hat,Minstrel Song Hat,4,20,,100,,12,,1,0x00080000,56,1,256,,100,1,628,{ bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bLongAtkRate,5; bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",10; bonus2 bSkillUseSP,"MI_ECHOSONG",10; },{},{}
 5752,Midas_Whisper,Midas Whispers,4,20,,100,,12,,1,0x00040000,56,2,256,,100,1,629,{ bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,5; bonus bAspd,1; } },{},{}
 5753,Magic_Stone_Hat,Magic Stone Hat,4,20,,100,,12,,1,0x00000200,56,2,256,,100,1,630,{ bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bDex)>=120){ bonus bMatkRate,10; bonus bVariableCastrate,-2; } },{},{}
@@ -5778,9 +5778,9 @@
 7935,Poison_Herb_Seratum,Poison Herb Seratum,3,1,,10,,,,,,,,,,,,,{},{},{}
 7936,Poison_Herb_Scopolia,Poison Herb Scoporia,3,1,,10,,,,,,,,,,,,,{},{},{}
 7937,Poison_Herb_Amoena,Poison Herb Amoena,3,1,,10,,,,,,,,,,,,,{},{},{}
-7938,Light_Granule,Light Granule,3,1000,,10,,,,,,,,,,,,,{},{},{}
-7939,Elder_Branch,Elder Branch,3,1000,,10,,,,,,,,,,,,,{},{},{}
-7940,Special_Alloy_Trap,Special Alloy Trap,3,200,,2,,,,,,,,,,,,,{},{},{}
+7938,Light_Granule,Light Granule,3,1500,,10,,,,,,,,,,,,,{},{},{}
+7939,Elder_Branch,Elder Branch,3,1500,,10,,,,,,,,,,,,,{},{},{}
+7940,Special_Alloy_Trap,Special Alloy Trap,3,300,,2,,,,,,,,,,,,,{},{},{}
 7941,Halloween_Ticket,Halloween Ticket,3,10,,0,,,,,,,,,,,,,{},{},{}
 7942,Letter_From_Chico,Chico Cesar Letter,3,0,,0,,,,,,,,,,,,,{},{},{}
 7943,Caskinya,Caskinya,3,0,,0,,,,,,,,,,,,,{},{},{}
@@ -6115,7 +6115,7 @@
 11599,Superstar_Potion,Superstar Potion,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 11600,Shining_Holy_Water,Shining Holy Water,0,10,,15,,,,0,0xFFFFFFFF,63,2,,,,,,{ if(strcharinfo(3)=="prt_q") { bonus_script "{ bonus2 bSubSize,Size_All,10; }",600; sc_end SC_SILENCE; sc_end SC_POISON; sc_end SC_CURSE; heal 1000,0; } },{},{}
 11602,Catnip_Fruit,Catnip Fruit,0,15,,1,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(10,40),0; },{},{}
-11605,Cookie_Bat,Cookie Bat,0,0,,50,,,,,,,,,,,,,{ itemheal rand(50,100),0; /*TODO*/ },{},{}
+11605,Cookie_Bat,Cookie Bat,0,0,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(50,100),0; /*TODO*/ },{},{}
 //
 11701,Girl_Bunch_Of_Flower_,Girl's Bouquet,0,20,,50,,,,,0xFFFFFFFF,63,2,,,,,,{ itemheal rand(105,145),0; },{},{}
 11702,Moon_Cookie,Moon Cookie,0,0,,300,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -6772,8 +6772,8 @@
 12643,E_Coin_Pack50,E Coin Pack50,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6422,50; },{},{}
 12644,PCBang_Coupon_Box4,PCBang Coupon Box4,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12645,J_Aspersio_5_Scroll_C,J Aspersio 5 Scroll C,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPERSIO,180000,1; },{},{}
-12646,Takoyaki,Fried Octopus Legs,2,20,,30,,,,,,,,,,,,,{ percentheal 5,5; sc_start SC_LUKFOOD,600000,9; sc_start SC_ATKPOTION,600000,20; sc_start SC_MATKPOTION,600000,20; },{},{}
-12647,Ink_Ball,Sea Ink,2,20,,30,,,,,,,,,,,,,{},{},{}
+12646,Takoyaki,Fried Octopus Legs,2,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 5,5; sc_start SC_LUKFOOD,600000,9; sc_start SC_ATKPOTION,600000,20; sc_start SC_MATKPOTION,600000,20; },{},{}
+12647,Ink_Ball,Sea Ink,2,20,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Ink_Ball); },{},{}
 12648,Special_Potion_Set,Comprehensive Set Of Potions,2,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 501,10; getitem 502,10; getitem 503,10; getitem 504,10; getitem 505,10; },{},{}
 12649,Lv70_Imperial_Gift,Level 70 Bounty,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12073,5; getitem 12088,5; getitem 12078,5; getitem 12083,5; getitem 12093,5; getitem 12098,5; },{},{}
 12650,Lv90_Imperial_Gift,Level 90 Bounty,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12263,5; },{},{}
@@ -6990,15 +6990,15 @@
 12860,Mommy_Day_Cake,Mommy Day Cake,2,0,,200,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; skilleffect "HP_ASSUMPTIO",0; sc_start SC_ASSUMPTIO,100000,5; },{},{}
 12863,Treasure_Chest_Summoned_II,Treasure Chest Summoned II,2,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ monster "this",-1,-1,"--ja--",rand(1324,1363),1,""; },{},{}
 12873,TE_Potion_Box,TE Potion Box,18,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem(11558,10); },{},{}
-12874,Frost_Giant_Blood,Frost Giant Blood,2,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12875,Golem_Stone,Golem Stone,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12876,Elf_Tear_Stun,Elf Tear Stun,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12877,Elf_Tear_Stone_Curse,Elf Tear Stone Curse,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12878,Elf_Tear_Freezing,Elf Tear Freezing,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12879,Elf_Tear_Sleep,Elf Tear Sleep,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12880,Elf_Tear_Curse,Elf Tear Curse,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12881,Elf_Tear_Silence,Elf Tear Silence,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12882,Elf_Tear_Blind,Elf Tear Blind,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12874,Frost_Giant_Blood,Frost Giant Blood,2,0,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_POTION_CON; sc_start4 SC_GVG_GIANT,10000,3000,0,100,100; },{},{}
+12875,Golem_Stone,Golem Stone,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_POTION_CON; sc_start4 SC_GVG_GOLEM,10000,0,200,50,50; },{},{}
+12876,Elf_Tear_Stun,Elf Tear Stun,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_STUN,10000,3000,0; },{},{}
+12877,Elf_Tear_Stone_Curse,Elf Tear Stone Curse,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_STONE,10000,3000,0; },{},{}
+12878,Elf_Tear_Freezing,Elf Tear Freezing,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_FREEZ,10000,3000,0; },{},{}
+12879,Elf_Tear_Sleep,Elf Tear Sleep,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_SLEEP,10000,3000,0; },{},{}
+12880,Elf_Tear_Curse,Elf Tear Curse,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_CURSE,10000,3000,0; },{},{}
+12881,Elf_Tear_Silence,Elf Tear Silence,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_SILENCE,10000,3000,0; },{},{}
+12882,Elf_Tear_Blind,Elf Tear Blind,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start2 SC_GVG_BLIND,10000,3000,0; },{},{}
 12883,Almighty,Almighty,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ specialeffect2 EF_BASH3D; sc_start SC_2011RWC_SCROLL,1800000,10; },{},{}
 12884,Infinite_Concentration_Potion,Infinite Concentration Potion,11,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,4; },{},{}
 12885,Infinite_Awakening_Potion,Infinite Awakening Potion,11,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION1,1800000,6; },{},{}
@@ -8491,9 +8491,9 @@
 14665,Jung_Bi_Scroll,Jung Bi Scroll,18,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Jung_Bi_Scroll); },{},{}
 14666,Je_Un_Scroll,Je Un Scroll,18,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Je_Un_Scroll); },{},{}
 14667,Yong_Kwang_Scroll,Yong Kwang Scroll,18,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Yong_Kwang_Scroll); },{},{}
-14672,Steel_Fighter_Scroll_Lv20,Steel Fighter Scroll (Lv20),0,20,,10,,,,,0xFFFFFFFF,,,,,,,,{},{},{}
-14673,Steel_Fighter_Scroll_Lv25,Steel Fighter Scroll (Lv25),0,20,,10,,,,,0xFFFFFFFF,,,,,,,,{},{},{}
-14674,Cup_Of_Boza,Cup Of Boza,2,20,,10,,,,,,,,,,,,,{ bonus_script "{ bonus bVit,10; bonus2 bSubEle,Ele_Fire,5; }",120; /*EFST_CUP_OF_BOZA 120000*/ },{},{}
+14672,Steel_Fighter_Scroll_Lv20,Steel Fighter Scroll (Lv20),0,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+14673,Steel_Fighter_Scroll_Lv25,Steel Fighter Scroll (Lv25),0,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+14674,Cup_Of_Boza,Cup Of Boza,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus bVit,10; bonus2 bSubEle,Ele_Fire,5; }",120; /*EFST_CUP_OF_BOZA 120000*/ },{},{}
 14675,Shadow_Box_II,Shadow Box II,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 14679,Article_Sealed_Storm_Scroll,Article Sealed Storm Scroll,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 14681,Costume_Enchantment_Stone_Box_II,Costume Enchantment Stone Box II,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -8502,7 +8502,7 @@
 14695,Costume_Enchant_Stone_Box_3,Costume Enchant Stone Box III,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem rand(6790,6792),1; getitem 4936,1; getitem 4937,1; getitem 4938,1; },{},{}
 14696,Sealed_Gloom_Under_Night_Gachapon,Sealed Gloom Under Night Gachapon,18,0,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /* getitem callfunc("F_Rand",Sealed Cards Gloom Under Night, 9 weapons smelting ticket, Armor 9 smelting ticket, medium armor Shadow, Shadow Weapon Medium, costume Wings of the Kirin, costume enchant stone box); */ },{},{}
 14699,Memorial_Garuda_Lucky_Egg,Memorial Garuda Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Memorial_Garuda_Lucky_Egg); },{},{}
-14701,Rune_Midgard_Imortal_Lucky_Egg,Rune Midgard Imortal Lucky Egg,18,0,,0,,,,0,,,,,,,,,{ getgroupitem(IG_Rune_Midgard_Imortal_Lucky_Egg); },{},{}
+14701,Rune_Midgard_Imortal_Lucky_Egg,Rune Midgard Imortal Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Rune_Midgard_Imortal_Lucky_Egg); },{},{}
 14704,Gemstone_Shadow_Box,Gemstone Shadow Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 24084,1; getitem 24085,1; getitem 24086,1; getitem 24087,1; getitem 24088,1; getitem 24089,1; },{},{}
 14705,Sealed_Fallen_Bishop_Hibram_Scroll,Sealed Fallen Bishop Hibram Scroll,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: COnfirm the rates*/ getitem callfunc("F_Rand",6228,6232,14704,19884,14695,6697),1; },{},{}
 14713,Sealed_Ifrit_Scroll,Sealed Ifrit Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ /* getitem callfunc("F_Rand",Sealed ifrit card, 9 weapons smelting ticket, Armor 9 smelting ticket, costume Noah's hats, costumes Enchantment Stone Box); */ },{},{}
@@ -8638,6 +8638,12 @@
 15163,Fictitious_Robe,Fictitious Robe,4,20,,100,,0,,1,0xFFFFFFFF,63,2,16,,100,1,,{ skill "SA_SPELLBREAKER",1; .@i = BaseLevel; bonus bMatkRate,(.@i>=140)?(14):((.@i>=120)?(9):(5)); },{},{}
 15164,Consultative_Robe,Consultative Robe,4,20,,100,,0,,1,0xFFFFFFFF,63,2,16,,100,1,,{ bonus bVit,5; skill "PA_SACRIFICE",1; bonus2 bSubEle,Ele_Dark,getrefine()*3; bonus2 bSubEle,Ele_Fire,getrefine()*3; },{},{}
 15174,Surfer_Swimsuit,Surfer Swimsuit,4,20,,100,,1,,1,0xFFFFFFFF,63,2,16,,40,1,,{ bonus bMaxHPrate,(getrefine()/3)+5; bonus bMaxSPrate,(getrefine()/3)+5; },{},{}
+15181,Para_Team_Uniform100,Awakened Eden Group Uniform I,4,20,,0,,80,,0,0xFFFFFFFF,63,2,16,,100,,,{ bonus bAllStats,1; bonus bMaxHP,700; bonus bMaxSP,100; bonus bMdef,7; },{},{}
+15182,Para_Team_Uniform115,Awakened Eden Group Uniform II,4,20,,0,,85,,0,0xFFFFFFFF,63,2,16,,115,,,{ bonus bAllStats,1; bonus bMaxHP,1100; bonus bMaxSP,120; bonus bMdef,11; },{},{}
+15183,Para_Team_Uniform130,Awakened Eden Group Uniform III,4,20,,0,,90,,0,0xFFFFFFFF,63,2,16,,130,,,{ bonus bAllStats,2; bonus bMaxHP,1100; bonus bMaxSP,120; bonus bMdef,11; },{},{}
+15184,Para_Team_Uniform145,Awakened Eden Group Uniform IV,4,20,,0,,100,,0,0xFFFFFFFF,63,2,16,,145,,,{ bonus bAllStats,2; bonus bMaxHP,1500; bonus bMaxSP,150; bonus bMdef,15; },{},{}
+15185,Para_Team_Uniform160,Awakened Eden Group Uniform V,4,20,,0,,100,,0,0xFFFFFFFF,63,2,16,,160,,,{ bonus bAllStats,2; bonus bMaxHP,1500; bonus bMaxSP,150; bonus bMdef,15; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; },{},{}
+15186,Kafra_Uniform,Kafra Uniform,4,20,,500,,40,,1,0xFFFFFFFF,63,2,16,,1,1,,{ bonus2 bExpAddClass,Class_All,5; bonus2 bDropAddClass,Class_All,5; .@r = getrefine(); bonus bMaxHP,100*.@r; bonus bMaxSP,20*.@r; bonus bMaxHPrate,(3*(.@r>=7)+5*(.@r>=9)); bonus bMaxSPrate,(3*(.@r>=7)+5*(.@r>=9)); if(.@r>=12){ bonus bHPrecovRate,100; bonus bSPrecovRate,100; } },{},{}
 //===================================================================
 // More Maces
 //===================================================================
@@ -8665,7 +8671,7 @@
 16021,Velum_Flail,Vellum Flail,5,20,,1500,170,,1,0,0x0004C5B3,63,2,2,4,95,1,8,{ bonus bUnbreakableWeapon,1; bonus3 bStateNoRecoverRace,RC_DemiHuman,10000,10000; .@r = getrefine(); bonus bHit,.@r; bonus bCritical,.@r; },{},{}
 16022,Nemesis_,Nemesis,5,20,,900,120,,1,2,0x00008110,63,2,2,4,60,1,8,{ bonus bUnbreakableWeapon,1; bonus bAtkEle,Ele_Holy; },{},{}
 16023,Metal_Mace,Metal Mace,5,20,,0,80,,1,1,0x0004C5B3,63,2,2,3,1,1,8,{ bonus bUnbreakableWeapon,1; bonus bBaseAtk,(getrefine()*5); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
-16024,Quadrille_,Quadrille,5,10,,900,165,,,2,0x10,63,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddRace,RC_Player,10; bonus2 bAddEle,Ele_Earth,10; },{},{}
+16024,Quadrille_,Quadrille,5,10,,900,165,,,2,0x00008110,63,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddRace,RC_Player,10; bonus2 bAddEle,Ele_Earth,10; },{},{}
 16025,TE_Woe_Mace,TE Woe Mace,5,0,,0,120,,1,0,0x0004C5B3,63,2,2,3,40,1,8,{ bonus bUnbreakableWeapon,1; bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Freeze,3000; bonus bHPRecovRate,5; bonus bSPRecovRate,5; },{},{}
 16026,RWC_Memory_Mace,RWC Memory Mace,5,20,,800,100,,1,1,0x0004C5B2,63,2,2,3,1,1,8,{ bonus bUnbreakableWeapon,1; .@r = getrefine(); bonus bBaseAtk,(.@r/30)*30; if(.@r>=9){ .@i = 1; bonus3 bAutoSpellWhenHit,"BS_WEAPONPERFECT",1,10; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,5; } },{},{}
 16027,Hammer_Of_Evil_Slayer,Hammer Of Evil Slayer,5,10,,1350,,125,,1,0x228F6EEF,63,2,2,3,100,1,8,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus bAtkRate,(.@r>=9)?(5):((.@r>=12)?(7):(0)); },{},{}
@@ -9169,7 +9175,7 @@
 17181,Jan_Groove_Box,Jan Groove Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 17184,3rd_Test_Pass_Box,3rd Test Pass Box,18,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6583,1; },{},{}
 17203,Free_Pass_Box,Free Pass Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-17204,Shining_Egg,Shining Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ /*TODO, confirm the rates*/ getitem callfunc("F_Rand",4302,5374,5254,12246),1; },{},{}
+17204,Shining_Egg,Shining Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Shining_Egg); },{},{}
 17207,Idn_Heart_Scroll,Idn Heart Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 17209,Tw_Rainbow_Scroll,Tw Rainbow Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Tw_Rainbow_Scroll); },{},{}
 17210,Tw_Red_Scroll,Tw Red Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Tw_Red_Scroll); },{},{}
@@ -9406,7 +9412,7 @@
 18120,Bow_Of_Evil_Slayer,Bow Of Evil Slayer,5,10,,1350,,115,,1,0x00020008,63,2,34,,100,1,11,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus bAtkRate,(.@r>=9)?(5):((.@r>=12)?(7):(0)); },{},{}
 18121,Bow_of_Vicious_Mind,Bow of Vicious Mind,5,20,,1700,170,,5,1,0x000A0808,63,2,34,4,160,1,11,{ bonus bAtk,pow(min(getrefine(),15),2); },{},{}
 18122,Giant_Bow,Giant Bow,5,20,,3000,195,,5,1,0x00000800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,40; bonus bAspdRate,-15; bonus bHit,50; },{},{}
-18123,Bow_of_Storms,Bow of Storms,5,20,,1500,160,,5,1,0x00000800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,30; bonus2 bSkillCooldown,"RA_ARROWSTORM",-20; bonus2 bSkillUseSP,"RA_ARROWSTORM",15; },{},{}
+18123,Bow_of_Storms,Bow of Storms,5,20,,1500,160,,5,1,0x00080800,63,2,34,4,130,1,11,{ bonus bLongAtkRate,30; bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000; bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",15; },{},{}
 18124,Half_BF_Bow1,Half BF Bow1,5,20,,0,100,,5,0,0x000A0848,63,2,34,3,80,1,11,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,30; bonus2 bAddRace,RC_Player,30; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon,1; },{},{}
 18125,Arcus_Daemonicus,Arcus Daemonicus,5,20,,1000,130,,5,2,0x00020008,63,2,34,4,80,1,11,{ /*Fix me: bonus bAtkRate,50; when equipped with shadow arrows*/ if(getrefine()>9){ bonus bAspd,1; bonus bUseSPrate,-20; } },{},{}
 18126,Blue_Bow,Blue Bow,5,10,,1200,150,,5,1,0x00000800,56,2,2,3,100,1,11,{ bonus bAgi,5; bonus bDex,5; },{},{}
@@ -9658,7 +9664,7 @@
 18748,Gold_Ingot_Poring_Hat,Gold Ingot Poring Hat,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,0,1,887,{ bonus bDex,2; bonus bLuk,2; },{},{}
 18749,Majoruros_Horn,Majoruros Horn,4,20,,500,,8,,1,0xFFFFFFFF,63,2,256,,0,1,888,{ bonus bStr,2; bonus bMaxHP,100; },{},{}
 18750,Poker_Card_In_Mouth,Poker Card In Mouth,4,20,,50,,0,,0,0xFFFFFFFF,63,2,1,,10,0,889,{ bonus2 bAddRace,RC_DemiHuman,2; },{},{}
-18752,Rideword_Hat_,Rideword Hat,4,20,,300,,3,,1,0xFFFFFFFE,63,2,256,,99,1,890,{ .@r = getrefine(); bonus2 bHPLossRate,500*.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3); },{},{}
+18752,Cursed_Book,Cursed Book,4,20,,300,,3,,1,0xFFFFFFFE,63,2,256,,99,1,890,{ .@r = getrefine(); bonus2 bHPLossRate,.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3); },{},{}
 18753,Tw_Rice_Ball,Tw Rice Ball,4,20,,100,,6,,0,0xFFFFFFFF,63,2,256,,0,0,892,{ bonus bLuk,1; bonus2 bAddMonsterDropItem,564,100; },{},{}
 18754,Blood_Sucker,Blood Sucker,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1,,40,0,893,{ bonus bUnbreakableHelm,1; bonus2 bHPDrainRate,30,5; bonus bHPrecovRate,-100; bonus bSPrecovRate,-100; },{},{}
 18755,Feather_Beret_,Feather Beret,4,0,,600,,1,,1,0xFFFFFFFF,63,2,256,1,1,1,224,{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{}
@@ -9747,7 +9753,7 @@
 18871,Very_Sweet_Candy,Very Sweet Candy,4,10,,10,,,,0,0xFFFFFFFF,63,2,1,,1,1,446,{ bonus bAllStats,1; bonus bBaseAtk,5; bonus bMatk,5; },{},{}
 18872,Snake_Hat,Snake Hat,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,986,{ bonus bStr,3; bonus bInt,3; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{}
 18873,Sweet_Valentine_Out,Sweet Valentine Out,4,20,,100,,1,,0,0xFFFFFFFF,63,2,256,,1,1,865,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; },{},{}
-18874,Cyclops_Glasses,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,1,23,{},{},{}
+18874,Cyclops_Glasses,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,,23,{},{},{}
 18878,Palace_Guard_Cap,Palace Guard Cap,4,10,,1000,,15,,1,0xFFFFFFFF,63,2,256,,50,1,991,{ .@r = getrefine(); bonus2 bAddEle,Ele_Neutral,4+.@r/6; bonus bLongAtkRate,4+.@r; bonus bUnbreakableHelm,1; },{},{}
 18879,Angry_Scorpion_Hat,Angry Scorpion Hat,4,10,,100,,5,,0,0xFFFFFFFF,63,2,256,,0,1,995,{ bonus bMdef,5; },{},{}
 18880,Advanced_Jao_King_Hat,Advanced Jao King Hat,4,10,,1500,,4,,1,0xFFFFFFFF,63,2,256,,175,1,996,{ bonus bAllStats,3; bonus bMaxHPrate,5; bonus bMaxSPrate,5; },{},{}
@@ -9810,7 +9816,7 @@
 19026,Aegir_Helm,Aegir Helm,4,10,,800,,10,,1,0xFFFFFFFF,63,2,256,,40,1,870,{ bonus bVit,3; },{},{}
 19030,Pretty_Rabbit_Hood,Pretty Rabbit Hood,4,10,,100,,20,,1,0xFFFFFFFF,63,2,769,,1,1,1085,{ bonus bMaxHP,(15*BaseLevel); },{},{}
 19031,Fallen_Angel_Blessing,Fallen Angel Blessing,4,0,,200,,1,,0,0xFFFFFFFF,63,2,512,,,1,1250,{ bonus2 bAddRace,RC_Angel,5; bonus2 bSubRace,RC_Angel,5; },{},{}
-19033,Rift_Ancient_Decoration,Rift Ancient Decoration,4,20,,20,,2,,1,0xFFFFFFFF,63,2,256,,100,1,376,{ .@r = getrefine(); bonus bMaxHP,1000+(.@r >= 9 ? 1000 : .@r >=7 ? 400 : 0); },{},{}
+19033,Rift_Ancient_Decoration,Rift Ancient Decoration,4,20,,200,,2,,1,0xFFFFFFFF,63,2,256,,100,1,376,{ .@r = getrefine(); bonus bMaxHP,1000+(.@r >= 9 ? 1000 : .@r >=7 ? 400 : 0); },{},{}
 19038,12_Anniversary_Crown_Of_Saint,12 Anniversary Crown of Saint,4,10,,120,,12,,1,0xFFFFFFFF,63,2,256,,0,1,1117,{ bonus bAllStats,2; bonus bMdef,12; },{},{}
 19039,12_Anniversary_Elf_Ears,12 Anniversary Elf Ears,4,10,,120,,0,,0,0xFFFFFFFF,63,2,512,,0,1,875,{ bonus2 bSubRace,RC_All,4; bonus2 bSubRace,RC_Player,-4; },{},{}
 19047,Angeling_KnitCap,Angeling KnitCap,4,0,,300,,5,,1,0xFFFFFFFF,63,2,256,,20,1,953,{ bonus2 bSPGainRace,RC_Angel,5; bonus bHPGainValue,100; .@r = getrefine(); if (.@r >= 5) { bonus2 bSubRace,RC_Angel,5+((.@r >= 7) ? 5 : 0); } },{},{}
@@ -9834,6 +9840,8 @@
 19133,Odin_Mask_,Odin's Mask,4,20,,100,,1,,1,0xFFFFFFFF,63,2,513,,1,0,480,{ bonus2 bSubClass,Class_Boss,2; },{},{}
 19134,Wickebines_Black_Cat_Ears,Wickebine's Black Cat Ears,4,20,,200,,4,,1,0xFFFFFFFF,63,2,256,,1,1,368,{},{},{}
 19138,Seraphim_Coronet,Seraphim Coronet,4,20,,300,,0,,0,0xFFFFFFFF,63,2,512,,70,0,1487,{ bonus bStr,2; .@int = readparam(bInt); bonus bBaseAtk,(.@int/8)*5; bonus bHealPower,.@int/8; bonus bVariableCastrate,.@int/8; if ((.@int>108)) { bonus bBaseAtk,50; bonus bHealPower,5; bonus bVariableCastrate,4; } if ((.@int>120)) { bonus bBaseAtk,75; bonus bHealPower,5; bonus bVariableCastrate,2; } },{},{}
+19139,Survive_Orb,Survive Orb,4,0,,300,,,,0,0xFFFFFFFF,63,2,1,,50,0,1488,{ skill "TF_HIDING",1; bonus bAtkRate,2; bonus bMatkRate,2; bonus bVariableCastrate,-3; },{},{}
+19140,Squirrel_Ear_Hat,Squirrel Ear Hat,4,0,,200,,10,,1,0xFFFFFFFF,63,2,256,,100,1,1486,{ .@r = getrefine(); bonus bAspd,1; bonus bCriticalLong,5; bonus bCritAtkRate,10; bonus2 bIgnoreDefRaceRate,RC_All,10; if (.@r > 4) { bonus bAspd,1; bonus bCriticalLong,10; bonus bCritAtkRate,2; bonus2 bIgnoreDefRaceRate,RC_All,20; } if (.@r > 6) { bonus bAspd,1; bonus bCriticalLong,15; bonus bCritAtkRate,6; bonus2 bIgnoreDefRaceRate,RC_All,30; } if (.@r > 8) { bonus bAspd,1; bonus bCriticalLong,20; bonus bCritAtkRate,12; bonus2 bIgnoreDefRaceRate,RC_All,40; autobonus "{ bonus bCritAtkRate,100; }",70,5000; } },{},{}
 19141,Dolor_Thanatos_Mask,Dolor Thanatos Mask,4,20,,200,,6,,0,0xFFFFFFFF,63,2,513,,100,0,666,{ bonus bMdef,8; bonus bAllStats,1; bonus2 bSubRace,RC_DemiHuman,5; bonus2 bSubRace,RC_Player,1; bonus2 bSubEle,Ele_Fire,5; bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Wind,5; bonus2 bSubEle,Ele_Earth,5; },{},{}
 19142,Drooping_Rebellion,Drooping Rebellion,4,20,,500,,1,,1,0xFFFFFFFF,63,2,256,,1,0,1444,{ bonus bLongAtkRate,10; },{},{}
 19143,Poring_Balloon,Poring Balloon,4,20,,10,,0,,0,0xFFFFFFFF,63,2,1,,1,0,1426,{ bonus2 bAddMonsterDropItem,909,2000; bonus2 bExpAddRace,RC_All,5; bonus2 bDropAddRace,RC_All,5; },{},{}
@@ -9853,7 +9861,10 @@
 19158,C_GeminiS58_Eyes_Blue,Costume GeminiS58 Eyes Blue,4,0,,0,,0,,0,0xFFFFFFFF,63,2,2048,,0,0,1456,{},{},{}
 19159,Barrel_Helm,Barrel Helm,4,20,,420,,59,,1,0xFFFFFFFF,63,2,769,,60,1,1498,{ bonus bVit,5; bonus bHPrecovRate,-10; .@r = getrefine(); if (.@r >= 7) { bonus bDef,100; skill "CR_AUTOGUARD",1; } if (.@r >= 8) { bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; if(BaseJob==Job_SuperNovice) { skill "CR_AUTOGUARD",5; } } },{},{}
 19162,Scuba_Mask_,Scuba Mask,4,20,,100,,0,,1,0xFFFFFFFF,63,2,512,,40,1,400,{ bonus bBaseAtk,5; bonus bMatk,5; },{},{}
+19164,Para_Team_Hat100,Awakened Eden Group Hat I,4,20,,0,,10,,1,0xFFFFFFFF,63,2,256,,100,1,1529,{ autobonus "{ bonus bBaseAtk,15; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,15; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }"; .@r = getrefine(); if(.@r >= 7){ bonus bAtk,10; bonus bMatk,10; if(.@r >= 9){ bonus bAllStats,1; if(.@r >= 12){ bonus2 bRegenPercentSP,1,10000; } } } },{},{}
+19165,Para_Team_Hat160,Awakened Eden Group Hat II,4,20,,0,,10,,1,0xFFFFFFFF,63,2,256,,160,1,1530,{ autobonus "{ bonus bBaseAtk,30; }",70,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bMatk,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }"; .@r = getrefine(); if(.@r >= 7){ bonus bAtk,15; bonus bMatk,15; if(.@r >= 9){ bonus bAllStats,2; if(.@r >= 12){ bonus2 bRegenPercentHP,2,10000; bonus2 bRegenPercentSP,1,10000; } } } },{},{}
 19166,RO_Celebration_Hat,RO Celebration Hat,4,20,,140,,14,,1,0xFFFFFFFF,63,2,256,,14,1,1541,{ bonus bMaxSP,140; bonus2 bSPRegenRate,6,4000; },{},{}
+19168,Band_Of_Kafra_,Kafra Staff Headband,4,20,,500,,0,,1,0xFFFFFFFF,63,2,256,,,1,106,{ bonus2 bSubClass,Class_All,5; .@r = getrefine()*10; bonus2 bAddMonsterDropItem,23177,10+.@r; bonus2 bAddMonsterDropItem,7059,10+.@r; bonus2 bAddMonsterDropItem,7060,10+.@r; },{},{}
 //===================================================================
 // Costume System
 //===================================================================
@@ -10737,14 +10748,20 @@
 20790,Elegant_Doram_Manteau,Elegant Doram Manteau,4,20,,500,,30,,1,0x80000000,7,2,4,,175,1,,{ bonus bFlee,10; bonus2 bSubEle,Ele_Neutral,5; .@r = getrefine()/2; bonus bFlee2,.@r; bonus bInt,.@r; bonus bDex,.@r; bonus bLuk,.@r; },{},{}
 20797,Etran_Shirt,Etran Shirt,4,0,,150,,,,1,0xFFFFFFFF,63,2,4,1,1,1,,{ bonus bMdef,10; bonus bMaxHPrate,2; .@r = getrefine(); if (.@r >= 6) bonus bMaxHPrate,4; if (.@r >= 7) bonus bMaxHPrate,6; if (.@r >= 8) bonus bMaxHPrate,8; if (.@r >= 9) bonus bNoKnockback,1; },{},{}
 20798,C_Grim_Reaper_Protection,Costume Grim Reaper Protection,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1450,{},{},{}
+20815,Seraphim_Robe,Seraphim Robe,4,0,,300,,18,,1,0xFFFFFFFF,63,2,4,,1,1,,{ bonus bMaxHPrate,10; bonus2 bMagicAtkEle,Ele_Neutral,5; .@r = getrefine(); if (.@r > 6) { bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Holy,20; bonus bMatkRate,10; } if (.@r > 8) { bonus2 bSubEle,Ele_Dark,10; bonus2 bSubEle,Ele_Holy,10; bonus bVariableCastrate,-5; } if (getskilllv("CR_TRUST") > 0) { bonus2 bSubEle,Ele_Holy,.@r*3; } },{},{}
 20819,Oxygen_Bottle,Oxygen Bottle,4,0,,500,,0,,1,0xFFFFFFFF,63,2,4,,40,0,0,{ bonus bFlee,12+getrefine(); bonus bHit,getrefine(); },{},{}
+20823,Para_Team_Manteau100,Awakened Eden Group Manteau I,4,0,,0,,20,,0,0xFFFFFFFF,63,2,4,,100,1,0,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,12; .@r = getrefine(); if(.@r >= 7){ bonus bMaxHP,500; bonus bFlee2,2; if(.@r >= 9){ bonus bMaxHP,500; bonus2 bSubEle,Ele_All,10; bonus2 bSubEle,Ele_Neutral,-10; } } },{},{}
+20824,Para_Team_Manteau130,Awakened Eden Group Manteau II,4,0,,0,,25,,0,0xFFFFFFFF,63,2,4,,130,1,0,{ bonus2 bSubEle,Ele_Neutral,10; bonus bFlee,12; bonus bMaxHP,500; bonus bFlee2,2; .@r = getrefine(); if(.@r >= 7){ bonus bMaxHP,500; bonus2 bSubEle,Ele_All,10; bonus2 bSubEle,Ele_Neutral,-10; if(.@r >= 9){ bonus2 bSubEle,Ele_Neutral,5; } } },{},{}
+20825,Para_Team_Manteau160,Awakened Eden Group Manteau III,4,0,,0,,30,,0,0xFFFFFFFF,63,2,4,,160,1,0,{ bonus2 bSubEle,Ele_All,10; bonus bFlee,12; bonus bMaxHP,1000; bonus bFlee2,2; .@r = getrefine(); if(.@r >= 7){ bonus2 bSubEle,Ele_Neutral,5; if(.@r >= 9){ skill "BS_GREED",1; } } },{},{}
+20826,Angel_Feather,Angel Feather,4,0,,200,,18,,1,0xFFFFFFFF,63,2,4,,1,1,18,{},{},{}
+20830,Wings_of_Seraph,Wings of Seraph,4,0,,200,,18,,1,0xFFFFFFFF,63,2,4,,1,1,8,{},{},{}
 //===================================================================
 // More 2-Handed Swords
 //===================================================================
 21000,Upg_Twohand_Sword,Upg Two-Handed Sword,5,20,,1500,100,,1,1,0x00004082,63,2,34,3,1,1,3,{ .@r = getrefine(); bonus bBaseAtk,(.@r*12); bonus bMatk,(.@r*5); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{}
 21001,Velum_Claymore,Vellum Claymore,5,20,,3500,260,,1,0,0x00004082,63,2,34,4,95,1,3,{ bonus2 bAddRace,RC_Player,80; bonus2 bIgnoreDefRaceRate,RC_Player,30; .@r = getrefine(); if(.@r>=6) { bonus2 bAddRace,RC_Player,40; } if(.@r>=9) { autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",6000,2000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; } },{},{}
 21002,Velum_Katzbalger,Vellum Katzbalger,5,20,,2500,100,,1,0,0x00004082,63,2,34,4,95,1,3,{ bonus3 bHPVanishRaceRate,RC_Player,10000,8; },{},{}
-21003,Muramasa_,Muramasa,5,20,,1000,155,,1,2,0x00004082,63,2,34,4,48,1,3,{},{},{}
+21003,Muramasa_,Muramasa,5,20,,1000,155,,1,2,0x00004082,63,2,34,4,48,1,3,{ bonus bCritical,30; bonus bAspdRate,8; bonus2 bAddEff2,Eff_Curse,10; },{},{}
 21004,Alca_Bringer_,Alca Bringer,5,20,,3400,280,,2,2,0x00004082,63,2,34,3,100,1,3,{},{},{}
 21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,5,20,,0,95,,1,1,0x00004082,63,2,34,3,1,1,3,{ .@r = getrefine(); bonus bBaseAtk,(.@r*6); bonus bMatk,(.@r*2); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bBaseAtk,((.@i-2)*5); },{},{}
 21006,TE_Woe_Two_Hand_Sword,TE Woe Two Hand Sword,5,0,,0,150,,1,0,0x00004082,63,2,34,3,40,1,3,{ bonus2 bAddRace,RC_Player,40; bonus2 bAddEff,Eff_Bleeding,3000; },{},{}
@@ -10779,6 +10796,7 @@
 22015,Impr_Angel's_Arrival,Advanced Angel's Reincarnation,4,10000,,300,,8,,1,0x00000001,63,2,64,,99,1,0,{ bonus bMaxHP,500; bonus bMaxSP,100; },{},{}
 22018,Shoes_Of_Wise_Man,Shoes Of Wise Man,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,50,1,,{ .@r = getrefine(); if(.@r>5){ bonus bInt,.@r-5; bonus bMaxHPrate,-(.@r-5); } },{},{}
 22033,Boots_of_Gray,Boots of Gray,4,10,,0,,,,1,0xFFFFFFFF,63,2,64,,120,1,,{ bonus2 bSubEle,Ele_Holy,1+getrefine()/3; },{},{}
+22034,Crimson_Gaiter,Crimson Gaiter,4,0,,500,,10,,0,0xFFFFFFFF,63,2,64,,50,1,,{ bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; } },{},{}
 22035,Heoric_Nepenthes_Shoes,Heoric Nepenthes Shoes,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=10) .@i=5+.@r; else if (.@r>=11 && .@r<=13) .@i=5+(.@r*3); else if (.@r>13) .@i=42; bonus bVariableCastrate,-10-.@i; },{},{}
 22036,Heroic_Silver_Fox_Leather_Boots,Heroic Silver Fox Leather Boots,4,10,,300,,15,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bLongAtkRate,5+.@i; },{},{}
 22037,Heroic_Ungoliant_Upgrade_Boots,Heroic Ungoliant Upgrade Boots,4,10,,300,,10,,1,0xFFFFFFFF,63,2,64,,160,1,,{ .@r = getrefine(); if (.@r>=8 && .@r<=13) .@i=.@r; else if (.@r>13) .@i=13; bonus bUseSPrate,-5-.@i; },{},{}
@@ -10800,7 +10818,14 @@
 22083,Private_Doram_Shoes,Private Doram Shoes,4,20,,500,,25,,1,0x80000000,7,2,64,,100,1,,{ bonus bMaxHP,100; bonus bMaxSP,50; .@r = getrefine()/3; bonus bHPrecovRate,.@r*10; bonus bSPrecovRate,.@r*10; },{},{}
 22084,Luxury_Doram_Shoes,Luxury Doram Shoes,4,20,,600,,30,,1,0x80000000,7,2,64,,140,1,,{ bonus bMaxHP,300; bonus bMaxSP,100; .@r = getrefine()/3; bonus bHPrecovRate,20*.@r; bonus bSPrecovRate,20*.@r; },{},{}
 22085,Elegant_Doram_Shoes,Elegant Doram Shoes,4,20,,700,,35,,1,0x80000000,7,2,64,,175,1,,{ bonus bMaxHPrate,10; bonus bMaxSPrate,5; .@r = getrefine()/2; bonus bMaxHP,100*.@r; bonus bMaxSP,20*.@r; if(.@r >= 4) bonus2 bSkillUseSP,"SU_LOPE",5; },{},{}
+22089,Crimson_Gaiter_,Crimson Gaiter,4,0,,500,,10,,1,0xFFFFFFFF,63,2,64,,50,1,,{ bonus bCritical,2; bonus bCritAtkRate,2; if(getrefine()>=7){ bonus bCritical,3; bonus bCritAtkRate,3; } },{},{}
 22103,Excelion_Leg,Excelion Leg,4,0,,500,,13,,0,0xFFFFFFFF,63,2,64,1,100,1,,{ .@r = getrefine(); bonus bMaxHP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; bonus bMaxSP,5+((BaseLevel > 129) ? 4 : 0)+(.@r/3)*3; },{},{}
+22106,Giant_Boots,Giant Boots,4,0,,500,,13,,1,0xFFFFFFFF,63,2,64,,1,1,,{ bonus2 bSubRace,RC_All,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; .@r = getrefine(); if (.@r > 4) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } if (.@r > 6) { bonus bDefRate,2; bonus bMaxHPrate,4; bonus bMaxSPrate,4; } },{},{}
+22122,Para_Team_Boots100,Awakened Eden Group Boots I,4,0,,0,,22,,0,0xFFFFFFFF,63,2,64,,100,1,,{ bonus bAllStats,1; bonus bHPrecovRate,30; bonus bSPrecovRate,14; },{},{}
+22123,Para_Team_Boots115,Awakened Eden Group Boots II,4,0,,0,,25,,0,0xFFFFFFFF,63,2,64,,115,1,,{ bonus bAllStats,1; bonus bHPrecovRate,36; bonus bSPrecovRate,18; },{},{}
+22124,Para_Team_Boots130,Awakened Eden Group Boots III,4,0,,0,,27,,0,0xFFFFFFFF,63,2,64,,130,1,,{ bonus bAllStats,2; bonus bHPrecovRate,36; bonus bSPrecovRate,18; },{},{}
+22125,Para_Team_Boots145,Awakened Eden Group Boots IV,4,0,,0,,30,,0,0xFFFFFFFF,63,2,64,,145,1,,{ bonus bAllStats,2; bonus bHPrecovRate,40; bonus bSPrecovRate,20; },{},{}
+22126,Para_Team_Boots160,Awakened Eden Group Boots V,4,0,,0,,30,,0,0xFFFFFFFF,63,2,64,,160,1,,{ bonus bAllStats,2; bonus bHPrecovRate,40; bonus bSPrecovRate,20; bonus bUseSPrate,-5; },{},{}
 22508,Para_Team_Mark_,Eden Group Mark,11,0,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ unitskilluseid getcharid(3),"AL_TELEPORT",3; },{},{}
 22507,Worn-Out-Scroll,Worn-Out-Scroll,3,10,,10,,,,0,,,,,,,,,{},{},{}
 22510,King_Wolf_Scroll,King Wolf Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO, confirm the rates*/ getitem callfunc("F_Rand",6635,19598,5658,6238,6239),1; },{},{}
@@ -10824,7 +10849,7 @@
 22531,Special_Christmas_Box,Special Christmas Box,18,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ /*TODO*/ },{},{}
 22532,Santa_Gift,Santa Gift,18,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ /*TODO*/ },{},{}
 22533,New_Year_Gift_Box,New Year Gift Box,18,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ /*TODO*/ },{},{}
-22534,Closed_Mind_Box,Closed Mind Box,18,10,,1000,,,,,,,,,,,,,{ getgroupitem(IG_Sealed_Mind_Box); },{},{}
+22534,Closed_Mind_Box,Closed Mind Box,18,10,,1000,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Sealed_Mind_Box); },{},{}
 22535,Scroll_Summoning_Workers(Male),Scroll Summoning Workers(Male),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 22536,Scroll_Summoning_Workers(Female),Scroll Summoning Workers(Female),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 22538,Hanbok_bag,Hanbok bag,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{},{},{}
@@ -10850,8 +10875,8 @@
 22559,Mock_Strawberry,Mock Strawberry,11,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; itemskill "SM_ENDURE",3; },{},{}
 22563,Lucky_Bag_Of_New_Era,Lucky Bag Of New Era,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ /* TODO */ },{},{}
 22566,Last_Years_Frost,Last Year's Frost,3,20,,0,,,,,,,,,,,,,{},{},{}
-22567,Expedition_Award_Box,Expedition Award Box,0,20,,100,,,,,0xFFFFFFFF,,,,,,,,{},{},{}
-22568,Nidhoggur_Summon_Scroll,Nidhoggur Summon Scroll,0,20,,100,,,,,0xFFFFFFFF,,,,,,,,{},{},{}
+22567,Expedition_Award_Box,Expedition Award Box,0,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+22568,Nidhoggur_Summon_Scroll,Nidhoggur Summon Scroll,0,20,,100,,,,,0xFFFFFFFF,63,,2,,,,,{},{},{}
 22569,Gift_New_start,Gift New start,18,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
 22571,Easter_Egg,Easter Egg,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 22589,Savage_Ora_Ora,Savage Ora Ora,3,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -10948,7 +10973,7 @@
 22760,Argiope_Transportin,Argiope Transportin,2,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{/*No Info*/},{},{}
 22761,Luciola_Vespa_Transportin,Luciola Vespa Transportin,2,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{/*No Info*/},{},{}
 22762,Centipede_Transportin,Centipede Transportin,2,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{/*No Info*/},{},{}
-22764,Pet_Exchange_Ticket_Box_,Pet Exchange Ticket Box,18,10,,10,,,,,,,,,,,,,{ /*TODO: Confirm the allowed pet_id and chance*/ getitem callfunc("F_Rand",6116,6117,6118,6129,6130,6130,6132,6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143),1; },{},{}
+22764,Pet_Exchange_Ticket_Box_,Pet Exchange Ticket Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ /*TODO: Confirm the allowed pet_id and chance*/ getitem callfunc("F_Rand",6116,6117,6118,6129,6130,6130,6132,6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143),1; },{},{}
 22770,Shark_Skewer,Shark Skewer,0,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{/*No Info*/},{},{}
 22771,Bluefin_Tuna_Skewer,Bluefin Tuna Skewer,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INCATKRATE,5000,30; },{},{}
 22772,Sea_Bream_Skewer,Sea Bream Skewer,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_INCMATKRATE,5000,30; },{},{}
@@ -10956,27 +10981,27 @@
 22774,Salmon_Skewer,Salmon Skewer,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_SPEEDUP0,5000,25; },{},{}
 22775,Eels_Skewer,Eels Skewer,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_DEF_RATE,5000,30; },{},{}
 22776,Carp_Skewer,Carp Skewer,0,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_MDEF_RATE,5000,30; },{},{}
-22777,Gift_Buff_Set,Gift Buff Set,2,10,,100,,,,,,,,,,,,,{ getgroupitem(IG_Gift_Buff_Set); },{},{}
-22781,PC_Bang_Normal_Box,PC Bang Normal Box,2,10,,200,,,,,,,,,,,,,{ getitem 547,20; /*No Info*/},{},{}
-22782,PC_Bang_Wooden_Box,PC Bang Wooden Box,2,10,,200,,,,,,,,,,,,,{ getitem 547,30; /*No Info*/},{},{}
-22783,PC_Bang_Golden_Box,PC Bang Golden Box,2,10,,200,,,,,,,,,,,,,{ getitem 547,1; getitem 985,10; /*No Info*/},{},{}
-22784,PC_Bang_Platinum_Box,PC Bang Platinum Box,2,10,,200,,,,,,,,,,,,,{ getitem 547,1; getitem 12017,10; getitem 678,12; /*No Info*/},{},{}
+22777,Gift_Buff_Set,Gift Buff Set,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Gift_Buff_Set); },{},{}
+22781,PC_Bang_Normal_Box,PC Bang Normal Box,2,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 547,20; /*No Info*/},{},{}
+22782,PC_Bang_Wooden_Box,PC Bang Wooden Box,2,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 547,30; /*No Info*/},{},{}
+22783,PC_Bang_Golden_Box,PC Bang Golden Box,2,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 547,1; getitem 985,10; /*No Info*/},{},{}
+22784,PC_Bang_Platinum_Box,PC Bang Platinum Box,2,10,,200,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 547,1; getitem 12017,10; getitem 678,12; /*No Info*/},{},{}
 22802,Safe_to_6_Equipment_Certificate,Safe to 6 Equipment Certificate,3,10,,10,,,,,,,,,,,,,{},{},{}
 22808,Special_Gift_Box,Special Gift Box,2,10,,100,,,,,,,,,,,,,{},{},{}
-22812,Sealed_Dracula_Scroll,Sealed Dracula Scroll,2,10,,10,,,,,,,,,,,,,{ getitem callfunc("F_Rand",6228,6232,22813,19937,17314, 6635),1; },{},{}
-22813,Bearer's_Shadow_Box,Bearer's Shadow Box,2,10,,10,,,,,,,,,,,,,{ getitem callfunc("F_Rand",24180,24181,24182,24183,24184,24185),1; },{},{}
+22812,Sealed_Dracula_Scroll,Sealed Dracula Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",6228,6232,22813,19937,17314, 6635),1; },{},{}
+22813,Bearer's_Shadow_Box,Bearer's Shadow Box,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",24180,24181,24182,24183,24184,24185),1; },{},{}
 22814,Cat_Hand_Ticket,Cat Hand Ticket,3,10,,0,,,,,,,,,,,,,{},{},{}
 22823,Sealed_Sniper_Scroll,Sealed Sniper Scroll,2,10,,10,,,,,,,,,,,,,{ /*getitem callfunc("F_Rand",4491,6228,6232,24196, Hasty Shadow Armor, 19882, 17474, 6635),1;*/ },{},{}
-22826,Costume_Enchantment_Stone_Box_4,Costume Enchantment Stone Box 4,2,10,,100,,,,,,,,,,,,,{},{},{}
+22826,Costume_Enchantment_Stone_Box_4,Costume Enchantment Stone Box 4,2,10,,10,,,,,,,,,,,,,{},{},{}
 22827,Shadow_Cube,Shadow Cube,2,10,,10,,,,,,,,,,,,,{/*No Info*/},{},{}
-22828,Sealed_Album_Scroll,Sealed Album Scroll,2,10,,100,,,,,,,,,,,,,{ getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1; },{},{}
-22829,Sealed_Card_Album,Sealed Card Album,2,10,,100,,,,,,,,,,,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,4483,4491),1; },{},{}
-22837,Integer_Time,Integer Time,2,10,,50,,,,,,,,,,,,,{ getitem 673,5; },{},{}
-22838,Something_Present_Candy_Holders,Something Present Candy Holders,2,10,,10,,,,,,,,,,,,,{},{},{}
-22842,Sealed_Dracula_Scroll_II,Sealed Dracula Scroll II,2,10,,10,,,,,,,,,,,,,{ getitem callfunc("F_Rand",22846,6228,6232,24223,24227,17474/*, Enchant Letter*/),1; },{},{}
+22828,Sealed_Album_Scroll,Sealed Album Scroll,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1; },{},{}
+22829,Sealed_Card_Album,Sealed Card Album,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,4483,4491),1; },{},{}
+22837,Integer_Time,Integer Time,2,10,,50,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem 673,5; },{},{}
+22838,Something_Candy_Holder,Something Candy Holders,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Something_Candy_Holder); },{},{}
+22842,Sealed_Dracula_Scroll_II,Sealed Dracula Scroll II,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",22846,6228,6232,24223,24227,17474/*, Enchant Letter*/),1; },{},{}
 22843,Superstar_Snack,Superstar Snack,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus bAtk2,50; bonus bMatk,50; }",300; },{},{}
 22844,Sealed_Dracula_Card_Album,Sealed Dracula Card Album,2,10,,10,,,,,,,,,,,,,{/*No Info*/},{},{}
-22845,Sealed_Fortune_Egg,Sealed Fortune Egg,2,10,,10,,,,,,,,,,,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,22846),1; },{},{}
+22845,Sealed_Fortune_Egg,Sealed Fortune Egg,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,22846),1; },{},{}
 22846,Sealed_Dracula_Card_,Sealed Dracula Card,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus2 bSPDrainRate,50,5; }",300; },{},{}
 22847,Prontera_Medal,Prontera Medal,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prontera",0,0; /*No coord info*/ },{},{}
 22848,Prison_Key,Prison Key,2,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "prt_prison",0,0; /*No coord info*/ },{},{}
@@ -11016,6 +11041,13 @@
 22901,Question_Old_Blue_Box,Question Old Blue Box,2,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ /*No info yet*/ },{},{}
 22902,Sealed_Card_Album_Scroll_II,Sealed Card Album Scroll II,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem callfunc("F_Rand",6238,6239,17474,22829,24243,24244,24245),1; },{},{}
 22985,Basil,Basil,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "{ bonus2 bSPRegenRate,5,10000; }",180,1,0,SI_DORAM_BUF_02; },{},{}
+//
+23177,Kafra_Card_,Kafra Card,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashStore"; },{},{}
+23191,Varetyr_Spear_Scroll_1_5,Level 5 Varetyr Spear,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "SO_VARETYR_SPEAR",5; },{},{}
+23192,Diamond_Dust_Scroll_1_5,Level 5 Diamond Dust,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "SO_DIAMONDDUST",5; },{},{}
+23193,Crimson_Rock_Scroll_1_5,Level 5 Crimson Rock,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_CRIMSONROCK",5; },{},{}
+23194,Sienna_Execrate_Scroll_1_5,Level 5 Sienna Execrate,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_SIENNAEXECRATE",5,true; },{},{}
+23196,Shining_Blue_Lucky_Egg,Shining Blue Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Shining_Blue_Lucky_Egg); },{},{}
 //===================================================================
 // Shadow Equipments
 //===================================================================
@@ -11274,6 +11306,9 @@
 25148,Cute_Starved_Demon_Doll,Cute Starved Demon Doll,3,0,,0,,,,,,,,,,,,,{},{},{}
 25149,Doll_With_Warm_Scarf,Doll With Warm Scarf,3,0,,0,,,,,,,,,,,,,{},{},{}
 25150,Hugging_Alice_Pilow,Hugging Alice Pilow,3,0,,0,,,,,,,,,,,,,{},{},{}
+25223,Para_Team_Coin,Eden Group Coin,3,0,,0,,,,,,,,,,,,,{},{},{}
+25238,New_Normal_Lubricant,New Normal Lubricant,3,0,,0,,,,,,,,,,,,,{},{},{}
+25239,New_Advanced_Lubricant,New Advanced Lubricant,3,0,,0,,,,,,,,,,,,,{},{},{}
 //
 26100,Paradise_Foxtail_Staff_II,Eden Group Foxtail Staff II,5,20,,0,135:165,,1,0,0x80000000,7,2,2,2,40,0,10,{ bonus bDex,4; bonus bInt,4; bonus bLongAtkRate,6; },{},{}
 26101,Paradise_Foxtail_Staff_III,Eden Group Foxtail Staff III,5,20,,0,150:195,,1,0,0x80000000,7,2,2,3,60,0,10,{ bonus bDex,5; bonus bInt,5; bonus bLongAtkRate,7; },{},{}
@@ -11334,8 +11369,8 @@
 28381,Cute_Grass_Necklace,Cute Grass Necklace,4,20,,10,,0,,1,0x80000000,7,2,136,,100,0,,{ bonus bHealPower,5; bonus2 bSkillCooldown,"SU_TUNAPARTY",-7000; },{},{}
 28382,Charm_Grass_Necklace,Charm Grass Necklace,4,20,,10,,0,,1,0x80000000,7,2,136,,100,0,,{ bonus bMdef,5; bonus2 bVariableCastrate,"SU_CN_METEOR",-1000; },{},{}
 28386,Fallen_Monk_Rosary,Fallen Monk Rosary,4,0,,100,,,,1,0xFFFFFFFF,63,2,136,1,20,0,,{ bonus bAspdRate,5; bonus bCritical,5; bonus2 bSkillUseSP,"CH_SOULCOLLECT",-5; if (BaseLevel > 14) bonus2 bSkillAtk,"SR_DRAGONCOMBO",BaseLevel/15; if (BaseLevel > 19) bonus2 bSkillAtk,"SR_KNUCKLEARROW",BaseLevel/20; if (BaseLevel > 29) bonus2 bSkillAtk,"SR_SKYNETBLOW",BaseLevel/30; },{},{}
-28410,Sapphire_Wrist,Sapphire Wrist,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,1,50,1,,{ bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv(478); /*CR_SLIMPITCHER*/ bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
-28411,Emerald_Earring,Emerald Earring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,1,50,1,,{ bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv(2413); /*WM_METALICSOUND*/ bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
+28410,Sapphire_Wrist,Sapphire Wrist,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,1,50,1,,{ bonus bDex,5; bonus bLuk,5; bonus bInt,5; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",BaseLevel/5; bonus2 bVariableCastrate,"CR_ACIDDEMONSTRATION",-(BaseLevel/4); .@n = getskilllv("CR_SLIMPITCHER"); bonus bDex,.@n/2; bonus bLuk,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
+28411,Emerald_Earring,Emerald Earring,4,0,,500,,3,,1,0xFFFFFFFF,63,2,136,1,50,1,,{ bonus bDex,5; bonus bAgi,5; bonus bInt,5; bonus2 bSkillAtk,"CG_ARROWVULCAN",BaseLevel; bonus2 bSkillAtk,"BA_MUSICALSTRIKE",BaseLevel; bonus2 bSkillAtk,"DC_THROWARROW",BaseLevel; bonus2 bSkillAtk,"WM_METALICSOUND",2*(BaseLevel/5); .@n = getskilllv("WM_METALICSOUND"); bonus2 bVariableCastrate,"WM_METALICSOUND",.@n/2; bonus bDex,.@n/2; bonus bAgi,.@n/2; bonus bInt,.@n/2; bonus bMatk,(.@n/2)*20; },{},{}
 28413,Lesser_Mackerel_Talisman,Lesser Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,100,,,{ bonus bVit,1; },{},{}
 28414,Intermediate_Mackerel_Talisman,Intermediate Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,140,,,{ bonus bVit,2; },{},{}
 28415,Greater_Mackerel_Talisman,Greater Mackerel Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,175,,,{ bonus bVit,3; },{},{}
@@ -11348,6 +11383,37 @@
 28422,Shiny_Branch_Talisman,Shiny Branch Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,100,,,{ bonus2 bVariableCastrate,"SU_SV_STEMSPEAR",-50; bonus2 bSkillAtk,"SU_SV_STEMSPEAR",(readparam(bInt)/2)+(20 * getskilllv("SU_SV_STEMSPEAR")); /* Need to confirm damage formula */ },{},{}
 28423,Fresh_Tuna_Talisman,Fresh Tuna Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,100,,,{ bonus2 bSkillCooldown,"SU_TUNAPARTY",-5000; bonus3 bAutoSpellWhenHit,"SU_TUNAPARTY",max(1,getskilllv("SU_TUNAPARTY")),10; },{},{}
 28424,Chubby_Worm_Talisman,Chubby Worm Talisman,4,0,,100,,1,,1,0x80000000,63,2,136,,100,,,{ bonus2 bVariableCastrate,"SU_PICKYPECK",-50; bonus2 bSkillAtk,"SU_PICKYPECK",(readparam(bDex)/2)+(20 * getskilllv("SU_PICKYPECK")); /* Need to confirm damage formula */ },{},{}
+28443,Para_Team_Str_Ring100,Awakened Eden Group Ring of Strength I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bAtkRate,2; },{},{}
+28444,Para_Team_Str_Necklace100,Awakened Eden Group Necklace of Strength I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bStr,1; },{},{}
+28445,Para_Team_Str_Ring115,Awakened Eden Group Ring of Strength II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bAtkRate,3; },{},{}
+28446,Para_Team_Str_Necklace115,Awakened Eden Group Necklace of Strength II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bStr,2; },{},{}
+28447,Para_Team_Str_Ring130,Awakened Eden Group Ring of Strength III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bAtkRate,4; },{},{}
+28448,Para_Team_Str_Necklace130,Awakened Eden Group Necklace of Strength III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bStr,3; },{},{}
+28449,Para_Team_Str_Ring145,Awakened Eden Group Ring of Strength IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bAtkRate,5; },{},{}
+28450,Para_Team_Str_Necklace145,Awakened Eden Group Necklace of Strength IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bStr,4; },{},{}
+28451,Para_Team_Str_Ring160,Awakened Eden Group Ring of Strength V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bAtkRate,5; skill "AL_HEAL",1; },{},{}
+28452,Para_Team_Str_Necklace160,Awakened Eden Group Necklace of Strength V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bStr,4; skill "AL_TELEPORT",1; },{},{}
+28453,Para_Team_Magic_Ring100,Awakened Eden Group Ring of Magic I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bMatkRate,2; },{},{}
+28454,Para_Team_Magic_Necklace100,Awakened Eden Group Necklace of Magic I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bInt,1; },{},{}
+28455,Para_Team_Magic_Ring115,Awakened Eden Group Ring of Magic II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bMatkRate,3; },{},{}
+28456,Para_Team_Magic_Necklace115,Awakened Eden Group Necklace of Magic II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bInt,2; },{},{}
+28457,Para_Team_Magic_Ring130,Awakened Eden Group Ring of Magic III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bMatkRate,4; },{},{}
+28458,Para_Team_Magic_Necklace130,Awakened Eden Group Necklace of Magic III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bInt,3; },{},{}
+28459,Para_Team_Magic_Ring145,Awakened Eden Group Ring of Magic IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bMatkRate,5; },{},{}
+28460,Para_Team_Magic_Necklace145,Awakened Eden Group Necklace of Magic IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bInt,4; },{},{}
+28461,Para_Team_Magic_Ring160,Awakened Eden Group Ring of Magic V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bMatkRate,5; skill "AL_HEAL",1; },{},{}
+28462,Para_Team_Magic_Necklace160,Awakened Eden Group Necklace of Magic V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bInt,4; skill "AL_TELEPORT",1; },{},{}
+28463,Para_Team_Agi_Ring100,Awakened Eden Group Ring of Agility I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bLongAtkRate,1; },{},{}
+28464,Para_Team_Agi_Necklace100,Awakened Eden Group Necklace of Agility I,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,100,,,{ bonus bDex,1; },{},{}
+28465,Para_Team_Agi_Ring115,Awakened Eden Group Ring of Agility II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bLongAtkRate,2; },{},{}
+28466,Para_Team_Agi_Necklace115,Awakened Eden Group Necklace of Agility II,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,115,,,{ bonus bDex,2; },{},{}
+28467,Para_Team_Agi_Ring130,Awakened Eden Group Ring of Agility III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bLongAtkRate,3; },{},{}
+28468,Para_Team_Agi_Necklace130,Awakened Eden Group Necklace of Agility III,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bDex,3; },{},{}
+28469,Para_Team_Agi_Ring145,Awakened Eden Group Ring of Agility IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bLongAtkRate,4; },{},{}
+28470,Para_Team_Agi_Necklace145,Awakened Eden Group Necklace of Agility IV,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,145,,,{ bonus bDex,4; },{},{}
+28471,Para_Team_Agi_Ring160,Awakened Eden Group Ring of Agility V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bLongAtkRate,4; skill "AL_HEAL",1; },{},{}
+28472,Para_Team_Agi_Necklace160,Awakened Eden Group Necklace of Agility V,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,160,,,{ bonus bDex,4; skill "AL_TELEPORT",1; },{},{}
+28483,Royal_Guardian_Ring,Royal Guardian Ring,4,0,,10,,1,,1,0xFFFFFFFF,63,2,136,,99,,,{ .@b = min(BaseLevel/25,7); bonus bMaxHPrate,.@b; bonus bMaxSPrate,.@b; },{},{}
 28600,Blue_Book,Blue Book,5,10,,500,160,,1,1,0x00000100,56,2,2,3,100,1,15,{ bonus bAgi,5; bonus bDex,5; },{},{}
 28601,Ru_Gold_Book,Ru Gold Book,5,0,,500,160,,1,2,0x00000008,63,2,2,3,120,1,15,{ bonus bVit,8; bonus bInt,8; },{},{}
 28602,Demon_Hunting_Bible,Demon Hunting Bible,5,0,,500,30:170,,1,2,0x00000008,63,2,2,3,110,1,15,{ bonus bInt,2; bonus bDex,2; .@b = readparam(bInt); bonus2 bSkillAtk,"PR_MAGNUS",30+min(.@b,120); },{},{}
@@ -11504,5 +11570,16 @@
 31088,C_Mad_Hatter,Costume Mad Hatter,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1421,{},{},{}
 31089,C_Exploding_Crimson_Flame,Costume Exploding Crimson Flame,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,0,1500,{},{},{}
 31090,C_Angelring_Hat,Costume Angelring Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,348,{},{},{}
+31092,C_Rabbit_Ribbon_Hat,Costume Bunny Ribbon Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,845,{},{},{}
 31093,C_Under_Lamp,Costume Under Lamp,4,0,,0,,,,0,0xFFFFFFFF,63,2,4096,,1,0,1531,{},{},{}
+31095,C_JP_EV01,Costume Mythical Baphomet Horns,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1532,{},{},{}
+31096,C_JP_EV02,Costume Dog Ears of Bau Alma,4,0,,0,,,,0,0xFFFFFFFF,63,2,2048,,1,0,1533,{},{},{}
+31097,C_JP_EV03,Costume Bunny Ears of Minnie Doe Alma,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1534,{},{},{}
+31098,C_JP_EV04,Costume Fox Ears of Tamamo Loa,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1535,{},{},{}
+31099,C_JP_EV05,Costume Headdress of Ontama Aria,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1536,{},{},{}
+31100,C_JP_EV06,Costume Hat of Dumpty Alma,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1537,{},{},{}
+31101,C_JP_EV07,Costume Taini Hat Blue,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1538,{},{},{}
+31102,C_JP_EV08,Costume Taini Hat Orange,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1539,{},{},{}
+31103,C_JP_EV09,Costume Taini Hat Green,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1540,{},{},{}
+31104,C_Taini_Hat,Costume Taini Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,722,{},{},{}
 31105,C_RO_Celebration_Hat,Costume RO Celebration Hat,4,0,,0,,,,0,0xFFFFFFFF,63,2,1024,,1,0,1541,{},{},{}

db/re/item_flag.txt

@@ -363,6 +363,7 @@
 17143,2 //Ms_Scorpio_Scroll
 17156,2 //TCG_Card_Scroll
 17165,2 //Challenge_Kit
+17204,2 // Shining_Egg
 17209,2 //Tw_Rainbow_Scroll
 17210,2 //Tw_Red_Scroll
 17211,2 //Tw_Orange_Scroll
@@ -424,6 +425,7 @@
 22558,2 //Lucky_Bag
 22669,2 //HALLOWEEN_G_BOX
 22685,2 //Solo_Christmas_Gift
+23196,2 // Shining_Blue_Lucky_Egg
 
 // GUID
 12900,4 //Battle_Manual_Box
@@ -1689,6 +1691,7 @@
 17181,4 //Jan_Groove_Box
 17184,4 //3rd_Test_Pass_Box
 17203,4 //Free_Pass_Box
+17204,4 // Shining_Egg
 17207,4 //Idn_Heart_Scroll
 17209,4 //Tw_Rainbow_Scroll
 17210,4 //Tw_Red_Scroll
@@ -1764,6 +1767,7 @@
 //17330,4 //Fashion_Costume_Box4
 //17335,4 //Mysterious_Ingredient_B
 22558,4 //Lucky_Bag
+23196,4 // Shining_Blue_Lucky_Egg
 
 // Special Broadcast
 7782,16 //Gold_Key77

db/re/item_package.txt

@@ -4344,3 +4344,82 @@ IG_Mystical_Costume_Scroll,19615,1,1,1,0 // 1x C_Loki_Mask
 IG_Mystical_Costume_Scroll,20216,1,1,1,0 // 1x C_Rideword_Hat
 IG_Mystical_Costume_Scroll,20213,1,1,1,0 // 1x C_Sirt_Evil_Eye
 IG_Mystical_Costume_Scroll,20218,1,1,1,0 // 1x C_Spell_Circuit
+
+IG_Ink_Ball,603,66,1 // 1x Old Blue Box
+IG_Ink_Ball,616,66,1 // 1x Old Card Album
+IG_Ink_Ball,617,66,1 // 1x Old Purple Box
+IG_Ink_Ball,644,1333,1 // 1x Gift Box
+IG_Ink_Ball,717,666,1 // 1x Blue Gemstone
+IG_Ink_Ball,909,2666,1 // 1x Jellopy
+IG_Ink_Ball,991,1333,1 // 1x Crystal Blue
+IG_Ink_Ball,7126,1333,1 // 1x Large Jellopy
+IG_Ink_Ball,7444,399,1 // 1x Treasure Box
+IG_Ink_Ball,12106,66,1 // 1x Jewelry Box
+IG_Ink_Ball,12107,66,1 // 1x Wrapped Mask
+IG_Ink_Ball,12110,333,1 // 1x First Aid Kit
+IG_Ink_Ball,12111,666,1 // 1x Bundle of Food
+IG_Ink_Ball,12194,933,1 // 1x Hometown Gift
+
+IG_Something_Candy_Holder,517,5,5 // 5x Meat
+IG_Something_Candy_Holder,518,9,3 // 3x Honey
+IG_Something_Candy_Holder,529,9,7 // 7x Candy
+IG_Something_Candy_Holder,538,10,2 // 2x Well-baked Cookie
+IG_Something_Candy_Holder,539,10,1 // 1x Piece of Cake
+IG_Something_Candy_Holder,580,5,3 // 3x Bread
+IG_Something_Candy_Holder,603,2,1 // 1x Old Blue Box
+IG_Something_Candy_Holder,607,2,1 // 1x Yggdrasilberry
+IG_Something_Candy_Holder,616,1,1 // 1x Old Card Album
+IG_Something_Candy_Holder,617,1,1 // 1x Old Purple Box
+IG_Something_Candy_Holder,11550,7,1 // 1x Pumpkin Cake
+IG_Something_Candy_Holder,11592,6,3 // 3x Trans Candy Red
+IG_Something_Candy_Holder,11593,6,3 // 3x Trans Candy Blue
+IG_Something_Candy_Holder,11594,6,3 // 3x Trans Candy Yellow
+IG_Something_Candy_Holder,11595,6,3 // 3x Trans Candy Green
+IG_Something_Candy_Holder,12192,7,3 // 3x Pumpkin Pie
+IG_Something_Candy_Holder,20183,1,1 // 1x Costume: Floating Ghost
+IG_Something_Candy_Holder,22067,1,1 // 1x Witch Shoes
+IG_Something_Candy_Holder,22669,5,1 // 1x October Spooky Trade Box
+IG_Something_Candy_Holder,22670,1,1 // 1x DARK INVITATION
+
+//! TODO: Confirm the rates
+IG_Shining_Egg,4302,1,1,1,1 // 1x Tao_Gunka_Card
+IG_Shining_Egg,5374,1,1,1,1 // 1x L_Magestic_Goat
+IG_Shining_Egg,5254,1,1,1,1 // 1x Deviling_Hat
+IG_Shining_Egg,5474,1,1,1,1 // 1x Notice_Board
+IG_Shining_Egg,2554,1,1,1,1 // 1x Piece_Of_Angent_Skin
+IG_Shining_Egg,6438,1,1,1,0 // 1x Blessed_Weapon_Ore
+IG_Shining_Egg,6439,1,1,1,0 // 1x Blessed_Armor_Ore
+IG_Shining_Egg,12246,1,1,1,0 // 1x Magic_Card_Album
+IG_Shining_Egg,12909,1,1,1,0 // 1x Kafra_Card_Box
+IG_Shining_Egg,12922,1,1,1,0 // 1x Token_Of_Siegfried_Box
+IG_Shining_Egg,14159,1,1,1,0 // 1x F_Str_Dish_Box
+IG_Shining_Egg,14232,1,1,1,0 // 1x Yggdrasilberry_Box_
+IG_Shining_Egg,12910,1,1,1,0 // 1x Giant_Fly_Wing_Box
+IG_Shining_Egg,12361,1,1,1,0 // 1x Delicious_Shaved_Ice
+IG_Shining_Egg,12259,1,1,1,0 // 1x Miracle_Medicine
+IG_Shining_Egg,17001,1,1,1,0 // 1x Wander_Man_Box10
+
+//! TODO: Confirm the rates
+IG_Shining_Blue_Lucky_Egg,4365,1,1,1,1 // 1x B_Katrinn_Card
+IG_Shining_Blue_Lucky_Egg,4534,1,1,1,1 // 1x Giant_Octopus_Card
+IG_Shining_Blue_Lucky_Egg,4525,1,1,1,1 // 1x Kraken_Card
+IG_Shining_Blue_Lucky_Egg,4493,1,1,1,1 // 1x Sealed_Tao_Card
+IG_Shining_Blue_Lucky_Egg,6239,1,1,1,1 // 1x Guarantee_Armor_11Up
+IG_Shining_Blue_Lucky_Egg,6238,1,1,1,1 // 1x Guarantee_Weapon_11Up
+IG_Shining_Blue_Lucky_Egg,6232,1,1,1,1 // 1x Guarantee_Armor_9Up
+IG_Shining_Blue_Lucky_Egg,6228,1,1,1,1 // 1x Guarantee_Weapon_9Up
+IG_Shining_Blue_Lucky_Egg,22106,1,1,1,1 // 1x Giant_Boots
+IG_Shining_Blue_Lucky_Egg,19139,1,1,1,1 // 1x Survive_Orb
+IG_Shining_Blue_Lucky_Egg,20815,1,1,1,1 // 1x Seraphim_Robe
+IG_Shining_Blue_Lucky_Egg,19140,1,1,1,1 // 1x Squirrel_Ear_Hat
+IG_Shining_Blue_Lucky_Egg,6233,1,1,1,1 // 1x Guarantee_Armor_8Up
+IG_Shining_Blue_Lucky_Egg,6229,1,1,1,1 // 1x Guarantee_Weapon_8Up
+IG_Shining_Blue_Lucky_Egg,6438,1,3,1,0 // 3x Blessed_Weapon_Ore
+IG_Shining_Blue_Lucky_Egg,6439,1,3,1,0 // 3x Blessed_Armor_Ore
+IG_Shining_Blue_Lucky_Egg,17315,1,1,1,0 // 1x Lucky Silvervine Fruit Box(10)
+IG_Shining_Blue_Lucky_Egg,14620,1,20,1,0 // 20x DEX Biscuit Stick
+IG_Shining_Blue_Lucky_Egg,14621,1,20,1,0 // 20x LUK Biscuit Stick
+IG_Shining_Blue_Lucky_Egg,14616,1,20,1,0 // 20x STR Biscuit Stick
+IG_Shining_Blue_Lucky_Egg,14617,1,20,1,0 // 20x VIT Biscuit Stick
+IG_Shining_Blue_Lucky_Egg,14619,1,20,1,0 // 20x INT Biscuit Stick
+IG_Shining_Blue_Lucky_Egg,14618,1,20,1,0 // 20x AGI Biscuit Stick

db/re/item_trade.txt

@@ -3485,6 +3485,7 @@
 //17200,475,100	//
 //17201,475,100	//
 //17202,475,100	//
+17204,475,100	// Shining_Egg
 //17205,475,100	//
 //17206,475,100	//
 //17224,475,100	//
@@ -3857,6 +3858,8 @@
 //22950,475,100	//
 //22951,475,100	//
 //22952,475,100	//
+23177,475,100	// Kafra_Card_
+23196,475,100	// Shining_Blue_Lucky_Egg
 25132,499,100	// Pumpkin_Deco
 25133,499,100	// Dried_White_Stem
 25143,499,100	// Gift_Stuffed_Doll

db/re/mob_db.txt

@@ -1631,15 +1631,15 @@
 2475,MG_CORRUPTION_ROOT,Root of Corruption,Root of Corruption,136,3190000,1,240120,187920,3,710,1762,213,123,86,89,120,131,101,92,14,12,2,7,62,0x6280084,170,854,2016,480,120060,607,5500,608,3500,732,5500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4603,1
 2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x6283695,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4601,1
 
-//2477,NG_WANDER_MAN
-//2478,NG_RIDEWORD
-//2479,NG_MIMIC
-//2480,NG_EVIL_DRUID
-//2481,NG_WRAITH_DEAD
+2477,NG_WANDER_MAN,Nightmare Wander Man,Nightmare Wander Man,151,130682,1,19814,17228,2,2827,3045,129,16,208,151,76,39,231,50,12,12,1,6,24,0x2003695,100,672,500,192,0,0,0,0,0,0,0,7005,4850,616,2,13015,5,2270,5,21003,1,984,110,1164,10,0,0,0,0,0,0
+2478,NG_RIDEWORD,Nightmare Rideword,Nightmare Rideword,146,103220,1,10500,15840,1,2320,2486,140,59,131,195,58,66,263,5,12,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,1097,4850,1568,5,1569,5,1570,5,1571,5,7015,150,18752,1,0,0,0,0,0,0
+2479,NG_MIMIC,Nightmare Mimic,Nightmare Mimic,143,24958,1,2768,2354,1,1787,1946,139,46,145,162,10,49,213,57,10,12,1,0,60,0x3095,100,972,500,288,0,0,0,0,0,0,0,617,10,603,50,7940,1000,7938,1000,2626,10,757,270,0,0,0,0,0,0,0,0
+2480,NG_EVIL_DRUID,Nightmare Evil Druid,Nightmare Evil Druid,134,72837,1,6740,5886,1,1409,1552,160,41,137,60,48,57,158,28,10,12,2,1,89,0x3695,300,2276,576,336,0,0,0,0,0,0,0,2217,10,1624,1,2508,10,1557,5,7478,5,509,2000,0,0,0,0,0,0,0,0
+2481,NG_WRAITH_DEAD,Nightmare Wraith Dead,Nightmare Wraith Dead,110,15579,1,2554,2760,1,761,883,93,56,69,52,47,55,109,28,10,12,2,1,89,0x3695,175,1816,576,240,0,0,0,0,0,0,0,1059,4400,2206,10,2506,5,716,750,2505,10,732,10,0,0,0,0,0,0,0,0
 //2482,G_MG_KHALITZBURG
-//2483,NG_BAPHOMET
-//2484,G_NG_BAPHOMET_
-//2485,NG_CHIMERA
+2483,NG_BAPHOMET,Nightmare Baphomet,Nightmare Baphomet,154,4008000,1,1308530,1002320,1,2794,4054,379,45,120,125,230,85,186,85,10,12,2,6,67,0x6283695,100,768,768,576,198262,607,2000,750,500,923,5000,1466,500,2256,300,1476,50,714,500,5160,10,985,5432,984,4171,0,0,0,0,4147,1
+2484,G_NG_BAPHOMET_,Nightmare Baphomet Jr.,Nightmare Baphomet Jr.,141,49675,1,13085,10023,1,1302,1860,175,62,52,60,90,40,52,25,10,12,0,6,27,0x3695,100,868,480,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2485,NG_CHIMERA,Nightmare Chimera,Nightmare Chimera,140,528120,1,54260,46980,1,1887,2710,159,20,101,76,110,176,182,170,10,12,2,2,63,0x2003695,200,772,672,360,0,0,0,0,0,0,0,7054,5335,1048,2500,568,1000,1306,1,7295,1500,1364,1,984,160,0,0,0,0,4300,1
 //2486,ISIS_ANNIV
 //2487,PASANA_ANNIV
 //2488,OSIRIS_ANNIV
@@ -2070,14 +2070,14 @@
 2913,C3_ACIDUS_,Acidus Ringleader,Acidus Ringleader,130,203590,203590,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1
 //2914,E_GEFFEN_MAGE_3_1
 //2915,HIDDEN_MOB6
-//2916,BIG_BEN
-//2917,BIG_BELL
-//2918,TIME_KEEPER
-//2919,NEO_PUNK
-//2920,ARC_ELDER
-//2921,OWL_VISCOUNT
-//2922,G_OWL_VISCOUNT
-//2923,OWL_MARQUEES
+2916,BIG_BEN,Big Ben,Big Ben,150,220240,1,7447,7005,1,3101,3313,125,43,102,58,69,75,131,49,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,1095,3000,1019,500,509,950,568,160,757,100,22515,15,22515,15,0,0,0,0,4626,1
+2917,BIG_BELL,Big Bell,Big Bell,163,166860,1,7513,8457,1,4785,4977,138,53,102,104,72,57,98,57,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,1095,3000,2607,1,7005,750,984,100,912,750,22515,10,0,0,0,0,0,0,4627,1
+2918,TIME_KEEPER,Time Keeper,Time Keeper,155,256000,1,7898,8869,3,2989,3269,128,60,112,60,72,57,120,77,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,1095,3000,7054,3000,999,250,520,425,2109,1,22515,1000,22515,1000,0,0,0,0,4630,1
+2919,NEO_PUNK,Neo Punk,Neo Punk,155,154760,1,5874,6618,1,2051,2267,99,55,98,39,30,35,95,45,10,12,0,3,24,0x3095,300,1500,500,1000,0,0,0,0,0,0,0,7001,3000,715,500,1061,500,1057,1500,2502,8,5110,50,0,0,0,0,0,0,4628,1
+2920,ARC_ELDER,Arc Elder,Arc Elder,168,293640,1,9086,17532,3,2513,3315,105,41,100,63,35,99,106,61,10,12,2,7,80,0x3885,165,1552,1152,336,0,0,0,0,0,0,0,7099,3000,7117,1000,1564,5,1473,1,616,2,22515,1500,7939,500,0,0,0,0,4629,1
+2921,OWL_VISCOUNT,Owl Viscount,Owl Viscount,168,295240,1,9086,11089,1,4368,5268,113,45,87,51,45,88,106,50,10,12,2,6,60,0x6203695,195,1345,824,440,0,0,0,0,0,0,0,7071,2500,7063,1000,18874,1,747,1,2971,2,16024,1,15089,1,0,0,0,0,4631,1
+2922,G_OWL_VISCOUNT,Owl Viscount,Owl Viscount,168,295240,1,0,0,1,4368,5268,113,45,87,51,45,88,106,50,10,12,2,6,60,0x6203695,195,1345,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2923,OWL_MARQUEES,Owl Marquis,Owl Marquis,170,630000,1,21747,13806,2,1887,2490,127,25,112,65,55,102,108,72,10,12,2,6,60,0x6203695,175,1345,824,440,0,0,0,0,0,0,0,7071,2000,7063,1500,1716,1,1472,1,15089,3,1668,1,18874,1,0,0,0,0,4632,1
 2924,T_ELDER_WILOW,Elder Willow,Elder Willow,34,599,1,116,131,1,80,14,45,0,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,6067,500,7406,500,7407,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2925,T_WILOW,Willow,Willow,8,91,1,31,23,1,13,5,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,6065,500,6066,500,6067,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2926,T_HARPY,Harpy,Harpy,83,4423,1,660,760,1,340,41,69,44,71,39,50,31,125,12,10,12,1,6,64,0x3885,155,972,672,470,0,0,0,0,0,0,0,7406,500,7407,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -2228,7 +2228,7 @@
 //3071,PERE3
 //3072,PERE4
 //3073,GRAND_PERE
-//3074,TIMEHOLDER
+3074,TIMEHOLDER,Time Holder,Time Holder,170,25000000,1,2291250,1938750,1,5250,7350,288,265,224,152,251,257,402,77,10,12,2,6,80,0x6283695,100,398,384,288,2291250,0,0,0,0,0,0,1095,3000,2121,10,7054,3000,22515,3000,18874,20,16024,5,15089,3,0,0,0,0,4625,1
 //3075,WA_TREASURE
 //3076,WA_MONSTER_1
 //3077,WA_MONSTER_2
@@ -2812,5 +2812,23 @@
 //
 //3656,B_THE_PAPER
 //3657,B_THE_PAPER2
-//
+//3658,MD_LICH_LORD_100
+//3659,MD_LICH_LORD_160
+//3660,MD_NIGHTMARE_100
+//3661,MD_NIGHTMARE_160
+//3662,MD_JAKK_100
+//3663,MD_JAKK_160
+//3664,MD_GHOUL_100
+//3665,MD_GHOUL_160
+//3666,MD_DRAINLIAR_100
+//3667,MD_DRAINLIAR_160
 //3668,B_KIEL_
+//3721,QE_PORING
+//3722,QE_POPORING
+//3723,QE_DROPS
+//3724,QE_LUNATIC
+//3725,QE_WILOW
+//3726,QE_PICKY
+//3727,QE_PICKY_
+//3728,QE_ZOMBIE
+//3729,QE_POISON_SPORE

db/re/mob_skill_db.txt

@@ -2937,7 +2937,7 @@
 1639,Kathryne Keyron@MG_COLDBOLT,chase,14,10,3000,1000,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,attack,17,44,3000,500,10000,no,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBALL,chase,17,44,3000,500,10000,no,target,always,0,,,,,,,
-1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1639,Kathryne Keyron@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@WZ_QUAGMIRE,chase,92,5,3000,0,10000,yes,target,always,0,,,,,,,
 1639,Kathryne Keyron@MG_SAFETYWALL,attack,12,10,3000,0,10000,yes,self,always,0,,,,,,,
 1639,Kathryne Keyron@MG_FIREBOLT,chase,19,10,3000,1000,10000,no,target,always,0,,,,,,,
@@ -3649,7 +3649,7 @@
 1705,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1705,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1705,Thanatos Despero@KN_BOWLINGBASH,attack,62,4,1000,0,10000,yes,target,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1705,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -3715,7 +3715,7 @@
 1710,Thanatos Despero@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_STUNATTACK,attack,179,4,1000,0,5000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_TELEKINESISATTACK,attack,191,5,500,0,5000,yes,target,always,0,,,,,,21,
-1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,20,1000,0,10000,yes,target,attackpcge,2,,,,,,,
+1710,Thanatos Despero@WZ_SIGHTRASHER,attack,81,10,1000,0,10000,yes,target,attackpcge,2,,,,,,,
 //1710,Thanatos Despero@KN_BOWLINGBASH,attack,62,5,1000,0,10000,yes,target,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,1000,0,60000,yes,self,always,0,,,,,,,
 1710,Thanatos Despero@NPC_AGIUP,attack,350,5,2000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -4091,7 +4091,7 @@
 1768,Gloom Under Night@NPC_POWERUP,attack,349,5,2000,700,50000,no,self,always,0,,,,,,,
 1768,Gloom Under Night@NPC_FIREBREATH,chase,654,10,2000,500,10000,no,target,myhpltmaxrate,80,,,,,,,
 1768,Gloom Under Night@SM_MAGNUM,attack,7,25,10000,0,5000,yes,self,attackpcge,2,,,,,,,
-1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,20,2000,0,5000,yes,self,always,0,,,,,,,
+1768,Gloom Under Night@WZ_SIGHTRASHER,attack,81,10,2000,0,5000,yes,self,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,attack,17,44,1000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@MG_FIREBALL,chase,17,44,10000,500,20000,no,target,always,0,,,,,,,
 1768,Gloom Under Night@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -4523,7 +4523,7 @@
 1833,Kasa@MG_FIREBALL,idle,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,chase,17,44,10000,500,10000,no,target,always,0,,,,,,,
 1833,Kasa@MG_FIREBALL,attack,17,44,5000,500,10000,no,target,always,0,,,,,,,
-1833,Kasa@WZ_SIGHTRASHER,attack,81,20,1000,0,20000,yes,self,always,0,,,,,,,
+1833,Kasa@WZ_SIGHTRASHER,attack,81,10,1000,0,20000,yes,self,always,0,,,,,,,
 1833,Kasa@LK_SPIRALPIERCE,attack,397,1,1500,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,chase,83,1,5000,1000,10000,no,target,always,0,,,,,,,
 1833,Kasa@WZ_METEOR,attack,83,1,5000,1000,10000,no,target,always,0,,,,,,,
@@ -4567,7 +4567,7 @@
 1837,Imp@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,,
 1837,Imp@NPC_PULSESTRIKE,attack,661,3,1000,1000,5000,no,self,always,0,,,,,,,
 1837,Imp@MG_SIGHT,idle,10,1,500,0,5000,yes,self,always,0,,,,,,,
-1837,Imp@WZ_SIGHTRASHER,attack,81,20,3000,0,10000,yes,self,always,0,,,,,,,
+1837,Imp@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,yes,self,always,0,,,,,,,
 1837,Imp@RG_STRIPARMOR,attack,217,1,2000,0,5000,yes,target,always,0,,,,,,29,
 1838,Knocker@HT_LANDMINE,idle,116,2,4000,1000,18000,yes,around2,always,0,,,,,,5,
 1838,Knocker@NPC_GROUNDATTACK,attack,185,2,2000,0,5000,yes,target,always,0,,,,,,,
@@ -6105,7 +6105,7 @@
 2103,Ktullanux@MG_FROSTDIVER,idle,15,40,5000,1000,7000,no,target,always,0,,,,,,,
 2103,Ktullanux@MG_FROSTDIVER,chase,15,40,5000,1000,7000,no,target,always,0,,,,,,,
 2103,Ktullanux@WZ_STORMGUST,chase,89,10,5000,1000,20000,no,target,always,0,,,,,,,
-2103,Ktullanux@WZ_STORMGUST,attack,89,11,5000,1000,20000,no,target,always,0,,,,,,,
+2103,Ktullanux@WZ_STORMGUST,attack,89,10,5000,1000,20000,no,target,always,0,,,,,,,
 2103,Ktullanux@WZ_WATERBALL,chase,86,10,5000,0,20000,yes,target,always,0,,,,,,,
 2103,Ktullanux@WZ_WATERBALL,attack,86,10,5000,0,20000,yes,target,always,0,,,,,,,
 2103,Ktullanux@WZ_FROSTNOVA,chase,88,10,5000,0,20000,yes,self,always,0,,,,,,,
@@ -6202,7 +6202,7 @@
 2108,Gloom Under Night@NPC_POWERUP,attack,349,5,2000,700,50000,no,self,always,0,,,,,,,
 2108,Gloom Under Night@NPC_FIREBREATH,chase,654,10,2000,500,10000,no,target,myhpltmaxrate,80,,,,,,,
 2108,Gloom Under Night@SM_MAGNUM,attack,7,25,10000,0,5000,yes,self,attackpcge,2,,,,,,,
-2108,Gloom Under Night@WZ_SIGHTRASHER,attack,81,20,2000,0,5000,yes,self,always,0,,,,,,,
+2108,Gloom Under Night@WZ_SIGHTRASHER,attack,81,10,2000,0,5000,yes,self,always,0,,,,,,,
 2108,Gloom Under Night@MG_FIREBALL,attack,17,44,1000,500,20000,no,target,always,0,,,,,,,
 2108,Gloom Under Night@MG_FIREBALL,chase,17,44,10000,500,20000,no,target,always,0,,,,,,,
 2108,Gloom Under Night@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -7869,7 +7869,7 @@
 2255,Kades@NPC_POWERUP,attack,349,5,2000,700,50000,no,self,always,0,,,,,,,
 2255,Kades@NPC_FIREBREATH,chase,654,10,2000,500,10000,no,target,myhpltmaxrate,80,,,,,,,
 2255,Kades@SM_MAGNUM,attack,7,25,10000,0,5000,yes,self,attackpcge,2,,,,,,,
-2255,Kades@WZ_SIGHTRASHER,attack,81,20,2000,0,5000,yes,self,always,0,,,,,,,
+2255,Kades@WZ_SIGHTRASHER,attack,81,10,2000,0,5000,yes,self,always,0,,,,,,,
 2255,Kades@MG_FIREBALL,attack,17,44,1000,500,20000,no,target,always,0,,,,,,,
 2255,Kades@MG_FIREBALL,chase,17,44,10000,500,20000,no,target,always,0,,,,,,,
 2255,Kades@NPC_BLEEDING,attack,660,3,2000,0,50000,yes,target,always,0,,,,,,,
@@ -8777,70 +8777,78 @@
 //2476,MG_AMDARAIS@NPC_TALK,idle,682,10,10000,0,60000,no,self,myhpltmaxrate,100,,,,,,,42
 
 // Nightmare Glast Heim
-//2477,Wanderer (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2477,Wanderer (Nightmare)@KN_AUTOCOUNTER,attack,61,5,500,0,5000,yes,self,always,,,,,,,,
-//2477,Wanderer (Nightmare)@NPC_BLEEDING,attack,660,1,2000,0,3000,yes,target,always,,,,,,,32,
-//2477,Wanderer (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,9,,,,,,
-//2477,Wanderer (Nightmare)@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-//2477,Wanderer (Nightmare)@NPC_UNDEADATTACK,attack,347,3,500,500,5000,no,target,always,,,,,,,,
-//2477,Wanderer (Nightmare)@RG_INTIMIDATE,attack,219,1,500,0,5000,yes,target,always,,,,,,,,
-//2478,Rideword (Nightmare)@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,,,,,,,,
-//2478,Rideword (Nightmare)@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,,,,,,,2,
-//2478,Rideword (Nightmare)@NPC_PIERCINGATT,attack,158,3,500,0,5000,yes,target,always,,,,,,,2,
-//2479,Mimic (Nightmare)@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,,,,,,,,
-//2479,Mimic (Nightmare)@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-//2479,Mimic (Nightmare)@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,,,,,,,2,
-//2479,Mimic (Nightmare)@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,,,,,,,6,
-//2479,Mimic (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,29,,,,,,
-//2480,Evil Druid (Nightmare)@NPC_BLINDATTACK,attack,177,3,2000,0,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_BLINDATTACK,chase,177,3,2000,0,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_CURSEATTACK,attack,181,3,500,800,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_CURSEATTACK,chase,181,3,500,800,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_ENERGYDRAIN,chase,200,1,500,0,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_UNDEADATTACK,attack,347,3,500,500,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@NPC_UNDEADATTACK,chase,347,3,500,500,5000,yes,target,always,,,,,,,9,
-//2480,Evil Druid (Nightmare)@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,,,,,,,,
-//2480,Evil Druid (Nightmare)@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,,,,,,,,
-//2481,Wraith Dead (Nightmare)@AL_DECAGI,chase,30,9,500,1000,5000,no,target,always,,,,,,,29,
-//2481,Wraith Dead (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2481,Wraith Dead (Nightmare)@AS_GRIMTOOTH,chase,137,5,2000,0,5000,yes,target,always,,,,,,,,
-//2481,Wraith Dead (Nightmare)@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,,,,,,,29,
-//2481,Wraith Dead (Nightmare)@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,,,,,,,29,
-//2481,Wraith Dead (Nightmare)@NPC_POISON,attack,176,5,500,800,5000,no,target,always,,,,,,,29,
-//2483,Baphomet (Nightmare)@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
-//2483,Baphomet (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2483,Baphomet (Nightmare)@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-//2483,Baphomet (Nightmare)@KN_BRANDISHSPEAR,attack,57,10,2000,500,5000,no,target,always,,,,,,,29,
-//2483,Baphomet (Nightmare)@MO_BODYRELOCATION,chase,264,1,2000,200,1000,yes,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_ARMORBRAKE,attack,344,10,2000,0,5000,no,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_CRITICALWOUND,attack,673,3,500,0,5000,yes,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_DARKBREATH,attack,202,5,2000,800,5000,no,target,always,,,,,,,29,
-//2483,Baphomet (Nightmare)@NPC_DARKSTRIKE,chase,340,10,2000,0,1000,yes,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_EARTHQUAKE,attack,653,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
-//2483,Baphomet (Nightmare)@NPC_EARTHQUAKE,chase,653,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
-//2483,Baphomet (Nightmare)@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,,,,,,,,
-//2483,Baphomet (Nightmare)@NPC_HELLJUDGEMENT,attack,662,5,10000,800,10000,no,self,always,,,,,,,6,
-//2483,Baphomet (Nightmare)@NPC_HELLJUDGEMENT,chase,662,5,10000,800,10000,no,self,always,,,,,,,6,
-//2483,Baphomet (Nightmare)@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
-//2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,slavele,3,1431,,,,,,
-//2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,idle,196,6,10000,700,10000,no,self,slavele,3,1431,,,,,,
-//2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,idle,196,4,10000,0,0,no,self,onspawn,0,1101,,,,,,
-//2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,21,2000,500,2000,no,target,always,,,,,,,29,
-//2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,2000,500,2000,no,target,always,,,,,,,29,
-//2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,5000,500,2000,no,target,skillused,18,,,,,,29,
-//2485,Chimera (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2485,Chimera (Nightmare)@CR_AUTOGUARD,attack,249,5,500,0,300000,yes,self,always,,,,,,,,
-//2485,Chimera (Nightmare)@CR_AUTOGUARD,chase,249,5,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-//2485,Chimera (Nightmare)@NPC_FIREATTACK,attack,186,5,500,500,5000,yes,target,always,,,,,,,6,
-//2485,Chimera (Nightmare)@NPC_SHIELDBRAKE,attack,346,5,500,0,5000,yes,target,always,,,,,,,6,
-//2485,Chimera (Nightmare)@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-//2485,Chimera (Nightmare)@NPC_SUMMONSLAVE,idle,196,4,10000,2000,60000,yes,self,slavele,0,1253,,,,,,
-//2485,Chimera (Nightmare)@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,,,,,,,6,
-//2485,Chimera (Nightmare)@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,,,,,,,6,
+2477,Wanderer (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2477,Wanderer (Nightmare)@KN_AUTOCOUNTER,attack,61,5,500,0,5000,yes,self,always,,,,,,,,
+2477,Wanderer (Nightmare)@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
+2477,Wanderer (Nightmare)@RG_INTIMIDATE,attack,219,1,500,0,5000,yes,target,always,,,,,,,,
+2477,Wanderer (Nightmare)@NPC_UNDEADATTACK,attack,347,3,500,500,5000,no,target,always,,,,,,,,
+2477,Wanderer (Nightmare)@NJ_ISSEN,attack,544,10,500,500,5000,no,target,always,,,,,,,,
+2477,Wanderer (Nightmare)@NPC_BLEEDING,idle,660,5,2000,0,3000,yes,target,always,,,,,,,32,
+2477,Wanderer (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,9,,,,,,
+2478,Rideword (Nightmare)@NPC_PIERCINGATT,attack,158,3,500,0,0,yes,target,always,,,,,,,2,
+2478,Rideword (Nightmare)@NPC_BLINDATTACK,attack,177,3,500,0,0,yes,target,always,,,,,,,,
+2478,Rideword (Nightmare)@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,,,,,,,2,
+2479,Mimic (Nightmare)@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,,,,,,,6,
+2479,Mimic (Nightmare)@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,,,,,,,2,
+2479,Mimic (Nightmare)@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,,,,,,,,
+2479,Mimic (Nightmare)@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
+2479,Mimic (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,29,,,,,,
+2480,Evil Druid (Nightmare)@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,,,,,,,,
+2480,Evil Druid (Nightmare)@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,,,,,,,,
+2480,Evil Druid (Nightmare)@NPC_BLINDATTACK,attack,177,3,2000,0,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_BLINDATTACK,chase,177,3,2000,0,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_CURSEATTACK,attack,181,3,500,800,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_CURSEATTACK,chase,181,3,500,800,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_ENERGYDRAIN,chase,200,1,500,0,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_UNDEADATTACK,attack,347,3,500,500,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_UNDEADATTACK,chase,347,3,500,500,5000,yes,target,always,,,,,,,9,
+2480,Evil Druid (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,29,,,,,,
+2481,Wraith Dead (Nightmare)@NPC_POISON,attack,176,5,500,800,5000,no,target,always,,,,,,,29,
+2481,Wraith Dead (Nightmare)@NPC_BLINDATTACK,attack,177,3,2000,0,5000,yes,target,always,,,,,,,9,
+2481,Wraith Dead (Nightmare)@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,,,,,,,29,
+2481,Wraith Dead (Nightmare)@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,,,,,,,29,
+2481,Wraith Dead (Nightmare)@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,,,,,,,9,
+2483,Baphomet (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2483,Baphomet (Nightmare)@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+2483,Baphomet (Nightmare)@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2483,Baphomet (Nightmare)@KN_BRANDISHSPEAR,attack,57,10,2000,500,5000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,5000,500,2000,no,target,skillused,18,,,,,,29,
+2483,Baphomet (Nightmare)@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_DARKBREATH,attack,202,5,2000,800,5000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@MO_BODYRELOCATION,chase,264,1,2000,200,1000,yes,target,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_DARKSTRIKE,chase,340,10,2000,0,1000,yes,target,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_ARMORBRAKE,attack,344,10,2000,0,5000,no,target,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
+2483,Baphomet (Nightmare)@NPC_EARTHQUAKE,attack,653,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
+2483,Baphomet (Nightmare)@NPC_EARTHQUAKE,chase,653,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
+2483,Baphomet (Nightmare)@NPC_HELLJUDGEMENT,attack,662,5,10000,800,10000,no,self,always,,,,,,,6,
+2483,Baphomet (Nightmare)@NPC_HELLJUDGEMENT,chase,662,5,10000,800,10000,no,self,always,,,,,,,6,
+2483,Baphomet (Nightmare)@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,,,,,,,,
+2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,slavele,3,2484,,,,,,
+2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,idle,196,6,10000,700,10000,no,self,slavele,3,2484,,,,,,
+2483,Baphomet (Nightmare)@NPC_SUMMONSLAVE,idle,196,4,10000,0,0,no,self,onspawn,0,2484,,,,,,
+2484,Baphomet Jr. (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2484,Baphomet Jr. (Nightmare)@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,,,,,,,29,
+2484,Baphomet Jr. (Nightmare)@NPC_DARKNESSATTACK,attack,190,2,500,500,5000,no,target,always,,,,,,,6,
+2484,Baphomet Jr. (Nightmare)@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,,,,,,,29,
+2484,Baphomet Jr. (Nightmare)@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,,,,,,,29,
+2484,Baphomet Jr. (Nightmare)@SA_DISPELL,attack,289,1,0,0,30000,yes,target,always,,,,,,,29,
+2484,Baphomet Jr. (Nightmare)@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,,2,,,,,,
+2484,Baphomet Jr. (Nightmare)@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,,19,0x0081,,,,,
+2484,Baphomet Jr. (Nightmare)@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,6,0x3695,,,,,
+2485,Chimera (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2485,Chimera (Nightmare)@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,,,,,,,6,
+2485,Chimera (Nightmare)@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,,,,,,,6,
+2485,Chimera (Nightmare)@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
+2485,Chimera (Nightmare)@NPC_FIREATTACK,attack,186,5,500,500,5000,yes,target,always,,,,,,,6,
+2485,Chimera (Nightmare)@CR_AUTOGUARD,attack,249,5,500,0,300000,yes,self,always,,,,,,,,
+2485,Chimera (Nightmare)@CR_AUTOGUARD,chase,249,5,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
+2485,Chimera (Nightmare)@NPC_SHIELDBRAKE,attack,346,5,500,0,5000,yes,target,always,,,,,,,6,
+2485,Chimera (Nightmare)@NPC_SUMMONSLAVE,idle,196,4,10000,2000,60000,yes,self,slavele,0,1253,,,,,,
 
 // Heroes' Trail Part 1 - Sara's Memory
 // Not Yet Implemented skill
@@ -10718,68 +10726,71 @@
 2913,Acidus Ringleader@NPC_SUMMONSLAVE,idle,196,2,10000,700,30000,no,self,slavele,0,1716,,,,,,
 
 // Nightmare Clock Tower Dungeon
-//2916,Big Ben@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,6,
-//2916,Big Ben@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,6,
-//2916,Big Ben@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-//2916,Big Ben@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,,
-//2916,Big Ben@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x91,,,,,
-//2917,Big Bell@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-//2917,Big Bell@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,7,
-//2917,Big Bell@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-//2917,Big Bell@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
-//2917,Big Bell@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,6,
-//2918,Time Keeper@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,,
-//2918,Time Keeper@WZ_FIREPILLAR,idle,80,5,500,0,5000,yes,around2,always,0,,,,,,9,
-//2918,Time Keeper@SA_DISPELL,attack,289,1,500,0,30000,yes,target,always,0,,,,,,,
-//2918,Time Keeper@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,9,
-//2918,Time Keeper@NPC_SILENCEATTACK,chase,178,5,500,700,5000,no,target,always,0,,,,,,9,
-//2918,Time Keeper@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,9,
-//2918,Time Keeper@NPC_SLEEPATTACK,chase,182,5,500,0,5000,yes,target,always,0,,,,,,9,
-//2918,Time Keeper@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,,
-//2918,Time Keeper@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x91,,,,,
-//2919,Neo Punk@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-//2919,Neo Punk@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,7,
-//2919,Neo Punk@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-//2919,Neo Punk@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
-//2919,Neo Punk@NPC_WINDATTACK,attack,187,1,2000,0,5000,yes,target,always,0,,,,,,,
-//2920,Arc Elder@MG_FIREBOLT,attack,19,7,10000,1500,5000,yes,target,always,0,,,,,,11,
-//2920,Arc Elder@MG_FROSTDIVER,chase,15,9,10000,500,5000,yes,target,always,0,,,,,,,
-//2920,Arc Elder@MG_LIGHTNINGBOLT,chase,20,7,10000,1500,5000,yes,target,always,0,,,,,,12,
-//2920,Arc Elder@MG_STONECURSE,attack,16,10,10000,0,5000,yes,target,always,0,,,,,,11,
-//2920,Arc Elder@SA_DISPELL,attack,289,1,0,0,30000,yes,target,always,0,,,,,,,
-//2920,Arc Elder@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,,
-//2920,Arc Elder@MG_FIREBOLT,idle,19,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,11,
-//2920,Arc Elder@MG_FROSTDIVER,idle,15,9,10000,500,5000,yes,randomtarget,always,0,,,,,,,
-//2920,Arc Elder@MG_LIGHTNINGBOLT,idle,20,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,12,
-//2920,Arc Elder@MG_STONECURSE,idle,16,10,10000,0,5000,yes,randomtarget,always,0,,,,,,11,
-//2921,Owl Viscount@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2921,Owl Viscount@MG_LIGHTNINGBOLT,attack,20,3,2000,0,5000,yes,target,always,0,,,,,,,
-//2921,Owl Viscount@MG_LIGHTNINGBOLT,chase,20,3,2000,0,5000,yes,target,always,0,,,,,,,
-//2921,Owl Viscount@PR_LEXDIVINA,attack,76,3,500,1000,5000,yes,target,always,0,,,,,,,
-//2921,Owl Viscount@PR_LEXDIVINA,chase,76,3,500,1000,5000,yes,target,always,0,,,,,,,
-//2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,,
-//2921,Owl Viscount@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0xA1,,,,,
-//2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x37B5,,,,,
-//2923,Owl Marquees@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//2923,Owl Marquees@MG_LIGHTNINGBOLT,attack,20,5,2000,0,5000,yes,target,always,0,,,,,,,
-//2923,Owl Marquees@MG_LIGHTNINGBOLT,chase,20,5,2000,0,5000,yes,target,always,0,,,,,,,
-//2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,,
-//2923,Owl Marquees@SA_DISPELL,attack,289,5,0,0,30000,yes,target,always,0,,,,,,5,
-//2923,Owl Marquees@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0xA1,,,,,
-//2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x37B5,,,,,
-//2923,Owl Marquees@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,2921,,,,,,
-//3074,Timeholder@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
-//3074,Timeholder@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-//3074,Timeholder@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-//3074,Timeholder@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,,
-//3074,Timeholder@AL_INCAGI,chase,29,10,2000,700,300000,no,self,always,0,,,,,,,
-//3074,Timeholder@AL_DECAGI,attack,30,48,500,0,20000,no,target,always,0,,,,,,,
-//3074,Timeholder@AL_DECAGI,chase,30,48,500,0,20000,no,target,always,0,,,,,,,
-//3074,Timeholder@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,,
-//3074,Timeholder@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,,
-//3074,Timeholder@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,,
-//3074,Timeholder@NPC_HELLJUDGEMENT,chase,662,10,10000,1000,10000,no,self,always,0,,,,,,,
-//3074,Timeholder@NPC_HELLJUDGEMENT,attack,662,10,10000,1000,10000,no,self,always,0,,,,,,,
-//3074,Timeholder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
-//3074,Timeholder@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,,
-//3074,Timeholder@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,,
+2916,Big Ben@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,6,
+2916,Big Ben@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,6,
+2916,Big Ben@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
+2916,Big Ben@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x0091,,,,,
+2916,Big Ben@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
+2917,Big Bell@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
+2917,Big Bell@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,7,
+2917,Big Bell@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,,
+2917,Big Bell@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
+2917,Big Bell@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,6,
+2917,Big Bell@LK_SPIRALPIERCE,attack,397,5,10000,1000,10000,yes,target,myhpltmaxrate,80,,,,,,36,
+2917,Big Bell@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6,
+2918,Time Keeper@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,,
+2918,Time Keeper@WZ_FIREPILLAR,idle,80,5,500,0,5000,yes,around2,always,0,,,,,,9,
+2918,Time Keeper@SA_DISPELL,attack,289,1,500,0,30000,yes,target,always,0,,,,,,,
+2918,Time Keeper@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,9,
+2918,Time Keeper@NPC_SILENCEATTACK,chase,178,5,500,700,5000,no,target,always,0,,,,,,9,
+2918,Time Keeper@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,9,
+2918,Time Keeper@NPC_SLEEPATTACK,chase,182,5,500,0,5000,yes,target,always,0,,,,,,9,
+2918,Time Keeper@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,,
+2918,Time Keeper@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x0091,,,,,
+2919,Neo Punk@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
+2919,Neo Punk@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,7,
+2919,Neo Punk@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,,
+2919,Neo Punk@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
+2919,Neo Punk@NPC_WINDATTACK,attack,187,1,2000,0,5000,yes,target,always,0,,,,,,,
+2919,Neo Punk@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,,,,,,,,
+2920,Arc Elder@MG_FIREBOLT,attack,19,7,10000,1500,5000,yes,target,always,0,,,,,,11,
+2920,Arc Elder@MG_FROSTDIVER,chase,15,9,10000,500,5000,yes,target,always,0,,,,,,,
+2920,Arc Elder@MG_LIGHTNINGBOLT,chase,20,7,10000,1500,5000,yes,target,always,0,,,,,,12,
+2920,Arc Elder@MG_STONECURSE,attack,16,10,10000,0,5000,yes,target,always,0,,,,,,11,
+2920,Arc Elder@MG_FIREBOLT,idle,19,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,11,
+2920,Arc Elder@MG_FROSTDIVER,idle,15,9,10000,500,5000,yes,randomtarget,always,0,,,,,,,
+2920,Arc Elder@MG_LIGHTNINGBOLT,idle,20,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,12,
+2920,Arc Elder@MG_STONECURSE,idle,16,10,10000,0,5000,yes,randomtarget,always,0,,,,,,11,
+2920,Arc Elder@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6,
+2920,Arc Elder@NPC_RUN,attack,354,1,10000,0,0,yes,self,myhpltmaxrate,99,,,,,,26,
+2920,Arc Elder@NPC_RUN,chase,354,1,10000,0,0,yes,self,myhpltmaxrate,99,,,,,,26,
+2921,Owl Viscount@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2921,Owl Viscount@MG_LIGHTNINGBOLT,attack,20,5,2000,0,5000,yes,target,always,0,,,,,,,
+2921,Owl Viscount@MG_LIGHTNINGBOLT,chase,20,5,2000,0,5000,yes,target,always,0,,,,,,,
+2921,Owl Viscount@PR_LEXAETERNA,attack,78,1,500,1000,5000,yes,target,always,,,,,,,6,
+2921,Owl Viscount@PR_LEXAETERNA,chase,78,1,500,1000,5000,yes,target,always,,,,,,,6,
+2921,Owl Viscount@CR_REFLECTSHIELD,attack,252,10,10000,0,300000,yes,self,always,,,,,,,6,
+2921,Owl Viscount@CR_REFLECTSHIELD,chase,252,10,10000,0,300000,yes,self,always,,,,,,,6,
+2921,Owl Viscount@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6,
+2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,,
+2921,Owl Viscount@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,,
+2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
+2923,Owl Marquees@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+2923,Owl Marquees@MG_LIGHTNINGBOLT,attack,20,3,2000,0,5000,yes,target,always,0,,,,,,,
+2923,Owl Marquees@MG_LIGHTNINGBOLT,chase,20,3,2000,0,5000,yes,target,always,0,,,,,,,
+2923,Owl Marquees@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6,
+2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,,
+2923,Owl Marquees@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,,
+2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
+2923,Owl Marquees@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,2922,,,,,,
+3074,Time Holder@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+3074,Time Holder@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+3074,Time Holder@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
+3074,Time Holder@NPC_AGIUP,attack,350,5,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,,
+3074,Time Holder@AL_INCAGI,chase,29,10,2000,700,10000,no,self,always,0,,,,,,,
+3074,Time Holder@WZ_METEOR,attack,83,11,1000,500,10000,no,target,always,0,,,,,,,
+3074,Time Holder@NPC_HELLJUDGEMENT,chase,662,10,3000,1000,10000,no,self,always,0,,,,,,,
+3074,Time Holder@NPC_HELLJUDGEMENT,attack,662,10,3000,1000,10000,no,self,always,0,,,,,,,
+3074,Time Holder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
+3074,Time Holder@NPC_SUMMONSLAVE,attack,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,,
+3074,Time Holder@NPC_SUMMONSLAVE,idle,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,,

db/re/skill_db.txt

@@ -865,6 +865,28 @@
 //725,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION,Reverberation 2
 //726,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_REVERBERATION_ATK,Reverberation Attack
 //727,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEX_AETERNA,Lex Aeterna 2
+//728,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ARROWSTORM,NPC Arrow Storm
+//729,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CHEAL,NPC Coluceo Heal
+//730,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_SR_CURSEDCIRCLE,NPC 
+//731,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_DRAGONBREATH,NPC Dragon Breath
+//732,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FATALMENACE,NPC Fatal Menace
+//733,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION,NPC Magma Eruption
+//734,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MAGMA_ERUPTION_DOTDAMAGE,NPC Magma Eruption Dot Damage
+//735,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_MANDRAGORA,NPC Howling of Mandragora
+//736,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PSYCHIC_WAVE,NPC Psychic Wave
+//737,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_RAYOFGENESIS,NPC Ray of Genesis
+//738,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_VENOMIMPRESS,NPC Venom Impress
+//739,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_CLOUD_KILL,NPC Cloud Kill
+//740,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_IGNITIONBREAK,NPC Ignition Break
+//741,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_PHANTOMTHRUST,NPC Phantom Thrust
+//742,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_POISON_BUSTER,NPC Poison Blaster
+//743,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_HALLUCINATIONWALK,NPC Hallucination Walk
+//744,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_ELECTRICWALK,NPC Electric Walk
+//745,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_FIREWALK,NPC Fire Walk
+//746,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDEDISPEL,Wide Dispell
+//747,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_LEASH,Leash
+//748,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDELEASH,Wide Leash
+//749,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0,		NPC_WIDECRITICALWOUND,Wide Critical Wound
 
 //****
 // 2nd Quest Skills
@@ -1396,7 +1418,7 @@
 8035,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_ANGRIFFS_MODUS,Attack Mode
 8036,3:4:5:6:7,6,1,0,0,0,5,1,no,0,0x0200,0,weapon,0,0x0,	MH_TINDER_BREAKER,Tinder Breaker
 8037,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_CBC,Continual Break Combo
-8038,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,0x0,	MH_EQC,Eternal Quick Combo
+8038,1,6,4,0,0,0,5,1,no,0,0x200,0,misc,0,0x0,	MH_EQC,Eternal Quick Combo
 8039,0,6,4,3,0x2,1:1:1:2:2,5,1,no,0,0,0,weapon,0,0x0,	MH_MAGMA_FLOW,Magma Flow
 8040,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0,		MH_GRANITIC_ARMOR,Granitic Armor
 8041,7,6,2,3,0x2,0,5,1,no,0,0,1,weapon,0,0x0,		MH_LAVA_SLIDE,Lava Slide

doc/item_bonus.txt

@@ -155,6 +155,8 @@ bonus2 bHPRegenRate,n,t;		Gain n HP every t milliseconds
 bonus2 bHPLossRate,n,t; 		Lose n HP every t milliseconds
 bonus2 bSPRegenRate,n,t;		Gain n SP every t milliseconds
 bonus2 bSPLossRate,n,t; 		Lose n SP every t milliseconds
+bonus2 bRegenPercentHP,n,t;		Gain n% of max HP every t milliseconds
+bonus2 bRegenPercentSP,n,t;		Gain n% of max SP every t milliseconds
 bonus bNoRegen,x;       		Stops HP or SP regeneration (x: 1=HP, 2=SP)
 
 bonus bUseSPrate,n;         		SP consumption + n%

doc/mapflags.txt

@@ -413,3 +413,13 @@ in '/conf/channels.conf'.
 Disables MVP tombs from appearing on a map.
 
 ---------------------------------------
+
+*nocostume
+
+Disables costume sprites on a map.
+
+This only disables the sprites and not the effect of the items.
+If a player logs out on a nocostume map the costume sprites will also not be shown in the
+character server.
+
+---------------------------------------

doc/mob_skill_db_powerskill.txt

@@ -20,6 +20,7 @@ Skill | rAthena Lv | Explanation
 15,MG_FROSTDIVER      |40| 500% damage. 100% base chance.
 17,MG_FIREBALL        |44| Re: 1020% damage, Pre: 510% damage
 21,MG_THUNDERSTORM    |20| 7x7 AoE. 3 splash into LP. 20 hits.
+28,AL_HEAL            |11| Heals max_heal HP(see conf/battle/skills.conf)
 30,AL_DECAGI          |48| Reduces Agi by 50. Duration 130 seconds.
 42,MC_MAMMONITE       |22| 1200% damage.
 57,KN_BRANDISHSPEAR   |10| 562% damage at all ranges.

doc/script_commands.txt

@@ -4758,18 +4758,24 @@ The default setting, 'item_enabled_npc', is defined in 'conf/battle/items.conf'.
 
 ---------------------------------------
 
-*itemskill <skill id>,<skill level>;
-*itemskill "<skill name>",<skill level>;
+*itemskill <skill id>,<skill level>{,<keep requirement>};
+*itemskill "<skill name>",<skill level>{,<keep requirement>};
 
 This command is meant for item scripts to replicate single-use skills in usable
 items. It will not work properly if there is a visible dialog window or menu.
 If the skill is self or auto-targeting, it will be used immediately; otherwise a
 target cursor is shown.
 
+If <keep requirement> parameter is set to true, the skill's requirements will be checked.
+By default, the requirements for item skills are not checked, and therefore the default value is false.
+
 // When Anodyne is used, it will cast Endure (8), Level 1, as if the actual
 // skill has been used from skill tree.
 605,Anodyne,Anodyne,11,2000,0,100,,,,,10477567,2,,,,,{ itemskill 8,1; },{}
 
+// When Sienna_Execrate_Scroll_1_5 is used, it will cast Sienna Execrate Level 5 and consume 2 Red_Gemstones.
+23194,Sienna_Execrate_Scroll_1_5,Level 5 Sienna Execrate,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WL_SIENNAEXECRATE",5,true; },{},{}
+
 ---------------------------------------
 
 *consumeitem <item id>{,<char_id>};
@@ -8491,19 +8497,18 @@ Mark Color:
 ============================
 ---------------------------------------
 
-*waitingroom2bg_single(<battle group>,"<map name>",<x>,<y>,"<npc name>");
+*waitingroom2bg_single(<battle group>,{"<map name>",<x>,<y>{,"<npc name>"}});
 
-Adds the first waiting player from the chat room of the given NPC to an
-existing battleground group and warps it to the specified coordinates on
-the given map.
+Adds the first waiting player from the chat room of the given NPC to an existing battleground group.
+The player will also be warped to the default spawn point of the battle group or to the specified coordinates <x> and <y> on the given <map>.
 
 ---------------------------------------
 
-*waitingroom2bg("<map name>",<x>,<y>,"<On Quit Event>","<On Death Event>"{,"<NPC Name>"});
+*waitingroom2bg("<map name>",<x>,<y>,{"<On Quit Event>","<On Death Event>"{,"<NPC Name>"}});
 
 <map name>,<x>,<y> refer to where the "respawn" base is, where the player group will respawn when they die.
-<On Quit Event> refers to an NPC label that attaches to the character and is run when they relog.
-<On Death Event> refers to an NPC label that attaches to the character and is run when they die. Can be "" for empty.
+<On Quit Event> refers to an NPC label that attaches to the character and is run when they relog. (Optional)
+<On Death Event> refers to an NPC label that attaches to the character and is run when they die. (Optional)
 
 Unlike the prior command, the latter will attach a GROUP in a waiting room to the battleground, and 
 sets the array $@arenamembers[0] where 0 holds the IDs of the first group, and 1 holds the IDs of the second.
@@ -8517,6 +8522,26 @@ Example:
 
 ---------------------------------------
 
+*bg_create("<map name>",<x>,<y>{,"<On Quit Event>","<On Death Event>"});
+
+Creates an instance of battleground battle group that can be used with other battleground commands.
+
+<map name>,<x>,<y> refer to where the "respawn" base is, where the player group will respawn when they die.
+<On Quit Event> refers to an NPC label that attaches to the character and is run when they relog. (Optional)
+<On Death Event> refers to an NPC label that attaches to the character and is run when they die. (Optional)
+
+Returns battle group ID on success. Returns 0 on failure.
+
+---------------------------------------
+
+*bg_join(<battle group>,{"<map name>",{<x>,<y>{,<char id>}});
+
+Adds an attached player or <char id> if specified to an existing battleground group. The player will also be warped to the default spawn point of the battle group or to the specified coordinates <x> and <y> on the given <map>.
+
+Returns true on success. Returns false on failure.
+
+---------------------------------------
+
 *bg_team_setxy <Battle Group ID>,<x>,<y>;
 
 Updates the respawn point of the given Battle Group to x,y on the same map. <Battle Group ID> can be retrieved using getcharid(4).
@@ -9123,6 +9148,7 @@ The command returns 1 upon success, and these values upon failure:
 -2: Player already has a party.
 -3: Party not found.
 -4: Party is full.
+-5: Another character from the same account is already in the party.
 
 ---------------------------------------
 

doc/status_change.txt

@@ -2251,8 +2251,8 @@ SC_EQC	(SI_EQC)
 	desc:
 	val1:
 	val2: -% Def
-	val3: -% Atk
-	val4: -%MaxHP
+	val3: -%MaxHP
+	val4:
 
 SC_GOLDENE_FERSE	(SI_GOLDENE_FERSE)
 	desc:
@@ -2528,6 +2528,55 @@ SC_CHASEWALK2	(SI_CHASEWALK2)
 	desc: 2nd effect of Chasewalk
 	val1: +STR
 
+SC_GVG_GIANT	(SI_GVG_GIANT)
+	desc: Instantly consumes HP/SP, increases Physical/Magic damage on player enemies by n%.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+	val3: Increases % Physical damage
+	val4: Increases % Magical damage
+
+SC_GVG_GOLEM	(SI_GVG_GOLEM)
+	desc: Instantly consumes HP/SP, decreases n% damage received from other adventurers.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+	val3: Decreases % damage received of physical attack
+	val4: Decreases % damage received of magical attack
+
+SC_GVG_STUN	(SI_GVG_STUN)
+	desc: Instantly consumes HP/SP, immunizes you against Stun.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_STONE	(SI_GVG_STONE)
+	desc: Instantly consumes HP/SP, immunizes you against Petrification.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_FREEZ	(SI_GVG_FREEZ)
+	desc: Instantly consumes HP/SP, immunizes you against Frost.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_SLEEP	(SI_GVG_SLEEP)
+	desc: Instantly consumes HP/SP, immunizes you against Sleep.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_CURSE	(SI_GVG_CURSE)
+	desc: Instantly consumes HP/SP, immunizes you against Curse.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_SILENCE	(SI_GVG_SILENCE)
+	desc: Instantly consumes HP/SP, immunizes you against Silence.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
+SC_GVG_BLIND	(SI_GVG_BLIND)
+	desc: Instantly consumes HP/SP, immunizes you against Blind.
+	val1: Amount of HP that are instantly consumed
+	val2: Amount of SP that are instantly consumed
+
 SC_EXTREMITYFIST2	()
 	desc:
 	val1:

npc/airports/airships.txt

@@ -32,7 +32,7 @@ OnUnhide:
 	specialeffect EF_SUMMONSLAVE;
 	end;
 
-OnTouch:
+OnTouch_:
 	switch ($@airplanelocation) {
 	case 0: warp "yuno",92,260; end;
 	case 1: warp "einbroch",92,278; end;
@@ -655,7 +655,7 @@ airplane,50,66,5	script	Apple Merchant#airplane	86,{
 airplane_01,243,73,0	script	#AirshipWarp-3	45,1,1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	switch ($@airplanelocation2) {
 	case 0: warp "ra_fild12",292,204; end;
 	case 1: 
@@ -1027,7 +1027,7 @@ airplane_01,83,61,2	script	Dianne#01airplane_01	72,2,2,{
 	mes "Do you think that...";
 	close;
 
-OnTouch:
+OnTouch_:
 	emotion e_sob;
 	end;
 }

npc/battleground/flavius/flavius01.txt

@@ -332,7 +332,7 @@ OnInit:
 	disablenpc "bat_b01_rp1_a_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal 100,100;
 	warp "bat_b01",87,73;
 	end;

npc/battleground/flavius/flavius02.txt

@@ -333,7 +333,7 @@ OnInit:
 	disablenpc "bat_b02_rp1_a_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal 100,100;
 	warp "bat_b02",87,73;
 	end;

npc/battleground/kvm/kvm01.txt

@@ -36,8 +36,12 @@ OnEnterBG:
 	set $@KvM01BG_id2, waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie");
 	end;
 }
-bat_room,169,220,0	warp	#kvm801	2,2,bat_room,154,150
-bat_room,169,211,0	warp	#kvm802	2,2,bat_room,154,150
+bat_room,169,220,0	script	#kvm801	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,169,211,0	duplicate(#kvm801)	#kvm802	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/battleground/kvm/kvm02.txt

@@ -36,8 +36,12 @@ OnEnterBG:
 	set $@KvM02BG_id2, waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie");
 	end;
 }
-bat_room,197,220,0	warp	#kvm601	2,2,bat_room,154,150
-bat_room,197,211,0	warp	#kvm602	2,2,bat_room,154,150
+bat_room,197,220,0	script	#kvm601	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,197,21,0	duplicate(#kvm601)	#kvm602	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/battleground/kvm/kvm03.txt

@@ -35,8 +35,12 @@ OnEnterBG:
 	set $@KvM03BG_id2, waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie");
 	end;
 }
-bat_room,225,220,0	warp	#kvm701	2,2,bat_room,154,150
-bat_room,225,211,0	warp	#kvm702	2,2,bat_room,154,150
+bat_room,225,220,0	script	#kvm701	WARPNPC,2,2,{
+OnTouch:
+	warp "bat_room",154,150;
+	end;
+}
+bat_room,225,211,0	duplicate(#kvm701)	#kvm702	WARPNPC,2,2
 
 // Starting Line
 //============================================================

npc/cities/geffen.txt

@@ -219,7 +219,7 @@ geffen_in,34,170,0	script	Theodore	47,{
 geffen,146,148,4	script	Suspicious Guy	99,6,6,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[?]";
 	mes "^333333*Psssst!*";
 	mes "H-Hey you!";

npc/cities/jawaii.txt

@@ -694,7 +694,7 @@ OnSolo:
 }
 
 jawaii_in,28,96,0	script	jaw_em_order#Jawaii	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (getpartnerid()) {
 		donpcevent "Employee#jaw8::OnWelcome";
 		donpcevent "Employee#jaw7::OnWelcome";

npc/cities/lighthalzen.txt

@@ -1032,7 +1032,7 @@ lighthalzen,297,239,3	duplicate(Berru#lhz_01)	Pilia#lhz_01	818
 lighthalzen,312,233,3	script	Beggar#lhz_02	777,3,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Beggar]";
 	mes "Please...";
 	mes "My child is starving...";
@@ -1818,7 +1818,7 @@ lhz_in01,35,226,5	script	Rekenber Guard#li01	867,{
 }
 
 lhz_in01,23,132,3	script	Rekenber Guard#li02	867,5,5,{
-OnTouch:
+OnTouch_:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
 		mes "Keep your eyes open.";
@@ -1924,7 +1924,7 @@ lhz_in01,199,137,3	script	Scientist#li_03	865,{
 }
 
 lhz_in01,46,125,3	script	Rekenber Guard#li03	867,5,5,{
-OnTouch:
+OnTouch_:
 	if (isequipped(2241) && isequipped(2243)) {
 		mes "[Rekenber Guard]";
 		mes "......................";
@@ -2901,7 +2901,7 @@ lighthalzen,40,107,4	script	Vergil#zen4	869,{
 }
 
 lhz_in01,144,53,3	script	Jorje#zero	98,1,1,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "[Jorje]";
@@ -2970,7 +2970,7 @@ lhz_in01,139,48,7	script	Leimi#mimir	73,{
 }
 
 lhz_in01,138,47,0	script	#mimir_camera	-1,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Assassin) {
 		if (Sex) {
 			mes "^3355FF*Click*^000000";

npc/cities/morocc.txt

@@ -37,7 +37,7 @@ morocc,150,120,5	script	Soldier - Morroc#01::MocSoldier	707,3,3,{
 	mes "This is a restricted area. You can't come any further!";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Morroc Soldier]";
 	mes "Hey, you! Stop there.";
 	next;

npc/cities/niflheim.txt

@@ -61,7 +61,7 @@ niflheim,195,211,6	script	Gigantia#nif	796,3,3,{
 	mes "Death's sweet embrace.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (isequipped(5038) || isequipped(2257) || isequipped(2256)) {
 		mes "[Gigantia]";
 		mes "Hey, wait!";

npc/cities/payon.txt

@@ -115,7 +115,7 @@ payon,173,82,0	script	Young Man#2payon	88,{
 payon,158,246,3	script	Guardsman#payon	708,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Guardsman]";
 	mes "This is the Central Palace of Payon. This place is open to the public, but in accordance with our laws, you must behave in an orderly fashion once inside.";
 	next;
@@ -468,7 +468,7 @@ payon_in01,180,7,2	script	Waitress#payon	90,{
 payon_in03,96,116,3	script	Chief Guardsman#payon	708,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Chief Guardsman]";
 	mes "What brings";
 	mes "you here? ";
@@ -832,7 +832,7 @@ payon_in01,47,59,2	script	Archer Wolt#payon	88,{
 payon_in03,99,190,4	script	Chief#payon	107,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 30) {
 		mes "[Guard]";
 		mes "Hey...";

npc/cities/umbala.txt

@@ -1001,7 +1001,7 @@ um_in,158,71,3	script	Utan villager#um	787,{
 }
 
 umbala,140,197,1	script	Bungee Jump	-1,0,0,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		percentheal -100,0;
@@ -1021,7 +1021,7 @@ OnTouch:
 }
 
 umbala,136,195,0	script	 #jump	-1,1,1,{
-OnTouch:
+OnTouch_:
 	warp "umbala",145,166;
 	end;
 }

npc/instances/OrcsMemory.txt

@@ -396,7 +396,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),103,105,109,111,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead1";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),168,130;
 	end;
 
@@ -425,7 +425,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),32,40,38,46,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead2";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),85,85;
 	end;
 
@@ -454,7 +454,7 @@ OnEnable:
 	areamonster instance_mapname("1@orcs"),19,177,25,183,"Enchanted Orc",1023,1,instance_npcname("B1 Area Mobs")+"::OnMyMobDead3";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("1@orcs"),38,110;
 	end;
 
@@ -486,7 +486,7 @@ OnEnable:
 	donpcevent instance_npcname("#Resurrect Monsters4")+"::OnDisable";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),32,171;
 	end;
 }
@@ -731,7 +731,7 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),47,93;
 	end;
 }
@@ -762,7 +762,7 @@ OnTimer10000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),107,55;
 	end;
 }
@@ -807,7 +807,7 @@ OnTimer13110:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp instance_mapname("2@orcs"),167,95;
 	end;
 }
@@ -860,7 +860,7 @@ OnEnable:
 	enablenpc instance_npcname("#Warp Outside Orc Dun");
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "gef_fild10",240,197;
 	end;
 }

npc/instances/SealedShrine.txt

@@ -972,7 +972,7 @@ OnTimer3500000:
 }
 
 2@cata,80,144,0	script	ins_2f_enter	-1,3,3,{
-OnTouch:
+OnTouch_:
 	donpcevent instance_npcname("ins_2f_enter_broad")+"::OnEnable";
 	disablenpc instance_npcname("ins_2f_enter");
 	end;
@@ -1009,7 +1009,7 @@ OnTimer18000:
 }
 
 2@cata,50,67,0	script	slave_left	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,55,67,"Apostle of Baphomet",1869,1;
@@ -1033,7 +1033,7 @@ OnTouch:
 }
 
 2@cata,109,67,0	script	slave_right	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,105,67,"Apostle of Baphomet",1869,1;
@@ -1057,7 +1057,7 @@ OnTouch:
 }
 
 2@cata,79,39,0	script	slave_down	-1,5,5,{
-OnTouch:
+OnTouch_:
 	set .@map$, instance_mapname("2@cata");
 	mapannounce .@map$, "Apostle of Baphomet : Kill the humans! Don't let them interrupt the revival of our Master!",bc_map,"0xFFFF00";
 	monster .@map$,78,41,"Apostle of Baphomet",1869,1;

npc/jobs/2-1/assassin.txt

@@ -304,7 +304,7 @@ in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
 	mes "I feel irritated when somebody talks to me behind my back.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 == 4) {
 		mes "[Assassin 'Khai']";
 		mes "Ehhh?";
@@ -664,7 +664,7 @@ OnTouch:
 }
 
 in_moc_16,19,154,0	script	nameless_one	-1,8,2,{
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 < 5) {
 		if (ASSIN_Q2 < 3) {
 			mes "[The Anonymous One]";
@@ -1128,7 +1128,7 @@ OnStart:
 in_moc_16,21,165,2	script	Test Guide#ASN	725,4,4,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q2 < 5) {
 		mes "[Barcardi]";
 		mes "You can't take the next trial without passing the written test first. You better speak to the Anonymous One...";
@@ -1353,7 +1353,7 @@ OnTimer187000:
 }
 
 in_moc_16,68,158,0	script	01_1::SinTrap	-1,0,0,{
-OnTouch:
+OnTouch_:
 	if (getvariableofnpc(.DisableTraps,"Beholder#ASNTEST")  < 1) {
 		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
 		set ASSIN_Q,2;
@@ -1453,7 +1453,7 @@ OnInit:
 	disablenpc "Keeper of the Door#ASN";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	if (ASSIN_Q == 3)
 		set ASSIN_Q,3;
@@ -1499,7 +1499,7 @@ OnMyMobDead:
 in_moc_16,89,98,1	script	Thomas#ASNTEST	118,5,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q == 4) {
 		mes "[Thomas]";
 		mes "Damn...! You look like you're in a lot of pain. ^666666*Sigh*^000000 Give me a second, let me try to restore your HP and SP...";
@@ -1588,7 +1588,7 @@ OnDisable:
 
 in_moc_16,87,48,2	script	Barcardi#ASN	725,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	donpcevent "timestopper#1::OnDisable";
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	mes "[Barcardi]";
@@ -1602,7 +1602,7 @@ OnTouch:
 }
 
 in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
 		set ASSIN_Q,ASSIN_Q+1;
@@ -1618,7 +1618,7 @@ OnTouch:
 }
 
 in_moc_16,167,110,0	script	Guildmaster#ASN1	-1,3,1,{
-OnTouch:
+OnTouch_:
 	savepoint "in_moc_16",167,110;
 	mes "[Guildmaster]";
 	mes "Welcome. ";
@@ -1640,7 +1640,7 @@ OnCast:
 
 in_moc_16,149,80,4	script	Guildmaster#ASN2	106,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	savepoint "morocc",100,100;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
 		set ASSIN_Q,8;
@@ -2185,7 +2185,7 @@ in_moc_16,186,81,1	script	Master Assist	55,1,1,{
 }
 
 in_moc_16,170,90,0	script	info 1	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Huh.";
 	mes "Now, that place is blocked. You might want to check the other side.";
@@ -2193,14 +2193,14 @@ OnTouch:
 }
 
 in_moc_16,153,85,0	script	info 2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "You're getting warmer. You're almost there. Just, turn around a little bit.";
 	close;
 }
 
 in_moc_16,160,85,0	script	info 3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Hmm.";
 	mes "Now, that place";
@@ -2209,7 +2209,7 @@ OnTouch:
 }
 
 in_moc_16,175,89,0	script	info 4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Umm...";
 	mes "You're heading for my assistant. Do you still need to talk to him?";
@@ -2217,7 +2217,7 @@ OnTouch:
 }
 
 in_moc_16,164,88,0	script	info 5	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Well done...";
 	mes "I can feel your steps near me.";
@@ -2225,21 +2225,21 @@ OnTouch:
 }
 
 in_moc_16,149,95,0	script	info 6	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "Hm? Not bad. You're almost here.";
 	close;
 }
 
 in_moc_16,180,101,0	script	info 7	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "I don't think you're going the right way.";
 	close;
 }
 
 in_moc_16,186,107,0	script	info 8	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Guildmaster]";
 	mes "No sense of direction, eh?";
 	close;

npc/jobs/2-1/hunter.txt

@@ -969,7 +969,7 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 }
 
 job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
-OnTouch:
+OnTouch_:
 	if (HNTR_Q == 12) {
 		mes "[Guide]";
 		mes "Good day. Welcome to the Hunter testing site. The test begins when you enter the next room.";
@@ -1206,7 +1206,7 @@ OnTimer197000:
 }
 
 job_hunte,93,101,1	script	Switch#hnt	723,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThere are 3 buttons";
 	mes "on the escape switch.^000000";
 	set HNTR_Q,15;
@@ -1253,7 +1253,7 @@ OnInit:
 	disablenpc "exit#hnttest";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Manager#hnt::OnReset";
 	donpcevent "Waiting Room#hnt::OnStart";
 	set HNTR_Q,16;
@@ -1269,7 +1269,7 @@ OnTouch:
 // Hunter Job test traps.
 //============================================================ 
 job_hunte,52,140,0	script	1-1::HntTrap	-1,0,1,{
-OnTouch:
+OnTouch_:
 	switch(rand(200)) {
 	default:
 	case 1: mapannounce "job_hunte",strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
@@ -1638,7 +1638,7 @@ job_hunte,64,93,0	duplicate(HntTrap)	57-2	-1,0,0
 job_hunte,65,92,0	duplicate(HntTrap)	57-3	-1,0,0
 
 job_hunte,65,93,0	script	57-4::HntTrap2	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
 	set HNTR_Q,13;
 	warp "job_hunte",176,22;

npc/jobs/2-1/knight.txt

@@ -1989,11 +1989,11 @@ OnMyMobDead:
 	end;
 }
 
-job_knt,145,57,1	script	Warp#knt	107,22,22,{
+job_knt,143,57,1	script	Warp#knt	107,22,22,{
 OnInit:
 	disablenpc "Warp#knt";
 	end;
-OnTouch:
+OnTouch_:
 	set KNIGHT_Q,12;
 	changequest 9010,9011;
 	warp "prt_in",80,100;

npc/jobs/2-1/priest.txt

@@ -1163,7 +1163,7 @@ OnMyMobDead:
 }
 
 job_prist,24,44,0	script	Zombie Info	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Father Peter]";
 		mes "When the Priest applicant enters, 5 minutes will be given to complete this trial. Proceed slowly and help your Acolyte.";
@@ -1194,7 +1194,7 @@ OnInit:
 	disablenpc "Zombie1_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm1";
 		donpcevent "Zombie1_1::OnDisable";
@@ -1215,7 +1215,7 @@ OnInit:
 	disablenpc "Zombie2_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm2";
 		donpcevent "Zombie2_1::OnDisable";
@@ -1236,7 +1236,7 @@ OnInit:
 	disablenpc "Zombie3_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm3";
 		donpcevent "Zombie3_1::OnDisable";
@@ -1257,7 +1257,7 @@ OnInit:
 	disablenpc "Zombie4_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm4";
 		donpcevent "Zombie4_1::OnDisable";
@@ -1277,7 +1277,7 @@ OnInit:
 	disablenpc "Zombie5_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Zombie_Generator#prst::Onm5";
 		donpcevent "Zombie5_1::OnDisable";
@@ -1293,7 +1293,7 @@ OnDisable:
 }
 
 job_prist,24,109,4	script	prst1_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	set .@mobs,getvariableofnpc(.MyMobs,"Zombie_Generator#prst");
 	if (BaseJob == Job_Priest) warp "job_prist",168,17;
 	else if (BaseClass == Job_Acolyte && .@mobs < 1) {
@@ -1309,7 +1309,7 @@ OnTouch:
 // 3rd Test
 //==========================================================
 job_prist,168,45,4	script	Deviruchi#prst	1109,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Deviruchi]";
 		mes "Whaaaaat...?";
@@ -1410,7 +1410,7 @@ OnTouch:
 }
 
 job_prist,168,80,4	script	Doppelganger#prst	1046,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Doppelganger]";
 		mes "What are you doing here? You've already made your choice, there's no going back... Priest.";
@@ -1479,7 +1479,7 @@ OnTouch:
 }
 
 job_prist,168,115,4	script	Dark Lord#prst	1272,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Dark Lord]";
 		mes "^330033All is doom, darkness and despair! Those who love you will betray you, and all that will be left is grieving and fury!^000000";
@@ -1536,7 +1536,7 @@ OnTouch:
 }
 
 job_prist,168,150,4	script	Baphomet#prst	736,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		mes "[Baphomet]";
 		mes "I hate";
@@ -1598,7 +1598,7 @@ OnTouch:
 }
 
 job_prist,168,180,4	script	prst2_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) warp "job_prist",98,40;
 	else if (BaseClass == Job_Acolyte) {
 		warp "job_prist",98,40;
@@ -1646,7 +1646,7 @@ OnInit:
 	disablenpc "Mummy1_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm1";
 		donpcevent "Mummy1_1::OnDisable";
@@ -1667,7 +1667,7 @@ OnInit:
 	disablenpc "Mummy2_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm2";
 		donpcevent "Mummy2_1::OnDisable";
@@ -1688,7 +1688,7 @@ OnInit:
 	disablenpc "Mummy3_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "Mummy_Generator::Onm3";
 		donpcevent "Mummy3_1::OnDisable";
@@ -1705,7 +1705,7 @@ OnDisable:
 }
 
 job_prist,98,105,4	script	prst3_1	45,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Priest) {
 		warp "prt_church",15,36;
 		end; 

npc/jobs/2-1/wizard.txt

@@ -1253,7 +1253,7 @@ OnInit:
 	disablenpc "Room of Water#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapannounce "job_wiz",strcharinfo(0)+" has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
@@ -1433,7 +1433,7 @@ OnInit:
 	disablenpc "Room of Earth#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapannounce "job_wiz",strcharinfo(0) + " has not succeeded.",bc_map;
 	warp "geffen",120,110;
 	end;
@@ -1616,7 +1616,7 @@ OnInit:
 	disablenpc "Room of Fire#Failed";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "geffen",120,110;
 	end;
 }

npc/jobs/2-1e/StarGladiator.txt

@@ -327,7 +327,7 @@ payon,215,102,3	script	Moohyun#job_star	828,3,3,{
 	mes "they meet the right people~";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 0) {
 			mes "[Moohyun]";

npc/jobs/2-2/crusader.txt

@@ -1205,7 +1205,7 @@ OnDead:
 
 
 job_cru,98,105,4	script	 Summoner#cr5	45,3,3,{
-OnTouch:
+OnTouch_:
 	set CRUS_Q,6;
 	changequest 3010,3011;
 	warp "prt_castle",164,28;
@@ -1253,7 +1253,7 @@ OnStart:
 }
 
 job_cru,168,17,0	script	Zombie Guide	-1,2,2,{
-OnTouch:
+OnTouch_:
 	mes "[Bliant Piyord]";
 	mes "Go forth and defeat all";
 	mes "the monsters that appear.";
@@ -1324,7 +1324,7 @@ OnInit:
 	disablenpc "Monster Summon#cr1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster1";
 	donpcevent "Monster Summon#cr1::OnEnd";
 	end;
@@ -1343,7 +1343,7 @@ OnInit:
 	disablenpc "Monster Summon#cr2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster2";
 	donpcevent "Monster Summon#cr2::OnEnd";
 	end;
@@ -1362,7 +1362,7 @@ OnInit:
 	disablenpc "Monster Summon#cr3";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Monster Summon#cr0::OnMonster3";
 	donpcevent "Monster Summon#cr3::OnEnd";
 	end;
@@ -1381,7 +1381,7 @@ OnInit:
 	disablenpc "Monster Summon#cr4";
 	end;
 
-OnTouch:
+OnTouch_:
 	monster "job_cru",168,150,strcharinfo(0),1036,1,"Monster Summon#cr4-a::OnDead";
 	donpcevent "Monster Summon#cr4::OnEnd";
 	end;
@@ -1415,7 +1415,7 @@ OnInit:
 	disablenpc "Monster Summon#cr5";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "prt_castle",35,147;
 	donpcevent "Monster Summon#cr0::OnReset";
 	donpcevent "Monster Summon#cr4::OnReset";

npc/jobs/2-2/dancer.txt

@@ -1236,7 +1236,7 @@ OnTimer89000:
 }
 
 job_duncer,69,110,0	script	dance#return	-1,1,4,{
-OnTouch:
+OnTouch_:
 	mapannounce "job_duncer","Good! Well done! Go back to Bijou!",bc_map;
 	set DANC_Q,9;
 	changequest 7005,7006;
@@ -1256,7 +1256,7 @@ OnEnable:
 }
 
 job_duncer,66,110,0	script	dance#return#2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set DANC_Q,9;
 	warp "comodo",188,162;
 	end;
@@ -1272,7 +1272,7 @@ OnEnable:
 }
 
 job_duncer,72,110,0	script	dance#return#3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set DANC_Q,9;
 	warp "comodo",188,162;
 	end;
@@ -1291,7 +1291,7 @@ OnEnable:
 // Dance Move Triggers
 //============================================================ 
 -	script	dancestep::StepTrigger	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Backdancer#1::OnOmg";
 	mapannounce "job_duncer"," " + strcharinfo(0) + ", you lack rhythm... Your timing was too late!",bc_map;
 	set DANC_Q,8;

npc/jobs/2-2/monk.txt

@@ -292,7 +292,7 @@ prt_monk,59,247,1	script	Guarding Monk#mk	120,6,2,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (MONK_Q == 0) {
 		mes "[Tohobu]";
 		mes "How dare you set foot in";
@@ -1968,7 +1968,7 @@ monk_test,386,388,4	script	Apprentice Monk#mk	110,{
 }
 
 monk_test,387,350,0	script	Supervisor#race_monk	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (MONK_Q >= 15 && MONK_Q <= 23) {
 		set MONK_Q,MONK_Q+1;
 		warp "monk_test",385,388;
@@ -1993,7 +1993,7 @@ OnTouch:
 }
 
 monk_test,82,384,0	script	Trap#t_monk1_1::MonkTrap	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce "monk_test",""+ strcharinfo(0) + ", you're trapped. You will be returned.",bc_map;
 	warp "monk_test",387,387;
 	end;
@@ -2262,7 +2262,7 @@ monk_test,82,85,1	script	Proctor#mk	95,{
 }
 
 monk_test,144,277,0	script	mob_monk#1_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",144,277,"Zombie",1015,1;
 	monster "monk_test",144,277,"Zombie",1015,1;
 	monster "monk_test",144,277,"Zombie",1015,1;
@@ -2275,7 +2275,7 @@ OnDisable:
 }
 
 monk_test,134,291,0	script	mob_monk#1_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",134,291,"Zombie",1015,1;
 	monster "monk_test",134,291,"Zombie",1015,1;
 	monster "monk_test",134,291,"Zombie",1015,1;
@@ -2288,7 +2288,7 @@ OnDisable:
 }
 
 monk_test,157,284,0	script	mob_monk#1_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",157,284,"Mummy",1041,1;
 	end;
 
@@ -2298,7 +2298,7 @@ OnDisable:
 }
 
 monk_test,156,261,0	script	mob_monk#1_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",156,261,"Mummy",1041,1;
 	end;
 
@@ -2308,7 +2308,7 @@ OnDisable:
 }
 
 monk_test,149,268,0	script	mob_monk#1_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",149,268,"Zombie",1015,1;
 	monster "monk_test",149,268,"Zombie",1015,1;
 	monster "monk_test",149,268,"Zombie",1015,1;
@@ -2322,7 +2322,7 @@ OnDisable:
 }
 
 monk_test,166,278,0	script	exit_monk#1	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;
@@ -2369,7 +2369,7 @@ monk_test,88,91,1	script	Proctor#mk2	52,{
 }
 
 monk_test,140,181,0	script	mob_monk#2_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",140,181,"Zombie",1015,1;
 	monster "monk_test",140,181,"Zombie",1015,1;
 	monster "monk_test",140,181,"Zombie",1015,1;
@@ -2382,7 +2382,7 @@ OnDisable:
 }
 
 monk_test,150,164,0	script	mob_monk#2_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",150,164,"Zombie",1015,1;
 	monster "monk_test",150,164,"Zombie",1015,1;
 	monster "monk_test",150,164,"Zombie",1015,1;
@@ -2395,7 +2395,7 @@ OnDisable:
 }
 
 monk_test,158,192,0	script	mob_monk#2_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",158,192,"Mummy",1041,1;
 	end;
 
@@ -2405,7 +2405,7 @@ OnDisable:
 }
 
 monk_test,165,186,0	script	mob_monk#2_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",165,186,"Mummy",1041,1;
 	end;
 
@@ -2415,7 +2415,7 @@ OnDisable:
 }
 
 monk_test,162,182,0	script	mob_monk#2_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",162,182,"Zombie",1015,1;
 	monster "monk_test",162,182,"Zombie",1015,1;
 	monster "monk_test",162,182,"Zombie",1015,1;
@@ -2429,7 +2429,7 @@ OnDisable:
 }
 
 monk_test,166,178,0	script	exit_monk#2	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;
@@ -2476,7 +2476,7 @@ monk_test,95,85,1	script	Proctor#btl#3	79,{
 }
 
 monk_test,249,277,0	script	mob_monk#3_1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",249,277,"Zombie",1015,1;
 	monster "monk_test",249,277,"Zombie",1015,1;
 	monster "monk_test",249,277,"Zombie",1015,1;
@@ -2488,7 +2488,7 @@ OnDisable:
 }
 
 monk_test,231,296,0	script	mob_monk#3_2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",231,296,"Zombie",1015,1;
 	monster "monk_test",231,296,"Zombie",1015,1;
 	monster "monk_test",231,296,"Zombie",1015,1;
@@ -2501,7 +2501,7 @@ OnDisable:
 }
 
 monk_test,264,292,0	script	mob_monk#3_3	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",264,292,"Mummy",1041,1;
 	end;
 
@@ -2511,7 +2511,7 @@ OnDisable:
 }
 
 monk_test,252,284,0	script	mob_monk#3_4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",252,284,"Mummy",1041,1;
 	end;
 
@@ -2521,7 +2521,7 @@ OnDisable:
 }
 
 monk_test,257,285,0	script	mob_monk#3_5	-1,1,1,{
-OnTouch:
+OnTouch_:
 	monster "monk_test",257,285,"Zombie",1015,1;
 	monster "monk_test",257,285,"Zombie",1015,1;
 	monster "monk_test",257,285,"Zombie",1015,1;
@@ -2536,7 +2536,7 @@ OnDisable:
 }
 
 monk_test,270,278,0	script	exit_monk#3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Proctor]";
 	mes "You did well. Please return to Tomoon, he's waiting for you.";
 	set MONK_Q,27;

npc/jobs/2-2/rogue.txt

@@ -1016,7 +1016,7 @@ S_CheckItems:
 }
 
 cmd_fild09,106,195,0	script	Warp#1	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1086,7 +1086,7 @@ OnTouch:
 }
 
 cmd_fild09,335,143,0	script	Warp#2	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1156,7 +1156,7 @@ OnTouch:
 }
 
 cmd_fild04,304,180,0	script	Warp#3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Who's there?!";
 	mes "Who would dare";
@@ -1276,7 +1276,7 @@ in_rogue,272,135,1	script	Hermanthorn Jr#rg	85,{
 }
 
 in_rogue,270,130,0	script	he_to_rogue#rg	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
 	next;
 	input .@input;
@@ -1313,7 +1313,7 @@ OnTouch:
 }
 
 in_rogue,200,389,0	script	gen_ro#1	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",200,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
 		monster "in_rogue",201,389,"Zombie",1015,1,"gen_ro#1::OnMyMobDead";
@@ -1334,7 +1334,7 @@ OnMyMobDead:
 }
 
 in_rogue,100,389,0	script	gen_ro#2	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",100,389,"Mummy",1041,1,"gen_ro#2::OnMyMobDead";
 		donpcevent "gen_ro#1::OnDisable";
@@ -1352,7 +1352,7 @@ OnMyMobDead:
 }
 
 in_rogue,150,389,0	script	gen_ro#3	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",145,389,"Zombie",1015,1,"gen_ro#3::OnMyMobDead";
 		monster "in_rogue",143,389,"Mummy",1041,1,"gen_ro#3::OnMyMobDead";
@@ -1371,7 +1371,7 @@ OnMyMobDead:
 }
 
 in_rogue,250,389,0	script	gen_ro#4	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",200,389,"Abysmal Knight",1219,1,"gen_ro#4::OnMyMobDead";
 		donpcevent "gen_ro#3::OnDisable";
@@ -1389,7 +1389,7 @@ OnMyMobDead:
 }
 
 in_rogue,9,389,0	script	oneway_to_gu	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "gen_ro#4::OnDisable";
 	set ROGUE_Q,17;
 	warp "in_rogue",367,10;
@@ -1654,14 +1654,14 @@ in_rogue,177,109,1	script	Antonio junior#rg	88,{
 }
 
 in_rogue,370,320,0	script	quest_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	set ROGUE_Q,16;
 	warp "in_rogue",378,113;
 	end;
 }
 
 in_rogue,15,184,0	script	mob_rogue#1	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",14,187,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
 		monster "in_rogue",15,188,"Zombie",1015,1,"mob_rogue#1::OnMyMobDead";
@@ -1683,7 +1683,7 @@ OnMyMobDead:
 }
 
 in_rogue,15,273,0	script	mob_rogue#2	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",15,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
 		monster "in_rogue",13,276,"Mummy",1041,1,"mob_rogue#2::OnMyMobDead";
@@ -1702,7 +1702,7 @@ OnMyMobDead:
 }
 
 in_rogue,15,333,0	script	mob_rogue#3	-1,8,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
 		monster "in_rogue",15,336,"Zombie",1015,1,"mob_rogue#3::OnMyMobDead";
@@ -1725,7 +1725,7 @@ OnMyMobDead:
 }
 
 in_rogue,39,341,0	script	mob_rogue#4	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",39,341,"Mummy",1041,1,"mob_rogue#4::OnMyMobDead";
 		monster "in_rogue",40,341,"Ghoul",1036,1,"mob_rogue#4::OnMyMobDead";
@@ -1745,7 +1745,7 @@ OnMyMobDead:
 }
 
 in_rogue,102,334,0	script	mob_rogue#5	-1,1,4,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",92,334,"Khalitzburg",1132,1,"mob_rogue#5::OnMyMobDead";
 		donpcevent "mob_rogue#1::OnDisable";
@@ -1765,7 +1765,7 @@ OnMyMobDead:
 }
 
 in_rogue,58,309,0	script	mob_rogue#6	-1,4,1,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",57,301,"Khalitzburg",1132,1,"mob_rogue#6::OnMyMobDead";
 		donpcevent "mob_rogue#1::OnDisable";
@@ -1785,7 +1785,7 @@ OnMyMobDead:
 }
 
 in_rogue,101,264,0	script	mob_rogue#7	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",101,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
 		monster "in_rogue",102,264,"Abysmal Knight",1219,1,"mob_rogue#7::OnMyMobDead";
@@ -1803,7 +1803,7 @@ OnMyMobDead:
 }
 
 in_rogue,140,312,0	script	mob_rogue#8	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		monster "in_rogue",140,312,"Abysmal Knight",1219,1,"mob_rogue#8::OnMyMobDead";
 	else
@@ -1819,7 +1819,7 @@ OnMyMobDead:
 }
 
 in_rogue,139,246,0	script	mob_rogue#9	-1,4,4,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",139,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
 		monster "in_rogue",149,246,"Zombie",1015,1,"mob_rogue#9::OnMyMobDead";
@@ -1841,7 +1841,7 @@ OnMyMobDead:
 }
 
 in_rogue,197,249,0	script	mob_rogue#10	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",176,211,"Ghoul",1036,1,"mob_rogue#10::OnMyMobDead";
 		monster "in_rogue",176,212,"Zombie",1015,1,"mob_rogue#10::OnMyMobDead";
@@ -1876,7 +1876,7 @@ OnMyMobDead:
 }
 
 in_rogue,96,205,0	script	mob_rogue#11	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		donpcevent "mob_rogue#7::OnDisable";
 		donpcevent "mob_rogue#8::OnDisable";
@@ -1889,7 +1889,7 @@ OnTouch:
 }
 
 in_rogue,86,187,0	script	mob_rogue#12	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",90,187,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
 		monster "in_rogue",90,183,"Mummy",1041,1,"mob_rogue#12::OnMyMobDead";
@@ -1908,7 +1908,7 @@ OnMyMobDead:
 }
 
 in_rogue,223,187,0	script	mob_rogue#13	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",236,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
 		monster "in_rogue",238,186,"Abysmal Knight",1219,1,"mob_rogue#13::OnMyMobDead";
@@ -1928,7 +1928,7 @@ OnMyMobDead:
 }
 
 in_rogue,233,207,0	script	mob_rogue#14	-1,8,3,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		donpcevent "mob_rogue#13::OnDisable";
 	else
@@ -1937,7 +1937,7 @@ OnTouch:
 }
 
 in_rogue,244,319,0	script	mob_rogue#15	-1,1,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief) {
 		monster "in_rogue",240,319,"Mummy",1041,1,"mob_rogue#15::OnMyMobDead";
 		monster "in_rogue",259,319,"Archer Skeleton",1016,1,"mob_rogue#15::OnMyMobDead";
@@ -1959,7 +1959,7 @@ OnMyMobDead:
 }
 
 in_rogue,334,319,0	script	mob_rogue#16	-1,8,8,{
-OnTouch:
+OnTouch_:
 	if (BaseJob == Job_Thief)
 		donpcevent "mob_rogue#15::OnDisable";
 	else

npc/jobs/2-2e/SoulLinker.txt

@@ -334,7 +334,7 @@ OnInit:
 }
 
 job_soul,30,31,0	script	Maia#link2::SLTester	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (Class == Job_Taekwon) {
 		if (JobLevel < 40) {
 			set getvariableofnpc(.SoulLinkerTest,"Kid#link1"),0;

npc/mapflag/nocostume.txt

@@ -0,0 +1,28 @@
+//===== rAthena Script =======================================
+//= Mapflag: nocostume
+//===== Description: =========================================
+//= A mapflag to disable costume's sprite on map.
+//= Usage:
+//=     [mapname]	mapflag	nocostume
+//===== Changelogs: ==========================================
+//= 1.0 Initial release. [Cydh]
+//= 1.0.1 Added arug_dun01 and schg_dun01 to the list. [Cydh]
+//============================================================
+
+// WOE:TE Castles =========
+te_prtcas01	mapflag	nocostume
+te_prtcas02	mapflag	nocostume
+te_prtcas03	mapflag	nocostume
+te_prtcas04	mapflag	nocostume
+te_prtcas05	mapflag	nocostume
+te_aldecas1	mapflag	nocostume
+te_aldecas2	mapflag	nocostume
+te_aldecas3	mapflag	nocostume
+te_aldecas4	mapflag	nocostume
+te_aldecas5	mapflag	nocostume
+
+// Guild Dungeons =========
+teg_dun01	mapflag	nocostume
+teg_dun02	mapflag	nocostume
+arug_dun01	mapflag	nocostume
+schg_dun01	mapflag	nocostume

npc/other/arena/arena_aco.txt

@@ -18,7 +18,7 @@
 //============================================================
 
 arena_room,114,102,0	script	onlyaco#arena	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Acolyte) {
 		warp "arena_room",135,129;
 		end;
@@ -49,7 +49,7 @@ OnStart:
 }
 
 force_5-1,100,12,0	script	arena#aco	-1,5,5,{
-OnTouch:
+OnTouch_:
 	donpcevent "allkill#aco::OnEnable";
 	if (BaseJob == Job_Acolyte) {
 		donpcevent "arena_aco1::OnStart";
@@ -274,7 +274,7 @@ On09_End:
 }
 
 force_5-1,40,26,0	script	force_01start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#aco::OnEnable";
 	disablenpc "force_01start#aco";
 	end;
@@ -303,7 +303,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,69,0	script	force_02start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set $@drop_gate,0;
 	donpcevent "force_02mob#aco::OnEnable";
 	disablenpc "force_02start#aco";
@@ -330,7 +330,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,159,0	script	force_03start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#aco::OnEnable";
 	disablenpc "force_03start#aco";
 }
@@ -354,7 +354,7 @@ OnMyMobDead:
 }
 
 force_5-1,69,174,0	script	force_04start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::On04_Start";
 	donpcevent "arena_aco1::OnReset_04";
 	percentheal 50,50;
@@ -363,7 +363,7 @@ OnTouch:
 }
 
 force_5-1,159,174,0	script	force_05start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#aco::OnEnable";
 	disablenpc "force_05start#aco";
 	end;
@@ -388,7 +388,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,130,0	script	force_06start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06mob#aco::OnEnable";
 	donpcevent "arena_aco1::OnReset_06";
 	disablenpc "force_06start#aco";
@@ -426,7 +426,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,40,0	script	force_07start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#aco::OnEnable";
 	disablenpc "force_07start#aco";
 }
@@ -454,7 +454,7 @@ OnMyMobDead:
 }
 
 force_5-1,132,26,0	script	force_08start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	percentheal 50,50;
 	donpcevent "Trocco#aco1::On08_Start";
 	donpcevent "arena_aco1::OnReset_08";
@@ -463,7 +463,7 @@ OnTouch:
 }
 
 force_5-1,99,82,0	script	force_09start#aco	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::On09_Start";
 	donpcevent "force_09mob#aco::OnEnable";
 	disablenpc "force_09start#aco";
@@ -710,7 +710,7 @@ On09_End:
 }
 
 force_5-1,40,26,0	script	force_01start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#pri::OnEnable";
 	disablenpc "force_01start#pri";
 	end;
@@ -735,7 +735,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,69,0	script	force_02start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 70) {
 		donpcevent "force_02mob#pri::OnOn1";
 	}
@@ -770,7 +770,7 @@ OnMyMobDead:
 }
 
 force_5-1,25,159,0	script	force_03start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#pri::OnEnable";
 	disablenpc "force_03start#pri";
 	end;
@@ -795,7 +795,7 @@ OnMyMobDead:
 }
 
 force_5-1,69,174,0	script	force_04start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (BaseLevel < 90) {
 		donpcevent "force_04mob#pri::OnOn1";
 	}
@@ -836,7 +836,7 @@ OnMyMobDead:
 }
 
 force_5-1,159,174,0	script	force_05start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#pri::OnEnable";
 	if (BaseLevel < 70) {
 		donpcevent "force_05ex#pri::OnOn1";
@@ -885,7 +885,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,130,0	script	force_06start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06ex#pri::OnEnable";
 	if (BaseLevel < 70) {
 		donpcevent "force_06mob#pri::OnOn1";
@@ -943,7 +943,7 @@ OnMyMobDead:
 }
 
 force_5-1,174,40,0	script	force_07start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#pri::OnEnable";
 	disablenpc "force_07start#pri";
 	end;
@@ -968,7 +968,7 @@ OnMyMobDead:
 }
 
 force_5-1,132,26,0	script	force_08start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco2::On08_Start";
 	donpcevent "arena_aco2::OnReset_08";
 	disablenpc "force_08start#pri";
@@ -976,7 +976,7 @@ OnTouch:
 }
 
 force_5-1,99,82,0	script	force_09start#pri	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco2::On09_Start";
 	if (BaseLevel < 70) {
 		donpcevent "force_09mob#pri::OnOn4";
@@ -1027,7 +1027,7 @@ OnMyMobDead:
 }
 
 force_5-1,62,26,0	script	force_08_01#aco	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "force_5-1",40,26;
 	if (BaseJob == Job_Acolyte) {
 		enablenpc "force_01start#aco";
@@ -1039,7 +1039,7 @@ OnTouch:
 }
 
 force_5-1,99,124,0	script	force_exit#aco	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Trocco#aco1::OnTimerOff";
 	donpcevent "#arn_timer_aco::OnEnable";
 	mapwarp "force_5-1","prt_are_in",21,35;
@@ -1486,7 +1486,7 @@ OnHide:
 	disablenpc "arn_warp_aco";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "arena_room",100,75;
 	donpcevent "arn_warp_aco::OnHide";
 	end;

npc/other/arena/arena_lvl50.txt

@@ -292,21 +292,21 @@ OnReset_All:
 }
 
 force_1-1,62,26,1	script	force_08_01#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On01_Start";
 	warp "force_1-1",40,26;
 	end;
 }
 
 force_1-1,25,44,1	script	force_01_02#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On02_Start";
 	warp "force_1-1",25,69;
 	end;
 }
 
 force_1-1,25,134,1	script	force_02_03#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "arena#50::OnReset_02";
 	donpcevent "Heel and Toe#arena::On03_Start";
 	warp "force_1-1",25,159;
@@ -314,35 +314,35 @@ OnTouch:
 }
 
 force_1-1,44,174,1	script	force_03_04#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On04_Start";
 	warp "force_1-1",69,174;
 	end;
 }
 
 force_1-1,134,174,1	script	force_04_05#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On05_Start";
 	warp "force_1-1",159,174;
 	end;
 }
 
 force_1-1,174,155,1	script	force_05_06#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On06_Start";
 	warp "force_1-1",174,130;
 	end;
 }
 
 force_1-1,174,65,1	script	force_06_07#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On07_Start";
 	warp "force_1-1",174,40;
 	end;
 }
 
 force_1-1,155,26,1	script	force_07_08#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On08_Start";
 	warp "force_1-1",132,26;
 	enablenpc "force_08_09#50";
@@ -350,14 +350,14 @@ OnTouch:
 }
 
 force_1-1,99,54,1	script	force_08_09#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::On09_Start";
 	warp "force_1-1",99,82;
 	end;
 }
 
 force_1-1,99,124,1	script	force_exit#50	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Heel and Toe#arena::OnTimerOff";
 	donpcevent "#arn_timer_50::OnEnable";
 	mapwarp "force_1-1","prt_are_in",22,191,0,0;

npc/other/arena/arena_lvl60.txt

@@ -302,21 +302,21 @@ OnReset_All:
 }
 
 force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
 
 force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
 
 force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "arena#60::OnReset_02";
 	donpcevent "Minilover#arena::On03_Start";
 	warp "force_2-1",25,159;
@@ -324,35 +324,35 @@ OnTouch:
 }
 
 force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
 
 force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
 
 force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
 
 force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
 
 force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
 	enablenpc "force_08_09#60";
@@ -360,14 +360,14 @@ OnTouch:
 }
 
 force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
 
 force_2-1,99,124,1	script	force_exit#60	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Minilover#arena::OnTimerOff";
 	donpcevent "#arn_timer_60::OnEnable";
 	mapwarp "force_2-1","prt_are_in",22,139,0,0;

npc/other/arena/arena_lvl70.txt

@@ -310,56 +310,56 @@ OnReset_All:
 }
 
 force_3-1,62,26,1	script	force_08_01#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On01_Start";
 	warp "force_3-1",40,26;
 	end;
 }
 
 force_3-1,25,44,1	script	force_01_02#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On02_Start";
 	warp "force_3-1",25,69;
 	end;
 }
 
 force_3-1,25,134,1	script	force_02_03#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On03_Start";
 	warp "force_3-1",25,159;
 	end;
 }
 
 force_3-1,44,174,1	script	force_03_04#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On04_Start";
 	warp "force_3-1",69,174;
 	end;
 }
 
 force_3-1,134,174,1	script	force_04_05#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On05_Start";
 	warp "force_3-1",159,174;
 	end;
 }
 
 force_3-1,174,155,1	script	force_05_06#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On06_Start";
 	warp "force_3-1",174,130;
 	end;
 }
 
 force_3-1,174,65,1	script	force_06_07#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On07_Start";
 	warp "force_3-1",174,40;
 	end;
 }
 
 force_3-1,155,26,1	script	force_07_08#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On08_Start";
 	warp "force_3-1",132,26;
 	enablenpc "force_08_09#70";
@@ -367,14 +367,14 @@ OnTouch:
 }
 
 force_3-1,99,54,1	script	force_08_09#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::On09_Start";
 	warp "force_3-1",99,82;
 	end;
 }
 
 force_3-1,99,124,1	script	force_exit#70	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Cadillac#arena::OnTimerOff";
 	donpcevent "#arn_timer_70::OnEnable";
 	mapwarp "force_3-1","prt_are_in",22,87,0,0;

npc/other/arena/arena_lvl80.txt

@@ -313,28 +313,28 @@ OnReset_All:
 }
 
 force_4-1,62,26,1	script	force_08_01#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On01_Start";
 	warp "force_4-1",40,26;
 	end;
 }
 
 force_4-1,25,44,1	script	force_01_02#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On02_Start";
 	warp "force_4-1",25,69;
 	end;
 }
 
 force_4-1,25,134,1	script	force_02_03#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On03_Start";
 	warp "force_4-1",25,159;
 	end;
 }
 
 force_4-1,44,174,1	script	force_03_04#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On04_Start";
 	warp "force_4-1",69,174;
 	end;
@@ -342,28 +342,28 @@ OnTouch:
 }
 
 force_4-1,134,174,1	script	force_04_05#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On05_Start";
 	warp "force_4-1",159,174;
 	end;
 }
 
 force_4-1,174,155,1	script	force_05_06#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On06_Start";
 	warp "force_4-1",174,130;
 	end;
 }
 
 force_4-1,174,65,1	script	force_06_07#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On07_Start";
 	warp "force_4-1",174,40;
 	end;
 }
 
 force_4-1,155,26,1	script	force_07_08#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On08_Start";
 	warp "force_4-1",132,26;
 	enablenpc "force_08_09#80";
@@ -371,14 +371,14 @@ OnTouch:
 }
 
 force_4-1,99,54,1	script	force_08_09#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::On09_Start";
 	warp "force_4-1",99,82;
 	end;
 }
 
 force_4-1,99,124,1	script	force_exit#80	45,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "Octus#arena::OnTimerOff";
 	donpcevent "#arn_timer_80::OnEnable";
 	mapwarp "force_4-1","prt_are_in",73,192,0,0;

npc/other/arena/arena_party.txt

@@ -91,7 +91,7 @@ OnInit:
 	disablenpc "toarena#party";
 	end;
 
-OnTouch:
+OnTouch_:
 	if(Zeny < 1000)
 		warp "arena_room",100,75;
 	else {
@@ -125,7 +125,7 @@ OnTimer70000:
 	donpcevent "Ponox::OnStart";
 	disablenpc "toout#party";
 
-OnTouch:
+OnTouch_:
 	set $arn_partywait,0;
 	warp "arena_room",100,75;
 
@@ -140,7 +140,7 @@ OnStop:
 }
 
 prt_are_in,73,74,0	script	arena_out	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set $arn_partywait,0;
 	warp "arena_room",100,75;
 	end;
@@ -413,7 +413,7 @@ OnReset:
 }
 
 force_1-2,95,187,0	script	force_09_exit	45,1,1,{
-OnTouch:
+OnTouch_:
 	set $arena_minptend,gettime(2);
 	set $arena_secptend,gettime(1);
 	warp "prt_are_in",73,139;
@@ -424,7 +424,7 @@ OnTouch:
 }
 
 force_1-2,36,26,0	script	force_01start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_01mob#party::OnEnable";
 	disablenpc "force_01start#party";
 	end;
@@ -479,7 +479,7 @@ OnMyMobDead:
 }
 
 force_1-2,162,26,0	script	force_02start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_02mob#party::OnEnable";
 	disablenpc "force_02start#party";
 	end;
@@ -538,7 +538,7 @@ OnMyMobDead:
 }
 
 force_1-2,99,66,0	script	force_03start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_03mob#party::OnEnable";
 	disablenpc "force_03start#party";
 	end;
@@ -593,7 +593,7 @@ OnMyMobDead:
 }
 
 force_1-2,162,78,0	script	force_04start#party	-1,3,3,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_04mob#party::OnEnable";
 	disablenpc "force_04start#party";
 	end;
@@ -640,7 +640,7 @@ OnMyMobDead:
 }
 
 force_1-2,36,77,0	script	force_05start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_05mob#party::OnEnable";
 	disablenpc "force_05start#party";
 	end;
@@ -687,7 +687,7 @@ OnMyMobDead:
 }
 
 force_1-2,26,118,0	script	force_06start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_06mob#party::OnEnable";
 	disablenpc "force_06start#party";
 	end;
@@ -733,7 +733,7 @@ OnMyMobDead:
 }
 
 force_1-2,92,124,0	script	force_07start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_07mob#party::OnEnable";
 	disablenpc "force_07start#party";
 	end;
@@ -769,7 +769,7 @@ OnMyMobDead:
 }
 
 force_1-2,173,118,0	script	force_08start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_08mob#party::OnEnable";
 	disablenpc "force_08start#party";
 	end;
@@ -812,7 +812,7 @@ OnMyMobDead:
 }
 
 force_1-2,133,178,0	script	force_09start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_09mob#party::OnEnable";
 	disablenpc "force_09start#party";
 	end;
@@ -852,7 +852,7 @@ OnMyMobDead:
 }
 
 force_1-2,29,178,0	script	force_10start#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_10mob-1#party::OnEnable";
 	disablenpc "force_10start#party";
 	end;
@@ -904,7 +904,7 @@ OnMyMobDead:
 }
 
 force_1-2,59,178,0	script	force_exit#party	-1,1,1,{
-OnTouch:
+OnTouch_:
 	donpcevent "force_exitmob#party::OnEnable";
 	disablenpc "force_exit#party";
 	end;

npc/other/fortune.txt

@@ -2643,7 +2643,7 @@ payon_in03,118,119,1	script	Ascetic	4W_F_01,2,2,{
 	mes "Kiss me~~";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Kissy-Kissy]";
 	mes "NyangNyangNyang~";
 	mes "NyaNyangNyaNyang~";

npc/other/hugel_bingo.txt

@@ -747,14 +747,14 @@ OnInit:
 	disablenpc "out3#bingo";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_bingo",40,121;
 	end;
 }
 
 que_bingo,49,136,0	script	go3#bingo	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	switch($@hu_bingob) {
 		case 0: warp "que_bingo",49,125; break;
 		case 1: warp "que_bingo",53,121; break;

npc/other/msg_boards.txt

@@ -225,7 +225,7 @@ aldebaran,54,223,1	script	Billboard#Alde3	111,{
 }
 
 aldebaran,197,228,1	script	#Alde4	-1,1,1,{
-OnTouch:
+OnTouch_:
 	mes "[Home Owner]";
 	mes "Get off my roof you no good leecher!";
 	close;

npc/other/poring_war.txt

@@ -1045,7 +1045,7 @@ OnDisable:
 	disablenpc "#wop_warp_a";
 	end;
 
-OnTouch:
+OnTouch_:
 	set wop_team,1;
 	warp "poring_w02",57,82;
 	end;
@@ -1067,7 +1067,7 @@ OnDisable:
 	disablenpc "#wop_warp_d";
 	end;
 
-OnTouch:
+OnTouch_:
 	set wop_team,2;
 	warp "poring_w02",140,82;
 	end;
@@ -1522,7 +1522,7 @@ OnDisable:
 	disablenpc "#aroom_ingate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",99,49;
 	end;
 }
@@ -1542,7 +1542,7 @@ OnDisable:
 	disablenpc "#aroom_outgate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",99,54;
 	end;
 }
@@ -1619,7 +1619,7 @@ OnDisable:
 	disablenpc "#droom_ingate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",98,116;
 	end;
 }
@@ -1639,7 +1639,7 @@ OnDisable:
 	disablenpc "#droom_outgate_wop";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "poring_w02",98,111;
 	end;
 }

npc/other/pvp.txt

@@ -397,7 +397,7 @@ pvp_room,86,85,4	duplicate(PVPSpectator)	Spectator's Entrance#4	105
 // Spectator Warps
 //============================================================ 
 -	script	Combat Square Staff#dum::PVPSpecWarp	-1,{
-OnTouch:
+OnTouch_:
 	mes "[Combat Square Staff]";
 	mes "May I help you?";
 	if (select("To the center viewer seat.:Leave Combat Square.") == 1) {
@@ -432,7 +432,7 @@ pvp_2vs2,40,40,0	script	Combat Square Staff#5	45,1,1,{
 // PVP Area Exit warp
 //============================================================ 
 pvp_room,51,19,0	script	out#eventpvp	45,4,2,{
-OnTouch:
+OnTouch_:
 	mes "[Combat Square Staff]";
 	mes "Did you have fun in Combat Square?";
 	mes "May I ask where you want to go?";

npc/other/turbo_track.txt

@@ -90,7 +90,7 @@ turbo_n_1,298,167,3	duplicate(Helper#tt_main)	Helper#n1_F	124
 turbo_e_4,298,167,0	script	Point#tt_main	-1,15,15,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (tt_point < 28999) {
 		set tt_point,tt_point+2;
 		warp strnpcinfo(4),59,364;
@@ -415,7 +415,7 @@ turbo_n_8,167,3,0	duplicate(Master#tt_main)	Master#n16	-1
 turbo_n_1,167,3,0	duplicate(Master#tt_main)	Master#n1	-1
 
 -	script	NoUnfair#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	warp strnpcinfo(4),59,364;
 	end;
 }
@@ -435,7 +435,7 @@ turbo_n_1,62,379,0	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-1	-1,0,31
 turbo_n_1,68,379,5	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-2	-1,5,31
 
 -	script	LogTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch (rand(1,3)) {
 		case 1: warp strnpcinfo(4),72,372; end;
 		case 2: warp strnpcinfo(4),72,365; end;
@@ -990,7 +990,7 @@ turbo_n_1,145,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-14	-1,1,2
 turbo_n_1,148,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-15	-1,1,2
 
 -	script	SandTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,10)) {
 		case 1:
 		case 9:
@@ -1178,7 +1178,7 @@ turbo_n_1,382,363,0	duplicate(SandTrap#tt_main)	#TBT_trap_n1-22	-1,2,2
 turbo_n_1,381,354,0	duplicate(SandTrap#tt_main)	#TBT_trap_n1-23	-1,1,1
 
 -	script	Trap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	if (rand(1,3) == 1) {
 		set .@w$,callfunc("F_tt");
 		cutin "kafra_03",2;
@@ -1248,7 +1248,7 @@ turbo_n_16,355,362,0	duplicate(Trap#tt_main)	#TBT_trap_n16-24	-1,3,3
 turbo_n_1,355,362,0	duplicate(Trap#tt_main)	#TBT_trap_n1-24	-1,3,3
 
 -	script	WaterTrap#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	sc_start SC_BLIND,60000,0;
 	end;
 }
@@ -1611,7 +1611,7 @@ turbo_n_1,90,241,0	duplicate(WaterTrap#tt_main)	flasher#n1-48a	-1,1,0
 turbo_n_1,236,3,0	duplicate(WaterTrap#tt_main)	flasher#n1-48b	-1,3,0
 
 -	script	snake01#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,7);
 	if (.@turbo2 < 3) warp strnpcinfo(4),370,292;
 	if (.@turbo2 < 5) warp strnpcinfo(4),295,293;
@@ -1628,7 +1628,7 @@ turbo_n_16,324,279,0	duplicate(snake01#tt_main)	snake01#n16	45,1,1
 turbo_n_1,324,279,0	duplicate(snake01#tt_main)	snake01#n1	45,1,1
 
 -	script	snake02#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,8);
 	if (.@turbo2 < 3) warp strnpcinfo(4),287,256;
 	if (.@turbo2 < 5) warp strnpcinfo(4),303,256;
@@ -1646,7 +1646,7 @@ turbo_n_1,332,279,0	duplicate(snake02#tt_main)	snake02#n1	45,1,1
 
 
 -	script	snake03#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,8);
 	if (.@turbo2 < 3) warp strnpcinfo(4),279,292;
 	if (.@turbo2 < 5) warp strnpcinfo(4),311,292;
@@ -1664,7 +1664,7 @@ turbo_n_1,324,270,0	duplicate(snake03#tt_main)	snake03#n1	45,1,1
 
 
 -	script	snake04#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@turbo2,rand(1,7);
 	if (.@turbo2 < 3) warp strnpcinfo(4),363,256;
 	if (.@turbo2 < 5) warp strnpcinfo(4),295,293;
@@ -1720,7 +1720,7 @@ turbo_n_4,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n4	111
 turbo_n_1,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n1	111
 
 -	script	cos#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@n, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	switch (.@n) {
 		case 1:
@@ -1806,7 +1806,7 @@ turbo_n_1,93,19,0	duplicate(cos#tt_main)	#cos_n1_7	45,1,1
 turbo_n_1,232,14,0	duplicate(cos#tt_main)	#cos_n1_8	45,1,1
 
 turbo_e_16,179,55,0	script	TurboHint_1#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	emotion e_what,1;
 	end;
 }
@@ -1854,7 +1854,7 @@ turbo_n_1,209,61,0	duplicate(TurboHint_1#tt_main)	#n1Intersectionm	-1,1,1
 turbo_n_1,208,56,0	duplicate(TurboHint_1#tt_main)	#n1Intersectionn	-1,1,1
 
 -	script	TurboHint_2#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	end;
 }
@@ -1887,7 +1887,7 @@ turbo_n_1,208,26,0	duplicate(TurboHint_2#tt_main)	#n1CorrectPath8	-1,1,1
 turbo_n_1,191,30,0	duplicate(TurboHint_2#tt_main)	#n1CorrectPath9	-1,1,1
 
 -	script	TurboHint_3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	emotion e_swt2,1;
 	if (rand(1,4) == 3)
 		emotion e_gasp;
@@ -1907,7 +1907,7 @@ turbo_n_1,222,26,0	duplicate(TurboHint_3#tt_main)	#n1NoWayOut3	-1,1,1
 turbo_n_1,219,39,0	duplicate(TurboHint_3#tt_main)	#n1NoWayOut4	-1,1,1
 
 -	script	TurboHint_4#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	emotion e_swt2,1;
 	end;
 }
@@ -1923,7 +1923,7 @@ turbo_n_1,222,65,0	duplicate(TurboHint_4#tt_main)	#n1NoWayOut7	-1,1,1
 
 -	script	cos_end#tt_main	01,{
 	function	GetNumber;
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	if (.@w$ == "n1") set $@end_time,gettimetick(0);
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just arrived at the Finish Line! Congratulations!",bc_map,"0xFFFF00";
@@ -1973,7 +1973,7 @@ turbo_n_16,371,47,0	duplicate(cos_end#tt_main)	#cos_n16_end	45,1,1
 turbo_n_1,371,47,0	duplicate(cos_end#tt_main)	#cos_n1_end	45,1,1
 
 -	script	cos_end2#tt_main	45,1,1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
 	if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28961,40;
@@ -1995,7 +1995,7 @@ turbo_n_8,371,51,0	duplicate(cos_end2#tt_main)	#cos_n8_end2	45,1,1
 turbo_n_16,371,51,0	duplicate(cos_end2#tt_main)	#cos_n16_end2	45,1,1
 
 -	script	cos_end3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),"" + strcharinfo(0) +" is third to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
 	if (.@w$ == "e8" || .@w$ == "n8") setarray .@pts, 28971,30;
@@ -2019,7 +2019,7 @@ turbo_n_8,371,43,0	duplicate(cos_end3#tt_main)	#cos_n8_end3	45,1,1
 turbo_n_16,371,43,0	duplicate(cos_end3#tt_main)	#cos_n16_end3	45,1,1
 
 turbo_e_4,316,365,0	script	DSwitch#tt_main	-1,1,1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	if (rand(1,2) == 1)
 		enablenpc "Flasher_Exit_1#"+.@w$;
@@ -2037,7 +2037,7 @@ turbo_n_16,316,365,0	duplicate(DSwitch#tt_main)	Disposable_Switch#n16	-1,1,1
 turbo_n_1,316,365,0	duplicate(DSwitch#tt_main)	Disposable_Switch#n1	-1,1,1
 
 -	script	Flasher#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Flasher Maze!",bc_map,"0x70DBDB";
 	warp strnpcinfo(4),185,227;
 	end;
@@ -2764,7 +2764,7 @@ OnInit:
 }
 
 -	script	NMaker1#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
 	donpcevent "Turbo Track Guide::OnEnd_"+.@w$;
@@ -2785,7 +2785,7 @@ turbo_n_16,11,91,0	duplicate(NMaker1#tt_main)	Notice_Maker1#TBT_n16	-1,3,3
 turbo_n_1,11,91,0	duplicate(NMaker1#tt_main)	Notice_Maker1#TBT_n1	-1,3,3
 
 -	script	NMaker3#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Single Snail! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
 	disablenpc "Notice_Maker3#TBT_"+.@w$;
@@ -2805,7 +2805,7 @@ turbo_n_16,234,223,0	duplicate(NMaker3#tt_main)	Notice_Maker3#TBT_n16	-1,3,3
 turbo_n_1,234,223,0	duplicate(NMaker3#tt_main)	Notice_Maker3#TBT_n1	-1,3,3
 
 -	script	NMaker4#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is currently in First Place!",bc_map,"0xFFFF00";
 	disablenpc "Notice_Maker4#TBT_"+.@w$;
@@ -2826,7 +2826,7 @@ turbo_n_16,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n16	-1,3,3
 turbo_n_1,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n1	-1,3,3
 
 -	script	warp#tt_main	-1,{
-OnTouch:
+OnTouch_:
 	switch (rand(1,20)) {
 		case 1: warp strnpcinfo(4),216,378; break;
 		case 2: warp strnpcinfo(4),218,360; break;
@@ -2889,7 +2889,7 @@ turbo_n_1,253,364,0	duplicate(warp#tt_main)	Warp#n1_7	-1,2,2
 
 -	script	TurboTrap#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect EF_BLASTMINEBOMB;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
@@ -3526,7 +3526,7 @@ turbo_n_1,368,36,0	duplicate(TurboTrap#tt_main)	trap_n1#F95	139,1,1
 
 -	script	TurboTrap_2#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect EF_FREEZING;
 	set .@HitTrap,10;
 	if (.@HitTrap > 0 && .@HitTrap < 4)
@@ -3592,7 +3592,7 @@ turbo_n_1,340,55,0	duplicate(TurboTrap_2#tt_main)	trap_n1#F48	139,1,1
 
 -	script	bing_1#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	set .@w$,callfunc("F_tt");
 	set .@bing1,rand(1,10);
 	if (.@bing1 > 0 && .@bing1 < 4)
@@ -3618,7 +3618,7 @@ turbo_n_16,217,214,0	duplicate(bing_1#tt_main)	bing#n16	45,3,3
 
 -	script	bing_2#tt_main	-1,{
 	end;
-OnTouch:
+OnTouch_:
 	switch (rand(1,10)) {
 		case 1: warp strnpcinfo(4),217,232; break;
 		case 2: warp strnpcinfo(4),233,207; break;
@@ -4594,7 +4594,7 @@ S_ExchangePoints:
 }
 
 alde_gld,183,204,0	script	en_turbo	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";

npc/pre-re/jobs/1-1/mage.txt

@@ -104,7 +104,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 				mes "[Mage Guildsman]";
 				mes "Now it's time for";
 				mes "me to give you the test.";
-				switch(rand(3)) {
+				switch(rand(0,3)) {
 				case 1:
 					mes "Make me a ^3355FFMixed Solution No. 1^000000";
 					mes "and bring it back to me.";
@@ -207,9 +207,6 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		mes "Congratulations!";
 		mes "You are now a Mage!";
 		next;
-		callfunc "Job_Change",Job_Mage;
-		callfunc "F_ClearJobVar";
-		set Zeny,Zeny+50;
 		if(checkquest(1005) != -1) {
 			completequest 1005;
 		}
@@ -222,6 +219,9 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		else {
 			completequest 1008;
 		}
+		callfunc "Job_Change",Job_Mage;
+		callfunc "F_ClearJobVar";
+		set Zeny,Zeny+50;
 		mes "[Mage Guildsman]";
 		mes "'Welcome to My World~'";
 		mes "Heh heh, I just wanted to say that. You know, it's a quote from a well-known movie~";

npc/quests/dandelion_request.txt

@@ -2160,7 +2160,7 @@ morocc,43,108,5	script	Sharp-Looking Kid	82,{
 
 morocc,45,110,1	script	#maobar1	45,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request || Class == Job_Assassin || Class == Job_Assassin_Cross) warp "que_job01",9,94;
 	else
 	{
@@ -2230,30 +2230,13 @@ OnTouch:
 	}
 }
 
-que_job01,6,94,1	script	#maobar2	45,2,2,{
-
-OnTouch:
-	warp "morocc",45,103;
-	end;
-}
-
-que_job01,17,48,1	script	#maobar3	45,2,2,{
-
-OnTouch:
-	warp "que_job01",68,92;
-	end;
-}
-
-que_job01,68,96,1	script	#maobar4	45,2,2,{
-
-OnTouch:
-	warp "que_job01",17,53;
-	end;
-}
+que_job01,6,94,1	warp	#maobar2	2,2,morocc,45,103
+que_job01,17,48,1	warp	#maobar3	2,2,que_job01,68,92
+que_job01,68,96,1	warp	#maobar4	2,2,que_job01,17,53
 
 que_job01,80,77,1	script	#maobar5	45,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request > 1) warp "que_job01",61,50;
 	else
 	{
@@ -2362,12 +2345,7 @@ OnTouch:
 	}
 }
 
-que_job01,65,50,1	script	#maobar4-2	45,2,2,{
-
-OnTouch:
-	warp "que_job01",84,77;
-	end;
-}
+que_job01,65,50,1	warp	#maobar4-2	2,2,que_job01,84,77
 
 que_job01,81,79,5	script	Idle Knight	733,{
 
@@ -2726,7 +2704,7 @@ que_job01,49,49,5	script	Tao	877,{
 
 que_job01,51,55,1	script	#roombar1	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
 	{
 		if(!$@maobar_room)
@@ -2837,14 +2815,14 @@ OnEnter:
 	enablenpc "#maobar7";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,51,44,1	script	#roombar2	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
 	{
 		if(mao_request == 121)
@@ -2966,7 +2944,7 @@ OnEnter:
 	enablenpc "#maobar7";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -2981,14 +2959,14 @@ OnEnter:
 	enablenpc "#maobar8";
 	end;
 	
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,11,4,1	script	#maoexit1	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer1::OnStop";
 	end;
@@ -2996,7 +2974,7 @@ OnTouch:
 
 que_job01,80,27,1	script	#maoexit2	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer2::OnStop";
 	end;
@@ -3004,7 +2982,7 @@ OnTouch:
 
 que_job01,144,61,1	script	#maoexit3	45,1,1,{
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent "#maobartimer2::OnStop";
 	end;

npc/quests/eye_of_hellion.txt

@@ -661,7 +661,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 	mes "... ... ...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 57 && countitem(7334) > 0) {
 		specialeffect2 EF_HEAL2; 
 		specialeffect EF_HEAL2;
@@ -1075,7 +1075,7 @@ prontera,223,82,0	script	#prt_key-1	111,{
 }
 
 prontera,45,67,0	script	 #prt_key-1-1	111,1,1,{
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 40 || HELLIONQ == 41) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well, according to the";
@@ -1604,7 +1604,7 @@ payon,182,132,3	script	Grout'he Tuccok#hellion	48,{
 }
 
 payon,101,190,0	script	 #paypuzz1	-1,1,1,{
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 48) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Well, this is where";
@@ -1878,7 +1878,7 @@ pay_arche,142,28,0	script	Buddha Statue#paypuzz6	111,5,5,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 56 && countitem(7333) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;
@@ -2247,7 +2247,7 @@ geffen,110,200,3	script	Sage Welshyun#hellion	754,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 58 && countitem(7335) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;
@@ -2426,7 +2426,7 @@ gef_fild09,296,59,0	script	Hidden Cave#hellion	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (HELLIONQ == 68 && countitem(7332) > 0) {
 		specialeffect2 EF_HEAL2;
 		specialeffect EF_HEAL2;

npc/quests/first_class/tu_acolyte.txt

@@ -1275,7 +1275,7 @@ prt_monk,28,260,5	script	Hedrick	1_M_04,{
 // Weapon Merchant
 //============================================================
 prt_monk,136,261,0	script	Weapon Merchant#tu	HIDDEN_WARP_NPC,9,9,{
-OnTouch:
+OnTouch_:
 	if(tu_acolyte01 != 20 || countitem(1081) == 0) end;// Merchant_Box_1
 	mes "[Weapon Merchant]";
 	mes "The stuff I requested from the guild is finally here!";

npc/quests/first_class/tu_archer.txt

@@ -109,7 +109,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "You're...!";
 		next;
 		specialeffect2 EF_TALK_FROSTJOKE;
-		//specialeffect EF_TALK_FROSTJOKE,"Bard Jet#tu";
+		//specialeffect EF_TALK_FROSTJOKE,AREA,"Bard Jet#tu";
 		emotion e_no1;
 		mes "[Jet]";
 		mes "Let's see...";
@@ -1172,11 +1172,11 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 // Seisner
 //============================================================
 pay_arche,84,139,3	script	Seisner	4_F_JOB_HUNTER,{
-	specialeffect EF_HIT2,"#Target";
+	specialeffect EF_HIT2,AREA,"#Target";
 	mes "[Seisner]";
 	mes "Aaaah!";
 	mes "Double Strafe!";
-	specialeffect EF_HIT2,"#Target";
+	specialeffect EF_HIT2,AREA,"#Target";
 	next;
 	mes "[Seisner]";
 	mes "I did it!";

npc/quests/kiel_hyre_quest.txt

@@ -808,7 +808,7 @@ kh_school,57,142,6	script	Student#kha	893,3,3,{
 	mes "a new faculty member, are you?";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Laci]";
 	mes "Hey, Nesha...!";
 	mes "have you heard why";
@@ -5158,8 +5158,8 @@ OnTouch:
 // - Anyone can enter
 // - After 30-40 seonds this NPC should be disabled.
 //----------------------------------------------------------------------------
-kh_mansion,29,27,0	script	Kiehl_Room_Warp	45,2,2,{
-OnTouch:
+kh_mansion,27,27,0	script	Kiehl_Room_Warp	45,2,2,{
+OnTouch_:
 	warp "kh_kiehl01",10,31;
 	end;
 
@@ -5445,7 +5445,7 @@ yuno,250,132,0	script	Old Lady#kh	711,{
 // Warp portal into Rosimier Mansion
 //----------------------------------------------------------------------------
 yuno,273,141,0	script	Rosimmir_Entrance	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (countitem(7498) < 1) {
 		mes "That mansion seems to have";
 		mes "been destroyed by the time.";
@@ -6088,7 +6088,7 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor1Opened,"Big Door#BigDoorKHQ1"),0;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "kh_kiehl01",55,33;
 	end;
 }
@@ -6131,7 +6131,7 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 	}
 }
 
-kh_kiehl01,174,39,0	script	Big_Door_2_Warp	45,1,1,{
+kh_kiehl01,173,39,0	script	Big_Door_2_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6148,8 +6148,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor2Opened,"Big Door#BigDoorKHQ2"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",173,52;
+OnTouch_:
+	if (KielHyreQuest == 48)
+		warp "kh_kiehl01",173,35;
+	else
+		warp "kh_kiehl01",173,52;
 	end;
 }
 
@@ -6191,7 +6194,7 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 	}
 }
 
-kh_kiehl01,78,108,0	script	Big_Door_3_Warp	45,1,1,{
+kh_kiehl01,78,107,0	script	Big_Door_3_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6208,8 +6211,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor3Opened,"Big Door#BigDoorKHQ3"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",68,108;
+OnTouch_:
+	if (KielHyreQuest == 49)
+		warp "kh_kiehl01",82,108;
+	else
+		warp "kh_kiehl01",68,108;
 	end;
 }
 
@@ -6251,7 +6257,7 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 	}
 }
 
-kh_kiehl01,41,177,0	script	Big_Door_4_Warp	45,1,1,{
+kh_kiehl01,41,178,0	script	Big_Door_4_Warp	45,1,1,{
 OnEnable:
 	initnpctimer;
 	specialeffect EF_SUMMONSLAVE;
@@ -6268,8 +6274,11 @@ OnTimer30000:
 	set getvariableofnpc(.KHDoor4Opened,"Big Door#BigDoorKHQ4"),0;
 	end;
 
-OnTouch:
-	warp "kh_kiehl01",49,177;
+OnTouch_:
+	if (KielHyreQuest == 50)
+		warp "kh_kiehl01",38,178;
+	else
+		warp "kh_kiehl01",47,171;
 	end;
 }
 
@@ -6479,7 +6488,7 @@ OnInit:
 	disablenpc "Big_Door_5_Warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (KielHyreQuest >= 46)
 		warp "kh_kiehl02",50,7;
 	else
@@ -7095,11 +7104,11 @@ OnInit:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Kiehl_Room_Exit
 //----------------------------------------------------------------------------
-kh_kiehl02,50,59,0	script	Kiehl_Room_Exit	45,1,1,{
-OnTouch:
+kh_kiehl02,49,56,0	script	Kiehl_Room_Exit	45,1,1,{
+OnTouch_:
 	if (getmapusers("kh_kiehl02") < 1)
 		donpcevent "KiehlRoom::OnReset";
-	warp "lighthalzen",193,202;
+	warp "lighthalzen",193,200;
 	end;
 
 OnEnable:

npc/quests/newgears/2004_headgears.txt

@@ -2462,7 +2462,7 @@ OnInit:
 	disablenpc "Nine Tails#Kitsune Mask";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Nine Tails]";
 	mes "Yelp! Yelp yelp!";
 	mes "Yelp! Yelp yelp!";
@@ -2633,7 +2633,7 @@ OnMyMobDead2:
 // Orc Hero Helmet
 //============================================================
 in_orcs01,31,93,1	script	Orc Warrior#1	1023,2,2,{
-OnTouch:
+OnTouch_:
 	disable_items;
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -3504,7 +3504,7 @@ OnTouch:
 }
 
 in_orcs01,162,33,1	script	Orc Hero#1	1087,2,2,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";

npc/quests/okolnir.txt

@@ -370,7 +370,7 @@ que_qsch05,345,82,3	duplicate(Wish Maiden#gq_main)	Wish Maiden#gq_sch05	403
 	function	SMonster;
 	set .@sub$, callfunc("F_Okolnir");
 	
-OnTouch:
+OnTouch_:
 	set .@sub$, callfunc("F_Okolnir");
 	set .@saram,getmapusers("que_q"+.@sub$);
 	if (.@saram < 21) {
@@ -937,7 +937,7 @@ que_qsch05,2,3,0	duplicate(#miro_yf_main)	#miro_yf_sch05	844
 -	script	windpath01_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	if (countitem(7839)) {
 		mes "The Warp Gate responds to the Crystal Key.";
@@ -1005,7 +1005,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer;
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "#event_start01_"+.@sub$;
@@ -1276,7 +1276,7 @@ OnDisable:
 	disablenpc "#getspell0"+.@c+"_"+.@sub$;
 	end;
 
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	sc_start SC_Stone,300000,0,10000;
 	switch (getd("$@gqse_"+.@sub$+"_gd")) {
@@ -1387,7 +1387,7 @@ que_qsch05,146,121,0	duplicate(#getspells_main)	#getspell08_sch05	-1,1,1
 -	script	#main_cages	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	sc_end SC_Stone;
 	setarray .@n, 108,151,107,135,113,114,158,106,163,133,150,154;
@@ -1513,7 +1513,7 @@ que_qsch05,1,8,0	duplicate(#gd_main_mobctrl)	#gd_sch05_mobctrl	844
 -	script	windpaths_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	if (compare(strnpcinfo(0),"windpath03")) {
 		warp "que_q"+.@sub$,119,103;
@@ -1553,7 +1553,7 @@ que_qsch05,128,104,0	duplicate(windpaths_main)	windpath04_sch05	45,1,1
 -	script	#nm_switch_main	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	disablenpc "#nm_switch_"+.@sub$;
 	initnpctimer;
@@ -1886,7 +1886,7 @@ que_qsch05,2,10,0	duplicate(#main_stone03)	#sch05_stone03	844
 -	script	Guard of Shadow#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
@@ -1960,7 +1960,7 @@ que_qsch05,225,303,5	duplicate(Guard of Shadow#main_all)	Guard of Shadow#sch05_0
 -	script	Bloody Hunter#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
@@ -2034,7 +2034,7 @@ que_qsch05,279,300,3	duplicate(Bloody Hunter#main_all)	Bloody Hunter#sch05_ac04
 -	script	Temple Keeper#main_all	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@sub$,callfunc("F_Okolnir");
 	set .@in, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
@@ -2273,7 +2273,7 @@ que_qsch05,252,340,3	duplicate(Wish Maiden#main_gift)	Wish Maiden#sch05_gift	403
 -	script	#to_agit_main_gate	-1,{
 	end;
 	
-OnTouch:
+OnTouch_:
 	set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
 	warp .@t$,157,369;
 	end;

npc/quests/quests_13_1.txt

@@ -3095,7 +3095,7 @@ mid_camp,264,263,4	script	Diego#ep13bs	931,{
 mid_campin,291,128,1	script	#ep13bs	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_newbs < 4) {
 		mes "- It's a neat and tidy bed -";
 		mes "- It seems that nobody used it. -";
@@ -4742,7 +4742,7 @@ mid_camp,52,148,1	script	Dirt#ep13	844,{
 }
 
 man_fild01,59,261,0	script	#evt_lumis	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (ep13_animal == 11) {
 		mes "[Rumis Block]";
 		mes "This is it! Come to the small tree in the southeast direction!";
@@ -4982,7 +4982,7 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 // The Tripartite Union's Feud :: ep13_1_rhea
 //============================================================ 
 mid_campin,376,120,0	script	Research Official#ep131	754,3,3,{
-OnTouch:
+OnTouch_:
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
 		mes "[United Research Official]";
 		mes "How come you've got so much to carry?";
@@ -11978,7 +11978,7 @@ morocc,43,108,5	script	Sharp-Looking Boy#dan_07	82,{
 }
 
 morocc,45,110,0	script	que_job01#01	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
 		end;
@@ -12205,7 +12205,7 @@ que_job01,82,95,3	script	Bar Master#moc2_01	46,{
 }
 
 que_job01,80,77,0	script	que_job01#04	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin || mao_request > 0 || mao_morocc2 > 4) {
 		warp "que_job01",61,50;
 		end;
@@ -12413,7 +12413,7 @@ OnReset:
 	set $@moc_mao_room1,0; //Global Variable
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Tao]";
 	if (prt_curse == 24) {
 		if ($@moc_mao_room1 == 0) {
@@ -12513,13 +12513,13 @@ OnEnable:
 	enablenpc "#room1_warp13";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room1timer::OnStop";
 	end;
@@ -12573,7 +12573,7 @@ OnReset:
 	set $@moc_mao_room2,0; //Global Variable
 	end;
 
-OnTouch:
+OnTouch_:
 	if ((mao_morocc2 > 4) && (mao_morocc2 < 10)) {
 		if ($@moc_mao_room2 == 0) {
 			set $@moc_mao_room2,1; //Global Variable
@@ -12696,7 +12696,7 @@ OnEnable:
 	enablenpc "#room2_1_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -12711,20 +12711,20 @@ OnEnable:
 	enablenpc "#room2_2_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
 
 que_job01,80,27,0	script	que_job01#room2_1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room2timer::OnStop";
 	end;
 }
 
 que_job01,144,61,0	script	que_job01#room2_2_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room2timer::OnStop";
 	end;
@@ -13434,7 +13434,7 @@ OnStop:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (mao_morocc2 == 10) {
 		disablenpc "#moc2_event_on";
 		donpcevent "#moc2_event01::OnEnable";
@@ -13491,7 +13491,7 @@ OnEnable:
 	enablenpc "#moc2_event01";
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "wander_man_move.wav",1;
 	sc_start sc_blind,600000,0;
 	mes "As soon as you touched the crystal,";

npc/quests/quests_13_2.txt

@@ -2538,7 +2538,7 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 spl_in02,239,93,3	duplicate(Arc#ep13md_l02)	Terra#ep13md_l03	441
 
 splendide,287,140,0	script	terrashome_in	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (ep13_mdrama > 25) {
 		warp "spl_in02",237,89;
 		end;
@@ -3385,7 +3385,7 @@ OnDisable:
 	disablenpc "Egg Keeper Draco#13_1";
 	end;
 
-OnTouch:
+OnTouch_:
 	disablenpc "Egg Keeper Draco#13_1";
 	monster "nyd_dun02",201,157,"Egg Keeper Draco",2013,1,"Egg Keeper Draco#13_3::OnMyMobDead";
 	end;
@@ -3402,7 +3402,7 @@ OnDisable:
 	disablenpc "Egg Keeper Draco#13_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	disablenpc "Egg Keeper Draco#13_2";
 	monster "nyd_dun02",206,157,"Egg Keeper Draco",2013,1,"Egg Keeper Draco#13_4::OnMyMobDead";
 	end;
@@ -3453,7 +3453,7 @@ OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan01";
@@ -3481,7 +3481,7 @@ OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
-OnTouch:
+OnTouch_:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan02";
@@ -4858,7 +4858,7 @@ function	script	find_13_2	{
 -	script	mjo_no_find	-1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,0;
 	end;
 }
@@ -4930,7 +4930,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 2 && countitem(6076) == 1 && countitem(6077) < 10)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -4948,7 +4948,7 @@ mjolnir_10,188,260,3	duplicate(mjo_find)	#mj10_01	111,10,10
 mjolnir_01,364,256,0	script	#mj01_find	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,32,309,1,0x00FF00;
 	viewpoint 1,217,34,2,0x00FF00;
@@ -4982,7 +4982,7 @@ OnTimer60000:
 mjolnir_02,313,289,0	script	#mj02_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,90,195,1,0x00FF00;
 	viewpoint 1,206,187,2,0x00FF00;
@@ -4992,7 +4992,7 @@ OnTouch:
 mjolnir_02,78,258,0	script	#mj02_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,90,195,1,0x00FF00;
 	viewpoint 1,206,187,2,0x00FF00;
@@ -5025,7 +5025,7 @@ OnTimer60000:
 mjolnir_04,147,208,0	script	#mj04_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5035,7 +5035,7 @@ OnTouch:
 mjolnir_04,160,77,0	script	#mj04_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5045,7 +5045,7 @@ OnTouch:
 mjolnir_04,361,174,0	script	#mj04_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,125,380,1,0x00FF00;
 	viewpoint 1,220,130,2,0x00FF00;
@@ -5077,7 +5077,7 @@ OnTimer60000:
 mjolnir_09,201,355,0	script	#mj09_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5086,7 +5086,7 @@ OnTouch:
 mjolnir_09,38,243,0	script	#mj09_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5095,7 +5095,7 @@ OnTouch:
 mjolnir_09,106,36,0	script	#mj09_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5104,7 +5104,7 @@ OnTouch:
 mjolnir_09,306,36,0	script	#mj09_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5113,7 +5113,7 @@ OnTouch:
 mjolnir_09,369,279,0	script	#mj09_find_5	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5133,7 +5133,7 @@ OnTimer60000:
 mjolnir_10,201,355,0	script	#mj10_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5142,7 +5142,7 @@ OnTouch:
 mjolnir_10,374,215,0	script	#mj10_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5151,7 +5151,7 @@ OnTouch:
 mjolnir_10,272,20,0	script	#mj10_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5160,7 +5160,7 @@ OnTouch:
 mjolnir_10,75,22,0	script	#mj10_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,188,260,1,0x00FF00;
 	close;
@@ -5169,7 +5169,7 @@ OnTouch:
 mjolnir_10,27,258,0	script	#mj10_find_5	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",0,1;
 	viewpoint 1,229,214,1,0x00FF00;
 	close;
@@ -5189,7 +5189,7 @@ OnTimer60000:
 hu_fild05,335,152,0	script	#hu_find_1	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5202,7 +5202,7 @@ OnTouch:
 hu_fild05,89,52,0	script	#hu_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5215,7 +5215,7 @@ OnTouch:
 hu_fild05,42,205,0	script	#hu_find_3	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5228,7 +5228,7 @@ OnTouch:
 hu_fild05,276,349,0	script	#hu_find_4	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",1,1;
 	viewpoint 1,251,345,1,0x00FF00;
 	viewpoint 1,134,322,2,0x00FF00;
@@ -5280,7 +5280,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 3 && countitem(6076) == 1 && countitem(6077) < 5)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -5350,7 +5350,7 @@ OnTimer60000:
 ve_fild03,351,219,0	script	#ve_find_1	-1,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",2,1;
 	viewpoint 1,152,134,1,0x00FF00;
 	viewpoint 1,256,228,2,0x00FF00;
@@ -5362,7 +5362,7 @@ OnTouch:
 ve_fild03,223,51,0	script	#ve_find_2	-1,5,5,{
 	end;
 
-OnTouch:
+OnTouch_:
 	callfunc "find_13_2",2,1;
 	viewpoint 1,152,134,1,0x00FF00;
 	viewpoint 1,256,228,2,0x00FF00;
@@ -5413,7 +5413,7 @@ OnInit:
 	enablenpc strnpcinfo(0);
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ep13_2_tre == 4 && countitem(6076) == 1 && countitem(6077) < 5)
 		specialeffect EF_COUPLECASTING;
 	end;
@@ -6915,7 +6915,7 @@ nyd_dun02,178,255,0	script	Strange Device#ep13_out	844,3,3,{
 			close;
 	}
 
-OnTouch:
+OnTouch_:
 	specialeffect EF_LEVEL99_4;
 	end;
 }
@@ -6971,7 +6971,7 @@ OnTimer70000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	specialeffect EF_LEVEL99_4;
 	end;
 }
@@ -7055,7 +7055,7 @@ OnDisable:
 }
 
 -	script	ep13_warp_w_0	-1,{
-OnTouch:
+OnTouch_:
 	warp "nyd_dun01",214,68;
 	end;
 }
@@ -7132,7 +7132,7 @@ OnEnable:
 	enablenpc "ep13_warp_22_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_31::OnEnable";
 	donpcevent "ep13_warp_41::OnEnable";
 	donpcevent "ep13_warp_42::OnEnable";
@@ -7147,7 +7147,7 @@ OnEnable:
 	enablenpc "ep13_warp_24_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		donpcevent "ep13_warp_33::OnEnable";
 		donpcevent "ep13_warp_43::OnEnable";
@@ -7176,7 +7176,7 @@ OnEnable:
 	enablenpc "ep13_warp_43_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_52::OnEnable";
 	donpcevent "ep13_warp_61::OnEnable";
 	donpcevent "ep13_warp_61_2::OnEnable";
@@ -7194,7 +7194,7 @@ OnEnable:
 	enablenpc "ep13_warp_45_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_46::OnEnable";
 	donpcevent "ep13_warp_55::OnEnable";
 	donpcevent "ep13_warp_56::OnEnable";
@@ -7214,7 +7214,7 @@ OnEnable:
 	enablenpc "ep13_warp_61_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_62::OnEnable";
 	donpcevent "ep13_warp_71::OnEnable";
 	donpcevent "ep13_warp_72::OnEnable";
@@ -7229,7 +7229,7 @@ OnEnable:
 	enablenpc "ep13_warp_65_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		donpcevent "ep13_warp_64::OnEnable";
 		donpcevent "ep13_warp_73::OnEnable";
@@ -7260,7 +7260,7 @@ OnEnable:
 	enablenpc "ep13_warp_81_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_91::OnEnable";
 	donpcevent "ep13_warp_92::OnEnable";
 	donpcevent "ep13_warp_93::OnEnable";
@@ -7279,7 +7279,7 @@ OnEnable:
 	enablenpc "ep13_warp_83_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_84::OnEnable";
 	donpcevent "ep13_warp_94::OnEnable";
 	donpcevent "ep13_warp_e2::OnEnable";
@@ -7297,7 +7297,7 @@ OnEnable:
 	enablenpc "ep13_warp_85_2";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "ep13_warp_95::OnEnable";
 	donpcevent "ep13_warp_e3::OnEnable";
 	donpcevent "ep13_warp_85_2::OnEnable";

npc/quests/quests_airship.txt

@@ -504,7 +504,7 @@ airplane,47,61,7	script	Crewman	4_M_ZONDAOYAJI,{
 // Empty Room 201
 //----------------------------------------------------------------------------
 ein_in01,227,279,3	script	#door_ein	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (kain_ticket == 5) {
 		kain_ticket = 6;
 		mes "["+strcharinfo(0)+"]";
@@ -554,7 +554,7 @@ OnTouch:
 // Elle Cherno
 //----------------------------------------------------------------------------
 ein_in01,261,241,3	script	Elle Cherno	4_F_KID2,3,3,{
-OnTouch:
+OnTouch_:
 	mes "[Elle Cherno]";
 	mes "Let's get to work";
 	mes "fear-less comraaades~!";
@@ -3136,7 +3136,7 @@ airplane,33,69,4	script	Kaci	1_F_MERCHANT_01,{
 
 ein_in01,279,25,0	script	#lab01_heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "(^333333I've... I've just";
@@ -3150,7 +3150,7 @@ OnTouch:
 
 ein_in01,264,17,0	script	#lab02_heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...";
@@ -3186,7 +3186,7 @@ OnInit:
 
 ein_in01,261,35,0	script	lab03#heart	HIDDEN_WARP_NPC,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (lhz_heart == 9) {
 		mes "[Security System]";
 		mes "^FF0000Unauthorized person";

npc/quests/quests_alberta.txt

@@ -2047,7 +2047,7 @@ tur_dun03,105,76,4	script	Knight Leader#tur	110,5,5,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	mes "[Scared Voice]";
 	mes "Wh-wh-whaat?!";
 	next;

npc/quests/quests_amatsu.txt

@@ -387,7 +387,7 @@ OnReset:
 }
 
 ama_test,34,25,0	script	Hanako chan#ama	-1,2,2,{
-OnTouch:
+OnTouch_:
 	mes "[Hanako chan]";
 	mes ".......Eeeeheeheehee";
 	mes ".....................";
@@ -418,7 +418,7 @@ OnInit:
 	disablenpc "Grandma#ama1";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Grandma]";
 	mes "Arrrk!!!";
 	next;
@@ -662,7 +662,7 @@ OnInit:
 	disablenpc "Coach#ama";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Coach]";
 	mes "Boom bam Boooom!!!";
 	mes "Tada~~~ !";
@@ -713,7 +713,7 @@ OnInit:
 	disablenpc "Coach#after";
 	end;
 
-OnTouch:
+OnTouch_:
 	mes "[Coach]";
 	mes "( Clap- Clap- Clap- )";
 	next;
@@ -784,7 +784,7 @@ OnInit:
 	disablenpc "backwarp#ama";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "amatsu",115,95;
 	end;
 }

npc/quests/quests_ayothaya.txt

@@ -418,7 +418,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 		}
 	}
 
-OnTouch:
+OnTouch_:
 	if (thai_find == 0) {
 		mes "[Powerful-Looking Woman]";
 		mes "^666666*Sigh...*^000000";
@@ -544,7 +544,7 @@ if (!$@annonactive) {
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (thai_find == 12) {
 		if (!rand(0,2)) {
 			emotion e_gasp,1;
@@ -967,7 +967,7 @@ ayothaya,253,99,3	script	Fisherman	843,{
 }
 
 ayo_dun01,255,62,0	script	AyoFootprint1	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 4) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -981,7 +981,7 @@ OnTouch:
 }
 
 ayo_dun01,74,142,0	script	AyoFootprint2	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 5) {
 		if (rand(1,3) < 2) {
 			emotion e_dots,1;
@@ -995,7 +995,7 @@ OnTouch:
 }
 
 ayo_dun01,244,256,2	script	AyoFootprint3	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 6) {
 		if (rand(1,3) < 2) {
 			emotion e_no,1;
@@ -1009,7 +1009,7 @@ OnTouch:
 }
 
 ayo_dun01,17,257,0	script	AyoFootprint4	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 7) {
 		if (rand(1,3) < 2) {
 			emotion e_ic,1;
@@ -1023,7 +1023,7 @@ OnTouch:
 }
 
 ayo_dun02,145,120,0	script	AyoFootprint5	139,2,0,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 8) {
 		if (rand(1,3) < 2) {
 			mes "^3355FFYou find the same footprints";
@@ -1040,7 +1040,7 @@ OnTouch:
 }
 
 ayo_dun02,135,168,0	script	AyoFootprint6	139,0,2,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 9) {
 		if (rand(1,3) == 1) {
 			emotion e_gasp,1;
@@ -1114,7 +1114,7 @@ OnTouch:
 }
 
 ayo_dun02,77,213,0	script	AyoFootprint7	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 10) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -1131,7 +1131,7 @@ OnTouch:
 }
 
 ayo_dun02,86,254,0	script	AyoFootprint8	139,1,1,{
-OnTouch:
+OnTouch_:
 	if (thai_find == 11) {
 		if (rand(1,3) < 2) {
 			emotion e_gasp,1;
@@ -1513,6 +1513,7 @@ ayo_in01,181,193,4	script	Shaman#thai	840,{
 			mes "[Boonthom]";
 			mes "The ancient building consists";
 			mes "of 2 levels. Before you enter the 2nd underground level, please return to me so that I can tell you how to enter that place.";
+			close;
 		}
 		mes "[Boonthom]";
 		mes "Did you forget what materials";
@@ -1927,7 +1928,7 @@ ayo_dun01,273,26,0	script	 #th_dun1_1_1::AyoTrap1	111,0,4,{
 	mes "^2F2F4Fyou might get killed.^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "^3355FFYou look down and see a pool";
 	mes "of water in the distance. It looks like a long drop to the bottom.^000000";
 	next;
@@ -1943,7 +1944,7 @@ ayo_dun01,272,27,0	duplicate(AyoTrap1)	 #th_dun1_1_3	111,0,4
 ayo_dun01,272,26,0	duplicate(AyoTrap1)	 #th_dun1_1_4	111
 
 ayo_dun01,26,27,0	script	 #th_dun1_1::AyoTrap2	-1,1,1,{
-OnTouch:
+OnTouch_:
 	percentheal -100,0;
 	end;
 }
@@ -1962,7 +1963,7 @@ ayo_dun01,25,271,0	duplicate(AyoTrap2)	 #th_dun1_12	-1
 
 // Hints
 ayo_dun01,156,148,0	script	 #hint01::AyoHint	-1,0,4,{
-OnTouch:
+OnTouch_:
 	if (rand(1,100) > 60 && ayodunquest < 11) {
 		mes "^3355FFThe Holy Thread in your pocket suddenly began to glow. You feel that something is near you...^000000";
 		close2;
@@ -2679,7 +2680,7 @@ ayothaya,121,240,7	script	Mr. Jun#ayo	842,1,1,{
 	mes "...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you're carrying -";

npc/quests/quests_ein.txt

@@ -3424,7 +3424,7 @@ einbroch,132,84,3	script	Liotzburg#ein	853,2,2,{
 	mes "assure you of that!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ($EinPolution > 9 && !$@AlrdEinPoll) {
 		mes "[Liotzburg]";
 		mes "What's going on?!";
@@ -5637,7 +5637,7 @@ airplane,31,77,5	script	Drunken Man#ein	853,{
 }
 
 ein_in01,231,170,0	script	#kenka	-1,2,2,{
-OnTouch:
+OnTouch_:
 	if (Shinokas_Quest > 8) {
 		mes "^3355FFThe open window rattles";
 		mes "as you enter the room and";
@@ -5682,7 +5682,7 @@ einbech,57,210,3	script	Young Man#Shinokas_Quest	855,{
 einbroch,51,52,0	script	Security#ein	45,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (((Shinokas_Quest == 7) || (lhz_heart == 9)) || (lhz_heart == 10)) {
 		mes "[Security System]";
 		mes "^8B0000*Beep Boop*^000000";
@@ -6517,7 +6517,7 @@ ein_in01,200,101,5	script	Klitzer#ein	854,{
 ein_in01,21,147,3	script	Megass#EIN	853,3,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if ((EIN_LOVERQ == 4) && (EIN_LOVERQ == 5)) {
 		mes "[Megass]";
 		mes "You again?!";

npc/quests/quests_gonryun.txt

@@ -3676,7 +3676,7 @@ yuno_in01,99,101,4	script	Doctor#gnbs	744,{
 }
 
 yuno_in01,104,94,0	script	go away#gnbs	139,2,1,{
-OnTouch:
+OnTouch_:
 	if (b_sword < 22) {
 		mes "[??????]";
 		mes "^FF0000What are you doing here?";
@@ -3800,7 +3800,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 }
 
 gon_fild01,245,257,0	script	#gonknife	111,3,3,{
-OnTouch:
+OnTouch_:
 	if (nakha == 1) {
 		set nakha,2;
 		mes "^3355FFHm? What's this?";

npc/quests/quests_hugel.txt

@@ -391,7 +391,7 @@ hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (hg_herb == 4) {
 		mes "[Allen]";
 		mes "^333333*Cough cough!*^000000";
@@ -520,7 +520,7 @@ hu_fild06,34,123,3	script	Postell Schuwell	97,{
 }
 
 hu_in01,370,255,3	script	Upper Drawer#First	139,2,2,{
-OnTouch:
+OnTouch_:
 	set .@rand,rand(1,7);
 	if (hg_herb < 5) {
 		mes "^3355FFThere are several";
@@ -684,7 +684,7 @@ OnInit:
 	disablenpc "Upper Drawer#Second";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_herb == 5) {
 		mes "^3355FFYou take out one dose of";
 		mes "Withstander from the drawer.^000000";
@@ -7197,7 +7197,7 @@ hugel,56,104,3	script	Kurupe	709,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel > 49) {
 		if (!hg_milk) {
 			mes "[Kurupe]";
@@ -7343,7 +7343,7 @@ hu_fild06,217,270,3	script	Burupu	896,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (hg_milk == 2) {
 		mes "[Burupu]";
 		mes "Heeeyah!";
@@ -8954,7 +8954,7 @@ hu_in01,18,167,4	script	Julian	86,{
 }
 
 hu_in01,16,21,0	script	Ashe#5	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 18) {
 		mes "[Ashe]";
 		mes "......?";
@@ -9117,7 +9117,7 @@ hu_in01,16,20,4	script	Ashe	95,{
 }
 
 hu_in01,174,90,0	script	Entrance	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 22 || hg_odin == 23) {
 		mes "[Laura]";
 		mes "So it means that everyone fooled me!";
@@ -9344,7 +9344,7 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 }
 
 hu_in01,171,90,0	script	Ashe#3	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 25) {
 		mes "^3355FFAshe picked up";
 		mes "the file that Laura";
@@ -9397,7 +9397,7 @@ moc_fild12,160,372,0	script	Hit	139,{
 }
 
 moc_fild12,160,365,0	script	Ashe#4	139,4,4,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 59) {
 		mes "[???]";
 		mes "...Silence.";
@@ -9602,7 +9602,7 @@ OnEnter:
 	enablenpc "warpinside#1";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9634,7 +9634,7 @@ OnEnter:
 	enablenpc "warpinside#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9666,7 +9666,7 @@ OnEnter:
 	enablenpc "warpinside#3";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9698,7 +9698,7 @@ OnEnter:
 	enablenpc "warpinside#4";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9730,7 +9730,7 @@ OnEnter:
 	enablenpc "warpinside#5";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (hg_odin > 19 && hg_odin < 23) {
 		switch(rand(1,4)) {
 		case 1:
@@ -9754,7 +9754,7 @@ OnTouch:
 }
 
 hu_in01,99,90,0	script	Empty	139,3,3,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThis place is empty.";
 	mes "Everyone must";
 	mes "have already left.^000000";
@@ -9762,7 +9762,7 @@ OnTouch:
 }
 
 que_hugel,35,29,5	script	object#1	139,2,2,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 21) {
 		mes "^3355FFA weathered structure";
 		mes "of the Odin Shrine is";
@@ -9826,7 +9826,7 @@ OnTouch:
 }
 
 que_hugel,163,31,0	script	object#2	139,3,3,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFWhen you come back";
 	mes "to your senses, you";
 	mes "find that nothing is";
@@ -9835,7 +9835,7 @@ OnTouch:
 }
 
 que_hugel,163,178,0	script	object#3	139,3,3,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 22) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Huh?";
@@ -9851,7 +9851,7 @@ OnTouch:
 }
 
 hu_in01,15,108,0	script	alex#warp	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (hg_odin == 17) {
 		mes "[Alex]";
 		mes "Haven't you found it yet?";
@@ -9941,7 +9941,7 @@ OnTouch:
 }
 
 hugel,52,90,0	script	alex#warp2	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (hg_odin > 59) warp "hu_in01",102,90;
 	else if (hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
 	else warp "hu_in01",33,90;
@@ -9949,13 +9949,13 @@ OnTouch:
 }
 
 hu_in01,155,70,0	script	alex#warp3	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }
 
 hu_in01,155,108,0	script	alex#warp4	45,1,1,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFThe door is locked.^000000";
 	close;
 }

npc/quests/quests_juperos.txt

@@ -1639,7 +1639,7 @@ juperos_01,215,127,4	script	Machine Statue	844,{
 juperos_01,100,91,0	script	jupe_goto#1	-1,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer "jupe_goto#1",1;
 	mes "^777777["+ strcharinfo(0) +"]^000000";
 	mes "This light...";
@@ -1689,7 +1689,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "juperos_02",128,278;
 	end;
 
@@ -1819,7 +1819,7 @@ OnTimer1200000:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",50,167;
 	end;
 }
@@ -1947,7 +1947,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",47,259;
 	end;
 
@@ -1962,7 +1962,7 @@ OnInit:
 	disablenpc "Red Alarm#1-1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Red Alarm On#1-1::OnEnable";
 	disablenpc "Red Alarm#1-1";
 	donpcevent "#hole#1-1::OnStop_Timer";
@@ -2241,7 +2241,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",21,191;
 	end;
 
@@ -2255,7 +2255,7 @@ OnInit:
 	disablenpc "Red Alarm#1-2";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-2::OnEnable";
 	disablenpc "Red Alarm#1-2";
@@ -2528,7 +2528,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",33,105;
 	end;
 
@@ -2542,7 +2542,7 @@ OnInit:
 	disablenpc "Red Alarm#1-3";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-3::OnEnable";
 	disablenpc "Red Alarm#1-3";
@@ -2817,7 +2817,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area1",83,157;
 	end;
 
@@ -2835,7 +2835,7 @@ OnEnable:
 	enablenpc "Red Alarm#1-4";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea1InUse,1;
 	donpcevent "Red Alarm On#1-4::OnEnable";
 	disablenpc "Red Alarm#1-4";
@@ -3023,7 +3023,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",28,30;
 	end;
 
@@ -3156,7 +3156,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",116,259;
 	end;
 
@@ -3171,7 +3171,7 @@ OnInit:
 	disablenpc "Red Alarm#2-1";
 	end;
 
-OnTouch:
+OnTouch_:
 	donpcevent "Red Alarm On#2-1::OnEnable";
 	disablenpc "Red Alarm#2-1";
 	donpcevent "#hole#2-1::OnStop_Timer";
@@ -3450,7 +3450,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",142,191;
 	end;
 
@@ -3464,7 +3464,7 @@ OnInit:
 	disablenpc "Red Alarm#2-2";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-2::OnEnable";
 	disablenpc "Red Alarm#2-2";
@@ -3737,7 +3737,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",130,105;
 	end;
 
@@ -3751,7 +3751,7 @@ OnInit:
 	disablenpc "Red Alarm#2-3";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-3::OnEnable";
 	disablenpc "Red Alarm#2-3";
@@ -4028,7 +4028,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_area2",80,157;
 	end;
 
@@ -4046,7 +4046,7 @@ OnEnable:
 	enablenpc "Red Alarm#2-4";
 	end;
 
-OnTouch:
+OnTouch_:
 	set $@JupreArea2InUse,1;
 	donpcevent "Red Alarm On#2-4::OnEnable";
 	disablenpc "Red Alarm#2-4";
@@ -4236,7 +4236,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_gate",71,29;
 	end;
 
@@ -4518,7 +4518,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	percentheal -99,-100;
 	end;
 
@@ -4541,7 +4541,7 @@ OnInit:
 	disablenpc "Elevator Escape#ufe";
 	end;
 
-OnTouch:
+OnTouch_:
 	mapwarp "jupe_ele_r", "jupe_gate",49,138;
 	end;
 }
@@ -4921,7 +4921,7 @@ OnInit:
 	disablenpc "4F Enter#ufe";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "jupe_core",rand(149,151),286;
 	end;
 }
@@ -4932,7 +4932,7 @@ OnTouch:
 jupe_gate,50,173,0	script	gate#start	-1,2,3,{
 	end;
 
-OnTouch:
+OnTouch_:
 	initnpctimer "gate#start",1;
 	mes "^3355FFIt's a Warp Portal";
 	mes "that will teleport you";
@@ -4968,7 +4968,7 @@ OnInit:
 	disablenpc "gate#start#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "juperos_02",130,142;
 	end;
 
@@ -4979,7 +4979,7 @@ OnTimer2000:
 }
 
 juperos_02,33,59,0	script	jupe_goto2F	45,2,2,{
-OnTouch:
+OnTouch_:
 	switch(rand(1,4)) {
 	case 1: warp "juperos_01",120,72; end;
 	case 2: warp "juperos_01",120,112; end;

npc/quests/quests_lighthalzen.txt

@@ -1693,7 +1693,7 @@ lhz_cube,250,184,0	script	Door#cube	111,{
 }
 
 lhz_dun02,224,6,0	script	Exit1#lt	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (MISC_QUEST&512) {
 		warp "lhz_cube",231,90;
 		end;
@@ -1710,7 +1710,7 @@ OnTouch:
 lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	870,2,2,{
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
@@ -1783,7 +1783,7 @@ OnInit:
 	disablenpc "Suspicious Guy#lhz_02";
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,3)) {
 	case 1:
 		mes "^3355FF*SHHHHHHUK!*^000000";
@@ -1855,7 +1855,7 @@ OnInit:
 	disablenpc "Suspicious Guy#lhz_03";
 	end;
 
-OnTouch:
+OnTouch_:
 	switch(rand(1,5)) {
 	case 1:
 	case 2:
@@ -6937,7 +6937,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 
 lighthalzen,173,167,1	script	Switch	-1,2,4,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 1)
 	{
 		mes "[??????]";
@@ -8526,7 +8526,7 @@ OnInit:
 
 yuno_pre,117,60,0	script	Eavesdrop	-1,10,5,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 16)
 	{
 		mes "^3355FFWhat the...?";
@@ -9017,7 +9017,7 @@ OnInit:
 
 lhz_fild02,224,220,0	script	Wounded Man Switch	-1,3,3,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_boss == 18)
 	{
 		mes "[?????]";
@@ -9031,7 +9031,7 @@ OnTouch:
 
 lhz_fild01,76,214,0	script	Esuna Trigger	-1,5,5,{
 
-OnTouch:
+OnTouch_:
 	if((lhz_boss == 26) || (lhz_boss == 36) || (lhz_boss == 38) || (lhz_boss == 40))
 	{
 		mes "[????]";
@@ -9519,7 +9519,7 @@ lhz_in01,187,31,0	script	#Sneak	111,4,3,{
 
 	end;
 
-OnTouch:
+OnTouch_:
 	if((lhz_boss > 27) && (lhz_boss < 35))
 	{
 		set @sneaktime,gettimetick(0) % 100;
@@ -9674,7 +9674,7 @@ L_Enter:
 
 lhz_in01,177,44,0	script	Timer_Sneak	-1,8,12,{
 
-OnTouch:
+OnTouch_:
 	warp "lhz_in01",191,49;
 	end;
 
@@ -11827,7 +11827,7 @@ OnEnter:
 	enablenpc "#packidentity";
 	end;
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 19)
 	{
 		mes "^3355FFYou peek through the";
@@ -11857,7 +11857,7 @@ OnTimer120000:
 
 lhz_in01,187,247,3	script	#flashback1	139,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 22)
 	{
 		cutin "lhz_kaz11",2;
@@ -11879,7 +11879,7 @@ OnTouch:
 
 lhz_in01,75,248,3	script	#flashback2	139,2,2,{
 
-OnTouch:
+OnTouch_:
 	if(lhz_rekenber == 22)
 	{
 		cutin "lhz_kaz11",2;

npc/quests/quests_louyang.txt

@@ -51,7 +51,7 @@ lou_in02,53,174,7	script	Employee#1	822,6,62,{
 	mes "^666666*Yawn...*^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -138,7 +138,7 @@ lou_in02,76,181,3	script	Employee#2	822,2,2,{
 	mes "...Zzzzz...Zzzz...";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -234,7 +234,7 @@ lou_in02,61,175,3	script	Employee#3	818,2,2,{
 	mes "^666666*Yawn...*^000000";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -367,7 +367,7 @@ lou_in02,62,183,3	script	Chef#1-2	820,2,2,{
 	mes "Dragon Soup is the best food for any appetite. I suggest that you try a bowl. You'll be quite pleased!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -894,7 +894,7 @@ lou_in02,58,183,5	script	Chef Assistant#lou1	823,5,5,{
 	mes "I will continue to hone my martial arts through cooking!";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (ch_tre == 2 || ch_tre == 3) {
 		if (gettime(3) >= 10 && gettime(3) < 14) {
 			if (rand(1,10) < 9) {
@@ -4253,7 +4253,7 @@ lou_fild01,225,350,0	script	 #fire	139,{
 }
 
 lou_in01,101,125,0	script	Trap#lou_in1	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Who goes there!";
@@ -4267,7 +4267,7 @@ OnTouch:
 }
 
 lou_in01,101,129,0	script	Trap#lou_in2	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4283,7 +4283,7 @@ OnTouch:
 }
 
 lou_in01,101,134,0	script	Trap#lou_in3	-1,20,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";
@@ -4298,7 +4298,7 @@ OnTouch:
 }
 
 lou_in01,114,163,0	script	Trap#lou_in4	-1,6,1,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Hold it right there, Rune-Midgardian!";
@@ -4312,7 +4312,7 @@ OnTouch:
 }
 
 lou_in01,114,165,0	script	Trap#lou_in5	-1,1,0,{
-OnTouch:
+OnTouch_:
 	if (ch_poison == 12 || ch_poison == 16) {
 		mes "[Soldier]";
 		mes "Huh...?";

npc/quests/quests_morocc.txt

@@ -194,7 +194,7 @@ morocc,43,108,5	script	Sharp-Looking Kid#dan_07	82,{
 }
 
 morocc,45,110,0	script	que_job01#01	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",9,94;
 		end;
@@ -219,7 +219,7 @@ que_job01,17,48,0	warp	que_job01#02	2,2,que_job01,68,92
 que_job01,68,96,0	warp	que_job01#03	2,2,que_job01,17,53
 
 que_job01,80,77,0	script	que_job01#04	45,2,2,{
-OnTouch:
+OnTouch_:
 	if (BaseClass == Job_Assassin) {
 		warp "que_job01",61,50;
 		end;
@@ -671,7 +671,7 @@ OnReset:
 	set $@maobar_room,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (prt_curse == 24) {
 		if ($@maobar_room == 0) {
 			set $@maobar_room,1;
@@ -780,7 +780,7 @@ OnDisable:
 	disablenpc "#room1_warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	end;
 }
@@ -788,7 +788,7 @@ OnTouch:
 que_job01,51,44,0	warp	que_job01#room_2	1,1,que_job01,80,23
 
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
-OnTouch:
+OnTouch_:
 	warp "que_job01",52,50;
 	donpcevent " #room1timer::OnStop";
 	end;
@@ -1190,7 +1190,7 @@ moc_fild20,215,336,3	duplicate(MocConGuard)	Continental Guard#08	707,3,3
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (BaseLevel > 79) {
 		mes "[Continental Guard Messenger]";
 		mes "Are you... "+ strcharinfo(0) +"?";
@@ -1865,7 +1865,7 @@ moc_fild21,38,193,0	script	Morocc Timer#edq	-1,6,6,{
 //	set $@re_moc_time$,"";
 //	end;
 
-OnTouch:
+OnTouch_:
 	if ($@re_moc == 0) {
 		set $@re_moc,1;
 		donpcevent "Satan Broadcast#edq::OnEnable";
@@ -7646,7 +7646,7 @@ OnDisable:
 }
 
 prt_castle,318,276,0	script	#eisen	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((nkprince_eisen == 4) || (nkprince_eisen == 5)) {
 		donpcevent "Prince#another_ern::OnEnable";
 		set nkprince_eisen,5;
@@ -7738,7 +7738,7 @@ OnTouch:
 }
 
 prt_castle,336,276,0	script	#ern	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10023) == 0 || checkquest(10023) == 1) {
 		donpcevent "Prince#eisen6::OnEnable";
 	}
@@ -7747,7 +7747,7 @@ OnTouch:
 }
 
 prt_castle,300,276,0	script	#erich	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10020) == 0 || checkquest(10020) == 1) {
 		donpcevent "Prince#eisen1::OnEnable";
 	}
@@ -7756,7 +7756,7 @@ OnTouch:
 }
 
 prt_castle,330,271,0	script	#helmut	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10022) == 0 || checkquest(10022) == 1) {
 		donpcevent "Prince#eisen3::OnEnable";
 	}
@@ -7765,7 +7765,7 @@ OnTouch:
 }
 
 prt_castle,348,271,0	script	#poe	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10018) == 0 || checkquest(10018) == 1) {
 		donpcevent "Prince#eisen4::OnEnable";
 	}
@@ -7774,7 +7774,7 @@ OnTouch:
 }
 
 prt_castle,354,276,0	script	#peter	45,1,1,{
-OnTouch:;
+OnTouch_:
 	if (checkquest(10019) == 0 || checkquest(10019) == 1) {
 		donpcevent "Prince#eisen5::OnEnable";
 	}
@@ -7783,7 +7783,7 @@ OnTouch:;
 }
 
 prt_castle,310,271,0	script	#urgen	45,1,1,{
-OnTouch:
+OnTouch_:
 	if (checkquest(10021) == 0 || checkquest(10021) == 1) {
 		donpcevent "Prince#eisen2::OnEnable";
 	}

npc/quests/quests_moscovia.txt

@@ -8393,7 +8393,7 @@ mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	2_BULLETIN_BOARD
 //----------------------------------------------------------------------------
 mosk_fild02,116,202,3	script	Lusalka#07russai_22	-1,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (rhea_rus_main != 8 || rhea_rus_hair < 2) {
 		emotion e_what,1;
 		end;
@@ -9015,7 +9015,7 @@ moc_pryd04,126,120,0	script	Soldier#rus26	4_M_RUSMAN1,{
 //----------------------------------------------------------------------------
 mosk_dun01,45,250,3	script	1#rus27	WARPNPC,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	warp "mosk_que",49,22;
 	end;
 
@@ -9037,7 +9037,7 @@ mosk_que,0,0,0,0	monster	Sasquatch	1243,15,10000,0,0
 
 mosk_que,49,22,3	script	#rus27	-1,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	if (rhea_rus_main == 8) {
 		if (!rhea_rus_quiz) {
 			mes "[Voice unidentified]";
@@ -9978,7 +9978,7 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 mosk_dun02,257,193,0	script	Cow#rus33	4_BULL,3,3,{
 	end;
-OnTouch:
+OnTouch_:
 	mes "[Cow]";
 	mes "Moo...";
 	if (rhea_rus_main == 11) {

npc/quests/quests_nameless.txt

@@ -1469,7 +1469,7 @@ OnTimer150000:
 
 nameless_n,145,162,0	script	AideAmi#Aru	139,2,2,{
 	end;
-OnTouch:
+OnTouch_:
 	if (aru_monas == 26) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "There is a low wall here against the other wall, if I climb it I could reach the resting place of Tristan III...";
@@ -3157,7 +3157,7 @@ OnInit:
 	stopnpctimer;
 	end;
 
-OnTouch:
+OnTouch_:
 	if (aru_em == 22) {
 		initnpctimer;
 		disablenpc "#em_end";
@@ -3692,7 +3692,7 @@ alberta,127,143,3	script	Belder	85,{
 	mes "you came from. Jerk.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if (diamond_edq < 3) {
 		mes "[Belder]";
 		mes "Cash flow problems?";
@@ -8213,7 +8213,7 @@ OnInit:
 	hideonnpc "Suspicious Man#2";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (zdan_edq == 9 && $@zdan == 0)
 		callsub S_Quest;
 	end;
@@ -8458,7 +8458,7 @@ OnTouch:
 }
 
 z_agit,98,44,0	script	EntranceCheck#1	-1,10,10,{
-OnTouch:
+OnTouch_:
 	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
 		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";
@@ -8487,7 +8487,7 @@ OnTouch:
 }
 
 z_agit,98,92,0	script	EntranceCheck#2	-1,10,10,{
-OnTouch:
+OnTouch_:
 	if (((zdan_edq == 15) || (zdan_edq == 16)) && ($@monster_zgang == 0)) {
 		set $@monster_zgang,1;
 		donpcevent "#zdan_broad::OnEnable";

npc/quests/quests_niflheim.txt

@@ -178,7 +178,7 @@ nif_in,31,20,3	script	Kuzkahina#nif	794,{
 niflheim,208,103,1	script	#Graveyard1	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 5 || nif_esc == 7 || nif_esc == 8 || nif_esc == 10) {
 		mes "^3355FFYou found something";
 		mes "half-buried near a grave.";
@@ -200,7 +200,7 @@ OnTouch:
 niflheim,169,71,1	script	#Graveyard2	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 6 || nif_esc == 9) {
 		mes "^3355FFYou found something";
 		mes "half-buried near a grave.";
@@ -219,7 +219,7 @@ OnTouch:
 nif_in,115,181,0	script	#Piano	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 0 && (MISC_QUEST & 32) == 0) {
 		mes "^3355FFYou see a big, heavy piano.";
 		mes "You get the feeling that";
@@ -252,7 +252,7 @@ OnTouch:
 nif_in,114,181,0	script	#Piano3	111,1,1,{
 	end;
 
-OnTouch:
+OnTouch_:
 	if (nif_esc == 12 || nif_esc == 13 || (MISC_QUEST & 32)) {
 		mes "^3355FFAs you bend towards";
 		mes "the final empty key space";

npc/quests/quests_rachel.txt

@@ -2477,7 +2477,7 @@ rachel,266,35,3	script	Grandma#rachel	918,{
 }
 
 lhz_in02,213,207,0	script	#ratrace1	111,4,4,{
-OnTouch:
+OnTouch_:
 	if (rach_vice == 5) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "This...";
@@ -2498,7 +2498,7 @@ OnTouch:
 }
 
 rachel,265,47,0	script	#raevent1	111,2,2,{
-OnTouch:
+OnTouch_:
 	if (rach_vice == 23) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Just looking at this";
@@ -3388,7 +3388,7 @@ rachel,265,98,3	script	Hamion#aru	930,{
 	}
 }
 
-rachel,113,96,5	script	Mohadian	929,10,10,{
+rachel,113,97,5	script	Mohadian	929,10,10,{
 	if (ice_necklace_q == 6) {
 		mes "[Mohadian]";
 		mes "I work at the bar around";
@@ -3488,7 +3488,7 @@ rachel,113,96,5	script	Mohadian	929,10,10,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (ice_necklace_q == 6) {
 		mes "[Mohadian]";
 		mes "Welcome to--";
@@ -3736,7 +3736,7 @@ OnTimer60000:
 }
 
 ice_dun03,150,137,0	script	#ice_4f_1	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3746,7 +3746,7 @@ OnInit:
 }
 
 ice_dun03,138,148,0	script	#ice_4f_2	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3756,7 +3756,7 @@ OnInit:
 }
 
 ice_dun03,161,148,0	script	#ice_4f_3	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -3766,7 +3766,7 @@ OnInit:
 }
 
 ice_dun03,151,162,0	script	#ice_4f_4	45,2,2,{
-OnTouch:
+OnTouch_:
 	warp "ice_dun04",33,144;
 	end;
 
@@ -4671,7 +4671,7 @@ OnTouch:
 }
 
 que_rachel,170,37,0	script	nemma01::nemma01	-1,5,5,{
-OnTouch:
+OnTouch_:
 	if (ra_tem_q == 8) {
 		mes "[???]";
 		mes "Only the goddess exists.";
@@ -6820,7 +6820,7 @@ OnTouch:
 
 ra_temin,275,226,0	script	#rachel33	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (aru_em == 21)
 		warp "que_temsky",99,11;
 	else

npc/quests/quests_umbala.txt

@@ -1267,7 +1267,7 @@ OnInit:
 	disablenpc "#!@#$%";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (um_wind == 4) {
 		set um_wind,5;
 		mes "^3355FFAs you enter the house";
@@ -1296,7 +1296,7 @@ OnInit:
 	disablenpc "#unpc";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (um_wind == 5) {
 		mes "^3355FFAs you realized what happened";
 		mes "after being kicked out of the";

npc/quests/seals/brisingamen_seal.txt

@@ -2707,7 +2707,7 @@ gef_dun01,89,192,0	script	#lowentrace	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
@@ -2839,7 +2839,7 @@ gef_dun01,203,48,0	script	#lowentrace1	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((god_brising > 9) && (god_brising < 34)) {
 		emotion e_gasp;
 	}
@@ -2980,7 +2980,7 @@ que_god02,54,64,4	script	Soldier#1_brising	105,1,1,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising == 31) {
 		warp "que_god02",174,49;
 		donpcevent "#brisinsold::OnSold1Off";
@@ -3158,7 +3158,7 @@ que_god02,167,58,4	script	#knight3	752,{ end; }
 
 que_god02,174,49,0	script	#lowenone	139,0,0,{
 
-OnTouch:
+OnTouch_:
 	donpcevent "brisinsold2::OnSold2On";
 	mes "[" + strcharinfo(0) + "]";
 	mes "Where am I?";
@@ -3243,7 +3243,7 @@ que_god02,124,59,7	script	#hermite	798,{ end; }
  
 que_god02,120,52,0	script	#monologue	139,0,0,{
 
-OnTouch:
+OnTouch_:
 	mes "[" + strcharinfo(0) + "]";
 	mes "Where am I?";
 	mes "Isn't that...";
@@ -3676,7 +3676,7 @@ xmas,38,105,0	script	#brisindwarf1	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 39) {
 		emotion e_gasp,1;
 	}
@@ -4143,7 +4143,7 @@ prt_fild02,185,269,0	script	#brisindwarf2	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 41) {
 		emotion e_gasp,1;
 	}
@@ -4337,7 +4337,7 @@ mjolnir_09,85,129,0	script	#brisindwarf3	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if (god_brising > 42) {
 		emotion e_gasp,1;
 	}
@@ -4577,7 +4577,7 @@ mjo_dun02,126,36,0	script	#brisindwarf4	111,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ($God2 < $@god_check1) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "Beh, no way out.";

npc/quests/seals/god_weapon_creation.txt

@@ -813,7 +813,7 @@ que_god01,154,67,0	script	god_failwarp#1	-1,4,7,{
 OnInit:
 	disablenpc strnpcinfo(0);
 	end;
-OnTouch:
+OnTouch_:
 	warp "prontera",156,324;
 	end;
 }

npc/quests/seals/sleipnir_seal.txt

@@ -1837,7 +1837,7 @@ que_god01,84,95,0	script	Switch#God0	111,{
 }
 
 que_god01,84,92,0	script	god_sl_w0	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1864,7 +1864,7 @@ que_god01,49,97,0	script	Switch#God1	111,{
 }
 
 que_god01,46,97,0	script	god_sl_w1	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1891,7 +1891,7 @@ que_god01,19,97,0	script	Switch#God2	111,{
 }
 
 que_god01,16,97,0	script	god_sl_w2	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1918,7 +1918,7 @@ que_god01,14,80,0	script	Switch#God3	111,{
 }
 
 que_god01,17,80,0	script	god_sl_w3	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;
@@ -1945,7 +1945,7 @@ que_god01,44,80,0	script	Switch#God4	111,{
 }
 
 que_god01,47,80,0	script	god_sl_w4	45,1,1,{
-OnTouch:
+OnTouch_:
 	if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
 		mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
 		next;

npc/quests/skills/archer_skills.txt

@@ -260,7 +260,7 @@ payon,103,63,3	script	Jason	88,3,3,{
 	mes "a lonely lad like me?";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[???]";
 	mes "Errrrrrr...";
 	close;

npc/quests/skills/assassin_skills.txt

@@ -737,7 +737,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	885,{
 }
 
 in_sphinx2,259,213,0	script	Old Coffin#qsk_as	-1,7,8,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 2) {
 		mes "^3355FFIt's an ancient coffin";
 		mes "with a broken lid that";
@@ -801,7 +801,7 @@ OnTouch:
 }
 
 in_sphinx2,212,267,0	script	Old Coffin#qsk_as2	-1,5,6,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 2) {
 		mes "^3355FFIt's an ancient coffin";
 		mes "with a broken lid that";
@@ -884,7 +884,7 @@ OnTouch:
 }
 
 in_sphinx2,13,163,0	script	Stone Statue#qsk_as	-1,7,7,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 3) {
 		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
@@ -919,7 +919,7 @@ OnTouch:
 }
 
 in_sphinx2,13,146,0	script	Stone Statue#qsk_as2	-1,7,7,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 3) {
 		specialeffect EF_CONE;
 		mes "^3355FFThis ancient stone statue";
@@ -953,7 +953,7 @@ OnTouch:
 }
 
 moc_pryd04,85,96,0	script	¡¡#crypt	-1,3,3,{
-OnTouch:
+OnTouch_:
 	if (ASSN_SK == 4) {
 		specialeffect EF_CONE;
 		mes "^3355FFThere's something";

npc/quests/skills/merchant_skills.txt

@@ -172,7 +172,7 @@ alberta,83,96,5	script	Necko	98,7,7,{
 	mes "come again later. Hehe~";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[!?]";
 	mes "Muahahahahahahahahahahahaha!!";
 	mes "Pukakakakakakakakakakakakaka!";

npc/quests/skills/rogue_skills.txt

@@ -53,7 +53,7 @@ OnInit:
 	disablenpc "Killer#Rogueguild";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (ROG_SK == 10) {
 		specialeffect2 EF_CHANGECOLD;
 		specialeffect EF_CHANGEWIND;
@@ -1036,7 +1036,7 @@ in_rogue,181,114,3	script	Jay Greg#rogueguild	85,{
 }
 
 prt_are01,150,150,0	script	#1strecog	-1,10,10,{
-OnTouch:
+OnTouch_:
 	donpcevent "#1st5min::OnEnable";
 	donpcevent "#1stmove::OnEnable";
 	disablenpc "#1strecog";
@@ -1155,7 +1155,7 @@ OnDisable:
 
 prt_are01,149,162,0	script	Kienna#1st	700,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	callfunc "F_Kienna",strnpcinfo(2);
 	end;
 }

npc/quests/skills/swordman_skills.txt

@@ -295,7 +295,7 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 	mes "See you in a better world!";
 	close;
 
-OnTouch:
+OnTouch_:
 	mes "[Leon]";
 	mes "Hahahahahahaha!";
 	mes "Hahahahahahaha!";

npc/quests/thana_quest.txt

@@ -150,7 +150,7 @@ hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	mes "[Tower Keeper]";
 	mes "Excuse me, but you cannot";
 	mes "enter. This place is under";
@@ -876,7 +876,7 @@ tha_t02,227,163,0	script	3rdf_warp#tt	45,1,1,{
 OnInit:
 	disablenpc "3rdf_warp#tt";
 	end;
-OnTouch:
+OnTouch_:
 	if (thana_tower == 0) warp "tha_t02",227,158;
 	else warp "tha_t03",219,159;
 	end;
@@ -942,7 +942,7 @@ tha_t03,67,70,0	script	Rune Device#tt1	111,4,4,{
 	mes "You've acquired everything you need from this rune device.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7421) == 0) && (countitem(7426) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1153,7 +1153,7 @@ tha_t04,195,195,0	script	Rune Device#tt2	111,3,3,{
 	mes "You've acquired everything you need from this rune device.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7422) == 0) && (countitem(7427) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1238,7 +1238,7 @@ tha_t05,62,179,0	script	Brilliant Statue#tt3	111,3,3,{
 	mes "You've acquired everything you need from this statue.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7423) == 0) && (countitem(7428) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1510,7 +1510,7 @@ tha_t06,226,230,0	script	Brilliant Statue#tt4	111,3,3,{
 	mes "The spell is already released. You've acquired everything you need from this statue.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7424) == 0) && (countitem(7429) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -1600,7 +1600,7 @@ tha_t06,204,181,0	script	Splendid Sword#tt5	111,3,3,{
 	mes "You've acquired everything you need from here.";
 	close;
 
-OnTouch:
+OnTouch_:
 	if ((countitem(7425) == 0) && (countitem(7430) == 0))
 		specialeffect EF_LEVEL99_4;
 	end;
@@ -2057,7 +2057,7 @@ OnEnable:
 OnOn2:
 	initnpctimer;
 	end;
-OnTouch:
+OnTouch_:
 	set .@touch,1;
 OnTimer6000:
 	if (($@thana_summon == 0) || ($@thana_summon == 6)) {
@@ -2091,7 +2091,7 @@ OnDisable:
 	hideonnpc strnpcinfo(0);
 	set .hide,0;
 	end;
-OnTouch:
+OnTouch_:
 	set .@seal, atoi(charat(strnpcinfo(2),2));
 	if (.hide & (1<<.@seal)) end;
 
@@ -2172,7 +2172,7 @@ OnEnable:
 OnDisable:
 	disablenpc "#thanatos_seal";
 	end;
-OnTouch:
+OnTouch_:
 	if ($@thana_summon2 == 4) {
 		initnpctimer;
 		donpcevent "Memory Seal#tt5::OnEnable";

npc/quests/the_sign_quest.txt

@@ -2924,7 +2924,7 @@ aldeba_in,155,101,3	script	Sir Jore#sign	805,7,7,{
 	}
 	close;
 
-OnTouch:
+OnTouch_:
 	if (rand(2)) {
 		emotion e_ic;
 		specialeffect EF_PHARMACY_OK;
@@ -3072,7 +3072,7 @@ prt_maze02,57,151,1	script	Pleur#warp	91,{
 }
 
 prt_maze02,58,150,0	script	#movesign	-1,5,5,{
-OnTouch:
+OnTouch_:
 	mes "^3355FFYou catch a glimpse";
 	mes "of a girl heading directly";
 	mes "into a deep forest. You decide";
@@ -3087,14 +3087,14 @@ OnTouch:
 }
 
 prt_maze02,18,126,0	script	#mazewarp	-1,3,3,{
-OnTouch:
+OnTouch_:
 	warp "prt_maze02",90,170;
 	end;
 }
 
 /* Currently broken.
 prt_maze02,25,161,0	script	#music	-1,7,7,{
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
 	end;
 }
@@ -5168,7 +5168,7 @@ OnReset:
 	set .s_up,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_up.wav",1;
 	if (.s_up == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5224,7 +5224,7 @@ OnReset:
 	set .s_down,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_down.wav",1;
 	if (.s_down == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5301,7 +5301,7 @@ OnReset:
 	set .s_left,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_left.wav",1;
 	if (.s_left == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5369,7 +5369,7 @@ OnReset:
 	set .s_right,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_right.wav",1;
 	if (.s_right == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5443,7 +5443,7 @@ OnReset:
 	set .s_center,0;
 	end;
 
-OnTouch:
+OnTouch_:
 	soundeffect "effect\\sign_center.wav",1;
 	if (.s_center == 1) {
 		donpcevent "Examiner#sd::OnUp";
@@ -5473,7 +5473,7 @@ OnInit:
 	disablenpc "Examiner#sd";
 	end;
 
-OnTouch:
+OnTouch_:
 	if (.s_check < 30) {
 		if (sign_q == 30) {
 			set sign_q,32;
@@ -8148,7 +8148,7 @@ gef_fild07,182,241,0	script	#Valkyrie Warp	111,1,1,{
 		close;
 	}
 
-OnTouch:
+OnTouch_:
 	if ((sign_q == 80) && (countitem(907) > 3) && (countitem(953) > 11) && (countitem(7013) > 364)) {
 		mes "["+strcharinfo(0)+"]";
 		mes "What the...?";
@@ -10428,7 +10428,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 }
 
 nif_in,186,168,1	script	#witch	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q == 83) {
 		if (sign_sq == 2) {
@@ -11652,7 +11652,7 @@ niflheim,102,54,4	script	Mad Man#s	739,{
 }
 
 niflheim,348,257,1	script	#Cursed Soul	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if ((sign_q == 83) || (sign_q == 90)) {
 		if (sign_sq == 0) {
@@ -11767,7 +11767,7 @@ OnMyMobDead:
 }
 
 nif_in,102,81,1	script	#Crayu	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q < 75) end;
 	else if (sign_q < 82) {
@@ -11859,7 +11859,7 @@ OnTouch:
 }
 
 nif_in,156,91,1	script	#kidniff	-1,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if (sign_q == 83) {
 		if (sign_sq == 0) {
@@ -12239,7 +12239,7 @@ OnInit:
 	disablenpc "Geffenia Warp";
 	end;
 
-OnTouch:
+OnTouch_:
 	set geffenia_warp,rand(1,4);
 	if (geffenia_warp == 1) warp "gefenia01",58,169;
 	else if (geffenia_warp == 2) warp "gefenia02",116,115;
@@ -12304,7 +12304,7 @@ geffen,119,48,0	script	Fountain#s	111,{
 }
 
 que_sign01,196,44,0	script	Starter#serin	-1,32,32,{
-OnTouch:
+OnTouch_:
 	donpcevent "Timer#serin::OnStart";
 	disablenpc "Starter#serin";
 	end;
@@ -12320,7 +12320,7 @@ OnInit:
 	disablenpc "Warp#serin";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "niflheim",30,156;
 	end;
 
@@ -12365,7 +12365,7 @@ OnReset:
 }
 
 que_sign01,197,195,0	script	Starter#witch	-1,32,32,{
-OnTouch:
+OnTouch_:
 	donpcevent "Timer#witch::OnStart";
 	disablenpc "Starter#witch";
 	end;
@@ -12404,7 +12404,7 @@ OnEnable:
 	enablenpc "Warp#witch";
 	end;
 
-OnTouch:
+OnTouch_:
 	warp "niflheim",30,156;
 	end;
 }
@@ -12445,7 +12445,7 @@ que_sign02,0,0,0,0	monster	Wraith	1475,15,0,0,0
 que_sign02,0,0,0,0	monster	Wraith Dead	1566,8,0,0,0
 
 que_sign02,378,235,0	script	sign_w6	45,1,1,{
-OnTouch:
+OnTouch_:
 	callfunc "F_UpdateSignVars";
 	if ((countitem(7313) == 1) && ((sign_q != 124) || (sign_q != 125) || (sign_q != 126))) {
 		warp "que_sign01",197,190;

npc/re/cities/malaya.txt

@@ -167,7 +167,7 @@ OnBingx2:
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-OnTouch:
+OnTouch_:
 	if (getcharid(1)) {
 		if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) {
 			donpcevent strnpcinfo(0)+"::OnBingx2";
@@ -218,7 +218,7 @@ OnBingx2:
 		donpcevent "Unidentified Creature#"+.@npc$[.@i]+"::"+((.@i == .@rand)?"OnEnable":"OnDisable");
 	donpcevent strnpcinfo(0)+"::OnDisable";
 	end;
-OnTouch:
+OnTouch_:
 	set .@i, atoi(strnpcinfo(2));
 	if (.@i%4 == 2) {
 		if (getcharid(0) == getpartyleader(getcharid(1),2))

npc/re/guides/guides_dicastes.txt

@@ -15,7 +15,7 @@
 //= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 
-dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
+dicastes01,189,191,5	script	Traveler Ichack#info	481,2,2,{
 	mes "[Traveler Ichack]";
 	mes "Oh!! You are a stranger!";
 	mes "I'm Ichack, the first adventurer that arrived here in El Dicastes!";

npc/re/instances/BakonawaLake.txt

@@ -165,7 +165,7 @@ OnStart:
 	enablenpc instance_npcname("#Bakonawan1");
 	set .@map$, instance_mapname("1@ma_b");
 	mapannounce .@map$,"Taho: I can see him there on the surface! ATTACK!!!",bc_map,"0x00ffff"; //FW_NORMAL 15 0 0
-	monster .@map$,78,81,"Bakonawa",2320,1,instance_npcname("#Bakonawan1")+"::OnMyMobDead"; //original: (78,83)
+	monster .@map$,78,83,"Bakonawa",2320,1,instance_npcname("#Bakonawan1")+"::OnMyMobDead";
 	initnpctimer;
 	end;
 OnFail:
@@ -331,7 +331,7 @@ OnInstanceInit:
 	end;
 OnStart:
 	enablenpc instance_npcname("#Bakonawan2-1");
-	monster instance_mapname("1@ma_b"),78,81,"Enraged Bakonawa",2321,1,instance_npcname("#Bakonawan2-1")+"::OnMyMobDead"; //original: (78,93)
+	monster instance_mapname("1@ma_b"),78,93,"Enraged Bakonawa",2321,1,instance_npcname("#Bakonawan2-1")+"::OnMyMobDead";
 	end;
 OnFail:
 	killmonster instance_mapname("1@ma_b"),instance_npcname("#Bakonawan2-1")+"::OnMyMobDead";
@@ -365,7 +365,7 @@ OnInstanceInit:
 OnStart:
 	enablenpc instance_npcname("#Bakonawan3");
 	initnpctimer;
-	monster instance_mapname("1@ma_b"),78,81,"Enraged Bakonawa",2322,1,instance_npcname("#Bakonawan3")+"::OnMyMobDead"; //original: (78,83)
+	monster instance_mapname("1@ma_b"),78,83,"Enraged Bakonawa",2322,1,instance_npcname("#Bakonawan3")+"::OnMyMobDead";
 	donpcevent instance_npcname("#Bakonawan3-1")+"::OnStart";
 	end;
 OnMyMobDead:

npc/re/instances/BangungotHospital.txt

@@ -1041,59 +1041,85 @@ OnTimer30000:
 
 // Warp Portals
 //============================================================
-1@ma_h,35,156,0	warp	#Boss Room Exit	2,2,ma_dun01,150,9
-1@ma_h,105,157,0	warp	#Boss Room Door	2,2,1@ma_h,116,157
-1@ma_h,112,157,0	warp	#Boss Room Door1	2,2,1@ma_h,100,157
-1@ma_h,104,63,0	warp	#Boss Room Door2	2,2,1@ma_h,117,63
-1@ma_h,112,63,0	warp	#Boss Room Door3	2,2,1@ma_h,100,63
-1@ma_h,36,157,0	warp	#Patternwarp1	7,7,1@ma_h,117,63
-1@ma_h,46,157,0	warp	#Patternwarp2	7,7,1@ma_h,117,63
-1@ma_h,57,157,0	warp	#Patternwarp3	7,7,1@ma_h,117,63
-1@ma_h,67,157,0	warp	#Patternwarp4	7,7,1@ma_h,117,63
-1@ma_h,79,157,0	warp	#Patternwarp5	7,7,1@ma_h,117,63
-1@ma_h,89,157,0	warp	#Patternwarp6	7,7,1@ma_h,117,63
-1@ma_h,100,157,0	warp	#Patternwarp7	7,7,1@ma_h,117,63
-1@ma_h,51,173,0	warp	#Patternwarp8	10,10,1@ma_h,117,63
-1@ma_h,52,140,0	warp	#Patternwarp34	10,10,1@ma_h,117,63
-1@ma_h,73,173,0	warp	#Patternwarp35	10,10,1@ma_h,117,63
-1@ma_h,73,140,0	warp	#Patternwarp36	10,10,1@ma_h,117,63
-1@ma_h,95,173,0	warp	#Patternwarp37	10,10,1@ma_h,117,63
-1@ma_h,95,140,0	warp	#Patternwarp38	10,10,1@ma_h,117,63
-//1@ma_h,70,170,0	warp	#Patternwarp39	10,10,1@ma_h,117,63
-//1@ma_h,77,169,0	warp	#Patternwarp40	10,10,1@ma_h,117,63
-1@ma_h,117,171,0	warp	#Patternwarp41	10,10,1@ma_h,117,63
-1@ma_h,131,171,0	warp	#Patternwarp42	10,10,1@ma_h,117,63
-1@ma_h,146,171,0	warp	#Patternwarp43	10,10,1@ma_h,117,63
-1@ma_h,117,157,0	warp	#Patternwarp44	10,10,1@ma_h,117,63
-1@ma_h,131,157,0	warp	#Patternwarp45	10,10,1@ma_h,117,63
-1@ma_h,146,157,0	warp	#Patternwarp46	10,10,1@ma_h,117,63
-1@ma_h,117,143,0	warp	#Patternwarp47	10,10,1@ma_h,117,63
-1@ma_h,131,143,0	warp	#Patternwarp48	10,10,1@ma_h,117,63
-1@ma_h,146,143,0	warp	#Patternwarp49	10,10,1@ma_h,117,63
-1@ma_h,36,63,0	warp	#Patternwarp10	7,7,1@ma_h,116,157
-1@ma_h,46,63,0	warp	#Patternwarp11	7,7,1@ma_h,116,157
-1@ma_h,56,63,0	warp	#Patternwarp12	7,7,1@ma_h,116,157
-1@ma_h,67,63,0	warp	#Patternwarp13	7,7,1@ma_h,116,157
-1@ma_h,78,63,0	warp	#Patternwarp14	7,7,1@ma_h,116,157
-1@ma_h,89,63,0	warp	#Patternwarp15	7,7,1@ma_h,116,157
-1@ma_h,100,63,0	warp	#Patternwarp16	7,7,1@ma_h,116,157
-1@ma_h,51,79,0	warp	#Patternwarp17	10,10,1@ma_h,116,157
-1@ma_h,51,46,0	warp	#Patternwarp18	10,10,1@ma_h,116,157
-1@ma_h,73,80,0	warp	#Patternwarp19	10,10,1@ma_h,116,157
-1@ma_h,73,46,0	warp	#Patternwarp20	10,10,1@ma_h,116,157
-1@ma_h,95,79,0	warp	#Patternwarp21	10,10,1@ma_h,116,157
-1@ma_h,95,46,0	warp	#Patternwarp22	10,10,1@ma_h,116,157
-//1@ma_h,193,82,0	warp	#Patternwarp23	7,7,1@ma_h,116,157
-//1@ma_h,193,82,0	warp	#Patternwarp24	7,7,1@ma_h,116,157
-1@ma_h,117,77,0	warp	#Patternwarp25	10,10,1@ma_h,116,157
-1@ma_h,131,77,0	warp	#Patternwarp26	10,10,1@ma_h,116,157
-1@ma_h,146,77,0	warp	#Patternwarp27	10,10,1@ma_h,116,157
-1@ma_h,117,63,0	warp	#Patternwarp28	10,10,1@ma_h,116,157
-1@ma_h,131,63,0	warp	#Patternwarp29	10,10,1@ma_h,116,157
-1@ma_h,146,63,0	warp	#Patternwarp30	10,10,1@ma_h,116,157
-1@ma_h,117,49,0	warp	#Patternwarp31	10,10,1@ma_h,116,157
-1@ma_h,131,49,0	warp	#Patternwarp32	10,10,1@ma_h,116,157
-1@ma_h,146,49,0	warp	#Patternwarp33	10,10,1@ma_h,116,157
+1@ma_h,35,156,0	script	#Boss Room Exit	WARPNPC,2,2,{
+OnTouch:
+	warp "ma_dun01",150,9;
+	end;
+}
+1@ma_h,105,157,0	script	#Boss Room Door	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",116,157;
+	end;
+}
+1@ma_h,112,157,0	script	#Boss Room Door1	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",100,157;
+	end;
+}
+1@ma_h,112,63,0	script	#Boss Room Door3	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",100,63;
+	end;
+}
+
+1@ma_h,104,63,0	script	#Boss Room Door2	WARPNPC,2,2,{
+OnTouch:
+	warp "1@ma_h",117,63;
+	end;
+}
+1@ma_h,36,157,0	duplicate(#Boss Room Door2)	#Patternwarp1	WARPNPC,7,7
+1@ma_h,46,157,0	duplicate(#Boss Room Door2)	#Patternwarp2	WARPNPC,7,7
+1@ma_h,57,157,0	duplicate(#Boss Room Door2)	#Patternwarp3	WARPNPC,7,7
+1@ma_h,67,157,0	duplicate(#Boss Room Door2)	#Patternwarp4	WARPNPC,7,7
+1@ma_h,79,157,0	duplicate(#Boss Room Door2)	#Patternwarp5	WARPNPC,7,7
+1@ma_h,89,157,0	duplicate(#Boss Room Door2)	#Patternwarp6	WARPNPC,7,7
+1@ma_h,100,157,0	duplicate(#Boss Room Door2)	#Patternwarp7	WARPNPC,7,7
+1@ma_h,51,173,0	duplicate(#Boss Room Door2)	#Patternwarp8	WARPNPC,10,10
+1@ma_h,52,140,0	duplicate(#Boss Room Door2)	#Patternwarp34	WARPNPC,10,10
+1@ma_h,73,173,0	duplicate(#Boss Room Door2)	#Patternwarp35	WARPNPC,10,10
+1@ma_h,73,140,0	duplicate(#Boss Room Door2)	#Patternwarp36	WARPNPC,10,10
+1@ma_h,95,173,0	duplicate(#Boss Room Door2)	#Patternwarp37	WARPNPC,10,10
+1@ma_h,95,140,0	duplicate(#Boss Room Door2)	#Patternwarp38	WARPNPC,10,10
+//1@ma_h,70,170,0	duplicate(#Boss Room Door2)	#Patternwarp39	WARPNPC,10,10
+//1@ma_h,77,169,0	duplicate(#Boss Room Door2)	#Patternwarp40	WARPNPC,10,10
+1@ma_h,117,171,0	duplicate(#Boss Room Door2)	#Patternwarp41	WARPNPC,10,10
+1@ma_h,131,171,0	duplicate(#Boss Room Door2)	#Patternwarp42	WARPNPC,10,10
+1@ma_h,146,171,0	duplicate(#Boss Room Door2)	#Patternwarp43	WARPNPC,10,10
+1@ma_h,117,157,0	duplicate(#Boss Room Door2)	#Patternwarp44	WARPNPC,10,10
+1@ma_h,131,157,0	duplicate(#Boss Room Door2)	#Patternwarp45	WARPNPC,10,10
+1@ma_h,146,157,0	duplicate(#Boss Room Door2)	#Patternwarp46	WARPNPC,10,10
+1@ma_h,117,143,0	duplicate(#Boss Room Door2)	#Patternwarp47	WARPNPC,10,10
+1@ma_h,131,143,0	duplicate(#Boss Room Door2)	#Patternwarp48	WARPNPC,10,10
+1@ma_h,146,143,0	duplicate(#Boss Room Door2)	#Patternwarp49	WARPNPC,10,10
+
+1@ma_h,36,63,0	script	#Patternwarp10	WARPNPC,7,7,{
+OnTouch:
+	warp "1@ma_h",116,157;
+	end;
+}
+1@ma_h,46,63,0	duplicate(#Patternwarp10)	#Patternwarp11	WARPNPC,7,7
+1@ma_h,56,63,0	duplicate(#Patternwarp10)	#Patternwarp12	WARPNPC,7,7
+1@ma_h,67,63,0	duplicate(#Patternwarp10)	#Patternwarp13	WARPNPC,7,7
+1@ma_h,78,63,0	duplicate(#Patternwarp10)	#Patternwarp14	WARPNPC,7,7
+1@ma_h,89,63,0	duplicate(#Patternwarp10)	#Patternwarp15	WARPNPC,7,7
+1@ma_h,100,63,0	duplicate(#Patternwarp10)	#Patternwarp16	WARPNPC,7,7
+1@ma_h,51,79,0	duplicate(#Patternwarp10)	#Patternwarp17	WARPNPC,10,10
+1@ma_h,51,46,0	duplicate(#Patternwarp10)	#Patternwarp18	WARPNPC,10,10
+1@ma_h,73,80,0	duplicate(#Patternwarp10)	#Patternwarp19	WARPNPC,10,10
+1@ma_h,73,46,0	duplicate(#Patternwarp10)	#Patternwarp20	WARPNPC,10,10
+1@ma_h,95,79,0	duplicate(#Patternwarp10)	#Patternwarp21	WARPNPC,10,10
+1@ma_h,95,46,0	duplicate(#Patternwarp10)	#Patternwarp22	WARPNPC,10,10
+//1@ma_h,193,82,0	duplicate(#Patternwarp10)	#Patternwarp23	WARPNPC,7,7
+//1@ma_h,193,82,0	duplicate(#Patternwarp10)	#Patternwarp24	WARPNPC,7,7
+1@ma_h,117,77,0	duplicate(#Patternwarp10)	#Patternwarp25	WARPNPC,10,10
+1@ma_h,131,77,0	duplicate(#Patternwarp10)	#Patternwarp26	WARPNPC,10,10
+1@ma_h,146,77,0	duplicate(#Patternwarp10)	#Patternwarp27	WARPNPC,10,10
+1@ma_h,117,63,0	duplicate(#Patternwarp10)	#Patternwarp28	WARPNPC,10,10
+1@ma_h,131,63,0	duplicate(#Patternwarp10)	#Patternwarp29	WARPNPC,10,10
+1@ma_h,146,63,0	duplicate(#Patternwarp10)	#Patternwarp30	WARPNPC,10,10
+1@ma_h,117,49,0	duplicate(#Patternwarp10)	#Patternwarp31	WARPNPC,10,10
+1@ma_h,131,49,0	duplicate(#Patternwarp10)	#Patternwarp32	WARPNPC,10,10
+1@ma_h,146,49,0	duplicate(#Patternwarp10)	#Patternwarp33	WARPNPC,10,10
 
 // Disable select warps.
 // Custom, but saves processing and lines.

npc/re/instances/BuwayaCave.txt

@@ -267,7 +267,7 @@ OnMyMobDead:
 	end;
 }
 
-1@ma_c,38,118,0	script	#box_out	45,2,2,{
+1@ma_c,33,118,0	script	#box_out	45,2,2,{
 OnInstanceInit:
 OnDisable:
 	disablenpc instance_npcname("#box_out");
@@ -308,7 +308,7 @@ OnTimer35000:
 	initnpctimer;
 	disablenpc instance_npcname("#box_call");
 	end;
-OnTouch:
+OnTouch_:
 	specialeffect2 EF_GUIDEDATTACK;
 	warp instance_mapname("1@ma_c"),33,112;
 	end;

npc/re/instances/HazyForest.txt

@@ -175,7 +175,7 @@ bif_fild01,161,355,0	script	Log Tunnel	844,{
 OnInstanceInit:
 	enablenpc instance_npcname("#Whisper_mist");
 	end;
-OnTouch:
+OnTouch_:
 	disablenpc instance_npcname("#Whisper_mist");
 	initnpctimer;
 	end;
@@ -1033,7 +1033,7 @@ bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
 
 1@mist,109,70,0	script	a1_a2	45,1,1,{
 	end;
-OnTouch:
+OnTouch_:
 	if (checkquest(7211,PLAYTIME) == -1)
 		setquest 7211;
 	warp instance_mapname("1@mist"),116,40;