Mercurial > fife-parpg
diff demos/rpg/scripts/scene.py @ 563:f85762e634c5
- Added the AttackAction along with a test enemy on level 1.
- Removed the getModuleByType() helper function.
| author | prock@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Thu, 24 Jun 2010 21:27:11 +0000 |
| parents | 69d50e751c9a |
| children | 9152ed2b5bb8 |
line wrap: on
line diff
--- a/demos/rpg/scripts/scene.py Thu Jun 24 19:58:59 2010 +0000 +++ b/demos/rpg/scripts/scene.py Thu Jun 24 21:27:11 2010 +0000 @@ -34,7 +34,7 @@ from scripts.actors.questgiver import QuestGiver from scripts.quests.basequest import Quest, ReturnItemQuest, QuestTypes from scripts.actors.player import Player -from scripts.objects.baseobject import GameObjectTypes, getModuleByType +from scripts.objects.baseobject import GameObjectTypes from scripts.objects.items import BaseItem, GoldStack, Portal from scripts.misc.exceptions import ObjectNotFoundError, ObjectAlreadyInSceneError from scripts.misc.serializer import Serializer @@ -75,7 +75,7 @@ newobject = Portal(self._gamecontroller, self.itemlayer, objdict["type"], objectname, modeldict["model"], identifier) elif objdict["type"] == "QUESTGIVER": newobject = QuestGiver(self._gamecontroller, self.actorlayer, objdict["type"], objectname, modeldict["model"], identifier, True) - elif objdict["type"] == "NPC": + elif objdict["type"] == "ENEMY": newobject = Actor(self._gamecontroller, self.actorlayer, objdict["type"], objectname, modeldict["model"], identifier, True) else: return None