X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=server%2Fcommands.py;h=fc384528704cf88e8cfec3b975a857d1433594f2;hb=9ae02cea8243472195d97b756542f9d344a67459;hp=f20297d31da9041562a4acd9cdf44ecd130f3ba4;hpb=b96dfc255b732c753d8da8d727b3d3be6e072302;p=plomrogue
diff --git a/server/commands.py b/server/commands.py
index f20297d..fc38452 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -49,6 +49,9 @@ def command_thingshere(str_y, str_x):
if None != y and None != x and y < length and x < length:
pos = (y * world_db["MAP_LENGTH"]) + x
strong_write(io_db["file_out"], "THINGS_HERE START\n")
+ terrain = chr(world_db["Things"][0]["T_MEMMAP"][pos])
+ terrain_name = world_db["terrain_names"][terrain]
+ strong_write(io_db["file_out"], "terrain: " + terrain_name + "\n")
if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
for id in [id for tid in sorted(list(world_db["ThingTypes"]))
for id in world_db["Things"]
@@ -84,8 +87,8 @@ def command_makeworld(seed_string):
"""Call make_world()."""
val = integer_test(seed_string, 0, 4294967295)
if None != val:
- from server.config.misc import make_world_func
- make_world_func(val)
+ from server.make_world import make_world
+ make_world(val)
def command_maplength(maplength_string):
@@ -115,17 +118,19 @@ def command_worldactive(worldactive_string):
else:
print("World already active.")
elif 0 == world_db["WORLD_ACTIVE"]:
- wait_exists = False
for ThingAction in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][ThingAction]["TA_NAME"]:
- wait_exists = True
break
- player_exists = False
+ else:
+ print("Ignored: No wait action defined for world to activate.")
+ return
for Thing in world_db["Things"]:
if 0 == Thing:
- player_exists = True
break
- if wait_exists and player_exists and world_db["MAP"]:
+ else:
+ print("Ignored: No player defined for world to activate.")
+ return
+ if world_db["MAP"]:
for id in world_db["Things"]:
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])
@@ -136,7 +141,7 @@ def command_worldactive(worldactive_string):
world_db["Things"][0]["fovmap"] = empty_fovmap
world_db["WORLD_ACTIVE"] = 1
else:
- print("Ignoring: Not all conditions for world activation met.")
+ print("Ignoring: No map defined for world to activate.")
def command_tid(id_string):
@@ -310,16 +315,13 @@ def command_taname(name):
or name == "pickup":
world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
if 1 == world_db["WORLD_ACTIVE"]:
- wait_defined = False
for id in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
- wait_defined = True
break
- if not wait_defined:
+ else:
set_world_inactive()
else:
print("Ignoring: Invalid action name.")
- # In contrast to the original,naming won't map a function to a ThingAction.
def setter(category, key, min, max=None):
@@ -499,6 +501,9 @@ def play_move(str_arg):
move_result = mv_yx_in_dir_legal(chr(dir), t["T_POSY"], t["T_POSX"])
if 1 == move_result[0]:
pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
+ if ord("~") == world_db["MAP"][pos]:
+ log("You can't SWIM.")
+ return
if chr(world_db["MAP"][pos]) in symbols_passable:
world_db["Things"][0]["T_ARGUMENT"] = dir
set_command("move")
@@ -508,6 +513,6 @@ def play_move(str_arg):
def command_ai():
"""Call ai() on player Thing, then turn_over()."""
- from server.config.actions import ai_func
- ai_func(world_db["Things"][0])
+ from server.ai import ai
+ ai(world_db["Things"][0])
turn_over()