Began working on NPC code

[butaba-adventures.git] / gameobjects.py

diff --git a/gameobjects.py b/gameobjects.py
index b4992a3..2edbc5b 100644 (file)
--- a/gameobjects.py
+++ b/gameobjects.py
@@ -1,18 +1,15 @@
 # object classes - classes for game interactive objects
-import pygame
-import os.path
-
-import utility
 
 # base class for all objects
 class GameObject:
        # initialization routine
-       def __init__ (self, row, col, text, image = None, can_pickup = True):
+       def __init__ (self, row, col, text, image = None, can_pickup = True, use_str = "Use"):
                self.row = row
                self.col = col
                self.image = image
                self.text = text
                self.can_pickup = can_pickup
+               self.use_str = use_str
 
        # override this for interaction, i.e. when character walks into the item
        def interact (self):
@@ -30,7 +27,7 @@ class GoldCoins (GameObject):
        def __init__ (self, row, col, image, value):
                text = "gold coins"
                self.value = value
-               GameObject.__init__ (self, row, col, text, image, False)
+               GameObject.__init__ (self, row, col, text, image, False, "Take")
 
        # no interaction with this object
        def interact (self):
@@ -45,7 +42,7 @@ class HealthPotion (GameObject):
        # initialize
        def __init__ (self, row, col, image):
                text = "health potion"
-               GameObject.__init__ (self, row, col, text, image, True)
+               GameObject.__init__ (self, row, col, text, image, True, "Drink")
 
        # no interaction with this object
        def interact (self):
@@ -58,11 +55,11 @@ class HealthPotion (GameObject):
                        butaba.health = butaba.MAXHEALTH
 
 class Chest (GameObject):
-       def __init__ (self, row, col, text, image, key_id, locked = False, items = []):
+       def __init__ (self, row, col, text, image, key_id, locked = False, objects = []):
                self.key_id = key_id
                self.locked = locked
-               self.items = items
-               GameObject.__init__ (self, row, col, text, image, False)
+               self.objects = objects
+               GameObject.__init__ (self, row, col, text, image, False, "Open")
 
        # no interaction with this object. Also solid so return False
        def interact (self):