pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add GetDisplayAC() to Perl/Lua.

Browse Source
This commit is contained in:
Alex 2020-06-29 15:49:24 -04:00
parent f32126faac
commit eb039d176c
5 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/attack.cpp
View File

@ -780,7 +780,7 @@ int Mob::GetClassRaceACBonus()
return ac_bonus; return ac_bonus;
} }
int Mob::ACSum() int Mob::ACSum(bool skip_caps)
{ {
int ac = 0; // this should be base AC whenever shrouds come around int ac = 0; // this should be base AC whenever shrouds come around
ac += itembonuses.AC; // items + food + tribute ac += itembonuses.AC; // items + food + tribute
@ -799,7 +799,7 @@ int Mob::ACSum()
// EQ math // EQ math
ac = (ac * 4) / 3; ac = (ac * 4) / 3;
// anti-twink // anti-twink
if (IsClient() && GetLevel() < RuleI(Combat, LevelToStopACTwinkControl)) if (!skip_caps && IsClient() && GetLevel() < RuleI(Combat, LevelToStopACTwinkControl))
ac = std::min(ac, 25 + 6 * GetLevel()); ac = std::min(ac, 25 + 6 * GetLevel());
ac = std::max(0, ac + GetClassRaceACBonus()); ac = std::max(0, ac + GetClassRaceACBonus());
if (IsNPC()) { if (IsNPC()) {
@ -835,11 +835,11 @@ int Mob::ACSum()
if (ac < 0) if (ac < 0)
ac = 0; ac = 0;
if (IsClient() if (!skip_caps && (IsClient()
#ifdef BOTS #ifdef BOTS
|| IsBot() || IsBot()
#endif #endif
) { )) {
auto softcap = GetACSoftcap(); auto softcap = GetACSoftcap();
auto returns = GetSoftcapReturns(); auto returns = GetSoftcapReturns();
int total_aclimitmod = aabonuses.CombatStability + itembonuses.CombatStability + spellbonuses.CombatStability; int total_aclimitmod = aabonuses.CombatStability + itembonuses.CombatStability + spellbonuses.CombatStability;

6
zone/lua_mob.cpp
View File

@ -532,6 +532,11 @@ int Lua_Mob::GetAC() {
return self->GetAC(); return self->GetAC();
} }
int Lua_Mob::GetDisplayAC() {
Lua_Safe_Call_Int();
return self->GetDisplayAC();
}
int Lua_Mob::GetATK() { int Lua_Mob::GetATK() {
Lua_Safe_Call_Int(); Lua_Safe_Call_Int();
return self->GetATK(); return self->GetATK();
@ -2344,6 +2349,7 @@ luabind::scope lua_register_mob() {
.def("SetMana", &Lua_Mob::SetMana) .def("SetMana", &Lua_Mob::SetMana)
.def("GetManaRatio", &Lua_Mob::GetManaRatio) .def("GetManaRatio", &Lua_Mob::GetManaRatio)
.def("GetAC", &Lua_Mob::GetAC) .def("GetAC", &Lua_Mob::GetAC)
.def("GetDisplayAC", &Lua_Mob::GetDisplayAC)
.def("GetATK", &Lua_Mob::GetATK) .def("GetATK", &Lua_Mob::GetATK)
.def("GetSTR", &Lua_Mob::GetSTR) .def("GetSTR", &Lua_Mob::GetSTR)
.def("GetSTA", &Lua_Mob::GetSTA) .def("GetSTA", &Lua_Mob::GetSTA)

1
zone/lua_mob.h
View File

@ -124,6 +124,7 @@ public:
int SetMana(int mana); int SetMana(int mana);
double GetManaRatio(); double GetManaRatio();
int GetAC(); int GetAC();
int GetDisplayAC();
int GetATK(); int GetATK();
int GetSTR(); int GetSTR();
int GetSTA(); int GetSTA();

3
zone/mob.h
View File

@ -211,7 +211,8 @@ public:
int TryAssassinate(Mob* defender, EQ::skills::SkillType skillInUse); int TryAssassinate(Mob* defender, EQ::skills::SkillType skillInUse);
virtual void DoRiposte(Mob* defender); virtual void DoRiposte(Mob* defender);
void ApplyMeleeDamageMods(uint16 skill, int &damage, Mob * defender = nullptr, ExtraAttackOptions *opts = nullptr); void ApplyMeleeDamageMods(uint16 skill, int &damage, Mob * defender = nullptr, ExtraAttackOptions *opts = nullptr);
int ACSum(); int ACSum(bool skip_caps = false);
inline int GetDisplayAC() { return 1000 * (ACSum(true) + compute_defense()) / 847; }
int offense(EQ::skills::SkillType skill); int offense(EQ::skills::SkillType skill);
int GetBestMeleeSkill(); int GetBestMeleeSkill();
void CalcAC() { mitigation_ac = ACSum(); } void CalcAC() { mitigation_ac = ACSum(); }

26
zone/perl_mob.cpp
View File

@ -2506,6 +2506,31 @@ XS(XS_Mob_GetAC) {
XSRETURN(1); XSRETURN(1);
} }
XS(XS_Mob_GetDisplayAC); /* prototype to pass -Wmissing-prototypes */
XS(XS_Mob_GetDisplayAC) {
dXSARGS;
if (items != 1)
Perl_croak(aTHX_ "Usage: Mob::GetDisplayAC(THIS)");
{
Mob *THIS;
uint32 RETVAL;
dXSTARG;
if (sv_derived_from(ST(0), "Mob")) {
IV tmp = SvIV((SV *) SvRV(ST(0)));
THIS = INT2PTR(Mob *, tmp);
} else
Perl_croak(aTHX_ "THIS is not of type Mob");
if (THIS == nullptr)
Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
RETVAL = THIS->GetDisplayAC();
XSprePUSH;
PUSHu((UV) RETVAL);
}
XSRETURN(1);
}
XS(XS_Mob_GetATK); /* prototype to pass -Wmissing-prototypes */ XS(XS_Mob_GetATK); /* prototype to pass -Wmissing-prototypes */
XS(XS_Mob_GetATK) { XS(XS_Mob_GetATK) {
dXSARGS; dXSARGS;
@ -8676,6 +8701,7 @@ XS(boot_Mob) {
newXSproto(strcpy(buf, "SetMana"), XS_Mob_SetMana, file, "$$"); newXSproto(strcpy(buf, "SetMana"), XS_Mob_SetMana, file, "$$");
newXSproto(strcpy(buf, "GetManaRatio"), XS_Mob_GetManaRatio, file, "$"); newXSproto(strcpy(buf, "GetManaRatio"), XS_Mob_GetManaRatio, file, "$");
newXSproto(strcpy(buf, "GetAC"), XS_Mob_GetAC, file, "$"); newXSproto(strcpy(buf, "GetAC"), XS_Mob_GetAC, file, "$");
newXSproto(strcpy(buf, "GetDisplayAC"), XS_Mob_GetDisplayAC, file, "$");
newXSproto(strcpy(buf, "GetATK"), XS_Mob_GetATK, file, "$"); newXSproto(strcpy(buf, "GetATK"), XS_Mob_GetATK, file, "$");
newXSproto(strcpy(buf, "GetSTR"), XS_Mob_GetSTR, file, "$"); newXSproto(strcpy(buf, "GetSTR"), XS_Mob_GetSTR, file, "$");
newXSproto(strcpy(buf, "GetSTA"), XS_Mob_GetSTA, file, "$"); newXSproto(strcpy(buf, "GetSTA"), XS_Mob_GetSTA, file, "$");