From 3c11e7169e1f9f888226f4a6fab6193d0b64044d Mon Sep 17 00:00:00 2001 From: Kisuka Date: Mon, 1 Dec 2008 19:05:34 +0000 Subject: Bug Fixes: - Added Veins to nopvp mapflag. (bugreport:2504) - Corrected weight on some items. (bugreport:2471) - Corrected typo on Kiel Hyre Quest. (bugreport:2507) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13391 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/nopvp.txt | 3 +++ db/item_db.txt | 12 ++++++------ npc/quests/Kiel_Hyre_Quest.txt | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf/mapflag/nopvp.txt b/conf/mapflag/nopvp.txt index a75d9168b..379d0eb90 100644 --- a/conf/mapflag/nopvp.txt +++ b/conf/mapflag/nopvp.txt @@ -77,3 +77,6 @@ einbech mapflag pvp off einbroch mapflag pvp off ein_in01 mapflag pvp off ayothaya mapflag pvp off +veins mapflag pvp off +ve_in mapflag pvp off +ve_in02 mapflag pvp off \ No newline at end of file diff --git a/db/item_db.txt b/db/item_db.txt index 097e56277..79e6b6b22 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2278,20 +2278,20 @@ 5330,Drooping_Kitty_C,Refined Drooping Cat,5,1,,0,,6,,0,0xFFFFFFFE,7,2,256,,1,0,142,{ bonus bMDef,15; bonus2 bResEff,Eff_Curse,4000; bonus2 bResEff,Eff_Curse,1000; },{},{} 5331,Corsair_C,Refined Corsair,5,1,,500,,10,,0,0xFFFFFFFE,7,2,256,,1,0,105,{ bonus bVit,3; bonus bInt,3; },{},{} 5332,Loki_Mask,Loki Mask,5,0,,200,,0,,0,0xFFFFFFFF,7,2,513,,1,0,346,{ bonus bFlee2,3; },{},{} -5333,Radio_Antenna,Antenna,5,0,,1500,,2,,0,0xFFFFFFFF,7,2,256,,60,0,347,{ bonus bMdef,5; bonus bCritical,5; bonus bFlee,5; skill "MG_LIGHTNINGBOLT",1; bonus4 bAutoSpellWhenHit,"MG_THUNDERSTORM",5,20,1; },{},{} +5333,Radio_Antenna,Antenna,5,0,,1500,,2,,0,0xFFFFFFFF,7,2,256,,50,0,347,{ bonus bMdef,5; bonus bCritical,5; bonus bFlee,5; skill "MG_LIGHTNINGBOLT",1; bonus4 bAutoSpellWhenHit,"MG_THUNDERSTORM",5,20,1; },{},{} 5334,Angeling_Wanna_Fly,Flying Angeling,5,0,,700,,0,,0,0xFFFFFFFF,7,2,256,,38,1,348,{ bonus bLuk,2; bonus bMdef,2; },{},{} 5335,Jumping_Poring,Squatting Poring,5,0,,300,,2,,0,0xFFFFFFFF,7,2,256,,10,1,349,{ bonus bLuk,1; bonus bUnbreakableHelm,0; },{},{} -5336,Guildsman_Recruiter,Guild Recruiting Hat,5,,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,1,350,{},{},{} -5337,Party_Recruiter_Hat,Party Hat,5,0,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,1,351,{},{},{} -5338,Bf_Recruiter_Hat,Boyfriend Hat,5,0,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,1,352,{},{},{} -5339,Friend_Recruiter_Hat,Friend Hat,5,0,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,1,353,{},{},{} +5336,Guildsman_Recruiter,Guild Recruiting Hat,5,,,0,,2,,0,0xFFFFFFFF,7,2,256,,10,1,350,{},{},{} +5337,Party_Recruiter_Hat,Party Hat,5,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,10,1,351,{},{},{} +5338,Bf_Recruiter_Hat,Boyfriend Hat,5,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,10,1,352,{},{},{} +5339,Friend_Recruiter_Hat,Friend Hat,5,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,10,1,353,{},{},{} 5340,Deprotai_Doll_Hat,Deporte Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,354,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bStr,2; },{},{} 5341,Claris_Doll_Hat,Clarice Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,355,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bInt,2; },{},{} 5342,Sorin_Doll_Hat,Sorin Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,356,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bDex,2; },{},{} 5343,Tayelin_Doll_Hat,Tailring Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,357,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bAgi,2; },{},{} 5344,Binit_Doll_Hat,Vinit Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,358,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bVit,2; },{},{} 5345,Debril_Doll_Hat,W Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,359,{ bonus2 bSubRace,RC_DemiHuman,5; bonus bLuk,2; },{},{} -5346,Gf_Recruiter_Hat,Girlfriend Hat,5,0,,700,,0,,0,0xFFFFFFFF,7,2,256,,10,1,360,{},{},{} +5346,Gf_Recruiter_Hat,Girlfriend Hat,5,0,,0,,2,,0,0xFFFFFFFF,7,2,256,,10,1,360,{},{},{} 5347,Ph.D_Hat_,Ph.D Hat,5,20,,200,,3,,1,0xFFFFFFFE,7,2,256,,0,1,98,{},{},{} 5348,Big_Sis'_Ribbon_,Big Ribbon,5,15000,,200,,2,,1,0xFFFFFFFE,7,2,256,,0,1,28,{ bonus bMdef,3; },{},{} 5349,Boy's_Cap_,Boys Cap,5,20,,100,,2,,1,0xFFFFFFFE,7,2,256,,0,1,102,{},{},{} diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index c3c5d1b2c..f1e3618a6 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -3925,7 +3925,7 @@ kh_mansion,78,55,5 script Steward#kh 109,{ mes "afraid that I must insist on"; mes "your immediate departure!"; close2; - warp "lightalzen",188,201; + warp "lighthalzen",188,201; end; } } -- cgit v1.2.3-60-g2f50