Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ndspy from 3.0.0 to 4.0.0 #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump ndspy from 3.0.0 to 4.0.0 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df1c3c6
Fix some fixed room properties descriptions
Frostbyte0x70 Jun 26, 2022
4ef3a4f
Bump ndspy from 3.0.0 to 4.0.0
dependabot[bot] Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-mac-windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ndspy==3.0.0
ndspy==4.0.0
skytemple-files==1.3.9
skytemple-dtef==1.1.5
skytemple-icons==1.3.2
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ndspy==3.0.0
ndspy==4.0.0
git+https://github.com/skytemple/skytemple-files@master#egg=skytemple_files
git+https://github.com/skytemple/skytemple-dtef@main#egg=skytemple_dtef
git+https://github.com/skytemple/skytemple-icons@main#egg=skytemple_icons
Expand Down
25 changes: 21 additions & 4 deletions skytemple/module/dungeon/controller/fixed.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ if dungeon is cleared:</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Prevent "Item Stealing"</property>
<property name="label" translatable="yes">Allow "Item Stealing"</property>
</object>
<packing>
<property name="left-attach">0</property>
Expand All @@ -1683,7 +1683,7 @@ if dungeon is cleared:</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Disable all warp effects:</property>
<property name="label" translatable="yes">Allow warp effects:</property>
</object>
<packing>
<property name="left-attach">0</property>
Expand All @@ -1695,7 +1695,7 @@ if dungeon is cleared:</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Disable some traps:</property>
<property name="label" translatable="yes">Allow certain traps:</property>
</object>
<packing>
<property name="left-attach">0</property>
Expand Down Expand Up @@ -1779,7 +1779,24 @@ Please check the help for each setting for more information.</property>
</packing>
</child>
<child>
<placeholder/>
<object class="GtkButton" id="btn_help_unk5">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="valign">center</property>
<signal name="clicked" handler="on_btn_help_unk5_clicked" swapped="no"/>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">skytemple-help-about-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<placeholder/>
Expand Down
9 changes: 7 additions & 2 deletions skytemple/module/dungeon/controller/fixed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,16 @@ def on_btn_help_orbs_clicked(self, *args):
def on_btn_help_defeat_enemies_clicked(self, *args):
self._help(_("If enabled, the floor is exited after all the enemies have been defeated"))

def on_btn_help_unk5_clicked(self, *args):
self._help(_("If disabled, certain traps (Summon, Pitfall and Pokémon) will be disabled."
"\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))

def on_btn_help_unk8_clicked(self, *args):
self._help(_("If ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))
self._help(_("If disabled, warping, being blown away and leaping effects will be disabled."
"\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))

def on_btn_help_unk9_clicked(self, *args):
self._help(_("Prevents any kind of item pulling (such as with the Trawl Orb)."
self._help(_("If disabled, prevents any kind of item pulling (such as with the Trawl Orb)."
"\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))

def on_btn_help_complete_clicked(self, *args):
Expand Down