Fixed reject sword having a infinite duration, bugreport:695 (both stable and trunk)

Fixed 13007,Jitte and 13008,Jitte_ break chances (5->2%).
Fixed 1535,Hollgrehenn_Hammer break chances without combo (2->1%) and with combo (12->10%), also has no chance of breaking user equip.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12797 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 9 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index efd9fd411..03d7e6836 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/06/09
+	* Fixed reject sword having a infinite duration, bugreport:695 [Brainstorm]
+
 2008/06/08
 	* Implemented the two-handed staff/rod type
 	* Corrected definition of 'delitem' and 'delitem2', which prevented the
diff --git a/db/Changelog.txt b/db/Changelog.txt
index c71be49e0..81d52a30d 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -44,6 +44,8 @@
 
 =======================
 2008/06/08
+	* Fixed 13007,Jitte and 13008,Jitte_ break chances (5->2%).
+	* Fixed 1535,Hollgrehenn_Hammer break chances without combo (2->1%) and with combo (12->10%), also has no chance of breaking user equip.
 	* Reverted Change on 2656,Hyper_Changer from revision 12776.
 	* 2125,Strong_Shield elemental damage penalties (+20% dmg vs fire, water, wind, earth, holy, dark and ghost).
 	* Fixed 2367,Sniping_Suit Critical bonus from LUK, +1 crit per 10 LUK (before was per 5 LUK).
diff --git a/db/item_db.txt b/db/item_db.txt
index f6c849bc4..32fde1e0a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -764,7 +764,7 @@
 1532,Stunner_,Stunner,4,60000,,2000,140,,1,2,0x00008110,7,2,2,3,27,1,8,{ bonus2 bAddEff,Eff_Stun,1000; },{},{}
 1533,Warrior's_Balmung,Warrior's Balmung,4,,10,1000,170,,1,0,0xFFFFFFFF,7,2,2,4,48,1,8,{ bonus bAllStats,5; },{},{}
 1534,Spanner_C,Refined Wrench,4,,,0,150,,1,0,0x00008110,7,2,2,3,1,0,8,{ bonus2 bAddEff,Eff_Blind,100; bonus2 bAddEff,Eff_Stun,100; bonus2 bAddEff,Eff_Poison,100; bonus2 bAddEff,Eff_Freeze,100; },{},{}
-1535,Holgrehenn's_Hammer,Holgrehenn's Refining Hammer,4,,10,440,4,,1,1,0x0004C5B2,7,2,2,4,44,1,8,{ bonus bBreakArmorRate,200; bonus bBreakWeaponRate,200; if(readparam(bStr) >= 44) { bonus bBaseAtk,44; }; if(isequipped(4361)) { bonus bBreakArmorRate,1000; bonus bBreakWeaponRate,1000; bonus4 bAutoSpell,343,10,30,0; bonus4 bAutoSpell,344,10,30,0; }; },{},{}
+1535,Hollgrehenn_Hammer,Holgrehenn's Refining Hammer,4,,10,440,4,,1,1,0x0004C5B2,7,2,2,4,44,1,8,{ bonus bBreakArmorRate,100; bonus bBreakWeaponRate,100; if(readparam(bStr) >= 44) { bonus bBaseAtk,44; }; if(isequipped(4361)) { bonus bBreakArmorRate,900; bonus bBreakWeaponRate,900; }; },{},{}
 1536,Good_Morning_Star,Good Morning Star,4,,10,0,120,,1,0,0x0004C5B3,7,2,2,1,1,0,8,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1537,Quadrille_C,Refined Quadrille,4,,0,0,193,,1,0,0x00008110,7,2,2,4,1,0,8,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEle,Ele_Earth,10; },{},{}
 1538,Spike_,Spike,4,,10,700,85,,1,2,0x00008110,7,2,2,4,40,1,8,{ bonus bCritical,40; bonus bDefRate,-67; bonus bDef2Rate,-67; },{},{}
@@ -3619,8 +3619,8 @@
 13005,Angelwing_Short_Sword,Angelic Wing Dagger,4,,10,600,120,,1,2,0x00000001,7,2,2,4,50,1,1,{},{},{}
 // Ninja Weapons
 13006,Khukri,Gokurin,4,240000,,600,150,,1,0,0x02000000,7,2,2,3,65,1,1,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Curse,1000; },{},{}
-13007,Jitte,Jitte,4,20000,,400,70,,1,0,0x02000000,7,2,2,2,35,1,1,{ bonus bBreakWeaponRate,500; },{},{}
-13008,Jitte_,Jitte,4,20000,,400,70,,1,1,0x02000000,7,2,2,2,35,1,1,{ bonus bBreakWeaponRate,500; },{},{}
+13007,Jitte,Jitte,4,20000,,400,70,,1,0,0x02000000,7,2,2,2,35,1,1,{ bonus bBreakWeaponRate,200; },{},{}
+13008,Jitte_,Jitte,4,20000,,400,70,,1,1,0x02000000,7,2,2,2,35,1,1,{ bonus bBreakWeaponRate,200; },{},{}
 13009,Kamaitachi,Kamaitachi,4,48000,,900,125,,2,0,0x02000000,7,2,2,4,70,1,1,{ bonus bAtkEle,Ele_Wind; bonus bCritical,3; bonus bAspdRate,3; },{},{}
 13010,Asura,Ashura,4,3000,,600,50,,1,2,0x02000000,7,2,2,1,12,1,1,{ bonus bMatkRate,10; },{},{}
 13011,Asura_,Ashura,4,3000,,600,50,,1,3,0x02000000,7,2,2,1,12,1,1,{ bonus bMatkRate,10; },{},{}
diff --git a/src/map/skill.c b/src/map/skill.c
index 11a362dd2..160595566 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -695,7 +695,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 		break;
 
 	case ST_REJECTSWORD:
-		sc_start(bl,SC_AUTOCOUNTER,(skilllv*15),skilllv,skill_get_time2(skillid,skilllv));
+		sc_start(bl,SC_AUTOCOUNTER,(skilllv*15),skilllv,skill_get_time(skillid,skilllv));
 		break;
 
 	case PF_FOGWALL: