diff options
| author | shennetsind <ind@henn.et> | 2013-05-31 13:27:12 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-05-31 13:27:12 -0300 |
| commit | 39ef1aa8ca2c322aef7a380e2222f671fadd408a (patch) | |
| tree | 2efea166529248090e619f6998445113f7833120 /db | |
| parent | 3956eb8ece10375ce6ab55945465001df5e178d4 (diff) | |
| parent | 89eb3b2c2605ef6c4ba82fe55d32891f8e2deeda (diff) | |
| download | hercules-39ef1aa8ca2c322aef7a380e2222f671fadd408a.tar.gz hercules-39ef1aa8ca2c322aef7a380e2222f671fadd408a.tar.bz2 hercules-39ef1aa8ca2c322aef7a380e2222f671fadd408a.tar.xz hercules-39ef1aa8ca2c322aef7a380e2222f671fadd408a.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'db')
| -rw-r--r-- | db/pre-re/item_db.txt | 2 | ||||
| -rw-r--r-- | db/re/item_db.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 44237ee80..501e657cc 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -5203,7 +5203,7 @@ 12772,Cool_Hat_Box2,Cool Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12773,Victory_Hat_Box2,Victory Hat Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{} -12790,Char_Rename_Card,Character Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{} +12790,Change_Name_Card,Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{} 12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{} 12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} 12901,Insurance_Package,Insurance Package,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12209,10; },{},{} diff --git a/db/re/item_db.txt b/db/re/item_db.txt index a28fbd711..5dccc5442 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -5984,7 +5984,7 @@ 12775,Ancient_Spirit_Amulet,Ancient Spirit Amulet,2,20,,600,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // 12786,Change_Slot_Card,Character Position Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set SlotChange, SlotChange + 1; },{},{} -12790,Char_Rename_Card,Character Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{} +12790,Change_Name_Card,Name Change Coupon,2,,,,,,,,0xFFFFFFFF,7,2,,,,,,{ set CharRename, CharRename + 1; },{},{} // 12848,Falcon_Flute,Falcon Flute,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } } },{},{} 12900,Battle_Manual_Box,Battle Manual Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,10; },{},{} |