mirror of https://github.com/FreeCol/freecol.git
Map changes
New Mazim maps added, damaged rivers in old maps repaired, authors of old maps itentifed, all maps renamed to include size and author info. Map properties file updated too.
This commit is contained in:
Blakeley00
Mike Pope
parent
87a5536e81
commit
5b617fe8d8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -3545,12 +3545,29 @@ mapEditorTransformPanel.setRiverStyle=Set river style
|
|||
mapEditorTransformPanel.resource=Change/remove resource
|
||||
|
||||
# MapGeneratorOptionsDialog
|
||||
freecol.map.Africa=Africa
|
||||
freecol.map.America_large=America (large)
|
||||
freecol.map.Australia=Australia
|
||||
freecol.map.Caribbean_basin=Caribbean Basin
|
||||
freecol.map.Caribbean_large=Caribbean (large)
|
||||
freecol.map.South_America=South America
|
||||
freecol.map.L_America_JsTheDude=<html>L America<br><font size="-2">By JsTheDude</font></html>
|
||||
freecol.map.L_America_Mazim=<html>L America<br>By Mazim</html>
|
||||
freecol.map.L_Asia_Mazim=<html>L Asia<br>By Mazim</html>
|
||||
freecol.map.L_PacificSouth_Mazim=<html>L Pacific South<br>By Mazim</html>
|
||||
freecol.map.L_TheOldWorld_Mazim=<html>L The Old World<br>By Mazim</html>
|
||||
freecol.map.M_Africa_Gilolat=<html>M Africa<br>By Gilolat</html>
|
||||
freecol.map.M_Africa_Mazim=<html>M Africa<br>By Mazim</html>
|
||||
freecol.map.M_America_Mazim=<html>M America<br>By Mazim</html>
|
||||
freecol.map.M_AustraliaOceania_Mazim=<html>M Australia<br>Oceania<br>By Mazim</html>
|
||||
freecol.map.M_Caribbean_Piotrus=<html>M Caribbean Basin<br>By Piotrus</html>
|
||||
freecol.map.M_CaribbeanIslands_Mazim=<html>M Caribbean Islands<br>By Mazim</html>
|
||||
freecol.map.M_Eurasia_Mazim=<html>M Eurasia<br>By Mazim</html>
|
||||
freecol.map.M_NorthAmerica_Mazim=<html>M North America 2<br>By Mazim</html>
|
||||
freecol.map.M_NorthAmerica2_Mazim=<html>M North<br>America<br>By Mazim</html>
|
||||
freecol.map.M_SouthAmerica_Mazim=<html>M South<br>America<br>By Mazim</html>
|
||||
freecol.map.S_Arabias_Mazim=<html>S Arabias<br>By Mazim</html>
|
||||
freecol.map.S_AustraliaOceania_Gilolat=<html>S Australia<br>Oceania<br>By Gilolat</html>
|
||||
freecol.map.S_Caribbean_Phil=<html>S Caribbean Basin<br>By Phil</html>
|
||||
freecol.map.S_FeudalJapan_Mazim=<html>S Feudal Japan<br>By Mazim</html>
|
||||
freecol.map.S_SouthEastAsia_Mazim=<html>S South East Asia<br>By Mazim</html>
|
||||
freecol.map.S_USA_Mazim=<html>S USA<br>By Mazim</html>
|
||||
freecol.map.XL_GigaEarth_Mazim=<html>XL Giga Earth<br>By Mazim</html>
|
||||
freecol.map.XXL_HugeWorld_Mazim=<html>XXL Huge World<br>By Mazim</html>
|
||||
mapGeneratorOptionsDialog.badWidth=Map width (%width%) is too narrow, less than 4 times edge-distance (%edge%)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -114,22 +114,10 @@ public class SerializationTest extends FreeColTestCase {
|
|||
ServerTestHelper.stopServerGame();
|
||||
}
|
||||
|
||||
public void testMapAfrica() throws Exception {
|
||||
validateMap("data/maps/Africa.fsm");
|
||||
}
|
||||
|
||||
public void testMapAustralia() throws Exception {
|
||||
validateMap("data/maps/Australia.fsm");
|
||||
}
|
||||
|
||||
public void testMapAmerica() throws Exception {
|
||||
validateMap("data/maps/America_large.fsm");
|
||||
validateMap("data/maps/South_America.fsm");
|
||||
}
|
||||
|
||||
public void testMapCaribbean() throws Exception {
|
||||
validateMap("data/maps/Caribbean_basin.fsm");
|
||||
validateMap("data/maps/Caribbean_large.fsm");
|
||||
public void testStandardMaps() throws Exception {
|
||||
for (String name : FreeColTestCase.STANDARD_MAPS) {
|
||||
validateMap(name);
|
||||
}
|
||||
}
|
||||
|
||||
public void testStringTemplate() throws Exception {
|
||||
|
|
|
|||
|
|
@ -183,23 +183,40 @@ public class MapGeneratorTest extends FreeColTestCase {
|
|||
* Make sure we can import all distributed maps.
|
||||
*/
|
||||
public void testImportMap() {
|
||||
Game game = getStandardGame();
|
||||
final Specification spec = game.getSpecification();
|
||||
|
||||
MapGenerator gen = new SimpleMapGenerator(new Random(1));
|
||||
Map importMap = null;
|
||||
for (File importFile : FreeColDirectories.getMapFileList()) {
|
||||
List<File> mapFiles = new ArrayList<>();
|
||||
if (true) {
|
||||
// We now have too many maps to test comprehensively, so
|
||||
// we will just test the standard (old) maps for now
|
||||
for (String name : FreeColTestCase.STANDARD_MAPS) {
|
||||
mapFiles.add(new File(name));
|
||||
}
|
||||
} else {
|
||||
// This test all the maps
|
||||
mapFiles.addAll(FreeColDirectories.getMapFileList());
|
||||
}
|
||||
for (File importFile : mapFiles) {
|
||||
Game game = getStandardGame();
|
||||
Specification spec = game.getSpecification();
|
||||
spec.setFile(MapGeneratorOptions.IMPORT_FILE, importFile);
|
||||
System.gc(); // Try to clean up before reading a big map
|
||||
try {
|
||||
importMap = FreeColServer.readMap(importFile, spec);
|
||||
} catch (FreeColException|IOException|XMLStreamException ex) {
|
||||
fail("Map read of " + importFile.getName() + " failed: "
|
||||
+ ex.toString());
|
||||
}
|
||||
assertNotNull(gen.generateMap(game, importMap, new LogBuilder(-1)));
|
||||
try {
|
||||
assertNotNull(gen.generateMap(game, importMap,
|
||||
new LogBuilder(-1)));
|
||||
} catch (Exception ex) {
|
||||
fail("Map generate of " + importFile.getName() + " failed: "
|
||||
+ ex.toString());
|
||||
}
|
||||
// Clear import file option from a standard spec!
|
||||
spec.setFile(MapGeneratorOptions.IMPORT_FILE, null);
|
||||
}
|
||||
// Clear import file option
|
||||
spec.setFile(MapGeneratorOptions.IMPORT_FILE, null);
|
||||
}
|
||||
|
||||
public void testRegions() {
|
||||
|
|
|
|||
|
|
@ -64,6 +64,14 @@ import net.sf.freecol.server.model.ServerUnit;
|
|||
*/
|
||||
public class FreeColTestCase extends TestCase {
|
||||
|
||||
/** We now have lots of maps, restrict testing to just the old ones. */
|
||||
public static String[] STANDARD_MAPS = {
|
||||
"data/maps/M_Africa_Gilolat.fsm",
|
||||
"data/maps/S_AustraliaOceania_Gilolat.fsm",
|
||||
"data/maps/L_America_JsTheDude.fsm",
|
||||
"data/maps/S_Caribbean_Phil.fsm"
|
||||
};
|
||||
|
||||
private static java.util.Map<String, Specification> specifications
|
||||
= new HashMap<>();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue