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

Extra categories are now working! 🐶

Browse Source
This commit is contained in:
spinerak
2024-05-24 23:33:22 +02:00
parent 55821d0e05
commit ae68fa0109
4 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/yachtdice/Items.py
View File

@@ -71,12 +71,6 @@ item_table = {
}
ITEM_GROUPS = {
"Rolls": {
"Roll", "Roll Fragment"
},
"Dice": {
"Dice", "Dice Fragment"
},
"Categories": {
"Category Ones",
"Category Twos",

71
worlds/yachtdice/Rules.py
View File

@@ -50,40 +50,45 @@ def extractProgression(state, player, options):
score_mult = 0.01 * number_of_mults
categories = []
category_mappings = {
"Category Ones": "Ones",
"Category Twos": "Twos",
"Category Threes": "Threes",
"Category Fours": "Fours",
"Category Fives": "Fives",
"Category Sixes": "Sixes",
"Category Choice": "Choice",
"Category Inverse Choice": "Choice",
"Category Pair": "Pair",
"Category Three of a Kind": "ThreeOfAKind",
"Category Four of a Kind": "FourOfAKind",
"Category Tiny Straight": "TinyStraight",
"Category Small Straight": "SmallStraight",
"Category Large Straight": "LargeStraight",
"Category Full House": "FullHouse",
"Category Yacht": "Yacht",
"Category Distincts": "Distincts",
"Category Two times Ones": "TwoTimesOnes",
"Category Half of Sixes": "HalfOfSixes",
"Category Twos and Threes": "TwosAndThrees",
"Category Sum of Odds": "SumOfOdds",
"Category Sum of Evens": "SumOfEvens",
"Category Double Threes and Fours": "DoubleThreesAndFours",
"Category Quadruple Ones and Twos": "QuadrupleOnesAndTwos",
"Category Micro Straight": "MicroStraight",
"Category Three Odds": "ThreeOdds",
"Category 1-2-1 Consecutive": "OneTwoOneConsecutive",
"Category Three Distinct Dice": "ThreeDistinctDice",
"Category Two Pair": "TwoPair",
"Category 2-1-2 Consecutive": "TwoOneTwoConsecutive",
"Category Five Distinct Dice": "FiveDistinctDice",
"Category 4&5 Full House": "FourAndFiveFullHouse"
}
if state.has("Category Choice", player, 1):
categories.append(Category("Choice"))
if state.has("Category Inverse Choice", player, 1):
categories.append(Category("Choice"))
if state.has("Category Sixes", player, 1):
categories.append(Category("Sixes"))
if state.has("Category Fives", player, 1):
categories.append(Category("Fives"))
if state.has("Category Tiny Straight", player, 1):
categories.append(Category("TinyStraight"))
if state.has("Category Threes", player, 1):
categories.append(Category("Threes"))
if state.has("Category Fours", player, 1):
categories.append(Category("Fours"))
if state.has("Category Pair", player, 1):
categories.append(Category("Pair"))
if state.has("Category Three of a Kind", player, 1):
categories.append(Category("ThreeOfAKind"))
if state.has("Category Four of a Kind", player, 1):
categories.append(Category("FourOfAKind"))
if state.has("Category Ones", player, 1):
categories.append(Category("Ones"))
if state.has("Category Twos", player, 1):
categories.append(Category("Twos"))
if state.has("Category Small Straight", player, 1):
categories.append(Category("SmallStraight"))
if state.has("Category Large Straight", player, 1):
categories.append(Category("LargeStraight"))
if state.has("Category Full House", player, 1):
categories.append(Category("FullHouse"))
if state.has("Category Yacht", player, 1):
categories.append(Category("Yacht"))
for category_name, category_value in category_mappings.items():
if state.has(category_name, player, 1):
categories.append(Category(category_value))
extra_points_in_logic = state.count("1 Point", player)
extra_points_in_logic += state.count("10 Points", player) * 10

2
worlds/yachtdice/YachtWeights.py
View File

File diff suppressed because one or more lines are too long

31
worlds/yachtdice/__init__.py
View File

@@ -85,7 +85,7 @@ class YachtDiceWorld(World):
item1 = ["Category Choice", "Category Double Threes and Fours"][categorylist[0]]
item2 = ["Category Inverse Choice", "Category Quadruple Ones and Twos"][categorylist[1]]
self.multiworld.push_precollected(self.create_item(item1))
self.multiworld.push_precollected(self.create_item(item2))
@@ -115,21 +115,22 @@ class YachtDiceWorld(World):
itempool += ["Score Multiplier"] * 10
#add all categories. Note: not "choice" and "inverse choice", they are obtained at the start
itempool += ["Category Ones", "Category Distincts"][categorylist[2]]
itempool += ["Category Twos", "Category Two times Ones"][categorylist[3]]
itempool += ["Category Threes", "Category Half of Sixes"][categorylist[4]]
itempool += ["Category Fours", "Category Twos and Threes"][categorylist[5]]
itempool += ["Category Fives", "Category Sum of Odds"][categorylist[6]]
itempool += ["Category Sixes", "Category Sum of Evens"][categorylist[7]]
itempool += [["Category Ones", "Category Distincts"][categorylist[2]]]
itempool += [["Category Twos", "Category Two times Ones"][categorylist[3]]]
itempool += [["Category Threes", "Category Half of Sixes"][categorylist[4]]]
itempool += [["Category Fours", "Category Twos and Threes"][categorylist[5]]]
itempool += [["Category Fives", "Category Sum of Odds"][categorylist[6]]]
itempool += [["Category Sixes", "Category Sum of Evens"][categorylist[7]]]
itempool += [["Category Pair", "Category Micro Straight"][categorylist[8]]]
itempool += [["Category Three of a Kind", "Category Three Odds"][categorylist[9]]]
itempool += [["Category Four of a Kind", "Category 1-2-1 Consecutive"][categorylist[10]]]
itempool += [["Category Tiny Straight", "Category Three Distinct Dice"][categorylist[11]]]
itempool += [["Category Small Straight", "Category Two Pair"][categorylist[12]]]
itempool += [["Category Large Straight", "Category 2-1-2 Consecutive"][categorylist[13]]]
itempool += [["Category Full House", "Category Five Distinct Dice"][categorylist[14]]]
itempool += [["Category Yacht", "Category 4&5 Full House"][categorylist[15]]]
itempool += ["Category Pair", "Category Micro Straight"][categorylist[8]]
itempool += ["Category Three of a Kind", "Category Three Odds"][categorylist[9]]
itempool += ["Category Four of a Kind", "Category 1-2-1 Consecutive"][categorylist[10]]
itempool += ["Category Tiny Straight", "Category Three Distinct Dice"][categorylist[11]]
itempool += ["Category Small Straight", "Category Two Pair"][categorylist[12]]
itempool += ["Category Large Straight", "Category 2-1-2 Consecutive"][categorylist[13]]
itempool += ["Category Full House", "Category Five Distinct Dice"][categorylist[14]]
itempool += ["Category Yacht", "Category 4&5 Full House"][categorylist[15]]
if self.options.game_mode.value == 2:
if(self.options.points_game_mode.value >= 4):