- Fixes all stats going red on equipment screen when vitality is low

XelaPy · Oct 31, 2016 · b970050 · b970050
1 parent cd16930
commit b970050
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/game/library/items/chars_equipment.rpy b/game/library/items/chars_equipment.rpy
@@ -362,10 +362,8 @@ screen char_equip():
                     frame:
                         background Transform(Frame(im.MatrixColor("content/gfx/frame/p_frame5.png", im.matrix.brightness(-0.1)), 5, 5), alpha=0.7)
                         xsize 218
-                        xpadding 6
-                        ypadding 6
-                        xmargin 0
-                        ymargin 0
+                        padding 6, 6
+                        margin 0, 0
                         style_group "proper_stats"
                         has vbox spacing 1
                         # STATS ============================>
@@ -402,7 +400,7 @@ screen char_equip():
                                     $ tempstr = build_str_for_eq(eqtarget, dummy, stat, "#F5F5DC")
                                     text tempstr style_suffix "value_text" xalign .98 yoffset 3
                                 else:
-                                    text u"{}/{}".format(getattr(eqtarget, stat), eqtarget.get_max(stat)) xalign .98 yoffset 3 style_suffix "value_text" color tempc
+                                    text u"{}/{}".format(getattr(eqtarget, stat), eqtarget.get_max(stat)) xalign .98 yoffset 3 style_suffix "value_text" color "#F5F5DC"
 
                     # BATTLE STATS ============================>
                     frame:

diff --git a/game/library/screens/mc_profile.rpy b/game/library/screens/mc_profile.rpy
@@ -115,7 +115,7 @@ init:
                 add ProportionalScale("content/gfx/interface/images/mag.png", 24, 24)
                 text("{size=-5}{font=fonts/Rubius.ttf}{color=#8470FF}[hero.magic]|%d"%(hero.get_max("magic"))) outlines [(1, "#0d0d0d", 0, 0)]
 
-        # LEFT FRAME ====================================>
+        # LEFT FRAME (Stats/Friends/Etc) ====================================>
         vbox:
             xsize 217
             pos (8, 110)
@@ -464,7 +464,7 @@ init:
                 add "content/gfx/interface/images/exp_b.png" ypos 2 xalign 0.8
                 text "[hero.exp]/[hero.goal]" style "proper_stats_value_text" bold True outlines [(1, "#181818", 0, 0)] color "#DAA520"
 
-    screen hero_equip():
+    screen hero_equip(): # This is not used any longer...?
         modal True
         zorder 1
         default tt = Tooltip(None)