summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-25 21:59:55 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-25 21:59:55 +0000
commit7d88aa25325ec2013323a31b606525edc02553ef (patch)
tree49111b5c11e3bf4cf3d464631d7506aa14a3c5b3 /db
parentdbf2fd23c69608ead75e968d5ede7e5ebf9fcea9 (diff)
downloadhercules-7d88aa25325ec2013323a31b606525edc02553ef.tar.gz
hercules-7d88aa25325ec2013323a31b606525edc02553ef.tar.bz2
hercules-7d88aa25325ec2013323a31b606525edc02553ef.tar.xz
hercules-7d88aa25325ec2013323a31b606525edc02553ef.zip
Added correct packets for the food item creation window.
Added script command 'cooking' to activate this window and applied it to the 5 cooking kit items. Renamed the cooking quest variable to cooking_q to avoid a naming collision with the new script command. (You need to manually rename all occurences of this variable in your txt-savefile/sql-database if you want to preserve player progress.) The code still relies on the messy skill_produce_mix logic and still uses completely custom equations. To be fixed in a separate commit. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13628 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt10
-rw-r--r--db/packet_db.txt2
3 files changed, 8 insertions, 6 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index b33688da5..fb712f2ca 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -41,6 +41,8 @@
=======================
2009/03/25
+ * Added cooking packets to packet_db.txt
+ * Changed the cooking kit items to use the new 'cooking' function [ultramage]
* Added missing 12.1 drops to the monsters [Playtester]
* Fixed Sonic Blow's and Arrow Vulcan's aftercast delay being reducable by Bragi [Playtester]
2009/03/24
diff --git a/db/item_db.txt b/db/item_db.txt
index 1a7eabb96..0a5ab6165 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3568,11 +3568,11 @@
12123,Honey_Pastry,Honey Pastry,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_FleeFood,1200000,30; },{},{}
12124,Rainbow_Cake,Rainbow Cake,0,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_BATKFood,1200000,10; sc_start SC_MATKFood,120000,10; },{},{}
// Cooking Sets
-12125,Outdoor_Cooking_Kits,Outdoor Cooking Kit,2,500,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 11; },{},{}
-12126,Indoor_Cooking_Kits,Home Cooking Kit,2,1000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 12; },{},{}
-12127,High_end_Cooking_Kits,Professional Cooking Kit,2,2000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 13; },{},{}
-12128,Imperial_Cooking_Kits,Royal Cooking Kit,2,5000,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 14; },{},{}
-12129,Fantastic_Cooking_Kits,Fantastic Cooking Kit,2,10000,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 15; },{},{}
+12125,Outdoor_Cooking_Kits,Outdoor Cooking Kit,2,500,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 11; },{},{}
+12126,Indoor_Cooking_Kits,Home Cooking Kit,2,1000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 12; },{},{}
+12127,High_end_Cooking_Kits,Professional Cooking Kit,2,2000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 13; },{},{}
+12128,Imperial_Cooking_Kits,Royal Cooking Kit,2,5000,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 14; },{},{}
+12129,Fantastic_Cooking_Kits,Fantastic Cooking Kit,2,10000,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ cooking 15; },{},{}
//
12130,Cookie_Bag,Cookie Bag,2,2,,70,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_CookieBag),1; getitem groupranditem(IG_CookieBag),1; getitem groupranditem(IG_CookieBag),1; },{},{}
12131,Lucky_Potion,Lucky Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/packet_db.txt b/db/packet_db.txt
index acf1b6fa7..30cdb02ae 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -819,7 +819,7 @@ packet_ver: 19
//2005-10-10aSakexe
0x020e,32
0x025a,-1
-0x025b,-1
+0x025b,6,cooking,0
//2005-10-13aSakexe
0x007a,6