From 0450554d06f65a92506974c673607c39ce31c2f4 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 15:34:44 -0500 Subject: [PATCH 01/19] Expanded xrange and zrange to [-3000,3000] --- pve-6-rails.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 1e4a062..2d58d2f 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -1,6 +1,6 @@ name: PvE Rail Network -xrange: [-2000, 2000] -zrange: [-2000, 2000] +xrange: [-3000, 3000] +zrange: [-3000, 3000] stations: # Official Stations From 9d69624ac830fb6d5d7f56b36b658b0f5d47ce31 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 15:53:15 -0500 Subject: [PATCH 02/19] Added Pleasantville connections --- pve-6-rails.yaml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 2d58d2f..3413436 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -50,7 +50,11 @@ stations: Beacon Island: x: 540 z: -720 - + + Gobias: + x: 2500 + z: -1000 + # Eastern Stations East Transfer: x: 850 @@ -324,4 +328,24 @@ lines: level: underground stops: - Pleasantville - - Pico PV Embassy \ No newline at end of file + - Pico PV Embassy + + 720: + name: "PV/Beacon Island" + direction: out + type: citylink + flow: twoway + level: underground + stops: + - Pleasantville + - Beacon Island + + 730: + name: "PV/Gobias" + direction: out + type: citylink + flow: twoway + level: underground + stops: + - Pleasantville + - Gobias From 67606073dc1779dc4a4a6869a4d922561eb1e969 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 16:11:04 -0500 Subject: [PATCH 03/19] Added Whore Island and Monkeh Island rails. --- pve-6-rails.yaml | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 3413436..4d69ce2 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -92,7 +92,28 @@ stations: East Ocean: x: 1630 z: 1500 - + + "Monkeh/Whore Junction": + x: 2323 + z: 312 + + Whore Island: + x: 2518 + z: 51 + + Monkeh Island: + x: 2337 + z: 567 + + "Island/Argoth Junction": + x: 1521 + z: 312 + + Derp Town: + x: 905 + z: 310 + notes: "Station access via ladder down in sandstone building. Not connected to 850 loop." + # Southern Stations South Transfer: x: -43 @@ -296,6 +317,28 @@ lines: - New Argoth - [East Portal, west of portal] + 410: + name: "Monkeh Island" + direction: out + flow: twoway + type: citylink + level: underground + stops: + - "Monkeh/Whore Junction" + - Monkeh Island + + 420: + name: "Whore Island" + direction: west + flow: twoway + type: citylink + level: underground + stops: + - Whore Island + - "Monkeh/Whore Junction" + - "Island/Argoth Junction" + - Derp Town + # 500 lines - South (Nowhere) 520: name: "Lothos/Portal" From dd9cb023290f1aadc44d170aabc204ff6d8b1bea Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 16:21:51 -0500 Subject: [PATCH 04/19] Added line between Wellspring and Spawn (SE Terminal) --- pve-6-rails.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 4d69ce2..2c6b508 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -18,6 +18,10 @@ stations: x: -285 z: -35 notes: "Access via Snapperolle Underground" + + SE Terminal: + x: 8 + z: 129 # Northern Stations Pico: @@ -293,6 +297,16 @@ lines: stops: - Snapperolle - Seneca + + 220: + name: "Wellspring/Spawn" + direction: out + type: citylink + flow: twoway + level: underground + stops: + - SE Terminal + - Wellspring # 300 lines - North (Pico) 300: From 2fb23ea1ca8f355b6a46e97bcb6a814941b4bdae Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 16:31:45 -0500 Subject: [PATCH 05/19] Added Wellspring/New Athens/New Argoth rail. --- pve-6-rails.yaml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 2c6b508..1944dcc 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -75,7 +75,15 @@ stations: "Nuttin' Atoll": x: 1120 z: -260 - + + New Athens Substation: + x: 946 + z: 491 + + New Athens: + x: 951 + z: 533 + # Southeastern Stations Wellspring: x: 945 @@ -353,6 +361,27 @@ lines: - "Island/Argoth Junction" - Derp Town + 430: + name: "Argoth/Wellspring" + direction: west + flow: twoway + type: citylink + level: underground + stops: + - New Argoth + - New Athens Substation + - Wellspring + + 440: + name: "New Athens Spur" + direction: east + flow: twoway + type: citylink + level: underground + stops: + - New Athens Substation + - New Athens + # 500 lines - South (Nowhere) 520: name: "Lothos/Portal" From fc2479caba9ca6a7afda22450d2232eb725a51ad Mon Sep 17 00:00:00 2001 From: George Saunders Date: Mon, 2 Jan 2012 16:43:43 -0500 Subject: [PATCH 06/19] Added notes to staions without surface access. --- pve-6-rails.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 1944dcc..88513ce 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -79,6 +79,7 @@ stations: New Athens Substation: x: 946 z: 491 + notes: "No surface access" New Athens: x: 951 @@ -108,6 +109,7 @@ stations: "Monkeh/Whore Junction": x: 2323 z: 312 + notes: "No surface access" Whore Island: x: 2518 @@ -120,6 +122,7 @@ stations: "Island/Argoth Junction": x: 1521 z: 312 + notes: "No surface access" Derp Town: x: 905 From 2cf6b306e554e40a2c87ad4652d270837798d8cf Mon Sep 17 00:00:00 2001 From: George Saunders Date: Tue, 3 Jan 2012 22:25:45 -0500 Subject: [PATCH 07/19] Added more lines near Pleasantville. --- pve-6-rails.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 88513ce..92a07c1 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -46,6 +46,14 @@ stations: x: 1200 z: -1300 notes: "No pedestrian access - just switches between lines" + + saffsd Junction: + x: 1226 + z: -1784 + + Blanco: + x: 1765 + z: -1781 Pleasantville: x: 1200 @@ -58,6 +66,14 @@ stations: Gobias: x: 2500 z: -1000 + + Esper: + x: 1025 + z: -1418 + + Esper PV Express: + x: 1047 + z: -1342 # Eastern Stations East Transfer: @@ -267,6 +283,7 @@ lines: level: el stops: - [Pico, east platform] + - Esper - Blanco Junction - Pleasantville - "Nuttin' Atoll" @@ -438,3 +455,25 @@ lines: stops: - Pleasantville - Gobias + + 740: + name: "PV/Esper" + direction: out + type: citylink + flow: twoway + level: underground + stops: + - Pleasantville + - Esper PV Express + + 750: + name: "Blanco Rail" + direction: out + type: citylink + flow: twoway + level: elevated + stops: + - Blanco Junction + - saffsd Junction + - Blanco + \ No newline at end of file From 26c58e12ab1345e995ede0ffda81378609e5c159 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Tue, 3 Jan 2012 22:27:42 -0500 Subject: [PATCH 08/19] Added Hall of Pillars rail. --- pve-6-rails.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 92a07c1..09de4fd 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -144,6 +144,11 @@ stations: x: 905 z: 310 notes: "Station access via ladder down in sandstone building. Not connected to 850 loop." + + Hall of Pillars: + x: 1559 + z: 2230 + notes: "Schererererer's Uberproject" # Southern Stations South Transfer: @@ -401,6 +406,17 @@ lines: stops: - New Athens Substation - New Athens + + 450: + name: "Hall of Pillars" + direction: south + flow: twoway + type: citylink + level: underground + stops: + - New Argoth + - "Island/Argoth Junction" + - Hall of Pillars # 500 lines - South (Nowhere) 520: From 67c50479f5ef5a6306f4a43d5272418a3b091930 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 Jan 2012 23:24:33 -0500 Subject: [PATCH 09/19] Made Argoth/Wellspring connect through New Athens directly. This is not actually correct, but it makes for a better subway map without losing too much detail. --- pve-6-rails.yaml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 09de4fd..28254c8 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -92,11 +92,6 @@ stations: x: 1120 z: -260 - New Athens Substation: - x: 946 - z: 491 - notes: "No surface access" - New Athens: x: 951 z: 533 @@ -394,18 +389,8 @@ lines: level: underground stops: - New Argoth - - New Athens Substation - - Wellspring - - 440: - name: "New Athens Spur" - direction: east - flow: twoway - type: citylink - level: underground - stops: - - New Athens Substation - New Athens + - Wellspring 450: name: "Hall of Pillars" From ee8ec2b0937a55a5090f3d82e324267b0b8a588f Mon Sep 17 00:00:00 2001 From: George Saunders Date: Wed, 4 Jan 2012 22:23:32 -0500 Subject: [PATCH 10/19] Added lines. --- pve-6-rails.yaml | 55 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 28254c8..425c5bb 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -40,7 +40,11 @@ stations: Pico PV Embassy: x: 12 z: -1420 - + + North Transfer: + x: -62 + z: -848 + # Northeastern Stations Blanco Junction: x: 1200 @@ -225,6 +229,18 @@ stations: x: -1190 z: -1630 + Metro Hub: + x: -1146 + z: -1005 + + Metro West: + x: -1626 + z: -1009 + + Dimma Vale: + x: -1019 + z: -1106 + lines: # 10X - Cardinal Cross, y = 12 103: @@ -235,6 +251,7 @@ lines: level: underground stops: - Spawn Station + - North Transfer - [Pico, south platform] 104: @@ -267,7 +284,7 @@ lines: flow: loop level: underground stops: - # - North Transfer # broken now + - North Transfer - East Transfer - Wellspring - South Transfer @@ -299,6 +316,7 @@ lines: - QN Junction - Topaz West - Snowhedge + - Metro West - Something Else - Andaren - Montpellier @@ -346,7 +364,38 @@ lines: stops: - [Pico, north platform] - North Portal - + + 310: + name: "Beacon Island/Pico" + direction: north + type: citylink + flow: oneway + level: underground + stops: + - Beacon Island + - Pico PV Embassy + + 320: + name: "Metro/Dimma Vale" + direction: east + type: citylink + flow: twoway + level: underground + stops: + - Metro West + - Metro Hub + - Dimma Vale + + 321: + name: "Metro/Agua Fria" + direction: east + type: citylink + flow: twoway + level: underground + stops: + - Metro Hub + - Agua Fria + # 400 lines - East (New Argoth) 400: name: "New Argoth/Portal" From c27b5d9d3b86eee0741bca051b736b6a1ebd2318 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Thu, 5 Jan 2012 00:08:57 -0500 Subject: [PATCH 11/19] Updated rails around the northeast junction. --- pve-6-rails.yaml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 425c5bb..243620b 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -46,9 +46,9 @@ stations: z: -848 # Northeastern Stations - Blanco Junction: + Northeast Junction: x: 1200 - z: -1300 + z: -1400 notes: "No pedestrian access - just switches between lines" saffsd Junction: @@ -58,7 +58,11 @@ stations: Blanco: x: 1765 z: -1781 - + + Diehimmel: + x: 1600 + z: -1487 + Pleasantville: x: 1200 z: -1000 @@ -301,7 +305,7 @@ lines: stops: - [Pico, east platform] - Esper - - Blanco Junction + - Northeast Junction - Pleasantville - "Nuttin' Atoll" - New Argoth @@ -523,7 +527,16 @@ lines: flow: twoway level: elevated stops: - - Blanco Junction + - Northeast Junction - saffsd Junction - Blanco - \ No newline at end of file + + 760: + name: "Diehimmel Rail" + direction: east + type: citylink + flow: twoway + level: elevated + stops: + - Northeast Junction + - Diehimmel \ No newline at end of file From 167411ff2ea421a5cbd0ec20d3cdaec381d4a67b Mon Sep 17 00:00:00 2001 From: George Saunders Date: Thu, 5 Jan 2012 17:52:41 -0500 Subject: [PATCH 12/19] Added missing colon. --- pve-6-rails.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 243620b..3b5f5ea 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -199,7 +199,7 @@ stations: QN Junction: x: -1630 - z 717 + z: 717 # Western Stations West Transfer: From 974123690c88b4fdcd970878a5b13bc96a425659 Mon Sep 17 00:00:00 2001 From: George Saunders Date: Thu, 5 Jan 2012 21:14:23 -0500 Subject: [PATCH 13/19] Added rails in the south. --- pve-6-rails.yaml | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 3b5f5ea..5a0d017 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -161,6 +161,14 @@ stations: South Portal: x: -40 z: 1700 + + "Makdaam's Retreat": + x: 2 + z: 2401 + + Southquan: + x: 2 + z: 2810 # In the future, jchance may add Birch Island. @@ -201,6 +209,14 @@ stations: x: -1630 z: 717 + Cathedral: + x: -299 + z: 194 + + Lothos Desert: + x: -585 + z: 1130 + # Western Stations West Transfer: x: -845 @@ -465,8 +481,21 @@ lines: level: underground stops: - [Lothos, "east [green] bay"] + - Nowhere - South Portal - + + 530: + name: "Southquan Rail" + direction: south + type: citylink + flow: twoway + level: surface + stops: + - South Portal + - "Makdaam's Retreat" + - Southquan + + 540: name: "Deepholm" direction: in @@ -476,6 +505,27 @@ lines: stops: - Deepholm Junction - Deepholm + + 550: + name: "Lothos/Deorne" + direction: west + type: citylink + flow: twoway + level: underground + stops: + - Lothos + - Lothos Desert + - Deorne + + 560: + name: "Lothos/Cathdral" + direction: north + type: citylink + flow: twoway + level: underground + stops: + - Lothos + - Cathedral # 600 lines - West (Topaz) From a739e7768224011b1b71a4071b057439a014f298 Mon Sep 17 00:00:00 2001 From: Thomas Daede Date: Thu, 5 Jan 2012 20:42:40 -0600 Subject: [PATCH 14/19] Add new script generate-nodes.py, which outputs a json file containing a list of stations and which destinations they connect to. This format is more convenient for automatic pathfinding. --- generate-nodes.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 generate-nodes.py diff --git a/generate-nodes.py b/generate-nodes.py new file mode 100755 index 0000000..0419fb7 --- /dev/null +++ b/generate-nodes.py @@ -0,0 +1,41 @@ +#!/usr/bin/python +import yaml +import json +import argparse +from pprint import pprint + +def getStopStation(stop): + if type(stop) is list: + return stop[0] + else: + return stop + +parser = argparse.ArgumentParser(description=''' +Generates a json file containing node link information, +to be used to determine fastest route.''') +parser.add_argument('inputfile', metavar='INPUT', type=str, help='input yaml file') +args = parser.parse_args() + +yaml_file = open(args.inputfile, 'r') +yaml_data = yaml.load(yaml_file) + +stations = yaml_data["stations"] +lines = yaml_data["lines"] + +for station in stations: + stations[station]["destinations"] = [] + +for linename,line in lines.iteritems(): + if line["flow"] == "twoway": + previous = "" + for stopindex, stop in enumerate(line["stops"]): + try: + stations[getStopStation(stop)]["destinations"].append(getStopStation(line["stops"][stopindex-1])) + except IndexError: + pass + try: + stations[getStopStation(stop)]["destinations"].append(getStopStation(line["stops"][stopindex+1])) + except IndexError: + pass + +pprint(stations) \ No newline at end of file From 0fae4216fcd39444292eabc13e050d09930ef7c9 Mon Sep 17 00:00:00 2001 From: Thomas Daede Date: Thu, 5 Jan 2012 21:05:20 -0600 Subject: [PATCH 15/19] Add proper loop rail traversal and fix twoway rails. --- generate-nodes.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/generate-nodes.py b/generate-nodes.py index 0419fb7..5921f5a 100755 --- a/generate-nodes.py +++ b/generate-nodes.py @@ -14,10 +14,12 @@ def getStopStation(stop): Generates a json file containing node link information, to be used to determine fastest route.''') parser.add_argument('inputfile', metavar='INPUT', type=str, help='input yaml file') +parser.add_argument('outputfile', metavar='OUTPUT', type=str, help='output json file') args = parser.parse_args() yaml_file = open(args.inputfile, 'r') yaml_data = yaml.load(yaml_file) +yaml_file.close() stations = yaml_data["stations"] lines = yaml_data["lines"] @@ -26,16 +28,21 @@ def getStopStation(stop): stations[station]["destinations"] = [] for linename,line in lines.iteritems(): - if line["flow"] == "twoway": - previous = "" - for stopindex, stop in enumerate(line["stops"]): - try: - stations[getStopStation(stop)]["destinations"].append(getStopStation(line["stops"][stopindex-1])) - except IndexError: - pass - try: - stations[getStopStation(stop)]["destinations"].append(getStopStation(line["stops"][stopindex+1])) - except IndexError: - pass + previous = "" + for stopindex, stop in enumerate(line["stops"]): + if stopindex > 0 or line["flow"] == "loop": + previousStation = getStopStation(line["stops"][stopindex-1]) + stations[getStopStation(stop)]["destinations"].append(previousStation) + try: + if line["flow"] == "loop" and stopindex+1 > len(line["stops"])-1: + nextStation = getStopStation(line["stops"][0]) + else: + nextStation = getStopStation(line["stops"][stopindex+1]) + stations[getStopStation(stop)]["destinations"].append(nextStation) + except IndexError: + pass -pprint(stations) \ No newline at end of file +pprint(stations) +json_file = open(args.outputfile, 'w') +json.dump(stations, json_file) +json_file.close() \ No newline at end of file From 951cacba2fc40c31e50fede568259417faa58134 Mon Sep 17 00:00:00 2001 From: Thomas Daede Date: Thu, 5 Jan 2012 23:04:55 -0600 Subject: [PATCH 16/19] Route planning html page! Automatically calculates routes up to 8 stops, counting the start and end points. Results are given in a list sorted by the number of stops. Modify generate-nodes.py to support a hacky javascript file output mode as well, required by route.html right now. --- generate-nodes.py | 5 ++++ route.html | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 route.html diff --git a/generate-nodes.py b/generate-nodes.py index 5921f5a..d3f02da 100755 --- a/generate-nodes.py +++ b/generate-nodes.py @@ -15,6 +15,7 @@ def getStopStation(stop): to be used to determine fastest route.''') parser.add_argument('inputfile', metavar='INPUT', type=str, help='input yaml file') parser.add_argument('outputfile', metavar='OUTPUT', type=str, help='output json file') +parser.add_argument('--javascript', action='store_true', help='output valid js file hack') args = parser.parse_args() yaml_file = open(args.inputfile, 'r') @@ -44,5 +45,9 @@ def getStopStation(stop): pprint(stations) json_file = open(args.outputfile, 'w') +if args.javascript: + json_file.write("stations =") json.dump(stations, json_file) +if args.javascript: + json_file.write(";") json_file.close() \ No newline at end of file diff --git a/route.html b/route.html new file mode 100644 index 0000000..ece0cbf --- /dev/null +++ b/route.html @@ -0,0 +1,74 @@ + + + + + + + + + +
+ + \ No newline at end of file From 1e1329be1293b2a3d8595ff26278fd2f88843f13 Mon Sep 17 00:00:00 2001 From: Thomas Daede Date: Thu, 5 Jan 2012 23:36:27 -0600 Subject: [PATCH 17/19] Add a bit of labels to the html page so people know what it even is. --- route.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/route.html b/route.html index ece0cbf..618f21a 100644 --- a/route.html +++ b/route.html @@ -1,5 +1,6 @@ +MCPublic PvE Rail Directions + +
From 19921195bd2070204490588070942b116dca81bc Mon Sep 17 00:00:00 2001 From: Brandon Nason Date: Fri, 6 Jan 2012 02:13:28 -0600 Subject: [PATCH 18/19] Added ability to define rail turns --- railgen.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/railgen.rb b/railgen.rb index 802bc5b..834dded 100755 --- a/railgen.rb +++ b/railgen.rb @@ -26,6 +26,10 @@ require 'haml' require 'yaml' +def is_a_number?(s) + s.to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true +end + class RailNetwork def self.load (data) network = self.new(data["name"] || "Rail Network") @@ -40,7 +44,11 @@ def self.load (data) line = network.add_line n, ln["name"], ln["direction"].to_sym, ln["flow"].to_sym, ln["level"].to_sym, ln["type"].to_sym, ln["notes"] ln["stops"].each do |stop| if stop.is_a?(Array) - line.add_stop(stop[0], stop[1]) + if is_a_number?(stop[0]) and is_a_number?(stop[1]) + line.add_stop(stop, nil) + else + line.add_stop(stop[0], stop[1]) + end else line.add_stop(stop, nil) end @@ -250,7 +258,11 @@ def color end def add_stop (stop, landing) - stop = @network.get_station stop + if !stop.is_a?(Array) + stop = @network.get_station stop + else + stop = Station.new(@network, '', stop[0], stop[1], nil) + end @stops << [stop, landing] stop.add_line(self, landing) end From ff3524aeda822a371f5330e99e75d8290d2d1f89 Mon Sep 17 00:00:00 2001 From: Brandon Nason Date: Fri, 6 Jan 2012 03:38:38 -0600 Subject: [PATCH 19/19] Added West Rail line and turns to 850 and y70 loops --- pve-6-rails.yaml | 63 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/pve-6-rails.yaml b/pve-6-rails.yaml index 5a0d017..95bbc99 100644 --- a/pve-6-rails.yaml +++ b/pve-6-rails.yaml @@ -188,8 +188,12 @@ stations: # Southwestern Stations Deorne: x: -850 - z: 855 + z: 865 notes: "The line selector is after you leave the station" + + 850 South West Transfer: + x: -850 + z: 850 New Hempshire: x: -1460 @@ -236,6 +240,10 @@ stations: x: -925 z: -760 notes: "The line selector is after you leave the station" + + 850 North West Transfer: + x: -850 + z: -850 Snowhedge: x: -1630 @@ -263,7 +271,7 @@ stations: lines: # 10X - Cardinal Cross, y = 12 - 103: + 101: name: "North Trunk" direction: north type: trunk @@ -274,7 +282,7 @@ lines: - North Transfer - [Pico, south platform] - 104: + 102: name: "East Trunk" direction: east type: trunk @@ -282,10 +290,11 @@ lines: level: underground stops: - Spawn Station + - [-90, -115] - East Transfer - New Argoth - 105: + 103: name: "South Trunk" direction: south type: trunk @@ -295,6 +304,18 @@ lines: - Spawn Station - South Transfer - Nowhere + + 104: + name: "West Trunk" + direction: west + type: trunk + flow: twoway + level: underground + stops: + - Spawn Station + - [-90, -115] + - West Transfer + - Topaz West # Other 1X0 lines 110: @@ -305,12 +326,14 @@ lines: level: underground stops: - North Transfer + - [850,-850] - East Transfer - Wellspring + - [850,850] - South Transfer - Deorne - West Transfer - - Agua Fria + - 850 North West Transfer 120: name: "Y70 Outer Loop" @@ -324,22 +347,30 @@ lines: - Northeast Junction - Pleasantville - "Nuttin' Atoll" + - [1520, -260] - New Argoth - Kilst Island - Not Bacon - Birch Island - East Ocean + - [1630, 1632] # - Nowhere Y70 - Unknown Station + - [-1100, 1632] + - [-1100, 1540] - New Hempshire + - [-1630, 1540] - Deepholm Junction - QN Junction - Topaz West - Snowhedge - Metro West + - [-1626, -1640] - Something Else - Andaren - Montpellier + - [-100, -1633] + - [-100, -1500] # 200 lines - Central (Seneca) 207: @@ -351,6 +382,7 @@ lines: level: underground stops: - Seneca + - [-15,-1000] - Pleasantville 210: @@ -416,6 +448,26 @@ lines: - Metro Hub - Agua Fria + 330: + name: "850 NW Aqua Fria Transfer" + direction: out + type: citylink + flow: oneway + level: underground + stops: + - 850 North West Transfer + - Agua Fria + + 350: + name: "850 SW Deorne Transfer" + direction: out + type: citylink + flow: oneway + level: underground + stops: + - 850 South West Transfer + - Deorne + # 400 lines - East (New Argoth) 400: name: "New Argoth/Portal" @@ -538,6 +590,7 @@ lines: level: underground stops: - Pleasantville + - [-15,-1000] - Pico PV Embassy 720: