summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-09 12:03:53 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-09 12:03:53 +0000
commitd4e85de04dc6f11eb5c5b82be2ce236fc39009e6 (patch)
tree86e6062f7a2dc5f09ee1be076edd3222c0bb5df1
parentcf51fb6a2e0e24aa24dddcec2509a7046bfbb113 (diff)
downloadhercules-d4e85de04dc6f11eb5c5b82be2ce236fc39009e6.tar.gz
hercules-d4e85de04dc6f11eb5c5b82be2ce236fc39009e6.tar.bz2
hercules-d4e85de04dc6f11eb5c5b82be2ce236fc39009e6.tar.xz
hercules-d4e85de04dc6f11eb5c5b82be2ce236fc39009e6.zip
Cleared documentation about autospellwhenhit, a lot of cards will need to be revised
Fixed 2000,Destruction_Rod being 0.2% per refine instead of 2%. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12799 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt3
-rw-r--r--db/item_db.txt4
-rw-r--r--doc/item_bonus.txt48
3 files changed, 34 insertions, 21 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 81d52a30d..aa49f52a7 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,9 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/06/09
+ * Fixed 2000,Destruction_Rod being 0.2% per refine instead of 2%.
+
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.
diff --git a/db/item_db.txt b/db/item_db.txt
index 26b088a61..4d6fe0b3a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -982,7 +982,7 @@
1977,Battle_Lariat,Battle Lariat,4,,0,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus bUnbreakableWeapon,0; },{},{}
1978,Battle_Lariat_,Battle Lariat,4,,0,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,394,20; bonus bUnbreakableWeapon,0; },{},{}
// Additional 2-Handed Staffs
-2000,Destruction_Rod,Staff of Destruction,4,,10,2500,130,,1,1,0x00000200,2,2,34,4,80,1,10,{ bonus bMatkRate,25+getrefine()/2; bonus bInt,3; bonus bAgi,10; bonus bUseSPrate,(getrefine()*2); bonus5 bAutoSpellWhenHit,84,5,(getrefine()*2),BF_WEAPON,1; bonus2 bCastrate,366,-50; },{},{}
+2000,Destruction_Rod,Staff of Destruction,4,,10,2500,130,,1,1,0x00000200,2,2,34,4,80,1,10,{ bonus bMatkRate,25+getrefine()/2; bonus bInt,3; bonus bAgi,10; bonus bUseSPrate,(getrefine()*2); bonus5 bAutoSpellWhenHit,84,5,(getrefine()*20),BF_WEAPON,1; bonus2 bCastrate,366,-50; },{},{}
2001,Divine_Cross,Divine Cross,4,,10,1500,120,,1,0,0x00008100,7,2,34,4,70,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bDex,4; bonus2 bSubRace,RC_Demon,15; bonus2 bSubRace,RC_Undead,15; if (isequipped(2677) || isequipped(2711)) { bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; }; },{},{}
// Shields
//===================================================================
@@ -1616,7 +1616,7 @@
4165,Gig_Card,Gig Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Insect,5; },{},{ heal 0,-5; }
4166,Nightmare_Terror_Card,Nightmare Terror Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Curse,300+600*(isequipped(4127)); },{},{}
4167,Neraid_Card,Neraid Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Brute,5; },{},{ heal 0,-5; }
-4168,Dark_Lord_Card,Dark Lord Card,6,,10,10,,,,,,,,64,,,,,{ bonus4 bAutoSpellWhenHit,83,5,100,0; if(isequipped(4169)) { bonus bMaxHPrate,20; bonus bMaxSPrate,20; } },{},{}
+4168,Dark_Lord_Card,Dark Lord Card,6,,10,10,,,,,,,,64,,,,,{ bonus5 bAutoSpellWhenHit,83,5,100,1,BF_SHORT; if(isequipped(4169)) { bonus bMaxHPrate,20; bonus bMaxSPrate,20; } },{},{}
4169,Dark_Illusion_Card,Dark Illusion Card,6,,10,10,,,,,,,,769,,,,,{ bonus bMaxHPrate,-10; bonus bMaxSPrate,-10; bonus bCastrate,-10-10*isequipped(4168); },{},{}
4170,Dark_Frame_Card,Dark Frame Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,600; },{},{}
4171,Dark_Priest_Card,Dark Priest Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPVanishRate,50,10; if(BaseJob==Job_Sage) bonus bSPGainValue,1; },{},{}
diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index dc0c39016..95069ce9b 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -197,37 +197,47 @@ bonus4 bAutoSpellWhenHit,x,y,n,i; n/10% chance to cast skill x of level y when
i: 1=cast on enemy, not on self
2=use random skill lv in [1..y]
3=1+2 (random lv on enemy)
-bonus5 bAutoSpell,x,y,n,t,i; n/10% chance to cast skill x of level y when
- attacking
- i: 1=cast on enemy, not on self
+bonus5 bAutoSpell,x,y,n,t,i; n/10% chance to cast skill x of level y when attacking
+ t: Trigger criteria:
+ BF_SHORT: Trigger on melee attack
+ BF_LONG: Trigger on ranged attack
+ ( Default: BF_SHORT+BF_LONG )
+
+ BF_WEAPON: Trigger on weapon skills
+ BF_MAGIC: Trigger on magic skills
+ BF_MISC: Trigger on misc skills
+ ( Default: BF_WEAPON )
+
+ BF_NORMAL: Trigger on normal
+ attacks.
+ BF_SKILL: Trigger on skills
+ (Default: BF_SKILL if type is BF_MISC or BF_MAGIC, BF_NORMAL if type is BF_WEAPON)
+
+ i: 1=cast on enemy, not on self
2=use random skill lv in [1..y]
3=1+2 (random lv on enemy)
+
+bonus5 bAutoSpellWhenHit,x,y,n,t,i; n/10% chance to cast skill x of level y when being hit by a direct attack.
+ Target must be within spell's range to go
+ off.
t: Trigger criteria:
BF_SHORT: Trigger on melee attack
BF_LONG: Trigger on ranged attack
- (When neither is specified,
- then BF_SHORT+BF_LONG is used.
+ ( Default: BF_SHORT+BF_LONG )
+
BF_WEAPON: Trigger on weapon skills
BF_MAGIC: Trigger on magic skills
BF_MISC: Trigger on misc skills
- (If none is specified, BF_WEAPON is
- used)
+ ( Default: BF_WEAPON )
+
BF_NORMAL: Trigger on normal
- attacks.
+ attacks.
BF_SKILL: Trigger on skills
- (When neither is specified,
- BF_SKILL is used if the type is
- BF_MISC or BF_MAGIC. BF_NORMAL is
- used if the type is BF_WEAPON)
-bonus5 bAutoSpellWhenHit,x,y,n,t,i; n/10% chance to cast skill x of level y when
- being hit by a direct attack. Target
- must be within spell's range to go
- off.
- i: 1=cast on enemy, not on self
+ (Default: BF_SKILL if type is BF_MISC or BF_MAGIC, BF_NORMAL if type is BF_WEAPON)
+
+ i: 1=cast on enemy, not on self
2=use random skill lv in [1..y]
3=1+2 (random lv on enemy)
- t: Trigger criteria (see bonus5
- bAutoSpell)
//---- 2/22 new card effects ----