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

[Spells/Disciplines] Bulk Train / Scribe (#1640)

Browse Source 
* Bulk scribe spells

* Add bulk disc training

* Remove bulk from non bulk method

* PR adjustments
This commit is contained in:
Chris Miles
2021-10-27 20:45:27 -05:00
committed by GitHub
parent 6e5bf4b941
commit 7230714cbc
7 changed files with 157 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/command.cpp
+30 -21
View File
@@ -7928,7 +7928,7 @@ void command_scribespells(Client *c, const Seperator *sep)
}
if (!IsDiscipline(spell_id_) && !t->HasSpellScribed(spell_id)) { // isn't a discipline & we don't already have it scribed
t->ScribeSpell(spell_id_, book_slot);
t->ScribeSpell(spell_id_, book_slot, true, true);
++count;
}
@@ -7939,14 +7939,18 @@ void command_scribespells(Client *c, const Seperator *sep)
}
if (count > 0) {
t->Message(Chat::White, "Successfully scribed %i spells.", count);
if (t != c)
c->Message(Chat::White, "Successfully scribed %i spells for %s.", count, t->GetName());
t->Message(Chat::White, "Successfully scribed %i spells.", count);
if (t != c) {
c->Message(Chat::White, "Successfully scribed %i spells for %s.", count, t->GetName());
}
t->SaveSpells();
}
else {
t->Message(Chat::White, "No spells scribed.");
if (t != c)
c->Message(Chat::White, "No spells scribed for %s.", t->GetName());
if (t != c) {
c->Message(Chat::White, "No spells scribed for %s.", t->GetName());
}
}
}
@@ -8058,6 +8062,7 @@ void command_untraindiscs(Client *c, const Seperator *sep) {
t = c->GetTarget()->CastToClient();
t->UntrainDiscAll();
t->Message(Chat::Yellow, "All disciplines removed.");
}
void command_wpinfo(Client *c, const Seperator *sep)
@@ -9275,7 +9280,7 @@ void command_npcedit(Client *c, const Seperator *sep)
}
if (strcasecmp(sep->arg[1], "gender") == 0) {
auto gender_id = atoi(sep->arg[2]);
auto gender_id = atoi(sep->arg[2]);
c->Message(Chat::Yellow, fmt::format("NPC ID {} is now a {} ({}).", npc_id, gender_id, GetGenderName(gender_id)).c_str());
std::string query = fmt::format("UPDATE npc_types SET gender = {} WHERE id = {}", gender_id, npc_id);
content_db.QueryDatabase(query);
@@ -9461,7 +9466,7 @@ void command_npcedit(Client *c, const Seperator *sep)
std::string query = fmt::format("UPDATE npc_types SET ammo_idfile = {} WHERE id = {}", atoi(sep->arg[2]), npc_id);
content_db.QueryDatabase(query);
return;
}
}
if (strcasecmp(sep->arg[1], "weapon") == 0) {
c->Message(Chat::Yellow, fmt::format("NPC ID {} will have Model {} set to their Primary and Model {} set to their Secondary on repop.", npc_id, atoi(sep->arg[2]), atoi(sep->arg[3])).c_str());
@@ -9679,7 +9684,7 @@ void command_npcedit(Client *c, const Seperator *sep)
content_db.QueryDatabase(query);
return;
}
if (strcasecmp(sep->arg[1], "accuracy") == 0) {
c->Message(Chat::Yellow, fmt::format("NPC ID {} now has {} Accuracy.", npc_id, atoi(sep->arg[2])).c_str());
std::string query = fmt::format("UPDATE npc_types SET accuracy = {} WHERE id = {}", atoi(sep->arg[2]), npc_id);
@@ -9749,7 +9754,7 @@ void command_npcedit(Client *c, const Seperator *sep)
content_db.QueryDatabase(query);
return;
}
if (strcasecmp(sep->arg[1], "armtexture") == 0) {
c->Message(Chat::Yellow, fmt::format("NPC ID {} is now using Arm Texture {}.", npc_id, atoi(sep->arg[2])).c_str());
std::string query = fmt::format("UPDATE npc_types SET armtexture = {} WHERE id = {}", atoi(sep->arg[2]), npc_id);
@@ -9934,7 +9939,7 @@ void command_npcedit(Client *c, const Seperator *sep)
animation = 1;
animation_name = "Sitting";
} else if(strcasecmp(sep->arg[2], "crouch") == 0 || atoi(sep->arg[2]) == 2) { // Crouch
animation = 2;
animation = 2;
animation_name = "Crouching";
} else if(strcasecmp(sep->arg[2], "dead") == 0 || atoi(sep->arg[2]) == 3) { // Dead
animation = 3;
@@ -10999,7 +11004,6 @@ void command_traindisc(Client *c, const Seperator *sep)
}
else if (t->GetPP().disciplines.values[r] == 0) {
t->GetPP().disciplines.values[r] = spell_id_;
database.SaveCharacterDisc(t->CharacterID(), r, spell_id_);
change = true;
t->Message(Chat::White, "You have learned a new discipline!");
++count; // success counter
@@ -11011,17 +11015,22 @@ void command_traindisc(Client *c, const Seperator *sep)
}
}
if (change)
if (change) {
t->SendDisciplineUpdate();
t->SaveDisciplines();
}
if (count > 0) {
t->Message(Chat::White, "Successfully trained %u disciplines.", count);
if (t != c)
c->Message(Chat::White, "Successfully trained %u disciplines for %s.", count, t->GetName());
} else {
t->Message(Chat::White, "Successfully trained %u disciplines.", count);
if (t != c) {
c->Message(Chat::White, "Successfully trained %u disciplines for %s.", count, t->GetName());
}
}
else {
t->Message(Chat::White, "No disciplines trained.");
if (t != c)
c->Message(Chat::White, "No disciplines trained for %s.", t->GetName());
if (t != c) {
c->Message(Chat::White, "No disciplines trained for %s.", t->GetName());
}
}
}
@@ -14880,7 +14889,7 @@ void command_dye(Client *c, const Seperator *sep)
c->Message(Chat::White, "Command Syntax: #dye help | #dye [slot] [red] [green] [blue] [use_tint]");
return;
}
uint8 slot = 0;
uint8 red = 255;
uint8 green = 255;
@@ -14902,7 +14911,7 @@ void command_dye(Client *c, const Seperator *sep)
std::vector<std::string> slot_messages;
c->Message(Chat::White, "Command Syntax: #dye help | #dye [slot] [red] [green] [blue] [use_tint]");
c->Message(Chat::White, "Red, Green, and Blue go from 0 to 255.");
for (const auto& slot : dye_slots) {
slot_messages.push_back(fmt::format("({}) {}", slot_id, slot));
slot_id++;