Menu
▾
▴
[Rails-commits] 2 commits - data/1830 data/1851 data/1889 data/18AL data/18GA data/18Kaas data/18VA
|
From: Erik V. <ev...@us...> - 2011-08-01 15:43:01
|
data/1830/Game.xml | 10 ++--------
data/1851/Game.xml | 7 ++-----
data/1889/Game.xml | 10 ++--------
data/18AL/Game.xml | 5 +----
data/18GA/Game.xml | 5 +----
data/18Kaas/Game.xml | 5 +----
data/18VA/Game.xml | 2 +-
7 files changed, 10 insertions(+), 34 deletions(-)
New commits:
commit f34e7b0a07e66e1c6c3d5e9e2eb113b97d4ed835
Merge: 1048c31 0f7b51b
Author: Erik Vos <eri...@xs...>
Date: Mon Aug 1 17:42:32 2011 +0200
Merge branch 'master' of ssh://evos:lsv...@ra.../gitroot/rails/rails
commit 1048c314a9c30def5245767f473f2826bea153f5
Author: Erik Vos <eri...@xs...>
Date: Mon Aug 1 17:39:59 2011 +0200
All train types now have a default 'quantity'
diff --git a/data/1830/Game.xml b/data/1830/Game.xml
index 6ef5513..f885604 100644
--- a/data/1830/Game.xml
+++ b/data/1830/Game.xml
@@ -171,14 +171,11 @@
<Attributes quantity="4"/>
</IfOption>
</TrainType>
- <TrainType name="6" majorStops="6" cost="630">
+ <TrainType name="6" majorStops="6" cost="630" quantity="2">
<NewPhase phaseName="6"/>
<IfOption name="WithOptional6Train" value="yes">
<Attributes quantity="3"/>
</IfOption>
- <IfOption name="WithOptional6Train" value="no">
- <Attributes quantity="2"/>
- </IfOption>
<IfOption name="Variant" value="Coalfields,Reading">
<Attributes quantity="3" releasedTrain="7,D"/>
</IfOption>
@@ -196,7 +193,7 @@
<TrainType name="7" majorStops="7" cost="830" quantity="-1"/>
</IfOption>
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&Reading,Simple">
- <TrainType name="D" majorStops="99">
+ <TrainType name="D" majorStops="99" quantity="6">
<NewPhase phaseName="D"/>
<IfOption name="Variant" value="Basegame,Pere Marquette,Simple">
<Attributes cost="1100"/>
@@ -209,9 +206,6 @@
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes quantity="6"/>
- </IfOption>
<Exchange cost="800"/>
</TrainType>
</IfOption>
diff --git a/data/1851/Game.xml b/data/1851/Game.xml
index 574f68f..bba23f2 100644
--- a/data/1851/Game.xml
+++ b/data/1851/Game.xml
@@ -70,14 +70,11 @@
<TrainType name="6" majorStops="6" cost="600" quantity="2">
<NewPhase phaseName="6"/>
</TrainType>
- <TrainType name="8" majorStops="8" cost="800">
+ <TrainType name="8" majorStops="8" cost="800" quantity="4">
<NewPhase phaseName="8"/>
- <IfOption name="UnlimitedTopTrains" value="yes">
+ <IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes quantity="4"/>
- </IfOption>
</TrainType>
<TrainBuyingRules>
<FaceValueIfDifferentPresidents/>
diff --git a/data/1889/Game.xml b/data/1889/Game.xml
index 5fddf24..19a5014 100644
--- a/data/1889/Game.xml
+++ b/data/1889/Game.xml
@@ -92,23 +92,17 @@
<TrainType name="5" majorStops="5" cost="450" quantity="3">
<NewPhase phaseName="5"/>
</TrainType>
- <TrainType name="6" majorStops="6" cost="630">
+ <TrainType name="6" majorStops="6" cost="630" quantity="2">
<NewPhase phaseName="6"/>
<IfOption name="WithOptional6Train" value="yes">
<Attributes quantity="3"/>
</IfOption>
- <IfOption name="WithOptional6Train" value="no">
- <Attributes quantity="2"/>
- </IfOption>
</TrainType>
- <TrainType name="D" majorStops="99" cost="1100">
+ <TrainType name="D" majorStops="99" cost="1100" quantity="6">
<NewPhase phaseName="D"/>
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes quantity="6"/>
- </IfOption>
<Exchange cost="800"/>
</TrainType>
</Component>
diff --git a/data/18AL/Game.xml b/data/18AL/Game.xml
index 9c59f20..ecef46d 100644
--- a/data/18AL/Game.xml
+++ b/data/18AL/Game.xml
@@ -74,14 +74,11 @@
<TrainType name="7" majorStops="7" cost="700" quantity="1">
<NewPhase phaseName="7"/>
</TrainType>
- <TrainType name="4D" majorStops="4" cost="800">
+ <TrainType name="4D" majorStops="4" cost="800" quantity="5">
<NewPhase phaseName="4D"/>
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes quantity="5"/>
- </IfOption>
<Reach countTowns="no"/>
<Score scoreCities="double"/>
<Exchange cost="800"/>
diff --git a/data/18GA/Game.xml b/data/18GA/Game.xml
index 926f5f1..e1c5c9b 100644
--- a/data/18GA/Game.xml
+++ b/data/18GA/Game.xml
@@ -77,14 +77,11 @@
<TrainType name="6" majorStops="6" cost="630" quantity="2">
<NewPhase phaseName="6"/>
</TrainType>
- <TrainType name="8" majorStops="8" cost="800">
+ <TrainType name="8" majorStops="8" cost="800" quantity="5">
<NewPhase phaseName="8"/>
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
- <IfOption name="UnlimitedTopTrains" value="no">
- <Attributes quantity="5"/>
- </IfOption>
</TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
diff --git a/data/18Kaas/Game.xml b/data/18Kaas/Game.xml
index ecd583f..0aa433f 100644
--- a/data/18Kaas/Game.xml
+++ b/data/18Kaas/Game.xml
@@ -59,14 +59,11 @@
<TrainType name="5" majorStops="5" cost="450" quantity="3">
<NewPhase phaseName="5"/>
</TrainType>
- <TrainType name="6" majorStops="6" cost="630">
+ <TrainType name="6" majorStops="6" cost="630" quantity="2">
<NewPhase phaseName="6"/>
<IfOption name="WithOptional6Train" value="yes">
<Attributes quantity="3"/>
</IfOption>
- <IfOption name="WithOptional6Train" value="no">
- <Attributes quantity="2"/>
- </IfOption>
</TrainType>
<TrainType name="D" majorStops="99" cost="1100" quantity="6">
<NewPhase phaseName="D"/>
diff --git a/data/18VA/Game.xml b/data/18VA/Game.xml
index 1b0c89f..0d66c61 100644
--- a/data/18VA/Game.xml
+++ b/data/18VA/Game.xml
@@ -74,7 +74,7 @@
<TrainType name="5" majorStops="5" cost="500" quantity="3">
<NewPhase phaseName="5"/>
</TrainType>
- <TrainType name="6" majorStops="6" cost="600">
+ <TrainType name="6" majorStops="6" cost="600" quantity="2">
<NewPhase phaseName="6"/>
</TrainType>
<TrainType name="4D" majorStops="99" cost="800" quantity="10">
|
