X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.py;h=8e4fd1bc366c8a2fc0acb2c6e0a081e7dd633e13;hb=dbb17811ffb485471c228544549e8c8ff940a946;hp=4509d33a73dc1d01a294524edafa21dd4800ca13;hpb=6354f0d85ce38a5450142b2bc775e49f0abfc7b8;p=plomrogue2

diff --git a/rogue_chat.py b/rogue_chat.py
index 4509d33..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,
@@ -10,17 +10,19 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
                                 cmd_GOD_THING_NAME, cmd_THING_DOOR_CLOSED,
                                 cmd_GOD_THING_PROTECTION, cmd_THING_PROTECTION,
                                 cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT,
-                                cmd_THING_MUSICPLAYER_SETTINGS,
+                                cmd_THING_MUSICPLAYER_SETTINGS, cmd_THING_HAT_DESIGN,
                                 cmd_THING_MUSICPLAYER_PLAYLIST_ITEM,
-                                cmd_THING_BOTTLE_EMPTY)
+                                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_COMMAND)
+                             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_Bottle,
                               Thing_BottleSpawner, Thing_BottleDeposit,
-                              Thing_MusicPlayer)
+                              Thing_MusicPlayer, Thing_Hat, Thing_HatRemixer)
 
 from plomrogue.config import config
 game = Game(config['savefile'])
@@ -33,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)
@@ -47,6 +48,7 @@ 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)
@@ -56,6 +58,10 @@ 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)
@@ -65,6 +71,8 @@ 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)
@@ -76,6 +84,8 @@ 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']: