changeset 196:a4c4e2f34162

Remove DummyWorld since npc-test now uses the real world.
author Simon Cross <hodgestar@gmail.com>
date Wed, 06 Apr 2011 22:06:45 +0200
parents 445a28f4b38e
children 6696ffd51ac2
files scripts/npc-test skaapsteker/dialogue.py
diffstat 2 files changed, 1 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/npc-test	Wed Apr 06 22:04:19 2011 +0200
+++ b/scripts/npc-test	Wed Apr 06 22:06:45 2011 +0200
@@ -8,7 +8,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
-from skaapsteker.dialogue import DSM, DsmEvent, DummyWorld
+from skaapsteker.dialogue import DSM, DsmEvent
 from skaapsteker.gamestate import GameState
 
 
--- a/skaapsteker/dialogue.py	Wed Apr 06 22:04:19 2011 +0200
+++ b/skaapsteker/dialogue.py	Wed Apr 06 22:06:45 2011 +0200
@@ -118,52 +118,3 @@
         if eval(self._matches, {}, my_locals.copy()):
             return eval(self._next_state, {}, my_locals.copy())
         return None
-
-
-class DummyWorld(object):
-
-    def __init__(self):
-        self._fox_has_tea = False
-        self._fox_is_shapeshifted = False
-        self._fox_is_disguised = False
-
-        self._fire_started = False
-        self._cannon_destroyed = False
-
-        self._vase_broken = False
-        self._fish_in_house = False
-        self._torn_kimono = False
-
-        self._masks_destroyed = False
-
-        self.npcs = {}
-
-    def npc_is(self, npc_name, state):
-        return self.npcs[npc_name].state == state
-
-    def fox_has_tea(self):
-        return self._fox_has_tea
-
-    def fox_is_shapeshifted(self):
-        return self._fox_is_shapeshifted
-
-    def fox_is_disguised(self):
-        return self._fox_is_disguised
-
-    def fire_started(self):
-        return self._fire_started
-
-    def cannon_destroyed(self):
-        return self._cannon_destroyed
-
-    def vase_broken(self):
-        return self._vase_broken
-
-    def fish_in_house(self):
-        return self._fish_in_house
-
-    def torn_kimono(self):
-        return self._torn_kimono
-
-    def masks_destroyed(self):
-        return self._masks_destroyed