From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 5 Mar 2016 12:49:52 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:koperkapel
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=803254edba328148045841cd2cbdc0e4bd19655b;hp=8792e5a86456400f818a71bbd501a1a5128f0122;p=koperkapel.git

Merge branch 'master' of ctpug.org.za:koperkapel
---

diff --git a/koperkapel/gamelib/door.py b/koperkapel/gamelib/door.py
index 9b6e563..3134e1c 100644
--- a/koperkapel/gamelib/door.py
+++ b/koperkapel/gamelib/door.py
@@ -19,5 +19,9 @@ class Door(OrientatedSurfActor):
         self._closed = False
         self.surf = self._open_surf
 
+    def close(self):
+        self._closed = True
+        self.surf = self._closed_surf
+
     def is_closed(self):
         return self._closed
diff --git a/koperkapel/gamelib/keypad.py b/koperkapel/gamelib/keypad.py
index 4667fcd..b328f39 100644
--- a/koperkapel/gamelib/keypad.py
+++ b/koperkapel/gamelib/keypad.py
@@ -14,7 +14,10 @@ class Keypad(SurfActor):
         surf = images.load(os.path.join('fixtures', 'keypad'))
         super().__init__(surf, anchor=(0, 0))
 
-    def activate(self):
+    def activate(self, roaches):
         # FIXME: Check stats
         for door in self._doors:
-            door.open()
+            if door.is_closed():
+                door.open()
+            else:
+                door.close()
diff --git a/koperkapel/gamelib/level.py b/koperkapel/gamelib/level.py
index 39e4565..a8fe447 100644
--- a/koperkapel/gamelib/level.py
+++ b/koperkapel/gamelib/level.py
@@ -11,6 +11,7 @@ class Level(object):
         self.tiles = []
         self.keypads = []
         self.doors = []
+        self.grates = []
         self.tileset = None
         self.start_pos = (0, 0)
 
@@ -43,8 +44,18 @@ class Level(object):
     def can_crawl(self, x, y, layer):
         return 'crawl' in self.tiles[y][x][layer]['behaviour']
 
-    def keypad_at(self, x, y):
+    def is_keypad(self, x, y):
         for keypad in self.keypads:
             if (x, y) == keypad.game_pos:
-                return keypad
-        return None
+                return True
+        return False
+
+    def is_grate(self, x, y):
+        if (x, y) in self.grates:
+            return True
+        return False
+
+    def press_keypad(self, x, y, roaches):
+        for keypad in self.keypads:
+            if (x, y) == keypad.game_pos:
+                keypad.activate(roaches)
diff --git a/koperkapel/images/roach_management/eject_button.png b/koperkapel/images/roach_management/eject_button.png
index 39c6af8..766e0cc 100644
Binary files a/koperkapel/images/roach_management/eject_button.png and b/koperkapel/images/roach_management/eject_button.png differ
diff --git a/koperkapel/images/roach_management/inventory_pad.png b/koperkapel/images/roach_management/inventory_pad.png
index 93ab592..ed524fd 100644
Binary files a/koperkapel/images/roach_management/inventory_pad.png and b/koperkapel/images/roach_management/inventory_pad.png differ
diff --git a/koperkapel/images/roach_management/left_button.png b/koperkapel/images/roach_management/left_button.png
index 80b86ba..a6123a7 100644
Binary files a/koperkapel/images/roach_management/left_button.png and b/koperkapel/images/roach_management/left_button.png differ
diff --git a/koperkapel/images/roach_management/right_button.png b/koperkapel/images/roach_management/right_button.png
index 8408526..93fbdd7 100644
Binary files a/koperkapel/images/roach_management/right_button.png and b/koperkapel/images/roach_management/right_button.png differ
diff --git a/koperkapel/images/roach_management/roach_pad.png b/koperkapel/images/roach_management/roach_pad.png
index b0a58ad..6b02b94 100644
Binary files a/koperkapel/images/roach_management/roach_pad.png and b/koperkapel/images/roach_management/roach_pad.png differ
diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index 9bb85e4..5247695 100644
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -55,6 +55,7 @@ class LevelLoader(ResourceLoader):
                     angle = 0
                 new_door = Door(x, y, angle)
                 self._level.doors.append(new_door)
+                doors.append(new_door)
             # Add the keypads
             for keypad in door_info['keypads']:
                 new_keypad = Keypad(keypad[0], keypad[1], doors)
@@ -72,8 +73,8 @@ class LevelLoader(ResourceLoader):
                             TILES[tile[layer]['base']].image(neighbors)
                     # Hack this for now
                     if layer == 'floor' and 'crawl' in tile[layer]['behaviour']:
-                        print('Here')
                         tile['floor image'] = Grate.image(neighbors)
+                        self._level.grates.append((x, y))
 
 
 levels = LevelLoader('levels')
diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index 70dd7be..ea37e15 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -129,17 +129,27 @@ class GameLevelScene(BaseLevelScene):
                 self._set_pos(x + 1, y)
                 offset = (TILE_SIZE, 0)
                 self._set_angle(270)
-        elif key == keys.S:
-            if self._level_layer == 'floor' and self._level.can_crawl(x, y, 'floor'):
-                # We're probably on a grate
-                if self._level.can_crawl(x, y, 'tunnels'):
-                    self._level_layer = 'tunnels'
-                    self._mode = 'crawl'
-            elif self._level.can_crawl(x, y, 'floor'):
-                # Must be in the tunnels already
-                self._level_layer = 'floor'
-                self._mode = 'walk'
+        elif key == keys.C:
+            # Activate
+            if self._level.is_grate(x, y):
+                if self._level_layer == 'floor' and self._level.can_crawl(x, y, 'floor'):
+                    if self._level.can_crawl(x, y, 'tunnels'):
+                        self._level_layer = 'tunnels'
+                        self._mode = 'crawl'
+                elif self._level.can_crawl(x, y, 'floor'):
+                    # Must be in the tunnels already
+                    self._level_layer = 'floor'
+                    self._mode = 'walk'
+            elif self._level.is_keypad(x, y):
+                self._level.press_keypad(x, y, self._roaches)
             return
+        elif key == keys.X:
+            # Fire
+            print('Boom')
+        elif key == keys.V:
+            # Leave vehicle
+            print('Vehicle key pressed')
+            
         if offset:
             return [MoveViewportEvent(offset)]
         return super(GameLevelScene, self).on_key_down(key, mod, unicode)
diff --git a/sources/images/source.txt b/sources/images/source.txt
deleted file mode 100644
index eb9f047..0000000
--- a/sources/images/source.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Public domain drawings of cockroaches from "Histoire physique, naturelle, et politique de Madagascar" via Wikimedia Commons.
-
-https://www.archive.org/stream/histoirephysiquept23pt1gran#page/n277/mode/2up
-https://fr.wikipedia.org/wiki/Projet:Biologie/Illustrations/Insectes/Histoire_physique,_naturelle,_et_politique_de_Madagascar
-
-The placeholder tile images floor.png and cwall.png are from the public domain
-roguelike tileset "RLTiles". You can find the original tileset at:
-http://rltiles.sf.net
-
-Wall and floor tiles:
-https://commons.wikimedia.org/wiki/File:Concrete_aggregate_grinding.JPG
-https://commons.wikimedia.org/wiki/File:Concrete_Casting_Defect_Blowhole.jpg
diff --git a/sources/source.txt b/sources/source.txt
new file mode 100644
index 0000000..891f9bf
--- /dev/null
+++ b/sources/source.txt
@@ -0,0 +1,15 @@
+Public domain drawings of cockroaches from "Histoire physique, naturelle, et politique de Madagascar" via Wikimedia Commons.
+
+https://www.archive.org/stream/histoirephysiquept23pt1gran#page/n277/mode/2up
+https://fr.wikipedia.org/wiki/Projet:Biologie/Illustrations/Insectes/Histoire_physique,_naturelle,_et_politique_de_Madagascar
+
+The placeholder tile images floor.png and cwall.png are from the public domain
+roguelike tileset "RLTiles". You can find the original tileset at:
+http://rltiles.sf.net
+
+Wall and floor tiles:
+https://commons.wikimedia.org/wiki/File:Concrete_aggregate_grinding.JPG
+https://commons.wikimedia.org/wiki/File:Concrete_Casting_Defect_Blowhole.jpg
+
+Font used in graphics is "Epilog" by Divide By Zero:
+http://fonts.tom7.com/
diff --git a/sources/vector/roach_management/eject_button.svg b/sources/vector/roach_management/eject_button.svg
index 172f5bc..34e0011 100644
--- a/sources/vector/roach_management/eject_button.svg
+++ b/sources/vector/roach_management/eject_button.svg
@@ -25,17 +25,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.467796"
-     inkscape:cx="-69.378208"
-     inkscape:cy="54.810268"
+     inkscape:zoom="6.4375"
+     inkscape:cx="32"
+     inkscape:cy="45.359223"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1231"
-     inkscape:window-height="776"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata3402">
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,21 +54,32 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-924.36216)">
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3405"
+    <g
+       transform="translate(-0.02763672,924.36216)"
        style="font-style:normal;font-weight:normal;font-size:22.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(0,924.36216)"><flowRegion
-         id="flowRegion3407"><rect
-           id="rect3409"
-           width="57.946442"
-           height="40.927208"
-           x="2.0260994"
-           y="4.8131585" /></flowRegion><flowPara
-         id="flowPara3411"
-         style="font-size:15px;-inkscape-font-specification:'DejaVu Sans Bold';font-family:'DejaVu Sans';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:middle;text-align:center">Eject</flowPara><flowPara
-         id="flowPara3413"
-         style="font-size:15px;-inkscape-font-specification:'DejaVu Sans Bold';font-family:'DejaVu Sans';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:middle;text-align:center">Roach</flowPara></flowRoot>    <path
+       id="flowRoot3405">
+      <path
+         d="m 19.066113,14.9875 q 0.11,0.2475 0.11,0.66 0,0.495 -0.165,1.1 -0.165,0.5775 -0.3025,0.77 -0.1375,0.165 -0.6325,0.165 -0.1375,0 -1.815,-0.1375 -1.6775,-0.165 -2.31,-0.165 -0.7975,0 -1.485,-0.0275 -0.6875,-0.0275 -1.32,-0.055 -0.5225,0 -0.8525,0.055 -0.3024997,0.055 -0.4399997,0.2475 -0.3025,0.33 -0.4125,0.44 -0.1925,0.22 -0.1925,0.55 0,0.275 -0.0275,0.55 0,0.2475 0,0.495 0,0.385 0.055,0.6875 0.055,0.275 0.2475,0.495 0.5499997,0.5775 1.4299997,0.7975 0.9075,0.22 2.145,0.22 0.9075,0 2.31,-0.0825 1.43,-0.11 1.595,-0.11 1.1825,0 1.2925,0.4675 0.11,0.44 0.11,0.715 0,0.3575 -0.11,0.605 -0.0825,0.22 -0.3575,0.3575 -0.44,0.2475 -1.045,0.3575 -0.5775,0.11 -1.21,0.11 -0.66,0 -2.145,-0.1375 -1.4575,-0.165 -1.815,-0.165 -0.825,0 -1.265,0.165 -0.44,0.1375 -0.7424997,0.6325 -0.0825,0.11 -0.0825,0.33 0,0.0825 0.055,0.385 0.055,0.3025 0.055,0.55 0,0.22 -0.0275,0.6325 -0.0275,0.4125 -0.0275,0.5775 0,0.55 0.3574997,0.8525 0.3575,0.3025 1.1275,0.44 0.7975,0.11 2.0075,0.11 0.88,0 1.76,-0.0275 0.88,-0.0275 1.7325,-0.055 0.99,0 1.485,0.11 0.5225,0.0825 0.6325,0.44 0.1375,0.3575 0.1375,0.66 0,0.33 -0.165,0.88 -0.1375,0.55 -0.33,0.77 -0.165,0.1925 -0.5225,0.1925 -1.1275,-0.22 -2.3375,-0.385 -1.1825,-0.1925 -2.5575,-0.1925 -0.7425,0 -1.4575,0.0275 -0.715,0.0275 -1.4025,0.055 -1.7599997,0 -2.4474997,-0.4125 -0.9625,-0.5775 -0.9625,-2.145 -0.0275,-1.485 -0.055,-3.41 0,-1.9525 0,-4.235 0,-2.5575 0.0275,-3.9875 0.0275,-1.43 0.11,-1.65 0.1925,-0.4675 2.2275,-0.55 2.0624997,-0.11 3.5199997,-0.11 l 0.825,0 q 1.32,0 2.4475,-0.11 1.155,-0.11 2.2825,-0.2475 0.385,0 0.55,0.1375 0.1925,0.1375 0.385,0.605 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4191" />
+      <path
+         d="m 24.933926,17.9575 q -0.165,0.1925 -0.7425,0.1925 -0.605,0 -1.265,-0.165 -0.6325,-0.1925 -0.7975,-0.44 -0.2475,-0.3575 -0.385,-0.6875 -0.11,-0.33 -0.11,-0.6875 0,-0.4675 0.33,-0.8525 0.1925,-0.1925 0.55,-0.275 0.385,-0.0825 0.9075,-0.0825 0.55,0 0.935,0.11 0.4125,0.0825 0.5225,0.3025 0.11,0.22 0.165,0.6325 0.055,0.4125 0.055,0.7975 0,0.935 -0.165,1.155 z m 0.66,7.26 q 0,1.4575 -0.11,2.86 -0.0825,1.375 -0.385,2.8325 -0.605,2.9975 -0.66,3.135 -0.44,1.2375 -1.65,1.65 -0.715,0.2475 -1.1825,0.2475 -0.385,0 -0.6875,-0.11 -0.3025,-0.11 -0.8525,-0.4675 -0.715,-0.4675 -0.715,-1.155 0,-0.2475 0.11,-0.55 0.1375,-0.275 0.88,-0.5775 0.77,-0.3025 1.21,-0.8525 0.22,-0.275 0.2475,-1.1275 0.055,-0.88 0.055,-1.925 0,-0.9625 -0.11,-3.685 -0.0825,-2.75 -0.0825,-3.85 0,-0.5225 0,-1.045 0.055,-0.77 0.22,-0.9075 0.6875,-0.5775 1.3475,-0.5775 0.385,0 0.7975,0.1375 0.4125,0.1375 0.5775,0.1925 0.495,0.165 0.7425,1.265 0.2475,1.1 0.2475,4.51 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4193" />
+      <path
+         d="m 37.610137,25.3275 q -0.11,0.385 -0.6325,0.55 -0.495,0.1375 -1.3475,0.1375 -0.6875,0 -1.155,-0.0275 -1.8425,-0.11 -1.9525,-0.11 -0.935,0 -1.2375,0.1375 -0.3025,0.1375 -0.55,0.5225 -0.22,0.3575 -0.22,0.66 0,0.8525 0.385,1.4575 0.495,0.77 1.3475,0.77 0.33,0 0.605,-0.0825 0.275,-0.11 1.4025,-0.9075 0.5775,-0.4125 0.88,-0.495 0.33,-0.0825 0.605,-0.0825 0.4125,0 0.5775,0.1925 0.3025,0.275 0.3575,0.5225 0.0825,0.2475 0.0825,0.7425 0,1.43 -1.65,2.035 -1.1825,0.44 -2.915,0.44 -2.5025,0 -4.0975,-2.1725 -1.4575,-1.98 -1.4575,-4.5375 0,-2.75 1.6225,-4.5375 1.65,-1.815 4.0975,-1.815 2.3925,0 3.85,1.705 0.7425,0.8525 1.4025,2.5025 0.2475,0.5775 0.2475,1.1 0,0.44 -0.2475,1.2925 z m -3.74,-2.035 q 0.0825,-0.3025 0.0825,-0.5775 0,-0.4125 -0.275,-0.8525 -0.4675,-0.605 -1.2925,-0.605 -0.385,0 -0.6875,0.11 -1.155,0.4675 -1.155,1.595 0,0.1925 0.055,0.4675 0.055,0.2475 0.5225,0.495 0.495,0.2475 1.1,0.2475 0.605,0 1.045,-0.1925 0.4675,-0.22 0.605,-0.6875 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4195" />
+      <path
+         d="m 49.040254,27.6925 q 0.22,0.1925 0.22,0.5775 0,0.99 -1.2375,1.98 -1.4575,1.155 -3.7675,1.4025 -0.2475,0.0275 -0.6875,0.0275 -2.6675,0 -3.905,-2.475 -0.9075,-1.815 -0.9075,-4.2075 0,-2.5025 1.9525,-4.2625 1.6225,-1.4575 3.0525,-1.4575 2.2825,0 3.3,0.55 0.88,0.4675 1.21,1.43 0.11,0.275 0.1925,0.495 0.0825,0.1925 0.0825,0.385 0,0.385 -0.3575,0.5775 -0.33,0.1925 -1.2925,0.1925 -0.495,0 -0.9075,-0.275 -1.045,-0.6875 -1.6225,-0.6875 -0.22,0.0275 -0.33,0.0275 -0.8525,0.0825 -1.485,1.2925 -0.605,1.1825 -0.605,2.5575 0,1.32 0.33,2.2 0.4675,1.265 1.54,1.265 1.0725,0 1.65,-0.6875 0.4675,-0.8525 0.935,-1.7325 0.0825,-0.055 0.33,-0.055 0.495,0 1.265,0.33 0.77,0.3025 1.045,0.55 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4197" />
+      <path
+         d="m 57.11666,30.91 q -0.2475,0.3575 -0.4675,0.715 -0.275,0.1925 -1.595,0.1925 -0.825,0 -1.6225,-0.44 -0.605,-0.33 -1.1,-0.88 -0.495,-0.55 -0.715,-1.5125 -0.1925,-0.99 -0.1925,-2.145 0,-0.6875 0.0825,-1.925 0.0825,-1.2375 0.0825,-1.705 0,-0.7425 -0.165,-1.155 -0.165,-0.44 -0.7975,-0.825 -0.605,-0.4125 -0.605,-0.99 0,-0.605 0.3025,-0.7975 0.6325,-0.44 0.7975,-0.6325 0.1925,-0.22 0.4125,-0.9075 0.2475,-0.6875 0.55,-1.5125 0.11,-0.22 0.605,-0.4125 0.495,-0.1925 0.9625,-0.1925 0.385,0 0.605,0.11 0.2475,0.0825 0.385,0.33 0.275,0.5775 0.4125,1.3475 0.1375,0.7425 0.3025,1.0175 0.165,0.2475 1.0725,0.44 0.9075,0.165 0.9075,0.99 0,0.11 -0.0825,0.66 -0.0825,0.5225 -1.265,0.55 -1.1825,0 -1.1825,3.74 0,1.8975 0.11,2.6675 0.11,0.7425 0.6325,1.21 1.0175,0.5775 1.4025,0.88 0.4125,0.275 0.4125,0.5775 0,0.22 -0.2475,0.605 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4199" />
+    </g>
+    <path
        sodipodi:type="star"
        style="fill:#ffe685;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0"
        id="path3415"
@@ -86,9 +97,35 @@
        inkscape:transform-center-x="-0.35689086"
        inkscape:transform-center-y="1.2521983" />
     <path
-       style="fill:#b68989;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 14.182695,979.42263 0,30.39147 22.692313,-12.15657 -2.43132,9.31997 18.640115,-17.82967 -19.855774,-14.9931 0,0 2.026099,8.9148 z"
-       id="path4217"
-       inkscape:connector-curvature="0" />
+       style="fill:#b68989;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0080837px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.504042,1005.1666 0,16.635 24.952349,0 0,6.9311 13.862415,-15.2486 -13.862415,-15.2487 0,6.9312 z"
+       id="path4217-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       transform="translate(0.42141023,951.83889)"
+       style="font-style:normal;font-weight:normal;font-size:22.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="flowRoot3405-8">
+      <path
+         d="m 16.603711,17.12 q 0,0.6525 -0.3825,1.35 -0.2925,0.54 -0.855,1.1475 -0.405,0.45 -0.81,0.8775 -0.3825,0.495 -0.3825,1.125 0,0.3375 1.305,1.8675 1.305,1.53 1.305,2.1825 0,0.405 -0.315,0.585 -0.09,0.0675 -0.225,0.2475 -0.1125,0.18 -0.7875,0.18 -0.9,0 -1.9575,-1.3725 -0.9225,-1.2825 -1.8225,-2.565 -1.125,-1.395 -2.1825001,-1.395 -0.6525,0 -0.9675,0.63 -0.2925,0.6075 -0.2925,2.655 0,0.7875 -0.1575,1.485 -0.135,0.675 -0.405,0.81 -0.1575,0.0675 -0.405,0.135 -0.2475,0.045 -0.405,0.045 -0.4725,0 -0.855,-0.315 -0.2025,-0.1125 -0.315,-0.225 -0.4275,-0.405 -0.4275,-1.89 l 0,-4.8825 0.0225,-3.3525 q 0,-1.1475 0.2925,-1.8675 0.1575,-0.405 0.495,-0.765 0.2475,-0.3375 0.63,-0.4275 0.3825,-0.1125 1.08,-0.1125 0.315,0 1.125,0.0225 0.81,0.0225 0.8775,0.0225 1.7775001,0 2.7675001,0.09 1.0125,0.09 1.89,0.495 1.0575,0.495 1.5975,1.26 0.5625,0.765 0.5625,1.9575 z m -2.88,0.54 q 0.1125,-0.45 0.1125,-0.72 0,-0.5625 -0.5175,-0.8775 -0.9225,-0.6075 -2.8575,-0.6075 -0.6975001,0 -1.0800001,0.18 -0.135,0.0675 -0.495,0.36 -0.27,0.225 -0.405,0.4275 -0.135,0.2025 -0.225,0.54 -0.0675,0.3375 -0.0675,0.5175 0,0.1575 0.0675,0.405 0.0675,0.225 0.225,0.4275 0.18,0.18 0.315,0.3375 0.1575,0.135 0.2925,0.1575 0.135,0.0225 0.63,0.0225 l 0.7650001,0 q 0.405,0 0.9675,0.0225 0.5625,0.0225 0.72,0.0225 0.585,0 0.9,-0.225 0.2025,-0.18 0.3825,-0.4275 0.18,-0.27 0.27,-0.5625 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4180" />
+      <path
+         d="m 28.218633,21.575 q 0,2.52 -1.575,4.0725 -1.485,1.4625 -3.69,1.4625 -1.935,0 -3.42,-1.5975 -1.5525,-1.665 -1.5525,-4.0275 0,-1.44 1.3275,-3.1725 1.5975,-2.0925 3.735,-2.0925 1.8225,0 3.375,1.35 1.8,1.575 1.8,4.005 z m -2.7675,-0.2925 q 0,-1.17 -0.495,-1.9575 -0.495,-0.81 -1.35,-0.81 -1.125,0 -1.935,0.99 -0.72,0.8775 -0.72,1.7775 0,1.395 0.6075,2.43 0.63,1.0125 1.7775,1.0125 1.1475,0 1.62,-0.81 0.495,-0.8325 0.495,-2.6325 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4182" />
+      <path
+         d="m 37.066406,26.3225 q -0.0225,0.1575 -0.3825,0.36 -0.36,0.18 -0.7425,0.18 -0.3375,0 -0.9,-0.315 -0.2925,-0.1575 -0.4725,-0.1575 l -1.17,0.045 q -0.045,0 -0.81,0.225 -0.45,0.135 -1.0125,0.135 -1.17,0 -1.89,-0.7875 -0.72,-0.7875 -0.72,-2.07 0,-1.7775 1.5075,-2.6325 0.9225,-0.5175 3.06,-0.9225 0.2925,-0.0675 0.2925,-0.675 0,-0.3825 -0.135,-0.765 -0.135,-0.3825 -0.4725,-0.3825 -0.3375,0 -1.2375,0.495 -0.9,0.495 -1.1925,0.495 -0.135,0 -0.2025,-0.0675 -0.2925,-0.18 -0.5625,-0.3825 -0.2475,-0.2025 -0.2925,-0.5625 -0.045,-0.4275 1.395,-1.0575 1.4625,-0.6525 2.655,-0.6525 1.395,0 2.115,0.8325 0.8775,1.035 0.8775,3.78 0,0.4275 -0.0225,1.26 -0.0225,0.8325 -0.0225,1.215 0,0.5625 0.1125,0.8775 0.2925,0.8325 0.2925,0.945 0,0.2025 -0.0675,0.585 z m -3.285,-2.205 q 0.1575,-0.2925 0.1575,-0.675 0,-0.6975 -0.5625,-1.035 -0.1575,-0.09 -0.36,-0.09 -0.4725,0 -0.9225,0.4725 -0.4275,0.45 -0.4275,0.9675 0,0.2025 0.045,0.2925 0.2475,0.6975 0.8775,0.7875 0.3825,0.0675 0.675,-0.1125 0.315,-0.2025 0.5175,-0.6075 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4184" />
+      <path
+         d="m 46.501641,23.5325 q 0.18,0.1575 0.18,0.4725 0,0.81 -1.0125,1.62 -1.1925,0.945 -3.0825,1.1475 -0.2025,0.0225 -0.5625,0.0225 -2.1825,0 -3.195,-2.025 -0.7425,-1.485 -0.7425,-3.4425 0,-2.0475 1.5975,-3.4875 1.3275,-1.1925 2.4975,-1.1925 1.8675,0 2.7,0.45 0.72,0.3825 0.99,1.17 0.09,0.225 0.1575,0.405 0.0675,0.1575 0.0675,0.315 0,0.315 -0.2925,0.4725 -0.27,0.1575 -1.0575,0.1575 -0.405,0 -0.7425,-0.225 -0.855,-0.5625 -1.3275,-0.5625 -0.18,0.0225 -0.27,0.0225 -0.6975,0.0675 -1.215,1.0575 -0.495,0.9675 -0.495,2.0925 0,1.08 0.27,1.8 0.3825,1.035 1.26,1.035 0.8775,0 1.35,-0.5625 0.3825,-0.6975 0.765,-1.4175 0.0675,-0.045 0.27,-0.045 0.405,0 1.035,0.27 0.63,0.2475 0.855,0.45 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4186" />
+      <path
+         d="m 56.777109,26.7725 q -0.315,0.2475 -0.72,0.2475 -0.225,0 -0.7875,-0.1125 -0.54,-0.135 -0.72,-0.135 -0.225,0 -0.225,-1.035 0,-0.36 0.045,-1.485 0.045,-1.125 0.045,-1.7775 0,-1.9575 -0.3375,-2.97 -0.45,-1.3725 -1.5525,-1.3725 -1.08,0 -1.5075,1.2375 -0.3375,0.9675 -0.3375,2.79 0,0.81 0.0225,1.7325 0.045,0.9225 0.0675,1.4625 0,0.7425 -0.09,1.08 -0.0675,0.3375 -0.315,0.3375 -0.225,0 -0.7875,0.09 -0.5625,0.09 -0.8325,0.09 -0.3375,0 -0.54,-0.0675 -0.18,-0.09 -0.2925,-0.36 -0.1125,-0.2925 -0.2025,-3.2175 -0.09,-2.9475 -0.09,-6.1425 0,-2.4525 0.045,-3.8025 0.0675,-1.3725 0.2025,-1.62 0.135,-0.27 0.36,-0.3825 0.2475,-0.135 0.5175,-0.135 0.315,0 0.72,0.1575 0.4275,0.135 0.81,0.3375 0.225,0.1125 0.2925,0.585 0.09,0.45 0.09,1.17 l 0,1.2825 q 0,0.2925 0,0.54 0,0.2475 0.045,0.495 0.0675,0.2475 0.3375,0.4725 0.2925,0.2025 0.72,0.2025 0.1575,-0.0225 0.225,-0.0225 0.18,-0.0225 0.765,-0.2475 0.585,-0.2475 1.17,-0.2475 0.225,0.0225 0.36,0.0225 0.6075,0 1.3725,0.5625 0.6525,0.4725 0.9,0.945 0.2475,0.45 0.4725,2.5425 0.2475,2.07 0.2475,3.8475 0,1.125 -0.135,1.9125 -0.1125,0.7875 -0.36,0.99 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path4188" />
+    </g>
   </g>
 </svg>
diff --git a/sources/vector/roach_management/inventory_pad.svg b/sources/vector/roach_management/inventory_pad.svg
index 3a26871..a600548 100644
--- a/sources/vector/roach_management/inventory_pad.svg
+++ b/sources/vector/roach_management/inventory_pad.svg
@@ -32,10 +32,10 @@
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1231"
-     inkscape:window-height="776"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,6 +54,56 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-700.36216)">
+    <g
+       transform="translate(-18.246291,466.58634)"
+       style="font-style:normal;font-weight:normal;font-size:22.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot3368-7">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 55.946133,306.88781 q 0,1.32 0.42,8.4 0.42,7.08 0.42,10.68 0,3.12 -0.24,4.74 -0.18,1.56 -1.02,1.98 -0.84,0.36 -1.98,0.6 -1.14,0.24 -2.1,0.24 -1.86,0 -2.58,-0.96 -0.24,-0.3 -0.36,-2.58 -0.12,-2.34 -0.12,-5.64 0,-4.56 0.12,-9.42 0.12,-4.92 0.24,-7.98 0,-0.3 -0.24,-2.04 -0.18,-1.8 -0.18,-2.64 0,-1.98 0.54,-3.36 0.54,-1.44 1.98,-1.86 0.72,-0.18 1.08,-0.3 0.36,-0.12 0.6,-0.12 0.54,0 1.32,0.42 1.32,0.66 1.74,1.98 0.42,1.26 0.42,3.66 0,0.84 -0.06,1.74 0,0.9 0,1.86 l 0,0.6 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5494" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 84.704883,322.12781 q 0,5.46 -0.18,7.2 -0.36,3.36 -1.26,3.6 -0.9,0.24 -1.8,0.42 -0.84,0.18 -1.38,0.18 -0.84,0 -1.44,-0.18 -0.6,-0.24 -1.14,-0.66 -0.48,-0.42 -0.66,-1.5 -0.18,-1.14 -0.18,-2.76 0,-1.32 0.12,-4.8 0.12,-3.54 0.12,-4.08 0,-1.26 -0.06,-2.52 -0.06,-1.26 -0.24,-2.4 -0.42,-2.58 -1.38,-3.96 -1.14,-1.56 -3.06,-1.56 -1.68,0 -3.12,1.98 -1.2,1.68 -1.74,3.84 -0.24,0.96 -0.36,2.34 -0.12,1.38 -0.12,2.76 0,1.86 0.12,4.8 0.18,2.94 0.18,3.24 0,2.22 -0.42,3.42 -0.36,1.2 -1.38,1.38 -1.02,0.18 -1.68,0.3 -0.66,0.06 -1.08,0.06 -1.98,0 -2.88,-1.44 -0.24,-0.42 -0.24,-3 0,-3.42 0.06,-5.94 0.06,-2.58 0.12,-4.86 0,-1.68 -0.06,-4.26 -0.06,-2.58 -0.06,-3.42 0,-2.94 0.42,-3.48 0.78,-1.14 1.38,-1.56 0.6,-0.42 1.32,-0.42 0.66,0 1.62,0.42 2.22,0.96 3.06,0.96 1.68,0 3.12,-1.14 1.44,-1.14 3.72,-1.14 3.66,0 5.22,0.6 1.56,0.54 3.96,4.14 0.72,1.08 1.02,4.86 0.36,3.72 0.36,8.58 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5496" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 108.76957,311.32781 q -0.42,1.74 -1.74,5.04 -1.74,4.32 -2.16,5.64 -2.58,7.2 -3.66,8.76 -1.32,1.92 -3.06,1.92 -1.26,0 -3.54,-3.96 -1.98,-3.36 -4.32,-8.94 -1.74,-4.14 -3.06,-7.86 -1.26,-3.78 -1.26,-5.22 0,-0.54 0.24,-0.78 0.54,-0.48 1.02,-0.66 0.54,-0.24 1.08,-0.24 0.54,0 1.86,0.42 1.32,0.36 2.58,2.82 0.9,1.86 1.62,4.44 0.48,1.68 0.96,3.36 0.54,1.62 1.02,1.98 0.84,0.66 1.56,0.66 0.9,0 1.8,-1.38 0.54,-0.9 1.08,-2.1 0.54,-1.26 0.9,-2.7 0.42,-1.5 1.68,-4.02 1.08,-2.16 1.5,-2.58 0.72,-0.72 2.16,-0.72 0.66,0 1.32,0.24 0.72,0.24 1.2,0.78 0.54,0.54 0.54,1.38 0,0.78 -0.48,1.8 -0.42,1.02 -0.84,1.92 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5498" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 135.45363,318.76781 q -0.24,0.84 -1.38,1.2 -1.08,0.3 -2.94,0.3 -1.5,0 -2.52,-0.06 -4.02,-0.24 -4.26,-0.24 -2.04,0 -2.7,0.3 -0.66,0.3 -1.2,1.14 -0.48,0.78 -0.48,1.44 0,1.86 0.84,3.18 1.08,1.68 2.94,1.68 0.72,0 1.32,-0.18 0.6,-0.24 3.06,-1.98 1.26,-0.9 1.92,-1.08 0.72,-0.18 1.32,-0.18 0.9,0 1.26,0.42 0.66,0.6 0.78,1.14 0.18,0.54 0.18,1.62 0,3.12 -3.6,4.44 -2.58,0.96 -6.36,0.96 -5.46,0 -8.94,-4.74 -3.18,-4.32 -3.18,-9.9 0,-6 3.54,-9.9 3.6,-3.96 8.94,-3.96 5.22,0 8.4,3.72 1.62,1.86 3.06,5.46 0.54,1.26 0.54,2.4 0,0.96 -0.54,2.82 z m -8.16,-4.44 q 0.18,-0.66 0.18,-1.26 0,-0.9 -0.6,-1.86 -1.02,-1.32 -2.82,-1.32 -0.84,0 -1.5,0.24 -2.52,1.02 -2.52,3.48 0,0.42 0.12,1.02 0.12,0.54 1.14,1.08 1.08,0.54 2.4,0.54 1.32,0 2.28,-0.42 1.02,-0.48 1.32,-1.5 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5500" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 163.57207,322.12781 q 0,5.46 -0.18,7.2 -0.36,3.36 -1.26,3.6 -0.9,0.24 -1.8,0.42 -0.84,0.18 -1.38,0.18 -0.84,0 -1.44,-0.18 -0.6,-0.24 -1.14,-0.66 -0.48,-0.42 -0.66,-1.5 -0.18,-1.14 -0.18,-2.76 0,-1.32 0.12,-4.8 0.12,-3.54 0.12,-4.08 0,-1.26 -0.06,-2.52 -0.06,-1.26 -0.24,-2.4 -0.42,-2.58 -1.38,-3.96 -1.14,-1.56 -3.06,-1.56 -1.68,0 -3.12,1.98 -1.2,1.68 -1.74,3.84 -0.24,0.96 -0.36,2.34 -0.12,1.38 -0.12,2.76 0,1.86 0.12,4.8 0.18,2.94 0.18,3.24 0,2.22 -0.42,3.42 -0.36,1.2 -1.38,1.38 -1.02,0.18 -1.68,0.3 -0.66,0.06 -1.08,0.06 -1.98,0 -2.88,-1.44 -0.24,-0.42 -0.24,-3 0,-3.42 0.06,-5.94 0.06,-2.58 0.12,-4.86 0,-1.68 -0.06,-4.26 -0.06,-2.58 -0.06,-3.42 0,-2.94 0.42,-3.48 0.78,-1.14 1.38,-1.56 0.6,-0.42 1.32,-0.42 0.66,0 1.62,0.42 2.22,0.96 3.06,0.96 1.68,0 3.12,-1.14 1.44,-1.14 3.72,-1.14 3.66,0 5.22,0.6 1.56,0.54 3.96,4.14 0.72,1.08 1.02,4.86 0.36,3.72 0.36,8.58 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5502" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 179.53676,330.94781 q -0.54,0.78 -1.02,1.56 -0.6,0.42 -3.48,0.42 -1.8,0 -3.54,-0.96 -1.32,-0.72 -2.4,-1.92 -1.08,-1.2 -1.56,-3.3 -0.42,-2.16 -0.42,-4.68 0,-1.5 0.18,-4.2 0.18,-2.7 0.18,-3.72 0,-1.62 -0.36,-2.52 -0.36,-0.96 -1.74,-1.8 -1.32,-0.9 -1.32,-2.16 0,-1.32 0.66,-1.74 1.38,-0.96 1.74,-1.38 0.42,-0.48 0.9,-1.98 0.54,-1.5 1.2,-3.3 0.24,-0.48 1.32,-0.9 1.08,-0.42 2.1,-0.42 0.84,0 1.32,0.24 0.54,0.18 0.84,0.72 0.6,1.26 0.9,2.94 0.3,1.62 0.66,2.22 0.36,0.54 2.34,0.96 1.98,0.36 1.98,2.16 0,0.24 -0.18,1.44 -0.18,1.14 -2.76,1.2 -2.58,0 -2.58,8.16 0,4.14 0.24,5.82 0.24,1.62 1.38,2.64 2.22,1.26 3.06,1.92 0.9,0.6 0.9,1.26 0,0.48 -0.54,1.32 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5504" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 210.19207,318.70781 q 0,6.72 -4.2,10.86 -3.96,3.9 -9.84,3.9 -5.16,0 -9.12,-4.26 -4.14,-4.44 -4.14,-10.74 0,-3.84 3.54,-8.46 4.26,-5.58 9.96,-5.58 4.86,0 9,3.6 4.8,4.2 4.8,10.68 z m -7.38,-0.78 q 0,-3.12 -1.32,-5.22 -1.32,-2.16 -3.6,-2.16 -3,0 -5.16,2.64 -1.92,2.34 -1.92,4.74 0,3.72 1.62,6.48 1.68,2.7 4.74,2.7 3.06,0 4.32,-2.16 1.32,-2.22 1.32,-7.02 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5506" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 227.66613,312.64781 q -0.9,0.48 -2.58,0.6 -1.62,0.12 -2.22,0.3 -0.6,0.18 -1.14,0.78 -0.3,0.3 -0.96,1.26 -0.6,0.96 -0.96,2.4 -0.3,1.38 -0.3,4.14 0,1.56 0.06,3.36 0.12,1.74 0.18,2.82 0,1.98 -0.48,3 -0.48,1.02 -1.92,1.14 -0.66,0 -1.2,0.06 -0.48,0 -0.78,0 -1.02,0 -1.38,-0.3 -0.36,-0.3 -0.72,-0.96 -0.3,-0.72 -0.48,-4.56 -0.18,-3.9 -0.18,-8.64 0,-2.34 0.06,-5.46 0.06,-3.18 0.42,-4.38 0.42,-1.2 1.86,-1.2 0.6,0 1.5,0.3 0.84,0.54 1.32,0.78 0.96,0.54 1.5,0.48 1.74,-0.18 2.4,-0.42 0.72,-0.24 2.22,-1.14 0.66,-0.36 1.32,-0.36 1.56,0 2.76,1.5 0.42,0.48 0.42,1.92 0,0.84 -0.18,1.62 -0.18,0.72 -0.54,0.96 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog;text-align:center;text-anchor:middle"
+         id="path5508" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 254.2902,308.98781 q -0.48,1.74 -0.9,3.48 -1.2,4.38 -2.58,8.4 -1.92,5.7 -4.08,10.5 -0.18,0.36 -1.74,5.58 -0.6,2.04 -1.26,3.06 -1.26,2.1 -3.12,3.24 -1.8,1.2 -3.48,1.2 -3.48,0 -4.44,-0.36 -1.44,-0.54 -1.44,-2.4 0,-1.26 2.04,-2.1 3.12,-1.26 3.6,-1.62 1.02,-0.78 1.44,-2.34 0.48,-1.56 0.48,-3.42 -0.42,-1.32 -0.72,-2.28 -1.8,-5.52 -3.6,-10.2 -0.24,-0.54 -2.76,-6.12 -0.84,-1.86 -1.2,-3.06 -0.12,-0.48 -0.18,-0.9 -0.06,-0.48 -0.06,-0.84 0,-1.74 1.32,-2.58 0.84,-0.48 1.56,-0.48 0.84,0 1.86,0.6 1.08,0.54 2.1,2.22 0.84,1.38 1.44,3.6 0.9,3.84 1.32,5.52 0.78,2.94 1.62,3.6 0.84,0.6 1.32,0.6 0.54,0 1.2,-0.96 0.66,-1.02 1.44,-3.84 1.2,-4.38 1.38,-4.92 0.72,-2.22 1.62,-3.84 0.96,-1.68 1.62,-1.98 0.96,-0.48 1.86,-0.48 0.84,0 1.38,0.48 0.6,0.48 0.78,0.96 0.18,0.42 0.18,1.68 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5510" />
+    </g>
     <ellipse
        style="fill:#ffe685;fill-opacity:1;stroke:#000000;stroke-width:0.81365633;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path3339"
@@ -74,19 +124,5 @@
            y="15.913391"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:MathJax_Main;-inkscape-font-specification:MathJax_Main;text-align:center;text-anchor:middle" /></flowRegion><flowPara
          id="flowPara3347"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:45px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">Inventory</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3368"
-       style="font-style:normal;font-weight:normal;font-size:22.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(2.0018174,487.21083)"><flowRegion
-         id="flowRegion3370"><rect
-           id="rect3372"
-           width="205.85886"
-           height="56.295601"
-           x="26.848671"
-           y="274.00705" /></flowRegion><flowPara
-         id="flowPara3374"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:35px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'"><flowSpan
-   style="text-align:center;text-anchor:middle"
-   id="flowSpan3376">Inventor</flowSpan>y</flowPara></flowRoot>  </g>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:45px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">Inventory</flowPara></flowRoot>  </g>
 </svg>
diff --git a/sources/vector/roach_management/left_button.svg b/sources/vector/roach_management/left_button.svg
index 6b52e72..5e8bbf9 100644
--- a/sources/vector/roach_management/left_button.svg
+++ b/sources/vector/roach_management/left_button.svg
@@ -25,18 +25,24 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.840214"
-     inkscape:cx="18.147302"
-     inkscape:cy="23.921443"
+     inkscape:zoom="11.680428"
+     inkscape:cx="12.182747"
+     inkscape:cy="8.145018"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      units="px"
-     inkscape:window-width="1231"
-     inkscape:window-height="776"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="false"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7177" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4243">
     <rdf:RDF>
@@ -56,8 +62,9 @@
      transform="translate(0,-1020.3622)">
     <path
        style="fill:#b68989;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.72720629px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 30.338139,1027.4204 0,22.1009 -16.501991,-8.8404 1.768071,6.7776 -13.5552085,-12.9659 14.4392425,-10.9031 0,0 -1.473391,6.4829 z"
+       d="m 30.127788,1030.3622 0,12 -17.999998,0 0,5 -9.999998,-11 9.999998,-11 0,5 z"
        id="path4217"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
   </g>
 </svg>
diff --git a/sources/vector/roach_management/right_button.svg b/sources/vector/roach_management/right_button.svg
index 898aabe..e8728ff 100644
--- a/sources/vector/roach_management/right_button.svg
+++ b/sources/vector/roach_management/right_button.svg
@@ -25,18 +25,24 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.840214"
-     inkscape:cx="18.147302"
-     inkscape:cy="23.921443"
+     inkscape:zoom="11.680428"
+     inkscape:cx="12.182747"
+     inkscape:cy="8.145018"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      units="px"
-     inkscape:window-width="1231"
-     inkscape:window-height="776"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="false"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7177" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4243">
     <rdf:RDF>
@@ -45,7 +51,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -56,8 +62,9 @@
      transform="translate(0,-1020.3622)">
     <path
        style="fill:#b68989;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.72720629px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 1.8524576,1027.4204 0,22.1009 16.5019914,-8.8404 -1.768071,6.7776 13.555208,-12.9659 -14.439242,-10.9031 0,0 1.473391,6.4829 z"
+       d="m 1.9999998,1030.3622 0,12 17.9999982,0 0,5 9.999998,-11 -9.999998,-11 0,5 z"
        id="path4217"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
   </g>
 </svg>
diff --git a/sources/vector/roach_management/roach_pad.svg b/sources/vector/roach_management/roach_pad.svg
index 645c186..85bc515 100644
--- a/sources/vector/roach_management/roach_pad.svg
+++ b/sources/vector/roach_management/roach_pad.svg
@@ -26,16 +26,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.1546196"
-     inkscape:cx="-2.0781358"
+     inkscape:cx="-11.116012"
      inkscape:cy="188.57143"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1231"
-     inkscape:window-height="776"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,6 +54,46 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-700.36216)">
+    <g
+       transform="translate(-3.7271085,681.2923)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;line-height:125%;font-family:MathJax_Main;-inkscape-font-specification:MathJax_Main;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot3341-0">
+      <path
+         d="m 67.960937,61.274062 q 0,8.05 -4.479999,15.47 -4.410001,7.350001 -9.380001,7.350001 -10.009999,0 -14.7,-8.050001 -3.5,-6.02 -3.5,-14.77 0,-10.71 6.72,-16.029999 4.830001,-3.780001 10.64,-3.780001 7.91,0 11.69,6.51 3.01,5.18 3.01,13.3 z m -8.4,0.49 q 0,-4.97 -1.05,-7.7 -1.89,-4.9 -7,-4.9 -3.5,0 -6.02,4.34 -2.17,3.78 -2.17,7.77 0,6.370001 2.310001,9.94 2.31,3.5 6.229999,3.5 4.62,0 6.440001,-4.34 1.259999,-2.94 1.259999,-8.61 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5479"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 99.260781,84.654062 q -1.33,0.98 -3.43,0.98 -0.7,0 -0.98,-0.07 -1.4,-0.7 -2.73,-1.400001 -0.21,-0.07 -0.77,-0.07 -0.63,0 -1.4,0.07 -0.77,0.07 -1.47,0.14 -0.63,0 -3.22,0.63 -2.59,0.630001 -3.85,0.630001 -6.09,0 -8.47,-3.570001 -1.61,-2.379999 -1.61,-6.3 -0.14,-1.68 -0.14,-5.95 0,-4.339999 0.14,-9.099999 0.14,-4.83 0.35,-5.600001 0.28,-0.84 1.26,-1.26 0.98,-0.42 2.24,-0.42 1.05,0 2.03,0.28 1.05,0.28 1.75,0.84 0.7,0.56 0.98,1.89 0.28,1.33 0.28,3.15 0,1.540001 -0.28,5.320001 -0.28,3.78 -0.28,5.74 0,4.06 0.63,6.159999 0.7,2.100001 3.01,2.100001 l 0.77,0 q 1.61,0 2.1,-0.07 1.89,-0.28 2.87,-1.54 1.05,-1.33 1.4,-3.919999 0.42,-2.59 0.42,-5.95 l 0,-3.850001 q 0,-3.78 0.14,-6.16 0.14,-2.45 0.63,-3.08 0.91,-1.19 2.8,-1.19 2.45,0 4.2,1.61 0.56,0.560001 0.77,1.890001 0.28,1.259999 0.28,3.57 0,1.399999 -0.14,5.46 -0.14,3.989999 -0.14,4.689999 0,2.38 0.07,5.320001 0.07,2.869999 0.21,6.089999 0,2.59 -0.42,2.94 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5481"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 119.75984,82.344063 q -0.63,0.91 -1.19,1.819999 -0.7,0.49 -4.06,0.49 -2.1,0 -4.13,-1.119999 -1.54,-0.840001 -2.8,-2.240001 -1.26,-1.399999 -1.82,-3.85 -0.49,-2.519999 -0.49,-5.46 0,-1.75 0.21,-4.899999 0.21,-3.150001 0.21,-4.340001 0,-1.89 -0.42,-2.94 -0.42,-1.12 -2.03,-2.1 -1.54,-1.049999 -1.54,-2.52 0,-1.54 0.77,-2.03 1.61,-1.119999 2.03,-1.609999 0.49,-0.560001 1.05,-2.310001 0.63,-1.75 1.4,-3.849999 0.28,-0.56 1.54,-1.05 1.26,-0.490001 2.45,-0.490001 0.98,0 1.54,0.28 0.63,0.210001 0.98,0.840001 0.7,1.469999 1.05,3.429999 0.35,1.89 0.77,2.59 0.42,0.630001 2.73,1.12 2.31,0.42 2.31,2.52 0,0.28 -0.21,1.68 -0.21,1.33 -3.22,1.4 -3.01,0 -3.01,9.520001 0,4.829999 0.28,6.789999 0.28,1.89 1.61,3.080001 2.59,1.47 3.57,2.24 1.05,0.7 1.05,1.469999 0,0.560001 -0.63,1.540001 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5483"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 150.83437,75.064063 q 0,4.059999 -4.34,7 -4.27,2.94 -9.52,2.94 -4.12999,0 -8.4,-2.66 -4.27,-2.73 -4.27,-5.040001 0,-1.4 1.47001,-2.73 1.47,-1.33 2.65999,-1.33 2.24,0 4.41001,2.45 2.23999,2.38 4.12999,2.38 0.91,0.07 1.54,0.07 1.68,0 2.59,-0.490001 1.33,-0.7 1.33,-2.52 0,-2.379999 -2.94,-3.01 -6.51,-1.47 -7.07,-1.68 -3.85,-1.469999 -6.09,-3.78 -2.58999,-2.659999 -2.58999,-5.879999 0,-4.900001 4.05999,-7.700001 3.64,-2.52 8.82,-2.52 5.32,0 8.75,1.82 3.43,1.82 3.71,4.06 0,2.8 -1.75,4.13 -0.63,0.56 -1.47,0.56 -1.12,0 -5.25,-2.87 -2.03,-1.4 -3.29,-1.4 -1.12,0 -1.89,1.12 -0.7,1.050001 -1.05,2.59 -0.14,0.42 0.77,1.19 0.98,0.7 2.52,1.47 1.54,0.7 2.45,1.12 0.91,0.35 1.96,0.42 5.39,0 7.49,4.130001 1.26,2.449999 1.26,6.16 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5485"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 164.00969,47.274062 q -0.14,1.05 -2.8,1.05 -1.89,0 -3.43,-0.63 -1.47,-0.63 -1.89,-1.75 -0.42,-1.189999 -0.42,-1.539999 0,-0.350001 0,-0.560001 0,-1.89 1.68,-3.29 1.19,-0.84 2.52,-0.84 2.31,0 3.99,2.1 0.7,0.980001 0.7,2.520001 0,0.77 -0.21,1.819999 -0.14,1.05 -0.14,1.12 z m 2.1,10.08 q -0.56,1.75 -0.98,3.710001 -0.42,1.959999 -0.42,4.55 0,2.73 0,5.25 0,2.519999 0.07,4.899999 0,4.2 -0.21,6.09 -0.14,1.89 -0.84,2.38 -2.17,1.610001 -4.41,1.610001 -1.75,0 -3.01,-1.050001 -0.56,-0.49 -0.91,-5.319999 -0.35,-4.83 -0.35,-10.5 0,-5.880001 0.28,-10.710001 0.28,-4.83 0.77,-5.67 0.56,-0.909999 1.68,-1.4 1.12,-0.56 2.38,-0.56 0.77,0 1.61,0.21 0.91,0.14 2.38,0.630001 0.63,0.21 1.26,1.959999 0.7,1.75 0.7,3.92 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5487"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 196.58812,78.354062 q -0.07,0.35 -0.07,1.05 0,0.910001 0.21,2.17 0.21001,1.260001 0.21001,1.540001 0,0.98 -0.91001,1.539999 -0.14,0.07 -0.98,0.14 -0.77,0.07 -0.98,0.07 -1.33,0 -2.87,0.07 -1.47,0 -3.29,0.350001 -1.82,0.349999 -3.92,0.56 -2.03,0.209999 -3.78,0.209999 -5.39,0 -8.68,-4.689999 -3.22,-4.760001 -3.22,-10.990001 0,-5.6 1.54,-8.68 1.19,-2.31 4.2,-4.76 1.54,-1.259999 2.66,-1.89 1.61,-0.91 2.94,-0.91 1.4,-0.14 2.73,0.42 1.4,0.560001 2.59,0.560001 1.47001,0 2.31,-1.260001 0.91001,-1.26 0.91001,-2.66 0,-2.59 0.83999,-4.34 0.84,-1.819999 1.68,-1.959999 0.84,-0.21 1.26,-0.21 0.98,0 1.89,0.7 1.12,1.119999 1.75,1.679999 0.70001,0.49 1.05,5.53 0.42,5.04 0.42,12.32 0,8.260001 -0.49,13.44 z m -8.26,-8.819999 q 0,-3.150001 -1.47,-5.67 -1.68,-2.870001 -4.27,-2.870001 -2.24,0 -4.2,2.8 -1.96,2.800001 -1.96,6.16 0,4.2 0.84,6.300001 0.91,2.03 3.71,2.799999 0.91,0.280001 1.82,0.280001 0.91,0 1.75,-0.280001 2.52,-0.7 3.29,-3.709999 0.49,-1.820001 0.49,-5.81 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5489"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 226.92328,68.134062 q -0.28,0.980001 -1.61,1.400001 -1.26,0.349999 -3.43,0.349999 -1.75,0 -2.94,-0.07 -4.69,-0.28 -4.97,-0.28 -2.38,0 -3.15,0.349999 -0.77,0.35 -1.4,1.33 -0.56,0.91 -0.56,1.680001 0,2.17 0.98,3.709999 1.26,1.960001 3.43,1.960001 0.84,0 1.54,-0.210001 0.7,-0.28 3.57,-2.31 1.47,-1.05 2.24,-1.259999 0.84,-0.210001 1.54,-0.210001 1.05,0 1.47,0.490001 0.77,0.699999 0.91,1.33 0.21,0.629999 0.21,1.89 0,3.64 -4.2,5.179999 -3.01,1.120001 -7.42,1.120001 -6.37,0 -10.43,-5.530001 -3.71,-5.04 -3.71,-11.549999 0,-7 4.13,-11.550001 4.2,-4.619999 10.43,-4.619999 6.09,0 9.8,4.34 1.89,2.169999 3.57,6.369999 0.63,1.47 0.63,2.800001 0,1.119999 -0.63,3.289999 z m -9.52,-5.18 q 0.21,-0.77 0.21,-1.47 0,-1.05 -0.7,-2.17 -1.19,-1.54 -3.29,-1.54 -0.98,0 -1.75,0.28 -2.94,1.19 -2.94,4.060001 0,0.489999 0.14,1.189999 0.14,0.63 1.33,1.260001 1.26,0.629999 2.8,0.629999 1.54,0 2.66,-0.49 1.19,-0.559999 1.54,-1.75 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:Epilog;-inkscape-font-specification:Epilog"
+         id="path5491"
+         inkscape:connector-curvature="0" />
+    </g>
     <ellipse
        style="fill:#ffe685;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path3339"
@@ -61,18 +101,5 @@
        cy="898.44922"
        rx="78.380798"
        ry="116.05554" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3341"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;line-height:125%;font-family:MathJax_Main;-inkscape-font-specification:MathJax_Main;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(3.6728516,700.18471)"><flowRegion
-         id="flowRegion3343"><rect
-           id="rect3345"
-           width="200.0659"
-           height="72.751236"
-           x="24.250412"
-           y="15.913391"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:MathJax_Main;-inkscape-font-specification:MathJax_Main;text-align:center;text-anchor:middle" /></flowRegion><flowPara
-         id="flowPara3347"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:45px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold'">Outside</flowPara></flowRoot>  </g>
+  </g>
 </svg>