From 3d7b5824b6b3564166d2ffc19dce741d9c36c128 Mon Sep 17 00:00:00 2001 From: Ryan Carpenter Date: Tue, 2 Aug 2016 22:50:41 +0800 Subject: [PATCH] Added path & stop data for Cat Replaced commas in episodes.csv text (not URL...) --- data/episodes.csv | 8 ++--- data/paths.csv | 33 ++++++++++++++++--- data/stops.csv | 53 ++++++++++++++++-------------- data/waypoints.csv | 80 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 140 insertions(+), 34 deletions(-) diff --git a/data/episodes.csv b/data/episodes.csv index d69e288..92327b9 100644 --- a/data/episodes.csv +++ b/data/episodes.csv @@ -2,7 +2,7 @@ season,episode,title,awoiaf,wikipedia 1,1,Winter Is Coming,Winter_Is_Coming, 1,2,The Kingsroad,The_Kingsroad, 1,3,Lord Snow,Lord_Snow, -1,4,"Cripples, Bastards, & Broken Things","Cripples,_Bastards,_and_Broken_Things", +1,4,Cripplesˌ Bastardsˌ & Broken Things,"Cripples,_Bastards,_and_Broken_Things", 1,5,The Wolf and the Lion,The_Wolf_and_the_Lion, 1,6,A Golden Crown,A_Golden_Crown, 1,7,You Win or You Die,You_Win_or_You_Die, @@ -20,7 +20,7 @@ season,episode,title,awoiaf,wikipedia 2,9,Blackwater,Blackwater_(TV), 2,10,Valar Morghulis,Valar_Morghulis_(TV), 3,1,Valar Dohaeris,Valar_Dohaeris_(TV), -3,2,"Dark Wings, Dark Words","Dark_Wings,_Dark_Words", +3,2,Dark Wingsˌ Dark Words,"Dark_Wings,_Dark_Words", 3,3,Walk of Punishment,Walk_of_Punishment, 3,4,And Now His Watch is Ended,And_Now_His_Watch_Is_Ended, 3,5,Kissed by Fire,Kissed_by_Fire, @@ -44,7 +44,7 @@ season,episode,title,awoiaf,wikipedia 5,3,High Sparrow,High_Sparrow_(TV),High_Sparrow 5,4,The Sons of the Harpy,Sons_of_the_Harpy_(TV),Sons_of_the_Harpy 5,5,Kill the Boy,Kill_the_Boy,Kill_the_Boy -5,6,"Unbowed, Unbent, Unbroken","Unbowed,_Unbent,_Unbroken","Unbowed,_Unbent,_Unbroken" +5,6,Unbowedˌ Unbentˌ Unbroken,"Unbowed,_Unbent,_Unbroken","Unbowed,_Unbent,_Unbroken" 5,7,The Gift,The_Gift,The_Gift_(Game_of_Thrones) 5,8,Hardhome,Hardhome_(TV),Hardhome 5,9,The Dance of Dragons,The_Dance_of_Dragons,The_Dance_of_Dragons @@ -58,4 +58,4 @@ season,episode,title,awoiaf,wikipedia 6,7,The Broken Man,,The_Broken_Man 6,8,No One,,No_One_(Game_of_Thrones) 6,9,Battle of the Bastards,,Battle_of_the_Bastards -6,10,The Winds of Winter,,The_Winds_of_Winter_(Game_of_Thrones) +6,10,The Winds of Winter,,The_Winds_of_Winter_(Game_of_Thrones) \ No newline at end of file diff --git a/data/paths.csv b/data/paths.csv index 98ae459..b00b12c 100644 --- a/data/paths.csv +++ b/data/paths.csv @@ -1,5 +1,28 @@ -key,firstChapter,firstEpisode -Eddard_Stark-1,AGOT-1,S1E01 -Eddard_Stark-2,AGOT-12,S1E02 -Eddard_Stark-3,AGOT-15,S1E02 -Eddard_Stark-4,AGOT-20,S1E03 \ No newline at end of file +key,firstChapter,firstEpisode,arrows +Eddard_Stark-1,AGOT-1,S1E01, +Eddard_Stark-2,AGOT-12,S1E02,TRUE +Eddard_Stark-3,AGOT-15,S1E02,TRUE +Eddard_Stark-4,AGOT-20,S1E03,TRUE +Catelyn_Stark-1,AGOT-18,S1E03,TRUE +Catelyn_Stark-2,AGOT-22,S1E04,TRUE +Catelyn_Stark-3,AGOT-28,S1E04,TRUE +Catelyn_Stark-4,AGOT-31,S1E05, +Catelyn_Stark-5,AGOT-34,S1E05, +Catelyn_Stark-6,AGOT-55,, +Catelyn_Stark-7,AGOT-55,, +Catelyn_Stark-8,AGOT-59,, +Catelyn_Stark-8a,,S1E09,TRUE +Catelyn_Stark-9,AGOT-63,S1E09,TRUE +Catelyn_Stark-10,AGOT-71,S1E09, +Catelyn_Stark-11,ACOK-22,S2E03,TRUE +Catelyn_Stark-12,ACOK-31,S2E04,TRUE +Catelyn_Stark-13,ACOK-39,,TRUE +Catelyn_Stark-14,,S2E06,TRUE +Catelyn_Stark-15,,S2E08,TRUE +Catelyn_Stark-16,,S3E01,TRUE +Catelyn_Stark-17,,S3E02,TRUE +Catelyn_Stark-18,,S3E03,TRUE +Catelyn_Stark-19,ASOS-45,S3E07,TRUE +Catelyn_Stark-20,ASOS-49,S3E09,TRUE +Catelyn_Stark-21,ASOS-81,,TRUE +Catelyn_Stark-22,AFFC-42,,TRUE \ No newline at end of file diff --git a/data/stops.csv b/data/stops.csv index 7ef4e26..9369d6d 100644 --- a/data/stops.csv +++ b/data/stops.csv @@ -1,24 +1,29 @@ -character,town,clue,latitude,longitude,firstChapter,firstEpisode,isLost,isDead,isUnmentioned -Eddard_Stark,Winterfell,,,,AGOT-0,,,, -Eddard_Stark,Execution_Holdfast,,,,AGOT-1,,,, -Eddard_Stark,Winterfell,,,,AGOT-2,S1E01,,, -Eddard_Stark,,A few days south of Winterfell,57.9848,-122.4023,AGOT-12,,,, -Eddard_Stark,,The Trident,26.4312,-114.1406,AGOT-15,S1E02,,, -Eddard_Stark,King%27s_Landing,,,,AGOT-20,S1E03,,, -Eddard_Stark,King%27s_Landing,,,,AGOT-65,S1E09,,TRUE, -Catelyn_Stark,Winterfell,,,,AGOT-0,S1E01,,, -Catelyn_Stark,King%27s_Landing,,,,AGOT-18,S1E03,,, -Catelyn_Stark,,,13.1115,-108.8671,AGOT-22,,,, -Catelyn_Stark,Crossroads_Inn,,,,AGOT-28,S1E04,,, -Catelyn_Stark,,Mountains of the Moon,27.4107,-104.9121,AGOT-31,,,, -Catelyn_Stark,Eyrie,,,,AGOT-34,S1E05,,, -Catelyn_Stark,Moat_Cailin,,,,AGOT-55,,,, -Catelyn_Stark,Twins,,,,AGOT-59,,,, -Catelyn_Stark,,The Whispering Wood,23.9661,-128.3642,AGOT-63,,,, -Catelyn_Stark,Riverrun,,,,AGOT-71,S1E09,,, -Catelyn_Stark,Bitterbridge,,,,ACOK-22,S2E03,,, -Catelyn_Stark,,,,,,,,, -Catelyn_Stark,Storm%27s_End,,,,ACOK-31,S2E04,,, -Catelyn_Stark,Oxcross,,,,,S2E06,,, -Catelyn_Stark,,The Westerlands,22.106,-134.6484,,S2E08,,, -Catelyn_Stark,Riverrun,,,,ACOK-39,S3E03,,, \ No newline at end of file +character,town,clue,latitude,longitude,firstChapter,firstEpisode,isLost,isDead +Eddard_Stark,Winterfell,,,,AGOT-0,,, +Eddard_Stark,Execution_Holdfast,,,,AGOT-1,,, +Eddard_Stark,Winterfell,,,,AGOT-2,S1E01,, +Eddard_Stark,,A few days south of Winterfell,57.9848,-122.4023,AGOT-12,,, +Eddard_Stark,,The Trident,26.4312,-114.1406,AGOT-15,S1E02,, +Eddard_Stark,King%27s_Landing,,,,AGOT-20,S1E03,, +Eddard_Stark,King%27s_Landing,,,,AGOT-65,S1E09,,TRUE +Catelyn_Stark,Winterfell,,,,AGOT-0,S1E01,, +Catelyn_Stark,King%27s_Landing,,,,AGOT-18,S1E03,, +Catelyn_Stark,,,13.1115,-108.8671,AGOT-22,,, +Catelyn_Stark,Crossroads_Inn,,,,AGOT-28,S1E04,, +Catelyn_Stark,,Mountains of the Moon,27.4107,-104.9121,AGOT-31,,, +Catelyn_Stark,Eyrie,,,,AGOT-34,S1E05,, +Catelyn_Stark,Moat_Cailin,,,,AGOT-55,,, +Catelyn_Stark,Twins,,,,AGOT-59,,, +Catelyn_Stark,,The Whispering Wood,23.9661,-128.3642,AGOT-63,,, +Catelyn_Stark,Riverrun,,,,AGOT-71,S1E09,, +Catelyn_Stark,Bitterbridge,,,,ACOK-22,S2E03,, +Catelyn_Stark,,,,,,,, +Catelyn_Stark,Storm%27s_End,,,,ACOK-31,S2E04,, +Catelyn_Stark,Oxcross,,,,,S2E06,, +Catelyn_Stark,,The Westerlands,22.106,-134.6484,,S2E08,, +Catelyn_Stark,Riverrun,,,,ACOK-39,S3E03,, +Catelyn_Stark,,Hag's Mire,32.6578,-127.4121,ASOS-45,S3E05,, +Catelyn_Stark,Twins,,,,ASOS-49,,, +Catelyn_Stark,Twins,,,,ASOS-51,S3E07,,TRUE +Catelyn_Stark,Oldstones,,,,ASOS-81,,,TRUE +Catelyn_Stark,BWB_Hideout,,,,AFFC-42,,,TRUE \ No newline at end of file diff --git a/data/waypoints.csv b/data/waypoints.csv index b562ef2..239ae56 100644 --- a/data/waypoints.csv +++ b/data/waypoints.csv @@ -14,4 +14,82 @@ Eddard_Stark-4,,26.4312,-114.1406 Eddard_Stark-4,Darry,, Eddard_Stark-4,,16.0669,-109.5263 Eddard_Stark-4,Hayford,, -Eddard_Stark-4,King%27s_Landing,, \ No newline at end of file +Eddard_Stark-4,King%27s_Landing,, +Catelyn_Stark-1,Winterfell,, +Catelyn_Stark-1,,64.1489,-117.041 +Catelyn_Stark-1,White_Harbor,, +Catelyn_Stark-1,,50.0359,-110.7128 +Catelyn_Stark-1,,49.2964,-78.9843 +Catelyn_Stark-1,,20.6739,-77.666 +Catelyn_Stark-1,,10.7901,-94.3652 +Catelyn_Stark-1,,1.3621,-97.3535 +Catelyn_Stark-1,King%27s_Landing,, +Catelyn_Stark-2,King%27s_Landing,, +Catelyn_Stark-2,,13.1115,-108.8671 +Catelyn_Stark-3,,13.1115,-108.8671 +Catelyn_Stark-3,Crossroads_Inn,, +Catelyn_Stark-4,Crossroads_Inn,, +Catelyn_Stark-4,,25.1651,-110.2294 +Catelyn_Stark-4,,25.2446,-106.0107 +Catelyn_Stark-4,,27.4107,-104.9121 +Catelyn_Stark-5,,27.4107,-104.9121 +Catelyn_Stark-5,,28.2656,-103.5937 +Catelyn_Stark-5,Eyrie,, +Catelyn_Stark-6,Eyrie,, +Catelyn_Stark-6,,33.578,-95.3613 +Catelyn_Stark-6,Ironoaks,, +Catelyn_Stark-6,,30.6001,-90.5273 +Catelyn_Stark-6,Gulltown,, +Catelyn_Stark-6,,27.3718,-84.1553 +Catelyn_Stark-6,,27.7224,-78.1787 +Catelyn_Stark-7,White_Harbor,, +Catelyn_Stark-7,Moat_Cailin,, +Catelyn_Stark-8,Moat_Cailin,, +Catelyn_Stark-8,,45.058,-122.4902 +Catelyn_Stark-8,Twins,, +Catelyn_Stark-8a,Crossroads_Inn,, +Catelyn_Stark-8a,,25.6811,-113.5253 +Catelyn_Stark-8a,,34.7777,-121.9628 +Catelyn_Stark-8a,Twins,, +Catelyn_Stark-9,Twins,, +Catelyn_Stark-9,,34.7777,-125.3906 +Catelyn_Stark-9,Fairmarket,, +Catelyn_Stark-9,,23.9661,-128.3642 +Catelyn_Stark-10,,23.9661,-128.3642 +Catelyn_Stark-10,Riverrun,, +Catelyn_Stark-11,Riverrun,, +Catelyn_Stark-11,,16.8466,-128.2031 +Catelyn_Stark-11,,13.7954,-123.8085 +Catelyn_Stark-11,Bitterbridge,, +Catelyn_Stark-12,Bitterbridge,, +Catelyn_Stark-12,,-10.1851,-92.6074 +Catelyn_Stark-12,Storm%27s_End,, +Catelyn_Stark-13,Storm%27s_End,, +Catelyn_Stark-13,,-14.1365,-98.6718 +Catelyn_Stark-13,,-9.3189,-105.7031 +Catelyn_Stark-13,,-7.2316,-115.5468 +Catelyn_Stark-13,Riverrun,, +Catelyn_Stark-14,Storm%27s_End,, +Catelyn_Stark-14,,-14.1365,-98.6718 +Catelyn_Stark-14,,-9.3189,-105.7031 +Catelyn_Stark-14,,-7.2316,-115.5468 +Catelyn_Stark-14,,12.2112,-135.791 +Catelyn_Stark-14,Oxcross,, +Catelyn_Stark-15,Oxcross,, +Catelyn_Stark-15,,22.106,-134.6484 +Catelyn_Stark-16,,22.106,-134.6484 +Catelyn_Stark-16,Harrenhal,, +Catelyn_Stark-17,Harrenhal,, +Catelyn_Stark-17,,21.6166,-122.0801 +Catelyn_Stark-18,,21.6166,-122.0801 +Catelyn_Stark-18,Riverrun,, +Catelyn_Stark-19,Riverrun,, +Catelyn_Stark-19,,29.1713,-122.5781 +Catelyn_Stark-19,,30.921,-126.4013 +Catelyn_Stark-19,,32.6578,-127.4121 +Catelyn_Stark-20,,32.6578,-127.4121 +Catelyn_Stark-20,Twins,, +Catelyn_Stark-21,Twins,, +Catelyn_Stark-21,Oldstones,, +Catelyn_Stark-22,Oldstones,, +Catelyn_Stark-22,BWB_Hideout,, \ No newline at end of file