diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 05:57:23 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 05:57:23 +0000 |
| commit | a44d3c2ebd20e05c7c574cd3a13888fc471067b9 (patch) | |
| tree | ed5b1750e4e074eb1cf01a59913b97d9e9ce2f43 | |
| parent | ac55d15e484e2357954af3a6a3573c79fbbd88d8 (diff) | |
| download | sigen-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
62 files changed, 1857 insertions, 1157 deletions
@@ -1,4 +1,25 @@ ----------------- +Rev: 227 +Date: 20 July 2008 +User: MathStuf +----------------- +[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 + +----------------- +Rev: 226 +Date: 11 July 2008 +User: MathStuf +----------------- +[FIX] Actually added the Wrapper classes (again :( ) + +----------------- Rev: 225 Date: 11 July 2008 User: MathStuf diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp index 68d3d6ed..4d5f3885 100644 --- a/pokebattle/Arena.cpp +++ b/pokebattle/Arena.cpp @@ -26,6 +26,7 @@ // KDE includes #include <kross/core/action.h> +#include <kross/core/actioncollection.h> #include <kross/core/manager.h> QSet<int> Pokebattle::Arena::m_arenaIds; diff --git a/pokebattle/Arena.h b/pokebattle/Arena.h index 0bbec051..fb99eca2 100644 --- a/pokebattle/Arena.h +++ b/pokebattle/Arena.h @@ -28,11 +28,12 @@ #include <QtCore/QPair> #include <QtCore/QSet> -// KDE includes -#include <kross/core/actioncollection.h> -#include <kross/core/manager.h> - // Forward declarations +namespace Kross +{ +class Action; +class ActionCollection; +} namespace Pokemod { class Script; diff --git a/pokebattle/TeamMember.cpp b/pokebattle/TeamMember.cpp index aed42f05..98542d0e 100644 --- a/pokebattle/TeamMember.cpp +++ b/pokebattle/TeamMember.cpp @@ -399,7 +399,7 @@ void Pokebattle::TeamMember::initStats() { for (int i = Pokemod::ST_No_HP_Start; i < Pokemod::ST_End_RBY; ++i) m_dv[i] = qrand() & 15; - m_dv[Pokemod::ST_HP] = (m_dv[Pokemod::ST_Attack] << 3) + (m_dv[Pokemod::ST_Defense] << 2) + (m_dv[Pokemod::ST_Speed] << 1) + m_dv[Pokemod::ST_Special]; + m_dv[Pokemod::ST_HP] = ((m_dv[Pokemod::ST_Attack] & 1) << 3) + ((m_dv[Pokemod::ST_Defense] & 1) << 2) + ((m_dv[Pokemod::ST_Speed] & 1) << 1) + (m_dv[Pokemod::ST_Special] & 1); } } diff --git a/pokegen.spec b/pokegen.spec index d72402fe..90b3d6a6 100644 --- a/pokegen.spec +++ b/pokegen.spec @@ -1,6 +1,6 @@ Name: pokegen Version: 0.0.2 -Release: 0.7.20080630svn221%{?dist} +Release: 0.8.20080711svn227%{?dist} Summary: Pokégen is an RPG/Strategy engine inspired by the Pokémon games Group: Amusements/Games @@ -114,6 +114,8 @@ rm -rf %{buildroot} %{_bindir}/pokemodr %{_libdir}/libpokemod.so.0 %{_libdir}/libpokemod.so.0.0.2 +%{_libdir}/libpokescripting.so.0 +%{_libdir}/libpokescripting.so.0.0.2 %{_libdir}/libpokebattle.so.0 %{_libdir}/libpokebattle.so.0.0.2 %{_datadir}/mime/packages/pokemodr.xml @@ -125,10 +127,14 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/libpokemod.so %{_libdir}/libpokebattle.so +%{_libdir}/libpokebattle.so %{_includedir}/%{name}/ %changelog +* Fri Jul 11 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.8.2008071svn227 +- Updated the version + * Mon Jun 30 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-0.7.20080630svn221 - Build/install use of buildroot fixed - Fixed up changelog diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp index e4ea1117..aec463ee 100644 --- a/pokemod/Pokemod.cpp +++ b/pokemod/Pokemod.cpp @@ -44,7 +44,6 @@ #include "Weather.h" // Qt includes -#include <QtCore/QBuffer> #include <QtCore/QSet> Pokemod::Pokemod::Pokemod() : @@ -54,12 +53,6 @@ Pokemod::Pokemod::Pokemod() : m_description(""), m_startMap(INT_MAX), m_startWarp(INT_MAX), - m_walkSkin(192, 128), - m_bikeSkin(192, 128), - m_surfSkin(192, 128), - m_flySkin(192, 128), - m_fishSkin(192, 128), - m_surfFishSkin(192, 128), m_typechart(0, 0), m_rules(new Rules(this)) { @@ -279,12 +272,6 @@ void Pokemod::Pokemod::load(const QDomElement& xml) LOAD(QString, description); LOAD(int, startMap); LOAD(int, startWarp); - LOAD(QPixmap, walkSkin); - LOAD(QPixmap, bikeSkin); - LOAD(QPixmap, surfSkin); - LOAD(QPixmap, flySkin); - LOAD(QPixmap, fishSkin); - LOAD(QPixmap, surfFishSkin); LOAD_Rules(); LOAD_SUB(newAbility, Ability); LOAD_SUB(newAuthor, Author); @@ -318,12 +305,6 @@ QDomElement Pokemod::Pokemod::save() const SAVE(QString, description); SAVE(int, startMap); SAVE(int, startWarp); - SAVE(QPixmap, walkSkin); - SAVE(QPixmap, bikeSkin); - SAVE(QPixmap, surfSkin); - SAVE(QPixmap, flySkin); - SAVE(QPixmap, fishSkin); - SAVE(QPixmap, surfFishSkin); SAVE_Rules(rules); SAVE_MATRIX(Fraction, typechart); SAVE_SUB(Ability, abilities); @@ -390,72 +371,6 @@ void Pokemod::Pokemod::setStartWarp(const int startWarp) CHECK(startWarp); } -void Pokemod::Pokemod::setWalkSkin(const QPixmap& walkSkin) -{ - if (walkSkin.size() != QSize(192, 128)) - { - emit(error(size("walkSkin"))); - return; - } - m_walkSkin = walkSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setBikeSkin(const QPixmap& bikeSkin) -{ - if (bikeSkin.size() != QSize(192, 128)) - { - emit(error(size("bikeSkin"))); - return; - } - m_bikeSkin = bikeSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setSurfSkin(const QPixmap& surfSkin) -{ - if (surfSkin.size() != QSize(192, 128)) - { - emit(error(size("surfSkin"))); - return; - } - m_surfSkin = surfSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setFlySkin(const QPixmap& flySkin) -{ - if (flySkin.size() != QSize(192, 128)) - { - emit(error(size("flySkin"))); - return; - } - m_flySkin = flySkin; - emit(changed()); -} - -void Pokemod::Pokemod::setFishSkin(const QPixmap& fishSkin) -{ - if (fishSkin.size() != QSize(192, 128)) - { - emit(error(size("fishSkin"))); - return; - } - m_fishSkin = fishSkin; - emit(changed()); -} - -void Pokemod::Pokemod::setSurfFishSkin(const QPixmap& surfFishSkin) -{ - if (surfFishSkin.size() != QSize(192, 128)) - { - emit(error(size("surfFishSkin"))); - return; - } - m_surfFishSkin = surfFishSkin; - emit(changed()); -} - void Pokemod::Pokemod::setTypechart(const int attack, const int defense, const Fraction& multiplier) { CHECK_ARRAY(typechart(attack, defense), multiplier); @@ -496,36 +411,6 @@ int Pokemod::Pokemod::startWarp() const return m_startWarp; } -QPixmap Pokemod::Pokemod::walkSkin() const -{ - return m_walkSkin; -} - -QPixmap Pokemod::Pokemod::bikeSkin() const -{ - return m_bikeSkin; -} - -QPixmap Pokemod::Pokemod::surfSkin() const -{ - return m_surfSkin; -} - -QPixmap Pokemod::Pokemod::flySkin() const -{ - return m_flySkin; -} - -QPixmap Pokemod::Pokemod::fishSkin() const -{ - return m_fishSkin; -} - -QPixmap Pokemod::Pokemod::surfFishSkin() const -{ - return m_surfFishSkin; -} - const Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() const { return &m_typechart; diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h index 76a858b3..9055e3a2 100644 --- a/pokemod/Pokemod.h +++ b/pokemod/Pokemod.h @@ -25,7 +25,6 @@ // Qt includes #include <QtCore/QList> -#include <QtGui/QPixmap> namespace Pokemod { @@ -71,12 +70,6 @@ class POKEMOD_EXPORT Pokemod : public Object void setDescription(const QString& description); void setStartMap(const int startMap); void setStartWarp(const int startWarp); - void setWalkSkin(const QPixmap& walkSkin); - void setBikeSkin(const QPixmap& bikeSkin); - void setSurfSkin(const QPixmap& surfSkin); - void setFlySkin(const QPixmap& slySkin); - void setFishSkin(const QPixmap& fishSkin); - void setSurfFishSkin(const QPixmap& surfFishSkin); void setTypechart(const int attack, const int defense, const Fraction& multiplier); void setRules(const Rules& rules); void setRules(const QDomElement& xml); @@ -86,12 +79,6 @@ class POKEMOD_EXPORT Pokemod : public Object QString description() const; int startMap() const; int startWarp() const; - QPixmap walkSkin() const; - QPixmap bikeSkin() const; - QPixmap surfSkin() const; - QPixmap flySkin() const; - QPixmap fishSkin() const; - QPixmap surfFishSkin() const; const Matrix<Fraction>* typechart() const; Matrix<Fraction>* typechart(); Fraction typechart(const int attack, const int defense) const; @@ -424,12 +411,6 @@ class POKEMOD_EXPORT Pokemod : public Object QString m_description; int m_startMap; int m_startWarp; - QPixmap m_walkSkin; - QPixmap m_bikeSkin; - QPixmap m_surfSkin; - QPixmap m_flySkin; - QPixmap m_fishSkin; - QPixmap m_surfFishSkin; Matrix<Fraction> m_typechart; Rules* m_rules; QList<Ability*> m_abilities; diff --git a/pokemod/Script.h b/pokemod/Script.h index b655b908..e1718180 100644 --- a/pokemod/Script.h +++ b/pokemod/Script.h @@ -29,7 +29,8 @@ namespace Pokemod class POKEMOD_EXPORT Script { public: - Script(const QString& interpreter = "", const QString& script = ""); + Script(); + Script(const QString& interpreter, const QString& script); void setInterpreter(const QString& interpreter); void setScript(const QString& script); @@ -45,6 +46,12 @@ class POKEMOD_EXPORT Script QString m_script; }; +inline Script::Script() : + m_interpreter(""), + m_script("") +{ +} + inline Script::Script(const QString& interpreter, const QString& script) : m_interpreter(interpreter), m_script(script) diff --git a/pokemod/Species.cpp b/pokemod/Species.cpp index a187bcd4..509d6e84 100644 --- a/pokemod/Species.cpp +++ b/pokemod/Species.cpp @@ -47,18 +47,15 @@ Pokemod::Species::Species(const Pokemod* parent, const int id) : m_itemChance(1, 1), m_pokedexNumber(INT_MAX), m_weight(0), - m_heightFeet(0), - m_heightInches(0), + m_height(0), m_frontMaleSprite(128, 128), m_backMaleSprite(128, 128), m_frontFemaleSprite(128, 128), m_backFemaleSprite(128, 128), - m_listSprite(64, 128), m_pokedexEntry(""), m_genderFactor(1, 1), m_eggSpecies(INT_MAX), m_eggSteps(0), - m_nidoranGroup(INT_MAX), m_evolution("", "") { for (int i = 0; i < ST_End_GSC; ++i) @@ -97,12 +94,10 @@ void Pokemod::Species::validate() TEST(setFleeChance, fleeChance); TEST(setItemChance, itemChance); TEST(setWeight, weight); - TEST(setHeightInches, heightInches); TEST(setFrontMaleSprite, frontMaleSprite); TEST(setBackMaleSprite, backMaleSprite); TEST(setFrontFemaleSprite, frontFemaleSprite); TEST(setBackFemaleSprite, backFemaleSprite); - TEST(setListSprite, listSprite); if ((m_pokedexNumber != INT_MAX) && m_pokedexEntry.isEmpty()) emit(error("Pokedex entry is empty")); TEST(setGenderFactor, genderFactor); @@ -160,13 +155,11 @@ void Pokemod::Species::load(const QDomElement& xml) LOAD(Fraction, itemChance); LOAD(int, pokedexNumber); LOAD(int, weight); - LOAD(int, heightFeet); - LOAD(int, heightInches); + LOAD(int, height); LOAD(QString, pokedexEntry); LOAD(Fraction, genderFactor); LOAD(int, eggSpecies); LOAD(int, eggSteps); - LOAD(int, nidoranGroup); LOAD_LIST(int, type); LOAD_LIST(int, eggGroup); LOAD(Script, evolution); @@ -189,13 +182,11 @@ QDomElement Pokemod::Species::save() const SAVE(Fraction, itemChance); SAVE(int, pokedexNumber); SAVE(int, weight); - SAVE(int, heightFeet); - SAVE(int, heightInches); + SAVE(int, height); SAVE(QString, pokedexEntry); SAVE(Fraction, genderFactor); SAVE(int, eggSpecies); SAVE(int, eggSteps); - SAVE(int, nidoranGroup); SAVE_LIST(int, type); SAVE_LIST(int, eggGroup); SAVE(Script, evolution); @@ -305,19 +296,9 @@ void Pokemod::Species::setWeight(const int weight) CHECK(weight); } -void Pokemod::Species::setHeightFeet(const int heightFeet) +void Pokemod::Species::setHeight(const int height) { - CHECK(heightFeet); -} - -void Pokemod::Species::setHeightInches(const int heightInches) -{ - if (12 <= heightInches) - { - emit(error(bounds("heightInches"))); - return; - } - CHECK(heightInches); + CHECK(height); } void Pokemod::Species::setPokedexEntry(const QString& pokedexEntry) @@ -409,17 +390,6 @@ void Pokemod::Species::setBackFemaleSprite(const QPixmap& backFemaleSprite) emit(changed()); } -void Pokemod::Species::setListSprite(const QPixmap& listSprite) -{ - if (listSprite.size() != QSize(64, 128)) - { - emit(error(size("listSprite"))); - return; - } - m_listSprite = listSprite; - emit(changed()); -} - void Pokemod::Species::setGenderFactor(const Fraction& genderFactor) { CHECK(genderFactor); @@ -440,11 +410,6 @@ void Pokemod::Species::setEggSteps(const int eggSteps) CHECK(eggSteps); } -void Pokemod::Species::setNidoranGroup(const int nidoranGroup) -{ - CHECK(nidoranGroup); -} - void Pokemod::Species::setType(const int type, const bool state) { if (qobject_cast<const Pokemod*>(pokemod())->typeIndex(type) == INT_MAX) @@ -553,14 +518,9 @@ int Pokemod::Species::weight() const return m_weight; } -int Pokemod::Species::heightFeet() const -{ - return m_heightFeet; -} - -int Pokemod::Species::heightInches() const +int Pokemod::Species::height() const { - return m_heightInches; + return m_height; } QString Pokemod::Species::pokedexEntry() const @@ -588,11 +548,6 @@ QPixmap Pokemod::Species::backFemaleSprite() const return m_backFemaleSprite; } -QPixmap Pokemod::Species::listSprite() const -{ - return m_listSprite; -} - Pokemod::Fraction Pokemod::Species::genderFactor() const { return m_genderFactor; @@ -608,11 +563,6 @@ int Pokemod::Species::eggSteps() const return m_eggSteps; } -int Pokemod::Species::nidoranGroup() const -{ - return m_nidoranGroup; -} - bool Pokemod::Species::type(const int type) const { return m_type.contains(type); @@ -878,13 +828,15 @@ Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) COPY(itemChance); COPY(pokedexNumber); COPY(weight); - COPY(heightFeet); - COPY(heightInches); + COPY(height); + COPY(frontMaleSprite); + COPY(backMaleSprite); + COPY(frontFemaleSprite); + COPY(backFemaleSprite); COPY(pokedexEntry); COPY(genderFactor); COPY(eggSpecies); COPY(eggSteps); - COPY(nidoranGroup); COPY(type); COPY(eggGroup); COPY(evolution); diff --git a/pokemod/Species.h b/pokemod/Species.h index 1e458d18..91a05369 100644 --- a/pokemod/Species.h +++ b/pokemod/Species.h @@ -74,18 +74,15 @@ class POKEMOD_EXPORT Species : public Object void setItemChance(const Fraction& itemChance); void setPokedexNumber(const int pokedexNumber); void setWeight(const int weight); - void setHeightFeet(const int heighteet); - void setHeightInches(const int heightInches); + void setHeight(const int height); void setPokedexEntry(const QString& pokedexEntry); void setFrontMaleSprite(const QPixmap& frontMaleSprite); void setBackMaleSprite(const QPixmap& backMaleSprite); void setFrontFemaleSprite(const QPixmap& frontFemaleSprite); void setBackFemaleSprite(const QPixmap& backFemaleSprite); - void setListSprite(const QPixmap& listSprite); void setGenderFactor(const Fraction& genderFactor); void setEggSpecies(const int eggSpecies); void setEggSteps(const int eggSteps); - void setNidoranGroup(const int nidoranGroup); void setType(const int type, const bool state); void setEggGroup(const int eggGroup, const bool state); void setEvolution(const Script& evolution); @@ -101,18 +98,15 @@ class POKEMOD_EXPORT Species : public Object 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; Fraction genderFactor() const; int eggSpecies() const; int eggSteps() const; - int nidoranGroup() const; bool type(const int type) const; bool eggGroup(const int eggGroup) const; Script evolution() const; @@ -177,18 +171,15 @@ class POKEMOD_EXPORT Species : public Object Fraction m_itemChance; int m_pokedexNumber; int m_weight; - int m_heightFeet; - int m_heightInches; + int m_height; QPixmap m_frontMaleSprite; QPixmap m_backMaleSprite; QPixmap m_frontFemaleSprite; QPixmap m_backFemaleSprite; - QPixmap m_listSprite; QString m_pokedexEntry; Fraction m_genderFactor; int m_eggSpecies; int m_eggSteps; - int m_nidoranGroup; QList<int> m_type; QList<int> m_eggGroup; Script m_evolution; diff --git a/pokemod/TODO b/pokemod/TODO index 85825423..f9bde618 100644 --- a/pokemod/TODO +++ b/pokemod/TODO @@ -1,7 +1,3 @@ Properly inline methods (http://www.parashift.com/c++-faq-lite/inline-functions.html#faq-9.9)
Species::validate() gives a (possible) noreturn option (???)
-
-Trainer AI stuff
-
-Test library
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp index 685bf57f..d5864058 100644 --- a/pokemod/Tile.cpp +++ b/pokemod/Tile.cpp @@ -140,6 +140,7 @@ Pokemod::Tile& Pokemod::Tile::operator=(const Tile& rhs) if (this == &rhs) return *this; COPY(name); + COPY(sprite); COPY_ARRAY(from, D_End); COPY(script); return *this; diff --git a/pokemodr/FractionWidget.h b/pokemodr/FractionWidget.h index c77a36e6..5b0ef944 100644 --- a/pokemodr/FractionWidget.h +++ b/pokemodr/FractionWidget.h @@ -35,7 +35,7 @@ class FractionWidget : public QWidget, private Ui::formFraction Q_PROPERTY(int behavior READ behavior WRITE setBehavior) public: - FractionWidget(QWidget* parent, const Pokemod::Fraction& value = Pokemod::Fraction(1, 1)); + explicit FractionWidget(QWidget* parent, const Pokemod::Fraction& value = Pokemod::Fraction(1, 1)); int behavior() const; Pokemod::Fraction value() const; diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp index b9ff47af..342173a7 100644 --- a/pokemodr/MoveUI.cpp +++ b/pokemodr/MoveUI.cpp @@ -57,6 +57,7 @@ void Pokemodr::MoveUI::setGui() varDescription->setText(qobject_cast<Pokemod::Move*>(modified())->description()); varBattleScript->setValue(qobject_cast<Pokemod::Move*>(modified())->battleScript()); varWorldScript->setValue(qobject_cast<Pokemod::Move*>(modified())->worldScript()); + boxWorldScript->setEnabled(qobject_cast<Pokemod::Move*>(modified())->overworld()); } void Pokemodr::MoveUI::apply() diff --git a/pokemodr/PointWidget.h b/pokemodr/PointWidget.h index 20cf9031..de7b5a7e 100644 --- a/pokemodr/PointWidget.h +++ b/pokemodr/PointWidget.h @@ -32,7 +32,7 @@ class PointWidget : public QWidget, private Ui::formPoint Q_OBJECT public: - PointWidget(QWidget* parent, const QPoint& value = QPoint(0, 0)); + explicit PointWidget(QWidget* parent, const QPoint& value = QPoint(0, 0)); QPoint value() const; signals: diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp index 9afbb834..a16a98dc 100644 --- a/pokemodr/PokemodUI.cpp +++ b/pokemodr/PokemodUI.cpp @@ -82,12 +82,6 @@ void Pokemodr::PokemodUI::setGui() } } varWarp->setCurrentIndex(varWarp->findData(qobject_cast<Pokemod::Pokemod*>(modified())->startWarp())); - varWalkSkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->walkSkin()); - varBikeSkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->bikeSkin()); - varFlySkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->flySkin()); - varSurfSkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->surfSkin()); - varFishSkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->fishSkin()); - varSurfFishSkin->setIcon(qobject_cast<Pokemod::Pokemod*>(original())->surfFishSkin()); } void Pokemodr::PokemodUI::apply() @@ -132,72 +126,6 @@ void Pokemodr::PokemodUI::on_varWarp_activated(const int warp) qobject_cast<Pokemod::Pokemod*>(modified())->setStartWarp(varWarp->itemData(warp).toInt()); } -void Pokemodr::PokemodUI::on_varWalkSkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setWalkSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - -void Pokemodr::PokemodUI::on_varBikeSkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setBikeSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - -void Pokemodr::PokemodUI::on_varFlySkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setFlySkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - -void Pokemodr::PokemodUI::on_varSurfSkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setSurfSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - -void Pokemodr::PokemodUI::on_varFishSkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setFishSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - -void Pokemodr::PokemodUI::on_varSurfFishSkin_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(192, 168)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - void Pokemodr::PokemodUI::on_varTypechart_clicked(const QModelIndex& index) { m_index = index; diff --git a/pokemodr/PokemodUI.h b/pokemodr/PokemodUI.h index e0921755..f8d12869 100644 --- a/pokemodr/PokemodUI.h +++ b/pokemodr/PokemodUI.h @@ -48,12 +48,6 @@ class PokemodUI : public ObjectUI, private Ui::formPokemod void on_varDescription_textChanged(const QString& description); void on_varMap_activated(const int map); void on_varWarp_activated(const int warp); - void on_varWalkSkin_pressed(); - void on_varBikeSkin_pressed(); - void on_varFlySkin_pressed(); - void on_varSurfSkin_pressed(); - void on_varFishSkin_pressed(); - void on_varSurfFishSkin_pressed(); void on_varTypechart_clicked(const QModelIndex& index); void on_varEffectiveness_valueChanged(const Pokemod::Fraction& multiplier); private slots: diff --git a/pokemodr/ScriptWidget.cpp b/pokemodr/ScriptWidget.cpp index 2097dd62..1e3ac794 100644 --- a/pokemodr/ScriptWidget.cpp +++ b/pokemodr/ScriptWidget.cpp @@ -38,7 +38,9 @@ Pokemodr::ScriptWidget::ScriptWidget(QWidget* parent, const Pokemod::Script& val languages["Ruby"] = "ruby"; languages["JavaScript"] = "kjs"; languages["Java"] = "java"; - languages["Falcon"] = "falcon"; + languages["Falcon"] = "falcon"; // No highlight rules yet + languages["PHP"] = "php"; + languages["C#"] = "mono"; QList<QString> langs = languages.keys(); foreach (QString language, langs) varInterpreter->addItem(language, languages[language]); @@ -57,10 +59,11 @@ Pokemodr::ScriptWidget::ScriptWidget(QWidget* parent, const Pokemod::Script& val m_view->action(KStandardAction::name(KStandardAction::Cut))->setShortcuts(QKeySequence::UnknownKey); m_view->action(KStandardAction::name(KStandardAction::Copy))->setShortcuts(QKeySequence::UnknownKey); m_view->action(KStandardAction::name(KStandardAction::PasteText))->setShortcuts(QKeySequence::UnknownKey); - // FIXME: this is so hacky and error prone...needs KDE4 trunk though + // FIXME: Needs KDE4 4.0.98 or higher (maybe less, but 98 should be enough) // QList<KActionCollection*> collections = KActionCollection::allCollections(); // foreach (KActionCollection* collection, collections) // { +// // FIXME: Nothing else should have a Preferences action right? // if (collection->action(KStandardAction::name(KStandardAction::Preferences))) // { // connect(collection->action(KStandardAction::name(KStandardAction::Cut)), SIGNAL(triggered()), m_view->action(KStandardAction::name(KStandardAction::Cut)), SIGNAL(triggered())); diff --git a/pokemodr/ScriptWidget.h b/pokemodr/ScriptWidget.h index 646c307a..30aaaf65 100644 --- a/pokemodr/ScriptWidget.h +++ b/pokemodr/ScriptWidget.h @@ -41,7 +41,7 @@ class ScriptWidget : public QWidget, private Ui::formScript Q_OBJECT public: - ScriptWidget(QWidget* parent, const Pokemod::Script& value = Pokemod::Script("", "")); + explicit ScriptWidget(QWidget* parent, const Pokemod::Script& value = Pokemod::Script("", "")); ~ScriptWidget(); Pokemod::Script value() const; diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp index a1e05cdf..e9264532 100644 --- a/pokemodr/SpeciesUI.cpp +++ b/pokemodr/SpeciesUI.cpp @@ -80,7 +80,6 @@ void Pokemodr::SpeciesUI::refreshGui() { boxEggSpecies->setEnabled(false); varEggSteps->setEnabled(false); - varNidoranGroup->setEnabled(false); boxEggGroups->setEnabled(false); } } @@ -110,8 +109,7 @@ void Pokemodr::SpeciesUI::setGui() varItemChance->setValue(qobject_cast<Pokemod::Species*>(modified())->itemChance()); varPokedexNumber->setValue(qobject_cast<Pokemod::Species*>(modified())->pokedexNumber()); varWeight->setValue(qobject_cast<Pokemod::Species*>(modified())->weight()); - varHeightFeet->setValue(qobject_cast<Pokemod::Species*>(modified())->heightFeet()); - varHeightInches->setValue(qobject_cast<Pokemod::Species*>(modified())->heightInches()); + varHeight->setValue(qobject_cast<Pokemod::Species*>(modified())->height()); varPokedexEntry->setText(qobject_cast<Pokemod::Species*>(modified())->pokedexEntry()); varMaleFront->setIcon(qobject_cast<Pokemod::Species*>(modified())->frontMaleSprite()); varMaleBack->setIcon(qobject_cast<Pokemod::Species*>(modified())->backMaleSprite()); @@ -120,13 +118,11 @@ void Pokemodr::SpeciesUI::setGui() varFemaleFront->setIcon(qobject_cast<Pokemod::Species*>(modified())->frontFemaleSprite()); varFemaleBack->setIcon(qobject_cast<Pokemod::Species*>(modified())->backFemaleSprite()); } - varList->setIcon(qobject_cast<Pokemod::Species*>(modified())->listSprite()); boxGenderChance->setChecked((qobject_cast<Pokemod::Species*>(modified())->genderFactor().denominator() < qobject_cast<Pokemod::Species*>(modified())->genderFactor().numerator()) ? Qt::Checked : Qt::Unchecked); varGenderChance->setValue(qobject_cast<Pokemod::Species*>(modified())->genderFactor()); varEggSpecies->setCurrentIndex(varEggSpecies->findData(qobject_cast<Pokemod::Species*>(modified())->eggSpecies())); varEggSteps->setValue(qobject_cast<Pokemod::Species*>(modified())->eggSteps()); varEvolution->setValue(qobject_cast<Pokemod::Species*>(modified())->evolution()); - varNidoranGroup->setValue(qobject_cast<Pokemod::Species*>(modified())->nidoranGroup()); for (int i = 0; i < varTypes->count(); ++i) { QListWidgetItem* widgetItem = varTypes->item(i); @@ -204,14 +200,9 @@ void Pokemodr::SpeciesUI::on_varWeight_valueChanged(const int weight) qobject_cast<Pokemod::Species*>(modified())->setWeight(weight); } -void Pokemodr::SpeciesUI::on_varHeightFeet_valueChanged(const int feet) +void Pokemodr::SpeciesUI::on_varHeight_valueChanged(const int height) { - qobject_cast<Pokemod::Species*>(modified())->setHeightFeet(feet); -} - -void Pokemodr::SpeciesUI::on_varHeightInches_valueChanged(const int inches) -{ - qobject_cast<Pokemod::Species*>(modified())->setHeightInches(inches); + qobject_cast<Pokemod::Species*>(modified())->setHeight(height); } void Pokemodr::SpeciesUI::on_varPokedexEntry_textChanged(const QString& pokedexEntry) @@ -263,17 +254,6 @@ void Pokemodr::SpeciesUI::on_varFemaleBack_pressed() delete dialog; } -void Pokemodr::SpeciesUI::on_varList_pressed() -{ - FileDialog* dialog = new FileDialog(QSize(128, 64)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::Species*>(modified())->setListSprite(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; -} - void Pokemodr::SpeciesUI::on_boxGenderChance_clicked(const bool genderChance) { qobject_cast<Pokemod::Species*>(modified())->setGenderFactor(Pokemod::Fraction((genderChance ? 1 : 2), 1)); @@ -299,11 +279,6 @@ void Pokemodr::SpeciesUI::on_varEvolution_valueChanged(const Pokemod::Script& ev qobject_cast<Pokemod::Species*>(modified())->setEvolution(evolution); } -void Pokemodr::SpeciesUI::on_varNidoranGroup_valueChanged(const int nidoranGroup) -{ - qobject_cast<Pokemod::Species*>(modified())->setNidoranGroup(nidoranGroup); -} - void Pokemodr::SpeciesUI::on_varTypes_itemClicked(QListWidgetItem* item) { qobject_cast<Pokemod::Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), item->isSelected()); diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h index 77546b3e..1669a5ed 100644 --- a/pokemodr/SpeciesUI.h +++ b/pokemodr/SpeciesUI.h @@ -53,20 +53,17 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void on_varItemChance_valueChanged(const Pokemod::Fraction& itemChance); void on_varPokedexNumber_valueChanged(const int pokedexNumber); void on_varWeight_valueChanged(const int weight); - void on_varHeightFeet_valueChanged(const int feet); - void on_varHeightInches_valueChanged(const int inches); + void on_varHeight_valueChanged(const int height); void on_varPokedexEntry_textChanged(const QString& pokedexEntry); void on_varMaleFront_pressed(); void on_varMaleBack_pressed(); void on_varFemaleFront_pressed(); void on_varFemaleBack_pressed(); - void on_varList_pressed(); void on_boxGenderChance_clicked(const bool genderUsed); void on_varGenderChance_valueChanged(const Pokemod::Fraction& genderChance); void on_varEggSpecies_activated(const int eggSpecies); void on_varEggSteps_valueChanged(const int eggSteps); void on_varEvolution_valueChanged(const Pokemod::Script& evolution); - void on_varNidoranGroup_valueChanged(const int nidoranGroup); void on_varTypes_itemClicked(QListWidgetItem* item); void on_varEggGroups_itemClicked(QListWidgetItem* item); private slots: diff --git a/pokemodr/SpriteUI.cpp b/pokemodr/SpriteUI.cpp index f4bd492c..9e45bb77 100644 --- a/pokemodr/SpriteUI.cpp +++ b/pokemodr/SpriteUI.cpp @@ -39,8 +39,10 @@ Pokemodr::SpriteUI::~SpriteUI() void Pokemodr::SpriteUI::setGui() { + const QPixmap sprite = qobject_cast<Pokemod::Sprite*>(modified())->sprite(); varName->setText(qobject_cast<Pokemod::Sprite*>(modified())->name()); - varSprite->setIcon(qobject_cast<Pokemod::Sprite*>(modified())->sprite()); + varSprite->setIcon(sprite); + varSprite->setMinimumSize(sprite.size()); } void Pokemodr::SpriteUI::apply() diff --git a/pokemodr/TODO b/pokemodr/TODO index 2ea13d3d..25806232 100644 --- a/pokemodr/TODO +++ b/pokemodr/TODO @@ -1,6 +1,3 @@ -Rules: - Screwed up widgets - Models: ContextMenu Fix up deleting diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui index 4cdf6e6e..d33e5025 100644 --- a/pokemodr/gui/ability.ui +++ b/pokemodr/gui/ability.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the ability</string> + </property> + <property name="statusTip" > + <string>Name of the ability</string> + </property> + <property name="whatsThis" > + <string>Name of the ability</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the ability</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,13 +32,18 @@ <property name="title" > <string>Priority</string> </property> + <property name="toolTip" > + <string>The priority of the ability (lower goes first)</string> + </property> + <property name="statusTip" > + <string>The priority of the ability (lower goes first)</string> + </property> + <property name="whatsThis" > + <string>The priority of the ability (lower goes first)</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KIntNumInput" name="varPriority" > - <property name="toolTip" > - <string>The priority of the ability (lower goes first)</string> - </property> - </widget> + <widget class="KIntNumInput" name="varPriority" /> </item> </layout> </widget> @@ -42,6 +53,15 @@ <property name="title" > <string>Description</string> </property> + <property name="toolTip" > + <string>A small description of the ability</string> + </property> + <property name="statusTip" > + <string>A small description of the ability</string> + </property> + <property name="whatsThis" > + <string>A small description of the ability</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varDescription" /> @@ -54,6 +74,15 @@ <property name="title" > <string>Battle Script</string> </property> + <property name="toolTip" > + <string>The script used for the ability in the battle</string> + </property> + <property name="statusTip" > + <string>The script used for the ability in the battle</string> + </property> + <property name="whatsThis" > + <string>The script used for the ability in the battle</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varBattleScript" /> @@ -66,6 +95,15 @@ <property name="title" > <string>World Script</string> </property> + <property name="toolTip" > + <string>The script used for the ability on the overworld</string> + </property> + <property name="statusTip" > + <string>The script used for the ability on the overworld</string> + </property> + <property name="whatsThis" > + <string>The script used for the ability on the overworld</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varWorldScript" /> diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui index 328f07be..43b5ece9 100644 --- a/pokemodr/gui/author.ui +++ b/pokemodr/gui/author.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of an author of the Pokémod</string> + </property> + <property name="statusTip" > + <string>Name of an author of the Pokémod</string> + </property> + <property name="whatsThis" > + <string>Name of an author of the Pokémod</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of an author of the PokéMod</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,12 +32,18 @@ <property name="title" > <string>Email</string> </property> + <property name="toolTip" > + <string>Email address of the author</string> + </property> + <property name="statusTip" > + <string>Email address of the author</string> + </property> + <property name="whatsThis" > + <string>Email address of the author</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varEmail" > - <property name="toolTip" > - <string>Email address of the author</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -45,12 +57,18 @@ <property name="title" > <string>Role</string> </property> + <property name="toolTip" > + <string>The role of the author</string> + </property> + <property name="statusTip" > + <string>The role of the author</string> + </property> + <property name="whatsThis" > + <string>The role of the author</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varRole" > - <property name="toolTip" > - <string>What the author did</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui index b4fd9954..74cc80df 100644 --- a/pokemodr/gui/badge.ui +++ b/pokemodr/gui/badge.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the badge</string> + </property> + <property name="statusTip" > + <string>The name of the badge</string> + </property> + <property name="whatsThis" > + <string>The name of the badge</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>The name of the badge</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,12 +32,18 @@ <property name="title" > <string>Obey Level</string> </property> + <property name="toolTip" > + <string>The maximum level team members can be and always obey the player</string> + </property> + <property name="statusTip" > + <string>The maximum level team members can be and always obey the player</string> + </property> + <property name="whatsThis" > + <string>The maximum level team members can be and always obey the player</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varObey" > - <property name="toolTip" > - <string>The maximum level where the player will always be obeyed</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -45,6 +57,15 @@ <property name="title" > <string>Images</string> </property> + <property name="toolTip" > + <string>Sprites that represent the badges</string> + </property> + <property name="statusTip" > + <string>Sprites that represent the badges</string> + </property> + <property name="whatsThis" > + <string>Sprites that represent the badges</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -67,6 +88,15 @@ <height>64</height> </size> </property> + <property name="toolTip" > + <string>The sprite used before the badge is obtained</string> + </property> + <property name="statusTip" > + <string>The sprite used before the badge is obtained</string> + </property> + <property name="whatsThis" > + <string>The sprite used before the badge is obtained</string> + </property> </widget> </item> <item> @@ -90,6 +120,15 @@ <height>64</height> </size> </property> + <property name="toolTip" > + <string>The sprite used after the badge is obtained</string> + </property> + <property name="statusTip" > + <string>The sprite used after the badge is obtained</string> + </property> + <property name="whatsThis" > + <string>The sprite used after the badge is obtained</string> + </property> </widget> </item> <item> @@ -113,11 +152,26 @@ <property name="title" > <string>Stat</string> </property> + <property name="toolTip" > + <string>Stat modifiers for local battles when the badge is obtained</string> + </property> + <property name="statusTip" > + <string>Stat modifiers for local battles when the badge is obtained</string> + </property> + <property name="whatsThis" > + <string>Stat modifiers for local battles when the badge is obtained</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KComboBox" name="varStat" > <property name="toolTip" > - <string>The stat the badge boosts</string> + <string>Stat multiplier shown</string> + </property> + <property name="statusTip" > + <string>Stat multiplier shown</string> + </property> + <property name="whatsThis" > + <string>Stat multiplier shown</string> </property> </widget> </item> @@ -126,12 +180,18 @@ <property name="title" > <string>Multiplier</string> </property> + <property name="toolTip" > + <string>The multiplier for the stat</string> + </property> + <property name="statusTip" > + <string>The multiplier for the stat</string> + </property> + <property name="whatsThis" > + <string>The multiplier for the stat</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varStatMultiplier" > - <property name="toolTip" > - <string>The multiplier to the stat in-game battles</string> - </property> <property name="behavior" > <number>1</number> </property> diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui index 57dea334..682ee4e4 100644 --- a/pokemodr/gui/coinlist.ui +++ b/pokemodr/gui/coinlist.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the coin list (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the coin list (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the coin list (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the coin list</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script used to control how the coin list is handled</string> + </property> + <property name="statusTip" > + <string>The script used to control how the coin list is handled</string> + </property> + <property name="whatsThis" > + <string>The script used to control how the coin list is handled</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui index f7c6570d..d76d0748 100644 --- a/pokemodr/gui/coinlistobject.ui +++ b/pokemodr/gui/coinlistobject.ui @@ -7,29 +7,39 @@ <property name="title" > <string>Type</string> </property> + <property name="toolTip" > + <string>The type of object</string> + </property> + <property name="statusTip" > + <string>The type of object</string> + </property> + <property name="whatsThis" > + <string>The type of object</string> + </property> <layout class="QVBoxLayout" > <item> - <widget class="KComboBox" name="varType" > - <property name="toolTip" > - <string>Type of object</string> - </property> - </widget> + <widget class="KComboBox" name="varType" /> </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="boxObject" > + <property name="title" > + <string>Object</string> + </property> + <property name="toolTip" > + <string>The object to be sold</string> + </property> + <property name="statusTip" > + <string>The object to be sold</string> + </property> + <property name="whatsThis" > + <string>The object to be sold</string> + </property> + <layout class="QHBoxLayout" > <item> - <widget class="QGroupBox" name="boxObject" > - <property name="title" > - <string>Object</string> - </property> - <layout class="QHBoxLayout" > - <item> - <widget class="KComboBox" name="varObject" > - <property name="toolTip" > - <string>Object to be sold</string> - </property> - </widget> - </item> - </layout> - </widget> + <widget class="KComboBox" name="varObject" /> </item> </layout> </widget> @@ -39,12 +49,18 @@ <property name="title" > <string>Amount</string> </property> + <property name="toolTip" > + <string>How many of the object are sold at one time</string> + </property> + <property name="statusTip" > + <string>How many of the object are sold at one time</string> + </property> + <property name="whatsThis" > + <string>How many of the object are sold at one time</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varAmount" > - <property name="toolTip" > - <string>How many are sold</string> - </property> <property name="minimum" > <number>1</number> </property> @@ -58,12 +74,18 @@ <property name="title" > <string>Cost</string> </property> + <property name="toolTip" > + <string>How much the object[s] cost</string> + </property> + <property name="statusTip" > + <string>How much the object[s] cost</string> + </property> + <property name="whatsThis" > + <string>How much the object[s] cost</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varCost" > - <property name="toolTip" > - <string>How much the object(s) cost</string> - </property> <property name="minimum" > <number>0</number> </property> diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui index 42a66df2..90932826 100644 --- a/pokemodr/gui/egggroup.ui +++ b/pokemodr/gui/egggroup.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the egg group (internal use only)</string> + </property> + <property name="statusTip" > + <string>The name of the egg group (internal use only)</string> + </property> + <property name="whatsThis" > + <string>The name of the egg group (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the egg group</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> diff --git a/pokemodr/gui/fraction.ui b/pokemodr/gui/fraction.ui index 32b660c9..f0b70c2b 100644 --- a/pokemodr/gui/fraction.ui +++ b/pokemodr/gui/fraction.ui @@ -3,19 +3,21 @@ <widget class="QWidget" name="formFraction" > <layout class="QVBoxLayout" > <item> - <widget class="KLineEdit" name="varValue" > - <property name="readOnly" > - <bool>true</bool> - </property> - </widget> - </item> - <item> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varNumerator" > <property name="label" > <string>Numerator</string> </property> + <property name="toolTip" > + <string>Numerator of the fraction</string> + </property> + <property name="statusTip" > + <string>Numerator of the fraction</string> + </property> + <property name="whatsThis" > + <string>Numerator of the fraction</string> + </property> <property name="minimum" > <number>0</number> </property> @@ -26,6 +28,15 @@ <property name="label" > <string>Denominator</string> </property> + <property name="toolTip" > + <string>Denominator of the fraction</string> + </property> + <property name="statusTip" > + <string>Denominator of the fraction</string> + </property> + <property name="whatsThis" > + <string>Denominator of the fraction</string> + </property> <property name="minimum" > <number>1</number> </property> @@ -33,6 +44,22 @@ </item> </layout> </item> + <item> + <widget class="KLineEdit" name="varValue" > + <property name="readOnly" > + <bool>true</bool> + </property> + <property name="toolTip" > + <string>Decimal value of the fraction</string> + </property> + <property name="statusTip" > + <string>Decimal value of the fraction</string> + </property> + <property name="whatsThis" > + <string>Decimal value of the fraction</string> + </property> + </widget> + </item> </layout> </widget> <customwidgets> diff --git a/pokemodr/gui/globalscript.ui b/pokemodr/gui/globalscript.ui index e48a53f6..786ac97c 100644 --- a/pokemodr/gui/globalscript.ui +++ b/pokemodr/gui/globalscript.ui @@ -7,6 +7,15 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the script (internal use only)</string> + </property> + <property name="statusTip" > + <string>The name of the script (internal use only)</string> + </property> + <property name="whatsThis" > + <string>The name of the script (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > @@ -23,6 +32,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script</string> + </property> + <property name="statusTip" > + <string>The script</string> + </property> + <property name="whatsThis" > + <string>The script</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui index 5fd23d3e..fecea1a2 100644 --- a/pokemodr/gui/item.ui +++ b/pokemodr/gui/item.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the item</string> + </property> + <property name="statusTip" > + <string>The name of the item</string> + </property> + <property name="whatsThis" > + <string>The name of the item</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the item</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -23,11 +29,17 @@ </item> <item> <widget class="QGroupBox" name="boxSellable" > + <property name="title" > + <string>Sellable</string> + </property> <property name="toolTip" > <string>Whether the item is sellable at a store or not</string> </property> - <property name="title" > - <string>Sellable</string> + <property name="statusTip" > + <string>Whether the item is sellable at a store or not</string> + </property> + <property name="whatsThis" > + <string>Whether the item is sellable at a store or not</string> </property> <property name="checkable" > <bool>true</bool> @@ -39,13 +51,18 @@ <property name="title" > <string>Type</string> </property> + <property name="toolTip" > + <string>Type of the item</string> + </property> + <property name="toolTip" > + <string>Type of the item</string> + </property> + <property name="toolTip" > + <string>Type of the item</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varType" > - <property name="toolTip" > - <string>Type of item</string> - </property> - </widget> + <widget class="KComboBox" name="varType" /> </item> </layout> </widget> @@ -55,12 +72,18 @@ <property name="title" > <string>Price</string> </property> + <property name="toolTip" > + <string>Price of the item at a store (resell value is 50%)</string> + </property> + <property name="statusTip" > + <string>Price of the item at a store (resell value is 50%)</string> + </property> + <property name="whatsThis" > + <string>Price of the item at a store (resell value is 50%)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varPrice" > - <property name="toolTip" > - <string>Price of the item at the store (resell value is 50%; 25% for "Hard Cash" mode)</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -74,11 +97,20 @@ <property name="title" > <string>Description</string> </property> + <property name="toolTip" > + <string>Description of the item</string> + </property> + <property name="statusTip" > + <string>Description of the item</string> + </property> + <property name="whatsThis" > + <string>Description of the item</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varDescription" > - <property name="toolTip" > - <string>Description of the item</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -90,6 +122,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script that determines how the item works</string> + </property> + <property name="statusTip" > + <string>The script that determines how the item works</string> + </property> + <property name="whatsThis" > + <string>The script that determines how the item works</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui index b8413a23..db8e78f4 100644 --- a/pokemodr/gui/itemtype.ui +++ b/pokemodr/gui/itemtype.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the item type (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the item type (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the item type (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the item type</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,12 +32,18 @@ <property name="title" > <string>Computer</string> </property> + <property name="toolTip" > + <string>How many of the items can be stored on the computer system</string> + </property> + <property name="statusTip" > + <string>How many of the items can be stored on the computer system</string> + </property> + <property name="whatsThis" > + <string>How many of the items can be stored on the computer system</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varComputer" > - <property name="toolTip" > - <string>How many of the items can be stored on the computer system</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -45,12 +57,18 @@ <property name="title" > <string>Player</string> </property> + <property name="toolTip" > + <string>How many of the type of item the player can carry</string> + </property> + <property name="statusTip" > + <string>How many of the type of item the player can carry</string> + </property> + <property name="whatsThis" > + <string>How many of the type of item the player can carry</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varPlayer" > - <property name="toolTip" > - <string>How many of the item the player can carry</string> - </property> <property name="minimum" > <number>1</number> </property> @@ -64,13 +82,18 @@ <property name="title" > <string>Count</string> </property> + <property name="toolTip" > + <string>The way the items count towards the storage limit</string> + </property> + <property name="statusTip" > + <string>The way the items count towards the storage limit</string> + </property> + <property name="whatsThis" > + <string>The way the items count towards the storage limit</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varCount" > - <property name="toolTip" > - <string>The way the items count towards the storage limit</string> - </property> - </widget> + <widget class="KComboBox" name="varCount" /> </item> </layout> </widget> diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui index d125e1ea..4fe79161 100644 --- a/pokemodr/gui/map.ui +++ b/pokemodr/gui/map.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the map (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the map (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the map (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the map</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -32,12 +38,18 @@ <property name="checked" > <bool>false</bool> </property> + <property name="toolTip" > + <string>The destination when flown to the map</string> + </property> + <property name="statusTip" > + <string>The destination when flown to the map</string> + </property> + <property name="whatsThis" > + <string>The destination when flown to the map</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KComboBox" name="varFlyWarp" > - <property name="toolTip" > - <string>The destination when flown to the map</string> - </property> </widget> </item> </layout> @@ -48,13 +60,18 @@ <property name="title" > <string>Type</string> </property> + <property name="toolTip" > + <string>They type of map</string> + </property> + <property name="statusTip" > + <string>They type of map</string> + </property> + <property name="whatsThis" > + <string>They type of map</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varType" > - <property name="toolTip" > - <string>They type of map</string> - </property> - </widget> + <widget class="KComboBox" name="varType" /> </item> </layout> </widget> @@ -73,19 +90,47 @@ <layout class="QGridLayout" > <item rowspan="7" row="0" column="0" > <widget class="QTableView" name="varTilemap" > + <property name="toolTip" > + <string>The tilemap of the map</string> + </property> + <property name="statusTip" > + <string>The tilemap of the map</string> + </property> + <property name="whatsThis" > + <string>The tilemap of the map</string> + </property> <property name="selectionMode" > <enum>QAbstractItemView::SingleSelection</enum> </property> </widget> </item> <item row="6" column="1" > - <widget class="KComboBox" name="varTile" /> + <widget class="KComboBox" name="varTile" > + <property name="toolTip" > + <string>The tile for the current position</string> + </property> + <property name="statusTip" > + <string>The tile for the current position</string> + </property> + <property name="whatsThis" > + <string>The tile for the current position</string> + </property> + </widget> </item> <item row="5" column="1" > <widget class="KPushButton" name="buttonDeleteColumn" > <property name="text" > <string>Delete Column</string> </property> + <property name="toolTip" > + <string>Delete the current column</string> + </property> + <property name="statusTip" > + <string>Delete the current column</string> + </property> + <property name="whatsThis" > + <string>Delete the current column</string> + </property> </widget> </item> <item row="4" column="1" > @@ -93,6 +138,15 @@ <property name="text" > <string>Insert Column</string> </property> + <property name="toolTip" > + <string>Insert a new column at the current position</string> + </property> + <property name="statusTip" > + <string>Insert a new column at the current position</string> + </property> + <property name="whatsThis" > + <string>Insert a new column at the current position</string> + </property> </widget> </item> <item row="3" column="1" > @@ -100,6 +154,15 @@ <property name="text" > <string>Add Column</string> </property> + <property name="toolTip" > + <string>Add a new column</string> + </property> + <property name="statusTip" > + <string>Add a new column</string> + </property> + <property name="whatsThis" > + <string>Add a new column</string> + </property> </widget> </item> <item row="2" column="1" > @@ -107,6 +170,15 @@ <property name="text" > <string>Delete Row</string> </property> + <property name="toolTip" > + <string>Delete the current row</string> + </property> + <property name="statusTip" > + <string>Delete the current row</string> + </property> + <property name="whatsThis" > + <string>Delete the current row</string> + </property> </widget> </item> <item row="1" column="1" > @@ -114,6 +186,15 @@ <property name="text" > <string>Insert Row</string> </property> + <property name="toolTip" > + <string>Insert a new row at the current position</string> + </property> + <property name="statusTip" > + <string>Insert a new row at the current position</string> + </property> + <property name="whatsThis" > + <string>Insert a new row at the current position</string> + </property> </widget> </item> <item row="0" column="1" > @@ -121,6 +202,15 @@ <property name="text" > <string>Add Row</string> </property> + <property name="toolTip" > + <string>Add a new row</string> + </property> + <property name="statusTip" > + <string>Add a new row</string> + </property> + <property name="whatsThis" > + <string>Add a new row</string> + </property> </widget> </item> </layout> diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui index 3bf8ec50..be4e29fc 100644 --- a/pokemodr/gui/mapeffect.ui +++ b/pokemodr/gui/mapeffect.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the effect</string> + </property> + <property name="statusTip" > + <string>Name of the effect</string> + </property> + <property name="whatsThis" > + <string>Name of the effect</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the effect</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,16 +32,18 @@ <property name="title" > <string>Coordinate</string> </property> - <property name="flat" > - <bool>false</bool> + <property name="toolTip" > + <string>The coordinate of the effect</string> + </property> + <property name="statusTip" > + <string>The coordinate of the effect</string> + </property> + <property name="whatsThis" > + <string>The coordinate of the effect</string> </property> <layout class="QVBoxLayout" > <item> - <widget class="Pokemodr::PointWidget" name="varCoordinate" > - <property name="toolTip" > - <string>The coordinate of the effect</string> - </property> - </widget> + <widget class="Pokemodr::PointWidget" name="varCoordinate" /> </item> </layout> </widget> @@ -45,6 +53,15 @@ <property name="title" > <string>Skin</string> </property> + <property name="toolTip" > + <string>Skin of the effect</string> + </property> + <property name="statusTip" > + <string>Skin of the effect</string> + </property> + <property name="whatsThis" > + <string>Skin of the effect</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -67,9 +84,6 @@ <height>128</height> </size> </property> - <property name="toolTip" > - <string>Skin of the effect</string> - </property> </widget> </item> <item> @@ -99,6 +113,15 @@ <property name="checked" > <bool>false</bool> </property> + <property name="toolTip" > + <string>If checked, the effect does not block movement</string> + </property> + <property name="statusTip" > + <string>If checked, the effect does not block movement</string> + </property> + <property name="whatsThis" > + <string>If checked, the effect does not block movement</string> + </property> <layout class="QVBoxLayout" /> </widget> </item> @@ -107,6 +130,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script for the effect</string> + </property> + <property name="statusTip" > + <string>The script for the effect</string> + </property> + <property name="whatsThis" > + <string>The script for the effect</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui index 5c551ec9..e29d461f 100644 --- a/pokemodr/gui/maptrainer.ui +++ b/pokemodr/gui/maptrainer.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the trainer</string> + </property> + <property name="statusTip" > + <string>Name of the trainer</string> + </property> + <property name="whatsThis" > + <string>Name of the trainer</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the trainer</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,13 +32,18 @@ <property name="title" > <string>Trainer Class</string> </property> + <property name="toolTip" > + <string>The base class of the trainer</string> + </property> + <property name="statusTip" > + <string>The base class of the trainer</string> + </property> + <property name="whatsThis" > + <string>The base class of the trainer</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varTrainerClass" > - <property name="toolTip" > - <string>The base class of the trainer</string> - </property> - </widget> + <widget class="KComboBox" name="varTrainerClass" /> </item> </layout> </widget> @@ -42,6 +53,15 @@ <property name="title" > <string>Coordinate</string> </property> + <property name="toolTip" > + <string>The coordinate of the trainer</string> + </property> + <property name="statusTip" > + <string>The coordinate of the trainer</string> + </property> + <property name="whatsThis" > + <string>The coordinate of the trainer</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::PointWidget" name="varCoordinate" /> @@ -54,12 +74,18 @@ <property name="title" > <string>Number Fight</string> </property> + <property name="toolTip" > + <string>How many team members from each side fight at a time</string> + </property> + <property name="statusTip" > + <string>How many team members from each side fight at a time</string> + </property> + <property name="whatsThis" > + <string>How many team members from each side fight at a time</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varNumberFight" > - <property name="toolTip" > - <string>How many team members from each side fight at a time</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -73,6 +99,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script for the trainer</string> + </property> + <property name="statusTip" > + <string>The script for the trainer</string> + </property> + <property name="whatsThis" > + <string>The script for the trainer</string> + </property> <layout class="QHBoxLayout" name="horizontalLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> @@ -85,13 +120,18 @@ <property name="title" > <string>Lead Team Member</string> </property> + <property name="toolTip" > + <string>The lead team member</string> + </property> + <property name="statusTip" > + <string>The lead team member</string> + </property> + <property name="whatsThis" > + <string>The lead team member</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varLeadTeamMember" > - <property name="toolTip" > - <string>The lead team member</string> - </property> - </widget> + <widget class="KComboBox" name="varLeadTeamMember" /> </item> </layout> </widget> diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui index 1191e86f..2cbc9ac1 100644 --- a/pokemodr/gui/maptrainerteammember.ui +++ b/pokemodr/gui/maptrainerteammember.ui @@ -7,13 +7,18 @@ <property name="title" > <string>Species</string> </property> + <property name="toolTip" > + <string>Species of the team member</string> + </property> + <property name="statusTip" > + <string>Species of the team member</string> + </property> + <property name="whatsThis" > + <string>Species of the team member</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varSpecies" > - <property name="toolTip" > - <string>Species of the team member</string> - </property> - </widget> + <widget class="KComboBox" name="varSpecies" /> </item> </layout> </widget> @@ -23,12 +28,18 @@ <property name="title" > <string>Level</string> </property> + <property name="toolTip" > + <string>Level of the team member</string> + </property> + <property name="statusTip" > + <string>Level of the team member</string> + </property> + <property name="whatsThis" > + <string>Level of the team member</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varLevel" > - <property name="toolTip" > - <string>Level</string> - </property> <property name="minimum" > <number>1</number> </property> @@ -42,12 +53,18 @@ <property name="title" > <string>Abilities</string> </property> + <property name="toolTip" > + <string>Abilities the team member has</string> + </property> + <property name="statusTip" > + <string>Abilities the team member has</string> + </property> + <property name="whatsThis" > + <string>Abilities the team member has</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varAbilities" > - <property name="toolTip" > - <string>Abilities</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -61,12 +78,18 @@ <property name="title" > <string>Items</string> </property> + <property name="toolTip" > + <string>Items the team member is holding</string> + </property> + <property name="statusTip" > + <string>Items the team member is holding</string> + </property> + <property name="whatsThis" > + <string>Items the team member is holding</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varItems" > - <property name="toolTip" > - <string>Items held</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -80,12 +103,18 @@ <property name="title" > <string>Moves</string> </property> + <property name="toolTip" > + <string>Moves the team member has</string> + </property> + <property name="statusTip" > + <string>Moves the team member has</string> + </property> + <property name="whatsThis" > + <string>Moves the team member has</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varMoves" > - <property name="toolTip" > - <string>Moves held</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -99,12 +128,18 @@ <property name="title" > <string>Natures</string> </property> + <property name="toolTip" > + <string>Natures the team member has</string> + </property> + <property name="statusTip" > + <string>Natures the team member has</string> + </property> + <property name="whatsThis" > + <string>Natures the team member has</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varNatures" > - <property name="toolTip" > - <string>Natures</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui index d1f01cd9..ced51a92 100644 --- a/pokemodr/gui/mapwarp.ui +++ b/pokemodr/gui/mapwarp.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the warp (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the warp (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the warp (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the warp</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,13 +32,18 @@ <property name="title" > <string>Coordinate</string> </property> + <property name="toolTip" > + <string>The coordinate of the warp</string> + </property> + <property name="statusTip" > + <string>The coordinate of the warp</string> + </property> + <property name="whatsThis" > + <string>The coordinate of the warp</string> + </property> <layout class="QVBoxLayout" > <item> - <widget class="Pokemodr::PointWidget" name="varCoordinate" > - <property name="toolTip" > - <string>The coordinate of the warp</string> - </property> - </widget> + <widget class="Pokemodr::PointWidget" name="varCoordinate" /> </item> </layout> </widget> @@ -42,13 +53,18 @@ <property name="title" > <string>Type</string> </property> + <property name="toolTip" > + <string>The type of warp</string> + </property> + <property name="statusTip" > + <string>The type of warp</string> + </property> + <property name="whatsThis" > + <string>The type of warp</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varType" > - <property name="toolTip" > - <string>The type of warp</string> - </property> - </widget> + <widget class="KComboBox" name="varType" /> </item> </layout> </widget> @@ -58,12 +74,27 @@ <property name="title" > <string>Destination Map</string> </property> + <property name="toolTip" > + <string>The destination for the warp</string> + </property> + <property name="statusTip" > + <string>The destination for the warp</string> + </property> + <property name="whatsThis" > + <string>The destination for the warp</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KComboBox" name="varToMap" > <property name="toolTip" > <string>Map the warp goes to</string> </property> + <property name="statusTip" > + <string>Map the warp goes to</string> + </property> + <property name="whatsThis" > + <string>Map the warp goes to</string> + </property> </widget> </item> <item> @@ -77,6 +108,12 @@ <property name="toolTip" > <string>Warp on the map the warp goes to</string> </property> + <property name="statusTip" > + <string>Warp on the map the warp goes to</string> + </property> + <property name="whatsThis" > + <string>Warp on the map the warp goes to</string> + </property> </widget> </item> </layout> @@ -90,6 +127,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script that is executed when the warp is activated</string> + </property> + <property name="statusTip" > + <string>The script that is executed when the warp is activated</string> + </property> + <property name="whatsThis" > + <string>The script that is executed when the warp is activated</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui index c14c85f3..0d0e4ab7 100644 --- a/pokemodr/gui/mapwildlist.ui +++ b/pokemodr/gui/mapwildlist.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the list (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the list (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the list (internal use only)</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the list</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui index e329b892..2859f206 100644 --- a/pokemodr/gui/mapwildlistencounter.ui +++ b/pokemodr/gui/mapwildlistencounter.ui @@ -7,13 +7,18 @@ <property name="title" > <string>Species</string> </property> + <property name="toolTip" > + <string>Species of the encounter</string> + </property> + <property name="statusTip" > + <string>Species of the encounter</string> + </property> + <property name="whatsThis" > + <string>Species of the encounter</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varSpecies" > - <property name="toolTip" > - <string>Species of the encounter</string> - </property> - </widget> + <widget class="KComboBox" name="varSpecies" /> </item> </layout> </widget> @@ -23,12 +28,18 @@ <property name="title" > <string>Level</string> </property> + <property name="toolTip" > + <string>Level of the encounter</string> + </property> + <property name="statusTip" > + <string>Level of the encounter</string> + </property> + <property name="whatsThis" > + <string>Level of the encounter</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varLevel" > - <property name="toolTip" > - <string>Level of the encounter</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -42,12 +53,18 @@ <property name="title" > <string>Weight</string> </property> + <property name="toolTip" > + <string>Weighting</string> + </property> + <property name="statusTip" > + <string>Weighting</string> + </property> + <property name="whatsThis" > + <string>Weighting</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varWeight" > - <property name="toolTip" > - <string>Weighting</string> - </property> <property name="minimum" > <number>1</number> </property> diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui index c79f2963..7a7ee446 100644 --- a/pokemodr/gui/move.ui +++ b/pokemodr/gui/move.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the move</string> + </property> + <property name="statusTip" > + <string>Name of the move</string> + </property> + <property name="whatsThis" > + <string>Name of the move</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the move</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,13 +32,18 @@ <property name="title" > <string>Priority</string> </property> + <property name="toolTip" > + <string>The priority of the move (lower goes first)</string> + </property> + <property name="statusTip" > + <string>The priority of the move (lower goes first)</string> + </property> + <property name="whatsThis" > + <string>The priority of the move (lower goes first)</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KIntNumInput" name="varPriority" > - <property name="toolTip" > - <string>The priority of the move (lower goes first)</string> - </property> - </widget> + <widget class="KIntNumInput" name="varPriority" /> </item> </layout> </widget> @@ -42,12 +53,18 @@ <property name="title" > <string>Accuracy</string> </property> + <property name="toolTip" > + <string>The chance that the move hits</string> + </property> + <property name="statusTip" > + <string>The chance that the move hits</string> + </property> + <property name="whatsThis" > + <string>The chance that the move hits</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varAccuracy" > - <property name="toolTip" > - <string>The chance that the move hits</string> - </property> <property name="behavior" > <number>-1</number> </property> @@ -61,12 +78,18 @@ <property name="title" > <string>Power</string> </property> + <property name="toolTip" > + <string>The power of the move</string> + </property> + <property name="statusTip" > + <string>The power of the move</string> + </property> + <property name="whatsThis" > + <string>The power of the move</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varPower" > - <property name="toolTip" > - <string>The power of the move</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -80,13 +103,18 @@ <property name="title" > <string>Type</string> </property> + <property name="toolTip" > + <string>The type of the move</string> + </property> + <property name="statusTip" > + <string>The type of the move</string> + </property> + <property name="whatsThis" > + <string>The type of the move</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varType" > - <property name="toolTip" > - <string>The type of the move</string> - </property> - </widget> + <widget class="KComboBox" name="varType" /> </item> </layout> </widget> @@ -96,12 +124,18 @@ <property name="title" > <string>Power Points</string> </property> + <property name="toolTip" > + <string>How many power points the move has</string> + </property> + <property name="statusTip" > + <string>How many power points the move has</string> + </property> + <property name="whatsThis" > + <string>How many power points the move has</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varPowerPoints" > - <property name="toolTip" > - <string>How many power points the move has</string> - </property> <property name="minimum" > <number>1</number> </property> @@ -115,6 +149,15 @@ <property name="title" > <string>Special</string> </property> + <property name="toolTip" > + <string>Whether the move uses special stats</string> + </property> + <property name="statusTip" > + <string>Whether the move uses special stats</string> + </property> + <property name="whatsThis" > + <string>Whether the move uses special stats</string> + </property> <property name="checkable" > <bool>true</bool> </property> @@ -128,6 +171,15 @@ <property name="title" > <string>Overworld</string> </property> + <property name="toolTip" > + <string>Whether the move can be used out of battle or not</string> + </property> + <property name="statusTip" > + <string>Whether the move can be used out of battle or not</string> + </property> + <property name="whatsThis" > + <string>Whether the move can be used out of battle or not</string> + </property> <property name="checkable" > <bool>true</bool> </property> @@ -141,11 +193,20 @@ <property name="title" > <string>Description</string> </property> + <property name="toolTip" > + <string>Description of the move</string> + </property> + <property name="statusTip" > + <string>Description of the move</string> + </property> + <property name="whatsThis" > + <string>Description of the move</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varDescription" > - <property name="toolTip" > - <string>Description of the move</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -157,6 +218,15 @@ <property name="title" > <string>Battle Script</string> </property> + <property name="toolTip" > + <string>Script that controls the move when used in battle</string> + </property> + <property name="statusTip" > + <string>Script that controls the move when used in battle</string> + </property> + <property name="whatsThis" > + <string>Script that controls the move when used in battle</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varBattleScript" /> @@ -169,6 +239,15 @@ <property name="title" > <string>WorldScript</string> </property> + <property name="toolTip" > + <string>The script that controls the move when used in the overworld</string> + </property> + <property name="toolTip" > + <string>The script that controls the move when used in the overworld</string> + </property> + <property name="toolTip" > + <string>The script that controls the move when used in the overworld</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varWorldScript" /> diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui index 6db1231e..43e6f25b 100644 --- a/pokemodr/gui/nature.ui +++ b/pokemodr/gui/nature.ui @@ -7,11 +7,20 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the nature</string> + </property> + <property name="statusTip" > + <string>Name of the nature</string> + </property> + <property name="whatsThis" > + <string>Name of the nature</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the nature</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -23,12 +32,27 @@ <property name="title" > <string>Stat</string> </property> + <property name="toolTip" > + <string>The multipliers for the stats with the nature</string> + </property> + <property name="statusTip" > + <string>The multipliers for the stats with the nature</string> + </property> + <property name="whatsThis" > + <string>The multipliers for the stats with the nature</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KComboBox" name="varStat" > <property name="toolTip" > <string>Stat the nature affects</string> </property> + <property name="statusTip" > + <string>Stat the nature affects</string> + </property> + <property name="whatsThis" > + <string>Stat the nature affects</string> + </property> </widget> </item> <item> @@ -36,12 +60,18 @@ <property name="title" > <string>Multiplier</string> </property> + <property name="toolTip" > + <string>The multiplier of the stat</string> + </property> + <property name="statusTip" > + <string>The multiplier of the stat</string> + </property> + <property name="whatsThis" > + <string>The multiplier of the stat</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varStatMultiplier" > - <property name="toolTip" > - <string>The multiplier of the stat</string> - </property> <property name="behavior" > <number>1</number> </property> @@ -58,12 +88,18 @@ <property name="title" > <string>Weight</string> </property> + <property name="toolTip" > + <string>Weighting for the nature</string> + </property> + <property name="statusTip" > + <string>Weighting for the nature</string> + </property> + <property name="whatsThis" > + <string>Weighting for the nature</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varWeight" > - <property name="toolTip" > - <string>Weighting</string> - </property> <property name="minimum" > <number>1</number> </property> diff --git a/pokemodr/gui/point.ui b/pokemodr/gui/point.ui index a52bf955..2337800f 100644 --- a/pokemodr/gui/point.ui +++ b/pokemodr/gui/point.ui @@ -7,6 +7,15 @@ <property name="label" > <string>x</string> </property> + <property name="toolTip" > + <string>The x coordinate of the point</string> + </property> + <property name="statusTip" > + <string>The x coordinate of the point</string> + </property> + <property name="whatsThis" > + <string>The x coordinate of the point</string> + </property> <property name="minimum" > <number>0</number> </property> @@ -17,6 +26,15 @@ <property name="label" > <string>y</string> </property> + <property name="toolTip" > + <string>The y coordinate of the point</string> + </property> + <property name="statusTip" > + <string>The y coordinate of the point</string> + </property> + <property name="whatsThis" > + <string>The y coordinate of the point</string> + </property> <property name="minimum" > <number>0</number> </property> diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui index e104b23c..5cc04245 100644 --- a/pokemodr/gui/pokemod.ui +++ b/pokemodr/gui/pokemod.ui @@ -14,12 +14,18 @@ <property name="title" > <string>Title</string> </property> + <property name="toolTip" > + <string>The title of the Pokémod</string> + </property> + <property name="statusTip" > + <string>The title of the Pokémod</string> + </property> + <property name="whatsThis" > + <string>The title of the Pokémod</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varTitle" > - <property name="toolTip" > - <string>The title of the PokéMod</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -33,12 +39,18 @@ <property name="title" > <string>Version</string> </property> + <property name="toolTip" > + <string>Pokémod version</string> + </property> + <property name="statusTip" > + <string>Pokémod version</string> + </property> + <property name="whatsThis" > + <string>Pokémod version</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varVersion" > - <property name="toolTip" > - <string>PokéMod version</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -52,11 +64,20 @@ <property name="title" > <string>Description</string> </property> + <property name="toolTip" > + <string>Description of the Pokémod</string> + </property> + <property name="statusTip" > + <string>Description of the Pokémod</string> + </property> + <property name="whatsThis" > + <string>Description of the Pokémod</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varDescription" > - <property name="toolTip" > - <string>Description of the PokéMod</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -66,7 +87,16 @@ <item> <widget class="QGroupBox" name="boxStartPosition" > <property name="title" > - <string>Start Map</string> + <string>Start Position</string> + </property> + <property name="toolTip" > + <string>Where the player starts the game</string> + </property> + <property name="statusTip" > + <string>Where the player starts the game</string> + </property> + <property name="whatsThis" > + <string>Where the player starts the game</string> </property> <layout class="QVBoxLayout" > <item> @@ -74,6 +104,12 @@ <property name="toolTip" > <string>Map the player starts on</string> </property> + <property name="statusTip" > + <string>Map the player starts on</string> + </property> + <property name="whatsThis" > + <string>Map the player starts on</string> + </property> </widget> </item> <item> @@ -87,6 +123,12 @@ <property name="toolTip" > <string>Warp the player starts on</string> </property> + <property name="statusTip" > + <string>Warp the player starts on</string> + </property> + <property name="whatsThis" > + <string>Warp the player starts on</string> + </property> </widget> </item> </layout> @@ -110,296 +152,6 @@ </item> </layout> </widget> - <widget class="QWidget" name="tabSkins" > - <attribute name="title" > - <string>Skins</string> - </attribute> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QGroupBox" name="boxWalkingSkin" > - <property name="title" > - <string>Walking</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varWalkSkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="0" column="1" > - <widget class="QGroupBox" name="boxBikingSkin" > - <property name="title" > - <string>Biking</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varBikeSkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="boxFlyingSkin" > - <property name="title" > - <string>Flying</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varFlySkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="1" column="1" > - <widget class="QGroupBox" name="boxSurfingSkin" > - <property name="title" > - <string>Surfing</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varSurfSkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="boxFishingSkin" > - <property name="title" > - <string>Fishing</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varFishSkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="2" column="1" > - <widget class="QGroupBox" name="boxSurfFishingSkin" > - <property name="title" > - <string>Surf Fishing</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varSurfFishSkin" > - <property name="minimumSize" > - <size> - <width>192</width> - <height>128</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item row="3" column="0" colspan="2" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>0</width> - <height>1</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> <widget class="QWidget" name="tabTypechart" > <attribute name="title" > <string>Typechart</string> @@ -413,6 +165,15 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="toolTip" > + <string>Grid used for determining type effectiveness</string> + </property> + <property name="statusTip" > + <string>Grid used for determining type effectiveness</string> + </property> + <property name="whatsThis" > + <string>Grid used for determining type effectiveness</string> + </property> <property name="selectionMode" > <enum>QAbstractItemView::SingleSelection</enum> </property> @@ -426,6 +187,12 @@ <property name="toolTip" > <string>Multiplier for attacks of the attacking type against the defending type</string> </property> + <property name="statusTip" > + <string>Multiplier for attacks of the attacking type against the defending type</string> + </property> + <property name="whatsThis" > + <string>Multiplier for attacks of the attacking type against the defending type</string> + </property> <property name="behavior" > <number>0</number> </property> diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui index c8dca325..d75ae7f4 100644 --- a/pokemodr/gui/pokemodr.ui +++ b/pokemodr/gui/pokemodr.ui @@ -47,6 +47,15 @@ <property name="shortcut" > <string>Ctrl+Return</string> </property> + <property name="toolTip" > + <string>Apply the changes</string> + </property> + <property name="statusTip" > + <string>Apply the changes</string> + </property> + <property name="whatsThis" > + <string>Apply the changes</string> + </property> </widget> </item> <item> @@ -57,6 +66,15 @@ <property name="shortcut" > <string>Esc</string> </property> + <property name="toolTip" > + <string>Discard the changes</string> + </property> + <property name="statusTip" > + <string>Discard the changes</string> + </property> + <property name="whatsThis" > + <string>Discard the changes</string> + </property> </widget> </item> </layout> @@ -64,12 +82,12 @@ </item> <item> <widget class="QScrollArea" name="formPanel" > - <property name="alignment" > - <set>Qt::AlignHCenter</set> - </property> <property name="widgetResizable" > <bool>true</bool> </property> + <property name="alignment" > + <set>Qt::AlignHCenter</set> + </property> </widget> </item> </layout> @@ -78,6 +96,7 @@ </item> </layout> </widget> + <widget class="QStatusBar" name="statusBar" /> </widget> <customwidgets> <customwidget> diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui index 71a788f7..466b551b 100644 --- a/pokemodr/gui/rules.ui +++ b/pokemodr/gui/rules.ui @@ -7,6 +7,12 @@ <property name="toolTip" > <string>If checked, there can be male and female counterparts of species</string> </property> + <property name="statusTip" > + <string>If checked, there can be male and female counterparts of species</string> + </property> + <property name="whatsThis" > + <string>If checked, there can be male and female counterparts of species</string> + </property> <property name="title" > <string>Genders</string> </property> @@ -19,6 +25,12 @@ <property name="toolTip" > <string>If checked, breeding will be allowed</string> </property> + <property name="statusTip" > + <string>If checked, breeding will be allowed</string> + </property> + <property name="whatsThis" > + <string>If checked, breeding will be allowed</string> + </property> <property name="text" > <string>Breeding</string> </property> @@ -38,6 +50,12 @@ <property name="toolTip" > <string>If checked, critical hit chances will be determined by Generation II and newer methods</string> </property> + <property name="statusTip" > + <string>If checked, critical hit chances will be determined by Generation II and newer methods</string> + </property> + <property name="whatsThis" > + <string>If checked, critical hit chances will be determined by Generation II and newer methods</string> + </property> <property name="text" > <string>Critical Domains</string> </property> @@ -48,6 +66,12 @@ <property name="toolTip" > <string>If checked, money will be harder to come across (only check for challenging games)</string> </property> + <property name="statusTip" > + <string>If checked, money will be harder to come across (only check for challenging games)</string> + </property> + <property name="whatsThis" > + <string>If checked, money will be harder to come across (only check for challenging games)</string> + </property> <property name="text" > <string>Hard Cash</string> </property> @@ -58,6 +82,12 @@ <property name="toolTip" > <string>If checked, the player will be able to switch after knocking an enemy out</string> </property> + <property name="statusTip" > + <string>If checked, the player will be able to switch after knocking an enemy out</string> + </property> + <property name="whatsThis" > + <string>If checked, the player will be able to switch after knocking an enemy out</string> + </property> <property name="text" > <string>Switch Style</string> </property> @@ -68,6 +98,12 @@ <property name="toolTip" > <string>If checked, battle rounds will use strict ordering due to speed, otherwise the speed will fill a "ready" bar</string> </property> + <property name="statusTip" > + <string>If checked, battle rounds will use strict ordering due to speed, otherwise the speed will fill a "ready" bar</string> + </property> + <property name="whatsThis" > + <string>If checked, battle rounds will use strict ordering due to speed, otherwise the speed will fill a "ready" bar</string> + </property> <property name="text" > <string>Use Turns</string> </property> @@ -78,21 +114,33 @@ </item> <item> <widget class="QGroupBox" name="boxSplitSpecial" > - <property name="toolTip" > - <string>If checked, the special stat will be split into separate attack and defense stats</string> - </property> <property name="title" > <string>Split Special</string> </property> <property name="checkable" > <bool>true</bool> </property> + <property name="toolTip" > + <string>If checked, the special stat will be split into separate attack and defense stats</string> + </property> + <property name="statusTip" > + <string>If checked, the special stat will be split into separate attack and defense stats</string> + </property> + <property name="whatsThis" > + <string>If checked, the special stat will be split into separate attack and defense stats</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="QCheckBox" name="varSplitSpecialDV" > <property name="toolTip" > <string>If checked, the each special stat will have their own DV</string> </property> + <property name="statusTip" > + <string>If checked, the each special stat will have their own DV</string> + </property> + <property name="whatsThis" > + <string>If checked, the each special stat will have their own DV</string> + </property> <property name="text" > <string>Split Special DV</string> </property> @@ -103,23 +151,35 @@ </item> <item> <widget class="QGroupBox" name="boxEffortValues" > - <property name="toolTip" > - <string>If checked, stats will have effort values</string> - </property> <property name="title" > <string>Effort Values</string> </property> <property name="checkable" > <bool>true</bool> </property> + <property name="toolTip" > + <string>If checked, stats will have effort values</string> + </property> + <property name="statusTip" > + <string>If checked, stats will have effort values</string> + </property> + <property name="whatsThis" > + <string>If checked, stats will have effort values</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varMaxEV" > + <property name="label" > + <string>Max EV</string> + </property> <property name="toolTip" > <string>The maximum amount of effort values allowed</string> </property> - <property name="label" > - <string>Max EV</string> + <property name="statusTip" > + <string>The maximum amount of effort values allowed</string> + </property> + <property name="whatsThis" > + <string>The maximum amount of effort values allowed</string> </property> <property name="minimum" > <number>1</number> @@ -128,11 +188,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxEVPerStat" > + <property name="label" > + <string>Max EV Per Stat</string> + </property> <property name="toolTip" > <string>The maximum amount of effort values allowed for a single stat</string> </property> - <property name="label" > - <string>Max EV Per Stat</string> + <property name="statusTip" > + <string>The maximum amount of effort values allowed for a single stat</string> + </property> + <property name="whatsThis" > + <string>The maximum amount of effort values allowed for a single stat</string> </property> <property name="minimum" > <number>1</number> @@ -147,14 +213,29 @@ <property name="title" > <string>Storage</string> </property> + <property name="toolTip" > + <string>Computer storage values</string> + </property> + <property name="statusTip" > + <string>Computer storage values</string> + </property> + <property name="whatsThis" > + <string>Computer storage values</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varBoxes" > + <property name="label" > + <string>Boxes</string> + </property> <property name="toolTip" > <string>How many boxes on the computer will be available</string> </property> - <property name="label" > - <string>Boxes</string> + <property name="statusTip" > + <string>How many boxes on the computer will be available</string> + </property> + <property name="whatsThis" > + <string>How many boxes on the computer will be available</string> </property> <property name="minimum" > <number>0</number> @@ -166,6 +247,15 @@ <property name="label" > <string>Box Size</string> </property> + <property name="toolTip" > + <string>How large each box is</string> + </property> + <property name="statusTip" > + <string>How large each box is</string> + </property> + <property name="whatsThis" > + <string>How large each box is</string> + </property> <property name="minimum" > <number>1</number> </property> @@ -175,18 +265,33 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > + <widget class="QGroupBox" name="boxArena" > <property name="title" > <string>Arena</string> </property> + <property name="toolTip" > + <string>Limits in the battle arena</string> + </property> + <property name="statusTip" > + <string>Limits in the battle arena</string> + </property> + <property name="whatsThis" > + <string>Limits in the battle arena</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varMaxParty" > + <property name="label" > + <string>Team</string> + </property> <property name="toolTip" > <string>The size of the largest party possible</string> </property> - <property name="label" > - <string>Team</string> + <property name="statusTip" > + <string>The size of the largest party possible</string> + </property> + <property name="whatsThis" > + <string>The size of the largest party possible</string> </property> <property name="minimum" > <number>1</number> @@ -195,11 +300,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxFight" > + <property name="label" > + <string>Fighters</string> + </property> <property name="toolTip" > <string>Maximum amount of team members active at one time per side</string> </property> - <property name="label" > - <string>Fighters</string> + <property name="statusTip" > + <string>Maximum amount of team members active at one time per side</string> + </property> + <property name="whatsThis" > + <string>Maximum amount of team members active at one time per side</string> </property> <property name="minimum" > <number>1</number> @@ -208,11 +319,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxPlayers" > + <property name="label" > + <string>Teams</string> + </property> <property name="toolTip" > <string>Maximum amount of trainers allowed in a battle</string> </property> - <property name="label" > - <string>Teams</string> + <property name="statusTip" > + <string>Maximum amount of trainers allowed in a battle</string> + </property> + <property name="whatsThis" > + <string>Maximum amount of trainers allowed in a battle</string> </property> <property name="minimum" > <number>2</number> @@ -223,18 +340,33 @@ </widget> </item> <item> - <widget class="QGroupBox" name="boxLimits" > + <widget class="QGroupBox" name="boxGeneral" > <property name="title" > <string>General</string> </property> + <property name="toolTip" > + <string>Limits for various aspects of the game</string> + </property> + <property name="statusTip" > + <string>Limits for various aspects of the game</string> + </property> + <property name="whatsThis" > + <string>Limits for various aspects of the game</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KIntNumInput" name="varMaxMoves" > + <property name="label" > + <string>Moves</string> + </property> <property name="toolTip" > <string>Maximum amount of knowable moves</string> </property> - <property name="label" > - <string>Moves</string> + <property name="statusTip" > + <string>Maximum amount of knowable moves</string> + </property> + <property name="whatsThis" > + <string>Maximum amount of knowable moves</string> </property> <property name="minimum" > <number>1</number> @@ -243,11 +375,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxLevel" > + <property name="label" > + <string>Level</string> + </property> <property name="toolTip" > <string>Maximum level allowed</string> </property> - <property name="label" > - <string>Level</string> + <property name="statusTip" > + <string>Maximum level allowed</string> + </property> + <property name="whatsThis" > + <string>Maximum level allowed</string> </property> <property name="minimum" > <number>1</number> @@ -256,11 +394,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxHeldItems" > + <property name="label" > + <string>Held Items</string> + </property> <property name="toolTip" > <string>How many items can be held at once</string> </property> - <property name="label" > - <string>Held Items</string> + <property name="statusTip" > + <string>How many items can be held at once</string> + </property> + <property name="whatsThis" > + <string>How many items can be held at once</string> </property> <property name="minimum" > <number>0</number> @@ -269,11 +413,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxNatures" > + <property name="label" > + <string>Natures</string> + </property> <property name="toolTip" > <string>The maximum amount of natures allowed at once</string> </property> - <property name="label" > - <string>Natures</string> + <property name="statusTip" > + <string>The maximum amount of natures allowed at once</string> + </property> + <property name="whatsThis" > + <string>The maximum amount of natures allowed at once</string> </property> <property name="minimum" > <number>0</number> @@ -282,11 +432,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxAbilities" > + <property name="label" > + <string>Abilities</string> + </property> <property name="toolTip" > <string>The maximum amount of abilities allowed at once</string> </property> - <property name="label" > - <string>Abilities</string> + <property name="statusTip" > + <string>The maximum amount of abilities allowed at once</string> + </property> + <property name="whatsThis" > + <string>The maximum amount of abilities allowed at once</string> </property> <property name="minimum" > <number>0</number> @@ -295,11 +451,17 @@ </item> <item> <widget class="KIntNumInput" name="varMaxStages" > + <property name="label" > + <string>Modifier Stages</string> + </property> <property name="toolTip" > <string>The maximum stage that stats can be modified to</string> </property> - <property name="label" > - <string>Modifier Stages</string> + <property name="statusTip" > + <string>The maximum stage that stats can be modified to</string> + </property> + <property name="whatsThis" > + <string>The maximum stage that stats can be modified to</string> </property> <property name="minimum" > <number>0</number> @@ -314,14 +476,20 @@ <property name="title" > <string>Money</string> </property> + <property name="toolTip" > + <string>Maximum amount of money allowed</string> + </property> + <property name="statusTip" > + <string>Maximum amount of money allowed</string> + </property> + <property name="whatsThis" > + <string>Maximum amount of money allowed</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varMaxMoney" > - <property name="toolTip" > - <string>Maximum amount of money allowed</string> - </property> <property name="minimum" > - <number>1</number> + <number>0</number> </property> </widget> </item> diff --git a/pokemodr/gui/script.ui b/pokemodr/gui/script.ui index bba33314..079f86e6 100644 --- a/pokemodr/gui/script.ui +++ b/pokemodr/gui/script.ui @@ -13,6 +13,15 @@ <property name="title" > <string>Interpreter</string> </property> + <property name="toolTip" > + <string>The language the script is written in</string> + </property> + <property name="statusTip" > + <string>The language the script is written in</string> + </property> + <property name="whatsThis" > + <string>The language the script is written in</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KComboBox" name="varInterpreter" /> @@ -25,6 +34,15 @@ <property name="title" > <string>Code</string> </property> + <property name="toolTip" > + <string>The code for the script</string> + </property> + <property name="statusTip" > + <string>The code for the script</string> + </property> + <property name="whatsThis" > + <string>The code for the script</string> + </property> <layout class="QHBoxLayout" name="layoutScript" /> </widget> </item> diff --git a/pokemodr/gui/sound.ui b/pokemodr/gui/sound.ui index 03d11ea1..323f439c 100644 --- a/pokemodr/gui/sound.ui +++ b/pokemodr/gui/sound.ui @@ -7,11 +7,20 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the sound (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the sound (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the sound (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the sound</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -23,22 +32,70 @@ <property name="title" > <string>Sound</string> </property> + <property name="toolTip" > + <string>The audio data</string> + </property> + <property name="statusTip" > + <string>The audio data</string> + </property> + <property name="whatsThis" > + <string>The audio data</string> + </property> <layout class="QGridLayout" > <item row="1" column="0" > - <widget class="KPushButton" name="buttonPlayPause" /> + <widget class="KPushButton" name="buttonPlayPause" > + <property name="toolTip" > + <string>Play/Pause</string> + </property> + <property name="statusTip" > + <string>Play/Pause</string> + </property> + <property name="whatsThis" > + <string>Play/Pause</string> + </property> + </widget> </item> <item row="1" column="1" > - <widget class="KPushButton" name="buttonStop" /> + <widget class="KPushButton" name="buttonStop" > + <property name="toolTip" > + <string>Stop</string> + </property> + <property name="statusTip" > + <string>Stop</string> + </property> + <property name="whatsThis" > + <string>Stop</string> + </property> + </widget> </item> <item row="2" column="0" colspan="2" > <widget class="KPushButton" name="buttonBrowse" > + <property name="toolTip" > + <string>Find an audio file</string> + </property> + <property name="statusTip" > + <string>Find an audio file</string> + </property> + <property name="whatsThis" > + <string>Find an audio file</string> + </property> <property name="text" > <string>Browse...</string> </property> </widget> </item> <item row="0" column="0" colspan="2" > - <widget class="Phonon::SeekSlider" name="seeker" /> + <widget class="Phonon::SeekSlider" name="seeker" > + <property name="toolTip" > + <string>Seek</string> + </property> + <property name="statusTip" > + <string>Seek</string> + </property> + <property name="whatsThis" > + <string>Seek</string> + </property> + </widget> </item> </layout> </widget> diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui index 3a9fcb04..f36c4d6e 100644 --- a/pokemodr/gui/species.ui +++ b/pokemodr/gui/species.ui @@ -14,12 +14,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the species</string> + </property> + <property name="statusTip" > + <string>Name of the species</string> + </property> + <property name="whatsThis" > + <string>Name of the species</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the species</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -33,12 +39,18 @@ <property name="title" > <string>Types</string> </property> + <property name="toolTip" > + <string>The types of the species</string> + </property> + <property name="statusTip" > + <string>The types of the species</string> + </property> + <property name="whatsThis" > + <string>The types of the species</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varTypes" > - <property name="toolTip" > - <string>The types of the species</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -52,12 +64,18 @@ <property name="title" > <string>Run Chance</string> </property> + <property name="toolTip" > + <string>The chance that the species runs in a wild battle each turn</string> + </property> + <property name="statusTip" > + <string>The chance that the species runs in a wild battle each turn</string> + </property> + <property name="whatsThis" > + <string>The chance that the species runs in a wild battle each turn</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varRunChance" > - <property name="toolTip" > - <string>The chance that the species runs in a wild battle</string> - </property> <property name="behavior" > <number>-1</number> </property> @@ -71,12 +89,18 @@ <property name="title" > <string>Flee Chance</string> </property> + <property name="toolTip" > + <string>Chance that the player can flee from a wild battle with this species</string> + </property> + <property name="statusTip" > + <string>Chance that the player can flee from a wild battle with this species</string> + </property> + <property name="whatsThis" > + <string>Chance that the player can flee from a wild battle with this species</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varFleeChance" > - <property name="toolTip" > - <string>Chance that the player can flee from a wild battle</string> - </property> <property name="behavior" > <number>-1</number> </property> @@ -90,12 +114,18 @@ <property name="title" > <string>Item Chance</string> </property> + <property name="toolTip" > + <string>Chance the species is carrying an item in a wild battle</string> + </property> + <property name="statusTip" > + <string>Chance the species is carrying an item in a wild battle</string> + </property> + <property name="whatsThis" > + <string>Chance the species is carrying an item in a wild battle</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varItemChance" > - <property name="toolTip" > - <string>Chance the species is carrying an item in a wild battle</string> - </property> <property name="behavior" > <number>-1</number> </property> @@ -129,12 +159,27 @@ <property name="title" > <string>Base Stats</string> </property> + <property name="toolTip" > + <string>The base values for calcuating the stats of this species</string> + </property> + <property name="statusTip" > + <string>The base values for calcuating the stats of this species</string> + </property> + <property name="whatsThis" > + <string>The base values for calcuating the stats of this species</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KComboBox" name="varBaseStat" > <property name="toolTip" > <string>Stat</string> </property> + <property name="statusTip" > + <string>Stat</string> + </property> + <property name="whatsThis" > + <string>Stat</string> + </property> </widget> </item> <item> @@ -142,6 +187,12 @@ <property name="toolTip" > <string>Base value for the stat</string> </property> + <property name="statusTip" > + <string>Base value for the stat</string> + </property> + <property name="whatsThis" > + <string>Base value for the stat</string> + </property> <property name="minimum" > <number>0</number> </property> @@ -155,12 +206,27 @@ <property name="title" > <string>Effort Values</string> </property> + <property name="toolTip" > + <string>The number of effort points given per stat when defeated</string> + </property> + <property name="statusTip" > + <string>The number of effort points given per stat when defeated</string> + </property> + <property name="whatsThis" > + <string>The number of effort points given per stat when defeated</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KComboBox" name="varEVStat" > <property name="toolTip" > <string>Stat</string> </property> + <property name="statusTip" > + <string>Stat</string> + </property> + <property name="whatsThis" > + <string>Stat</string> + </property> </widget> </item> <item> @@ -168,6 +234,12 @@ <property name="toolTip" > <string>Number of effort value points given when defeated for given stat</string> </property> + <property name="statusTip" > + <string>Number of effort value points given when defeated for given stat</string> + </property> + <property name="whatsThis" > + <string>Number of effort value points given when defeated for given stat</string> + </property> <property name="minimum" > <number>0</number> </property> @@ -181,13 +253,18 @@ <property name="title" > <string>Growth</string> </property> + <property name="toolTip" > + <string>Level growth pattern</string> + </property> + <property name="statusTip" > + <string>Level growth pattern</string> + </property> + <property name="whatsThis" > + <string>Level growth pattern</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varGrowth" > - <property name="toolTip" > - <string>Level growth pattern</string> - </property> - </widget> + <widget class="KComboBox" name="varGrowth" /> </item> </layout> </widget> @@ -197,12 +274,18 @@ <property name="title" > <string>Experience Value</string> </property> + <property name="toolTip" > + <string>Base value for experience points earned</string> + </property> + <property name="statusTip" > + <string>Base value for experience points earned</string> + </property> + <property name="whatsThis" > + <string>Base value for experience points earned</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varExperienceValue" > - <property name="toolTip" > - <string>Base value for experience points earned</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -216,18 +299,21 @@ <property name="title" > <string>Catch Value</string> </property> + <property name="toolTip" > + <string>How easy it is to catch the species</string> + </property> + <property name="statusTip" > + <string>How easy it is to catch the species</string> + </property> + <property name="whatsThis" > + <string>How easy it is to catch the species</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varCatchValue" > - <property name="toolTip" > - <string>How easy it is to catch the species</string> - </property> <property name="minimum" > <number>0</number> </property> - <property name="maximum" > - <number>255</number> - </property> </widget> </item> </layout> @@ -254,29 +340,56 @@ </attribute> <layout class="QVBoxLayout" > <item> - <widget class="KIntNumInput" name="varPokedexNumber" > + <widget class="QGroupBox" name="boxPokedexNumber" > + <property name="title" > + <string>Number</string> + </property> <property name="toolTip" > - <string>The PokéDex number of the species</string> + <string>The Pokédex number of the species</string> </property> - <property name="label" > - <string>Number</string> + <property name="statusTip" > + <string>The Pokédex number of the species</string> </property> - <property name="minimum" > - <number>0</number> + <property name="whatsThis" > + <string>The Pokédex number of the species</string> </property> + <layout class="QHBoxLayout" > + <item> + <widget class="KIntNumInput" name="varPokedexNumber" > + <property name="toolTip" > + <string>The Pokédex number of the species</string> + </property> + <property name="minimum" > + <number>0</number> + </property> + </widget> + </item> + </layout> </widget> </item> <item> - <widget class="KIntNumInput" name="varWeight" > + <widget class="QGroupBox" name="boxWeight" > + <property name="title" > + <string>Number</string> + </property> <property name="toolTip" > - <string>The weight of the species</string> + <string>The weight of the species in grams</string> </property> - <property name="label" > - <string>Weight</string> + <property name="statusTip" > + <string>The weight of the species in grams</string> </property> - <property name="minimum" > - <number>0</number> + <property name="whatsThis" > + <string>The weight of the species in grams</string> </property> + <layout class="QHBoxLayout" > + <item> + <widget class="KIntNumInput" name="varWeight" > + <property name="minimum" > + <number>0</number> + </property> + </widget> + </item> + </layout> </widget> </item> <item> @@ -284,34 +397,21 @@ <property name="title" > <string>Height</string> </property> + <property name="toolTip" > + <string>Height of the species in centimeters</string> + </property> + <property name="statusTip" > + <string>Height of the species in centimeters</string> + </property> + <property name="whatsThis" > + <string>Height of the species in centimeters</string> + </property> <layout class="QVBoxLayout" > <item> - <widget class="KIntNumInput" name="varHeightFeet" > - <property name="toolTip" > - <string>Height of the species</string> - </property> - <property name="label" > - <string>Feet</string> - </property> - <property name="minimum" > - <number>0</number> - </property> - </widget> - </item> - <item> - <widget class="KIntNumInput" name="varHeightInches" > - <property name="toolTip" > - <string>Height of the species</string> - </property> - <property name="label" > - <string>Inches</string> - </property> + <widget class="KIntNumInput" name="varHeight" > <property name="minimum" > <number>0</number> </property> - <property name="maximum" > - <number>11</number> - </property> </widget> </item> </layout> @@ -322,11 +422,20 @@ <property name="title" > <string>Entry</string> </property> + <property name="toolTip" > + <string>Information provided in the Pokédex about the species</string> + </property> + <property name="statusTip" > + <string>Information provided in the Pokédex about the species</string> + </property> + <property name="whatsThis" > + <string>Information provided in the Pokédex about the species</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="KLineEdit" name="varPokedexEntry" > - <property name="toolTip" > - <string>Information provided in the PokéDex about the species</string> + <property name="showClearButton" stdset="0" > + <bool>true</bool> </property> </widget> </item> @@ -361,13 +470,18 @@ <property name="checkable" > <bool>true</bool> </property> + <property name="toolTip" > + <string>Chance of getting a female version of the species (negative is genderless)</string> + </property> + <property name="statusTip" > + <string>Chance of getting a female version of the species (negative is genderless)</string> + </property> + <property name="whatsThis" > + <string>Chance of getting a female version of the species (negative is genderless)</string> + </property> <layout class="QVBoxLayout" > <item> - <widget class="Pokemodr::FractionWidget" name="varGenderChance" > - <property name="toolTip" > - <string>Chance of getting a female version of the species (negative is genderless)</string> - </property> - </widget> + <widget class="Pokemodr::FractionWidget" name="varGenderChance" /> </item> </layout> </widget> @@ -377,41 +491,45 @@ <property name="title" > <string>Egg Species</string> </property> + <property name="toolTip" > + <string>The species that hatches from an egg from this species</string> + </property> + <property name="statusTip" > + <string>The species that hatches from an egg from this species</string> + </property> + <property name="whatsThis" > + <string>The species that hatches from an egg from this species</string> + </property> <layout class="QVBoxLayout" > <item> - <widget class="KComboBox" name="varEggSpecies" > - <property name="toolTip" > - <string>The species that hatches from an egg from this species</string> - </property> - </widget> + <widget class="KComboBox" name="varEggSpecies" /> </item> </layout> </widget> </item> <item> - <widget class="KIntNumInput" name="varEggSteps" > - <property name="toolTip" > - <string>The number of steps it takes to hatch the egg of the species</string> - </property> - <property name="label" > - <string>Steps</string> - </property> - <property name="minimum" > - <number>0</number> + <widget class="QGroupBox" name="boxEggSteps" > + <property name="title" > + <string>Height</string> </property> - </widget> - </item> - <item> - <widget class="KIntNumInput" name="varNidoranGroup" > <property name="toolTip" > - <string>Nidoran group the species belongs to</string> + <string>The number of steps it takes to hatch the egg of the species</string> </property> - <property name="label" > - <string>Nidoran Group</string> + <property name="statusTip" > + <string>The number of steps it takes to hatch the egg of the species</string> </property> - <property name="minimum" > - <number>0</number> + <property name="whatsThis" > + <string>The number of steps it takes to hatch the egg of the species</string> </property> + <layout class="QVBoxLayout" > + <item> + <widget class="KIntNumInput" name="varEggSteps" > + <property name="minimum" > + <number>0</number> + </property> + </widget> + </item> + </layout> </widget> </item> <item> @@ -419,12 +537,18 @@ <property name="title" > <string>Egg Groups</string> </property> + <property name="toolTip" > + <string>The egg groups the species belongs to</string> + </property> + <property name="statusTip" > + <string>The egg groups the species belongs to</string> + </property> + <property name="whatsThis" > + <string>The egg groups the species belongs to</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varEggGroups" > - <property name="toolTip" > - <string>The egg groups the species belongs to</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -438,6 +562,15 @@ <property name="title" > <string>Evolution Script</string> </property> + <property name="toolTip" > + <string>The script that controls how the species evolves</string> + </property> + <property name="statusTip" > + <string>The script that controls how the species evolves</string> + </property> + <property name="whatsThis" > + <string>The script that controls how the species evolves</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varEvolution" /> @@ -457,6 +590,15 @@ <property name="title" > <string>Male</string> </property> + <property name="toolTip" > + <string>Sprites for the males of the species</string> + </property> + <property name="statusTip" > + <string>Sprites for the males of the species</string> + </property> + <property name="whatsThis" > + <string>Sprites for the males of the species</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -479,6 +621,15 @@ <height>128</height> </size> </property> + <property name="toolTip" > + <string>Front</string> + </property> + <property name="statusTip" > + <string>Front</string> + </property> + <property name="whatsThis" > + <string>Front</string> + </property> </widget> </item> <item> @@ -502,6 +653,15 @@ <height>128</height> </size> </property> + <property name="toolTip" > + <string>Back</string> + </property> + <property name="statusTip" > + <string>Back</string> + </property> + <property name="whatsThis" > + <string>Back</string> + </property> </widget> </item> <item> @@ -525,6 +685,15 @@ <property name="title" > <string>Female</string> </property> + <property name="toolTip" > + <string>Sprites for the females of the species</string> + </property> + <property name="statusTip" > + <string>Sprites for the females of the species</string> + </property> + <property name="whatsThis" > + <string>Sprites for the females of the species</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -547,6 +716,15 @@ <height>128</height> </size> </property> + <property name="toolTip" > + <string>Front</string> + </property> + <property name="statusTip" > + <string>Front</string> + </property> + <property name="whatsThis" > + <string>Front</string> + </property> </widget> </item> <item> @@ -570,50 +748,14 @@ <height>128</height> </size> </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="boxList" > - <property name="title" > - <string>List</string> - </property> - <layout class="QHBoxLayout" > - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <property name="toolTip" > + <string>Back</string> </property> - <property name="sizeHint" > - <size> - <width>1</width> - <height>0</height> - </size> + <property name="statusTip" > + <string>Back</string> </property> - </spacer> - </item> - <item> - <widget class="KPushButton" name="varList" > - <property name="minimumSize" > - <size> - <width>128</width> - <height>64</height> - </size> + <property name="whatsThis" > + <string>Back</string> </property> </widget> </item> diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui index 6d2fbb66..4832aa1a 100644 --- a/pokemodr/gui/speciesability.ui +++ b/pokemodr/gui/speciesability.ui @@ -7,13 +7,18 @@ <property name="title" > <string>Ability</string> </property> + <property name="toolTip" > + <string>Ability available</string> + </property> + <property name="statusTip" > + <string>Ability available</string> + </property> + <property name="whatsThis" > + <string>Ability available</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varAbility" > - <property name="toolTip" > - <string>Ability available</string> - </property> - </widget> + <widget class="KComboBox" name="varAbility" /> </item> </layout> </widget> @@ -23,12 +28,18 @@ <property name="title" > <string>Weight</string> </property> + <property name="toolTip" > + <string>Weighting for the ability</string> + </property> + <property name="statusTip" > + <string>Weighting for the ability</string> + </property> + <property name="whatsThis" > + <string>Weighting for the ability</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varWeight" > - <property name="toolTip" > - <string>Weighting</string> - </property> <property name="minimum" > <number>1</number> </property> diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui index ee13b2d9..16572769 100644 --- a/pokemodr/gui/speciesitem.ui +++ b/pokemodr/gui/speciesitem.ui @@ -7,13 +7,18 @@ <property name="title" > <string>Item</string> </property> + <property name="toolTip" > + <string>Item that can be held when found in the wild</string> + </property> + <property name="statusTip" > + <string>Item that can be held when found in the wild</string> + </property> + <property name="whatsThis" > + <string>Item that can be held when found in the wild</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varItem" > - <property name="toolTip" > - <string>Item that can be held</string> - </property> - </widget> + <widget class="KComboBox" name="varItem" /> </item> </layout> </widget> @@ -23,12 +28,18 @@ <property name="title" > <string>Weight</string> </property> + <property name="toolTip" > + <string>Weighting for the item</string> + </property> + <property name="statusTip" > + <string>Weighting for the item</string> + </property> + <property name="whatsThis" > + <string>Weighting for the item</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varWeight" > - <property name="toolTip" > - <string>Weighting</string> - </property> <property name="minimum" > <number>1</number> </property> diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui index bc13fd85..195df075 100644 --- a/pokemodr/gui/speciesmove.ui +++ b/pokemodr/gui/speciesmove.ui @@ -7,13 +7,18 @@ <property name="title" > <string>Move</string> </property> + <property name="toolTip" > + <string>Move that can be learned</string> + </property> + <property name="statusTip" > + <string>Move that can be learned</string> + </property> + <property name="whatsThis" > + <string>Move that can be learned</string> + </property> <layout class="QHBoxLayout" > <item> - <widget class="KComboBox" name="varMove" > - <property name="toolTip" > - <string>Move that is learned</string> - </property> - </widget> + <widget class="KComboBox" name="varMove" /> </item> </layout> </widget> @@ -23,12 +28,18 @@ <property name="title" > <string>Level</string> </property> + <property name="toolTip" > + <string>Level learned when the player levels up</string> + </property> + <property name="statusTip" > + <string>Level learned when the player levels up</string> + </property> + <property name="whatsThis" > + <string>Level learned when the player levels up</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varLevel" > - <property name="toolTip" > - <string>Level learned when the player levels up</string> - </property> <property name="minimum" > <number>0</number> </property> @@ -42,12 +53,18 @@ <property name="title" > <string>Wild Level</string> </property> + <property name="toolTip" > + <string>Level learned in the wild (used to give wilds better moves)</string> + </property> + <property name="statusTip" > + <string>Level learned in the wild (used to give wilds better moves)</string> + </property> + <property name="whatsThis" > + <string>Level learned in the wild (used to give wilds better moves)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KIntNumInput" name="varWildLevel" > - <property name="toolTip" > - <string>Level learned in the wild (used to give wilds better moves)</string> - </property> <property name="minimum" > <number>0</number> </property> diff --git a/pokemodr/gui/sprite.ui b/pokemodr/gui/sprite.ui index e93314af..0d5499ab 100644 --- a/pokemodr/gui/sprite.ui +++ b/pokemodr/gui/sprite.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the sprite (internal use only)</string> + </property> + <property name="statusTip" > + <string>The name of the sprite (internal use only)</string> + </property> + <property name="whatsThis" > + <string>The name of the sprite (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>The name of the sprite</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Sprite</string> </property> + <property name="toolTip" > + <string>The sprite</string> + </property> + <property name="statusTip" > + <string>The sprite</string> + </property> + <property name="whatsThis" > + <string>The sprite</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> diff --git a/pokemodr/gui/status.ui b/pokemodr/gui/status.ui index 7f219f40..ba8e2bd0 100644 --- a/pokemodr/gui/status.ui +++ b/pokemodr/gui/status.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the status (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the status (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the status (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the status</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script that controls how the status works</string> + </property> + <property name="statusTip" > + <string>The script that controls how the status works</string> + </property> + <property name="whatsThis" > + <string>The script that controls how the status works</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui index befd88ef..b80646ab 100644 --- a/pokemodr/gui/store.ui +++ b/pokemodr/gui/store.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the status (internal use only)</string> + </property> + <property name="statusTip" > + <string>The name of the status (internal use only)</string> + </property> + <property name="whatsThis" > + <string>The name of the status (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>The name of the badge</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Items</string> </property> + <property name="toolTip" > + <string>The items for sale at the store</string> + </property> + <property name="toolTip" > + <string>The items for sale at the store</string> + </property> + <property name="toolTip" > + <string>The items for sale at the store</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varItems" > diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui index aae0a307..a5a7e490 100644 --- a/pokemodr/gui/tile.ui +++ b/pokemodr/gui/tile.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the tile (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the tile (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the tile (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the tile</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Image</string> </property> + <property name="toolTip" > + <string>Image of the tile</string> + </property> + <property name="statusTip" > + <string>Image of the tile</string> + </property> + <property name="whatsThis" > + <string>Image of the tile</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -48,9 +63,6 @@ <height>64</height> </size> </property> - <property name="toolTip" > - <string>Image of the tile</string> - </property> </widget> </item> <item> @@ -74,12 +86,18 @@ <property name="title" > <string>Accessibility</string> </property> + <property name="toolTip" > + <string>Directions into the tile</string> + </property> + <property name="statusTip" > + <string>Directions into the tile</string> + </property> + <property name="whatsThis" > + <string>Directions into the tile</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KListWidget" name="varAccessibility" > - <property name="toolTip" > - <string>Directions into the tile</string> - </property> <property name="selectionMode" > <enum>QAbstractItemView::ExtendedSelection</enum> </property> @@ -93,6 +111,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script that is run for this tile</string> + </property> + <property name="statusTip" > + <string>The script that is run for this tile</string> + </property> + <property name="whatsThis" > + <string>The script that is run for this tile</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui index 0ea13ae0..196b13fd 100644 --- a/pokemodr/gui/time.ui +++ b/pokemodr/gui/time.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the time</string> + </property> + <property name="statusTip" > + <string>Name of the time</string> + </property> + <property name="whatsThis" > + <string>Name of the time</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the time period</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Time</string> </property> + <property name="toolTip" > + <string>The time it starts</string> + </property> + <property name="statusTip" > + <string>The time it starts</string> + </property> + <property name="whatsThis" > + <string>The time it starts</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="QTimeEdit" name="varTime" > diff --git a/pokemodr/gui/trainer.ui b/pokemodr/gui/trainer.ui index e0f15a28..d445d699 100644 --- a/pokemodr/gui/trainer.ui +++ b/pokemodr/gui/trainer.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the trainer type</string> + </property> + <property name="statusTip" > + <string>The name of the trainer type</string> + </property> + <property name="whatsThis" > + <string>The name of the trainer type</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>The name of the trainer type</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -22,16 +28,28 @@ </widget> </item> <item> - <widget class="KIntNumInput" name="varMoneyFactor" > + <widget class="QGroupBox" name="boxMoneyFactor" > + <property name="title" > + <string>Money Factor</string> + </property> <property name="toolTip" > <string>Multiplier for the money earned from the battle when won</string> </property> - <property name="label" > - <string>Money Factor</string> + <property name="statusTip" > + <string>Multiplier for the money earned from the battle when won</string> </property> - <property name="minimum" > - <number>0</number> + <property name="whatsThis" > + <string>Multiplier for the money earned from the battle when won</string> </property> + <layout class="QHBoxLayout" > + <item> + <widget class="KIntNumInput" name="varMoneyFactor" > + <property name="minimum" > + <number>0</number> + </property> + </widget> + </item> + </layout> </widget> </item> <item> @@ -39,6 +57,15 @@ <property name="title" > <string>Skin</string> </property> + <property name="toolTip" > + <string>Skin of the trainer</string> + </property> + <property name="statusTip" > + <string>Skin of the trainer</string> + </property> + <property name="whatsThis" > + <string>Skin of the trainer</string> + </property> <layout class="QHBoxLayout" > <item> <spacer> @@ -61,9 +88,6 @@ <height>128</height> </size> </property> - <property name="toolTip" > - <string>Skin of the trainer</string> - </property> </widget> </item> <item> diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui index cb018631..635a6b73 100644 --- a/pokemodr/gui/type.ui +++ b/pokemodr/gui/type.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>The name of the type</string> + </property> + <property name="statusTip" > + <string>The name of the type</string> + </property> + <property name="whatsThis" > + <string>The name of the type</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>The name of the type</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,12 +32,18 @@ <property name="title" > <string>STAB</string> </property> + <property name="toolTip" > + <string>Multiplier for species with this type for using a move of this type</string> + </property> + <property name="statusTip" > + <string>Multiplier for species with this type for using a move of this type</string> + </property> + <property name="whatsThis" > + <string>Multiplier for species with this type for using a move of this type</string> + </property> <layout class="QVBoxLayout" > <item> <widget class="Pokemodr::FractionWidget" name="varSTAB" > - <property name="toolTip" > - <string>Multiplier for species with this type for using a move of this type</string> - </property> <property name="behavior" > <number>1</number> </property> diff --git a/pokemodr/gui/weather.ui b/pokemodr/gui/weather.ui index 43a75581..9afa1938 100644 --- a/pokemodr/gui/weather.ui +++ b/pokemodr/gui/weather.ui @@ -7,12 +7,18 @@ <property name="title" > <string>Name</string> </property> + <property name="toolTip" > + <string>Name of the weather (internal use only)</string> + </property> + <property name="statusTip" > + <string>Name of the weather (internal use only)</string> + </property> + <property name="whatsThis" > + <string>Name of the weather (internal use only)</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="KLineEdit" name="varName" > - <property name="toolTip" > - <string>Name of the weather</string> - </property> <property name="showClearButton" stdset="0" > <bool>true</bool> </property> @@ -26,6 +32,15 @@ <property name="title" > <string>Script</string> </property> + <property name="toolTip" > + <string>The script that controls the effects of the weather</string> + </property> + <property name="statusTip" > + <string>The script that controls the effects of the weather</string> + </property> + <property name="whatsThis" > + <string>The script that controls the effects of the weather</string> + </property> <layout class="QHBoxLayout" > <item> <widget class="Pokemodr::ScriptWidget" name="varScript" /> 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); |
