summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-30 21:24:32 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-30 21:24:32 +0000
commit71e929e7e52293ffbb4644cbdf222acd733e4907 (patch)
tree8090683165e06b47a944335bc378449e57843aad
parente8a9dd12348aa0e504a5e0b24122a5b268128fda (diff)
downloadhercules-71e929e7e52293ffbb4644cbdf222acd733e4907.tar.gz
hercules-71e929e7e52293ffbb4644cbdf222acd733e4907.tar.bz2
hercules-71e929e7e52293ffbb4644cbdf222acd733e4907.tar.xz
hercules-71e929e7e52293ffbb4644cbdf222acd733e4907.zip
* Additional Pet Tames reverted again back to item-type 2 (recent commit by Ultramage fixes double-consumption)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10931 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/item_db.txt8
2 files changed, 5 insertions, 4 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 56f33426a..9b4a9b3ce 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -49,6 +49,7 @@
----
========================
07/30
+ * Rev. 10931 Additional Pet Tames reverted again back to item-type 2 (recent commit by Ultramage fixes double-consumption) [L0ne_W0lf]
* Rev. 10929 Added 1 slot to all coloured ribbons as pointed out by Elfange. [L0ne_W0lf]
07/28
* Fixed monsters using Pneuma on target instead of self [Playtester]
diff --git a/db/item_db.txt b/db/item_db.txt
index a9f96d55b..ae6c9ce94 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -158,9 +158,9 @@
657,Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x01E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{}
658,Union_Of_Tribe,Tribal Solidarity,2,,1,500,,,,,0xFFFFFFFF,7,2,,,,,,{ guildgetexp rand(600000,1200000); },{},{}
// New Pet Tames
-659,Heart_Of_Her,Her Heart,11,500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1188; },{},{}
-660,Prohibition_Red_Candle,Forbidden Red Candle,11,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1200; },{},{}
-661,Sway_Apron,Soft Apron,11,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1275; },{},{}
+659,Heart_Of_Her,Her Heart,2,500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1188; },{},{}
+660,Prohibition_Red_Candle,Forbidden Red Candle,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1200; },{},{}
+661,Sway_Apron,Soft Apron,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1275; },{},{}
662,Inspector_Certificate,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect 507; sc_start SC_SpeedUp0,180000,0; },{},{}
663,Korea_Rice_Cake,Songpyun,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}
// Item Givers
@@ -2928,7 +2928,7 @@
12219,Wind_Walk_10_Scroll,LV10 Windwalk Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect 383,0; sc_start SC_WINDWALK,250000,5; },{},{}
12220,Adrenaline_Scroll,LV5 Adrenaline Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect 111,0; sc_start SC_ADRENALINE,150000,5; },{},{}
12221,Megaphone_,Megaphone,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ input @Megaphone$; announce strcharinfo(0) + ": " + @megaphone$,bc_all,0xFF0000; end; },{},{}
-12225,Sweet_Candy_Cane,Sweet Candy Cane,11,,10,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{}
+12225,Sweet_Candy_Cane,Sweet Candy Cane,2,,10,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1245; },{},{}
12232,GingerBread,Ginger Bread,0,,,150,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12233,Kvass,Kvass,0,,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
//Valentine's Day Event (2007)