summaryrefslogtreecommitdiffstats
path: root/sigscript/SpeciesWrapper.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-10-06 00:50:02 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-10-06 00:50:02 +0000
commit2c0a3866e09140d8d5ff84178decddc22db15778 (patch)
tree8d780290c2b1738cb17cec832dd866b068b9a31f /sigscript/SpeciesWrapper.cpp
parent61276d172306a14c110a7c3631b484ccf93f9ffa (diff)
downloadsigen-2c0a3866e09140d8d5ff84178decddc22db15778.tar.gz
sigen-2c0a3866e09140d8d5ff84178decddc22db15778.tar.xz
sigen-2c0a3866e09140d8d5ff84178decddc22db15778.zip
[FIX] Added single player option to Sigmod
[FIX] Doxygen generation cleaned up [FIX] Can no longer override variables in the Sigmod if not a single player game [FIX] When checking for modified move priority, blean up afterwards git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@271 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigscript/SpeciesWrapper.cpp')
-rw-r--r--sigscript/SpeciesWrapper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sigscript/SpeciesWrapper.cpp b/sigscript/SpeciesWrapper.cpp
index 42a46a50..d79f2e5f 100644
--- a/sigscript/SpeciesWrapper.cpp
+++ b/sigscript/SpeciesWrapper.cpp
@@ -107,21 +107,21 @@ int Sigscript::SpeciesWrapper::maxHoldWeight() const
Sigmod::Fraction Sigscript::SpeciesWrapper::runChance() const
{
- if (hasValueOfType<Sigmod::Fraction>("runChance"))
+ if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("runChance"))
return valueOfType<Sigmod::Fraction>("runChance");
return m_species->runChance();
}
Sigmod::Fraction Sigscript::SpeciesWrapper::fleeChance() const
{
- if (hasValueOfType<Sigmod::Fraction>("fleeChance"))
+ if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("fleeChance"))
return valueOfType<Sigmod::Fraction>("fleeChance");
return m_species->fleeChance();
}
Sigmod::Fraction Sigscript::SpeciesWrapper::itemChance() const
{
- if (hasValueOfType<Sigmod::Fraction>("itemChance"))
+ if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("itemChance"))
return valueOfType<Sigmod::Fraction>("itemChance");
return m_species->itemChance();
}
@@ -178,7 +178,7 @@ Sigmod::Fraction Sigscript::SpeciesWrapper::genderFactor() const
int Sigscript::SpeciesWrapper::eggSpecies() const
{
- if (hasValueOfType<int>("eggSpecies"))
+ if (sigmod()->singlePlayer() && hasValueOfType<int>("eggSpecies"))
return valueOfType<int>("eggSpecies");
return m_species->eggSpecies();
}