home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow negative weariness, but force involuntary dancing to get rid of it.
[plomrogue2]
/
rogue_chat.py
diff --git
a/rogue_chat.py
b/rogue_chat.py
index 818758350c500ff5cf5eaaf914d9d9262442e8da..cc6421f0384d48e7d6062c78836c51bfe72dabbf 100755
(executable)
--- a/
rogue_chat.py
+++ b/
rogue_chat.py
@@
-11,9
+11,12
@@
from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
cmd_GOD_THING_PROTECTION, cmd_THING_PROTECTION,
cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT,
cmd_THING_MUSICPLAYER_SETTINGS, cmd_THING_HAT_DESIGN,
cmd_GOD_THING_PROTECTION, cmd_THING_PROTECTION,
cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT,
cmd_THING_MUSICPLAYER_SETTINGS, cmd_THING_HAT_DESIGN,
- cmd_THING_MUSICPLAYER_PLAYLIST_ITEM,
+ cmd_THING_MUSICPLAYER_PLAYLIST_ITEM,
cmd_TERRAIN,
cmd_THING_BOTTLE_EMPTY, cmd_PLAYER_FACE,
cmd_THING_BOTTLE_EMPTY, cmd_PLAYER_FACE,
- cmd_GOD_PLAYER_FACE, cmd_GOD_PLAYER_HAT)
+ cmd_GOD_PLAYER_FACE, cmd_GOD_PLAYER_HAT,
+ cmd_GOD_PLAYERS_HAT_CHARS, cmd_PLAYER_HAT,
+ cmd_TERRAIN_TAG, cmd_THING_DOOR_KEY,
+ cmd_THING_CRATE_ITEM)
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_INSTALL,
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_INSTALL,
@@
-22,7
+25,10
@@
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_SpawnPoint, Thing_SpawnPointSpawner,
Thing_Door, Thing_DoorSpawner, Thing_Bottle,
Thing_BottleSpawner, Thing_BottleDeposit,
- Thing_MusicPlayer, Thing_Hat, Thing_HatRemixer)
+ Thing_MusicPlayer, Thing_Hat, Thing_HatRemixer,
+ Thing_Cookie, Thing_CookieSpawner, Thing_Psychedelic,
+ Thing_PsychedelicSpawner, Thing_DoorKey,
+ Thing_Crate, Thing_CrateSpawner)
from plomrogue.config import config
game = Game(config['savefile'])
from plomrogue.config import config
game = Game(config['savefile'])
@@
-32,6
+38,8
@@
game.register_command(cmd_LOGIN)
game.register_command(cmd_NICK)
game.register_command(cmd_TURN)
game.register_command(cmd_MAP)
game.register_command(cmd_NICK)
game.register_command(cmd_TURN)
game.register_command(cmd_MAP)
+game.register_command(cmd_TERRAIN)
+game.register_command(cmd_TERRAIN_TAG)
game.register_command(cmd_MAP_LINE)
game.register_command(cmd_MAP_CONTROL_LINE)
game.register_command(cmd_MAP_CONTROL_PW)
game.register_command(cmd_MAP_LINE)
game.register_command(cmd_MAP_CONTROL_LINE)
game.register_command(cmd_MAP_CONTROL_PW)
@@
-61,7
+69,11
@@
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_PLAYER_FACE)
game.register_command(cmd_GOD_PLAYER_FACE)
game.register_command(cmd_GOD_PLAYER_HAT)
+game.register_command(cmd_GOD_PLAYERS_HAT_CHARS)
+game.register_command(cmd_PLAYER_HAT)
game.register_command(cmd_THING_HAT_DESIGN)
game.register_command(cmd_THING_HAT_DESIGN)
+game.register_command(cmd_THING_DOOR_KEY)
+game.register_command(cmd_THING_CRATE_ITEM)
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)
@@
-80,6
+92,7
@@
game.register_thing_type(Thing_ItemSpawner)
game.register_thing_type(Thing_SpawnPoint)
game.register_thing_type(Thing_SpawnPointSpawner)
game.register_thing_type(Thing_Door)
game.register_thing_type(Thing_SpawnPoint)
game.register_thing_type(Thing_SpawnPointSpawner)
game.register_thing_type(Thing_Door)
+game.register_thing_type(Thing_DoorKey)
game.register_thing_type(Thing_DoorSpawner)
game.register_thing_type(Thing_Bottle)
game.register_thing_type(Thing_BottleSpawner)
game.register_thing_type(Thing_DoorSpawner)
game.register_thing_type(Thing_Bottle)
game.register_thing_type(Thing_BottleSpawner)
@@
-87,6
+100,12
@@
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.register_thing_type(Thing_MusicPlayer)
game.register_thing_type(Thing_Hat)
game.register_thing_type(Thing_HatRemixer)
+game.register_thing_type(Thing_Cookie)
+game.register_thing_type(Thing_CookieSpawner)
+game.register_thing_type(Thing_Psychedelic)
+game.register_thing_type(Thing_PsychedelicSpawner)
+game.register_thing_type(Thing_Crate)
+game.register_thing_type(Thing_CrateSpawner)
game.read_savefile()
game.io.start_loop()
for port in config['servers']:
game.read_savefile()
game.io.start_loop()
for port in config['servers']: