Skip to content

Commit 6ac3d5c

Browse files
authored
Core: set consistent server defaults (#2566)
1 parent ed6b7b2 commit 6ac3d5c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

WebHostLib/templates/generate.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ <h1>Generate Game{% if race %} (Race Mode){% endif %}</h1>
6969
</td>
7070
<td>
7171
<select name="collect_mode" id="collect_mode">
72-
<option value="goal">Allow !collect after goal completion</option>
7372
<option value="auto">Automatic on goal completion</option>
73+
<option value="goal">Allow !collect after goal completion</option>
7474
<option value="auto-enabled">
7575
Automatic on goal completion and manual !collect
7676
</option>
@@ -93,9 +93,9 @@ <h1>Generate Game{% if race %} (Race Mode){% endif %}</h1>
9393
{% if race -%}
9494
<option value="disabled">Disabled in Race mode</option>
9595
{%- else -%}
96-
<option value="disabled">Disabled</option>
9796
<option value="goal">Allow !remaining after goal completion</option>
9897
<option value="enabled">Manual !remaining</option>
98+
<option value="disabled">Disabled</option>
9999
{%- endif -%}
100100
</select>
101101
</td>
@@ -185,12 +185,12 @@ <h1>Generate Game{% if race %} (Race Mode){% endif %}</h1>
185185
</span>
186186
</td>
187187
<td>
188+
<input type="checkbox" id="plando_items" name="plando_items" value="items">
189+
<label for="plando_items">Items</label><br>
190+
188191
<input type="checkbox" id="plando_bosses" name="plando_bosses" value="bosses" checked>
189192
<label for="plando_bosses">Bosses</label><br>
190193

191-
<input type="checkbox" id="plando_items" name="plando_items" value="items" checked>
192-
<label for="plando_items">Items</label><br>
193-
194194
<input type="checkbox" id="plando_connections" name="plando_connections" value="connections" checked>
195195
<label for="plando_connections">Connections</label><br>
196196

settings.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ class LogNetwork(IntEnum):
597597
disable_item_cheat: Union[DisableItemCheat, bool] = False
598598
location_check_points: LocationCheckPoints = LocationCheckPoints(1)
599599
hint_cost: HintCost = HintCost(10)
600-
release_mode: ReleaseMode = ReleaseMode("goal")
601-
collect_mode: CollectMode = CollectMode("goal")
600+
release_mode: ReleaseMode = ReleaseMode("auto")
601+
collect_mode: CollectMode = CollectMode("auto")
602602
remaining_mode: RemainingMode = RemainingMode("goal")
603603
auto_shutdown: AutoShutdown = AutoShutdown(0)
604604
compatibility: Compatibility = Compatibility(2)
@@ -673,7 +673,7 @@ class Race(IntEnum):
673673
spoiler: Spoiler = Spoiler(3)
674674
glitch_triforce_room: GlitchTriforceRoom = GlitchTriforceRoom(1) # why is this here?
675675
race: Race = Race(0)
676-
plando_options: PlandoOptions = PlandoOptions("bosses")
676+
plando_options: PlandoOptions = PlandoOptions("bosses, connections, texts")
677677

678678

679679
class SNIOptions(Group):

0 commit comments

Comments
 (0)