diff --git a/Pokemon/Header/Pokemon/Pokemon.hpp b/Pokemon/Header/Pokemon/Pokemon.hpp index 603909ee..c56d2144 100644 --- a/Pokemon/Header/Pokemon/Pokemon.hpp +++ b/Pokemon/Header/Pokemon/Pokemon.hpp @@ -10,12 +10,7 @@ namespace N_Pokemon { class Pokemon { public: - string name; - PokemonType type; - int health; - int maxHealth; - int attackPower; - + // Default constructor Pokemon(); @@ -34,5 +29,17 @@ namespace N_Pokemon void takeDamage(int damage); bool isFainted() const; + + //getters and setters + string getName(); + + void setName(string _name); + + protected: + string name; + PokemonType type; + int health; + int maxHealth; + int attackPower; }; } \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Bulbasaur.hpp b/Pokemon/Header/Pokemon/Pokemons/Bulbasaur.hpp new file mode 100644 index 00000000..bab0cdea --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Bulbasaur.hpp @@ -0,0 +1,17 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Bulbasaur : public Pokemon { + public: + Bulbasaur(); + + private: + int leafBlade_dmg; + void leafBlade(Pokemon& target); + }; + + } +} \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Caterpie.hpp b/Pokemon/Header/Pokemon/Pokemons/Caterpie.hpp new file mode 100644 index 00000000..d5dd3946 --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Caterpie.hpp @@ -0,0 +1,17 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Caterpie : public Pokemon { + public: + Caterpie(); + + private: + int bugBite_dmg; + void bugBite(Pokemon& target); + }; + + } +} \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Charmander.hpp b/Pokemon/Header/Pokemon/Pokemons/Charmander.hpp new file mode 100644 index 00000000..8505ef7f --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Charmander.hpp @@ -0,0 +1,17 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Charmander : public Pokemon { + public: + Charmander(); + + private: + int flameThrower_dmg; + void flameThrower(Pokemon& target); + }; + + } +} \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Pidgey.hpp b/Pokemon/Header/Pokemon/Pokemons/Pidgey.hpp new file mode 100644 index 00000000..1563de33 --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Pidgey.hpp @@ -0,0 +1,16 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Pidgey : public Pokemon { + public: + Pidgey(); + + private: + int wingAttack_dmg; + void WingAttack(Pokemon& target); + }; + } +} \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Pikachu.hpp b/Pokemon/Header/Pokemon/Pokemons/Pikachu.hpp new file mode 100644 index 00000000..2543edb1 --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Pikachu.hpp @@ -0,0 +1,17 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Pikachu : public Pokemon { + public: + Pikachu(); + + private: + int thunderShock_dmg; + void thunderShock(Pokemon& target); + }; + + } +} \ No newline at end of file diff --git a/Pokemon/Header/Pokemon/Pokemons/Squitle.hpp b/Pokemon/Header/Pokemon/Pokemons/Squitle.hpp new file mode 100644 index 00000000..b053068a --- /dev/null +++ b/Pokemon/Header/Pokemon/Pokemons/Squitle.hpp @@ -0,0 +1,17 @@ +#pragma once +#include "../Pokemon.hpp" + +namespace N_Pokemon { + namespace N_Pokemons { + + class Squitle : public Pokemon { + public: + Squitle(); + + private: + int waterGun_dmg; + void waterGun(Pokemon& target); + }; + + } +} \ No newline at end of file diff --git a/Pokemon/Pokemon.vcxproj b/Pokemon/Pokemon.vcxproj index bb4bc852..32c20e06 100644 --- a/Pokemon/Pokemon.vcxproj +++ b/Pokemon/Pokemon.vcxproj @@ -160,6 +160,12 @@ + + + + + + @@ -177,6 +183,12 @@ + + + + + + diff --git a/Pokemon/Pokemon.vcxproj.filters b/Pokemon/Pokemon.vcxproj.filters index ae1c52fd..cf5d2230 100644 --- a/Pokemon/Pokemon.vcxproj.filters +++ b/Pokemon/Pokemon.vcxproj.filters @@ -39,6 +39,24 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -74,5 +92,23 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.ilk b/Pokemon/Pokemon/x64/Debug/Pokemon.ilk index 23796fb6..766b24a8 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.ilk and b/Pokemon/Pokemon/x64/Debug/Pokemon.ilk differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.log b/Pokemon/Pokemon/x64/Debug/Pokemon.log index f7764f8e..ed0dade3 100644 --- a/Pokemon/Pokemon/x64/Debug/Pokemon.log +++ b/Pokemon/Pokemon/x64/Debug/Pokemon.log @@ -1,5 +1,8 @@ - BattleManager.cpp - Game.cpp - Pokemon.cpp + Bulbasaur.cpp + Charmander.cpp + Pidgey.cpp + Caterpie.cpp + Pikachu.cpp + Squirtle.cpp Generating Code... Pokemon.vcxproj -> C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\x64\Debug\Pokemon.exe diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.command.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.command.1.tlog index f02149a2..5a5862ff 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.command.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.command.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.read.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.read.1.tlog index 37f2db34..59c027d7 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.read.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.read.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.write.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.write.1.tlog index c0af07c7..0c8a0b40 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.write.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/CL.write.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/Cl.items.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/Cl.items.tlog index 3e5c2ae6..02f52a12 100644 --- a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/Cl.items.tlog +++ b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/Cl.items.tlog @@ -4,5 +4,11 @@ C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\main.cpp;C:\Users\wasis C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Character\Player\Player.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Player.obj C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemon.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Pokemon.obj C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Character\ProfessorOak.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\ProfessorOak.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Bulbasaur.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Bulbasaur.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Charmander.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Charmander.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Pidgey.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Pidgey.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Caterpie.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Caterpie.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Pikachu.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Pikachu.obj +C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Pokemon\Pokemons\Squirtle.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Squirtle.obj C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Utility\Utility.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Utility.obj C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Src\Battle\WildEncounterManager.cpp;C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\WildEncounterManager.obj diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.command.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.command.1.tlog index 90fc3303..df0bf660 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.command.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.command.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.read.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.read.1.tlog index c30c5cab..75d42c75 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.read.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.read.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.secondary.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.secondary.1.tlog index 400cef15..14832144 100644 --- a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.secondary.1.tlog +++ b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.secondary.1.tlog @@ -1,2 +1,2 @@ -^C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\BATTLEMANAGER.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\GAME.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\MAIN.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PLAYER.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\POKEMON.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PROFESSOROAK.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\UTILITY.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\WILDENCOUNTERMANAGER.OBJ +^C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\BATTLEMANAGER.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\BULBASAUR.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\CATERPIE.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\CHARMANDER.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\GAME.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\MAIN.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PIDGEY.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PIKACHU.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PLAYER.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\POKEMON.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\PROFESSOROAK.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\SQUIRTLE.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\UTILITY.OBJ|C:\USERS\WASIS\ONEDRIVE\DESKTOP\MY REPOS\POKEMON\POKEMON\POKEMON\X64\DEBUG\WILDENCOUNTERMANAGER.OBJ C:\Users\wasis\OneDrive\Desktop\My repos\Pokemon\Pokemon\Pokemon\x64\Debug\Pokemon.ilk diff --git a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.write.1.tlog b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.write.1.tlog index 2906cd7e..a59e1efe 100644 Binary files a/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.write.1.tlog and b/Pokemon/Pokemon/x64/Debug/Pokemon.tlog/link.write.1.tlog differ diff --git a/Pokemon/Pokemon/x64/Debug/vc143.idb b/Pokemon/Pokemon/x64/Debug/vc143.idb index 9b516fe9..03a2dbe1 100644 Binary files a/Pokemon/Pokemon/x64/Debug/vc143.idb and b/Pokemon/Pokemon/x64/Debug/vc143.idb differ diff --git a/Pokemon/Pokemon/x64/Debug/vc143.pdb b/Pokemon/Pokemon/x64/Debug/vc143.pdb index 4ea25218..c614a301 100644 Binary files a/Pokemon/Pokemon/x64/Debug/vc143.pdb and b/Pokemon/Pokemon/x64/Debug/vc143.pdb differ diff --git a/Pokemon/Src/Battle/BattleManager.cpp b/Pokemon/Src/Battle/BattleManager.cpp index 519ba846..84aa0cfa 100644 --- a/Pokemon/Src/Battle/BattleManager.cpp +++ b/Pokemon/Src/Battle/BattleManager.cpp @@ -13,7 +13,7 @@ namespace N_Battle battleState.wildPokemon = &wildPokemon; battleState.playerTurn = true; // Player starts first battleState.battleOngoing = true; - std::cout << "A wild " << wildPokemon.name << " appeared!\n"; + std::cout << "A wild " << wildPokemon.getName() << " appeared!\n"; battle(); } @@ -42,10 +42,10 @@ namespace N_Battle void BattleManager::handleBattleOutcome() { if (battleState.playerPokemon->isFainted()) { - std::cout << battleState.playerPokemon->name << " has fainted! You lose the battle.\n"; + std::cout << battleState.playerPokemon->getName() << " has fainted! You lose the battle.\n"; } else { - std::cout << "You defeated the wild " << battleState.wildPokemon->name << "!\n"; + std::cout << "You defeated the wild " << battleState.wildPokemon->getName() << "!\n"; } } diff --git a/Pokemon/Src/Character/Player/Player.cpp b/Pokemon/Src/Character/Player/Player.cpp index 9e5e7183..bba80d45 100644 --- a/Pokemon/Src/Character/Player/Player.cpp +++ b/Pokemon/Src/Character/Player/Player.cpp @@ -36,7 +36,7 @@ namespace N_Character chosenPokemon = N_Pokemon::Pokemon("Pikachu", N_Pokemon::PokemonType::ELECTRIC, 100, 10); break; } - cout << "Player " << name << " chose " << chosenPokemon.name << "!\n"; + cout << "Player " << name << " chose " << chosenPokemon.getName() << "!\n"; Utility::waitForEnter(); } } diff --git a/Pokemon/Src/Main/Game.cpp b/Pokemon/Src/Main/Game.cpp index b8de7cbf..8aa7e424 100644 --- a/Pokemon/Src/Main/Game.cpp +++ b/Pokemon/Src/Main/Game.cpp @@ -20,7 +20,7 @@ namespace N_Game caveGrass = {"Cave", {Pokemon {"Zubat", PokemonType::POISON, 30, 10}, Pokemon {"Geodude", PokemonType::ROCK, 50, 10}}, 80}; - shallowWater = {"Cave", {Pokemon {"Staryu", PokemonType::WATER, 40, 10}, Pokemon {"Tentacool", PokemonType::POISON, 40, 10}}, 80}; + shallowWater = {"water", {Pokemon {"Staryu", PokemonType::WATER, 40, 10}, Pokemon {"Tentacool", PokemonType::POISON, 40, 10}}, 80}; } void Game::gameLoop(Player& player) { @@ -51,7 +51,7 @@ namespace N_Game case 2: { std::cout << "You head to the PokeCenter.\n"; player.chosenPokemon.heal(); - std::cout << player.chosenPokemon.name << "'s health is fully restored!\n"; + std::cout << player.chosenPokemon.getName() << "'s health is fully restored!\n"; break; } case 5: { diff --git a/Pokemon/Src/Pokemon/Pokemon.cpp b/Pokemon/Src/Pokemon/Pokemon.cpp index 151059ff..65d609f3 100644 --- a/Pokemon/Src/Pokemon/Pokemon.cpp +++ b/Pokemon/Src/Pokemon/Pokemon.cpp @@ -55,5 +55,15 @@ namespace N_Pokemon { health = maxHealth; } + + string Pokemon::getName() + { + return (Pokemon::name); + } + + void Pokemon::setName(string _name) + { + Pokemon::name = _name; + } } \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Bulbasaur.cpp b/Pokemon/Src/Pokemon/Pokemons/Bulbasaur.cpp new file mode 100644 index 00000000..76c9cde3 --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Bulbasaur.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Bulbasaur.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Bulbasaur::Bulbasaur() : Pokemon("Bulbasaur", PokemonType::ELECTRIC, 100, 20) + { + leafBlade_dmg = 15; + } + + void Bulbasaur::leafBlade(Pokemon& target) { + cout << name << " uses Thunder Shock on " << target.getName() << "!\n"; + target.takeDamage(leafBlade_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Caterpie.cpp b/Pokemon/Src/Pokemon/Pokemons/Caterpie.cpp new file mode 100644 index 00000000..68f70633 --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Caterpie.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Caterpie.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Caterpie::Caterpie() : Pokemon("Pikachu", PokemonType::ELECTRIC, 100, 20) + { + bugBite_dmg = 15; + } + + void Caterpie::bugBite(Pokemon& target) { + cout << name << " uses Wing Attack on " << target.getName() << "!\n"; + target.takeDamage(bugBite_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Charmander.cpp b/Pokemon/Src/Pokemon/Pokemons/Charmander.cpp new file mode 100644 index 00000000..9e996ad9 --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Charmander.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Charmander.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Charmander::Charmander() : Pokemon("Charmander", PokemonType::ELECTRIC, 100, 20) + { + flameThrower_dmg = 15; + } + + void Charmander::flameThrower(Pokemon& target) { + cout << name << " uses Thunder Shock on " << target.getName() << "!\n"; + target.takeDamage(flameThrower_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Pidgey.cpp b/Pokemon/Src/Pokemon/Pokemons/Pidgey.cpp new file mode 100644 index 00000000..3a7baf80 --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Pidgey.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Pidgey.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Pidgey::Pidgey() : Pokemon("Pidgey", PokemonType::NORMAL, 100, 20) + { + wingAttack_dmg = 15; + } + + void Pidgey::WingAttack(Pokemon& target) { + cout << name << " uses Wing Attack on " << target.getName() << "!\n"; + target.takeDamage(wingAttack_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Pikachu.cpp b/Pokemon/Src/Pokemon/Pokemons/Pikachu.cpp new file mode 100644 index 00000000..42476ffc --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Pikachu.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Pikachu.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Pikachu::Pikachu() : Pokemon("Pikachu", PokemonType::ELECTRIC, 100, 20) + { + thunderShock_dmg = 15; + } + + void Pikachu::thunderShock(Pokemon& target) { + cout << name << " uses Thunder Shock on " << target.getName() << "!\n"; + target.takeDamage(thunderShock_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/Src/Pokemon/Pokemons/Squirtle.cpp b/Pokemon/Src/Pokemon/Pokemons/Squirtle.cpp new file mode 100644 index 00000000..7b7de51c --- /dev/null +++ b/Pokemon/Src/Pokemon/Pokemons/Squirtle.cpp @@ -0,0 +1,20 @@ +#include "../../../Header/Pokemon/Pokemons/Squitle.hpp" +#include "../../../Header/Pokemon/PokemonType.hpp" +#include + +namespace N_Pokemon { + namespace N_Pokemons { + + using namespace std; + + Squitle::Squitle() : Pokemon("Squitle", PokemonType::ELECTRIC, 100, 20) + { + waterGun_dmg = 15; + } + + void Squitle::waterGun(Pokemon& target) { + cout << name << " uses Thunder Shock on " << target.getName() << "!\n"; + target.takeDamage(waterGun_dmg); + } + } +} \ No newline at end of file diff --git a/Pokemon/x64/Debug/Pokemon.pdb b/Pokemon/x64/Debug/Pokemon.pdb index ec70645e..a7bc4521 100644 Binary files a/Pokemon/x64/Debug/Pokemon.pdb and b/Pokemon/x64/Debug/Pokemon.pdb differ