X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.py;h=8e4fd1bc366c8a2fc0acb2c6e0a081e7dd633e13;hb=856b68988876a63409737dac77b4d4921b9a466b;hp=3d9bf18d4a3b2f89905e97c7ada9f71a2e481947;hpb=7faae7c97770388f0067c541d27e21573008115d;p=plomrogue2

diff --git a/rogue_chat.py b/rogue_chat.py
index 3d9bf18..8e4fd1b 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from plomrogue.game import Game
 from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THING,
-                                cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
+                                cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_THING_INSTALLED,
                                 cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE,
                                 cmd_TASKS, cmd_MAP_CONTROL_LINE, cmd_MAP_CONTROL_PW,
                                 cmd_GOD_ANNOTATE, cmd_GOD_PORTAL, cmd_THING_TYPES,
@@ -9,14 +9,20 @@ 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_HAT_DESIGN,
+                                cmd_THING_MUSICPLAYER_PLAYLIST_ITEM,
+                                cmd_THING_BOTTLE_EMPTY, cmd_PLAYER_FACE,
+                                cmd_GOD_PLAYER_FACE, cmd_GOD_PLAYER_HAT)
 from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
                              Task_DROP, Task_FLATTEN_SURROUNDINGS, Task_DOOR,
-                             Task_INTOXICATE)
+                             Task_INTOXICATE, Task_COMMAND, Task_INSTALL,
+                             Task_WEAR)
 from plomrogue.things import (Thing_Player, Thing_Item, Thing_ItemSpawner,
                               Thing_SpawnPoint, Thing_SpawnPointSpawner,
-                              Thing_Door, Thing_DoorSpawner, Thing_Consumable,
-                              Thing_ConsumableSpawner)
+                              Thing_Door, Thing_DoorSpawner, Thing_Bottle,
+                              Thing_BottleSpawner, Thing_BottleDeposit,
+                              Thing_MusicPlayer, Thing_Hat, Thing_HatRemixer)
 
 from plomrogue.config import config
 game = Game(config['savefile'])
@@ -29,7 +35,6 @@ game.register_command(cmd_MAP)
 game.register_command(cmd_MAP_LINE)
 game.register_command(cmd_MAP_CONTROL_LINE)
 game.register_command(cmd_MAP_CONTROL_PW)
-game.register_command(cmd_GET_ANNOTATION)
 game.register_command(cmd_ANNOTATE)
 game.register_command(cmd_PORTAL)
 game.register_command(cmd_GOD_ANNOTATE)
@@ -43,12 +48,20 @@ game.register_command(cmd_THING_PROTECTION)
 game.register_command(cmd_GOD_THING_PROTECTION)
 game.register_command(cmd_THING_NAME)
 game.register_command(cmd_THING_DOOR_CLOSED)
+game.register_command(cmd_THING_INSTALLED)
 game.register_command(cmd_GOD_THING_NAME)
 game.register_command(cmd_ADMIN_PASSWORD)
 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_command(cmd_PLAYER_FACE)
+game.register_command(cmd_GOD_PLAYER_FACE)
+game.register_command(cmd_GOD_PLAYER_HAT)
+game.register_command(cmd_THING_HAT_DESIGN)
 game.register_task(Task_WAIT)
 game.register_task(Task_MOVE)
 game.register_task(Task_WRITE)
@@ -57,6 +70,9 @@ 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_task(Task_INSTALL)
+game.register_task(Task_WEAR)
 game.register_thing_type(Thing_Player)
 game.register_thing_type(Thing_Item)
 game.register_thing_type(Thing_ItemSpawner)
@@ -64,8 +80,12 @@ 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_Consumable)
-game.register_thing_type(Thing_ConsumableSpawner)
+game.register_thing_type(Thing_Bottle)
+game.register_thing_type(Thing_BottleSpawner)
+game.register_thing_type(Thing_BottleDeposit)
+game.register_thing_type(Thing_MusicPlayer)
+game.register_thing_type(Thing_Hat)
+game.register_thing_type(Thing_HatRemixer)
 game.read_savefile()
 game.io.start_loop()
 for port in config['servers']: