Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8794/rails/game
Modified Files:
TileI.java Tile.java
Log Message:
Updated and refactored revenue calculation, added support for 1835
Index: TileI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TileI.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TileI.java 4 Apr 2010 22:02:53 -0000 1.18
--- TileI.java 14 May 2010 15:19:57 -0000 1.19
***************
*** 5,8 ****
--- 5,9 ----
import java.util.Map;
+ import rails.algorithms.RevenueBonusTemplate;
import rails.util.Tag;
***************
*** 69,71 ****
--- 70,75 ----
public int getQuantity();
+
+ public List<RevenueBonusTemplate> getRevenueBonuses();
+
}
Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Tile.java 11 May 2010 21:47:21 -0000 1.39
--- Tile.java 14 May 2010 15:19:57 -0000 1.40
***************
*** 6,9 ****
--- 6,10 ----
import java.util.regex.Pattern;
+ import rails.algorithms.RevenueBonusTemplate;
import rails.game.model.ModelObject;
import rails.util.LocalText;
***************
*** 83,86 ****
--- 84,90 ----
private final ArrayList<MapHex> tilesLaid = new ArrayList<MapHex>();
+ /** Storage of revenueBonus that are bound to the tile */
+ protected List<RevenueBonusTemplate> revenueBonuses = null;
+
public Tile(Integer id) {
this.id = id;
***************
*** 269,273 ****
}
}
!
}
--- 273,286 ----
}
}
!
! // revenue bonus
! List<Tag> bonusTags = setTag.getChildren("RevenueBonus");
! if (bonusTags != null) {
! revenueBonuses = new ArrayList<RevenueBonusTemplate>();
! for (Tag bonusTag:bonusTags) {
! revenueBonuses.add(new RevenueBonusTemplate(bonusTag));
! }
! }
!
}
***************
*** 480,484 ****
return quantity;
}
!
@Override
public String toString() {
--- 493,501 ----
return quantity;
}
!
! public List<RevenueBonusTemplate> getRevenueBonuses() {
! return revenueBonuses;
! }
!
@Override
public String toString() {
|
