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";
}
}

40
src/game/Towers.cpp
View File

@@ -116,8 +116,8 @@ const std::map<std::pair<TowerType, TowerLevel>, TowerStats> TowerConstants = {
};
const TowerStats* getTowerStats(TowerType type, TowerLevel level) {
auto it = TowerConstants.find({type, level});
if(it == TowerConstants.end()) return nullptr;
auto it = TowerConstants.find({ type, level });
if (it == TowerConstants.end()) return nullptr;
return &it->second;
}
@@ -251,30 +251,30 @@ void PoisonTower::tick(std::uint64_t delta, World* world) {
if (m_Timer.update(delta)) {
for (MobPtr mob : world->getMobList()) {
if (isMobInRange(mob)) {
if(getLevel().getPath() == TowerPath::Bottom){
if (getLevel().getPath() == TowerPath::Bottom) {
mob->damage(getStats()->getDamage(), this);
}else{
} else {
float durationSec;
switch(getLevel().getLevel()){
case 1:
durationSec = 5;
break;
switch (getLevel().getLevel()) {
case 1:
durationSec = 5;
break;
case 2:
durationSec = 15;
break;
case 2:
durationSec = 15;
break;
case 3:
durationSec = 30;
break;
case 3:
durationSec = 30;
break;
case 4:
durationSec = 1e10; // about 3 million hours. It should be enough
break;
case 4:
durationSec = 1e10; // about 3 million hours. It should be enough
break;
default:
durationSec = 0; // how did we get there ?
break;
default:
durationSec = 0; // how did we get there ?
break;
}
mob->addEffect(EffectType::Poison, durationSec, this);
}

2
src/game/World.cpp
View File

@@ -278,7 +278,7 @@ TowerPtr World::getTower(const glm::vec2& position) const {
TowerPtr World::getTowerById(TowerID towerID) {
auto it = std::find_if(m_Towers.begin(), m_Towers.end(), [towerID](TowerPtr tower) { return tower->getID() == towerID;});
if(it == m_Towers.end()) return nullptr;
if (it == m_Towers.end()) return nullptr;
return *it;
}

4
src/game/client/Client.cpp
View File

@@ -49,7 +49,7 @@ void Client::render() {
m_Game.renderWorld();
}
void Client::sendMobs(const std::vector<protocol::MobSend>& mobSends){
void Client::sendMobs(const std::vector<protocol::MobSend>& mobSends) {
protocol::SendMobsPacket packet(mobSends);
m_Connexion.sendPacket(&packet);
}
@@ -59,7 +59,7 @@ void Client::placeTower(game::TowerType type, const glm::vec2& position) {
m_Connexion.sendPacket(&packet);
}
void Client::upgradeTower(game::TowerID tower, game::TowerLevel level){
void Client::upgradeTower(game::TowerID tower, game::TowerLevel level) {
protocol::UpgradeTowerPacket packet(tower, level);
m_Connexion.sendPacket(&packet);
}

2
src/game/client/WorldClient.cpp
View File

@@ -28,7 +28,7 @@ void WorldClient::HandlePacket(const protocol::SpawnMobPacket* packet) {
void WorldClient::HandlePacket(const protocol::UpgradeTowerPacket* packet) {
game::TowerPtr tower = getTowerById(packet->getTowerID());
if(tower == nullptr) return; // this should not happen but who knows ?
if (tower == nullptr) return; // this should not happen but who knows ?
tower->upgrade(packet->getTowerLevel().getLevel(), packet->getTowerLevel().getPath());
}

8
src/game/server/Server.cpp
View File

@@ -29,12 +29,12 @@ void Server::startThread() {
}
}
});
});
}
void Server::stopThread(){
void Server::stopThread() {
m_ServerRunning = false;
if(m_Thread.joinable())
if (m_Thread.joinable())
m_Thread.join();
}
@@ -55,7 +55,7 @@ bool Server::start(std::uint16_t port) {
}
void Server::stop() {
if(!m_ServerRunning)
if (!m_ServerRunning)
return;
stopThread();

4
src/game/server/ServerConnexion.cpp
View File

@@ -168,12 +168,12 @@ void ServerConnexion::HandlePacket(const protocol::SendMobsPacket* packet) {
//TODO: verify the packet
for(protocol::MobSend mobSend : mobSent){
for (protocol::MobSend mobSend : mobSent) {
m_Server->getGame().getServerWorld()->spawnMobs(mobSend.mobType, mobSend.mobLevel, m_ID, mobSend.mobCount);
}
}
void ServerConnexion::HandlePacket(const protocol::UpgradeTowerPacket* packet){
void ServerConnexion::HandlePacket(const protocol::UpgradeTowerPacket* packet) {
//TODO: verify the packet
m_Server->broadcastPacket(packet);

8
src/game/server/ServerGame.cpp
View File

@@ -9,7 +9,7 @@ ServerGame::ServerGame(server::Server* server) : game::Game(&m_ServerWorld), m_S
}
void ServerGame::tick(std::uint64_t delta) {
if(m_GameState == game::GameState::Game){
if (m_GameState == game::GameState::Game) {
Game::tick(delta);
updatePlayerStats();
}
@@ -27,16 +27,16 @@ void ServerGame::startGame() {
m_GameState = game::GameState::Game;
}
void ServerGame::updatePlayerStats(){
void ServerGame::updatePlayerStats() {
m_GoldMineTimer.update();
for (auto& pair : m_Server->getPlayers()) {
game::Player& player = pair.second;
if(player.hasGoldChanged()){
if (player.hasGoldChanged()) {
protocol::UpdateMoneyPacket packet(player.getGold());
m_Server->getConnexions()[player.getID()].sendPacket(&packet);
player.updateGold();
}
if(player.hasExpChanged()){
if (player.hasExpChanged()) {
protocol::UpdateExpPacket packet(player.getExp());
m_Server->getConnexions()[player.getID()].sendPacket(&packet);
player.updateExp();