Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19059/rails/game/specific/_1856
Modified Files:
CGRFormationRound.java
Log Message:
Prevent CGR getting more than 1 bonus of the same type (e.g. Bridge)
Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CGRFormationRound.java 27 Dec 2009 18:30:11 -0000 1.25
--- CGRFormationRound.java 27 Dec 2009 23:17:19 -0000 1.26
***************
*** 539,546 ****
if (comp.getBonuses() != null) {
List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
! for (Bonus bonus : bonuses) {
cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(),
bonus.getLocations()));
- comp.removeBonus(bonus);
}
}
--- 539,552 ----
if (comp.getBonuses() != null) {
List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
! bonuses: for (Bonus bonus : bonuses) {
! comp.removeBonus(bonus);
! // Only add if the CGR does not already have the same bonus
! if (cgr.getBonuses() != null) {
! for (Bonus b : cgr.getBonuses()) {
! if (b.equals(bonus)) continue bonuses;
! }
! }
cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(),
bonus.getLocations()));
}
}
|
