From 3b2762ca3c9e0eba1e8aa255d4a69a8747e7ebdc Mon Sep 17 00:00:00 2001 From: Euphy Date: Fri, 22 Aug 2014 16:06:32 -0400 Subject: [PATCH] Enable NPC logging through 'logmes' by default. - Commented some unnecessary log messages. Bug fixes: - M_DOPPELGANGER had too much HP. (Hercules 9cd3ec0) - Huuma_Swirling_Petal should not have an element. (bugreport:9073) http://rathena.org/board/tracker/issue-9073-huuma-swirling-petal/ Signed-off-by: Euphy --- conf/log_athena.conf | 2 +- db/mercenary_db.txt | 2 +- db/re/item_db.txt | 2 +- npc/custom/item_signer.txt | 2 +- npc/events/event_skill_reset.txt | 2 +- npc/kafras/functions_kafras.txt | 2 +- npc/other/Global_Functions.txt | 2 +- sql-files/item_db_re.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/log_athena.conf b/conf/log_athena.conf index 6136188a70..8d18f2b568 100644 --- a/conf/log_athena.conf +++ b/conf/log_athena.conf @@ -97,7 +97,7 @@ log_mvpdrop: no log_commands: yes // Log NPC 'logmes' commands (Note 1) -log_npc: no +log_npc: yes // Log CHAT (Global, Whisper, Party, Guild, Main chat) (Note 3) // LOGGING FILTERS diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt index db84c6889f..2bd47edb10 100644 --- a/db/mercenary_db.txt +++ b/db/mercenary_db.txt @@ -8,7 +8,7 @@ 1506,DISGUISE,Disguise,55,7543,180,2,279,546,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384 1275,ALICE,Alice,62,10000,221,2,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,2304,480 1965,M_WILD_ROSE,Wild Rose,38,2980,130,2,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,100,964,864,288 -1966,M_DOPPELGANGER,Doppelganger,72,249000,200,2,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,100,480,480,288 +1966,M_DOPPELGANGER,Doppelganger,72,7800,200,2,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,100,480,480,288 1967,M_YGNIZEM,Egnigem Cenia,58,11200,320,2,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,145,576,432,288 2000,M_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300 2001,F_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300 diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 1907de5e9b..df784def1d 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -6990,7 +6990,7 @@ 13310,P_Huuma_Suriken1,P.Huuma Suriken I,5,0,,0,170,,1,0,0x02000000,63,2,34,3,60,0,22,{ bonus bMatk,50; },{},{} 13311,Huuma_Shadow,Sword Huuma Shuriken,5,5000,,1500,170,,1,0,0x02000000,63,2,34,3,99,1,22,{ bonus bStr,3; },{},{} 13312,Huuma_Job_Test,Prototype Huuma Shuriken,5,0,,3000,0,,1,0,0x02000000,63,2,34,4,99,1,22,{},{},{} -13313,Huuma_Swirling_Petal,Flower Huuma Shuriken,5,100000,,1500,150,,1,2,0x02000000,63,2,34,3,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20; },{},{} +13313,Huuma_Swirling_Petal,Flower Huuma Shuriken,5,100000,,1500,150,,1,2,0x02000000,63,2,34,3,110,1,22,{ bonus bMatk,50; bonus2 bSkillAtk,"KO_HUUMARANKA",20; },{},{} 13314,Huuma_Fluttering_Snow,Wave Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,63,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30; },{},{} 13315,Huuma_Thunderstorm,Thunderstorm Huuma Shuriken,5,100000,,1500,200,,1,0,0x02000000,63,2,34,4,110,1,22,{ bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30; },{},{} 13316,Upg_Huuma_Shuriken,Upg Huuma Shuriken,5,20,,1500,55,,1,1,0x02000000,63,2,34,3,1,1,22,{ bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); bonus bLongAtkRate,(getrefine()); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5); },{},{} diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index b1f8825c96..75fc891f0a 100644 --- a/npc/custom/item_signer.txt +++ b/npc/custom/item_signer.txt @@ -119,7 +119,7 @@ prt_in,24,61,7 script Perchik 47,{ if (!countitem2(.@id,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3])) { mes "Where is "+getitemname(@id)+"...?"; npctalk "You're a snoozy cheater!"; - logmes "CHEATER: Tried to sign an item not having it: "+getitemname(@id); + logmes "Hack: Tried to sign an item not having it: "+getitemname(@id); emotion e_wah; close; } diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 44176d845b..3d7585cf33 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -104,6 +104,6 @@ L_Reset: mes @npcname$; mes "Thank you."; emotion e_thx; - logmes "SKILL RESET EVENT"; +// logmes "SKILL RESET EVENT"; close; } diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index db4dbb969c..1bf8ef220b 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -578,7 +578,7 @@ function script F_EntKafCode { set @kafcode_try,@kafcode_try+1; if(@kafcode_try>10) { set @kafcode_try,0; - logmes "Hack: Tried to fit storage password."; + logmes "Tried to fit storage password."; } if(input(@code_) == 1) { mes "You can't use such big password."; diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index f19475a9df..2eb18c7934 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -140,7 +140,7 @@ function script F_ClearGarbage { ////////////////////////////////////////////////////////////////////////////////// function script Job_Change { jobchange getarg(0),Upper; - logmes "CLASS CHANGE: " +strcharinfo(0)+ " become a "+jobname(Class); +// logmes "CLASS CHANGE: " +strcharinfo(0)+ " become a "+jobname(Class); return; } diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 659399c472..6c28592d04 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -7021,7 +7021,7 @@ REPLACE INTO `item_db_re` VALUES (13309,'Huuma_Giant_Wheel_C','Huuma Giant Wheel REPLACE INTO `item_db_re` VALUES (13310,'P_Huuma_Suriken1','P.Huuma Suriken I',5,0,NULL,0,'170',NULL,1,0,0x02000000,63,2,34,3,'60',0,22,'bonus bMatk,50;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (13311,'Huuma_Shadow','Sword Huuma Shuriken',5,5000,NULL,1500,'170',NULL,1,0,0x02000000,63,2,34,3,'99',1,22,'bonus bStr,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (13312,'Huuma_Job_Test','Prototype Huuma Shuriken',5,0,NULL,3000,'0',NULL,1,0,0x02000000,63,2,34,4,'99',1,22,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (13313,'Huuma_Swirling_Petal','Flower Huuma Shuriken',5,100000,NULL,1500,'150',NULL,1,2,0x02000000,63,2,34,3,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Fire; bonus2 bSkillAtk,"KO_HUUMARANKA",20;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (13313,'Huuma_Swirling_Petal','Flower Huuma Shuriken',5,100000,NULL,1500,'150',NULL,1,2,0x02000000,63,2,34,3,'110',1,22,'bonus bMatk,50; bonus2 bSkillAtk,"KO_HUUMARANKA",20;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (13314,'Huuma_Fluttering_Snow','Wave Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,63,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Water; bonus3 bAutoSpell,"NJ_HYOUSYOURAKU",(getskilllv("NJ_HYOUSYOURAKU")?getskilllv("NJ_HYOUSYOURAKU"):1),30;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (13315,'Huuma_Thunderstorm','Thunderstorm Huuma Shuriken',5,100000,NULL,1500,'200',NULL,1,0,0x02000000,63,2,34,4,'110',1,22,'bonus bMatk,50; bonus bAtkEle,Ele_Wind; bonus3 bAutoSpell,"NJ_RAIGEKISAI",(getskilllv("NJ_RAIGEKISAI")?getskilllv("NJ_RAIGEKISAI"):1),30;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (13316,'Upg_Huuma_Shuriken','Upg Huuma Shuriken',5,20,NULL,1500,'55',NULL,1,1,0x02000000,63,2,34,3,'1',1,22,'bonus bBaseAtk,(getrefine()*10); bonus bMatk,(getrefine()*5); bonus bLongAtkRate,(getrefine()); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*5);',NULL,NULL);