mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00

* MMBN3: Press program now has proper color index when received remotely * Initial commit of OSRS untangled from MMBN3 branch * Fixes some broken region connections * Removes some locations * Rearranges locations to fill in slots left by removed locations * Adds starting area rando * Moves Oak and Willow trees to resource regions * Fixes various PEP8 violations * Refactor of regions * Fixes variable capture issue with region rules * Partial completion of brutal grind logic * Finishes can_reach_skill function * Adds skill requirements to location rules, fixes regions rules * Adds documentation for OSRS * Removes match statement * Updates Data Version to test mode to prevent item name caching * Fixes starting spawn logic for east varrock * Fixes river lum crossing logic to not assume you can phase across water * Prevents equipping items when you haven't unlocked them * Changes canoe logic to not require huge levels * Skeletoning out some data I'll need for variable task system * Adds csvs and parser for logic * Adds Items parsing * Fixes the spawning logic to not default to Chunksanity when you didn't pick it * Begins adding generation rules for data-driven logic * Moves region handling and location creating to different methods * Adds logic limits to Options * Begun the location generation has * Randomly generates tasks for each skill until populated * Mopping up improper names, adding custom logic, and fixes location rolling * Drastically cleans up the location rolling loop * Modifies generation to properly use local variables and pass unit tests * Game is now generating, but rules don't seem to work * Lambda capture, my old nemesis. We meet again * Fixes issue with Corsair Cove item requirement causing logic loop * Okay one more fix, another variable capture * On second thought lets not have skull sceptre tasks. 'Tis a silly place * Removes QP from item pool (they're events not items) * Removes Stronghold floor tasks, no varbit to track them * Loads CSV with pkutil so it can be used in apworld * Fixes logic of skill tasks and adds QP requirements to long grinds * Fixes pathing in pkgutil call * Better handling for empty task categories, no longer throws errors * Fixes order for progressive tasks, removes un-checkable spider task * Fixes logic issues related to stew and the Blurite caves * Fixes issues generating causing tests to sporadically fail * Adds missing task that caused off-by-one error * Updates to new Options API * Updates generation to function properly with the Universal Tracker (Thanks Faris) * Replaces runtime CSV parsing with pre-made python files generated from CSVs * Switches to self.random and uses random.choice instead of doing it manually * Fixes to typing, variable names, iterators, and continue conditions * Replaces Name classes with Enums * Fixes parse error on region special rules * Skill requirements check now returns an accessrule instead of being one that checks options * Updates documentation and setup guide * Adjusts maximum numbers for combat and general tasks * Fixes region names so dictionary lookup works for chunksanity * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Updates readme.md and codeowners doc * Removes erroneous East Varrock -> Al Kharid connection * Changes to canoe logic to account for woodcutting level options * Fixes embarassing typo on 'Edgeville' * Moves Logic CSVs to separate repository, addresses suggested changes on PR * Fixes logic error in east/west lumbridge regions. Fixes incorrect List typing in main * Removes task types with weight 0 from the list of rollable tasks * Missed another place that the task type had to be removed if 0 weight * Prevents adding an empty task weight if levels are too restrictive for tasks to be added * Removes giant blank space in error message * Adds player name to error for not having enough available tasks --------- Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
145 lines
6.0 KiB
Python
145 lines
6.0 KiB
Python
"""
|
|
This is a utility file that converts logic in the form of CSV files into Python files that can be imported and used
|
|
directly by the world implementation. Whenever the logic files are updated, this script should be run to re-generate
|
|
the python files containing the data.
|
|
"""
|
|
import requests
|
|
|
|
# The CSVs are updated at this repository to be shared between generator and client.
|
|
data_repository_address = "https://raw.githubusercontent.com/digiholic/osrs-archipelago-logic/"
|
|
# The Github tag of the CSVs this was generated with
|
|
data_csv_tag = "v1.5"
|
|
|
|
if __name__ == "__main__":
|
|
import sys
|
|
import os
|
|
import csv
|
|
import typing
|
|
|
|
# makes this module runnable from its world folder. Shamelessly stolen from Subnautica
|
|
sys.path.remove(os.path.dirname(__file__))
|
|
new_home = os.path.normpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
|
|
os.chdir(new_home)
|
|
sys.path.append(new_home)
|
|
|
|
|
|
def load_location_csv():
|
|
this_dir = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
with open(os.path.join(this_dir, "locations_generated.py"), 'w+') as locPyFile:
|
|
locPyFile.write('"""\nThis file was auto generated by LogicCSVToPython.py\n"""\n')
|
|
locPyFile.write("from ..Locations import LocationRow, SkillRequirement\n")
|
|
locPyFile.write("\n")
|
|
locPyFile.write("location_rows = [\n")
|
|
|
|
with requests.get(data_repository_address + "/" + data_csv_tag + "/locations.csv") as req:
|
|
locations_reader = csv.reader(req.text.splitlines())
|
|
for row in locations_reader:
|
|
row_line = "LocationRow("
|
|
row_line += str_format(row[0])
|
|
row_line += str_format(row[1].lower())
|
|
|
|
region_strings = row[2].split(", ") if row[2] else []
|
|
row_line += f"{str_list_to_py(region_strings)}, "
|
|
|
|
skill_strings = row[3].split(", ")
|
|
row_line += "["
|
|
if skill_strings:
|
|
split_skills = [skill.split(" ") for skill in skill_strings if skill != ""]
|
|
if split_skills:
|
|
for split in split_skills:
|
|
row_line += f"SkillRequirement('{split[0]}', {split[1]}), "
|
|
row_line += "], "
|
|
|
|
item_strings = row[4].split(", ") if row[4] else []
|
|
row_line += f"{str_list_to_py(item_strings)}, "
|
|
row_line += f"{row[5]})" if row[5] != "" else "0)"
|
|
locPyFile.write(f"\t{row_line},\n")
|
|
locPyFile.write("]\n")
|
|
|
|
def load_region_csv():
|
|
this_dir = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
with open(os.path.join(this_dir, "regions_generated.py"), 'w+') as regPyFile:
|
|
regPyFile.write('"""\nThis file was auto generated by LogicCSVToPython.py\n"""\n')
|
|
regPyFile.write("from ..Regions import RegionRow\n")
|
|
regPyFile.write("\n")
|
|
regPyFile.write("region_rows = [\n")
|
|
|
|
with requests.get(data_repository_address + "/" + data_csv_tag + "/regions.csv") as req:
|
|
regions_reader = csv.reader(req.text.splitlines())
|
|
for row in regions_reader:
|
|
row_line = "RegionRow("
|
|
row_line += str_format(row[0])
|
|
row_line += str_format(row[1])
|
|
connections = row[2].replace("'", "\\'")
|
|
row_line += f"{str_list_to_py(connections.split(', '))}, "
|
|
resources = row[3].replace("'", "\\'")
|
|
row_line += f"{str_list_to_py(resources.split(', '))})"
|
|
regPyFile.write(f"\t{row_line},\n")
|
|
regPyFile.write("]\n")
|
|
|
|
def load_resource_csv():
|
|
this_dir = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
with open(os.path.join(this_dir, "resources_generated.py"), 'w+') as resPyFile:
|
|
resPyFile.write('"""\nThis file was auto generated by LogicCSVToPython.py\n"""\n')
|
|
resPyFile.write("from ..Regions import ResourceRow\n")
|
|
resPyFile.write("\n")
|
|
resPyFile.write("resource_rows = [\n")
|
|
|
|
with requests.get(data_repository_address + "/" + data_csv_tag + "/resources.csv") as req:
|
|
resource_reader = csv.reader(req.text.splitlines())
|
|
for row in resource_reader:
|
|
name = row[0].replace("'", "\\'")
|
|
row_line = f"ResourceRow('{name}')"
|
|
resPyFile.write(f"\t{row_line},\n")
|
|
resPyFile.write("]\n")
|
|
|
|
|
|
def load_item_csv():
|
|
this_dir = os.path.dirname(os.path.abspath(__file__))
|
|
|
|
with open(os.path.join(this_dir, "items_generated.py"), 'w+') as itemPyfile:
|
|
itemPyfile.write('"""\nThis file was auto generated by LogicCSVToPython.py\n"""\n')
|
|
itemPyfile.write("from BaseClasses import ItemClassification\n")
|
|
itemPyfile.write("from ..Items import ItemRow\n")
|
|
itemPyfile.write("\n")
|
|
itemPyfile.write("item_rows = [\n")
|
|
|
|
with requests.get(data_repository_address + "/" + data_csv_tag + "/items.csv") as req:
|
|
item_reader = csv.reader(req.text.splitlines())
|
|
for row in item_reader:
|
|
row_line = "ItemRow("
|
|
row_line += str_format(row[0])
|
|
row_line += f"{row[1]}, "
|
|
|
|
row_line += f"ItemClassification.{row[2]})"
|
|
|
|
itemPyfile.write(f"\t{row_line},\n")
|
|
itemPyfile.write("]\n")
|
|
|
|
|
|
def str_format(s) -> str:
|
|
ret_str = s.replace("'", "\\'")
|
|
return f"'{ret_str}', "
|
|
|
|
|
|
def str_list_to_py(str_list) -> str:
|
|
ret_str = "["
|
|
for s in str_list:
|
|
ret_str += f"'{s}', "
|
|
ret_str += "]"
|
|
return ret_str
|
|
|
|
|
|
|
|
load_location_csv()
|
|
print("Generated locations py")
|
|
load_region_csv()
|
|
print("Generated regions py")
|
|
load_resource_csv()
|
|
print("Generated resource py")
|
|
load_item_csv()
|
|
print("Generated item py")
|