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

[int64] Support for HP / Mana / End / Damage / Hate (#2091)

Browse Source 
* Initial int64 work

* Hate 64 bit

* Update special_attacks.cpp

* Aggro / Damage / Hate int64

* NPC edit adjustments

* Fix bot compile

* More int64 adjustments

* More int64 references

* npcedit references

* aggrozone

* More int64 changes

* More int64 changes for damage

* Many more damage int64 references

* More spell damage int64 conversions

* HealDamage

* Damage fully working

* Remove debug

* Add migration

* More int64 adjustments

* Much wow, many int64

* More int64

* PR adjustments
This commit is contained in:
Chris Miles
2022-05-07 22:32:02 -05:00
committed by GitHub
parent d9c41526e8
commit f201d4c999
57 changed files with 743 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/aggrozone.cpp
+2 -2
View File
@@ -7,9 +7,9 @@ void command_aggrozone(Client *c, const Seperator *sep)
target = c->GetTarget();
}
uint32 hate = 0;
uint64 hate = 0;
if (sep->IsNumber(1)) {
hate = std::stoul(sep->arg[1]);
hate = std::strtoll(sep->arg[1], nullptr, 10);
}
entity_list.AggroZone(target, hate);
zone/gm_commands/damage.cpp
+2 -2
View File
@@ -11,8 +11,8 @@ void command_damage(Client *c, const Seperator *sep)
Mob* target = c;
if (c->GetTarget()) {
target = c->GetTarget();
}
}
int damage = static_cast<int>(std::min(std::stoll(sep->arg[1]), (long long) 2000000000));
int64 damage = std::stoll(sep->arg[1], nullptr, 10);
target->Damage(c, damage, SPELL_UNKNOWN, EQ::skills::SkillHandtoHand, false);
}
zone/gm_commands/npcedit.cpp
+17 -10
View File
@@ -233,15 +233,22 @@ void command_npcedit(Client *c, const Seperator *sep)
}
if (strcasecmp(sep->arg[1], "hp") == 0) {
c->Message(Chat::Yellow, fmt::format("NPC ID {} now has {} Health.", npc_id, atoi(sep->arg[2])).c_str());
std::string query = fmt::format("UPDATE npc_types SET hp = {} WHERE id = {}", atoi(sep->arg[2]), npc_id);
c->Message(
Chat::Yellow,
fmt::format(
"NPC ID {} now has {} Health.",
npc_id,
std::strtoll(sep->arg[2], nullptr, 10)
).c_str()
);
std::string query = fmt::format("UPDATE npc_types SET hp = {} WHERE id = {}", strtoull(sep->arg[2], nullptr, 10), npc_id);
content_db.QueryDatabase(query);
return;
}
if (strcasecmp(sep->arg[1], "mana") == 0) {
c->Message(Chat::Yellow, fmt::format("NPC ID {} now has {} Mana.", npc_id, atoi(sep->arg[2])).c_str());
std::string query = fmt::format("UPDATE npc_types SET mana = {} WHERE id = {}", atoi(sep->arg[2]), npc_id);
c->Message(Chat::Yellow, fmt::format("NPC ID {} now has {} Mana.", npc_id, std::strtoll(sep->arg[2], nullptr, 10)).c_str());
std::string query = fmt::format("UPDATE npc_types SET mana = {} WHERE id = {}", std::strtoll(sep->arg[2], nullptr, 10), npc_id);
content_db.QueryDatabase(query);
return;
}
@@ -299,10 +306,10 @@ void command_npcedit(Client *c, const Seperator *sep)
if (strcasecmp(sep->arg[1], "hpregen") == 0) {
c->Message(
Chat::Yellow,
fmt::format("NPC ID {} now regenerates {} Health per Tick.", npc_id, atoi(sep->arg[2])).c_str());
fmt::format("NPC ID {} now regenerates {} Health per Tick.", npc_id, std::strtoll(sep->arg[2], nullptr, 10)).c_str());
std::string query = fmt::format(
"UPDATE npc_types SET hp_regen_rate = {} WHERE id = {}",
atoi(sep->arg[2]),
std::strtoll(sep->arg[2], nullptr, 10),
npc_id
);
content_db.QueryDatabase(query);
@@ -315,11 +322,11 @@ void command_npcedit(Client *c, const Seperator *sep)
fmt::format(
"NPC ID {} now regenerates {} HP per second.",
npc_id,
atoi(sep->arg[2])).c_str()
std::strtoll(sep->arg[2], nullptr, 10)).c_str()
);
std::string query = fmt::format(
"UPDATE npc_types SET hp_regen_per_second = {} WHERE id = {}",
atoi(sep->arg[2]),
std::strtoll(sep->arg[2], nullptr, 10),
npc_id
);
content_db.QueryDatabase(query);
@@ -329,10 +336,10 @@ void command_npcedit(Client *c, const Seperator *sep)
if (strcasecmp(sep->arg[1], "manaregen") == 0) {
c->Message(
Chat::Yellow,
fmt::format("NPC ID {} now regenerates {} Mana per Tick.", npc_id, atoi(sep->arg[2])).c_str());
fmt::format("NPC ID {} now regenerates {} Mana per Tick.", npc_id, std::strtoll(sep->arg[2], nullptr, 10)).c_str());
std::string query = fmt::format(
"UPDATE npc_types SET mana_regen_rate = {} WHERE id = {}",
atoi(sep->arg[2]),
std::strtoll(sep->arg[2], nullptr, 10),
npc_id
);
content_db.QueryDatabase(query);