diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-05-16 20:48:52 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-05-16 20:48:52 +0000 |
| commit | 5fbf25a91c75c59d56cb6b58c899323772f9176a (patch) | |
| tree | 7d97e0d0b745cbc0b2073f0906de42da28487f39 /pokemod/AbilityEffect.cpp | |
| parent | 9c1388c7964bd3b4ae147e39c146c96dc20947e9 (diff) | |
| download | sigen-5fbf25a91c75c59d56cb6b58c899323772f9176a.tar.gz sigen-5fbf25a91c75c59d56cb6b58c899323772f9176a.tar.xz sigen-5fbf25a91c75c59d56cb6b58c899323772f9176a.zip | |
[FIX] SoundUI uses correct icon names now
[FIX] Setting up combo boxes in UI widgets cleaner
[ADD] AbilityEffect widget done
[FIX] Fixed up MapEffect setting code
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@142 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/AbilityEffect.cpp')
| -rw-r--r-- | pokemod/AbilityEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokemod/AbilityEffect.cpp b/pokemod/AbilityEffect.cpp index ecac1af6..b7532e2d 100644 --- a/pokemod/AbilityEffect.cpp +++ b/pokemod/AbilityEffect.cpp @@ -26,7 +26,7 @@ const QStringList AbilityEffect::EffectStr = QStringList() << "Damage to HP" << "Prevent Damage" << "Auto Heal" << "Deal Damage" << "Wilds" << "Stat" << "Status" << "Ability" << "Accuracy/Power Trade" << "Bullseye" << "Item Effect" << "Type" << "Fast Hatch" << "Weather"; const QStringList AbilityEffect::TriggerStr = QStringList() << "Anything" << "Contact" << "Weather" << "Damage" << "Type" << "HP Boundary" << "Stat Change" << "Status"; const QStringList AbilityEffect::InteractStr = QStringList() << "Trade" << "Shadow" << "Block"; -const QStringList AbilityEffect::PowerAccStr = QStringList() << "Boost Power" << "Boost Accuracy"; +const QStringList AbilityEffect::PowerAccuracyStr = QStringList() << "Boost Power" << "Boost Accuracy"; const QStringList AbilityEffect::ItemStr = QStringList() << "Stat Modifier" << "Type Booster" << "Flinch" << "Go First"; const QStringList AbilityEffect::CauseStr = QStringList() << "Prevent" << "Inflict"; const QStringList AbilityEffect::BoostStr = QStringList() << "Boost" << "Hinder"; @@ -133,7 +133,7 @@ void AbilityEffect::setValue1(const int value1) switch (m_effect) { case E_Stats: - if ((Pokemod::ST_HP == value1) || (Pokemod::ST_End_Battle <= value1) || ((Pokemod::ST_SpecialDefense == value1) && !static_cast<const Pokemod*>(pokemod())->rules()->specialSplit())) + if ((value1 < Pokemod::ST_No_HP_Start) || (Pokemod::ST_End_Battle <= value1) || ((Pokemod::ST_SpecialDefense == value1) && !static_cast<const Pokemod*>(pokemod())->rules()->specialSplit())) { emit(error(bounds("value1"))); return; @@ -302,7 +302,7 @@ void AbilityEffect::setTriggerValue1(const int triggerValue1) } break; case T_StatChange: - if ((Pokemod::ST_HP == triggerValue1) || (Pokemod::ST_End_Battle <= triggerValue1) || ((Pokemod::ST_SpecialDefense == triggerValue1) && !static_cast<const Pokemod*>(pokemod())->rules()->specialSplit())) + if ((triggerValue1 < Pokemod::ST_No_HP_Start) || (Pokemod::ST_End_Battle <= triggerValue1) || ((Pokemod::ST_SpecialDefense == triggerValue1) && !static_cast<const Pokemod*>(pokemod())->rules()->specialSplit())) { emit(error(bounds("triggerValue1"))); return; |