home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server/py: Fix buggy worlddb_value_setter()() error message.
[plomrogue]
/
plomrogue-server.py
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 0098e472c22dee6857343892b3ef4e521015b79d..6ccd7a1ca2bd7be5632c1b582c8a71f04ed0d3a8 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-120,6
+120,8
@@
def save_world():
# Dummy for saving all commands to reconstruct current world state.
# Misses same optimizations as record() from the original record().
atomic_write(io_db["path_save"],
# Dummy for saving all commands to reconstruct current world state.
# Misses same optimizations as record() from the original record().
atomic_write(io_db["path_save"],
+ "MAP_LENGTH " + str(world_db["MAP_LENGTH"]) + "\n" +
+ "PLAYER_TYPE " + str(world_db["PLAYER_TYPE"]) + "\n" +
"TURN " + str(world_db["TURN"]) + "\n" +
"SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
"SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
"TURN " + str(world_db["TURN"]) + "\n" +
"SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
"SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
@@
-237,6
+239,11
@@
def play_game():
obey(read_command(), "in file", do_record=True)
obey(read_command(), "in file", do_record=True)
+def remake_map():
+ # DUMMY.
+ print("I'd (re-)make the map now, if only I knew how.")
+
+
def worlddb_value_setter(key, min, max):
"""Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
def func(val_string):
def worlddb_value_setter(key, min, max):
"""Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
def func(val_string):
@@
-247,7
+254,7
@@
def worlddb_value_setter(key, min, max):
world_db[key] = val
except ValueError:
print("Ignoring: Please use integer >= " + str(min) + " and <= " +
world_db[key] = val
except ValueError:
print("Ignoring: Please use integer >= " + str(min) + " and <= " +
-
"str(max)+ '
.")
+
str(max) + "
.")
return func
return func
@@
-262,12
+269,23
@@
def command_quit():
raise SystemExit("received QUIT command")
raise SystemExit("received QUIT command")
+def command_seedmap(seed_string):
+ """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map."""
+ worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
+ remake_map()
+
+
def command_makeworld(seed_string):
def command_makeworld(seed_string):
- #
Mere dummy so far
.
+ #
DUMMY
.
worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string)
worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string)
+def command_maplength(maplength_string):
+ # DUMMY.
+ worlddb_value_setter("MAP_LENGTH", 1, 256)(maplength_string)
+
+
"""Commands database.
Map command start tokens to ([0]) number of expected command arguments, ([1])
"""Commands database.
Map command start tokens to ([0]) number of expected command arguments, ([1])
@@
-279,10
+297,12
@@
commands_db = {
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
"MAKE_WORLD": (1, False, command_makeworld),
"QUIT": (0, True, command_quit),
"PING": (0, True, command_ping),
"MAKE_WORLD": (1, False, command_makeworld),
- "SEED_MAP": (1, False,
worlddb_value_setter("SEED_MAP", 0, 4294967295)
),
+ "SEED_MAP": (1, False,
command_seedmap
),
"SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0,
4294967295)),
"SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0,
4294967295)),
- "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535))
+ "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535)),
+ "PLAYER_TYPE": (1, False, worlddb_value_setter("PLAYER_TYPE", 0, 255)),
+ "MAP_LENGTH": (1, False, command_maplength)
}
}
@@
-290,7
+310,9
@@
commands_db = {
world_db = {
"TURN": 0,
"SEED_MAP": 0,
world_db = {
"TURN": 0,
"SEED_MAP": 0,
- "SEED_RANDOMNESS": 0
+ "SEED_RANDOMNESS": 0,
+ "PLAYER_TYPE": 0,
+ "MAP_LENGTH": 64
}
}