introduce changes from streamside fork

This commit is contained in:
ErikasKontenis
2019-09-16 20:38:16 +03:00
parent f2cbc2dc1c
commit ad03b0eb3e
162 changed files with 2485 additions and 698 deletions

View File

@@ -1,6 +1,6 @@
/**
* Tibia GIMUD Server - a free and open-source MMORPG server emulator
* Copyright (C) 2017 Alejandro Mujica <alejandrodemujica@gmail.com>
* Copyright (C) 2019 Sabrehaven and Mark Samman <mark.samman@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -220,12 +220,6 @@ class Creature : virtual public Thing
virtual int32_t getMaxHealth() const {
return healthMax;
}
uint32_t getMana() const {
return mana;
}
virtual uint32_t getMaxMana() const {
return 0;
}
const Outfit_t getCurrentOutfit() const {
return currentOutfit;
@@ -320,11 +314,9 @@ class Creature : virtual public Thing
}
virtual void changeHealth(int32_t healthChange, bool sendHealthChange = true);
virtual void changeMana(int32_t manaChange);
void gainHealth(Creature* attacker, int32_t healthGain);
virtual void drainHealth(Creature* attacker, int32_t damage);
virtual void drainMana(Creature* attacker, int32_t manaLoss);
virtual bool challengeCreature(Creature*) {
return false;
@@ -494,7 +486,6 @@ class Creature : virtual public Thing
uint32_t blockTicks = 0;
uint32_t lastStepCost = 1;
uint32_t baseSpeed = 70;
uint32_t mana = 0;
uint32_t latestKillEvent = 0;
int32_t varSpeed = 0;
int32_t health = 1000;