From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 22 Feb 2016 22:32:15 +0000 (+0100)
Subject: Server: Make thingproliferation function selectable.
X-Git-Tag: tce~181
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/foo.html?a=commitdiff_plain;h=d29cadf50b9a1daed21fa1d68a5c86ca5d953856;p=plomrogue
Server: Make thingproliferation function selectable.
---
diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index be91fd6..4f7841f 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -102,7 +102,7 @@ def actor_move(t):
log("BAR " + str(t["T_LIFEPOINTS"]))
return sadness
return 0
- from server.world import build_fov_map
+ from server.build_fov_map import build_fov_map
from server.utils import mv_yx_in_dir_legal
from server.config.world_data import directions_db
passable = False
diff --git a/server/actions.py b/server/actions.py
index 6393a0f..302c36d 100644
--- a/server/actions.py
+++ b/server/actions.py
@@ -15,7 +15,8 @@ def actor_wait(t):
def actor_move(t):
"""If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
- from server.world import build_fov_map, decrement_lifepoints
+ from server.build_fov_map import build_fov_map
+ from server.world import decrement_lifepoints
from server.utils import mv_yx_in_dir_legal
from server.config.world_data import directions_db, symbols_passable
passable = False
diff --git a/server/build_fov_map.py b/server/build_fov_map.py
new file mode 100644
index 0000000..11c6382
--- /dev/null
+++ b/server/build_fov_map.py
@@ -0,0 +1,14 @@
+# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+# or any later version. For details on its copyright, license, and warranties,
+# see the file NOTICE in the root directory of the PlomRogue source package.
+
+
+def build_fov_map(t):
+ """Build Thing's FOV map."""
+ from server.config.world_data import world_db
+ from server.utils import libpr, c_pointer_to_bytearray
+ t["fovmap"] = bytearray(b'v' * (world_db["MAP_LENGTH"] ** 2))
+ fovmap = c_pointer_to_bytearray(t["fovmap"])
+ map = c_pointer_to_bytearray(world_db["MAP"])
+ if libpr.build_fov_map(t["T_POSY"], t["T_POSX"], fovmap, map):
+ raise RuntimeError("Malloc error in build_fov_Map().")
diff --git a/server/commands.py b/server/commands.py
index 9a10337..71094e3 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -7,8 +7,8 @@ from server.config.world_data import world_db
from server.config.io import io_db
from server.io import log, strong_write
from server.utils import integer_test, id_setter
-from server.world import build_fov_map, update_map_memory, set_world_inactive,\
- turn_over
+from server.world import update_map_memory, set_world_inactive, turn_over
+from server.build_fov_map import build_fov_map
def command_plugin(str_plugin):
@@ -149,7 +149,7 @@ def command_tid(id_string):
print("Ignoring: No ThingType to settle new Thing in.")
return
type = list(world_db["ThingTypes"].keys())[0]
- from server.world import new_Thing
+ from server.new_thing import new_Thing
world_db["Things"][id] = new_Thing(type)
diff --git a/server/config/misc.py b/server/config/misc.py
index 5a3ce21..89af76f 100644
--- a/server/config/misc.py
+++ b/server/config/misc.py
@@ -3,5 +3,7 @@
# see the file NOTICE in the root directory of the PlomRogue source package.
from server.make_map import make_map
+from server.thingproliferation import thingproliferation
make_map_func = make_map
+thingproliferation_func = thingproliferation
diff --git a/server/new_thing.py b/server/new_thing.py
new file mode 100644
index 0000000..84bc591
--- /dev/null
+++ b/server/new_thing.py
@@ -0,0 +1,21 @@
+# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+# or any later version. For details on its copyright, license, and warranties,
+# see the file NOTICE in the root directory of the PlomRogue source package.
+
+
+def new_Thing(_type, pos=(0, 0)):
+ """Return Thing of type T_TYPE, with fovmap if alive and world active."""
+ from server.config.world_data import thing_defaults, world_db
+ from server.build_fov_map import build_fov_map
+ thing = {}
+ for key in thing_defaults:
+ thing[key] = thing_defaults[key]
+ if type(thing[key]) == list:
+ thing[key] = thing[key][:]
+ thing["T_LIFEPOINTS"] = world_db["ThingTypes"][_type]["TT_LIFEPOINTS"]
+ thing["T_TYPE"] = _type
+ thing["T_POSY"] = pos[0]
+ thing["T_POSX"] = pos[1]
+ if world_db["WORLD_ACTIVE"] and thing["T_LIFEPOINTS"]:
+ build_fov_map(thing)
+ return thing
diff --git a/server/thingproliferation.py b/server/thingproliferation.py
new file mode 100644
index 0000000..801ee29
--- /dev/null
+++ b/server/thingproliferation.py
@@ -0,0 +1,29 @@
+# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+# or any later version. For details on its copyright, license, and warranties,
+# see the file NOTICE in the root directory of the PlomRogue source package.
+
+
+def thingproliferation(t, prol_map):
+ """To chance of 1/TT_PROLIFERATE, create t offspring in open neighbor cell.
+
+ Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be be
+ marked "." in prol_map. If there are several map cell candidates, one is
+ selected randomly.
+ """
+ from server.config.world_data import directions_db, symbols_passable,\
+ world_db
+ from server.utils import mv_yx_in_dir_legal, rand
+ from server.new_thing import new_Thing
+ prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
+ if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)):
+ candidates = []
+ for dir in [directions_db[key] for key in sorted(directions_db.keys())]:
+ mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"])
+ c = prol_map[mv_result[1] + world_db["MAP_LENGTH"] + mv_result[2]]
+ if mv_result[0] and str(c) in symbols_passable:
+ candidates.append((mv_result[1], mv_result[2]))
+ if len(candidates):
+ i = rand.next() % len(candidates)
+ id = id_setter(-1, "Things")
+ newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
+ world_db["Things"][id] = newT
diff --git a/server/world.py b/server/world.py
index 84a3fc1..a7efc13 100644
--- a/server/world.py
+++ b/server/world.py
@@ -5,36 +5,13 @@
from server.config.world_data import world_db
from server.io import log
-from server.utils import rand, libpr, c_pointer_to_bytearray
+from server.utils import rand, libpr
from server.utils import id_setter
-def thingproliferation(t, prol_map):
- """To chance of 1/TT_PROLIFERATE, create t offspring in open neighbor cell.
-
- Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be be
- marked "." in prol_map. If there are several map cell candidates, one is
- selected randomly.
- """
- from server.config.world_data import directions_db, symbols_passable
- from server.utils import mv_yx_in_dir_legal
- prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
- if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)):
- candidates = []
- for dir in [directions_db[key] for key in sorted(directions_db.keys())]:
- mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"])
- c = prol_map[mv_result[1] + world_db["MAP_LENGTH"] + mv_result[2]]
- if mv_result[0] and str(c) in symbols_passable:
- candidates.append((mv_result[1], mv_result[2]))
- if len(candidates):
- i = rand.next() % len(candidates)
- id = id_setter(-1, "Things")
- newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
- world_db["Things"][id] = newT
-
-
def update_map_memory(t, age_map=True):
"""Update t's T_MEMMAP with what's in its FOV now,age its T_MEMMEPTHMAP."""
+ from server.utils import c_pointer_to_bytearray
def age_some_memdepthmap_on_nonfov_cells():
# OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
@@ -77,32 +54,6 @@ def update_map_memory(t, age_map=True):
t["T_MEMTHING"].append((type, y, x))
-def build_fov_map(t):
- """Build Thing's FOV map."""
- t["fovmap"] = bytearray(b'v' * (world_db["MAP_LENGTH"] ** 2))
- fovmap = c_pointer_to_bytearray(t["fovmap"])
- map = c_pointer_to_bytearray(world_db["MAP"])
- if libpr.build_fov_map(t["T_POSY"], t["T_POSX"], fovmap, map):
- raise RuntimeError("Malloc error in build_fov_Map().")
-
-
-def new_Thing(_type, pos=(0, 0)):
- """Return Thing of type T_TYPE, with fovmap if alive and world active."""
- from server.config.world_data import thing_defaults
- thing = {}
- for key in thing_defaults:
- thing[key] = thing_defaults[key]
- if type(thing[key]) == list:
- thing[key] = thing[key][:]
- thing["T_LIFEPOINTS"] = world_db["ThingTypes"][_type]["TT_LIFEPOINTS"]
- thing["T_TYPE"] = _type
- thing["T_POSY"] = pos[0]
- thing["T_POSX"] = pos[1]
- if world_db["WORLD_ACTIVE"] and thing["T_LIFEPOINTS"]:
- build_fov_map(thing)
- return thing
-
-
def decrement_lifepoints(t):
"""Decrement t's lifepoints by 1, and if to zero, corpse it.
@@ -232,6 +183,7 @@ def make_world(seed):
make_map_func()
world_db["WORLD_ACTIVE"] = 1
world_db["TURN"] = 1
+ from server.new_thing import new_Thing
for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]):
id = id_setter(-1, "Things")
world_db["Things"][id] = new_Thing(playertype, free_pos())
@@ -252,6 +204,7 @@ def make_world(seed):
def turn_over():
"""Run game world and its inhabitants until new player input expected."""
from server.config.actions import action_db, ai_func
+ from server.config.misc import thingproliferation_func
id = 0
whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
@@ -285,7 +238,7 @@ def turn_over():
action(Thing)
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
- thingproliferation(Thing, proliferable_map)
+ thingproliferation_func(Thing, proliferable_map)
if whilebreaker:
break
world_db["TURN"] += 1