X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fserums.py;h=5162180502e36e8c2c126f1da5379f1e5b079049;hb=40db8e631eca7b840335b4b23b165f0a61250bc6;hp=38794fd4926834bba5129b650f836e944c534490;hpb=7bdd34d38339dd7c2d20d6b1c75e0d223ca5b7f3;p=koperkapel.git

diff --git a/koperkapel/serums.py b/koperkapel/serums.py
index 38794fd..5162180 100644
--- a/koperkapel/serums.py
+++ b/koperkapel/serums.py
@@ -5,6 +5,7 @@ from pgzero.loaders import images
 from pygame.constants import BLEND_RGBA_MULT
 from pygame.transform import rotate
 from .actors.surf import SurfActor
+from .util import safepath
 
 SERUMS = ["smart", "fast", "strong"]
 
@@ -40,11 +41,19 @@ class SerumFactory:
     def __init__(self, suffix):
         self.suffix = suffix
 
+    def assemble_icon(self, name):
+        assert name in SERUMS
+        serum_icon = images.load(safepath("serum%s/%s") % (
+            self.suffix, SERUM_TILENAME_MAP[name],))
+        frame = serum_icon.copy()
+        frame.fill(SERUM_OVERLAY_COLORS[name], None, BLEND_RGBA_MULT)
+        return frame
+
     def assemble(self, name):
         assert name in SERUMS
-        puddle = images.load("serum%s/serum" % (self.suffix,))
+        puddle = images.load(safepath("serum%s/serum") % (self.suffix,))
         puddle = rotate(puddle, 90 * random.randint(0, 3))
-        serum_icon = images.load("serum%s/%s" % (
+        serum_icon = images.load(safepath("serum%s/%s") % (
             self.suffix, SERUM_TILENAME_MAP[name],))
         frame = puddle.copy()
         frame.fill(SERUM_OVERLAY_COLORS[name], None, BLEND_RGBA_MULT)