summaryrefslogtreecommitdiffstats
path: root/pokescripting
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-07-20 05:57:23 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-07-20 05:57:23 +0000
commita44d3c2ebd20e05c7c574cd3a13888fc471067b9 (patch)
treeed5b1750e4e074eb1cf01a59913b97d9e9ce2f43 /pokescripting
parentac55d15e484e2357954af3a6a3573c79fbbd88d8 (diff)
downloadsigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.tar.gz
sigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.tar.xz
sigen-a44d3c2ebd20e05c7c574cd3a13888fc471067b9.zip
[ADD] Added pokescripting to the spec file
[FIX] Added status tips and whats this tags to widgets in pokemodr [FIX] Removed the list sprite for the species [FIX] No more nidoran group needed (scripts should take care of it) [FIX] Height no longer broken between feet and inches [FIX] Fixed a bug in the TeamMember stat generation [FIX] No more global skins; should be scripted [FIX] Missed somt COPY() macros git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@227 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokescripting')
-rw-r--r--pokescripting/PokemodWrapper.h36
-rw-r--r--pokescripting/SpeciesWrapper.h24
2 files changed, 3 insertions, 57 deletions
diff --git a/pokescripting/PokemodWrapper.h b/pokescripting/PokemodWrapper.h
index 42bb1878..08125a79 100644
--- a/pokescripting/PokemodWrapper.h
+++ b/pokescripting/PokemodWrapper.h
@@ -59,12 +59,6 @@ class POKESCRIPTING_EXPORT PokemodWrapper : public ObjectWrapper
QString version() const;
QString description() const;
const MapWarpWrapper* startWarp() const;
- QPixmap walkSkin() const;
- QPixmap bikeSkin() const;
- QPixmap surfSkin() const;
- QPixmap flySkin() const;
- QPixmap fishSkin() const;
- QPixmap surfFishSkin() const;
Pokemod::Fraction effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const;
const RulesWrapper* rules() const;
@@ -121,36 +115,6 @@ inline const MapWarpWrapper* PokemodWrapper::startWarp() const
return new MapWarpWrapper(m_pokemod->mapById(m_pokemod->startMap())->warpById(m_pokemod->startWarp()), const_cast<PokemodWrapper*>(this));
}
-inline QPixmap PokemodWrapper::walkSkin() const
-{
- return m_pokemod->walkSkin();
-}
-
-inline QPixmap PokemodWrapper::bikeSkin() const
-{
- return m_pokemod->bikeSkin();
-}
-
-inline QPixmap PokemodWrapper::surfSkin() const
-{
- return m_pokemod->surfSkin();
-}
-
-inline QPixmap PokemodWrapper::flySkin() const
-{
- return m_pokemod->flySkin();
-}
-
-inline QPixmap PokemodWrapper::fishSkin() const
-{
- return m_pokemod->fishSkin();
-}
-
-inline QPixmap PokemodWrapper::surfFishSkin() const
-{
- return m_pokemod->surfFishSkin();
-}
-
inline Pokemod::Fraction PokemodWrapper::effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const
{
return m_pokemod->typechart(m_pokemod->typeIndex(attacker->id()), m_pokemod->typeIndex(defender->id()));
diff --git a/pokescripting/SpeciesWrapper.h b/pokescripting/SpeciesWrapper.h
index b70f802d..45ae996d 100644
--- a/pokescripting/SpeciesWrapper.h
+++ b/pokescripting/SpeciesWrapper.h
@@ -47,18 +47,15 @@ class POKESCRIPTING_EXPORT SpeciesWrapper : public ObjectWrapper
Pokemod::Fraction itemChance() const;
int pokedexNumber() const;
int weight() const;
- int heightFeet() const;
- int heightInches() const;
+ int height() const;
QString pokedexEntry() const;
QPixmap frontMaleSprite() const;
QPixmap backMaleSprite() const;
QPixmap frontFemaleSprite() const;
QPixmap backFemaleSprite() const;
- QPixmap listSprite() const;
Pokemod::Fraction genderFactor() const;
int eggSpecies() const;
int eggSteps() const;
- int nidoranGroup() const;
bool type(const int type) const;
bool eggGroup(const int eggGroup) const;
@@ -137,14 +134,9 @@ inline int SpeciesWrapper::weight() const
return m_species->weight();
}
-inline int SpeciesWrapper::heightFeet() const
+inline int SpeciesWrapper::height() const
{
- return m_species->heightFeet();
-}
-
-inline int SpeciesWrapper::heightInches() const
-{
- return m_species->heightInches();
+ return m_species->height();
}
inline QString SpeciesWrapper::pokedexEntry() const
@@ -172,11 +164,6 @@ inline QPixmap SpeciesWrapper::backFemaleSprite() const
return m_species->backFemaleSprite();
}
-inline QPixmap SpeciesWrapper::listSprite() const
-{
- return m_species->listSprite();
-}
-
inline Pokemod::Fraction SpeciesWrapper::genderFactor() const
{
return m_species->genderFactor();
@@ -192,11 +179,6 @@ inline int SpeciesWrapper::eggSteps() const
return m_species->eggSteps();
}
-inline int SpeciesWrapper::nidoranGroup() const
-{
- return m_species->nidoranGroup();
-}
-
inline bool SpeciesWrapper::type(const int type) const
{
return m_species->type(type);