X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Fconfig%2Fcommands.py;h=06e6f759cf1b5384957b1cabb89768db2d38fa22;hb=68eb747114744fa9315617e227ab82b5e57d28da;hp=197f7ee82dcfc63ed5c19c98743b1e5eaeb98142;hpb=0a56367e8396b2ece4c1bce8a25e93ceabd901c1;p=plomrogue
diff --git a/server/config/commands.py b/server/config/commands.py
index 197f7ee..06e6f75 100644
--- a/server/config/commands.py
+++ b/server/config/commands.py
@@ -9,7 +9,8 @@ from server.commands import command_plugin, command_quit, command_ping, \
command_taname, command_ttid, command_ttname, command_tttool, \
command_ttsymbol, command_ttcorpseid, command_tid, command_tcommand, \
command_ttype, command_tcarries, command_tmemthing, setter_tpos, \
- play_wait, play_move, play_pickup, play_drop, play_use, command_ai
+ play_wait, play_move, play_pickup, play_drop, play_use, command_ai, \
+ command_ttlifepoints, command_taeffort
"""Commands database.
@@ -20,7 +21,7 @@ be ignored in replay mode if read from server input file), and ([2]) a function
to be called on it.
"""
commands_db = {
- "PLUGIN": (1, True, command_plugin),
+ "PLUGIN": (1, False, command_plugin),
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
"THINGS_HERE": (2, True, command_thingshere),
@@ -32,7 +33,7 @@ commands_db = {
"WORLD_ACTIVE": (1, False, command_worldactive),
"MAP": (2, False, setter_map("MAP")),
"TA_ID": (1, False, command_taid),
- "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
+ "TA_EFFORT": (1, False, command_taeffort),
"TA_NAME": (1, False, command_taname),
"TT_ID": (1, False, command_ttid),
"TT_NAME": (1, False, command_ttname),
@@ -44,7 +45,7 @@ commands_db = {
0, 255)),
"TT_PROLIFERATE": (1, False, setter("ThingType", "TT_PROLIFERATE",
0, 65535)),
- "TT_LIFEPOINTS": (1, False, setter("ThingType", "TT_LIFEPOINTS", 0, 255)),
+ "TT_LIFEPOINTS": (1, False, command_ttlifepoints),
"T_ID": (1, False, command_tid),
"T_ARGUMENT": (1, False, setter("Thing", "T_ARGUMENT", 0, 255)),
"T_PROGRESS": (1, False, setter("Thing", "T_PROGRESS", 0, 255)),
@@ -60,9 +61,14 @@ commands_db = {
"T_POSX": (1, False, setter_tpos("X")),
"wait": (0, False, play_wait),
"move": (1, False, play_move),
- "pick_up": (0, False, play_pickup),
+ "pickup": (0, False, play_pickup),
"drop": (1, False, play_drop),
"use": (1, False, play_use),
"ai": (0, False, command_ai)
}
# TODO: Unhandled cases: (Un-)killing animates (esp. player!) with T_LIFEPOINTS.
+
+command_worldactive_test_hook = lambda: True
+play_move_attempt_hook = lambda x, y, z: False
+play_use_attempt_hook = lambda x, y: None
+play_pickup_attempt_hook = lambda x: True