data/1870/TileSet.xml | 2 +-
data/18AL/TileSet.xml | 2 +-
data/18Kaas/TileSet.xml | 2 +-
rails/game/OperatingRound.java | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit e9fbe53c5ef3c0b6f047771d478dbd919a7ad1db
Author: Erik Vos <eri...@xs...>
Date: Sun Nov 13 14:35:29 2011 +0100
Fixed two 18AL bugs.
1. (reported by Thomas Wall Hannaford):
Green tile #25 was not upgradeable to #45 and #46.
This fix also applies to 1870 and 18Kaas.
2. (reported by Hildebrand Tigelaar):
The registration of buying one train to prevent any further buys was not undoable.
This fix probably also applies to other games where similar buying restrictions exist.
diff --git a/data/1870/TileSet.xml b/data/1870/TileSet.xml
index 3a1b9d1..9fc9fd2 100644
--- a/data/1870/TileSet.xml
+++ b/data/1870/TileSet.xml
@@ -80,7 +80,7 @@
<Upgrade id="42,43,46,47" />
</Tile>
<Tile id="25" quantity="3">
- <Upgrade id="40" />
+ <Upgrade id="40,45,46" />
</Tile>
<Tile id="26" quantity="2">
<Upgrade id="42,44,45" />
diff --git a/data/18AL/TileSet.xml b/data/18AL/TileSet.xml
index 9afa970..9247c8c 100644
--- a/data/18AL/TileSet.xml
+++ b/data/18AL/TileSet.xml
@@ -82,7 +82,7 @@
<Upgrade id="42,43,46,47" />
</Tile>
<Tile id="25" quantity="1">
- <Upgrade id="40" />
+ <Upgrade id="40,45,46" />
</Tile>
<Tile id="26" quantity="1">
<Upgrade id="42,44,45" />
diff --git a/data/18Kaas/TileSet.xml b/data/18Kaas/TileSet.xml
index fe8ff75..87cc7f0 100644
--- a/data/18Kaas/TileSet.xml
+++ b/data/18Kaas/TileSet.xml
@@ -77,7 +77,7 @@
<Upgrade id="42,43,46,47" />
</Tile>
<Tile id="25" quantity="1">
- <Upgrade id="40" />
+ <Upgrade id="40,45,46" />
</Tile>
<Tile id="26" quantity="1">
<Upgrade id="42,44,45" />
diff --git a/rails/game/OperatingRound.java b/rails/game/OperatingRound.java
index 458a6a7..604caeb 100644
--- a/rails/game/OperatingRound.java
+++ b/rails/game/OperatingRound.java
@@ -2749,7 +2749,9 @@ public class OperatingRound extends Round implements Observer {
}
if (oldHolder.getOwner() instanceof Bank) {
- trainsBoughtThisTurn.add(train.getCertType());
+ //trainsBoughtThisTurn.add(train.getCertType());
+ new AddToList<TrainCertificateType>(trainsBoughtThisTurn, train.getCertType(),
+ operatingCompany.get().getName()+"_TrainsBoughtThisTurn");
}
if (stb != null) {
|
