[FIX] Replaced Point with QPoint (less duplicate code)

[FIX] Fraction and Point widgets are more compact
[FIX] Fleshed out more of the TeamMember
[FIX] Map tilemap editor now expands to fill all available area
[FIX] Added priority values to abilities and moves
[FIX] Added option for ATB-like battle rounds

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@217 6ecfd1a5-f3ed-3746-8530-beee90d26b22

21 files changed, 146 insertions, 76 deletions

diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
index 1768a83e..e4f6abc5 100644
--- a/pokemodr/AbilityUI.cpp
+++ b/pokemodr/AbilityUI.cpp
@@ -35,6 +35,7 @@ Pokemodr::AbilityUI::~AbilityUI()
 void Pokemodr::AbilityUI::setGui()
 {
     varName->setText(static_cast<Pokemod::Ability*>(modified())->name());
+    varPriority->setValue(static_cast<Pokemod::Ability*>(modified())->priority());
     varDescription->setText(static_cast<Pokemod::Ability*>(modified())->description());
     varScript->setValue(static_cast<Pokemod::Ability*>(modified())->script());
 }
@@ -59,6 +60,11 @@ void Pokemodr::AbilityUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
+void Pokemodr::AbilityUI::on_varPriority_valueChanged(const int priority)
+{
+    static_cast<Pokemod::Ability*>(modified())->setPriority(priority);
+}
+
 void Pokemodr::AbilityUI::on_varDescription_textChanged(const QString& description)
 {
     static_cast<Pokemod::Ability*>(modified())->setDescription(description);
diff --git a/pokemodr/AbilityUI.h b/pokemodr/AbilityUI.h
index e4275cc9..1fc4ff97 100644
--- a/pokemodr/AbilityUI.h
+++ b/pokemodr/AbilityUI.h
@@ -44,6 +44,7 @@ class AbilityUI : public ObjectUI, private Ui::formAbility
         void discard();
     protected slots:
         void on_varName_textChanged(const QString& name);
+        void on_varPriority_valueChanged(const int priority);
         void on_varDescription_textChanged(const QString& description);
         void on_varScript_valueChanged(const Pokemod::Script& script);
     private slots:
diff --git a/pokemodr/MapEffectUI.cpp b/pokemodr/MapEffectUI.cpp
index ad3585de..1db1ae64 100644
--- a/pokemodr/MapEffectUI.cpp
+++ b/pokemodr/MapEffectUI.cpp
@@ -72,7 +72,7 @@ void Pokemodr::MapEffectUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
-void Pokemodr::MapEffectUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate)
+void Pokemodr::MapEffectUI::on_varCoordinate_valueChanged(const QPoint& coordinate)
 {
     static_cast<Pokemod::MapEffect*>(modified())->setCoordinate(coordinate);
 }
diff --git a/pokemodr/MapEffectUI.h b/pokemodr/MapEffectUI.h
index 79fbd1ce..d3ef1686 100644
--- a/pokemodr/MapEffectUI.h
+++ b/pokemodr/MapEffectUI.h
@@ -44,7 +44,7 @@ class MapEffectUI : public ObjectUI, private Ui::formMapEffect
         void discard();
     protected slots:
         void on_varName_textChanged(const QString& name);
-        void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate);
+        void on_varCoordinate_valueChanged(const QPoint& coordinate);
         void on_varSkin_pressed();
         void on_varScript_valueChanged(const Pokemod::Script& script);
         void on_varIsGhost_clicked(const bool isGhost);
diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp
index 7111d155..b09b3315 100644
--- a/pokemodr/MapTrainerUI.cpp
+++ b/pokemodr/MapTrainerUI.cpp
@@ -95,7 +95,7 @@ void Pokemodr::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass
     static_cast<Pokemod::MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt());
 }
 
-void Pokemodr::MapTrainerUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate)
+void Pokemodr::MapTrainerUI::on_varCoordinate_valueChanged(const QPoint& coordinate)
 {
     static_cast<Pokemod::MapTrainer*>(modified())->setCoordinate(coordinate);
 }
diff --git a/pokemodr/MapTrainerUI.h b/pokemodr/MapTrainerUI.h
index ab1e052c..40593992 100644
--- a/pokemodr/MapTrainerUI.h
+++ b/pokemodr/MapTrainerUI.h
@@ -45,7 +45,7 @@ class MapTrainerUI : public ObjectUI, private Ui::formMapTrainer
     protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varTrainerClass_activated(const int trainerClass);
-        void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate);
+        void on_varCoordinate_valueChanged(const QPoint& coordinate);
         void on_varNumberFight_valueChanged(const int numberFight);
         void on_varScript_valueChanged(const Pokemod::Script& script);
         void on_varLeadTeamMember_activated(const int leadTeamMember);
diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index 33c4e070..4cd471c2 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -96,7 +96,7 @@ void Pokemodr::MapWarpUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
-void Pokemodr::MapWarpUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate)
+void Pokemodr::MapWarpUI::on_varCoordinate_valueChanged(const QPoint& coordinate)
 {
     static_cast<Pokemod::MapWarp*>(modified())->setCoordinate(coordinate);
 }
diff --git a/pokemodr/MapWarpUI.h b/pokemodr/MapWarpUI.h
index 69159603..1d2186f1 100644
--- a/pokemodr/MapWarpUI.h
+++ b/pokemodr/MapWarpUI.h
@@ -44,7 +44,7 @@ class MapWarpUI : public ObjectUI, private Ui::formMapWarp
         void discard();
     protected slots:
         void on_varName_textChanged(const QString& name);
-        void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate);
+        void on_varCoordinate_valueChanged(const QPoint& coordinate);
         void on_varType_activated(const int type);
         void on_varToMap_activated(const int toMap);
         void on_varToWarp_activated(const int toWarp);
diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp
index 97a9fd00..f4f9ce1a 100644
--- a/pokemodr/MoveUI.cpp
+++ b/pokemodr/MoveUI.cpp
@@ -47,6 +47,7 @@ void Pokemodr::MoveUI::refreshGui()
 void Pokemodr::MoveUI::setGui()
 {
     varName->setText(static_cast<Pokemod::Move*>(modified())->name());
+    varPriority->setValue(static_cast<Pokemod::Move*>(modified())->priority());
     varAccuracy->setValue(static_cast<Pokemod::Move*>(modified())->accuracy());
     varPower->setValue(static_cast<Pokemod::Move*>(modified())->power());
     varType->setCurrentIndex(varType->findData(static_cast<Pokemod::Move*>(modified())->type()));
@@ -77,6 +78,11 @@ void Pokemodr::MoveUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
+void Pokemodr::MoveUI::on_varPriority_valueChanged(const int priority)
+{
+    static_cast<Pokemod::Move*>(modified())->setPriority(priority);
+}
+
 void Pokemodr::MoveUI::on_varAccuracy_valueChanged(const Pokemod::Fraction& accuracy)
 {
     static_cast<Pokemod::Move*>(modified())->setAccuracy(accuracy);
diff --git a/pokemodr/MoveUI.h b/pokemodr/MoveUI.h
index 95fc7806..f22c2c35 100644
--- a/pokemodr/MoveUI.h
+++ b/pokemodr/MoveUI.h
@@ -44,6 +44,7 @@ class MoveUI : public ObjectUI, private Ui::formMove
         void discard();
     protected slots:
         void on_varName_textChanged(const QString& name);
+        void on_varPriority_valueChanged(const int priority);
         void on_varAccuracy_valueChanged(const Pokemod::Fraction& accuracy);
         void on_varPower_valueChanged(const int power);
         void on_varType_activated(const int type);
diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp
index 67a0390c..6b15b33f 100644
--- a/pokemodr/NatureUI.cpp
+++ b/pokemodr/NatureUI.cpp
@@ -43,7 +43,8 @@ void Pokemodr::NatureUI::refreshGui()
 {
     varStat->clear();
     const bool isSplit = pokemod()->rules()->specialSplit();
-    varStat->addItems((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr).mid(0, isSplit ? Pokemod::ST_End_RBY : Pokemod::ST_End_GSC));
+    for (int i = Pokemod::ST_No_HP_Start; i < isSplit ? Pokemod::ST_End_RBY : Pokemod::ST_End_GSC; ++i)
+        varStat->addItem((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr)[i], i);
 }
 
 void Pokemodr::NatureUI::setGui()
diff --git a/pokemodr/PointWidget.cpp b/pokemodr/PointWidget.cpp
index 47209153..82168925 100644
--- a/pokemodr/PointWidget.cpp
+++ b/pokemodr/PointWidget.cpp
@@ -18,29 +18,29 @@
 // Header include
 #include "PointWidget.h"
 
-Pokemodr::PointWidget::PointWidget(QWidget* parent, const Pokemod::Point& value) :
+Pokemodr::PointWidget::PointWidget(QWidget* parent, const QPoint& value) :
         QWidget(parent),
         m_value(value)
 {
     setupUi(this);
 }
 
-Pokemod::Point Pokemodr::PointWidget::value() const
+QPoint Pokemodr::PointWidget::value() const
 {
     return m_value;
 }
 
-void Pokemodr::PointWidget::setValue(const Pokemod::Point& value)
+void Pokemodr::PointWidget::setValue(const QPoint& value)
 {
     if (m_value == value)
         return;
     m_value = value;
     varX->setValue(m_value.x());
     varY->setValue(m_value.y());
-    emit(valueChanged(true));
+    emit(valueChanged(m_value));
 }
 
-void Pokemodr::PointWidget::setMaximum(const Pokemod::Point& maximum)
+void Pokemodr::PointWidget::setMaximum(const QPoint& maximum)
 {
     varX->setMaximum(maximum.x());
     varY->setMaximum(maximum.y());
@@ -49,11 +49,11 @@ void Pokemodr::PointWidget::setMaximum(const Pokemod::Point& maximum)
 void Pokemodr::PointWidget::on_varX_valueChanged(const int x)
 {
     m_value.setX(x);
-    emit(valueChanged(true));
+    emit(valueChanged(m_value));
 }
 
 void Pokemodr::PointWidget::on_varY_valueChanged(const int y)
 {
     m_value.setY(y);
-    emit(valueChanged(true));
+    emit(valueChanged(m_value));
 }
diff --git a/pokemodr/PointWidget.h b/pokemodr/PointWidget.h
index 4300dbb1..20cf9031 100644
--- a/pokemodr/PointWidget.h
+++ b/pokemodr/PointWidget.h
@@ -18,10 +18,8 @@
 #ifndef __POKEMODR_POINTWIDGET__
 #define __POKEMODR_POINTWIDGET__
 
-// Pokemod includes
-#include "../pokemod/Point.h"
-
 // Qt includes
+#include <QtCore/QPoint>
 #include <QtGui/QWidget>
 
 // Form include
@@ -34,19 +32,19 @@ class PointWidget : public QWidget, private Ui::formPoint
     Q_OBJECT
     
     public:
-        PointWidget(QWidget* parent, const Pokemod::Point& value = Pokemod::Point(0, 0));
+        PointWidget(QWidget* parent, const QPoint& value = QPoint(0, 0));
         
-        Pokemod::Point value() const;
+        QPoint value() const;
     signals:
-        void valueChanged(const Pokemod::Point&);
+        void valueChanged(const QPoint&);
     public slots:
-        void setValue(const Pokemod::Point& value);
-        void setMaximum(const Pokemod::Point& maximum);
+        void setValue(const QPoint& value);
+        void setMaximum(const QPoint& maximum);
     protected slots:
         void on_varX_valueChanged(const int x);
         void on_varY_valueChanged(const int y);
     private:
-        Pokemod::Point m_value;
+        QPoint m_value;
 };
 }
 
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index ca733e9e..c6f65655 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -39,6 +39,7 @@ void Pokemodr::RulesUI::setGui()
     varCriticalDomains->setChecked(static_cast<Pokemod::Rules*>(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked);
     varHardCash->setChecked(static_cast<Pokemod::Rules*>(modified())->hardCash() ? Qt::Checked : Qt::Unchecked);
     varSwitchStyle->setChecked(static_cast<Pokemod::Rules*>(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked);
+    varUseTurns->setChecked(static_cast<Pokemod::Rules*>(modified())->useTurns() ? Qt::Checked : Qt::Unchecked);
     boxSplitSpecial->setChecked(static_cast<Pokemod::Rules*>(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked);
     varSplitSpecialDV->setCheckState(static_cast<Pokemod::Rules*>(modified())->specialDVSplit() ? Qt::Checked : Qt::Unchecked);
     boxHappiness->setChecked(static_cast<Pokemod::Rules*>(modified())->happiness() ? Qt::Checked : Qt::Unchecked);
@@ -105,6 +106,11 @@ void Pokemodr::RulesUI::on_varSwitchStyle_toggled(const bool switchStyle)
     static_cast<Pokemod::Rules*>(modified())->setAllowSwitchStyle(switchStyle);
 }
 
+void Pokemodr::RulesUI::on_varUseTurns_toggled(const bool useTurns)
+{
+    static_cast<Pokemod::Rules*>(modified())->setUseTurns(useTurns);
+}
+
 void Pokemodr::RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial)
 {
     static_cast<Pokemod::Rules*>(modified())->setSpecialSplit(splitSpecial);
diff --git a/pokemodr/RulesUI.h b/pokemodr/RulesUI.h
index 9b4c5941..7097c7e1 100644
--- a/pokemodr/RulesUI.h
+++ b/pokemodr/RulesUI.h
@@ -48,6 +48,7 @@ class RulesUI : public ObjectUI, private Ui::formRules
         void on_varCriticalDomains_toggled(const bool criticalDomains);
         void on_varHardCash_toggled(const bool hardCash);
         void on_varSwitchStyle_toggled(const bool switchStyle);
+        void on_varUseTurns_toggled(const bool useTurns);
         void on_boxSplitSpecial_toggled(const bool specialSplit);
         void on_varSplitSpecialDV_toggled(const bool specialSplitDV);
         void on_boxHappiness_toggled(const bool happiness);
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index 90f23107..2e08101d 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -22,6 +22,22 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="boxPriority" >
+     <property name="title" >
+      <string>Priority</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>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="boxDescription" >
      <property name="title" >
       <string>Description</string>
@@ -67,6 +83,11 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
+   <class>KIntNumInput</class>
+   <extends>QWidget</extends>
+   <header location="global" >KIntNumInput</header>
+  </customwidget>
+  <customwidget>
    <class>Pokemodr::ScriptWidget</class>
    <extends>QWidget</extends>
    <header>ScriptWidget.h</header>
diff --git a/pokemodr/gui/fraction.ui b/pokemodr/gui/fraction.ui
index 51bd76f9..32b660c9 100644
--- a/pokemodr/gui/fraction.ui
+++ b/pokemodr/gui/fraction.ui
@@ -10,24 +10,28 @@
     </widget>
    </item>
    <item>
-    <widget class="KIntNumInput" name="varNumerator" >
-     <property name="label" >
-      <string>Numerator</string>
-     </property>
-     <property name="minimum" >
-      <number>0</number>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="KIntNumInput" name="varDenominator" >
-     <property name="label" >
-      <string>Denominator</string>
-     </property>
-     <property name="minimum" >
-      <number>1</number>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="KIntNumInput" name="varNumerator" >
+       <property name="label" >
+        <string>Numerator</string>
+       </property>
+       <property name="minimum" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="KIntNumInput" name="varDenominator" >
+       <property name="label" >
+        <string>Denominator</string>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui
index 9f9883d5..d125e1ea 100644
--- a/pokemodr/gui/map.ui
+++ b/pokemodr/gui/map.ui
@@ -29,6 +29,9 @@
      <property name="checkable" >
       <bool>true</bool>
      </property>
+     <property name="checked" >
+      <bool>false</bool>
+     </property>
      <layout class="QHBoxLayout" >
       <item>
        <widget class="KComboBox" name="varFlyWarp" >
@@ -58,35 +61,37 @@
    </item>
    <item>
     <widget class="QGroupBox" name="boxTilemap" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
       <string>Tilemap</string>
      </property>
      <layout class="QGridLayout" >
-      <item rowspan="6" row="0" column="0" >
+      <item rowspan="7" row="0" column="0" >
        <widget class="QTableView" name="varTilemap" >
         <property name="selectionMode" >
          <enum>QAbstractItemView::SingleSelection</enum>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="KPushButton" name="buttonAddRow" >
-        <property name="text" >
-         <string>Add Row</string>
-        </property>
-       </widget>
+      <item row="6" column="1" >
+       <widget class="KComboBox" name="varTile" />
       </item>
-      <item row="1" column="1" >
-       <widget class="KPushButton" name="buttonInsertRow" >
+      <item row="5" column="1" >
+       <widget class="KPushButton" name="buttonDeleteColumn" >
         <property name="text" >
-         <string>Insert Row</string>
+         <string>Delete Column</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="KPushButton" name="buttonDeleteRow" >
+      <item row="4" column="1" >
+       <widget class="KPushButton" name="buttonInsertColumn" >
         <property name="text" >
-         <string>Delete Row</string>
+         <string>Insert Column</string>
         </property>
        </widget>
       </item>
@@ -97,39 +102,30 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="KPushButton" name="buttonInsertColumn" >
+      <item row="2" column="1" >
+       <widget class="KPushButton" name="buttonDeleteRow" >
         <property name="text" >
-         <string>Insert Column</string>
+         <string>Delete Row</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1" >
-       <widget class="KPushButton" name="buttonDeleteColumn" >
+      <item row="1" column="1" >
+       <widget class="KPushButton" name="buttonInsertRow" >
         <property name="text" >
-         <string>Delete Column</string>
+         <string>Insert Row</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0" colspan="2" >
-       <widget class="KComboBox" name="varTile" />
+      <item row="0" column="1" >
+       <widget class="KPushButton" name="buttonAddRow" >
+        <property name="text" >
+         <string>Add Row</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <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>
  <customwidgets>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index ca2f7ab7..a0495ad6 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -22,6 +22,22 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="boxPriority" >
+     <property name="title" >
+      <string>Priority</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>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="boxAccuracy" >
      <property name="title" >
       <string>Accuracy</string>
diff --git a/pokemodr/gui/point.ui b/pokemodr/gui/point.ui
index 13b71c63..a52bf955 100644
--- a/pokemodr/gui/point.ui
+++ b/pokemodr/gui/point.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <class>formPoint</class>
  <widget class="QWidget" name="formPoint" >
-  <layout class="QVBoxLayout" >
+  <layout class="QHBoxLayout" >
    <item>
     <widget class="KIntNumInput" name="varX" >
      <property name="label" >
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index bfac7a4a..29f65b62 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -62,11 +62,24 @@
           </item>
           <item>
            <widget class="QCheckBox" name="varSwitchStyle" >
+            <property name="toolTip" >
+             <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>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="varUseTurns" >
+            <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="text" >
+             <string>Use Turns</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>