pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempting manual merge for Nature's Bounty

Browse Source
This commit is contained in:
JJ
2013-04-06 08:23:09 -04:00
parent b2d5ad6904
commit 88b9f96b91
9 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/forage.cpp
+8 -2
View File
@@ -400,7 +400,7 @@ void Client::GoFish()
}
}
void Client::ForageItem() {
void Client::ForageItem(bool guarantee) {
int skill_level = GetSkill(FORAGE);
@@ -417,7 +417,7 @@ void Client::ForageItem() {
};
// these may need to be fine tuned, I am just guessing here
if (MakeRandomInt(0,199) < skill_level) {
if (guarantee || MakeRandomInt(0,199) < skill_level) {
uint32 foragedfood = 0;
uint32 stringid = FORAGE_NOEAT;
@@ -476,6 +476,12 @@ void Client::ForageItem() {
}
parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst != NULL ? inst->GetItem()->ID : 0);
int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems;
if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) {
this->Message_StringID(MT_Skills, FORAGE_MASTERY);
this->ForageItem(true);
}
} else {
Message_StringID(MT_Skills, FORAGE_FAILED);