Skip to content

Commit

Permalink
Hyperdiction Debug
Browse files Browse the repository at this point in the history 
Collecting additional information for hyperdiction and added some extra logic to hopefully prevent false positives.

Also an easter egg!
  • Loading branch information
@paparomeo1969
paparomeo1969 committed Jun 22, 2018
1 parent bfdee48 commit 8ee5416
Show file tree
Hide file tree
Showing 6 changed files with 274 additions and 7 deletions.
178 changes: 178 additions & 0 deletions base.aup
View file
@@ -0,0 +1,178 @@
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
<project xmlns="http://audacity.sourceforge.net/xml/" projname="base_data" version="1.3.0" audacityversion="2.1.3" sel0="11.7921330310" sel1="11.7921330310" vpos="0" h="0.0000000000" zoom="125.1681944328" rate="44100.0" snapto="off" selectionformat="hh:mm:ss + milliseconds" frequencyformat="Hz" bandwidthformat="octaves">
<tags/>
<wavetrack name="Update 1" channel="2" linked="0" mute="1" solo="0" height="150" minimized="0" isSelected="0" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="140488">
<waveblock start="0">
<simpleblockfile filename="e0000bde.au" len="140488" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="3.185646258503" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="3.18566893">
<sequence maxsamples="262144" sampleformat="262159" numsamples="464739">
<waveblock start="0">
<simpleblockfile filename="e0000561.au" len="191900" min="-0.580553" max="0.702122" rms="0.069569"/>
</waveblock>
<waveblock start="191900">
<simpleblockfile filename="e0000b0c.au" len="136419" min="-0.618447" max="0.789156" rms="0.086836"/>
</waveblock>
<waveblock start="328319">
<simpleblockfile filename="e0000464.au" len="136420" min="-0.371026" max="0.581505" rms="0.043411"/>
</waveblock>
</sequence>
<envelope numpoints="2">
<controlpoint t="0.000000000000" val="1.000000000000"/>
<controlpoint t="10.538276643991" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="13.72396825">
<sequence maxsamples="262144" sampleformat="262159" numsamples="68923">
<waveblock start="0">
<simpleblockfile filename="e0000c69.au" len="68923" min="0.0" max="0.000089" rms="0.000001"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.000000000000" val="1.000000000000"/>
</envelope>
</waveclip>
</wavetrack>
<wavetrack name="messagegnosis" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="0" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="140488">
<waveblock start="0">
<simpleblockfile filename="e0000fe5.au" len="140488" min="-0.694588" max="0.99998" rms="0.061433"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="3.185646258503" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="3.18566893">
<sequence maxsamples="262144" sampleformat="262159" numsamples="533662">
<waveblock start="0">
<simpleblockfile filename="e00007ea.au" len="191900" min="0.0" max="0.001153" rms="0.000005"/>
</waveblock>
<waveblock start="191900">
<simpleblockfile filename="e0000133.au" len="191900" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
<waveblock start="383800">
<simpleblockfile filename="e0000f15.au" len="149862" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.000000000000" val="1.000000000000"/>
</envelope>
</waveclip>
</wavetrack>
<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="0" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="5359">
<waveblock start="0">
<simpleblockfile filename="e00006e8.au" len="5359" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.121496598639" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="0.12151927">
<sequence maxsamples="262144" sampleformat="262159" numsamples="126785">
<waveblock start="0">
<simpleblockfile filename="e00006f6.au" len="126785" min="-0.486611" max="0.509635" rms="0.077041"/>
</waveblock>
</sequence>
<envelope numpoints="2">
<controlpoint t="0.000000000000" val="1.000000000000"/>
<controlpoint t="2.874920634921" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="2.99646259">
<sequence maxsamples="262144" sampleformat="262159" numsamples="542006">
<waveblock start="0">
<simpleblockfile filename="e0000456.au" len="196072" min="-0.537455" max="-0.0" rms="0.00243"/>
</waveblock>
<waveblock start="196072">
<simpleblockfile filename="e0000f3b.au" len="196072" min="-0.0" max="-0.0" rms="0.0"/>
</waveblock>
<waveblock start="392144">
<simpleblockfile filename="e0000a88.au" len="149862" min="-0.0" max="-0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.000000000000" val="1.000000000000"/>
</envelope>
</waveclip>
</wavetrack>
<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="0.125893" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="1379">
<waveblock start="0">
<simpleblockfile filename="e0000d83.au" len="1379" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.031247165533" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="0.03126984">
<sequence maxsamples="262144" sampleformat="262159" numsamples="616953">
<waveblock start="0">
<simpleblockfile filename="e000036e.au" len="260765" min="-0.586398" max="0.536081" rms="0.179217"/>
</waveblock>
<waveblock start="260765">
<simpleblockfile filename="e00004a5.au" len="178094" min="-0.514702" max="0.523358" rms="0.179019"/>
</waveblock>
<waveblock start="438859">
<simpleblockfile filename="e0000503.au" len="178094" min="-0.851289" max="0.852423" rms="0.185464"/>
</waveblock>
</sequence>
<envelope numpoints="2">
<controlpoint t="0.000000000000" val="1.000000000000"/>
<controlpoint t="13.989841269841" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="14.02113379">
<sequence maxsamples="262144" sampleformat="262159" numsamples="55818">
<waveblock start="0">
<simpleblockfile filename="e000010a.au" len="55818" min="-0.33927" max="-0.0" rms="0.002875"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.000000000000" val="1.000000000000"/>
</envelope>
</waveclip>
</wavetrack>
<wavetrack name="Update 2" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="0" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="109926">
<waveblock start="0">
<simpleblockfile filename="e00002de.au" len="109926" min="0.0" max="0.0" rms="0.0"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="2.492630385488" val="1.000000000000"/>
</envelope>
</waveclip>
<waveclip offset="2.49265306">
<sequence maxsamples="262144" sampleformat="262159" numsamples="564224">
<waveblock start="0">
<simpleblockfile filename="e0000775.au" len="152218" min="-0.885275" max="0.837309" rms="0.082757"/>
</waveblock>
<waveblock start="152218">
<simpleblockfile filename="e000000a.au" len="262144" min="-0.685255" max="0.670992" rms="0.054389"/>
</waveblock>
<waveblock start="414362">
<simpleblockfile filename="e0000d7e.au" len="149862" min="-0.384278" max="0.618056" rms="0.03564"/>
</waveblock>
</sequence>
<envelope numpoints="1">
<controlpoint t="0.000000000000" val="1.000000000000"/>
</envelope>
</waveclip>
</wavetrack>
</project>
49 changes: 42 additions & 7 deletions load.py
View file
Expand Up @@ -6,14 +6,15 @@
import requests
import os
import csv
import json
import uuid
from urllib import quote_plus
from math import sqrt,pow,trunc
from ttkHyperlinkLabel import HyperlinkLabel
import datetime
import webbrowser
import threading

from winsound import *

from config import applongname, appversion
import myNotebook as nb
Expand All @@ -24,7 +25,7 @@
this.s = None
this.prep = {}
this.debuglevel=1
this.version="4.3.1"
this.version="4.3.2"



Expand Down Expand Up @@ -64,6 +65,18 @@ def run(self):
debug(self.payload,2)
except:
print("["+myPlugin+"] Issue posting message " + str(sys.exc_info()[0]))

class Player(threading.Thread):
def __init__(self, payload):
threading.Thread.__init__(self)
self.payload = payload

def run(self):
try:
soundfile = os.path.dirname(this.__file__)+'\\'+self.payload
PlaySound(soundfile,SND_FILENAME)
except:
print("["+myPlugin+"] Issue playing sound " + str(sys.exc_info()[0]))

class ussSelect:

Expand Down Expand Up @@ -435,12 +448,21 @@ def StartJump(self,cmdr, system, station, entry):
self.station = station
self.timestamp = entry["timestamp"].replace("T"," ").replace("-","/").replace("Z","")
self.cmdr=cmdr
self.startevent=entry

def DebugInfo(self,cmdr, system, entry):
url="https://docs.google.com/forms/d/e/1FAIpQLSeLsjL0M7mJy89y6AOH7eo5kSoVZhR_hb3zAmF_C4tsvKpvKQ/formResponse?usp=pp_url"
url+="&entry.1892927060="+quote_plus(cmdr);
url+="&entry.1740782271="+quote_plus(system);
url+="&entry.531806815="+quote_plus(json.dumps(self.startevent));
url+="&entry.495111246="+quote_plus(json.dumps(entry));
Reporter(url).start()


def FSDJump(self,cmdr, system, station, entry):
self.end_jump = entry["StarSystem"]
self.cmdr=cmdr
if self.target_jump != self.end_jump:
if self.target_jump != self.end_jump and system == self.start_jump:
debug("Hyperdiction Detected",2)
startx,starty,startz=edsmGetSystem(self.start_jump)
endx,endy,endz=edsmGetSystem(self.target_jump)
Expand All @@ -451,12 +473,14 @@ def FSDJump(self,cmdr, system, station, entry):
#print url
Reporter(url).start()
setHyperReport(self.start_jump,self.target_jump)
self.DebugInfo(cmdr, system,entry)

class news:
def __init__(self,frame):
debug("Initiating News")
self.feed_url="https://docs.google.com/spreadsheets/d/e/2PACX-1vSy9ij93j2qbwD-1_bXlI5IfO4EUD4ozNX2GJ2Do5tZNl-udWIqBHxYbtmcMRwvF6favzay3zY2LpH5/pub?gid=1876886084&single=true&output=tsv"
self.version_url="https://docs.google.com/spreadsheets/d/e/2PACX-1vSy9ij93j2qbwD-1_bXlI5IfO4EUD4ozNX2GJ2Do5tZNl-udWIqBHxYbtmcMRwvF6favzay3zY2LpH5/pub?gid=0&single=true&output=tsv"
self.nag_count=0
this.description = tk.Message(frame,width=200)
this.news_label = tk.Label(frame, text= "Report:")
this.newsitem= HyperlinkLabel(frame, compound=tk.LEFT, popup_copy = True)
Expand All @@ -469,7 +493,15 @@ def __init__(self,frame):
self.getPost()



def nag(self):
debug("Nagging")
self.nag_count=self.nag_count+1
if self.nag_count == 3:
Player("nag1.wav").start()
if self.nag_count == 10:
Player("nag2.wav").start()



def getPost(self):

Expand All @@ -483,6 +515,8 @@ def getPost(self):
this.newsitem["url"] = rec[2]
this.newsitem.grid()
this.news_label.grid()
debug("Nagging in getPost")
self.nag()
getnews=False


Expand Down Expand Up @@ -862,6 +896,7 @@ def getDistanceSol(x1,y1,z1):
return round(sqrt(pow(float(0)-float(x1),2)+pow(float(0)-float(y1),2)+pow(float(0)-float(z1),2)),2)

def journal_entry(cmdr, is_beta, system, station, entry, state):
statistics(cmdr, is_beta, system, station, entry, state)
if config.getint("Anonymous") >0:
commander="Anonymous"
else:
Expand All @@ -880,7 +915,7 @@ def journal_entry_wrapper(cmdr, is_beta, system, station, entry, state):
this.ussSelector.journal_entry(cmdr, system, station, entry)
faction_kill(cmdr, is_beta, system, station, entry, state)
refugee_mission(cmdr, is_beta, system, station, entry, state)
statistics(cmdr, is_beta, system, station, entry, state)


if entry['event'] == 'USSDrop':
this.ussInator.ussDrop(cmdr, system, station, entry)
Expand All @@ -889,6 +924,7 @@ def journal_entry_wrapper(cmdr, is_beta, system, station, entry, state):
if entry['event'] == 'SupercruiseExit':
# we need to check if we dropped from a uss
this.ussInator.SupercruiseExit(cmdr, system, station, entry)
this.newsFeed.getPost()

if entry['event'] == 'StartJump':
this.newsFeed.getPost()
Expand All @@ -900,7 +936,6 @@ def journal_entry_wrapper(cmdr, is_beta, system, station, entry, state):

this.hyperdictionInator.StartJump(cmdr, system, station, entry)

#patrol_start_jump(cmdr,this.arrived,entry["timestamp"],system,entry["StarSystem"])


if entry['event'] == 'FSDJump':
Expand Down Expand Up @@ -946,7 +981,7 @@ def faction_kill(cmdr, is_beta, system, station, entry, state):

def refugee_mission(cmdr, is_beta, system, station, entry, state):
if entry['event'] == "MissionAccepted":
if entry['Name'] == "Mission_RS_PassengerBulk_name":
if entry['Name'] == "Mission_RS_PassengerBulk_name" or entry['Name'] == "Mission_RS_PassengerBulk":
if entry['PassengerType'] == "Refugee":
url="https://docs.google.com/forms/d/e/1FAIpQLSckkj7F4EdwGtwBl0uGtHeDloXErdTIdhFDajtnkJTqomqeYA/formResponse?usp=pp_url"
url+="&entry.136746653="+quote_plus(cmdr)
Expand Down
Binary file added nag1.wav
View file
Binary file not shown.
Binary file added nag2.wav
View file
Binary file not shown.
54 changes: 54 additions & 0 deletions source/base.aup
View file
@@ -0,0 +1,54 @@
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
<project xmlns="http://audacity.sourceforge.net/xml/" projname="base_data" version="1.3.0" audacityversion="2.1.3" sel0="0.0000000000" sel1="14.2322633745" vpos="0" h="0.0000000000" zoom="127.8784654353" rate="44100.0" snapto="off" selectionformat="hh:mm:ss + milliseconds" frequencyformat="Hz" bandwidthformat="octaves">
<tags/>
<wavetrack name="Update 1" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="3.18566893">
<sequence maxsamples="262144" sampleformat="262159" numsamples="464739">
<waveblock start="0">
<simpleblockfile filename="e000014a.au" len="229657" min="-0.651868" max="0.696026" rms="0.110849"/>
</waveblock>
<waveblock start="229657">
<simpleblockfile filename="e0000a96.au" len="235082" min="-0.579699" max="0.664633" rms="0.089577"/>
</waveblock>
</sequence>
<envelope numpoints="0"/>
</waveclip>
</wavetrack>
<wavetrack name="messagegnosis" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.00000000">
<sequence maxsamples="262144" sampleformat="262159" numsamples="140488">
<waveblock start="0">
<simpleblockfile filename="e000047b.au" len="140488" min="-0.517517" max="0.760088" rms="0.09574"/>
</waveblock>
</sequence>
<envelope numpoints="0"/>
</waveclip>
</wavetrack>
<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="1.0" pan="0.0">
<waveclip offset="0.12151115">
<sequence maxsamples="262144" sampleformat="262159" numsamples="126785">
<waveblock start="0">
<simpleblockfile filename="e000026b.au" len="126785" min="-0.736767" max="0.715018" rms="0.082551"/>
</waveblock>
</sequence>
<envelope numpoints="0"/>
</waveclip>
</wavetrack>
<wavetrack name="Audio Track" channel="2" linked="0" mute="0" solo="0" height="150" minimized="0" isSelected="1" rate="44100" gain="0.125893" pan="0.0">
<waveclip offset="0.03126984">
<sequence maxsamples="262144" sampleformat="262159" numsamples="616953">
<waveblock start="0">
<simpleblockfile filename="e0000bb9.au" len="262144" min="-0.720856" max="0.746601" rms="0.181639"/>
</waveblock>
<waveblock start="262144">
<simpleblockfile filename="e0000c0a.au" len="262144" min="-0.736266" max="0.821584" rms="0.183097"/>
</waveblock>
<waveblock start="524288">
<simpleblockfile filename="e0000174.au" len="92665" min="-1.153519" max="1.053203" rms="0.189"/>
</waveblock>
</sequence>
<envelope numpoints="0"/>
</waveclip>
</wavetrack>
</project>
Binary file added source/messagegnosis.m4a
View file
Binary file not shown.

0 comments on commit 8ee5416

Please sign in to comment.