From df1c3c6a1685f85f3437e95231282716f1824399 Mon Sep 17 00:00:00 2001 From: End45 <71291438+End45@users.noreply.github.com> Date: Sun, 26 Jun 2022 19:22:31 +0200 Subject: [PATCH 1/2] Fix some fixed room properties descriptions --- .../module/dungeon/controller/fixed.glade | 25 ++++++++++++++++--- skytemple/module/dungeon/controller/fixed.py | 9 +++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/skytemple/module/dungeon/controller/fixed.glade b/skytemple/module/dungeon/controller/fixed.glade index b6b969735..3374657b7 100644 --- a/skytemple/module/dungeon/controller/fixed.glade +++ b/skytemple/module/dungeon/controller/fixed.glade @@ -1671,7 +1671,7 @@ if dungeon is cleared: True False end - Prevent "Item Stealing" + Allow "Item Stealing" 0 @@ -1683,7 +1683,7 @@ if dungeon is cleared: True False end - Disable all warp effects: + Allow warp effects: 0 @@ -1695,7 +1695,7 @@ if dungeon is cleared: True False end - Disable some traps: + Allow certain traps: 0 @@ -1779,7 +1779,24 @@ Please check the help for each setting for more information. - + + True + True + True + center + + + + True + False + skytemple-help-about-symbolic + + + + + 2 + 6 + diff --git a/skytemple/module/dungeon/controller/fixed.py b/skytemple/module/dungeon/controller/fixed.py index ed9101e5f..03cbb3bd6 100644 --- a/skytemple/module/dungeon/controller/fixed.py +++ b/skytemple/module/dungeon/controller/fixed.py @@ -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): From 4ef3a4f2dc01383694581e8fabfe9aa296a368d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jun 2022 17:24:24 +0000 Subject: [PATCH 2/2] Bump ndspy from 3.0.0 to 4.0.0 Bumps [ndspy](https://github.com/RoadrunnerWMC/ndspy) from 3.0.0 to 4.0.0. - [Release notes](https://github.com/RoadrunnerWMC/ndspy/releases) - [Commits](https://github.com/RoadrunnerWMC/ndspy/compare/v3.0.0...v4.0.0) --- updated-dependencies: - dependency-name: ndspy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-mac-windows.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-mac-windows.txt b/requirements-mac-windows.txt index bee152aa3..8da723d09 100644 --- a/requirements-mac-windows.txt +++ b/requirements-mac-windows.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index 5dedb159e..ff80246ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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