Skip to content

Commit

Permalink
improve
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlackRam-oss
BlackRam-oss committed Sep 16, 2023
1 parent 73213ed commit bf88039
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
20 changes: 10 additions & 10 deletions game/nqtr_screens/screens_memo.rpy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,21 @@ screen menu_memo():
viewport mousewheel True draggable True id 'vp2':
has vbox spacing 30
if cur_task_menu in quests_descriptions:
text quests_descriptions[cur_task_menu] size gui.normal_text_size color gui.accent_color
text quests_descriptions[cur_task_menu] size gui.dr_normal_text_size color gui.accent_color
else:
text quests[cur_task_menu].description size gui.normal_text_size color gui.accent_color
text quests[cur_task_menu].description size gui.dr_normal_text_size color gui.accent_color
if (current_quest_stages[cur_task_menu].active):
text quest_menu.description size gui.normal_text_size
text quest_menu.advice size gui.big_normal_text_size
text quest_menu.description size gui.dr_normal_text_size
text quest_menu.advice size gui.dr_big_normal_text_size
for item in quest_menu.goals:
text item.description size gui.big_normal_text_size
text item.description size gui.dr_big_normal_text_size
if current_quest_stages[cur_task_menu].completed and (cur_quest_menu+1) == len(quests[cur_task_menu].stage_ids):
if quests[cur_task_menu].development:
text _("It is currently the end of this story, unfortunately you have to wait for an update to continue this story.") size gui.big_normal_text_size
text _("It is currently the end of this story, unfortunately you have to wait for an update to continue this story.") size gui.dr_big_normal_text_size
else:
text _("You have completed all the quests.") size gui.big_normal_text_size
text _("You have completed all the quests.") size gui.dr_big_normal_text_size
else:
text quest_menu.request_description size gui.normal_text_size color gui.accent_color
text quest_menu.request_description size gui.dr_normal_text_size color gui.accent_color
vbar value YScrollValue('vp2') style 'menu_vscroll'

if (cur_task_menu != '' and number_stages_completed_in_quest[cur_task_menu] > 0):
Expand All @@ -114,15 +114,15 @@ screen menu_memo():
action [
SetVariable('cur_quest_menu', cur_quest_menu - 1),
]
at next_button_tran(180)
at dr_button_next_transform(180)
imagebutton align (1580/1920, 340/1080):
idle '/nqtr_interface/button/next_idle.webp'
focus_mask True
sensitive (cur_quest_menu < number_stages_completed_in_quest[cur_task_menu])
action [
SetVariable('cur_quest_menu', cur_quest_menu + 1),
]
at next_button_tran(0)
at dr_button_next_transform(0)

key 'K_ESCAPE' action Hide('menu_memo')
key 'mouseup_3' action Hide('menu_memo')
16 changes: 8 additions & 8 deletions game/nqtr_screens/screens_nqtr.rpy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ screen room_navigation():
action ShowMenu('save')
if renpy.variant("pc"):
tooltip _("Settings")
at small_menu
at dr_button_menu_transform

if renpy.has_label("open_characters_info"):
imagebutton:
Expand All @@ -91,7 +91,7 @@ screen room_navigation():
]
if renpy.variant("pc"):
tooltip _("Characters info")
at small_menu
at dr_button_menu_transform

if len(current_quest_stages) > 0 :
imagebutton:
Expand All @@ -104,15 +104,15 @@ screen room_navigation():
]
if renpy.variant("pc"):
tooltip _("Memo")
at small_menu
at dr_button_menu_transform

imagebutton:
idle '/nqtr_interface/menu-help.webp'
focus_mask True
action ShowMenu('help')
if renpy.variant("pc"):
tooltip _("Help")
at small_menu
at dr_button_menu_transform

hbox:
align (0.99, 0.01)
Expand All @@ -133,7 +133,7 @@ screen room_navigation():
]
if renpy.variant("pc"):
tooltip _("Backpack")
at small_menu
at dr_button_menu_transform

if renpy.has_label("open_smartphone"):
imagebutton:
Expand All @@ -144,7 +144,7 @@ screen room_navigation():
]
if renpy.variant("pc"):
tooltip _("Smartphone")
at small_menu
at dr_button_menu_transform

imagebutton:
idle '/nqtr_interface/menu-map.webp'
Expand All @@ -154,7 +154,7 @@ screen room_navigation():
]
if renpy.variant("pc"):
tooltip _("Map")
at small_menu
at dr_button_menu_transform

# More information by hovering the mouse
if renpy.variant("pc"):
Expand All @@ -163,7 +163,7 @@ screen room_navigation():
text "[text]":
xpos x-20
ypos y-20
size gui.little_text_size
size gui.dr_little_text_size
drop_shadow [(2, 2)]
outlines [(2, "#000", 0, 1)]

Expand Down
30 changes: 15 additions & 15 deletions game/nqtr_screens/screens_nqtr_component.rpy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ screen wait_button(small = False):
if renpy.variant("pc"):
tooltip _("Wait")
if small:
at small_map
at nqtr_button_location_transform
else:
at middle_action
at nqtr_button_action_transform

screen character_icon(character_id):
if (character_id in character_dict):
imagebutton:
idle character_dict.get(character_id).icon
focus_mask True
action []
at small_face
at dr_small_face_transform

screen time_text(tm, show_wait_button = False):
hbox:
Expand All @@ -27,11 +27,11 @@ screen time_text(tm, show_wait_button = False):
align (0.5, 0.01)
text "[tm.hour]:00":
xalign (0.5)
size gui.hour_text_size
size gui.nqtr_hour_text_size
drop_shadow [(2, 2)]
text tm.weekday_name:
xalign (0.5)
size gui.normal_text_size
size gui.dr_normal_text_size
drop_shadow [(2, 2)]
line_leading -16

Expand All @@ -49,7 +49,7 @@ screen action_button(act):
]
if renpy.variant("pc"):
tooltip act.name
at middle_action
at nqtr_button_action_transform

screen action_picture_in_background(act):
imagebutton:
Expand All @@ -62,12 +62,12 @@ screen action_picture_in_background(act):
]
if renpy.variant("pc"):
tooltip act.name
at middle_action_is_in_room
at nqtr_button_action_picture_transform

screen action_talk_button(ch_id, talk_obj, background):
if not talk_obj.is_hidden(flags = flags, check_if_has_icon = False):
frame:
xysize (gui.middle_action_size, gui.middle_action_size)
xysize (gui.nqtr_button_action_size, gui.nqtr_button_action_size)
background None

imagebutton:
Expand All @@ -83,7 +83,7 @@ screen action_talk_button(ch_id, talk_obj, background):
SetVariable('talk_image', background),
Call("after_return_from_room_navigation", label_name_to_call = talk_obj.label_name),
]
at middle_action
at nqtr_button_action_transform
if renpy.variant("pc"):
tooltip _("Talk")

Expand All @@ -105,11 +105,11 @@ screen location_button(location):
SetVariable('cur_location', location),
Call("after_return_from_room_navigation", label_name_to_call = "change_location"),
]
at small_map
at nqtr_button_location_transform

# Locations name
text location.name:
size gui.little_text_size
size gui.dr_little_text_size
drop_shadow [(2, 2)]
xalign 0.5
text_align 0.5
Expand All @@ -130,7 +130,7 @@ screen map_button(map_id, map, align_value, rotation):
]
if renpy.variant("pc"):
tooltip map.name
at middle_map(rotation)
at nqtr_button_map_transform(rotation)

screen map(maps, cur_map_id):
$ map_id_north = maps[cur_map_id].map_id_north
Expand All @@ -156,7 +156,7 @@ screen room_button(room, cur_room, i, find_ch = False):
if (room.location_id == cur_location.id and room.is_button != None and not room.is_hidden(flags)):
vbox:
frame:
xysize (gui.middle_action_size, gui.middle_action_size + gui.little_text_size)
xysize (gui.nqtr_button_action_size, gui.nqtr_button_action_size + gui.dr_little_text_size)
background None

# Room icon
Expand All @@ -174,7 +174,7 @@ screen room_button(room, cur_room, i, find_ch = False):
SetVariable('cur_room', room),
Call("after_return_from_room_navigation", label_name_to_call = "change_room"),
]
at middle_room
at nqtr_button_room_transform

if find_ch:
hbox:
Expand All @@ -188,7 +188,7 @@ screen room_button(room, cur_room, i, find_ch = False):
use character_icon(character_id)
# Room name
text room.name:
size gui.little_text_size
size gui.dr_little_text_size
drop_shadow [(2, 2)]
xalign 0.5
text_align 0.5
Expand Down
2 changes: 1 addition & 1 deletion game/screens_style
Submodule screens_style updated 2 files
+10 −10 dr_screens_size.rpy
+14 −14 dr_screens_style.rpy

0 comments on commit bf88039

Please sign in to comment.