diff --git a/worlds/yachtdice/Locations.py b/worlds/yachtdice/Locations.py index 147e0d50a2..0e1679edae 100644 --- a/worlds/yachtdice/Locations.py +++ b/worlds/yachtdice/Locations.py @@ -21,7 +21,6 @@ all_locations = {} starting_index = 16871244500 # 500 more than the starting index for items (not necessary, but this is what it is now) - def all_locations_fun(max_score): """ Function that is called when this file is loaded, which loads in ALL possible locations, score 1 to 1000 @@ -29,7 +28,6 @@ def all_locations_fun(max_score): return {f"{i} score": LocData(starting_index + i, "Board", i) for i in range(1, max_score + 1)} - def ini_locations(goal_score, max_score, number_of_locations, dif): """ function that loads in all locations necessary for the game, so based on options. @@ -51,7 +49,7 @@ def ini_locations(goal_score, max_score, number_of_locations, dif): highest_score = 0 for i in range(number_of_locations - 1): percentage = i / number_of_locations - current_score = int(1 + (percentage ** scaling) * (max_score - 2)) + current_score = int(1 + (percentage**scaling) * (max_score - 2)) if current_score <= highest_score: current_score = highest_score + 1 highest_score = current_score @@ -69,5 +67,6 @@ def ini_locations(goal_score, max_score, number_of_locations, dif): return location_table, scores.index(goal_score) + # we need to run this function to initialize all scores from 1 to 1000, even though not all are used -all_locations = all_locations_fun(1000) \ No newline at end of file +all_locations = all_locations_fun(1000) diff --git a/worlds/yachtdice/YachtWeights.py b/worlds/yachtdice/YachtWeights.py index ee3378c055..3b788d5c88 100644 --- a/worlds/yachtdice/YachtWeights.py +++ b/worlds/yachtdice/YachtWeights.py @@ -7904,5 +7904,3 @@ yacht_weights = { ("FourAndFiveFullHouse", 8, 7): {50: 97782, 0: 2218}, ("FourAndFiveFullHouse", 8, 8): {50: 98916, 0: 1084}, } - -