From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 5 Mar 2016 18:30:00 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:koperkapel
X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=commitdiff_plain;h=bfe27469228e9e18531dcf95021375089f65d147;hp=3aedff5424d65c64dc71f16f46922cf3045893d6

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

diff --git a/koperkapel/gamelib/items.py b/koperkapel/gamelib/items.py
index 837ccc6..b125d44 100644
--- a/koperkapel/gamelib/items.py
+++ b/koperkapel/gamelib/items.py
@@ -1,6 +1,7 @@
 # Item utilities
 
 from ..serums import default_serums
+from ..weapons import default_weapons
 
 
 def build_serum(item):
@@ -8,8 +9,14 @@ def build_serum(item):
     return actor
 
 
+def build_weapon(item):
+    actor = default_weapons.assemble(item["weapon"])
+    return actor
+
+
 ITEM_TYPES = {
     "serum": build_serum,
+    "weapon": build_weapon,
 }
 
 
diff --git a/koperkapel/levels/level1.json b/koperkapel/levels/level1.json
index 9dd2e4f..782ec65 100644
--- a/koperkapel/levels/level1.json
+++ b/koperkapel/levels/level1.json
@@ -4347,6 +4347,21 @@
         "type": "serum",
         "serum": "fast",
         "pos": [2, 4]
+      },
+      {
+        "type": "serum",
+        "serum": "smart",
+        "pos": [2, 8]
+      },
+      {
+        "type": "serum",
+        "serum": "strong",
+        "pos": [2, 12]
+      },
+      {
+        "type": "weapon",
+        "weapon": "butter_knife",
+        "pos": [9, 12]
       }
    ],
    "friendly roaches": [