summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-29 05:30:43 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-29 05:30:43 +0000
commit07ae3aa642ce374f72db3b1954e2df33594d51ac (patch)
tree134984c63b3521671601b71a0c24067cd7ebce51 /db
parent214e880edae3167e8a167776fe06a40bb7daba0d (diff)
downloadhercules-07ae3aa642ce374f72db3b1954e2df33594d51ac.tar.gz
hercules-07ae3aa642ce374f72db3b1954e2df33594d51ac.tar.bz2
hercules-07ae3aa642ce374f72db3b1954e2df33594d51ac.tar.xz
hercules-07ae3aa642ce374f72db3b1954e2df33594d51ac.zip
* Added more Malangdo scripts.
* Updated quest_db with more translated Malangdo entries. * Added and updated some newer items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17060 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/quest_db.txt82
-rw-r--r--db/re/item_db.txt10
2 files changed, 85 insertions, 7 deletions
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 4f4ae93e3..3c5839642 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -504,6 +504,7 @@
5080,0,0,0,0,0,0,0,"Sub Quest Games"
5081,0,0,0,0,0,0,0,"Sub Quest Games"
5082,0,0,0,0,0,0,0,"Sub Quest Games"
+5091,0,0,0,0,0,0,0,"Malang Road"
5092,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
5093,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
5094,0,1002,1000,0,0,0,0,"Unlocking the Ultimate Mediocrity"
@@ -769,13 +770,88 @@
7241,86400,0,0,0,0,0,0,"Toren's Errands - Tomorrow"
7260,0,0,0,0,0,0,0,"Occurrence of insect origin"
-7261,0,0,0,0,0,0,0,"Cat Cookies - Table"
-7262,0,0,0,0,0,0,0,"Cat Cookies - Mattress"
-7263,0,0,0,0,0,0,0,"Cat Cookies - Grill"
+7261,0,0,0,0,0,0,0,"Cat Biscuits - Table"
+7262,0,0,0,0,0,0,0,"Cat Biscuits - Mattress"
+7263,0,0,0,0,0,0,0,"Cat Biscuits - Grill"
7264,0,0,0,0,0,0,0,"Cat Chef"
7265,0,0,0,0,0,0,0,"Cat Chef Anger"
7266,0,0,0,0,0,0,0,"Cat Chef Intentions"
+7267,86400,0,0,0,0,0,0,"Cleanyang's meow and appointment time"
+7268,0,0,0,0,0,0,0,"Find the cat biscuits!"
+7269,0,0,0,0,0,0,0,"Cat Biscuits - Resting Place"
+7270,0,0,0,0,0,0,0,"Cat Biscuits - Sand"
+7271,0,0,0,0,0,0,0,"Cat Biscuits - Bottom of the Stairs"
+7272,0,0,0,0,0,0,0,"Cat Biscuits - Corner"
+7273,0,0,0,0,0,0,0,"Cat Biscuits - Locker"
+7274,0,0,0,0,0,0,0,"Cat Biscuits - Foothold"
+7275,0,0,0,0,0,0,0,"Cat Biscuits - Sand"
7276,86400,0,0,0,0,0,0,"Food delivery promise"
+7281,0,0,0,0,0,0,0,"List of Errands"
+7282,0,0,0,0,0,0,0,"List of Errands"
+7283,0,0,0,0,0,0,0,"List of Errands"
+7284,0,0,0,0,0,0,0,"List of Errands"
+7285,0,0,0,0,0,0,0,"List of Errands"
+7286,0,0,0,0,0,0,0,"List of Errands"
+7287,0,0,0,0,0,0,0,"List of Errands"
+7288,0,0,0,0,0,0,0,"List of Errands"
+7289,0,0,0,0,0,0,0,"List of Errands"
+7290,0,0,0,0,0,0,0,"List of Errands"
+7291,0,0,0,0,0,0,0,"List of Errands"
+7292,0,0,0,0,0,0,0,"List of Errands"
+7293,0,0,0,0,0,0,0,"List of Errands"
+7294,0,0,0,0,0,0,0,"List of Errands"
+7295,0,0,0,0,0,0,0,"List of Errands"
+7296,0,0,0,0,0,0,0,"List of Errands"
+7297,0,0,0,0,0,0,0,"List of Errands"
+7298,0,0,0,0,0,0,0,"List of Errands"
+7299,0,0,0,0,0,0,0,"List of Errands"
+7300,0,0,0,0,0,0,0,"List of Errands"
+7301,0,0,0,0,0,0,0,"List of Errands"
+7302,0,0,0,0,0,0,0,"List of Errands"
+7303,0,0,0,0,0,0,0,"List of Errands"
+7304,0,0,0,0,0,0,0,"List of Errands"
+7305,0,0,0,0,0,0,0,"List of Errands"
+7306,0,0,0,0,0,0,0,"List of Errands"
+7307,0,0,0,0,0,0,0,"List of Errands"
+7308,0,0,0,0,0,0,0,"List of Errands"
+7309,0,0,0,0,0,0,0,"List of Errands"
+7310,0,0,0,0,0,0,0,"List of Errands"
+7311,0,0,0,0,0,0,0,"List of Errands"
+7312,0,0,0,0,0,0,0,"List of Errands"
+7313,0,0,0,0,0,0,0,"List of Errands"
+7314,0,0,0,0,0,0,0,"List of Errands"
+7315,0,0,0,0,0,0,0,"List of Errands"
+7316,0,0,0,0,0,0,0,"List of Errands"
+7317,0,0,0,0,0,0,0,"List of Errands"
+7318,0,0,0,0,0,0,0,"List of Errands"
+7319,0,0,0,0,0,0,0,"List of Errands"
+7320,0,0,0,0,0,0,0,"List of Errands"
+7321,0,0,0,0,0,0,0,"List of Errands"
+7322,0,0,0,0,0,0,0,"List of Errands"
+7323,0,0,0,0,0,0,0,"List of Errands"
+7324,0,0,0,0,0,0,0,"List of Errands"
+7325,0,0,0,0,0,0,0,"List of Errands"
+7326,0,0,0,0,0,0,0,"List of Errands"
+7327,0,0,0,0,0,0,0,"List of Errands"
+7328,0,0,0,0,0,0,0,"List of Errands"
+7329,0,0,0,0,0,0,0,"List of Errands"
+7330,0,0,0,0,0,0,0,"List of Errands"
+7331,0,0,0,0,0,0,0,"List of Errands"
+7332,0,0,0,0,0,0,0,"List of Errands"
+7333,0,0,0,0,0,0,0,"List of Errands"
+7334,0,0,0,0,0,0,0,"List of Errands"
+7335,0,0,0,0,0,0,0,"List of Errands"
+7336,0,0,0,0,0,0,0,"List of Errands"
+7337,0,0,0,0,0,0,0,"List of Errands"
+7338,0,0,0,0,0,0,0,"List of Errands"
+7339,0,0,0,0,0,0,0,"List of Errands"
+7340,0,0,0,0,0,0,0,"List of Errands"
+7341,0,0,0,0,0,0,0,"List of Errands"
+7342,0,0,0,0,0,0,0,"List of Errands"
+7343,0,0,0,0,0,0,0,"List of Errands"
+7344,0,0,0,0,0,0,0,"List of Errands"
+7345,0,0,0,0,0,0,0,"List of Errands"
+7346,0,0,0,0,0,0,0,"List of Errands"
8000,0,0,0,0,0,0,0,"Quitting Job Change"
8001,0,0,0,0,0,0,0,"Job Change to Assassin"
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 0ba6641ab..4129ec62f 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -5022,11 +5022,13 @@
11529,MAAMOUL_,Maamoul,0,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 120,60; },{},{}
11530,Jujube,Jujube,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 30,0; },{},{}
11531,Coffee,Coffee,0,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,10; },{},{}
-11532,Nasi_Goreng,Nasi_Goreng,0,14,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(30,45),0; },{},{}
-11533,Satay,Satay,0,14,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(30,45),0; },{},{}
-11534,Coconut_Juice,Coconut Juice,0,14,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 3,3; },{},{}
+11532,Nasi_Goreng,Nasi_Goreng,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
+11533,Satay,Satay,0,15,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
+11534,Coconut_Juice,Coconut Juice,0,20,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(17,23),0; },{},{}
//
-11538,Fresh_Octopus_Legs,Fresh Octopus Legs,0,20,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(100,150),rand(50,65); },{},{}
+11536,Cat_Hard_Biscuit,Cat Biscuit,0,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,110),0; },{},{}
+//
+11538,Fresh_Octopus_Legs,Fresh Octopus Legs,0,20,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(35,60),rand(5,10); },{},{}
//
11547,Siege_Purple_Potion,Siege Purple Potion,0,20,,120,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(500,600),rand(60,80); },{},{}
11548,Siege_White_Potion,Siege White Potion,0,20,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}