OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-11-30 04:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WIP) Point 2: Generalization

Browse Source
This commit is contained in:
gsemaj
2022-04-12 22:22:12 -04:00
parent 82bc94c01c
commit f0cf6326e5
7 changed files with 74 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Combat.cpp
View File

@@ -50,14 +50,14 @@ int CombatNPC::takeDamage(EntityRef src, int amt) {
Mob* mob = (Mob*)this;
// cannot kill mobs multiple times; cannot harm retreating mobs
if (mob->state != MobState::ROAMING && mob->state != MobState::COMBAT) {
if (mob->state != AIState::ROAMING && mob->state != AIState::COMBAT) {
return 0; // no damage
}
if (mob->skillStyle >= 0)
return 0; // don't hurt a mob casting corruption
if (mob->state == MobState::ROAMING) {
if (mob->state == AIState::ROAMING) {
assert(mob->target == nullptr && src.type == EntityType::PLAYER); // players only for now
MobAI::enterCombat(src.sock, mob);
@@ -101,7 +101,31 @@ int32_t CombatNPC::getID() {
}
void CombatNPC::step(time_t currTime) {
// stubbed
if (playersInView < 0)
std::cout << "[WARN] Weird playerview value " << playersInView << std::endl;
// skip movement and combat if disabled or not in view
if ((!MobAI::simulateMobs || playersInView == 0) && state != AIState::DEAD
&& state != AIState::RETREAT)
return;
switch (state) {
case AIState::INACTIVE:
// no-op
break;
case AIState::ROAMING:
roamingStep(currTime);
break;
case AIState::COMBAT:
combatStep(currTime);
break;
case AIState::RETREAT:
retreatStep(currTime);
break;
case AIState::DEAD:
deadStep(currTime);
break;
}
}
static std::pair<int,int> getDamage(int attackPower, int defensePower, bool shouldCrit,
@@ -259,7 +283,7 @@ void Combat::npcAttackPc(Mob *mob, time_t currTime) {
if (plr->HP <= 0) {
mob->target = nullptr;
mob->state = MobState::RETREAT;
mob->state = AIState::RETREAT;
if (!MobAI::aggroCheck(mob, currTime)) {
MobAI::clearDebuff(mob);
if (mob->groupLeader != 0)
@@ -293,7 +317,7 @@ static void genQItemRolls(Player *leader, std::map<int, int>& rolls) {
}
void Combat::killMob(CNSocket *sock, Mob *mob) {
mob->state = MobState::DEAD;
mob->state = AIState::DEAD;
mob->target = nullptr;
mob->cbf = 0;
mob->skillStyle = -1;