From: Ian Jackson Date: Tue, 28 Jul 2009 11:03:23 +0000 (+0100) Subject: Use commas to separate islands in route database for easier editing X-Git-Tag: 3.0~30 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=3b69b2e8a477a5d0544717dc86aad22498347060 Use commas to separate islands in route database for easier editing --- diff --git a/pctb/Commods.pm b/pctb/Commods.pm index 75d48c4..b348c17 100644 --- a/pctb/Commods.pm +++ b/pctb/Commods.pm @@ -84,7 +84,7 @@ sub parse_master_master1 ($$) { } elsif (m/^routes (\w+)$/) { my $ocean= $1; @ctx= (sub { - m/^(\S[^\t]*\S)\t+(\S[^\t]*\S)\t+([1-9][0-9]{0,2})$/ or die; + m/^(\S[^\t]*\S),\s*(\S[^\t]*\S),\s*([1-9][0-9]{0,2})$/ or die; $routes{$ocean}{$1}{$2}= $3; }); } elsif (m/^client (\S+.*\S)$/) { diff --git a/pctb/ocean-midnight.txt b/pctb/ocean-midnight.txt index 6ccae43..f7c8059 100644 --- a/pctb/ocean-midnight.txt +++ b/pctb/ocean-midnight.txt @@ -4,126 +4,126 @@ routes Midnight # don't it won't affect things too much. # Ruby internal - Olivia Midsummer 3 - Midsummer Cranberry 2 - Olivia Lynx 5 - Olivia Eta 7 - Cranberry Eta 3 - Lynx Eta 3 - Lynx Islay of Luthien 5 - Eta Islay of Luthien 4 - Islay of Luthien Jorvik 5 - Eta Jorvik 5 + Olivia, Midsummer, 3 + Midsummer, Cranberry, 2 + Olivia, Lynx, 5 + Olivia, Eta, 7 + Cranberry, Eta, 3 + Lynx, Eta, 3 + Lynx, Islay of Luthien, 5 + Eta, Islay of Luthien, 4 + Islay of Luthien, Jorvik, 5 + Eta, Jorvik, 5 # Pearl internal and interarch - Cleopatra O'Reilly 3 - Cleopatra Zeta 4 - Cleopatra Nuptial 6 - O'Reilly Nuptial 4 - O'Reilly Zeta 6 - Nuptial Zeta 4 - Nuptial Ostreum 6 - Zeta Tadpole 4 - Tadpole Ostreum 6 - Tadpole Frond 4 - Frond Ostreum 4 - Frond Zeta 6 - Nuptial Islay of Luthien 10 - Ostreum Wrasse 6 - Ostreum Gaea 10 - Frond Wrasse 9 - Frond Gaea 13 + Cleopatra, O'Reilly, 3 + Cleopatra, Zeta, 4 + Cleopatra, Nuptial, 6 + O'Reilly, Nuptial, 4 + O'Reilly, Zeta, 6 + Nuptial, Zeta, 4 + Nuptial, Ostreum, 6 + Zeta, Tadpole, 4 + Tadpole, Ostreum, 6 + Tadpole, Frond, 4 + Frond, Ostreum, 4 + Frond, Zeta, 6 + Nuptial, Islay of Luthien, 10 + Ostreum, Wrasse, 6 + Ostreum, Gaea, 10 + Frond, Wrasse, 9 + Frond, Gaea, 13 # Diamond internal and interarch - this has lots of shortcut routes - Turtle Jorvik 6 - Turtle Papaya 3 - Turtle Cnossos 8 - Turtle Alpha 7 - Papaya Byrne 3 - Papaya Alpha 6 - Papaya Oyster 8 - Papaya Winter Solstice 11 - Cnossos Alpha 3 - Cnossos Winter Solstice 4 - Cnossos Guava 6 - Winter Solstice Guava 9 - Winter Solstice Alpha 6 - Winter Solstice Oyster 5 - Winter Solstice Park 11 - Winter Solstice Delta 16 - Winter Solstice Byrne 9 - Alpha Oyster 3 - Oyster Park 7 - Oyster Delta 12 - Alpha Byrne 4 - Byrne Remora 10 - Papaya Remora 8 + Turtle, Jorvik, 6 + Turtle, Papaya, 3 + Turtle, Cnossos, 8 + Turtle, Alpha, 7 + Papaya, Byrne, 3 + Papaya, Alpha, 6 + Papaya, Oyster, 8 + Papaya, Winter Solstice, 11 + Cnossos, Alpha, 3 + Cnossos, Winter Solstice, 4 + Cnossos, Guava, 6 + Winter Solstice, Guava, 9 + Winter Solstice, Alpha, 6 + Winter Solstice, Oyster, 5 + Winter Solstice, Park, 11 + Winter Solstice, Delta, 16 + Winter Solstice, Byrne, 9 + Alpha, Oyster, 3 + Oyster, Park, 7 + Oyster, Delta, 12 + Alpha, Byrne, 4 + Byrne, Remora, 10 + Papaya, Remora, 8 # Emerald internal and interarch to Jet and Opal - Wrasse Guava 5 - Wrasse Gaea 5 - Wrasse Epsilon 11 - Guava Epsilon 7 - Gaea Epsilon 4 - Gaea Tinga 8 - Epsilon Emperor 3 - Epsilon Spring 6 - Emperor Spring 4 - Epsilon Tinga 5 - Tinga Spring 4 - Tinga Hephaestus 11 - Spring Hephaestus 8 - Tinga Orca 8 + Wrasse, Guava, 5 + Wrasse, Gaea, 5 + Wrasse, Epsilon, 11 + Guava, Epsilon, 7 + Gaea, Epsilon, 4 + Gaea, Tinga, 8 + Epsilon, Emperor, 3 + Epsilon, Spring, 6 + Emperor, Spring, 4 + Epsilon, Tinga, 5 + Tinga, Spring, 4 + Tinga, Hephaestus, 11 + Spring, Hephaestus, 8 + Tinga, Orca, 8 # Opal internal - Orca Endurance 3 - Orca Norse 5 - Orca Nu 4 - Nu Norse 3 - Nu Endurance 3 - Nu Oseberg 4 - Norse Oseberg 6 - Norse Waterberry 4 - Waterberry Boyle 3 - Boyle Flow 3 - Flow Oseberg 3 + Orca, Endurance, 3 + Orca, Norse, 5 + Orca, Nu, 4 + Nu, Norse, 3 + Nu, Endurance, 3 + Nu, Oseberg, 4 + Norse, Oseberg, 6 + Norse, Waterberry, 4 + Waterberry, Boyle, 3 + Boyle, Flow, 3 + Flow, Oseberg, 3 # Jet internal - Hephaestus Namath 6 - Hephaestus Xi 4 - Hephaestus Lagniappe 8 - Hephaestus Dugong 10 - Namath Rhinoceros Ridge 3 - Rhinoceros Ridge Lagniappe 2 - Xi Lagniappe 5 - Xi Chaparral 4 - Xi Eclipse 6 - Chaparral Eclipse 4 - Lagniappe Dugong 3 - Lagniappe Eclipse 5 + Hephaestus, Namath, 6 + Hephaestus, Xi, 4 + Hephaestus, Lagniappe, 8 + Hephaestus, Dugong, 10 + Namath, Rhinoceros Ridge, 3 + Rhinoceros Ridge, Lagniappe, 2 + Xi, Lagniappe, 5 + Xi, Chaparral, 4 + Xi, Eclipse, 6 + Chaparral, Eclipse, 4 + Lagniappe, Dugong, 3 + Lagniappe, Eclipse, 5 # Coral internal and interarch to Jet - Park Angelfish 5 - Angelfish Meke 4 - Park Delta 6 - Delta Angelfish 3 - Delta Macaw 5 - Macaw Monsoon 3 - Monsoon Chaparral 6 - Monsoon Turongo 4 - Monsoon Durian 6 - Turongo Durian 3 - Turongo Angelfish 7 - Turongo Delta 8 - Turongo Park 11 + Park, Angelfish, 5 + Angelfish, Meke, 4 + Park, Delta, 6 + Delta, Angelfish, 3 + Delta, Macaw, 5 + Macaw, Monsoon, 3 + Monsoon, Chaparral, 6 + Monsoon, Turongo, 4 + Monsoon, Durian, 6 + Turongo, Durian, 3 + Turongo, Angelfish, 7 + Turongo, Delta, 8 + Turongo, Park, 11 # Sapphire internal - Remora The Horseshoe Crabs 3 - Remora Beta 3 - The Horseshoe Crabs Verdant Atoll 3 - The Horseshoe Crabs Beta 5 - Beta Iris 4 - Verdant Atoll Uxmal 3 - Verdant Atoll Iris 6 - Uxmal Iris 4 - Iris Vernal Equinox 3 + Remora, The Horseshoe Crabs, 3 + Remora, Beta, 3 + The Horseshoe Crabs, Verdant Atoll, 3 + The Horseshoe Crabs, Beta, 5 + Beta, Iris, 4 + Verdant Atoll, Uxmal, 3 + Verdant Atoll, Iris, 6 + Uxmal, Iris, 4 + Iris, Vernal Equinox, 3