Skip to content

Commit 468cfb3

Browse files
committed
Support a clamshell goal of 1 instead of old minimum of 2.
1 parent 72c250e commit 468cfb3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

worlds/crystal_project/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,11 +397,11 @@ def get_total_clamshells(self, max_clamshells: int) -> int:
397397
if total_clamshell_quantity > max_clamshells:
398398
percent_goal_clamshells = self.options.clamshell_goal_quantity.value / total_clamshell_quantity
399399
self.options.clamshell_goal_quantity.value = int(percent_goal_clamshells * max_clamshells)
400-
if self.options.clamshell_goal_quantity.value < 2:
401-
self.options.clamshell_goal_quantity.value = 2
400+
if self.options.clamshell_goal_quantity.value < self.options.clamshell_goal_quantity.range_start:
401+
self.options.clamshell_goal_quantity.value = self.options.clamshell_goal_quantity.range_start
402402
self.options.extra_clamshells_in_pool.value = int(max_clamshells - self.options.clamshell_goal_quantity.value)
403-
if self.options.extra_clamshells_in_pool.value < 0:
404-
self.options.extra_clamshells_in_pool.value = 0
403+
if self.options.extra_clamshells_in_pool.value < self.options.extra_clamshells_in_pool.range_start:
404+
self.options.extra_clamshells_in_pool.value = self.options.extra_clamshells_in_pool.range_start
405405

406406
# Log the change to player settings
407407
message = ("For player {2}: total_clamshells was {0} but there was only room for {1} clamshells in the pool. "

worlds/crystal_project/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ClamshellGoalQuantity(Range):
5454
(If your goal is not Clamshells, this setting does nothing. 3 Clamshells will be placed in your pool and the Mañana Man will ask for 2. Don't worry, he's cool with it.)
5555
"""
5656
display_name = "Clamshells needed to win"
57-
range_start = 2
57+
range_start = 1
5858
range_end = 99
5959
default = 13
6060

0 commit comments

Comments
 (0)