Skip to content

Commit 9844138

Browse files
committed
Fix issue with newly created characters inheriting values from previous
2 parents 5d5d70c + 0e64f76 commit 9844138

File tree

17 files changed

+508
-223
lines changed

17 files changed

+508
-223
lines changed

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"_extensions": [
1212
"cookiecutter.extensions.SlugifyExtension"
1313
],
14-
"project_name": "willow-mod-manager",
15-
"__project_slug": "willow_mod_manager",
14+
"project_name": "willow2-mod-manager",
15+
"__project_slug": "willow2_mod_manager",
1616
"include_cpp": true,
1717
"include_py": true,
1818
"_template": "[email protected]:bl-sdk/common_dotfiles.git",

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
[submodule "src/console_mod_menu"]
1111
path = src/console_mod_menu
1212
url = ../../bl-sdk/console_mod_menu.git
13+
[submodule "src/keybinds"]
14+
path = src/keybinds
15+
url = ../../bl-sdk/willow_keybinds

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
cmake_minimum_required(VERSION 3.24)
22

3-
project(willow_mod_manager)
3+
project(willow2_mod_manager)
44

5-
set(UNREALSDK_ARCH x86)
6-
set(UNREALSDK_UE_VERSION UE3)
5+
set(UNREALSDK_FLAVOUR WILLOW)
76
set(EXPLICIT_PYTHON_ARCH win32)
87
set(EXPLICIT_PYTHON_VERSION 3.13.1)
98

CMakePresets.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
"lhs": "${hostSystemName}",
3131
"rhs": "Windows"
3232
},
33-
"environment": {
33+
"cacheVariables": {
3434
"MSVC_WINE_ENV_SCRIPT": "/win-sdk/bin/x86/msvcenv.sh"
3535
},
36+
"generator": "Ninja",
3637
"toolchainFile": "libs/pyunrealsdk/common_cmake/clang-cross-x86.cmake"
3738
},
3839
{
@@ -43,6 +44,7 @@
4344
"lhs": "${hostSystemName}",
4445
"rhs": "Windows"
4546
},
47+
"generator": "Ninja",
4648
"toolchainFile": "libs/pyunrealsdk/common_cmake/i686-w64-mingw32.cmake"
4749
},
4850
{
@@ -53,6 +55,7 @@
5355
"lhs": "${hostSystemName}",
5456
"rhs": "Windows"
5557
},
58+
"generator": "Ninja",
5659
"toolchainFile": "libs/pyunrealsdk/common_cmake/llvm-i686-w64-mingw32.cmake"
5760
},
5861
{

changelog.md

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,74 @@
11
# Changelog
22

3-
## v3.7 (Upcoming)
3+
## v3.7: Meteor Shower
44

55
### [Console Mod Menu v1.6](https://github.com/bl-sdk/console_mod_menu/blob/master/Readme.md#v16)
6-
> - Linting fixes.
6+
> - Made Willow1 use UE3 controller key names.
77
88
### Legacy Compat v1.6
99
- Linting fixups.
10+
- Added fixups for Reign of Giants (for real this time).
1011

1112
### [Mods Base v1.10](https://github.com/bl-sdk/mods_base/blob/master/Readme.md#v19)
12-
> - Linting fixups.
13+
> - Added the `ObjectFlags` enum, holding a few known useful flags.
14+
>
15+
> - Moved a few warnings to go through Python's system, so they get attributed to the right place.
16+
>
17+
> - Added a warning for initializing a non-integer slider option with `is_integer=True` (the default).
18+
>
19+
> - Added support for BL1.
20+
21+
### [pyunrealsdk v1.8.0](https://github.com/bl-sdk/pyunrealsdk/blob/master/changelog.md#v180)
22+
> - Added `WeakPointer.replace`, to modify a pointer in-place.
23+
>
24+
> - Trying to overwrite the return value of a void function will now return a more appropriate error.
25+
>
26+
> - The type hinting of `WrappedArray`s now default to `WrappedArray[Any]`, no generic required.
27+
>
28+
> - Upgraded to support unrealsdk v2 - native modules can expect some breakage. The most notable
29+
> effect this has on Python code is a number of formerly read-only fields on core unreal types have
30+
> become read-write.
1331
1432
### Save Options v1.2
1533
- Fixed issue where loading a character with no save option data inherited option values from
1634
previous character.
35+
- Moved a few warnings to go through Python's system, so they get attributed to the right place.
1736

1837
### UI Utils v1.3
19-
- Linting fixes.
38+
- Added several new helper functions:
39+
- `show_blocking_message`, `hide_blocking_message`
40+
- `show_button_prompt`, `hide_button_prompt`
41+
- `show_coop_message`, `hide_coop_message`
42+
- `show_discovery_message`
43+
- `show_reward_popup`
44+
- `show_second_wind_notification`
45+
46+
[See examples here](https://bl-sdk.github.io/developing/ui_utils/willow2/).
47+
48+
### [unrealsdk v2.0.0](https://github.com/bl-sdk/unrealsdk/blob/master/changelog.md#v200)
49+
> - Now supports Borderlands 1. Big thanks to Ry for doing basically all the reverse engineering.
50+
>
51+
> - Major refactor of the core unreal types, to cleanly allow them to change layouts at runtime. All
52+
> core fields have changed from members to zero-arg methods, which return a reference to the
53+
> member. A few classes (e.g. `UProperty` subclasses) previous had existing methods to deal with
54+
> the same problem, these have all been moved to the new system.
55+
>
56+
> Clang is able to detect this change, and gives a nice error recommending inserting brackets at
57+
> the right spot.
58+
>
59+
> - Removed the `UNREALSDK_UE_VERSION` and `UNREALSDK_ARCH` CMake variables, in favour a new merged
60+
> `UNREALSDK_FLAVOUR` variable.
61+
>
62+
> - Removed the (optional) dependency on libfmt, `std::format` support is now required.
63+
>
64+
> - Console commands registered using `unrealsdk::commands::NEXT_LINE` now (try to) only fire on
65+
> direct user input, and ignore commands send via automated means.
66+
>
67+
> - Fixed that assigning an entire array, rather than getting the array and setting it's elements,
68+
> would likely cause memory corruption. This was most common when using an array of large structs,
69+
> and when assigning to one which was previously empty.
70+
>
71+
> - Made `unrealsdk::memory::get_exe_range` public.
2072
2173
### Willow2 Mod Menu v3.5
2274
- Linting fixups.

manager_pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# actual releases instead
55

66
[project]
7-
name = "willow_mod_manager"
7+
name = "willow2_mod_manager"
88
version = "3.7"
99
authors = [{ name = "bl-sdk" }]
1010

pick_release_name.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@
378378
"Luck Cannon",
379379
"Slagga",
380380
"Easy Mode",
381+
"Meteor Shower",
381382
]
382383

383384

src/__main__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# This file is part of the BL2/TPS/AoDK Willow Mod Manager.
2-
# <https://github.com/bl-sdk/willow-mod-manager>
1+
# This file is part of the BL2/TPS/AoDK Willow2 Mod Manager.
2+
# <https://github.com/bl-sdk/willow2-mod-manager>
33
#
4-
# The Willow Mod Manager is free software: you can redistribute it and/or modify it under the terms
4+
# The Willow2 Mod Manager is free software: you can redistribute it and/or modify it under the terms
55
# of the GNU Lesser General Public License Version 3 as published by the Free Software Foundation.
66
#
7-
# The Willow Mod Manager is distributed in the hope that it will be useful, but WITHOUT ANY
7+
# The Willow2 Mod Manager is distributed in the hope that it will be useful, but WITHOUT ANY
88
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
99
# PURPOSE. See the GNU Lesser General Public License for more details.
1010
#
11-
# You should have received a copy of the GNU General Public License along with the Willow Mod
11+
# You should have received a copy of the GNU General Public License along with the Willow2 Mod
1212
# Manager. If not, see <https://www.gnu.org/licenses/>.
1313

1414
from __future__ import annotations

src/keybinds

Submodule keybinds added at beba001

src/keybinds/__init__.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)