mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-24 17:33:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Changed yaml and small bug fixes

Browse Source 
Fix when goal and max are same
Options: changed chance to weight
This commit is contained in:
spinerak
2024-05-31 01:06:10 +02:00
parent 1a8d807a8d
commit 43d102b285
5 changed files with 89 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -886,3 +886,4 @@ worlds/witness/data/__pycache__/static_logic.cpython-311.pyc
worlds/witness/data/__pycache__/utils.cpython-311.pyc
*.pyc
worlds/yachtdice.apworld
GenerateManyTimes.py

2
worlds/yachtdice/Items.py
View File

@@ -66,7 +66,7 @@ item_table = {
"Story Chapter": ItemData(16871244202, ItemClassification.filler),
"Good RNG": ItemData(16871244203, ItemClassification.filler),
"Bad RNG": ItemData(16871244204, ItemClassification.trap),
"Extra Point": ItemData(16871244205, ItemClassification.useful), #not included in logic
"Bonus Point": ItemData(16871244205, ItemClassification.useful), #not included in logic
"1 Point": ItemData(16871244301, ItemClassification.progression_skip_balancing),
"10 Points": ItemData(16871244302, ItemClassification.progression),

11
worlds/yachtdice/Locations.py
View File

@@ -26,7 +26,7 @@ def all_locations_fun(max_score):
#function that loads in all locations necessary for the game, so based on options.
#will make sure that goal_score and max_score are included locations
def ini_locations(goal_score, max_score, num_locs, dif):
def ini_locations(goal_score, max_score, num_locs, dif):
scaling = 2 #parameter that determines how many low-score location there are.
#need more low-score locations or lower difficulties:
if dif == 1:
@@ -49,10 +49,11 @@ def ini_locations(goal_score, max_score, num_locs, dif):
hiscore = curscore
scores += [curscore]
#if the goal score is not in the list, find the closest one and make it the goal.
if goal_score not in scores:
closest_num = min(scores, key=lambda x: abs(x - 500))
scores[scores.index(closest_num)] = goal_score
if goal_score != max_score:
#if the goal score is not in the list, find the closest one and make it the goal.
if goal_score not in scores:
closest_num = min(scores, key=lambda x: abs(x - 500))
scores[scores.index(closest_num)] = goal_score
scores += [max_score]

95
worlds/yachtdice/Options.py
View File

@@ -18,9 +18,9 @@ class gameDifficulty(Choice):
class scoreForLastCheck(Range):
"""
The items in the itempool will always allow you to reach this score of 1000.
By default, the last check is at a score of 1000.
However, you can set the score for last check lower. This will make the game shorter and easier.
The items in the item pool will always allow you to reach a score of 1000.
By default, the last check is also at a score of 1000.
However, you can set the score for the last check to be lower. This will make the game shorter and easier.
"""
display_name = "Score for last check"
range_start = 500
@@ -29,8 +29,8 @@ class scoreForLastCheck(Range):
class scoreForGoal(Range):
"""
This setting determines what score you need to get to finish the game.
It cannot be higher than the score for last check (if it is, it is changed automatically).
This setting determines what score you need to reach to finish the game.
It cannot be higher than the score for the last check (if it is, it is changed automatically).
"""
display_name = "Score for goal"
range_start = 500
@@ -40,7 +40,7 @@ class scoreForGoal(Range):
class minimalNumberOfDiceAndRolls(Choice):
"""
The minimal number of dice and rolls in the pool.
There is an option later on that, if selected, can put more dice or rolls in the pool.
These are guaranteed, unlike the later items.
You can never get more than 8 dice and 5 rolls.
You start with one dice and one roll.
"""
@@ -58,7 +58,7 @@ class numberDiceFragmentsPerDice(Range):
Dice can be split into fragments, gathering enough will give you an extra dice.
You start with one dice, and there will always be one full dice in the pool.
The other dice are split into fragments, according to this setting.
Setting this to 1 fragment per dice, just puts 'Dice' objects in the pool.
Setting this to 1 fragment per dice just puts 'Dice' objects in the pool.
"""
display_name = "Number of dice fragments per dice"
range_start = 1
@@ -70,17 +70,21 @@ class numberRollFragmentsPerRoll(Range):
Rolls can be split into fragments, gathering enough will give you an extra roll.
You start with one roll, and there will always be one full roll in the pool.
The other three rolls are split into fragments, according to this setting.
Setting this to 1 fragment per roll, just puts 'Roll' objects in the pool.
Setting this to 1 fragment per roll just puts 'Roll' objects in the pool.
"""
display_name = "Number of roll fragments per roll"
range_start = 1
range_end = 5
default = 4
"""
Test 1 2 3
"""
class alternativeCategories(Range):
"""
There are 16 default categories, but there are also 16 alternative categories.
These alternative categories can replace the default categories.
These alternative categories can be randomly selected to replace the default categories.
They are a little strange, but can give a fun new experience.
In the game, you can hover over categories to check what they do.
How many alternative categories would you like to see in your game?
@@ -90,83 +94,64 @@ class alternativeCategories(Range):
range_end = 16
default = 0
class chanceOfDice(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The item pool is always filled in such a way that you can reach a score of 1000.
Extra progressive items are added that will help you on your quest.
You can set the weight for each extra progressive item in the following options.
The higher this chance compared to the others, the more Dice (or Dice Fragments if selected) are added.
And of course, more dice = more points!
Of course, more dice = more points!
"""
display_name = "Chance of adding Dice"
display_name = "Weight of adding Dice"
range_start = 0
range_end = 100
default = 5
class chanceOfRoll(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The higher this chance compared to the others, the more Rolls (or Roll Fragments if selected) are added.
And with more rolls, you'll be able to reach higher scores.
With more rolls, you'll be able to reach higher scores.
"""
display_name = "Chance of adding Roll"
display_name = "Weight of adding Roll"
range_start = 0
range_end = 100
default = 20
class chanceOfFixedScoreMultiplier(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The higher this chance compared to the others, the more Fixed Score Multipliers are added.
Getting a Fixed Score Multiplier will boost all future scores by 10%.
"""
display_name = "Chance of adding Fixed Score Multiplier"
display_name = "Weight of adding Fixed Score Multiplier"
range_start = 0
range_end = 100
default = 30
class chanceOfStepScoreMultiplier(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The higher this chance compared to the others, the more Step Score Multipliers are added.
The Step Score Multiplier boosts your multiplier after every roll by 1%, and resets on reset.
So, keep high scoring categories for last to get the most of them.
The Step Score Multiplier boosts your multiplier after every roll by 1%, and resets on sheet reset.
So, keep high scoring categories for later to get the most of them.
By default, this item is not included. It is fun however, you just need to know the above strategy.
"""
display_name = "Chance of adding Step Score Multiplier"
display_name = "Weight of adding Step Score Multiplier"
range_start = 0
range_end = 100
default = 0
class chanceOfDoubleCategory(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The higher this chance compared to the others, the more frequently categories will appear multiple times.
Getting a category for the second time, gives a x2 multiplier for that category.
And getting the category again will double it again!
This option allows categories to appear multiple times.
Each time you get a category after the first, its score value gets doubled.
"""
display_name = "Chance of adding Double Category"
display_name = "Weight of adding Category copy"
range_start = 0
range_end = 100
default = 50
class chanceOfPoints(Range):
"""
The itempool is always filled in such a way, that you can get to a score of 1000.
Extra items are shuffled in the itempool that will help you on your quest.
The higher this chance compared to the others, the more points are added into the pool.
And getting points gives you... points. You can get 1 point, 10 points, and even 100 points.
Getting points gives you... points. You can get 1 point, 10 points, and even 100 points.
"""
display_name = "Chance of adding Points"
display_name = "Weight of adding Points"
range_start = 0
range_end = 100
default = 20
@@ -174,7 +159,7 @@ class chanceOfPoints(Range):
class pointsSize(Choice):
"""
If you choose to add points to the item pool, do you prefer many small points,
a few larger points, or a mix of both?
medium size, a few larger points, or a mix of them?
"""
display_name = "Size of points"
option_small = 1
@@ -185,8 +170,8 @@ class pointsSize(Choice):
class minimizeExtraItems(Choice):
"""
Besides necessary items, Yacht Dice needs extra items (see below) in the item pool to ensure success in generation.
It is possible however to decrease the number of extra items,
Besides necessary items, Yacht Dice has extra items in the item pool.
It is possible however to decrease the number of extra items
by putting categories Fives, Sixes and Pair early into the playthrough. Would you like to do this?
"""
display_name = "Minimize extra items"
@@ -224,7 +209,7 @@ class addStoryChapters(Choice):
option_all_of_it = 1
option_sure = 2
option_never = 3
default = 2
default = 3
class whichStory(Choice):
"""
@@ -257,12 +242,12 @@ class YachtDiceOptions(PerGameCommonOptions):
alternative_categories: alternativeCategories
#the following options determine what extra items are shuffled into the pool:
chance_of_dice: chanceOfDice
chance_of_roll: chanceOfRoll
chance_of_fixed_score_multiplier: chanceOfFixedScoreMultiplier
chance_of_step_score_multiplier: chanceOfStepScoreMultiplier
chance_of_double_category: chanceOfDoubleCategory
chance_of_points: chanceOfPoints
weight_of_dice: chanceOfDice
weight_of_roll: chanceOfRoll
weight_of_fixed_score_multiplier: chanceOfFixedScoreMultiplier
weight_of_step_score_multiplier: chanceOfStepScoreMultiplier
weight_of_double_category: chanceOfDoubleCategory
weight_of_points: chanceOfPoints
points_size: pointsSize
minimize_extra_items: minimizeExtraItems

80
worlds/yachtdice/__init__.py
View File

@@ -144,28 +144,22 @@ class YachtDiceWorld(World):
self.goal_score = min(self.max_score, self.options.score_for_goal.value)
weights = [
self.options.chance_of_dice.value,
self.options.chance_of_roll.value,
self.options.chance_of_fixed_score_multiplier.value,
self.options.chance_of_step_score_multiplier.value,
self.options.chance_of_double_category.value,
self.options.chance_of_points.value
self.options.weight_of_dice.value,
self.options.weight_of_roll.value,
self.options.weight_of_fixed_score_multiplier.value,
self.options.weight_of_step_score_multiplier.value,
self.options.weight_of_double_category.value,
self.options.weight_of_points.value
]
if self.options.chance_of_dice.value > 0:
if amDiceF > 1:
self.itempool += ["Dice Fragment"] * (amDiceF - 1)
if self.options.chance_of_roll.value > 0:
if amRollsF > 1:
self.itempool += ["Roll Fragment"] * (amRollsF - 1)
while diceSimulation(self.itempool + self.precollected, "state_is_a_list", self.options) < 1000:
print("Max score currently ")
print(diceSimulation(self.itempool + self.precollected, "state_is_a_list", self.options))
print(self.itempool)
if weights[0] > 0 and amDiceF > 1:
self.itempool += ["Dice Fragment"] * (amDiceF - 1)
if weights[1] > 0 and amRollsF > 1:
self.itempool += ["Roll Fragment"] * (amRollsF - 1)
extraPointsAdded = 0
while diceSimulation(self.itempool + self.precollected, "state_is_a_list", self.options) < 1000:
allitems = self.itempool + self.precollected
dice_fragments_in_pool = allitems.count("Dice") * amDiceF + allitems.count("Dice Fragment")
if dice_fragments_in_pool + 1 >= 9 * amDiceF:
@@ -187,13 +181,13 @@ class YachtDiceWorld(World):
self.itempool += ["Dice"]
else:
self.itempool += ["Dice Fragment"]
weights[0] /= 1.1
weights[0] /= (1+amDiceF)
elif which_item_to_add == 1:
if amRollsF == 1:
self.itempool += ["Roll"]
else:
self.itempool += ["Roll Fragment"]
weights[1] /= 1.1
weights[1] /= (1+amRollsF)
elif which_item_to_add == 2:
self.itempool += ["Fixed Score Multiplier"]
weights[2] /= 1.1
@@ -214,16 +208,25 @@ class YachtDiceWorld(World):
probs = [0,0.3,0.7]
if score_dist == 4:
probs = [0.3,0.4,0.3]
self.itempool += self.multiworld.random.choices(["1 Point", "10 Points", "100 Points"],
weights = probs)
weights[5] /= 1.1
c = self.multiworld.random.choices([0,1,2], weights = probs)[0]
if c == 0:
self.itempool += ["1 Point"]
extraPointsAdded += 1
weights[5] /= 1.01
elif c==1:
self.itempool += ["10 Points"]
extraPointsAdded += 10
weights[5] /= 1.1
elif c==2:
self.itempool += ["100 Points"]
extraPointsAdded += 100
weights[5] /= 2
else:
raise Exception("Unknown point value (Yacht Dice)")
if extraPointsAdded > 300:
weights[5] = 0
else:
raise Exception("Invalid index when adding new items in Yacht Dice")
print("Max score after adding ")
print(self.itempool)
print(diceSimulation(self.itempool + self.precollected, "state_is_a_list", self.options))
print()
#count the number of locations in the game. extra_plando_items is set in generate_early
#and counts number of plando items *not* from pool.
@@ -237,7 +240,7 @@ class YachtDiceWorld(World):
#first, we flood the entire pool with extra points (useful), if that setting is chosen.
if self.options.add_extra_points.value == 1: #all of the extra points
already_items = len(self.itempool) + self.extra_plando_items + 1
self.itempool += ["Extra Point"] * min(self.number_of_locations - already_items, 100)
self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 100)
#second, we flood the entire pool with story chapters (filler), if that setting is chosen.
if self.options.add_story_chapters.value == 1: #all of the story chapters
@@ -249,7 +252,7 @@ class YachtDiceWorld(World):
#add some extra points (useful)
if self.options.add_extra_points.value == 2: #add extra points if wanted
already_items = len(self.itempool) + self.extra_plando_items + 1
self.itempool += ["Extra Point"] * min(self.number_of_locations - already_items, 10)
self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 10)
#add some story chapters (filler)
if self.options.add_story_chapters.value == 2: #add extra points if wanted
@@ -260,7 +263,7 @@ class YachtDiceWorld(World):
#add some extra points if there is still room
if self.options.add_extra_points.value == 2:
already_items = len(self.itempool) + self.extra_plando_items + 1
self.itempool += ["Extra Point"] * min(self.number_of_locations - already_items, 10)
self.itempool += ["Bonus Point"] * min(self.number_of_locations - already_items, 10)
#add some encouragements filler-items if there is still room
already_items = len(self.itempool) + self.extra_plando_items + 1
@@ -363,12 +366,12 @@ class YachtDiceWorld(World):
"number_of_dice_fragments_per_dice",
"number_of_roll_fragments_per_roll",
"alternative_categories",
"chance_of_dice",
"chance_of_roll",
"chance_of_fixed_score_multiplier",
"chance_of_step_score_multiplier",
"chance_of_double_category",
"chance_of_points",
"weight_of_dice",
"weight_of_roll",
"weight_of_fixed_score_multiplier",
"weight_of_step_score_multiplier",
"weight_of_double_category",
"weight_of_points",
"points_size",
"minimize_extra_items",
"add_extra_points",
@@ -381,7 +384,6 @@ class YachtDiceWorld(World):
slot_data["goal_score"] = self.goal_score
slot_data["last_check_score"] = self.max_score
slot_data["ap_world_version"] = self.ap_world_version
print(1/0)
return slot_data
def create_item(self, name: str) -> Item: