From 243b3a768c4a1f746fb8095f251ca5692a248483 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Fri, 27 Dec 2019 12:36:32 +0100 Subject: [PATCH] Remove unused fields in CreateCreature class --- src/Battling/Models/CreateCreature.cpp | 51 -------------------------- src/Battling/Models/CreateCreature.hpp | 20 ---------- 2 files changed, 71 deletions(-) diff --git a/src/Battling/Models/CreateCreature.cpp b/src/Battling/Models/CreateCreature.cpp index 60a5c4e..7dade49 100644 --- a/src/Battling/Models/CreateCreature.cpp +++ b/src/Battling/Models/CreateCreature.cpp @@ -15,52 +15,6 @@ CreateCreature* CreateCreature::WithNickname(std::string nickname) { return this; } -CreateCreature* CreateCreature::WithStatPotential(CreatureLib::Core::Statistic stat, uint32_t value) { - switch (stat) { - case Core::Health: _healthPotential = value; - case Core::PhysicalAttack: _physAttackPotential = value; - case Core::PhysicalDefense: _physDefensePotential = value; - case Core::MagicalAttack: _magAttackPotential = value; - case Core::MagicalDefense: _magDefensePotential = value; - case Core::Speed: _speedPotential = value; - } - return this; -} - -CreateCreature* CreateCreature::WithStatPotentials(uint32_t health, uint32_t physAttack, uint32_t physDefense, - uint32_t magAttack, uint32_t magDefense, uint32_t speed) { - _healthPotential = health; - _physAttackPotential = physAttack; - _physDefensePotential = physDefense; - _magAttackPotential = magAttack; - _magDefensePotential = magDefense; - _speedPotential = speed; - return this; -} - -CreateCreature* CreateCreature::WithStatExperience(Core::Statistic stat, uint32_t value) { - switch (stat) { - case Core::Health: _healthExperience = value; - case Core::PhysicalAttack: _physAttackExperience = value; - case Core::PhysicalDefense: _physDefenseExperience = value; - case Core::MagicalAttack: _magAttackExperience = value; - case Core::MagicalDefense: _magDefenseExperience = value; - case Core::Speed: _speedExperience = value; - } - return this; -} - -CreateCreature* CreateCreature::WithStatExperiences(uint32_t health, uint32_t physAttack, uint32_t physDefense, - uint32_t magAttack, uint32_t magDefense, uint32_t speed) { - _healthExperience = health; - _physAttackExperience = physAttack; - _physDefenseExperience = physDefense; - _magAttackExperience = magAttack; - _magDefenseExperience = magDefense; - _speedExperience = speed; - return this; -} - CreateCreature* CreateCreature::WithGender(Library::Gender gender) { this->_gender = gender; return this; @@ -101,11 +55,6 @@ Creature* CreateCreature::Create() { // FIXME: implement experience auto experience = 0; - auto statExperience = Core::StatisticSet(_healthExperience, _physAttackExperience, _physDefenseExperience, - _magAttackExperience, _magDefenseExperience, _speedExperience); - auto statPotential = Core::StatisticSet(_healthPotential, _physAttackPotential, _physDefensePotential, - _magAttackPotential, _magDefensePotential, _speedPotential); - auto attacks = std::vector(_attacks.size()); for (size_t i = 0; i < attacks.size(); i++) { auto kv = _attacks[i]; diff --git a/src/Battling/Models/CreateCreature.hpp b/src/Battling/Models/CreateCreature.hpp index 99ef0b5..34c0e1f 100644 --- a/src/Battling/Models/CreateCreature.hpp +++ b/src/Battling/Models/CreateCreature.hpp @@ -12,20 +12,6 @@ namespace CreatureLib::Battling { uint8_t _level; std::string _nickname = ""; - uint8_t _healthPotential = 0; - uint8_t _physAttackPotential = 0; - uint8_t _physDefensePotential = 0; - uint8_t _magAttackPotential = 0; - uint8_t _magDefensePotential = 0; - uint8_t _speedPotential = 0; - - uint8_t _healthExperience = 0; - uint8_t _physAttackExperience = 0; - uint8_t _physDefenseExperience = 0; - uint8_t _magAttackExperience = 0; - uint8_t _magDefenseExperience = 0; - uint8_t _speedExperience = 0; - std::string _talent = ""; Library::Gender _gender = static_cast(-1); uint8_t _coloring = 0; @@ -41,12 +27,6 @@ namespace CreatureLib::Battling { CreateCreature* WithVariant(std::string variant); CreateCreature* WithNickname(std::string nickname); - CreateCreature* WithStatPotential(Core::Statistic stat, uint32_t value); - CreateCreature* WithStatPotentials(uint32_t health, uint32_t physAttack, uint32_t physDefense, - uint32_t magAttack, uint32_t magDefense, uint32_t speed); - CreateCreature* WithStatExperience(Core::Statistic stat, uint32_t value); - CreateCreature* WithStatExperiences(uint32_t health, uint32_t physAttack, uint32_t physDefense, - uint32_t magAttack, uint32_t magDefense, uint32_t speed); CreateCreature* WithGender(Library::Gender gender); CreateCreature* WithAttack(const std::string& attackName, AttackLearnMethod learnMethod);