summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-29 15:11:28 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-29 15:11:28 +0000
commite855e728ca6778580a913d8046a9e8fa652fb983 (patch)
treea6f33b82c29d36994c2a3c03aeffe50e392112e2 /db
parent5723fdae682d71948b2b10161e336d36ea03bdfa (diff)
downloadhercules-e855e728ca6778580a913d8046a9e8fa652fb983.tar.gz
hercules-e855e728ca6778580a913d8046a9e8fa652fb983.tar.bz2
hercules-e855e728ca6778580a913d8046a9e8fa652fb983.tar.xz
hercules-e855e728ca6778580a913d8046a9e8fa652fb983.zip
Fixed Green Ale's effect, thanks to NLZ.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6818 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 537ff0140..e895d11dd 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -26,6 +26,8 @@
-----
=========================
+05/29
+ * Fixed Green Ale's effect, thanks to NLZ. [MasterOfMuppets]
05/28
* Readded some aDelay fixes which were accidentaly reverted [Playtester]
05/26
diff --git a/db/item_db.txt b/db/item_db.txt
index f2e82ba2b..f3f916719 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2390,7 +2390,7 @@
12132,Santa's_Bag,Santa's Bag,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Xmas,600000,0; },{},{}
12133,McDonald's_Ice_Cone,McDonald's Ice Cone,0,50,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(5) != MDiceCone) { set MDiceCone,gettime(5); percentheal 50,50; } },{},{}
12134,Red_Envelope_,Red Envelope,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(100,10000); },{},{}
-12135,Green_Ale,Green Ale,2,,10,30,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12135,Green_Ale,Green Ale,2,,10,30,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; if(rand(100) >= 90)sc_start SC_Confusion,10000,0; },{},{}
12136,Women's_Bundle,Women's Bundle,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem callfunc("F_RandMes",4,558,529,2668,7518),1; },{},{}
12137,First_Stage,First Stage,2,,10,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12138,Second_Stage,Second Stage,2,,10,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}