X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=rogue_chat.py;h=cb3080d0caa3d315f01f76c80c4d457492c81d11;hb=018bb0242ebd2b7e9fde170fae830376dea55e16;hp=c4a44008c4b20bf78df8148ba38b3bebf2191286;hpb=e91c0688ee0d273d7f106e837e1ad52009d79350;p=plomrogue2

diff --git a/rogue_chat.py b/rogue_chat.py
index c4a4400..cb3080d 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -9,12 +9,17 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
                                 cmd_BECOME_ADMIN, cmd_SET_TILE_CONTROL,
                                 cmd_GOD_THING_NAME, cmd_THING_DOOR_CLOSED,
                                 cmd_GOD_THING_PROTECTION, cmd_THING_PROTECTION,
-                                cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT)
+                                cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT,
+                                cmd_THING_MUSICPLAYER_SETTINGS,
+                                cmd_THING_MUSICPLAYER_PLAYLIST_ITEM,
+                                cmd_THING_BOTTLE_EMPTY)
 from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
-                             Task_DROP, Task_FLATTEN_SURROUNDINGS, Task_DOOR)
+                             Task_DROP, Task_FLATTEN_SURROUNDINGS, Task_DOOR,
+                             Task_INTOXICATE, Task_COMMAND)
 from plomrogue.things import (Thing_Player, Thing_Item, Thing_ItemSpawner,
                               Thing_SpawnPoint, Thing_SpawnPointSpawner,
-                              Thing_Door, Thing_DoorSpawner)
+                              Thing_Door, Thing_DoorSpawner, Thing_Bottle,
+                              Thing_BottleSpawner, Thing_MusicPlayer)
 
 from plomrogue.config import config
 game = Game(config['savefile'])
@@ -47,6 +52,9 @@ game.register_command(cmd_SET_TILE_CONTROL)
 game.register_command(cmd_SET_MAP_CONTROL_PASSWORD)
 game.register_command(cmd_BECOME_ADMIN)
 game.register_command(cmd_SPAWN_POINT)
+game.register_command(cmd_THING_MUSICPLAYER_SETTINGS)
+game.register_command(cmd_THING_MUSICPLAYER_PLAYLIST_ITEM)
+game.register_command(cmd_THING_BOTTLE_EMPTY)
 game.register_task(Task_WAIT)
 game.register_task(Task_MOVE)
 game.register_task(Task_WRITE)
@@ -54,6 +62,8 @@ game.register_task(Task_FLATTEN_SURROUNDINGS)
 game.register_task(Task_PICK_UP)
 game.register_task(Task_DROP)
 game.register_task(Task_DOOR)
+game.register_task(Task_INTOXICATE)
+game.register_task(Task_COMMAND)
 game.register_thing_type(Thing_Player)
 game.register_thing_type(Thing_Item)
 game.register_thing_type(Thing_ItemSpawner)
@@ -61,6 +71,9 @@ game.register_thing_type(Thing_SpawnPoint)
 game.register_thing_type(Thing_SpawnPointSpawner)
 game.register_thing_type(Thing_Door)
 game.register_thing_type(Thing_DoorSpawner)
+game.register_thing_type(Thing_Bottle)
+game.register_thing_type(Thing_BottleSpawner)
+game.register_thing_type(Thing_MusicPlayer)
 game.read_savefile()
 game.io.start_loop()
 for port in config['servers']: