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

refactor: format project

Browse Source
This commit is contained in:
Simon Pribylski
2021-11-21 17:02:42 +01:00
parent 0f328e6f81
commit f48af51dc7
36 changed files with 162 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/game/Mobs.cpp
View File

@@ -14,7 +14,7 @@ bool Mob::isImmuneTo(EffectType type) {
return std::find(getEffectImmunities().begin(), getEffectImmunities().end(), type) != getEffectImmunities().end();
}
EffectDuration& Mob::getEffect(EffectType effectType){
EffectDuration& Mob::getEffect(EffectType effectType) {
return *std::find_if(m_Effects.begin(), m_Effects.end(), [&effectType](EffectDuration effect) { return effect.type == effectType;});
}
@@ -39,40 +39,40 @@ void Mob::updateEffects(std::uint64_t delta) {
for (std::size_t i = 0; i < m_Effects.size(); i++) {
EffectDuration& effect = m_Effects[i];
effect.duration -= deltaSec;
if (effect.duration < 0){ // effect has gone
if (effect.duration < 0) { // effect has gone
m_Effects.erase(m_Effects.begin() + i);
switch(effect.type){
case EffectType::Fire:{
m_EffectFireTimer.reset();
break;
}
switch (effect.type) {
case EffectType::Fire: {
m_EffectFireTimer.reset();
break;
}
case EffectType::Poison:{
m_EffectPoisonTimer.reset();
break;
}
case EffectType::Poison: {
m_EffectPoisonTimer.reset();
break;
}
case EffectType::Heal:{
m_EffectHealTimer.reset();
}
case EffectType::Heal: {
m_EffectHealTimer.reset();
}
default:
break;
default:
break;
}
}
}
if(hasEffect(EffectType::Fire)){
if(m_EffectFireTimer.update(delta)){
if (hasEffect(EffectType::Fire)) {
if (m_EffectFireTimer.update(delta)) {
damage(3, getEffect(EffectType::Fire).tower);
}
}
if(hasEffect(EffectType::Poison)){
if(m_EffectPoisonTimer.update(delta)){
if (hasEffect(EffectType::Poison)) {
if (m_EffectPoisonTimer.update(delta)) {
damage(1, getEffect(EffectType::Poison).tower);
}
}
if(hasEffect(EffectType::Heal)){
if(m_EffectFireTimer.update(delta)){
if (hasEffect(EffectType::Heal)) {
if (m_EffectFireTimer.update(delta)) {
heal(10);
}
}
@@ -305,30 +305,30 @@ MobPtr MobFactory::createMob(MobID id, MobType type, std::uint8_t level, PlayerI
return mobFactory[type](id, level, sender);
}
std::string MobFactory::getMobName(MobType type){
switch(type){
case MobType::Zombie:
return "Zombie";
case MobType::Spider:
return "Spider";
case MobType::Skeleton:
return "Skeleton";
case MobType::Pigman:
return "Pigman";
case MobType::Creeper:
return "Creeper";
case MobType::Silverfish:
return "Silverfish";
case MobType::Blaze:
return "Blaze";
case MobType::Witch:
return "Witch";
case MobType::Slime:
return "Slime";
case MobType::Giant:
return "Giant";
default:
return "Unknow";
std::string MobFactory::getMobName(MobType type) {
switch (type) {
case MobType::Zombie:
return "Zombie";
case MobType::Spider:
return "Spider";
case MobType::Skeleton:
return "Skeleton";
case MobType::Pigman:
return "Pigman";
case MobType::Creeper:
return "Creeper";
case MobType::Silverfish:
return "Silverfish";
case MobType::Blaze:
return "Blaze";
case MobType::Witch:
return "Witch";
case MobType::Slime:
return "Slime";
case MobType::Giant:
return "Giant";
default:
return "Unknow";
}
}