Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

feat: add world notifier

Browse Source
This commit is contained in:
Simon Pribylski
2021-11-30 18:36:29 +01:00
parent 0c1824e40b
commit 8171a91ed5
4 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/Towers.cpp
View File

@@ -213,7 +213,7 @@ void ArcherTower::tick(std::uint64_t delta, World* world) {
std::uint8_t arrows = explosiveArrows ? 2 : getLevel().getLevel();
for (MobPtr mob : world->getMobList()) {
if (isMobInRange(mob)) {
world->OnArcherTowerShot(mob, this);
world->notifyListeners(&WorldListener::OnArcherTowerShot, mob, this);
m_Timer.applyCooldown();
arrowsShot++;
if (arrowsShot >= arrows)
@@ -229,7 +229,7 @@ void IceTower::tick(std::uint64_t delta, World* world) {
for (MobPtr mob : world->getMobList()) {
if (isMobInRange(mob)) {
mob->addEffect(EffectType::Slowness, 1, this); // slowness for 1s every second
mob->damage(damage, this);
world->notifyListeners(&WorldListener::OnMobDamage, mob, damage, this);
m_Timer.applyCooldown();
}
}
@@ -252,7 +252,7 @@ void PoisonTower::tick(std::uint64_t delta, World* world) {
for (MobPtr mob : world->getMobList()) {
if (isMobInRange(mob)) {
if (getLevel().getPath() == TowerPath::Bottom) {
mob->damage(getStats()->getDamage(), this);
world->notifyListeners(&WorldListener::OnMobDamage, mob, getStats()->getDamage(), this);
} else {
float durationSec;
switch (getLevel().getLevel()) {

19
src/game/World.cpp
View File

@@ -13,7 +13,7 @@ namespace td {
namespace game {
World::World(Game* game) : m_Game(game) {
bindListener(this);
}
TilePtr World::getTile(std::int32_t x, std::int32_t y) const {
@@ -400,30 +400,31 @@ TowerPtr World::getTowerById(TowerID towerID) {
void World::OnArcherTowerShot(MobPtr target, ArcherTower* shooter) {
bool explosiveArrows = shooter->getLevel().getPath() == TowerPath::Bottom;
notifyListeners(&WorldListener::OnArrowShot, target, shooter);
if (explosiveArrows) {
OnArrowShot(target, shooter);
OnExplosion({ target->getCenterX(), target->getCenterY(), 1.0f }, 10.0f, shooter);
} else {
OnArrowShot(target, shooter);
notifyListeners(&WorldListener::OnExplosion, utils::shape::Circle{ target->getCenterX(), target->getCenterY(), 1.0f }, 10.0f, shooter);
}
}
void World::OnArrowShot(MobPtr target, Tower* shooter) {
OnMobDamage(target, shooter->getStats()->getDamage(), shooter);
notifyListeners(&WorldListener::OnMobDamage, target, shooter->getStats()->getDamage(), shooter);
}
void World::OnExplosion(utils::shape::Circle explosion, float centerDamage, Tower* shooter) {
for (MobPtr mob : m_Mobs) {
if (mob->collidesWith(explosion)) {
if (mob->isAlive() && mob->collidesWith(explosion)) {
// linear distance damage reduction
float explosionDamage = mob->distance(explosion) / explosion.getRadius() * centerDamage;
OnMobDamage(mob, explosionDamage, shooter);
notifyListeners(&WorldListener::OnMobDamage, mob, explosionDamage, shooter);
}
}
}
void World::OnMobDamage(MobPtr target, float damage, Tower* source){
void World::OnMobDamage(MobPtr target, float damage, Tower* source) {
target->damage(damage, source);
if (target->isDead()) {
notifyListeners(&WorldListener::OnMobDead, target);
}
}
Team& World::getRedTeam() {