Skip to content

Commit

Permalink
Use goToSection insteal of disable numberPicker
Browse files Browse the repository at this point in the history 
Fix b25s20
  • Loading branch information
@cracrayol
cracrayol committed Aug 22, 2024
1 parent c923f9e commit deb48de
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 32 deletions.
7 changes: 2 additions & 5 deletions www/data/mechanics-24.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<restoreDeliveranceUse />
<!-- Reset Curing EP Used counter-->
<resetNewOrderCuringEPRestoredUse />
<!-- Reset any disabled disciplines -->
<resetNewOrderDisabledDisciplines />
</section>

<section id="gamerulz">
Expand Down Expand Up @@ -1021,7 +1019,7 @@
<goToSection section="sect280" />
</test>
<test expression="[NUMBERPICKER] != 280">
<toast text="Wrong number!" />
<goToSection section="sect248" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -1107,8 +1105,7 @@
<goToSection section="sect221" />
</test>
<test expression="[NUMBERPICKER] != 221">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect26" />
</test>
</numberPickerChoosed>
</section>
Expand Down
47 changes: 21 additions & 26 deletions www/data/mechanics-25.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<restoreDeliveranceUse />
<!-- Reset Curing EP Used counter-->
<resetNewOrderCuringEPRestoredUse />
<!-- Reset any disabled disciplines -->
<resetNewOrderDisabledDisciplines />
</section>

<section id="gamerulz">
Expand Down Expand Up @@ -156,8 +154,7 @@
<goToSection section="sect105" />
</test>
<test expression="[NUMBERPICKER] != 105">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect183" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -226,19 +223,23 @@
</section>

<section id="sect20">
<!-- TODO: Link from other sections -->
<choiceState section="sect326" set="disabled" />
<test not="true" hasDiscipline="assimila">
<choiceState section="sect58" set="disabled" />
</test>
<test not="true" hasDiscipline="alchemy">
<choiceState section="sect205" set="disabled" />
</test>
<test hasDiscipline="element">
<choiceState section="sect326" set="disabled" />
<choiceState section="sect58" set="disabled" />
<choiceState section="sect205" set="disabled" />
<test hasDiscipline="assimila">
<choiceState section="sect58" set="enabled" />
<choiceState section="sect111" set="disabled" />
</test>
<test hasDiscipline="alchemy">
<choiceState section="sect205" set="enabled" />
<choiceState section="sect111" set="disabled" />
</test>
<test hasDiscipline="element">
<test expression="[KAILEVEL] >= 8">
<choiceState section="sect326" set="enabled" />
<choiceState section="sect111" set="disabled" />
</test>
</test>
</test>
</section>

<section id="sect21">
Expand Down Expand Up @@ -377,8 +378,7 @@
<goToSection section="sect20" />
</test>
<test expression="[NUMBERPICKER] != 20">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect195" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -1683,8 +1683,7 @@
<goToSection section="sect12" />
</test>
<test expression="[NUMBERPICKER] != 12">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect261" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -1957,8 +1956,7 @@
<goToSection section="sect20" />
</test>
<test expression="[NUMBERPICKER] != 20">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect195" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -2237,8 +2235,7 @@
<goToSection section="sect20" />
</test>
<test expression="[NUMBERPICKER] != 20">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect195" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -2284,8 +2281,7 @@
<goToSection section="sect105" />
</test>
<test expression="[NUMBERPICKER] != 105">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect183" />
</test>
</numberPickerChoosed>
</section>
Expand Down Expand Up @@ -2630,8 +2626,7 @@
<goToSection section="sect20" />
</test>
<test expression="[NUMBERPICKER] != 20">
<toast text="Wrong number!" />
<numberPicker enabled="false" />
<goToSection section="sect195" />
</test>
</numberPickerChoosed>
</section>
Expand Down
1 change: 0 additions & 1 deletion www/data/mechanics-5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@
<goToSection section="sect67" />
</test>
<test expression="[NUMBERPICKER] != 67">
<toast text="Wrong number!" />
<goToSection section="sect98" />
</test>
</numberPickerChoosed>
Expand Down

0 comments on commit deb48de

Please sign in to comment.