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

Jump to bottom

92 if there are 10 rooms in the list the tool fails #93

Merged
merged 2 commits into from
Jan 15, 2024
Merged

92 if there are 10 rooms in the list the tool fails #93

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
57fff48
Update nav_value.rpy
BlackRam-oss Jan 15, 2024
691f456
Refactor room navigation screen and room button list
BlackRam-oss Jan 15, 2024
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
19 changes: 1 addition & 18 deletions game/nqtr_screens/screens_nqtr.rpy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ init python:

screen room_navigation():
modal True
$ i = 0
# More information by hovering the mouse
$ (x,y) = renpy.get_mouse_pos()

Expand All @@ -19,23 +18,7 @@ screen room_navigation():

else:
# Rooms
hbox:
yalign 0.99
xalign 0.01
spacing 2

for room in rooms:
$ i += 1

# Check the presence of ch in that room
$ there_are_ch = False
for comm in commitments_in_cur_location.values():
# If it is the selected room
if comm != None and room.id == comm.room_id:
# I insert hbox only if they are sure that someone is there
$ there_are_ch = True

use room_button(room, cur_room, i, there_are_ch)
use room_button_list(rooms, commitments_in_cur_location)

# Action wich Picture in background
for room in rooms:
Expand Down
117 changes: 69 additions & 48 deletions game/nqtr_screens/screens_nqtr_component.rpy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,51 +151,72 @@ screen map(maps, cur_map_id):
if not isNullOrEmpty(map_id_east):
use map_button(map_id = map_id_east, map = maps[map_id_east], align_value = (0.999, 0.5), rotation = 0)

screen room_button(room, cur_room, i, find_ch = False):
# If the Locations where I am is the same as the Locations where the room is located
if (room.location_id == cur_location.id and room.is_button != None and not room.is_hidden(flags)):
vbox:
frame:
xysize (gui.nqtr_button_action_size, gui.nqtr_button_action_size + gui.dr_little_text_size)
background None

# Room icon
imagebutton:
align (0, - 0.15)
if room.is_button:
idle room.button_icon
selected_idle room.button_icon_selected
selected_hover room.button_icon_selected
selected (True if cur_room and cur_room.id == room.id else False)
sensitive not room.is_disabled(flags)
focus_mask True
action [
SetVariable('prev_room', cur_room),
SetVariable('cur_room', room),
Call("after_return_from_room_navigation", label_name_to_call = "change_room"),
]
at nqtr_button_room_transform

# Character icon
if find_ch:
hbox:
align (0.5, 0.6)
for comm in commitments_in_cur_location.values():
# If it is the selected room
if room.id == comm.room_id:
use character_icon_screen(comm.character_icon)

# Room name
text room.name:
align (0.5, 0.99)
size gui.dr_little_text_size
drop_shadow [(2, 2)]
text_align 0.5
line_leading 0
line_spacing -2

key str(i) action [
SetVariable('prev_room', cur_room),
SetVariable('cur_room', room),
Call("after_return_from_room_navigation", label_name_to_call = "change_room"),
]
screen room_button_list(rooms, commitments_in_cur_location):
$ key_room = 0
# Rooms
hbox:
yalign 0.99
xalign 0.01
spacing 2

for room in rooms:
# Check the presence of ch in that room
$ there_are_ch = False
for comm in commitments_in_cur_location.values():
# If it is the selected room
if comm != None and room.id == comm.room_id:
# I insert hbox only if they are sure that someone is there
$ there_are_ch = True

$ key_room += 1
# If the Locations where I am is the same as the Locations where the room is located
if (room.location_id == cur_location.id and room.is_button != None and not room.is_hidden(flags)):
use room_button(room, cur_room, key_room, there_are_ch)

screen room_button(room, cur_room, key_room, find_ch = False):
python:
room_action = [
SetVariable('prev_room', cur_room),
SetVariable('cur_room', room),
Call("after_return_from_room_navigation", label_name_to_call = "change_room"),
]
vbox:
frame:
xysize (gui.nqtr_button_action_size, gui.nqtr_button_action_size + gui.dr_little_text_size)
background None

# Room icon
imagebutton:
align (0, - 0.15)
if room.is_button:
idle room.button_icon
selected_idle room.button_icon_selected
selected_hover room.button_icon_selected
selected (True if cur_room and cur_room.id == room.id else False)
sensitive not room.is_disabled(flags)
focus_mask True
action room_action
at nqtr_button_room_transform

# Character icon
if find_ch:
hbox:
align (0.5, 0.6)
for comm in commitments_in_cur_location.values():
# If it is the selected room
if room.id == comm.room_id:
use character_icon_screen(comm.character_icon)

# Room name
text room.name:
align (0.5, 0.99)
size gui.dr_little_text_size
drop_shadow [(2, 2)]
text_align 0.5
line_leading 0
line_spacing -2

if key_room < 10:
key str(key_room) action room_action
elif key_room == 10:
key str(0) action room_action