pcgen-commit-svn
|
From: <nuance@us...> - 2010-10-29 15:17:35
|
Revision: 13607
http://pcgen.svn.sourceforge.net/pcgen/?rev=13607&view=rev
Author: nuance
Date: 2010-10-29 15:17:28 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Fix JIRA CODE-369
http://jira.pcgen.org/browse/CODE-369
Modified the default movement code to index the movements array instaed of copying out one of its values. Set the index to defaut to 0 and be overridden by assigning a WALK movement type.
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/Movement.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/Movement.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2010-10-29 09:37:57 UTC (rev 13606)
+++ Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2010-10-29 15:17:28 UTC (rev 13607)
@@ -81,7 +81,7 @@
* CONSIDER I don't know why this variable exists?? - it seems to me it's
* duplicate of movements[0]
*/
- private Double movement;
+ private int movement;
/*
* REFACTOR Once PlayerCharacter is capable of using a CompositeMovement to
@@ -110,6 +110,11 @@
movements = new Double[i];
movementMult = new Double[i];
movementMultOp = new String[i];
+
+ // default the basic movement to the first movement type, if the creature has a
+ // walk speed in some entry other than 0 this will be changed by the assign
+ // movement operation.
+ movement = 0;
}
/**
@@ -137,18 +142,20 @@
}
/**
- * TODO REFACTOR Some of these methods might need to be rebuilt - should this be
- * dependent upon an index, or keyed off of a String name of a movementType?
+ * Return the creature's basic movement, this will be set to the walk
+ * speed (if the creature has one) by the assign movement operation.
+ * If no walk speed is assigned to the creature then the first movement
+ * defined is returned.
* @return movement as a Double
*/
public Double getDoubleMovement()
{
- return movement;
+ return movements[movement];
}
/**
* Get a movement multiplier
- * @param index
+ * @param index of the specified movement multiplier
* @return a movement multiplier
*/
public Double getMovementMult(int index)
@@ -158,7 +165,7 @@
/**
* a movement multiplier operator
- * @param index
+ * @param index of the specified movement
* @return a movement multiplier operator
*/
public String getMovementMultOp(int index)
@@ -444,7 +451,7 @@
if ("Walk".equals(movementTypes[x]))
{
- movement = movements[x];
+ movement = x;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jdempsey@us...> - 2012-08-27 09:09:40
|
Revision: 17082
http://pcgen.svn.sourceforge.net/pcgen/?rev=17082&view=rev
Author: jdempsey
Date: 2012-08-27 09:09:27 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Avoid non significant 0 in racial speed
Issue#: CODE-1549
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/Movement.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/Movement.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2012-08-27 08:24:57 UTC (rev 17081)
+++ Trunk/pcgen/code/src/java/pcgen/core/Movement.java 2012-08-27 09:09:27 UTC (rev 17082)
@@ -24,6 +24,7 @@
package pcgen.core;
import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.StringTokenizer;
import pcgen.util.Logging;
@@ -289,14 +290,15 @@
if (movementTypes != null && movementTypes.length > 0)
{
movelabel.append(movementTypes[0]);
+ NumberFormat numFmt = NumberFormat.getNumberInstance();
movelabel.append(' ').append(
- Globals.getGameModeUnitSet().convertDistanceToUnitSet(
- movements[0].doubleValue()));
+ numFmt.format(Globals.getGameModeUnitSet()
+ .convertDistanceToUnitSet(movements[0].doubleValue())));
movelabel.append(Globals.getGameModeUnitSet().getDistanceUnit());
if (movementMult[0].doubleValue() != 0)
{
- movelabel.append('(').append(movementMultOp[0]).append(
- movementMult[0]).append(')');
+ movelabel.append('(').append(movementMultOp[0])
+ .append(numFmt.format(movementMult[0])).append(')');
}
for (int i = 1; i < movementTypes.length; ++i)
@@ -304,14 +306,14 @@
movelabel.append(", ");
movelabel.append(movementTypes[i]);
movelabel.append(' ').append(
- Globals.getGameModeUnitSet().convertDistanceToUnitSet(
- movements[i].doubleValue()));
+ numFmt.format(Globals.getGameModeUnitSet()
+ .convertDistanceToUnitSet(movements[i].doubleValue())));
movelabel
.append(Globals.getGameModeUnitSet().getDistanceUnit());
if (movementMult[i].doubleValue() != 0)
{
- movelabel.append('(').append(movementMultOp[i]).append(
- movementMult[i]).append(')');
+ movelabel.append('(').append(movementMultOp[i])
+ .append(numFmt.format(movementMult[i])).append(')');
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|