Skip to content

Commit

Permalink
various fixes
Browse files Browse the repository at this point in the history 
No more updating of any information in legacy mode.
nicer format for current pos
new prices: concerns #12 need to check amphora plant and bark mounds to be completely sure.
  • Loading branch information
@Balvald
Balvald committed Dec 13, 2022
1 parent 8186c24 commit 9a00265
Show file tree
Hide file tree
Showing 2 changed files with 144 additions and 130 deletions.
32 changes: 23 additions & 9 deletions load.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from journalcrawler import build_biodata_json
from organicinfo import bearing, computedistance, generaltolocalised, \
getclonalcolonialranges, genusgeneraltolocalised, getu14vistagenomicprices
getclonalcolonialranges, genusgeneraltolocalised, getvistagenomicprices


frame: Optional[tk.Frame] = None
Expand Down Expand Up @@ -56,14 +56,17 @@

logger = logging.getLogger(f"{appname}.{os.path.basename(os.path.dirname(__file__))}")

vistagenomicsprices = getu14vistagenomicprices()
vistagenomicsprices = getvistagenomicprices()


class ArtemisScannerTracker:
"""Artemis Scanner Tracker plugin class."""

def __init__(self) -> None:
"""Initialize the plugin by getting values from the config file."""

self.AST_in_Legacy: Optional[bool] = False

# Be sure to use names that wont collide in our config variables
# Bools for show hide checkboxes

Expand Down Expand Up @@ -346,12 +349,13 @@ def dashboard_entry(cmdr: str, is_beta, entry):
:param is_beta: Is the game currently in beta
:param entry: full excerpt from status.json
"""
# print full excerpt to check everything is there.
# logger.debug(f'Status.json says: {entry}')
# 'Latitude': -19.506268, 'Longitude': -4.657524, 'Heading': 298,
# 'Altitude': 1320594, 'BodyName': 'Murato 3 a', 'PlanetRadius': 3741155.5,

global plugin, currentcommander, firstdashboard

if plugin.AST_in_Legacy is True:
# We're in legacy we don't update anything through dashboard entries
return

flag = False

if currentcommander != cmdr and currentcommander != "" and currentcommander is not None:
Expand All @@ -375,15 +379,18 @@ def dashboard_entry(cmdr: str, is_beta, entry):
plugin.on_preferences_closed(cmdr, is_beta)

if "PlanetRadius" in entry.keys():
# We found a PlanetRadius again, this means we are near a planet.
if not plugin.AST_near_planet:
# We just came into range of a planet again.
flag = True
plugin.AST_near_planet = True
plugin.AST_current_radius = entry["PlanetRadius"]
plugin.AST_current_pos_vector[0] = entry["Latitude"]
plugin.AST_current_pos_vector[1] = entry["Longitude"]
plugin.AST_current_pos_vector[2] = entry["Heading"]
text = str(plugin.AST_current_pos_vector[0]) + ", " + str(plugin.AST_current_pos_vector[1]) + ", " + \
str(plugin.AST_current_pos_vector[2]) + ", " + str(plugin.AST_current_radius)
text = "lat: " + str(plugin.AST_current_pos_vector[0]) + \
", long: " + str(plugin.AST_current_pos_vector[1]) + ", B:" + \
str(plugin.AST_current_pos_vector[2]) # + ", " + str(plugin.AST_current_radius)
plugin.AST_current_pos.set(text)

if plugin.AST_current_scan_progress.get() in ["1/3", "2/3"] and plugin.AST_scan_1_pos_vector[0] is not None:
Expand All @@ -410,6 +417,7 @@ def dashboard_entry(cmdr: str, is_beta, entry):
plugin.AST_scan_2_pos_vector[1]), 2)))
else:
if plugin.AST_near_planet:
# Switch happened we went too far from the planet to get any reference from it.
flag = True
plugin.AST_near_planet = False
plugin.AST_current_radius = None
Expand Down Expand Up @@ -479,6 +487,13 @@ def journal_entry(cmdr: str, is_beta: bool, system: str, station: str, entry, st
"""
global plugin, currentcommander

if (int(state["gameversion"][0]) < 4) and (plugin.AST_in_Legacy is False):
# We're in Legacy, we'll not change the state of anything through journal entries.
plugin.AST_in_Legacy = True
return
else:
plugin.AST_in_Legacy = False

if currentcommander != cmdr and currentcommander != "" and currentcommander is not None:
# Check if new and old Commander are in the cmdrstates file.
save_cmdr(currentcommander)
Expand All @@ -505,7 +520,6 @@ def journal_entry(cmdr: str, is_beta: bool, system: str, station: str, entry, st
flag = False

# Prepare to fix probable bugs before a user might report them:
# TODO: Do not update anything while not in Live universe of E:D!

# TODO: Check if upon death in 4.0 Horizons do we lose Exobiodata.
# TODO: Check how real death differs from frontline solutions ground combat zone death.
Expand Down
242 changes: 121 additions & 121 deletions organicinfo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import math

# new prices, only missing sinouos tubers and amphora plant
# Update 14 Prices
u14vistagenomicsprices = {
"Fonticulua Fluctus": 16777215,
"Tussock Stigmasis": 16777215,
Expand Down Expand Up @@ -127,125 +127,125 @@
"Bacterium Acies": 1500000
}

# pre U14 prices for vista genomics - spare table for when values change again.
# Update 14.01 prices
vistagenomicsprices = {
"Fonticulua Fluctus": 900000,
"Tussock Stigmasis": 806300,
"Stratum Tectonicas": 806300,
"Fonticulua Segmentatus": 806300,
"Concha Biconcavis": 806300,
"Stratum Cucumisis": 711500,
"Recepta Deltahedronix": 711500,
"Fumerola Extremus": 711500,
"Clypeus Speculumi": 711500,
"Cactoida Vermis": 711500,
"Tussock Virgam": 645700,
"Recepta Conditivus": 645700,
"Recepta Umbrux": 596500,
"Osseus Discus": 596500,
"Aleoida Gravis": 596500,
"Tubus Sororibus": 557800,
"Clypeus Margaritus": 557800,
"Frutexa Flammasis": 500100,
"Osseus Pellebantus": 477700,
"Clypeus Lacrimam": 426200,
"Bacterium Informem": 426200,
"Tussock Triticum": 400500,
"Tubus Rosarium": 400500,
"Frutexa Acus": 400500,
"Concha Aureolas": 400500,
"Bacterium Volu": 400500,
"Fumerola Nitris": 389400,
"Aleoida Arcus": 379300,
"Tussock Capillum": 370000,
"Fumerola Carbosis": 339100,
"Fumerola Aquatis": 339100,
"Electricae Radialem": 339100,
"Electricae Pluma": 339100,
"Aleoida Coronamus": 339100,
"Frutexa Sponsae": 326500,
"Tussock Pennata": 320700,
"Tubus Conifer": 315300,
"Fonticulua Upupam": 315300,
"Bacterium Nebulus": 296300,
"Bacterium Scopulum": 280600,
"Bacterium Omentum": 267400,
"Concha Renibus": 264300,
"Tussock Serrati": 258700,
"Osseus Fractus": 239400,
"Bacterium Verrata": 233300,
"Fungoida Bullarum": 224100,
"Cactoida Pullulanta": 222500,
"Cactoida Cortexum": 222500,
"Tussock Caputus": 213100,
"Aleoida Spica": 208900,
"Aleoida Laminiae": 208900,
"Fungoida Gelata": 206300,
"Tussock Albata": 202500,
"Tussock Ventusa": 201300,
"Osseus Pumice": 197800,
"Fonticulua Lapida": 195600,
"Stratum Laminamus": 179500,
"Fungoida Stabitis": 174000,
"Tubus Cavas": 171900,
"Stratum Frigus": 171900,
"Cactoida Peperatis": 164000,
"Cactoida Lapis": 164000,
"Stratum Excutitus": 162200,
"Stratum Araneamus": 162200,
"Osseus Spiralis": 159900,
"Concha Labiata": 157100,
"Bacterium Tela": 135600,
"Tussock Ignis": 130100,
"Frutexa Flabellum": 127900,
"Fonticulua Digitos": 127700,
"Tussock Divisa": 125600,
"Tussock Cultro": 125600,
"Tussock Catena": 125600,
"Bacterium Cerbrus": 121300,
"Fungoida Setisis": 120200,
"Bacterium Alcyoneum": 119500,
"Frutexa Collum": 118500,
"Frutexa Metallicum": 118100,
"Frutexa Fera": 118100,
"Crystalline Shards": 117900,
"Amphora Plant": 117900,
"Viride Brain Tree": 115900,
"Roseum Brain Tree": 115900,
"Puniceum Brain Tree": 115900,
"Ostrinum Brain Tree": 115900,
"Lividum Brain Tree": 115900,
"Lindigoticum Brain Tree": 115900,
"Gypseeum Brain Tree": 115900,
"Aureum Brain Tree": 115900,
"Viride Sinuous Tubers": 111300,
"Violaceum Sinuous Tubers": 111300,
"Roseum Sinuous Tubers": 111300,
"Prasinum Sinuous Tubers": 111300,
"Lindigoticum Sinuous Tubers": 111300,
"Caeruleum Sinuous Tubers": 111300,
"Blatteum Sinuous Tubers": 111300,
"Albidum Sinuous Tubers": 111300,
"Rubeum Bioluminescent Anemone": 110500,
"Roseum Bioluminescent Anemone": 110500,
"Roseum Anemone": 110500,
"Puniceum Anemone": 110500,
"Prasinum Bioluminescent Anemone": 110500,
"Luteolum Anemone": 110500,
"Croceum Anemone": 110500,
"Blatteum Bioluminescent Anemone": 110500,
"Osseus Cornibus": 109500,
"Bark Mounds": 108900,
"Tubus Compagibus": 102700,
"Stratum Paleas": 102500,
"Stratum Limaxus": 102500,
"Bacterium Bullaris": 89900,
"Bacterium Aurasus": 78500,
"Tussock Propagito": 71300,
"Fonticulua Campestris": 63600,
"Tussock Pennatis": 59600,
"Bacterium Vesicula": 56100,
"Bacterium Acies": 50000
"Fonticulua Fluctus": 20000000,
"Tussock Stigmasis": 19010800,
"Stratum Tectonicas": 19010800,
"Fonticulua Segmentatus": 19010800,
"Concha Biconcavis": 19010800,
"Stratum Cucumisis": 16202800,
"Recepta Deltahedronix": 16202800,
"Fumerola Extremus": 16202800,
"Clypeus Speculumi": 16202800,
"Cactoida Vermis": 16202800,
"Tussock Virgam": 14313700,
"Recepta Conditivus": 14313700,
"Recepta Umbrux": 12934900,
"Osseus Discus": 12934900,
"Aleoida Gravis": 12934900,
"Tubus Cavas": 11873200,
"Clypeus Margaritus": 11873200,
"Frutexa Flammasis": 10326000,
"Osseus Pellebantus": 9739000,
"Clypeus Lacrimam": 8418000,
"Bacterium Informem": 8418000,
"Tussock Triticum": 7774700,
"Tubus Compagibus": 7774700,
"Frutexa Acus": 7774700,
"Concha Aureolas": 7774700,
"Bacterium Volu": 7774700,
"Fumerola Nitris": 7500900,
"Aleoida Arcus": 7252500,
"Tussock Capillum": 7025800,
"Fumerola Carbosis": 6284600,
"Fumerola Aquatis": 6284600,
"Electricae Radialem": 6284600,
"Electricae Pluma": 6284600,
"Aleoida Coronamus": 6284600,
"Frutexa Sponsae": 5988000,
"Tussock Pennata": 5853800,
"Tubus Sororibus": 5727600,
"Fonticulua Upupam": 5727600,
"Bacterium Nebulus": 5289900,
"Bacterium Scopulum": 4934500,
"Bacterium Omentum": 4638900,
"Concha Renibus": 4572400,
"Tussock Serrati": 4447100,
"Osseus Fractus": 4027800,
"Bacterium Verrata": 3897000,
"Fungoida Bullarum": 3703200,
"Cactoida Pullulanta": 3667600,
"Cactoida Cortexum": 3667600,
"Tussock Caputus": 3472400,
"Aleoida Spica": 3385200,
"Aleoida Laminiae": 3385200,
"Fungoida Gelata": 3330300,
"Tussock Albata": 3252500,
"Tussock Ventusa": 3227700,
"Osseus Pumice": 3156300,
"Fonticulua Lapida": 3111000,
"Stratum Laminamus": 2788300,
"Fungoida Stabitis": 2680300,
"Tubus Rosarium": 2637500,
"Stratum Frigus": 2637500,
"Cactoida Peperatis": 2483600,
"Cactoida Lapis": 2483600,
"Stratum Excutitus": 2448900,
"Stratum Araneamus": 2448900,
"Tubus Conifer": 2415500,
"Osseus Spiralis": 2404700,
"Concha Labiata": 2352400,
"Bacterium Tela": 1949000,
"Tussock Ignis": 1849000,
"Frutexa Flabellum": 1808900,
"Fonticulua Digitos": 1804100,
"Tussock Divisa": 1766600,
"Tussock Cultro": 1766600,
"Tussock Catena": 1766600,
"Bacterium Cerbrus": 1689800,
"Fungoida Setisis": 1670100,
"Bacterium Alcyoneum": 1658500,
"Frutexa Collum": 1639800,
"Frutexa Metallicum": 1632500,
"Frutexa Fera": 1632500,
"Amphora Plant": 1628800,
"Crystalline Shards": 1628800,
"Viride Brain Tree": 1593700,
"Roseum Brain Tree": 1593700,
"Puniceum Brain Tree": 1593700,
"Ostrinum Brain Tree": 1593700,
"Lividum Brain Tree": 1593700,
"Lindigoticum Brain Tree": 1593700,
"Gypseeum Brain Tree": 1593700,
"Aureum Brain Tree": 1593700,
"Viride Sinuous Tubers": 1514500,
"Violaceum Sinuous Tubers": 1514500,
"Lindigoticum Sinuous Tubers": 1514500,
"Blatteum Sinuous Tubers": 1514500,
"Roseum Sinuous Tubers": 1514500,
"Albidum Sinuous Tubers": 1514500,
"Prasinum Sinuous Tubers": 1514500,
"Caeruleum Sinuous Tubers": 1514500,
"Rubeum Bioluminescent Anemone": 1499900,
"Roseum Bioluminescent Anemone": 1499900,
"Roseum Anemone": 1499900,
"Puniceum Anemone": 1499900,
"Prasinum Bioluminescent Anemone": 1499900,
"Luteolum Anemone": 1499900,
"Croceum Anemone": 1499900,
"Blatteum Bioluminescent Anemone": 1499900,
"Osseus Cornibus": 1483000,
"Bark Mounds": 1471900,
"Stratum Paleas": 1362000,
"Stratum Limaxus": 1362000,
"Bacterium Bullaris": 1152500,
"Bacterium Aurasus": 1000000,
"Tussock Propagito": 1000000,
"Fonticulua Campestris": 1000000,
"Tussock Pennatis": 1000000,
"Bacterium Vesicula": 1000000,
"Bacterium Acies": 1000000
}

# Journal name translation
Expand Down Expand Up @@ -422,9 +422,9 @@
}


def getu14vistagenomicprices():
def getvistagenomicprices():
"""Get price table."""
return u14vistagenomicsprices
return vistagenomicsprices


def getclonalcolonialranges(name: str) -> int:
Expand Down

0 comments on commit 9a00265

Please sign in to comment.