Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify map generation #3

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Simplify map generation #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3cb8e
Simplified line creation for map.
julian94 Feb 20, 2021
46de1ab
Severely improved map generation.
julian94 Feb 20, 2021
24148db
Cleared up disparity and print statements.
julian94 Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 90 additions & 46 deletions hexmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,61 @@
import json
import sys


class World:
def __init__(self, worldtype, gas_giant, starport, naval, scout, names):
self.worldtype = worldtype
self.gas_giant = gas_giant
self.starport = starport
self.naval = naval
self.scout = scout
self.names = names
def number_to_hex(number):
if number < 10:
return number
if number == 10:
return "A"
if number == 11:
return "B"
if number == 12:
return "C"
if number == 13:
return "D"
if number == 14:
return "E"
if number == 15:
return "F"
if number == 16:
return "G"
Comment on lines +7 to +23
Copy link

@AlexMooney AlexMooney Feb 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless you really want a 'G' instead of a '10', you can use hex. If you do want the 'G', then it's just 1 if statement on top of hex formatting. Or I guess you could ditch this method and just add a bunch of :X to the f-strings. Edit: or you could call pseudo_hex from stellagama.

Suggested change
def number_to_hex(number):
if number < 10:
return number
if number == 10:
return "A"
if number == 11:
return "B"
if number == 12:
return "C"
if number == 13:
return "D"
if number == 14:
return "E"
if number == 15:
return "F"
if number == 16:
return "G"
def number_to_hex(number):
return f'{number:X}'


class World2:
def __init__(self, json_data):
self.name = json_data["name"]
self.location_hex = json_data["hex"]
self.starport = json_data["starport"]
self.size = json_data["size"]
self.atmosphere = json_data["atmosphere"]
self.hydrographics = json_data["hydrographics"]
self.population = json_data["population"]
self.government = json_data["government"]
self.law = json_data["law"]
self.tl = json_data["tl"]
self.zone = json_data["zone"]
self.base = json_data["base"]
self.gas_giants = json_data["gas_giants"]
self.trade = json_data["trade"]

def worldtype(self):
if self.hydrographics > 0:
worldtype = "@"
elif self.size == 0:
worldtype = "#"
else:
worldtype = "O"
return worldtype

def naval_base(self):
return "*" if "N" in self.base else " "

def scout_base(self):
return "^" if "S" in self.base else " "

def uwp(self):
return f"{self.starport}{number_to_hex(self.size)}{number_to_hex(self.atmosphere)}{number_to_hex(self.hydrographics)}{number_to_hex(self.population)}{number_to_hex(self.government)}{number_to_hex(self.law)}-{number_to_hex(self.tl)}"

def __str__(self):
return f"{self.location_hex} {self.name} - {self.uwp()}"


def name_converter(name):
Expand All @@ -28,33 +74,7 @@ def read_json_subsector(jsonfile):
for column in data:
for row in data[column]:
if row in data[column]:
if data[column][row]["hydrographics"] > 0:
world_type = "@"
elif data[column][row]["size"] == 0:
world_type = "#"
else:
world_type = "O"
if data[column][row]["gas_giants"] == "G":
gas_giant = "*"
else:
gas_giant = " "
if data[column][row]["base"] == "N":
naval_base = "*"
else:
naval_base = " "
if data[column][row]["base"] == "S":
scout_base = "^"
else:
scout_base = "_"
starmap[int(column)][int(row)] = World(world_type, gas_giant, data[column][row]["starport"],
naval_base, scout_base,
name_converter(data[column][row]["name"]))
else:
starmap[int(column)][int(row)] = World(" ", " ", " ", " ", "_", " ")
for column in starmap:
for row in starmap[column]:
if row not in starmap[column]:
starmap[column][row] = World(" ", " ", " ", " ", "_", " ")
starmap[int(column)][int(row)] = World(data[column][row])
return starmap


Expand All @@ -63,7 +83,7 @@ def blank_map():
for column in range(0, 9):
starmap[column] = {}
for row in range(0, 11):
starmap[column][row] = World(" ", " ", " ", " ", "_", " ")
starmap[column][row] = None
Comment on lines -66 to +86
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you leave this as in instance of World, then later you could call printmap[row][column] = starmap[column][row].print_lines() and move all the print_map.append logic into this class, and then you don't need the if starmap[column][row] is not None:.

class World2:
    def print_lines(self):
        return [
            f"  {self.starport} {self.gas_giants}",
            f"{starmap[column][row].naval_base()}  {starmap[column][row].worldtype()}   "
            # etc.
        ]

return starmap


Expand Down Expand Up @@ -93,28 +113,52 @@ def base_row(base_row_string):
return row_string



Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

def starmap_string(starmap):
global row
# stellagama.clear_screen()
star_string = f" UNIVERSAL OS v.21.1\n\n A U T O N O M O U S R E G I O N\n\n {base_row(' _____ ')}\n"


# Convert starmap to preliminary format.
# Format is a 3d array, Row, Column, Line
printmap = [[[] for i in range(9)] for j in range(11)]
print("Created Array")
for row in range(0,11):
for column in range(1,9):
if starmap[column][row] is not None:
printmap[row][column].append(f" {starmap[column][row].starport} {starmap[column][row].gas_giants}")
printmap[row][column].append(f"{starmap[column][row].naval_base()} {starmap[column][row].worldtype()} ")
printmap[row][column].append(f"{name_converter(starmap[column][row].name)}")
printmap[row][column].append(f"{starmap[column][row].scout_base()}{hex_number(column, row, starmap[column][row].worldtype)}")
Comment on lines +129 to +132
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I like putting this into World2 more, but here's another way of doing this:

def print_star_cell(cell, star_cell):
    cell.append(f"  {starmap[column][row].starport} {starmap[column][row].gas_giants}")
    cell.append(f"{starmap[column][row].naval_base()}  {starmap[column][row].worldtype()}   ")
    cell.append(f"{name_converter(starmap[column][row].name)}")
    cell.append(f"{starmap[column][row].scout_base()}{hex_number(column, row, starmap[column][row].worldtype)}")
Suggested change
printmap[row][column].append(f" {starmap[column][row].starport} {starmap[column][row].gas_giants}")
printmap[row][column].append(f"{starmap[column][row].naval_base()} {starmap[column][row].worldtype()} ")
printmap[row][column].append(f"{name_converter(starmap[column][row].name)}")
printmap[row][column].append(f"{starmap[column][row].scout_base()}{hex_number(column, row, starmap[column][row].worldtype)}")
print_cell(printmap[row][column], starmap[column][row])

else:
printmap[row][column].append(" ")
printmap[row][column].append(" ")
printmap[row][column].append(" ")
printmap[row][column].append("_____")
Comment on lines +134 to +137
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

def print_empty_cell(cell)
    cell.append("     ")
    cell.append("       ")
    cell.append("       ")
    cell.append("_____")
Suggested change
printmap[row][column].append(" ")
printmap[row][column].append(" ")
printmap[row][column].append(" ")
printmap[row][column].append("_____")
print_empty_cell(printmap[row][column])


print("Filled Array")

# Each cell has 4 lines with 5,7,7,5 cells.
for row in range(1, 11):
star_string += f" / {starmap[1][row].starport} {starmap[1][row].gas_giant}\{starmap[2][row - 1].names}/ {starmap[3][row].starport} {starmap[3][row].gas_giant}\{starmap[4][row - 1].names}/ {starmap[5][row].starport} {starmap[5][row].gas_giant}\{starmap[6][row - 1].names}/ {starmap[7][row].starport} {starmap[7][row].gas_giant}\{starmap[8][row - 1].names}/ \n"
star_string += f" /{starmap[1][row].naval} {starmap[1][row].worldtype} \{starmap[2][row - 1].scout}{hex_number(2, row, starmap[2][row - 1].worldtype)}/{starmap[3][row].naval} {starmap[3][row].worldtype} \{starmap[4][row - 1].scout}{hex_number(4, row, starmap[4][row - 1].worldtype)}/{starmap[5][row].naval} {starmap[5][row].worldtype} \{starmap[6][row - 1].scout}{hex_number(6, row, starmap[6][row - 1].worldtype)}/{starmap[7][row].naval} {starmap[7][row].worldtype} \{starmap[8][row - 1].scout}{hex_number(8, row, starmap[8][row - 1].worldtype)}/ \n"
star_string += f" \{starmap[1][row].names}/ {starmap[2][row].starport} {starmap[2][row].gas_giant}\{starmap[3][row].names}/ {starmap[4][row].starport} {starmap[4][row].gas_giant}\{starmap[5][row].names}/ {starmap[6][row].starport} {starmap[6][row].gas_giant}\{starmap[7][row].names}/ {starmap[8][row].starport} {starmap[8][row].gas_giant}\ \n"
star_string += f" \{starmap[1][row].scout}{hex_number(1, row, starmap[1][row].worldtype)}/{starmap[2][row].naval} {starmap[2][row].worldtype} \{starmap[3][row].scout}{hex_number(3, row, starmap[3][row].worldtype)}/{starmap[4][row].naval} {starmap[4][row].worldtype} \{starmap[5][row].scout}{hex_number(5, row, starmap[5][row].worldtype)}/{starmap[6][row].naval} {starmap[6][row].worldtype} \{starmap[7][row].scout}{hex_number(7, row, starmap[7][row].worldtype)}/{starmap[8][row].naval} {starmap[8][row].worldtype} \ \n"
star_string += f" \{starmap[2][10].names}/ \{starmap[4][10].names}/ \{starmap[6][10].names}/ \{starmap[8][10].names}/\n"
star_string += f" \{starmap[2][10].scout}{hex_number(2, 11, starmap[2][row].worldtype)}/ \{starmap[4][10].scout}{hex_number(4, 11, starmap[4][10].worldtype)}/ \{starmap[6][10].scout}{hex_number(6, 11, starmap[6][10].worldtype)}/ \{starmap[8][10].scout}{hex_number(8, 11, starmap[8][10].worldtype)}/\n\n"
star_string += f" /{printmap[row][1][0]}\{printmap[row-1][2][2]}/{printmap[row][3][0]}\{printmap[row-1][4][2]}/{printmap[row][5][0]}\{printmap[row-1][6][2]}/{printmap[row][7][0]}\{printmap[row-1][8][2]}/ \n"
star_string += f" /{printmap[row][1][1]}\{printmap[row-1][2][3]}/{printmap[row][3][1]}\{printmap[row-1][4][3]}/{printmap[row][5][1]}\{printmap[row-1][6][3]}/{printmap[row][7][1]}\{printmap[row-1][8][3]}/ \n"
star_string += f" \{printmap[row][1][2]}/{printmap[row][2][0]}\{printmap[row][3][2]}/{printmap[row][4][0]}\{printmap[row][5][2]}/{printmap[row][6][0]}\{printmap[row][7][2]}/{printmap[row][8][0]}\ \n"
star_string += f" \{printmap[row][1][3]}/{printmap[row][2][1]}\{printmap[row][3][3]}/{printmap[row][4][1]}\{printmap[row][5][3]}/{printmap[row][6][1]}\{printmap[row][7][3]}/{printmap[row][8][1]}\ \n"
star_string += f" \{printmap[row][2][2]}/ \{printmap[row][4][2]}/ \{printmap[row][6][2]}/ \{printmap[row][8][2]}/\n"
star_string += f" \{printmap[row][2][3]}/ \{printmap[row][4][3]}/ \{printmap[row][6][3]}/ \{printmap[row][8][3]}/\n\n"

print("Created map")
return star_string


if __name__ == "__main__":
try:
if not sys.argv[1]:
print("Error: no files selected.")
elif not sys.argv[2]:
print("Error: no output file selected.")
else:
if not sys.argv[2]:
textfile = ".\default_output.txt"
print(f"No output file selected. Using {textfile} as default.")
textfile = stellagama.savefile_command_line(sys.argv[2])
with open(textfile, 'w') as output:
output.write(starmap_string(read_json_subsector(sys.argv[1])))
Expand Down