[FIX] Added a static poll method to Fraction

[FIX] More Arena stuff fleshed out
[FIX] Added priority scripts to Ability and Move
[FIX] A SigmodWrapper pointer is now passed around the containments
[FIX] Config now has templated methods for retrieving values

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

1 files changed, 11 insertions, 6 deletions

diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp
index 98f13702..6c21cc38 100644
--- a/sigscript/MoveWrapper.cpp
+++ b/sigscript/MoveWrapper.cpp
@@ -41,15 +41,15 @@ QString Sigscript::MoveWrapper::name() const
 
 Sigmod::Fraction Sigscript::MoveWrapper::accuracy() const
 {
-    if (value("accuracy").canConvert<Sigmod::Fraction>())
-        return value("accuracy").value<Sigmod::Fraction>();
+    if (hasValueOfType<Sigmod::Fraction>("accuracy"))
+        return valueOfType<Sigmod::Fraction>("accuracy");
     return m_move->accuracy();
 }
 
 int Sigscript::MoveWrapper::power() const
 {
-    if (value("power").canConvert<int>())
-        return value("power").toInt();
+    if (hasValueOfType<int>("power"))
+        return valueOfType<int>("power");
     return m_move->power();
 }
 
@@ -70,8 +70,8 @@ int Sigscript::MoveWrapper::powerPoints() const
 
 int Sigscript::MoveWrapper::priority() const
 {
-    if (value("priority").canConvert<int>())
-        return value("priority").toInt();
+    if (hasValueOfType<int>("priority"))
+        return valueOfType<int>("priority");
     return m_move->priority();
 }
 
@@ -89,3 +89,8 @@ Sigmod::Script Sigscript::MoveWrapper::worldScript() const
 {
     return m_move->worldScript();
 }
+
+Sigmod::Script Sigscript::MoveWrapper::priorityScript() const
+{
+    return m_move->priorityScript();
+}