[FIX] Neural Network methods complete

[FIX] Wrapped Node up into the layer
[FIX] Wrapped NatureEffect into Nature
[FIX] Getting around to fixing up the design of the PokéMod stuff
[FIX] Creating new subclasses now returns pointer to new subclass
[FIX] Simplified interfaces
[FIX] Minor style issues
[FIX] Renamed CoinItem to CoinListObject
[FIX] Renamed MapTrainerTeam to MapTrainerPokemon
[FIX] Renamed MapWildPokemon to MapWildListPokemon
[FIX] Moved global enums to relevant classes
[FIX] Removed general logging features
[DEL] pokemod/Debug.{h, cpp}
[DEL] pokemod/Path.{h, cpp}
[FIX] Using QFile rather than custom Path class for checking for files
[FIX] Set* methods now return a bool to let the caller know if anything actually changed (if it can fail, otherwise it is void)
[ADD] Compliation without errors is required for pokemod from now on before commits

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@24 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 143 insertions, 210 deletions

diff --git a/pokemod/PokemonEvolution.cpp b/pokemod/PokemonEvolution.cpp
index c04f379f..89abc22b 100644
--- a/pokemod/PokemonEvolution.cpp
+++ b/pokemod/PokemonEvolution.cpp
@@ -1,210 +1,143 @@
-/////////////////////////////////////////////////////////////////////////////

-// Name:        pokemod/PokemonEvolution.cpp

-// Purpose:     Define an evolution that a Pokémon can go through

-// Author:      Ben Boeckel

-// Modified by: Ben Boeckel

-// Created:     Tue Mar 20 18:45:29 2007

-// Copyright:   ©2007 Ben Boeckel and Nerdy Productions

-// Licence:

-//    This program is free software: you can redistribute it and/or modify

-//    it under the terms of the GNU General Public License as published by

-//    the Free Software Foundation, either version 3 of the License, or

-//    (at your option) any later version.

-//    

-//    This program is distributed in the hope that it will be useful,

-//    but WITHOUT ANY WARRANTY; without even the implied warranty of

-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-//    GNU General Public License for more details.

-//    

-//    You should have received a copy of the GNU General Public License along

-//    with this program.  If not, see <http://www.gnu.org/licenses/>.

-/////////////////////////////////////////////////////////////////////////////

-

-#include "PokemonEvolution.h"

-

-PokeGen::PokeMod::PokemonEvolution::PokemonEvolution(const Pokemod *par, const unsigned _id) :

-      species(UINT_MAX),

-      style(UINT_MAX),

-      level(0),

-      item(UINT_MAX),

-      happiness(0)

-{

-   LogCtor("PokemonEvolution", _id);

-   id = _id;

-   pokemod = par;

-}

-

-PokeGen::PokeMod::PokemonEvolution::PokemonEvolution(const Pokemod *par, Ini &ini, const unsigned _id)

-{

-   LogCtorIni("PokemonEvolution", _id);

-   pokemod = par;

-   ImportIni(ini, _id);

-   if (id == UINT_MAX)

-      LogIdError("PokemonEvolution");

-}

-

-PokeGen::PokeMod::PokemonEvolution::~PokemonEvolution()

-{

-   LogDtor("PokemonEvolution", id);

-}

-

-void PokeGen::PokeMod::PokemonEvolution::Validate()

-{

-   LogValidateStart("PokemonEvolution", id);

-   if (!pokemod->GetPokemon(species))

-   {

-      LogVarNotValid("PokemonEvolution", id, "species");

-      isValid = false;

-   }

-   if (STY_END <= style)

-   {

-      LogVarNotValid("PokemonEvolution", id, "style");

-      isValid = false;

-   }

-   if (pokemod->GetMaxLevel() <= level)

-   {

-      LogVarNotValid("PokemonEvolution", id, "level");

-      isValid = false;

-   }

-   if (!pokemod->GetItem(item))

-   {

-      LogVarNotValid("PokemonEvolution", id, "species");

-      isValid = false;

-   }

-   LogValidateOver("PokemonEvolution", id, isValid);

-}

-

-void PokeGen::PokeMod::PokemonEvolution::ImportIni(Ini &ini, const unsigned _id)

-{

-   LogImportStart("PokemonEvolution");

-   if (_id == UINT_MAX)

-   {

-      ini.GetValue("id", id);

-      if (id == UINT_MAX)

-         LogIdNotFound("PokemonEvolution");

-   }

-   else

-      id = _id;

-   ini.GetValue("species", species);

-   ini.GetValue("style", style);

-   ini.GetValue("level", level, 0);

-   ini.GetValue("item", item);

-   ini.GetValue("happiness", happiness, 0);

-   LogImportOver("PokemonEvolution", id);

-}

-

-void PokeGen::PokeMod::PokemonEvolution::ExportIni(QFile &fout, const QString &pokemon) const

-{

-   LogExportStart("PokemonEvolution", id);

-   Ini exPokemonEvolution("pokemonEvolution " + pokemon);

-   exPokemonEvolution.AddField("id", id);

-   exPokemonEvolution.AddField("species", species);

-   exPokemonEvolution.AddField("style", style);

-   exPokemonEvolution.AddField("level", level);

-   exPokemonEvolution.AddField("item", item);

-   exPokemonEvolution.AddField("happiness", happiness);

-   exPokemonEvolution.Export(fout);

-   LogExportOver("PokemonEvolution", id);

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetSpecies(const unsigned s)

-{

-   LogSetVar("PokemonEvolution", id, "species", s);

-   if (pokemod->GetPokemon(s))

-      species = s;

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetSpecies(const QString &s)

-{

-   LogSetVar("PokemonEvolution", id, "species", s);

-   if (const Pokemon *temp = pokemod->GetPokemon(s))

-      species = temp->GetId();

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetStyle(const unsigned s)

-{

-   LogSetVar("PokemonEvolution", id, "style", s);

-   if (s < STY_END)

-      style = s;

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetLevel(const unsigned l)

-{

-   LogSetVar("PokemonEvolution", id, "level", l);

-   if (l <= pokemod->GetMaxLevel())

-      level = l;

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetItem(const unsigned i)

-{

-   LogSetVar("PokemonEvolution", id, "item", i);

-   if (pokemod->GetItem(i))

-      item = i;

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetItem(const QString &i)

-{

-   LogSetVar("PokemonEvolution", id, "item", i);

-   if (const Item *temp = pokemod->GetItem(i))

-      item = temp->GetId();

-}

-

-void PokeGen::PokeMod::PokemonEvolution::SetHappiness(const unsigned h)

-{

-   LogSetVar("PokemonEvolution", id, "happiness", h);

-   happiness = h;

-}

-

-unsigned PokeGen::PokeMod::PokemonEvolution::GetSpecies() const

-{

-   LogFetchVar("PokemonEvolution", id, "species", species);

-   return species;

-}

-

-QString PokeGen::PokeMod::PokemonEvolution::GetSpeciesString() const

-{

-   LogFetchVar("PokemonEvolution", id, "species string", species);

-   if (const Pokemon *s = pokemod->GetPokemon(species))

-      return s->GetName();

-   return "";

-}

-

-unsigned PokeGen::PokeMod::PokemonEvolution::GetStyle() const

-{

-   LogFetchVar("PokemonEvolution", id, "style", style);

-   return style;

-}

-

-QString PokeGen::PokeMod::PokemonEvolution::GetStyleString() const

-{

-   LogFetchVar("PokemonEvolution", id, "style string", style);

-   if (style < STY_END)

-      return StyleStr[style];

-   return "";

-}

-

-unsigned PokeGen::PokeMod::PokemonEvolution::GetLevel() const

-{

-   LogFetchVar("PokemonEvolution", id, "level", level);

-   return level;

-}

-

-unsigned PokeGen::PokeMod::PokemonEvolution::GetItem() const

-{

-   LogFetchVar("PokemonEvolution", id, "item", item);

-   return item;

-}

-

-QString PokeGen::PokeMod::PokemonEvolution::GetItemString() const

-{

-   LogFetchVar("PokemonEvolution", id, "item string", item);

-   if (const Item *i = pokemod->GetItem(item))

-      return i->GetName();

-   return "";

-}

-

-unsigned PokeGen::PokeMod::PokemonEvolution::GetHappiness() const

-{

-   LogFetchVar("PokemonEvolution", id, "happiness", happiness);

-   return happiness;

-}

+/////////////////////////////////////////////////////////////////////////////
+// Name:        pokemod/PokemonEvolution.cpp
+// Purpose:     Define an evolution that a Pokémon can go through
+// Author:      Ben Boeckel
+// Modified by: Ben Boeckel
+// Created:     Tue Mar 20 18:45:29 2007
+// Copyright:   ©2007 Ben Boeckel and Nerdy Productions
+// Licence:
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License along
+//    with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#include "PokemonEvolution.h"
+
+PokeGen::PokeMod::PokemonEvolution::PokemonEvolution(const Pokemod* par, const unsigned _id) :
+        Object(_id, par),
+        species(UINT_MAX),
+        style(UINT_MAX),
+        val1(UINT_MAX),
+        val2(UINT_MAX),
+        level(0)
+{
+}
+
+PokeGen::PokeMod::PokemonEvolution::PokemonEvolution(const Pokemod* par, Ini& ini, const unsigned _id) :
+        Object(_id, par)
+{
+    ImportIni(ini, _id);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::Validate()
+{
+    pokemod->ValidationMsg(QString("------Evolution with id %1---").arg(id), Pokemod::V_Msg);
+    if (pokemod->GetPokemonByID(species) == UINT_MAX)
+    {
+        pokemod->ValidationMsg("Invalid species");
+        isValid = false;
+    }
+    if (End <= style)
+    {
+        pokemod->ValidationMsg("Invalid style");
+        isValid = false;
+    }
+    if (pokemod->GetMaxLevel() <= level)
+    {
+        pokemod->ValidationMsg("Invalid level");
+        isValid = false;
+    }
+    return isValid;
+}
+
+void PokeGen::PokeMod::PokemonEvolution::ImportIni(Ini& ini, const unsigned _id)
+{
+    if (_id == UINT_MAX)
+        ini.GetValue("id", id);
+    else
+        id = _id;
+    ini.GetValue("species", species);
+    ini.GetValue("style", style);
+    ini.GetValue("val1", val1);
+    ini.GetValue("val2", val2);
+    ini.GetValue("level", level, 0);
+}
+
+void PokeGen::PokeMod::PokemonEvolution::ExportIni(QFile& fout, const QString& pokemon) const
+{
+    Ini exPokemonEvolution("pokemonEvolution " + pokemon);
+    exPokemonEvolution.AddField("id", id);
+    exPokemonEvolution.AddField("species", species);
+    exPokemonEvolution.AddField("style", style);
+    exPokemonEvolution.AddField("val1", val1);
+    exPokemonEvolution.AddField("val2", val2);
+    exPokemonEvolution.AddField("level", level);
+    exPokemonEvolution.Export(fout);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::SetSpecies(const unsigned s)
+{
+    if (pokemod->GetPokemonByID(s) != UINT_MAX)
+        species = s;
+    return (species == s);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::SetStyle(const unsigned s)
+{
+    if (s < End)
+        style = s;
+    return (style == s);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::SetVal1(const unsigned v1)
+{
+    // TODO (Ben#1#): Val1 of PokemonEvolution
+    return (val1 == v1);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::SetVal2(const unsigned v2)
+{
+    // TODO (Ben#1#): Val2 of PokemonEvolution
+    return (val2 == v2);
+}
+
+bool PokeGen::PokeMod::PokemonEvolution::SetLevel(const unsigned l)
+{
+    if (l <= pokemod->GetMaxLevel())
+        level = l;
+    return (level == l);
+}
+
+unsigned PokeGen::PokeMod::PokemonEvolution::GetSpecies() const
+{
+    return species;
+}
+
+unsigned PokeGen::PokeMod::PokemonEvolution::GetStyle() const
+{
+    return style;
+}
+
+unsigned PokeGen::PokeMod::PokemonEvolution::GetVal1() const
+{
+    return val1;
+}
+
+unsigned PokeGen::PokeMod::PokemonEvolution::GetVal2() const
+{
+    return val2;
+}
+
+unsigned PokeGen::PokeMod::PokemonEvolution::GetLevel() const
+{
+    return level;
+}