summaryrefslogtreecommitdiff
path: root/db/pre-re
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-03-06 02:04:59 +0000
committershennetsind <ind@henn.et>2013-04-11 16:10:12 -0300
commit7d59a35f2a7c1c3aa99b223d3758448608581e8b (patch)
treed6661c8d5e62253cf76ae4a72ce556f472f900a8 /db/pre-re
parentc2797dc5080c0b65dee81d3ad7770208daf6f7d9 (diff)
downloadhercules-7d59a35f2a7c1c3aa99b223d3758448608581e8b.tar.gz
hercules-7d59a35f2a7c1c3aa99b223d3758448608581e8b.tar.bz2
hercules-7d59a35f2a7c1c3aa99b223d3758448608581e8b.tar.xz
hercules-7d59a35f2a7c1c3aa99b223d3758448608581e8b.zip
* Initial implementation of Archangel Wing Enchants script.
* Added some Malangdo coin exchange NPCs, more will come later. * Updated Malangdo warp portals. * Fixed item ID 12220 and clarified documentation of 'getiteminfo' types 11 and 14 (bugreport:7256). * Minor Renewal item database update. * Applied changes from r17171 to SQL databases. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17172 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/pre-re')
-rw-r--r--db/pre-re/item_db.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 633222feb..59d61be1c 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -4765,7 +4765,7 @@
12217,Aspersio_5_Scroll,LV5 Aspersio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(countitem(523)>0) { skilleffect "PR_ASPERSIO",0; sc_start SC_ASPERSIO,180000,5; delitem 523,1; } },{},{}
12218,Assumptio_5_Scroll,LV5 Assumptio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "HP_ASSUMPTIO",0; sc_start SC_ASSUMPTIO,100000,5; },{},{}
12219,Wind_Walk_10_Scroll,LV10 Wind Walker Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "SN_WINDWALK",0; sc_start SC_WINDWALK,250000,5; },{},{}
-12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getiteminfo(getequipid(EQI_HAND_R),14)==6||getiteminfo(getequipid(EQI_HAND_R),14)==7) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
+12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set .@type,getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==6||.@type==7||.@type==8) { skilleffect "BS_ADRENALINE",0; sc_start SC_ADRENALINE,150000,5; } },{},{}
12221,Megaphone_,Megaphone,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{}
12225,Sweet_Candy_Striper,Sweet Candy Cane,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{}
12226,Examination1,Examination 1,0,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,5400000,0; percentheal 100,100; sc_start SC_STRFOOD,5400000,10; sc_start SC_DEXFOOD,5400000,5; sc_start SC_ATKPOTION,5400000,22; sc_start SC_MATKFOOD,5400000,15; },{},{}