Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Implemented cooking chances. Chance of success is 70% - 7*(dish-lv)% + 12*(cooking set-lv)%. Exception: When using the legendary cooking set, success chance is 100% regardless of dish.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7518 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-07-04 19:00:02 +00:00
parent 865c3db6a3
commit e8e61d25cd
3 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/04
* Implemented cooking chances. Chance of success is 70% - 7*(dish-lv)% +
12*(cooking set-lv)%. Exception: When using the legendary cooking set,
success chance is 100% regardless of dish. [Skotlex]
* Added battle config setting emergency_recall, specifies behaviour of that
skill (skill.conf): 0 - Disabled. 1 - can't be used in nowarpto maps. 2 -
Can be used everywhere. [Skotlex]

110
db/produce_db.txt
View File

@ -140,7 +140,7 @@
//==============================================
// COOKING RECIPES
// COOKING RECIPES (LV= 11 -> 20)
//==============================================
//--------------------LEVEL 1-----------
@ -161,138 +161,138 @@
//--------------------LEVEL 2-----------
//-- Seasoned Webs <-- 20 Cobweb, 10 Green Herb, 10 Yellow Herb, 1 Plain Sauce
12042,11,0,7473,0,918,20,511,10,508,10,7454,1
12042,12,0,7473,0,918,20,511,10,508,10,7454,1
//-- Sea Food <-- 10 Clam Flesh, 5 Gill, 5 Fin, 1 Yummy Fish
12052,11,0,7473,0,966,10,956,5,951,5,579,1
12052,12,0,7473,0,966,10,956,5,951,5,579,1
//-- Black Tea <-- 5 Blue Herb, 10 Red Herb, 10 Yellow Herb
12047,11,0,7473,0,510,5,507,10,508,10
12047,12,0,7473,0,510,5,507,10,508,10
//-- Smooth Noodle <-- 1 Grain, 1 Plain Sauce, 5 Pumpkin, 3 Carrot
12057,11,0,7473,0,577,1,7454,1,535,5,515,3
12057,12,0,7473,0,577,1,7454,1,535,5,515,3
//-- Chocolate Mousse Cake <-- 10 Cacao, 1 Piece of Cake, 1 Milk, 1 China
12062,11,0,7473,0,7182,10,539,1,519,1,736,1
12062,12,0,7473,0,7182,10,539,1,519,1,736,1
//-- Mixed Juice <-- 3 Apple Juice, 2 Carrot Juice, 1 Grape Juice, 2 Orange Juice
12067,11,0,7473,0,531,3,534,2,533,1,620,2
12067,12,0,7473,0,531,3,534,2,533,1,620,2
//--------------------LEVEL 3-----------
//-- Fruit Punch <-- 5 Apple, 5 Banana, 5 Orange, 5 Strawberry, 1 Yellow Spice
12063,11,0,7474,0,512,5,513,5,582,5,578,5,7452,1
12063,13,0,7474,0,512,5,513,5,582,5,578,5,7452,1
//-- Herb and Honey Tea <-- 2 Honey, 10 White Herb, 1 Yellow Spice
12048,11,0,7474,0,518,2,509,10,7452,1
12048,13,0,7474,0,518,2,509,10,7452,1
//-- Bomber Steak <-- 4 Meat, 1 Old Frying Pan, 10 Green Herb, 5 Red Chili, 1 Hot Sauce
12043,11,0,7474,0,517,4,7031,1,511,10,7286,5,7455,1
12043,13,0,7474,0,517,4,7031,1,511,10,7286,5,7455,1
//-- Clam Soup <-- 20 Clam Flesh, 10 Conch, 1 Honey, 1 Sweet Sauce
12053,11,0,7474,0,966,20,961,10,518,1,7453,1
12053,13,0,7474,0,966,20,961,10,518,1,7453,1
//-- Tentacle and Cheese Gratin <-- 10 Tentacle, 10 Cheese, 5 Yam, 1 Sweet Sauce
12058,11,0,7474,0,962,10,548,10,549,5,7453,1
12058,13,0,7474,0,962,10,548,10,549,5,7453,1
//-- Fried Sweet Potato with Syrup <-- 10 Potato, 10 Yam, 1 Sweet Potato, 1 Sweet Sauce
12068,11,0,7474,0,516,10,549,10,633,1,7453,1
12068,13,0,7474,0,516,10,549,10,633,1,7453,1
//--------------------LEVEL 4-----------
//-- Morroc Fruit Wine <-- 10 Strawberry, 4 Lemon, 10 Orange, 2 Alcohol, 5 Grape
12049,11,0,7475,0,578,10,568,4,582,10,970,2,514,5
12049,14,0,7475,0,578,10,568,4,582,10,970,2,514,5
//-- Seasoned Jellyfish <-- 30 Tentacle, 10 White Herb, 10 Soft Blade Grass, 1 Old Frying Pan, 20 Squid Ink
12054,11,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20
12054,14,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20
//-- Rib with Herbs and Spices <-- 5 Meat, 3 Red Herb, 2 Yellow Herb, 3 Green Herb, 1 Sweet Sauce, 1 Lemon
12044,11,0,7475,0,517,5,507,3,508,2,511,3,7453,1,568,1
12044,14,0,7475,0,517,5,507,3,508,2,511,3,7453,1,568,1
//-- Cream Sandwich <-- 5 Bread, 15 Milk, 10 Cheese, 10 Yellow Herb, 1 Meat, 1 Sweet Sauce
12064,11,0,7475,0,580,5,519,15,548,10,508,10,517,1,7453,1
12064,14,0,7475,0,580,5,519,15,548,10,508,10,517,1,7453,1
//-- Lutie Mixed Cold Noodles <-- 3 Grain, 1 Hot Sauce, 10 Ice Cubic, 10 Carrot, 10 Jack o' Pumpkin
12059,11,0,7475,0,577,3,7455,1,7066,10,515,10,1062,10
12059,14,0,7475,0,577,3,7455,1,7066,10,515,10,1062,10
//-- Ancient Fish Dish <-- 10 Ancient Lips, 10 Raccoon Leaf, 10 White Herb,5 Yummy Fish, 2 Sweet Sauce
12069,11,0,7475,0,1054,10,945,10,509,10,579,5,7453,2
12069,14,0,7475,0,1054,10,945,10,509,10,579,5,7453,2
//--------------------LEVEL 5-----------
//-- Mastela Wine <-- 4 Mastela Fruit, 1 Blue Potion, 2 Alcohol, 2 Lemon, 1 Yellow Spice
12050,11,0,7476,0,522,4,505,1,970,2,568,2,7452,1
12050,15,0,7476,0,522,4,505,1,970,2,568,2,7452,1
//-- Lutie Plat Cake <-- 10 Potato, 2 Honey, 1 Cooking Oil, 3 Carrot, 1 Grain
12045,11,0,7476,0,516,10,518,2,7457,1,515,3,577,1
12045,15,0,7476,0,516,10,518,2,7457,1,515,3,577,1
//-- Green Salad <-- 2 Hinalle Leaflet, 3 Aloe Leaflet, 10 Sharp Leaf, 6 Huge Leaf, 1 Sweet Sauce, 1 Yellow Spice
12065,11,0,7476,0,520,2,521,3,7100,10,7198,6,7453,1,7452,1
12065,15,0,7476,0,520,2,521,3,7100,10,7198,6,7453,1,7452,1
//-- Steamed Bat Wing and Pumpkin <-- 20 Wing of Red Bat, 20 Jack o' Pumpkin, 1 Pot, 10 Hinalle Leaflet, 10 Red Herb
12060,11,0,7476,0,7006,20,1062,20,7482,1,520,10,507,10
12060,15,0,7476,0,7006,20,1062,20,7482,1,520,10,507,10
//-- Peppery Roasted Dumpling <-- 20 Bao, 10 Yellow Herb, 1 Hot Sauce, 1 Red Spice, 20 Green Herb
12055,11,0,7476,0,553,20,508,10,7455,1,7456,1,511,20
12055,15,0,7476,0,553,20,508,10,7455,1,7456,1,511,20
//-- Broiled Down Scorpion <-- 20 Scorpion Tail, 10 Bug Leg, 10 Huge Leaf, 2 Old Frying Pan, 1 Cooking Oil
12070,11,0,7476,0,904,20,1042,10,7198,10,7031,2,7457,1
12070,15,0,7476,0,904,20,1042,10,7198,10,7031,2,7457,1
//--------------------LEVEL 6-----------
//-- Flavored Grilled Beef <-- 10 Meat, 2 Honey, 1 Yellow Herb, 1 Mastela Fruit, 20 Shining Scale
12071,11,0,7477,0,517,10,518,2,508,1,522,1,954,20
12071,16,0,7477,0,517,10,518,2,508,1,522,1,954,20
//-- Red Mushroom Wine <-- 3 Mushroom, 3 Grape Juice, 20 Mushroom Spore, 1 Alcohol, 1 Red Spice
12076,11,0,7477,0,581,3,533,3,921,20,970,1,7456,1
12076,16,0,7477,0,581,3,533,3,921,20,970,1,7456,1
//-- Peach Cake <-- 20 Solid Peach, 10 Piece of Cake, 10 Cheese, 10 Milk, 5 Orange Juice, 1 Sweet Sauce
12091,11,0,7477,0,7164,20,539,10,548,10,519,10,620,5,7453,1
12091,16,0,7477,0,7164,20,539,10,548,10,519,10,620,5,7453,1
//-- Chili and Prawn Gratin <-- 20 Red Chile, 20 Shrimp, 1 Sweet Sauce, 20 Lemon
12086,11,0,7477,0,7286,20,567,20,7453,1,568,20
12086,16,0,7477,0,7286,20,567,20,7453,1,568,20
//-- Very Bitter Invigorant <-- 20 Brown Root, 10 Maneater Root, 20 Mushroom Spore, 1 Mushroom, 2 Honey
12081,11,0,7477,0,7188,20,1033,10,921,20,581,1,518,2
12081,16,0,7477,0,7188,20,1033,10,921,20,581,1,518,2
//-- Soup of Great Luck <-- 5 Reptile Tongue, 5 Tongue, 10 Clover, 10 Witch Starsand, 1 Aloe
12096,11,0,7477,0,903,5,1015,5,705,10,1061,10,704,1
12096,16,0,7477,0,903,5,1015,5,705,10,1061,10,704,1
//--------------------LEVEL 7-----------
//-- Barbecue <-- 10 Meat, 1 Live Coal, 2 Coal, 1 Hot Sauce, 15 Trunk, 10 White Herb
12072,11,0,7478,0,517,10,7098,1,1003,2,7455,1,1019,15,509,10
12072,17,0,7478,0,517,10,7098,1,1003,2,7455,1,1019,15,509,10
//-- Royal Jelly and Herb Tea <-- 4 Royal Jelly, 2 Honey, 5 White Herb, 10 Hinalle Leaflet, 1 Yellow Spice
12077,11,0,7478,0,526,4,518,2,509,5,520,10,7452,1
12077,17,0,7478,0,526,4,518,2,509,5,520,10,7452,1
//-- Soul Hunt Bread <-- 10 Bread, 5 Mastela Fruit, 1 Sweet Sauce, 5 Ment, 5 Amulet, 2 Unripe Apple
12092,11,0,7478,0,580,10,522,5,7453,1,708,5,609,5,619,2
12092,17,0,7478,0,580,10,522,5,7453,1,708,5,609,5,619,2
//-- Boiled Vegetable stuffed with Roasted Crocodile <-- 10 Anolian Skin, 10 Jack o' Pumpkin, 10 Carrot, 10 Aloe Leaflet, 10 Yellow Herb, 1 Yellow Spice
12087,11,0,7478,0,7003,10,1062,10,515,10,521,10,508,10
12087,17,0,7478,0,7003,10,1062,10,515,10,521,10,508,10
//-- Sumptuous Feast <-- 10 Fish Tail, 5 Aloe Leaflet, 10 Mane, 2 Yummy Fish, 10 Pet Food, 1 Sweet Sauce
12082,11,0,7478,0,1023,10,521,5,1028,10,579,2,537,10,7453,1
12082,17,0,7478,0,1023,10,521,5,1028,10,579,2,537,10,7453,1
//-- Grilled Meat Skewer <-- 10 Scale Shell, 5 Gill, 10 Soft Blade of Grass, 5 Meat, 10 Mushroom, 10 Clam Flesh
12097,11,0,7478,0,936,10,956,5,7194,10,517,5,581,10,966,10
12097,17,0,7478,0,936,10,956,5,7194,10,517,5,581,10,966,10
//--------------------LEVEL 8-----------
//-- Bear Foot Dish <-- 20 Bear's Footskin, 10 Carrot, 10 Jack o' Pumpkin, 2 Aloe Leaflet, 1 Hinalle Leaflet, 1 Plain Sauce
12073,11,0,7479,0,948,20,515,10,1062,10,521,2,520,1,7454,1
12073,18,0,7479,0,948,20,515,10,1062,10,521,2,520,1,7454,1
//-- Royal Tea <-- 4 Thorned Fruit, 10 Hinalle Leaflet, 3 Yggdrasil Leaf, 10 Aloe Leaflet, 6 Royal Jelly, 1 Yellow Spice
12078,11,0,7479,0,576,4,520,10,610,3,521,10,526,6,7453,1
12078,18,0,7479,0,576,4,520,10,610,3,521,10,526,6,7453,1
//-- Special Toast <-- 10 Bread, 2 Royal Jelly, 5 Meat, 10 Strawberry, 1 Hot Sauce, 10 Cheese, 1 Sweet Sauce
12093,11,0,7479,0,580,10,526,2,517,5,578,10,7455,1,548,10,7453,1
12093,18,0,7479,0,580,10,526,2,517,5,578,10,7455,1,548,10,7453,1
//-- Very Hot Curry <-- 1 Aloevera, 1 Hot Sauce, 10 Meat, 10 Hinalle Leaflet, 10 Jack o' Pumpkin, 10 Carrot
12088,11,0,7479,0,606,1,7455,1,517,10,520,10,1062,10,515,10
12088,18,0,7479,0,606,1,7455,1,517,10,520,10,1062,10,515,10
//-- Huge Stuffed Leaves <-- 20 Fig Leaf, 20 Meat, 5 Rainbow Carrot, 10 Jack o' Pumpkin, 1 Plain Sauce, 2 Grain
12083,11,0,7479,0,7298,20,517,20,622,5,1062,10,7454,1,577,2
12083,18,0,7479,0,7298,20,517,20,622,5,1062,10,7454,1,577,2
//-- Strawberry Rice Ball <-- 10 Strawberry, 5 Grain, 10 Fig Leaf, 1 Yellow Spice, 2 Red Spice, 1 Plain Sauce
12098,11,0,7479,0,578,10,577,5,7298,10,7452,1,7456,2,7454,1
12098,18,0,7479,0,578,10,577,5,7298,10,7452,1,7456,2,7454,1
//--------------------LEVEL 9-----------
//-- Sauted Meat Strips <-- 40 Tendon, 1 Pot, 10 Cheese, 1 Hot Sauce, 2 Coal, 30 Green Herb, 10 Squid Ink
12074,11,0,7480,0,1050,40,7482,1,548,10,7455,1,1003,2,511,30,1024,10
12074,19,0,7480,0,1050,40,7482,1,548,10,7455,1,1003,2,511,30,1024,10
//-- Tristan 12 <-- 10 Yggdrasil Leaf, 10 Orange, 5 Alcohol, 4 Royal Jelly, 2 Blue Potion, 1 Yellow Spice, 10 Aloe Leaflet
12079,11,0,7480,0,610,10,582,10,970,5,526,4,505,2,7452,1,521,10
12079,19,0,7480,0,610,10,582,10,970,5,526,4,505,2,7452,1,521,10
//-- Ethereal Fruit Juice <-- 5 Unripe Apple, 10 Orange, 10 Strawberry, 1 Red Spice, 1 Tropica Banana, 5 Grape Juice, 2 Alcohol
12094,11,0,7480,0,619,5,582,10,578,10,7456,1,634,1,533,5,970,2
12094,19,0,7480,0,619,5,582,10,578,10,7456,1,634,1,533,5,970,2
//-- Delicious Boiled Meats <-- 10 Meat, 5 Royal Jelly, 20 Shoot, 4 Plain Sauce, 5 Yellow Herb, 10 White Herb, 5 Red Herb
12089,11,0,7480,0,517,10,526,5,711,20,7454,4,508,5,509,10,507,5
12089,19,0,7480,0,517,10,526,5,711,20,7454,4,508,5,509,10,507,5
//-- Ascending Dragon Broth <-- 10 Dragon Skin, 20 Dragon Tail, 3 Yggdrasil Leaf, 6 Royal Jelly, 1 Hot Sauce, 1 Red Spice, 1 Fatty Chubby Earthworm
12084,11,0,7480,0,7123,10,1037,20,610,3,526,6,7455,1,7456,1,632,1
12084,19,0,7480,0,7123,10,1037,20,610,3,526,6,7455,1,7456,1,632,1
//-- Blood Flavored Sodapop <-- 1 Animal Gore, 2 Anodyne, 2 Aloevera, 2 Alcohol, 6 Royal Jelly, 1 Red Spice, 10 Apple Juice
12099,11,0,7480,0,702,1,605,2,606,2,970,2,526,6,7456,1,531,10
12099,19,0,7480,0,702,1,605,2,606,2,970,2,526,6,7456,1,531,10
//--------------------LEVEL 10-----------
//-- Tongue Dish <-- 20 Tongue, 1 Pot, 1 Alcohol, 2 Aloevera, 1 Hot Sauce, 5 Royal Jelly, 10 Yggdrasil Leaf, 2 Blue Potion
12075,11,0,7481,0,1015,20,7482,1,970,1,606,2,7455,1,526,5,610,10,505,2
12075,20,0,7481,0,1015,20,7482,1,970,1,606,2,7455,1,526,5,610,10,505,2
//-- Dragon Breath Cocktail <-- 10 Maneater Root, 1 Singing Plant, 5 Aloe Leaflet, 5 Royal Jelly, 5 Lemon, 5 Thorned Fruit, 1 Yggdrasilberry, 10 Blue Herb
12080,11,0,7481,0,1033,10,707,1,521,5,526,5,568,5,576,5,607,1,510,10
12080,20,0,7481,0,1033,10,707,1,521,5,526,5,568,5,576,5,607,1,510,10
//-- Wine of Bergelmir <-- 1 Yggdrasilberry, 10 Ice Cubic, 10 Bacillus, 4 Royal Jelly, 3 Concentration Potion, 5 Alcohol, 2 Thorned Fruit, 1 Illusion Flower
12095,11,0,7481,0,607,1,7066,10,7119,10,526,4,645,3,970,5,576,2,710,1
12095,20,0,7481,0,607,1,7066,10,7119,10,526,4,645,3,970,5,576,2,710,1
//-- Hot Sand Steamed Scorpion <-- 20 Scorpion Tail, 20 Scorpion Claw, 2 Aloevera, 3 Yggdrasil Leaf, 3 Bitter Herb, 10 Royal Jelly , 1 Hot Sauce, 1 Pot
12090,11,0,7481,0,904,20,7125,20,606,2,610,3,621,3,526,10,7455,1,7482,1
12090,20,0,7481,0,904,20,7125,20,606,2,610,3,621,3,526,10,7455,1,7482,1
//-- Stew of Immortality <-- 20 Immortal Heart, 10 Memento, 1 Yggdrasil Seed, 2 Anodyne, 10 Heart of Mermaid, 2 Hot Sauce, 10 Amulet, 2 Bitter Herb
12085,11,0,7481,0,929,20,934,10,608,1,605,2,950,10,7455,2,609,10,621,2
12085,20,0,7481,0,929,20,934,10,608,1,605,2,950,10,7455,2,609,10,621,2
//-- Nine Tail Dish <-- 10 Nine Tails, 2 Four Leaf Clover, 10 Maneater Root, 10 Sharp Leaf, 4 Yggdrasil Leaf, 1 Plain Sauce, 1 Yellow Spice, 2 Izidor
12100,11,0,7481,0,1022,10,706,2,1033,10,7100,10,610,4,7454,1,7452,1,709,2
12100,20,0,7481,0,1022,10,706,2,1033,10,7100,10,610,4,7454,1,7452,1,709,2
//==============================================

20
src/map/skill.c
View File

@ -9881,8 +9881,8 @@ int skill_can_produce_mix (struct map_session_data *sd, int nameid, int trigger,
if(trigger>20) { // Non-weapon, non-food item (itemlv must match)
if(skill_produce_db[i].itemlv!=trigger)
return 0;
} else if(trigger>10) { // Food (itemlv must be higher or equal)
if(skill_produce_db[i].itemlv<=10 || skill_produce_db[i].itemlv>trigger)
} else if(trigger>10) { // Food (any item level between 10 and 20 will do)
if(skill_produce_db[i].itemlv<=10)
return 0;
} else { // Weapon (itemlv must be higher or equal)
if(skill_produce_db[i].itemlv>trigger)
@ -10077,6 +10077,16 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
}
break;
default:
if (sd->menuskill_id == AM_PHARMACY &&
sd->menuskill_lv > 10 && sd->menuskill_lv <= 20)
{ //Assume Cooking Dish
if (sd->menuskill_lv >= 15) //Legendary Cooking Set.
make_per = 10000; //100% Success
else
make_per = 12*(sd->menuskill_lv-10) //12% chance per set level.
+ 700 - 70*(skill_produce_db[idx].itemlv-10); //70% - 7% per dish level
break;
}
make_per = 5000;
break;
}
@ -10199,7 +10209,8 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
clif_misceffect(&sd->bl,3);
break;
default: //Those that don't require a skill?
if (skill_produce_db[idx].itemlv==11) //Cooking items.
if (skill_produce_db[idx].itemlv>10 &&
skill_produce_db[idx].itemlv<= 20) //Cooking items.
clif_specialeffect(&sd->bl, 608, AREA);
break;
}
@ -10239,7 +10250,8 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
clif_misceffect(&sd->bl,2);
break;
default:
if (skill_produce_db[idx].itemlv==11)
if (skill_produce_db[idx].itemlv>10 &&
skill_produce_db[idx].itemlv<= 20) //Cooking items.
clif_specialeffect(&sd->bl, 609, AREA);
}
}