diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-05-19 01:48:12 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-05-19 01:48:12 +0000 |
| commit | 729fcb901439b4f9b20bdd928cdaff54ea4f6fc6 (patch) | |
| tree | 4b9f805f8e3f4169e780c6242ed799b4e858a2eb /pokemodr/AbilityEffectUI.cpp | |
| parent | c7ddef3aa27bd9c81c68d6b94173dca6d6e6cc05 (diff) | |
| download | sigen-729fcb901439b4f9b20bdd928cdaff54ea4f6fc6.tar.gz sigen-729fcb901439b4f9b20bdd928cdaff54ea4f6fc6.tar.xz sigen-729fcb901439b4f9b20bdd928cdaff54ea4f6fc6.zip | |
[ADD] ItemEffect widget near completion (value2 setting on the widget needed)
[FIX] Cleaned out unneeded customwidget fields in .ui files
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@151 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemodr/AbilityEffectUI.cpp')
| -rw-r--r-- | pokemodr/AbilityEffectUI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pokemodr/AbilityEffectUI.cpp b/pokemodr/AbilityEffectUI.cpp index a529b058..58033344 100644 --- a/pokemodr/AbilityEffectUI.cpp +++ b/pokemodr/AbilityEffectUI.cpp @@ -53,6 +53,7 @@ void AbilityEffectUI::setGui() { const bool resetEffects = (static_cast<AbilityEffect*>(modified())->effect() == m_lastEffect); const bool resetTrigger = (static_cast<AbilityEffect*>(modified())->trigger() == m_lastTrigger); + const bool isSplit = static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit(); varChance->setValue(static_cast<AbilityEffect*>(modified())->chance()); varEffect->setCurrentIndex(static_cast<AbilityEffect*>(modified())->effect()); m_lastEffect = static_cast<AbilityEffect*>(modified())->effect(); @@ -68,9 +69,9 @@ void AbilityEffectUI::setGui() case AbilityEffect::E_Stats: for (int i = Pokemod::ST_No_HP_Start; i < Pokemod::ST_End_Battle; ++i) { - if ((Pokemod::ST_SpecialDefense == i) && !static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit()) + if ((Pokemod::ST_SpecialDefense == i) && !isSplit) continue; - varValue1->addItem(Pokemod::StatGSCStr[i], varValue1->count()); + varValue1->addItem((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr)[i], varValue1->count()); } break; case AbilityEffect::E_Status: @@ -190,9 +191,9 @@ void AbilityEffectUI::setGui() case AbilityEffect::T_StatChange: for (int i = Pokemod::ST_No_HP_Start; i < Pokemod::ST_End_Battle; ++i) { - if ((Pokemod::ST_SpecialDefense == i) && !static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit()) + if ((Pokemod::ST_SpecialDefense == i) && !isSplit) continue; - varTriggerValue1->addItem(Pokemod::StatGSCStr[i], varValue1->count()); + varTriggerValue1->addItem((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr)[i], varValue1->count()); } break; case AbilityEffect::T_Status: |