summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-02 21:46:27 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-02 21:46:27 +0000
commit236afc9930355e09bcb35f3e1b7092d5700ece25 (patch)
tree847801c1fcd981bbff1d70a684658e343eefca8c /db
parent172581074787f73ba1b75618a792c76795868b34 (diff)
downloadhercules-236afc9930355e09bcb35f3e1b7092d5700ece25.tar.gz
hercules-236afc9930355e09bcb35f3e1b7092d5700ece25.tar.bz2
hercules-236afc9930355e09bcb35f3e1b7092d5700ece25.tar.xz
hercules-236afc9930355e09bcb35f3e1b7092d5700ece25.zip
* Gold Lux now makes you autocast Flip Coin on attack
- also Gunslinger can use Berserk Potion now git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8074 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index e1f685814..0215eaeb1 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
=========================
08/02
+ * Gold Lux now makes you autocast Flip Coin on attack [Playtester]
+ - also Gunslinger can use Berserk Potion now
* Changed Scream and Hammerfall's stun duration to 5 seconds. [Skotlex]
* Converted NJ_HYOUSYOURAKU from jAthena since our version was lacking a time2 [Playtester]
* Reverted LOD card changes as well [Playtester]
diff --git a/db/item_db.txt b/db/item_db.txt
index f04da3371..e33edd99a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -143,7 +143,7 @@
// ASPD Potions
645,Concentration_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{}
656,Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0xFFF7FEEF,7,2,,,40,,,{ sc_end SC_Sleep; sc_start SC_ASPDPOTION1,1800000,0; },{},{}
-657,Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x00E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{}
+657,Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x01E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{}
658,Tribal_Solidarity,Tribal Solidarity,2,1000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ guildgetexp rand(600000,1200000); },{},{}
// New Pet Tames
659,Her_Heart,Her Heart,11,500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1188; },{},{}
@@ -2651,7 +2651,7 @@
13103,Crimson_Bolt_,Crimson Bolt,4,20000,,450,45,,9,2,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
13104,Garrison,Garrison,4,48000,,500,70,,9,1,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
13105,Garrison_,Garrison,4,48000,,500,70,,9,2,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
-13106,Gold_Lux,Gold Lux,4,100000,,500,20,,9,0,0x01000000,7,2,2,3,12,1,17,{ bonus bHit,-10; },{},{}
+13106,Gold_Lux,Gold Lux,4,100000,,500,20,,9,0,0x01000000,7,2,34,3,12,1,17,{ bonus bHit,-10; if(getskilllv(500)>0) bonus3 bAutoSpell,500,getskilllv(500),10; },{},{}
13150,Branch,Branch,4,3000,,500,50,,9,3,0x01000000,7,2,34,1,1,1,18,{},{},{}
13151,Cyclone,Cyclone,4,17500,,700,120,,9,1,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
13152,Cyclone_,Cyclone,4,17500,,700,120,,9,2,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}