From: Christian Heller Date: Thu, 26 Nov 2020 21:16:33 +0000 (+0100) Subject: Simplify Thing type differentiation, Furniture becomes Item. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/pick_tasks?a=commitdiff_plain;h=7385c037c0acb54c06fc7919b5b85548c09f8d65;p=plomrogue2 Simplify Thing type differentiation, Furniture becomes Item. --- diff --git a/plomrogue/things.py b/plomrogue/things.py index 0f058f2..0edf8fb 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -40,11 +40,6 @@ class Thing_Item(Thing): -class Thing_Furniture(Thing): - symbol_hint = 'h' - - - class ThingAnimate(Thing): blocking = True diff --git a/rogue_chat.py b/rogue_chat.py index 407dc29..f4bc7cd 100755 --- a/rogue_chat.py +++ b/rogue_chat.py @@ -10,7 +10,7 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT) from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP, Task_DROP, Task_FLATTEN_SURROUNDINGS) -from plomrogue.things import Thing_Player, Thing_Item, Thing_Furniture +from plomrogue.things import Thing_Player, Thing_Item from plomrogue.config import config game = Game(config['savefile']) @@ -47,7 +47,6 @@ game.register_task(Task_PICK_UP) game.register_task(Task_DROP) game.register_thing_type(Thing_Player) game.register_thing_type(Thing_Item) -game.register_thing_type(Thing_Furniture) game.read_savefile() game.io.start_loop() for port in config['servers']: