Author: cazfi
Date: Sat Dec 27 07:14:28 2014
New Revision: 27415

URL: http://svn.gna.org/viewcvs/freeciv?rev=27415&view=rev
Log:
Use second set or rails present in trident as maglev.

Suggested by The Square Cow

See patch #5598

Modified:
    branches/S2_5/data/trident.tilespec
    branches/S2_5/data/trident/roads.spec

Modified: branches/S2_5/data/trident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident.tilespec?rev=27415&r1=27414&r2=27415&view=diff
==============================================================================
--- branches/S2_5/data/trident.tilespec (original)
+++ branches/S2_5/data/trident.tilespec Sat Dec 27 07:14:28 2014
@@ -201,8 +201,9 @@
 
 [roads]
 styles =
-    { "name", "style"
-      "road.road",  "ParityCombined"
-      "road.rail",  "ParityCombined"
-      "road.river", "River"
+    { "name",        "style"
+      "road.road",   "ParityCombined"
+      "road.rail",   "ParityCombined"
+      "road.maglev", "ParityCombined"
+      "road.river",  "River"
     }

Modified: branches/S2_5/data/trident/roads.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/trident/roads.spec?rev=27415&r1=27414&r2=27415&view=diff
==============================================================================
--- branches/S2_5/data/trident/roads.spec       (original)
+++ branches/S2_5/data/trident/roads.spec       Sat Dec 27 07:14:28 2014
@@ -65,55 +65,102 @@
 [grid_rails]
 
 x_top_left = 0
-y_top_left = 60          ; Change to 0 for original trident rails, 60 for 
dwp-style
+y_top_left = 60
 dx = 30
 dy = 30
 
 tiles = { "row", "column", "tag"
 
-  2,  0, "road.rail_isolated"
+  0,  0, "road.rail_isolated"
 
 ; Cardinal rails, connections north, south, east, west:
 
-  2,  1, "road.rail_c_n1e0s0w0"
-  2,  2, "road.rail_c_n0e1s0w0"
-  2,  3, "road.rail_c_n1e1s0w0"
-  2,  4, "road.rail_c_n0e0s1w0"
-  2,  5, "road.rail_c_n1e0s1w0"
-  2,  6, "road.rail_c_n0e1s1w0"
-  2,  7, "road.rail_c_n1e1s1w0"
-  2,  8, "road.rail_c_n0e0s0w1"
-  2,  9, "road.rail_c_n1e0s0w1"
-  2, 10, "road.rail_c_n0e1s0w1"
-  2, 11, "road.rail_c_n1e1s0w1"
-  2, 12, "road.rail_c_n0e0s1w1"
-  2, 13, "road.rail_c_n1e0s1w1"
-  2, 14, "road.rail_c_n0e1s1w1"
-  2, 15, "road.rail_c_n1e1s1w1"
+  0,  1, "road.rail_c_n1e0s0w0"
+  0,  2, "road.rail_c_n0e1s0w0"
+  0,  3, "road.rail_c_n1e1s0w0"
+  0,  4, "road.rail_c_n0e0s1w0"
+  0,  5, "road.rail_c_n1e0s1w0"
+  0,  6, "road.rail_c_n0e1s1w0"
+  0,  7, "road.rail_c_n1e1s1w0"
+  0,  8, "road.rail_c_n0e0s0w1"
+  0,  9, "road.rail_c_n1e0s0w1"
+  0, 10, "road.rail_c_n0e1s0w1"
+  0, 11, "road.rail_c_n1e1s0w1"
+  0, 12, "road.rail_c_n0e0s1w1"
+  0, 13, "road.rail_c_n1e0s1w1"
+  0, 14, "road.rail_c_n0e1s1w1"
+  0, 15, "road.rail_c_n1e1s1w1"
 
 ; Diagonal rails, connections same, rotated 45 degrees clockwise:
 
-  3,  1, "road.rail_d_ne1se0sw0nw0"
-  3,  2, "road.rail_d_ne0se1sw0nw0"
-  3,  3, "road.rail_d_ne1se1sw0nw0"
-  3,  4, "road.rail_d_ne0se0sw1nw0"
-  3,  5, "road.rail_d_ne1se0sw1nw0"
-  3,  6, "road.rail_d_ne0se1sw1nw0"
-  3,  7, "road.rail_d_ne1se1sw1nw0"
-  3,  8, "road.rail_d_ne0se0sw0nw1"
-  3,  9, "road.rail_d_ne1se0sw0nw1"
-  3, 10, "road.rail_d_ne0se1sw0nw1"
-  3, 11, "road.rail_d_ne1se1sw0nw1"
-  3, 12, "road.rail_d_ne0se0sw1nw1"
-  3, 13, "road.rail_d_ne1se0sw1nw1"
-  3, 14, "road.rail_d_ne0se1sw1nw1"
-  3, 15, "road.rail_d_ne1se1sw1nw1"
+  1,  1, "road.rail_d_ne1se0sw0nw0"
+  1,  2, "road.rail_d_ne0se1sw0nw0"
+  1,  3, "road.rail_d_ne1se1sw0nw0"
+  1,  4, "road.rail_d_ne0se0sw1nw0"
+  1,  5, "road.rail_d_ne1se0sw1nw0"
+  1,  6, "road.rail_d_ne0se1sw1nw0"
+  1,  7, "road.rail_d_ne1se1sw1nw0"
+  1,  8, "road.rail_d_ne0se0sw0nw1"
+  1,  9, "road.rail_d_ne1se0sw0nw1"
+  1, 10, "road.rail_d_ne0se1sw0nw1"
+  1, 11, "road.rail_d_ne1se1sw0nw1"
+  1, 12, "road.rail_d_ne0se0sw1nw1"
+  1, 13, "road.rail_d_ne1se0sw1nw1"
+  1, 14, "road.rail_d_ne0se1sw1nw1"
+  1, 15, "road.rail_d_ne1se1sw1nw1"
 
 ; Rail corners
 
-  2, 16, "road.rail_c_nw"
-  2, 17, "road.rail_c_ne"
-  3, 16, "road.rail_c_sw"
-  3, 17, "road.rail_c_se"
+  0, 16, "road.rail_c_nw"
+  0, 17, "road.rail_c_ne"
+  1, 16, "road.rail_c_sw"
+  1, 17, "road.rail_c_se"
+
+; Maglevs
+
+  2,  0, "road.maglev_isolated"
+
+; Cardinal maglevs, connections north, south, east, west:
+
+  2,  1, "road.maglev_c_n1e0s0w0"
+  2,  2, "road.maglev_c_n0e1s0w0"
+  2,  3, "road.maglev_c_n1e1s0w0"
+  2,  4, "road.maglev_c_n0e0s1w0"
+  2,  5, "road.maglev_c_n1e0s1w0"
+  2,  6, "road.maglev_c_n0e1s1w0"
+  2,  7, "road.maglev_c_n1e1s1w0"
+  2,  8, "road.maglev_c_n0e0s0w1"
+  2,  9, "road.maglev_c_n1e0s0w1"
+  2, 10, "road.maglev_c_n0e1s0w1"
+  2, 11, "road.maglev_c_n1e1s0w1"
+  2, 12, "road.maglev_c_n0e0s1w1"
+  2, 13, "road.maglev_c_n1e0s1w1"
+  2, 14, "road.maglev_c_n0e1s1w1"
+  2, 15, "road.maglev_c_n1e1s1w1"
+
+; Diagonal maglevs, connections same, rotated 45 degrees clockwise:
+
+  3,  1, "road.maglev_d_ne1se0sw0nw0"
+  3,  2, "road.maglev_d_ne0se1sw0nw0"
+  3,  3, "road.maglev_d_ne1se1sw0nw0"
+  3,  4, "road.maglev_d_ne0se0sw1nw0"
+  3,  5, "road.maglev_d_ne1se0sw1nw0"
+  3,  6, "road.maglev_d_ne0se1sw1nw0"
+  3,  7, "road.maglev_d_ne1se1sw1nw0"
+  3,  8, "road.maglev_d_ne0se0sw0nw1"
+  3,  9, "road.maglev_d_ne1se0sw0nw1"
+  3, 10, "road.maglev_d_ne0se1sw0nw1"
+  3, 11, "road.maglev_d_ne1se1sw0nw1"
+  3, 12, "road.maglev_d_ne0se0sw1nw1"
+  3, 13, "road.maglev_d_ne1se0sw1nw1"
+  3, 14, "road.maglev_d_ne0se1sw1nw1"
+  3, 15, "road.maglev_d_ne1se1sw1nw1"
+
+; Maglev corners
+
+  2, 16, "road.maglev_c_nw"
+  2, 17, "road.maglev_c_ne"
+  3, 16, "road.maglev_c_sw"
+  3, 17, "road.maglev_c_se"
 
 }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to