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

setaapts command will now let you have up to 5k AA points, from 200. Removed the need to specify a prev_id in alternate_abilities table it can deduce that by itself.

Browse Source
This commit is contained in:
KimLS 2015-06-21 01:25:34 -07:00
parent d5098a56e0
commit 77f050b653
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zone/aa.cpp
View File

@ -1520,7 +1520,9 @@ void Zone::LoadAlternateAdvancement() {
//process these ranks //process these ranks
AA::Rank *current = ability.second->first; AA::Rank *current = ability.second->first;
int i = 1; int i = 1;
int prev_id = -1;
while(current) { while(current) {
current->prev_id = prev_id;
current->prev = GetAlternateAdvancementRank(current->prev_id); current->prev = GetAlternateAdvancementRank(current->prev_id);
current->next = GetAlternateAdvancementRank(current->next_id); current->next = GetAlternateAdvancementRank(current->next_id);
current->base_ability = ability.second.get(); current->base_ability = ability.second.get();
@ -1531,11 +1533,11 @@ void Zone::LoadAlternateAdvancement() {
//check prereqs here //check prereqs here
for(auto &prev_prereq : current->prev->prereqs) { for(auto &prev_prereq : current->prev->prereqs) {
// //if prev has an aa we dont have set //if prev has an aa we dont have set
// // then set it here too // then set it here too
// //if prev has an aa we have and the count is different //if prev has an aa we have
// // then set to whichever is highest // then set to whichever is highest
//
auto iter = current->prereqs.find(prev_prereq.first); auto iter = current->prereqs.find(prev_prereq.first);
if(iter == current->prereqs.end()) { if(iter == current->prereqs.end()) {
//not found //not found
@ -1557,6 +1559,7 @@ void Zone::LoadAlternateAdvancement() {
} }
i++; i++;
prev_id = current->id;
current = current->next; current = current->next;
} }
} }
@ -1602,7 +1605,7 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
Log.Out(Logs::General, Logs::Status, "Loading Alternate Advancement Ability Ranks..."); Log.Out(Logs::General, Logs::Status, "Loading Alternate Advancement Ability Ranks...");
ranks.clear(); ranks.clear();
query = "SELECT id, upper_hotkey_sid, lower_hotkey_sid, title_sid, desc_sid, cost, level_req, spell, spell_type, recast_time, " query = "SELECT id, upper_hotkey_sid, lower_hotkey_sid, title_sid, desc_sid, cost, level_req, spell, spell_type, recast_time, "
"prev_id, next_id, expansion FROM aa_ranks"; "next_id, expansion FROM aa_ranks";
results = QueryDatabase(query); results = QueryDatabase(query);
if(results.Success()) { if(results.Success()) {
for(auto row = results.begin(); row != results.end(); ++row) { for(auto row = results.begin(); row != results.end(); ++row) {
@ -1617,11 +1620,11 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
rank->spell = atoi(row[7]); rank->spell = atoi(row[7]);
rank->spell_type = atoi(row[8]); rank->spell_type = atoi(row[8]);
rank->recast_time = atoi(row[9]); rank->recast_time = atoi(row[9]);
rank->prev_id = atoi(row[10]); rank->next_id = atoi(row[10]);
rank->next_id = atoi(row[11]); rank->expansion = atoi(row[11]);
rank->expansion = atoi(row[12]);
rank->base_ability = nullptr; rank->base_ability = nullptr;
rank->total_cost = 0; rank->total_cost = 0;
rank->prev_id = -1;
rank->next = nullptr; rank->next = nullptr;
rank->prev = nullptr; rank->prev = nullptr;

4
zone/command.cpp
View File

@ -5554,8 +5554,8 @@ void command_setaapts(Client *c, const Seperator *sep)
if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0') if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0')
c->Message(0, "Usage: #setaapts <AA|group|raid> <new AA points value>"); c->Message(0, "Usage: #setaapts <AA|group|raid> <new AA points value>");
else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 200) else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 5000)
c->Message(0, "You must have a number greater than 0 for points and no more than 200."); c->Message(0, "You must have a number greater than 0 for points and no more than 5000.");
else if(!strcasecmp(sep->arg[1], "group")) { else if(!strcasecmp(sep->arg[1], "group")) {
t->GetPP().group_leadership_points = atoi(sep->arg[2]); t->GetPP().group_leadership_points = atoi(sep->arg[2]);
t->GetPP().group_leadership_exp = 0; t->GetPP().group_leadership_exp = 0;