home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitelist legal input characters.
[plomrogue2]
/
rogue_chat.py
diff --git
a/rogue_chat.py
b/rogue_chat.py
index 3d9bf18d4a3b2f89905e97c7ada9f71a2e481947..4509d33a73dc1d01a294524edafa21dd4800ca13 100755
(executable)
--- a/
rogue_chat.py
+++ b/
rogue_chat.py
@@
-9,14
+9,18
@@
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_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,
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
)
from plomrogue.things import (Thing_Player, Thing_Item, Thing_ItemSpawner,
Thing_SpawnPoint, Thing_SpawnPointSpawner,
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)
from plomrogue.config import config
game = Game(config['savefile'])
from plomrogue.config import config
game = Game(config['savefile'])
@@
-49,6
+53,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_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)
game.register_task(Task_WAIT)
game.register_task(Task_MOVE)
game.register_task(Task_WRITE)
@@
-57,6
+64,7
@@
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_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)
game.register_thing_type(Thing_Player)
game.register_thing_type(Thing_Item)
game.register_thing_type(Thing_ItemSpawner)
@@
-64,8
+72,10
@@
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_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.read_savefile()
game.io.start_loop()
for port in config['servers']:
game.read_savefile()
game.io.start_loop()
for port in config['servers']: