mirror of
https://github.com/EQEmu/Server.git
synced 2026-01-05 08:23:52 +00:00
[Commands] Modify #summonitem and #giveitem. (#1400)
- #summonitem will now properly take item augments from an item link when used as a link for summoning. - #summonitem help message and command message will now list proper argument list. - #giveitem will now allow item links like #summonitem with the same functionality level. - #giveitem help message and command message will now list proper argument list. - #giveitem small fix where there were 2 checks for argument count at 7, meaning final argument count (8) did not work.
This commit is contained in:
Alex
GitHub
parent
7139530787
commit
4c7f2391cd
221
zone/command.cpp
221
zone/command.cpp
@ -7973,122 +7973,171 @@ void command_interrupt(Client *c, const Seperator *sep)
|
||||
|
||||
void command_summonitem(Client *c, const Seperator *sep)
|
||||
{
|
||||
uint32 itemid = 0;
|
||||
|
||||
uint32 item_id = 0;
|
||||
int16 charges = -1;
|
||||
uint32 augment_one = 0;
|
||||
uint32 augment_two = 0;
|
||||
uint32 augment_three = 0;
|
||||
uint32 augment_four = 0;
|
||||
uint32 augment_five = 0;
|
||||
uint32 augment_six = 0;
|
||||
int arguments = sep->argnum;
|
||||
std::string cmd_msg = sep->msg;
|
||||
size_t link_open = cmd_msg.find('\x12');
|
||||
size_t link_close = cmd_msg.find_last_of('\x12');
|
||||
if (link_open != link_close && (cmd_msg.length() - link_open) > EQ::constants::SAY_LINK_BODY_SIZE) {
|
||||
EQ::SayLinkBody_Struct link_body;
|
||||
EQ::saylink::DegenerateLinkBody(link_body, cmd_msg.substr(link_open + 1, EQ::constants::SAY_LINK_BODY_SIZE));
|
||||
itemid = link_body.item_id;
|
||||
}
|
||||
else if (!sep->IsNumber(1)) {
|
||||
c->Message(Chat::White, "Usage: #summonitem [item id | link] [charges], charges are optional");
|
||||
item_id = link_body.item_id;
|
||||
augment_one = link_body.augment_1;
|
||||
augment_two = link_body.augment_2;
|
||||
augment_three = link_body.augment_3;
|
||||
augment_four = link_body.augment_4;
|
||||
augment_five = link_body.augment_5;
|
||||
augment_six = link_body.augment_6;
|
||||
} else if (!sep->IsNumber(1)) {
|
||||
c->Message(Chat::White, "Usage: #summonitem [item id | link] [charges] [augment_one_id] [augment_two_id] [augment_three_id] [augment_four_id] [augment_five_id] [augment_six_id] (Charges are optional.)");
|
||||
return;
|
||||
} else {
|
||||
item_id = atoi(sep->arg[1]);
|
||||
}
|
||||
else {
|
||||
itemid = atoi(sep->arg[1]);
|
||||
}
|
||||
if (!itemid) {
|
||||
c->Message(Chat::White, "A valid item id number is required (derived: 0)");
|
||||
|
||||
if (!item_id) {
|
||||
c->Message(Chat::White, "Enter a valid item ID.");
|
||||
return;
|
||||
}
|
||||
|
||||
int16 item_status = 0;
|
||||
const EQ::ItemData* item = database.GetItem(itemid);
|
||||
uint8 item_status = 0;
|
||||
uint8 current_status = c->Admin();
|
||||
const EQ::ItemData* item = database.GetItem(item_id);
|
||||
if (item) {
|
||||
item_status = static_cast<int16>(item->MinStatus);
|
||||
item_status = item->MinStatus;
|
||||
}
|
||||
|
||||
if (item_status > c->Admin()) {
|
||||
c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
|
||||
if (item_status > current_status) {
|
||||
c->Message(
|
||||
Chat::White,
|
||||
fmt::format(
|
||||
"Insufficient status to summon this item, current status is {}, required status is {}.",
|
||||
current_status,
|
||||
item_status
|
||||
).c_str()
|
||||
);
|
||||
}
|
||||
else if (sep->argnum == 2 && sep->IsNumber(2)) {
|
||||
c->SummonItem(itemid, atoi(sep->arg[2]));
|
||||
|
||||
if (arguments >= 2 && sep->IsNumber(2)) {
|
||||
charges = atoi(sep->arg[2]);
|
||||
}
|
||||
else if (sep->argnum == 3) {
|
||||
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]));
|
||||
|
||||
if (arguments >= 3 && sep->IsNumber(3)) {
|
||||
augment_one = atoi(sep->arg[3]);
|
||||
}
|
||||
else if (sep->argnum == 4) {
|
||||
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
|
||||
|
||||
if (arguments >= 4 && sep->IsNumber(4)) {
|
||||
augment_two = atoi(sep->arg[4]);
|
||||
}
|
||||
else if (sep->argnum == 5) {
|
||||
c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]));
|
||||
|
||||
if (arguments >= 5 && sep->IsNumber(5)) {
|
||||
augment_three = atoi(sep->arg[5]);
|
||||
}
|
||||
else if (sep->argnum == 6) {
|
||||
c->SummonItem(
|
||||
itemid,
|
||||
atoi(sep->arg[2]),
|
||||
atoi(sep->arg[3]),
|
||||
atoi(sep->arg[4]),
|
||||
atoi(sep->arg[5]),
|
||||
atoi(sep->arg[6]));
|
||||
|
||||
if (arguments >= 6 && sep->IsNumber(6)) {
|
||||
augment_four = atoi(sep->arg[6]);
|
||||
}
|
||||
else if (sep->argnum == 7) {
|
||||
c->SummonItem(
|
||||
itemid,
|
||||
atoi(sep->arg[2]),
|
||||
atoi(sep->arg[3]),
|
||||
atoi(sep->arg[4]),
|
||||
atoi(sep->arg[5]),
|
||||
atoi(sep->arg[6]),
|
||||
atoi(sep->arg[7]));
|
||||
|
||||
if (arguments >= 7 && sep->IsNumber(7)) {
|
||||
augment_five = atoi(sep->arg[7]);
|
||||
}
|
||||
else if (sep->argnum == 8) {
|
||||
c->SummonItem(
|
||||
itemid,
|
||||
atoi(sep->arg[2]),
|
||||
atoi(sep->arg[3]),
|
||||
atoi(sep->arg[4]),
|
||||
atoi(sep->arg[5]),
|
||||
atoi(sep->arg[6]),
|
||||
atoi(sep->arg[7]),
|
||||
atoi(sep->arg[8]));
|
||||
}
|
||||
else {
|
||||
c->SummonItem(itemid);
|
||||
|
||||
if (arguments == 8 && sep->IsNumber(8)) {
|
||||
augment_six = atoi(sep->arg[8]);
|
||||
}
|
||||
|
||||
c->SummonItem(item_id, charges, augment_one, augment_two, augment_three, augment_four, augment_five, augment_six);
|
||||
}
|
||||
|
||||
void command_giveitem(Client *c, const Seperator *sep)
|
||||
{
|
||||
if (!sep->IsNumber(1)) {
|
||||
c->Message(Chat::Red, "Usage: #summonitem [item id] [charges], charges are optional");
|
||||
} else if(c->GetTarget() == nullptr) {
|
||||
uint32 item_id = 0;
|
||||
int16 charges = -1;
|
||||
uint32 augment_one = 0;
|
||||
uint32 augment_two = 0;
|
||||
uint32 augment_three = 0;
|
||||
uint32 augment_four = 0;
|
||||
uint32 augment_five = 0;
|
||||
uint32 augment_six = 0;
|
||||
int arguments = sep->argnum;
|
||||
std::string cmd_msg = sep->msg;
|
||||
size_t link_open = cmd_msg.find('\x12');
|
||||
size_t link_close = cmd_msg.find_last_of('\x12');
|
||||
if (link_open != link_close && (cmd_msg.length() - link_open) > EQ::constants::SAY_LINK_BODY_SIZE) {
|
||||
EQ::SayLinkBody_Struct link_body;
|
||||
EQ::saylink::DegenerateLinkBody(link_body, cmd_msg.substr(link_open + 1, EQ::constants::SAY_LINK_BODY_SIZE));
|
||||
item_id = link_body.item_id;
|
||||
augment_one = link_body.augment_1;
|
||||
augment_two = link_body.augment_2;
|
||||
augment_three = link_body.augment_3;
|
||||
augment_four = link_body.augment_4;
|
||||
augment_five = link_body.augment_5;
|
||||
augment_six = link_body.augment_6;
|
||||
} else if (sep->IsNumber(1)) {
|
||||
item_id = atoi(sep->arg[1]);
|
||||
} else if (!sep->IsNumber(1)) {
|
||||
c->Message(Chat::Red, "Usage: #giveitem [item id | link] [charges] [augment_one_id] [augment_two_id] [augment_three_id] [augment_four_id] [augment_five_id] [augment_six_id] (Charges are optional.)");
|
||||
} else if (!c->GetTarget()) {
|
||||
c->Message(Chat::Red, "You must target a client to give the item to.");
|
||||
} else if(!c->GetTarget()->IsClient()) {
|
||||
} else if (!c->GetTarget()->IsClient()) {
|
||||
c->Message(Chat::Red, "You can only give items to players with this command.");
|
||||
} else {
|
||||
Client *t = c->GetTarget()->CastToClient();
|
||||
uint32 itemid = atoi(sep->arg[1]);
|
||||
int16 item_status = 0;
|
||||
const EQ::ItemData* item = database.GetItem(itemid);
|
||||
if(item) {
|
||||
item_status = static_cast<int16>(item->MinStatus);
|
||||
}
|
||||
|
||||
if (item_status > c->Admin())
|
||||
c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
|
||||
else if (sep->argnum==2 && sep->IsNumber(2))
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]));
|
||||
else if (sep->argnum==3)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]));
|
||||
else if (sep->argnum==4)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
|
||||
else if (sep->argnum==5)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]));
|
||||
else if (sep->argnum==6)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]));
|
||||
else if (sep->argnum==7)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]));
|
||||
else if (sep->argnum == 7)
|
||||
t->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]), atoi(sep->arg[8]));
|
||||
else {
|
||||
t->SummonItem(itemid);
|
||||
}
|
||||
}
|
||||
|
||||
Client *client_target = c->GetTarget()->CastToClient();
|
||||
uint8 item_status = 0;
|
||||
uint8 current_status = c->Admin();
|
||||
const EQ::ItemData* item = database.GetItem(item_id);
|
||||
if (item) {
|
||||
item_status = item->MinStatus;
|
||||
}
|
||||
|
||||
if (item_status > current_status) {
|
||||
c->Message(
|
||||
Chat::White,
|
||||
fmt::format(
|
||||
"Insufficient status to summon this item, current status is {}, required status is {}.",
|
||||
current_status,
|
||||
item_status
|
||||
).c_str()
|
||||
);
|
||||
}
|
||||
|
||||
if (arguments >= 2 && sep->IsNumber(2)) {
|
||||
charges = atoi(sep->arg[2]);
|
||||
}
|
||||
|
||||
if (arguments >= 3 && sep->IsNumber(3)) {
|
||||
augment_one = atoi(sep->arg[3]);
|
||||
}
|
||||
|
||||
if (arguments >= 4 && sep->IsNumber(4)) {
|
||||
augment_two = atoi(sep->arg[4]);
|
||||
}
|
||||
|
||||
if (arguments >= 5 && sep->IsNumber(5)) {
|
||||
augment_three = atoi(sep->arg[5]);
|
||||
}
|
||||
|
||||
if (arguments >= 6 && sep->IsNumber(6)) {
|
||||
augment_four = atoi(sep->arg[6]);
|
||||
}
|
||||
|
||||
if (arguments >= 7 && sep->IsNumber(7)) {
|
||||
augment_five = atoi(sep->arg[7]);
|
||||
}
|
||||
|
||||
if (arguments == 8 && sep->IsNumber(8)) {
|
||||
augment_six = atoi(sep->arg[8]);
|
||||
}
|
||||
|
||||
client_target->SummonItem(item_id, charges, augment_one, augment_two, augment_three, augment_four, augment_five, augment_six);
|
||||
}
|
||||
|
||||
void command_givemoney(Client *c, const Seperator *sep)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user