From beefe31287f64f20d94ace2243e89358e70d1fc3 Mon Sep 17 00:00:00 2001
From: DaMatt <damadmatt@gmail.com>
Date: Mon, 14 Aug 2023 17:47:02 +0200
Subject: [PATCH 1/2] 1
---
game/gui/extra_images/vial2.png | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 game/gui/extra_images/vial2.png
diff --git a/game/gui/extra_images/vial2.png b/game/gui/extra_images/vial2.png
new file mode 100644
index 000000000..38a82877f
--- /dev/null
+++ b/game/gui/extra_images/vial2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:049abbf1818829caee38cafc5e3b39050d58f825cf997b69d39d54f145aae128
+size 669
--
GitLab
From 2fcd1646b63b960c96577330bae89e7cabf38823 Mon Sep 17 00:00:00 2001
From: DaMatt <damadmatt@gmail.com>
Date: Mon, 14 Aug 2023 19:38:06 +0200
Subject: [PATCH 2/2] QoL, 2 Vial Image if more then 1 serum active
---
game/_image_definitions_ren.py | 4 ++++
game/extra_images.rpy | 1 +
.../hud_screens/multi_person_info_ui.rpy | 17 ++++++++++----
.../hud_screens/person_info_hud.rpy | 23 +++++++++++++------
.../game_logic/MenuItem_ren.py | 5 +++-
5 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/game/_image_definitions_ren.py b/game/_image_definitions_ren.py
index 388bdff1d..6fb83a559 100644
--- a/game/_image_definitions_ren.py
+++ b/game/_image_definitions_ren.py
@@ -105,6 +105,9 @@ renpy.image("speech_bubble_exclamation_token_small", speech_bubble_exclamation_s
vial_token_small_image = im.Scale(Image(get_file_handle("vial.png")), 18, 18)
renpy.image("vial_token_small", vial_token_small_image)
+vial2_token_small_image = im.Scale(Image(get_file_handle("vial2.png")), 27, 18)
+renpy.image("vial2_token_small", vial2_token_small_image)
+
dna_token_small_image = im.Scale(Image(get_file_handle("dna.png")), 18, 18)
renpy.image("dna_token_small", dna_token_small_image)
@@ -112,6 +115,7 @@ progress_token_small_image = im.Scale(Image(get_file_handle("Progress32.png")),
renpy.image("progress_token_small", progress_token_small_image)
vial_image = Image(get_file_handle("vial.png"))
+vial2_image = Image(get_file_handle("vial2.png"))
dna_image = Image(get_file_handle("dna.png"))
question_image = Image(get_file_handle("question.png"))
home_image = Image(get_file_handle("home_marker.png"))
diff --git a/game/extra_images.rpy b/game/extra_images.rpy
index 13e356319..8117ee28f 100644
--- a/game/extra_images.rpy
+++ b/game/extra_images.rpy
@@ -73,6 +73,7 @@ init -10:
image bg paper_menu_background = paper_background_image
image serum_vial = "[vial_image.filename]"
+ image serum_vial2 = "[vial2_image.filename]"
image question_mark = "[question_image.filename]"
image dna_sequence = "[dna_image.filename]"
image home_marker = "[home_image.filename]"
diff --git a/game/game_screens/hud_screens/multi_person_info_ui.rpy b/game/game_screens/hud_screens/multi_person_info_ui.rpy
index 281716031..e08a5040a 100644
--- a/game/game_screens/hud_screens/multi_person_info_ui.rpy
+++ b/game/game_screens/hud_screens/multi_person_info_ui.rpy
@@ -55,11 +55,18 @@ screen multi_person_info_ui(actors):
use favourite_toggle_button(actor.person)
if actor.person.serum_effects:
- textbutton "{image=serum_vial} +[actor.person.suggestibility]%":
- style "transparent_style"
- text_style "menu_text_style"
- tooltip person_info_ui_get_serum_info_tooltip(actor.person)
- action NullAction()
+ if len(actor.person.serum_effects) > 1:
+ textbutton "{image=serum_vial2} +[actor.person.suggestibility]%":
+ style "transparent_style"
+ text_style "menu_text_style"
+ tooltip person_info_ui_get_serum_info_tooltip(actor.person)
+ action NullAction()
+ else:
+ textbutton "{image=serum_vial} +[actor.person.suggestibility]%":
+ style "transparent_style"
+ text_style "menu_text_style"
+ tooltip person_info_ui_get_serum_info_tooltip(actor.person)
+ action NullAction()
textbutton "Arousal: [arousal_info]":
style "transparent_style"
diff --git a/game/game_screens/hud_screens/person_info_hud.rpy b/game/game_screens/hud_screens/person_info_hud.rpy
index 039f58471..857695e9e 100644
--- a/game/game_screens/hud_screens/person_info_hud.rpy
+++ b/game/game_screens/hud_screens/person_info_hud.rpy
@@ -172,13 +172,22 @@ screen person_info_ui(person): #Used to display stats for a person while you're
hbox:
textbutton "Detailed Information" action Show("person_info_detailed", None, person) style "textbutton_style" text_style "textbutton_text_style"
if person.serum_effects:
- textbutton "{image=serum_vial}":
- yoffset 16
- style "transparent_style"
- text_style "menu_text_style"
- tooltip person_info_ui_get_serum_info_tooltip(person)
- action NullAction()
- sensitive True
+ if len(person.serum_effects) > 1:
+ textbutton "{image=serum_vial2}":
+ yoffset 16
+ style "transparent_style"
+ text_style "menu_text_style"
+ tooltip person_info_ui_get_serum_info_tooltip(person)
+ action NullAction()
+ sensitive True
+ else:
+ textbutton "{image=serum_vial}":
+ yoffset 16
+ style "transparent_style"
+ text_style "menu_text_style"
+ tooltip person_info_ui_get_serum_info_tooltip(person)
+ action NullAction()
+ sensitive True
if person.can_clone:
textbutton "{image=dna_sequence}":
diff --git a/game/major_game_classes/game_logic/MenuItem_ren.py b/game/major_game_classes/game_logic/MenuItem_ren.py
index 976abf183..ba67f97d0 100644
--- a/game/major_game_classes/game_logic/MenuItem_ren.py
+++ b/game/major_game_classes/game_logic/MenuItem_ren.py
@@ -84,7 +84,10 @@ def build_menu_item_list(element_list, draw_hearts_for_people = True, draw_perso
if item.knows_pregnant:
info.append("{image=feeding_bottle_token_small}")
if item.serum_effects:
- info.append("{image=vial_token_small}")
+ if len(item.serum_effects) > 1:
+ info.append("{image=vial2_token_small}")
+ else:
+ info.append("{image=vial_token_small}")
if item.infractions:
info.append("{image=infraction_token_small}")
if item.trance_training_availabe:
--
GitLab