Merge pull request #36 from rm-you/share_loc_websocket

Location Sharing, Path Recording, and Discord Overlay

.gitignore

@@ -16,6 +16,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 bin/
 build/
 develop-eggs/
@@ -27,6 +28,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.zip
 
 # Installer logs
 pip-log.txt

README.md

@@ -3,4 +3,14 @@
 
 Provides player location and spell tracking support for Project 1999 by reading the player log.
 
-Please see the [Wiki](https://github.com/nomns/nparse/wiki) for more information or go to the [Releases](https://github.com/nomns/nparse/releases) for the latest release.
+Now with location sharing, path recording, and Discord overlay!
+
+Please see the [Wiki](https://github.com/nomns/nparse/wiki) for more information or go to the [Releases](https://github.com/nomns/nparse/releases) for the latest release.
+
+Building
+========
+
+Currently only python 3.8.x is supported. Python 3.10.x has known issues that must be resolved.
+Install `pyinstaller==4.3` and `pyinstaller-hooks-contrib==2020.7`
+
+Run: `pyinstaller --onefile nparse_py.spec`

data/maps/map_files/airplane_2.txt

@@ -1,24 +1,24 @@
-P 349.81, -501.7633, 125.11, 0, 127, 0, 2, 6-Evians
-P -1108, -516, -15.2926, 0, 0, 127, 2, 2-Swords
-P -306.1557, 749.3103, 767.6651, 99, 0, 255, 2, 7-Swarm
-P 491.8852, 479.3287, 1005.2204, 0, 0, 0, 2, DA_Jump_to_island_3
-P -839, -1419, 0, 0, 0, 127, 2, 2-Swords
+P 349.81, -501.7633, 125.11, 0, 127, 0, 2, 5-Evians
+P -1108, -516, -15.2926, 0, 0, 127, 2, 1.5-Swords
+P -306.1557, 749.3103, 767.6651, 99, 0, 255, 2, 6-Swarm
+P 491.8852, 479.3287, 1005.2204, 0, 0, 0, 2, DA_Jump_to_island_2
+P -839, -1419, 0, 0, 0, 127, 2, 1.5-Swords
 P -533, -1612, 0, 64, 64, 64, 2, Quest_Room
-P -370, -1360, 0, 127, 0, 0, 2, 3-Misplaced
+P -370, -1360, 0, 127, 0, 0, 2, 2-Misplaced
 P -547, -1415, 0, 0, 0, 0, 3, X
-P -1171, -454, 0, 127, 0, 0, 2, 3-Misplaced
-P 580, 460, 0, 0, 127, 127, 2, 4-Misfortune
-P 434, 103, 0, 127, 0, 0, 2, 3-Misplaced
-P -231, -189, 0, 127, 64, 0, 2, 5-Beasts
-P -1089, 884, 408.7744, 0, 127, 0, 2, 6-Evians
-P -729, 193, 0, 96, 0, 255, 2, 7-_Swarm
-P -410, 1181, 0, 255, 53, 0, 2, 8-Scale
-P 1340.3395, 714.3034, 1007.2078, 0, 0, 0, 2, 9-Veeshan
-P -320, -564, -58.8406, 0, 127, 127, 2, 4-Misfortune
-P 781, -1185, 126.608, 127, 64, 0, 2, 5-Beasts
+P -1171, -454, 0, 127, 0, 0, 2, 2-Misplaced
+P 580, 460, 0, 0, 127, 127, 2, 3-Misfortune
+P 434, 103, 0, 127, 0, 0, 2, 2-Misplaced
+P -231, -189, 0, 127, 64, 0, 2, 4-Beasts
+P -1089, 884, 408.7744, 0, 127, 0, 2, 5-Evians
+P -729, 193, 0, 96, 0, 255, 2, 6-Swarm
+P -410, 1181, 0, 255, 53, 0, 2, 7-Scale
+P 1340.3395, 714.3034, 1007.2078, 0, 0, 0, 2, 8-Veeshan
+P -320, -564, -58.8406, 0, 127, 127, 2, 3-Misfortune
+P 781, -1185, 126.608, 127, 64, 0, 2, 4-Beasts
 P -559.9914, -1296.9843, -766.5031, 0, 0, 0, 1, Charm_of_Sacrifice(GS)Ench1.0)
-P 471, 984, 1009.2146, 255, 53, 0, 2, 8-Scale
-P 1294, 262, 1217.962, 0, 0, 0, 2, 9-Veeshan
+P 471, 984, 1009.2146, 255, 53, 0, 2, 7-Scale
+P 1294, 262, 1217.962, 0, 0, 0, 2, 8-Veeshan
 P -608.8858, -1371.2844, -663.6644, 0, 0, 127, 2, a_thunder_spirit_princess(Ncr1.0)
 P -654.9678, -1304.3721, -769.6851, 0, 0, 127, 2, Test_of_Power(Ncr1.0)
 P -653.5959, -1466.8195, -769.6851, 0, 0, 127, 2, Kihun_Solstin(Mag1.0)

data/maps/map_files/feerrott_4.txt

@@ -0,0 +1,7 @@
+P -2670, 1410, 23.7060,  127, 127, 0,  3,  #1
+P -2710, 1600, 23.7060,  127, 127, 0,  3,  #2
+P -2815, 1720, 23.7060,  127, 127, 0,  3,  #3
+P -2988, 1900, 23.7060,  127, 127, 0,  3,  #4
+P -2830, 1837, 23.7060,  127, 127, 0,  3,  #5
+P -2905, 1935, 23.7060,  127, 127, 0,  3,  #6
+P -2740, 1745, 23.7060,  127, 127, 0,  3,  #7

data/maps/map_files/mischiefplane.txt

@@ -3707,4 +3707,4 @@ L 46.0000, -9.0000, 90.0000,  45.0000, -8.0000, 90.0000,  255, 255, 255
 L 46.0000, -2.0000, 90.0000,  46.0000, -9.0000, 90.0000,  255, 255, 255
 L 0.0000, -25.0000, 90.0000,  0.0000, 25.0000, 90.0000,  255, 255, 255
 L -25.0000, 0.0000, 90.0000,  100.0000, 0.0000, 90.0000,  255, 255, 255
-P 353.0000, 1017.0000, 90.0000,  0, 127, 0,  3,  to_Cobalt_Scar_(tree)
+P -532, 669, 90.0000,  0, 127, 0,  3,  to_Cobalt_Scar_(tree)

data/maps/map_files/mischiefplane_4.txt

@@ -0,0 +1,10 @@
+P 1565, 630, 90, 200, 0, 200, 2, Trap!
+P 1300, 238, 90, 200, 0, 200, 2, Trap!
+P 1235, 195, 90, 200, 0, 200, 2, Trap!
+P 1040, 700, 90, 200, 0, 200, 2, Trap!
+P 985, 900, 90, 200, 0, 200, 2, Trap!
+P 617, 1238, 90, 200, 0, 200, 2, Trap!
+P 525, 1275, 90, 200, 0, 200, 2, Trap!
+P 485, 870, 90, 200, 0, 200, 2, Trap!
+P 275, 1230, 90, 200, 0, 200, 2, Trap!
+P 72, 1050, 90, 200, 0, 200, 2, Trap!

data/maps/map_keys.ini

@@ -2,7 +2,7 @@ ocean of tears = oot
 northern plains of karana = northkarana
 skyshrine = skyshrine
 the nektulos forest = nektulos
-sleeper's tomb = sleeper
+sleepers tomb = sleeper
 erudin = erudnext
 kedge keep = kedge
 ak'anon = akanon
@@ -17,6 +17,7 @@ tower of frozen shadow = frozenshadow
 icewell keep = thurgadinb
 the feerrott = feerrott
 ruins of sebilis = sebilis
+old sebilis = sebilis
 east commonlands = ecommons
 cabilis east = cabeast
 veeshan's peak = veeshan
@@ -35,7 +36,7 @@ befallen = befallen
 paineel = paineel
 north freeport = freportn
 nagafen's lair = soldungb
-liberated citadel of runnyeye = runnyeye
+runnyeye citadel = runnyeye
 frontier mountains = frontiermtns
 the city of mist = citymist
 west freeport = freportw
@@ -51,7 +52,7 @@ city of thurgadin = thurgadina
 northern desert of ro = nro
 neriak foreign quarter = neriaka
 infected paw = paw
-plane of sky = airplane
+plane of air = airplane
 southern felwithe = felwitheb
 velketor's labyrinth = velketor
 cabilis west = cabwest
@@ -93,7 +94,7 @@ mines of nurga = nurga
 oasis of marr = oasis
 the emerald jungle = emeraldjungle
 great divide = greatdivide
-siren's grotto = sirens
+sirens grotto = sirens
 erudin palace = erudnint
 toxxulia forest = tox
 ruins of old guk = gukbottom

data/maps/map_keys_who.ini

@@ -0,0 +1,36 @@
+kael drakkal = kael drakkel
+eastern wastes = eastern wastelands
+the wakening land = the wakening lands
+siren's grotto = sirens grotto
+the plane of hate = plane of hate
+burning woods = the burning wood
+south ro = southern desert of ro
+plane of sky = plane of air
+south karana = southern plains of karana
+sleeper's tomb = sleepers tomb
+mountains of rathe = rathe mountains
+nektulos forest = the nektulos forest
+city of mist = the city of mist
+west cabilis = cabilis west
+east cabilis = cabilis east
+cazic-thule = lost temple of cazic-thule
+everfrost peaks = everfrost
+highkeep = high keep
+kithicor forest = kithicor woods
+lower guk = ruins of old guk
+north ro = northern desert of ro
+north karana = northern plains of karana
+permafrost keep = permafrost caverns
+clan runnyeye = runnyeye citadel
+the ruins of old paineel = the hole
+the warrens = warrens
+thurgadin = city of thurgadin
+upper guk = guk
+warsliks wood = warsliks woods
+west karana = western plains of karana
+clan crushbone = crushbone
+east karana = eastern plains of karana
+the field of bone = field of bone
+qeynos catacombs = qeynos aqueduct system
+felwithe = northern felwithe
+kaladim = south kaladim

data/maps/map_timers.csv

@@ -0,0 +1,73 @@
+greatdivide,10:40
+qcat,12:00
+guktop,16:30
+gukbottom,28:00
+kerraridge,17:45
+soldunga,18:00
+soldungb,22:00
+charasis,20:30
+cazicthule,22:00
+citymist,22:00
+runnyeye,22:00
+mistmoore,22:00
+permafrost,22:00
+paw,22:00
+unrest,22:00
+qey2hh1,22:00
+felwithea,24:00
+felwitheb,24:00
+freporte,24:00
+freportn,24:00
+freportw,24:00
+neriaka,24:00
+neriakb,24:00
+neriakc,24:00
+kael,28:00
+sirens,28:00
+beholder,6:00
+thurgadina,7:00
+thurgadinb,7:00
+airplane,8:00
+butcher,10:00
+mischiefplane,1:12:00
+highkeep,10:00
+paineel,10:00
+stonebrunt,11:10
+dalnir,12:00
+growthplane,12:00
+timorous,12:00
+skyfire,13:00
+crystal,14:45
+oasis,16:30
+kaesora,18:00
+kurn,18:30
+najena,18:30
+befallen,19:00
+chardok,20:00
+cobaltscar,20:00
+frozenshadow,20:00
+nurga,20:30
+droga,20:30
+thurgadinb,21:00
+hole,21:30
+blackburrow,22:00
+kedge,22:00
+rivervale,22:00
+grobb,24:00
+halas,24:00
+oggok,24:00
+erudnint,25:00
+necropolis,27:00
+karnor,27:00
+sebilis,27:00
+skyshrine,30:00
+velketor,32:50
+highpass,5:00
+oot,6:00
+lfaydark,6:30
+gfaydark,7:05
+templeveeshan,72:00
+fearplane,8:00
+hateplane,8:00
+sleeper,8:00
+crushbone,9:00