Compare commits

..

No commits in common. "fb5fe8e977db94b4b620eaa072e659ab69be5d3a" and "c03a75eb4bc0b64f13bf6d8bef77adcfd21c8135" have entirely different histories.

3 changed files with 169 additions and 82 deletions

View File

@ -168,7 +168,7 @@ init python:
except IndexError: except IndexError:
print(f"Missing textures:\n{self.__repr__()}") print(f"Missing textures:\n{self.__repr__()}")
return Text(f"TexErr\n{{color=#00ffff}}{{size=-6}}ID:{self.id}{{/size}}{{/color}}", color="#ff0000") return Text(f"TexErr\n{{color=#00ffff}}{{size=-6}}ID:{self.id}{{/size}}{{/color}}", color="#ff0000")
sprites.extend(self.char.body.build_image(self.char.body._hash, matrix=matrix))
sprites.sort(key=itemgetter(2)) sprites.sort(key=itemgetter(2))
wmax, hmax = self.sizes wmax, hmax = self.sizes

View File

@ -9,15 +9,12 @@ screen mods():
default selection = next(iter(mods_list.keys())) default selection = next(iter(mods_list.keys()))
default checkbox_enabled = gui.theme("check_true") default checkbox_enabled = gui.theme("check_true")
default checkbox_disabled = gui.theme("check_false") default checkbox_disabled = gui.theme("check_false")
default mods_enabled_now = set(persistent.mods_enabled)
$ awaits_restart = bool(mods_enabled_now != persistent.mods_enabled)
fixed: fixed:
## The grid of file slots. ## The grid of file slots.
hbox: hbox:
spacing 5 spacing 5
vpgrid: vpgrid:
cols 1 cols 1
scrollbars "vertical" scrollbars "vertical"
@ -40,9 +37,8 @@ screen mods():
$ enabled = bool(name in persistent.mods_enabled) $ enabled = bool(name in persistent.mods_enabled)
$ selected = (name == selection) $ selected = (name == selection)
if selected: if selected:
$ action = ToggleMod(name) $ action = Function(toggle_mod, name)
else: else:
$ action = SetScreenVariable("selection", name) $ action = SetScreenVariable("selection", name)
@ -74,8 +70,6 @@ screen mods():
else: else:
add checkbox_disabled align (0.95, 0.5) add checkbox_disabled align (0.95, 0.5)
if awaits_restart:
text "Awaiting game restart to apply changes..."
frame: frame:
style gui.theme("frame") style gui.theme("frame")

File diff suppressed because it is too large Load Diff