From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 29 Feb 2016 01:33:00 +0000 (+0100)
Subject: Server, plugin: Some minor variable renaming.
X-Git-Tag: tce~116
X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=commitdiff_plain;h=1a424fe732e404f79b5e67243af46291d192134b

Server, plugin: Some minor variable renaming.
---

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index fba17fc..95b46d0 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -527,14 +527,14 @@ server.config.commands.play_use_attempt_hook = play_use_attempt_hook
 server.config.commands.play_pickup_attempt_hook = play_pickup_attempt_hook
 
 import server.config.misc
-server.config.misc.make_map_func = make_map
+server.config.misc.make_map = make_map
 server.config.misc.decrement_lifepoints = decrement_lifepoints
-server.config.misc.calc_effort_func = calc_effort
+server.config.misc.calc_effort = calc_effort
 
 import server.config.make_world_helpers
-server.config.make_world_helpers.pos_test_func = pos_test
-server.config.make_world_helpers.world_makable_func = world_makable
-server.config.make_world_helpers.make_map_func = make_map
+server.config.make_world_helpers.pos_test = pos_test
+server.config.make_world_helpers.world_makable = world_makable
+server.config.make_world_helpers.make_map = make_map
 
 import server.config.thingproliferation
 server.config.thingproliferation.field_spreadable = field_spreadable
diff --git a/server/config/make_world_helpers.py b/server/config/make_world_helpers.py
index 21b4239..aba18c5 100644
--- a/server/config/make_world_helpers.py
+++ b/server/config/make_world_helpers.py
@@ -5,6 +5,6 @@
 from server.make_map import make_map
 from server.world_makable import world_makable
 
-pos_test_func = lambda a, b, c: True
-make_map_func = make_map
-world_makable_func = world_makable
+pos_test = lambda a, b, c: True
+make_map = make_map
+world_makable = world_makable
diff --git a/server/config/misc.py b/server/config/misc.py
index 299486b..3d97a3e 100644
--- a/server/config/misc.py
+++ b/server/config/misc.py
@@ -7,4 +7,4 @@ from server.decrement_lifepoints import decrement_lifepoints
 from server.calc_effort import calc_effort
 
 decrement_lifepoints = decrement_lifepoints
-calc_effort_func = calc_effort
+calc_effort = calc_effort
diff --git a/server/make_world.py b/server/make_world.py
index 23609c6..424bd1a 100644
--- a/server/make_world.py
+++ b/server/make_world.py
@@ -4,8 +4,7 @@
 
 
 from server.config.world_data import world_db, symbols_passable
-from server.config.make_world_helpers import make_map_func, \
-    world_makable_func, pos_test_func
+from server.config.make_world_helpers import make_map, world_makable, pos_test
 from server.config.io import io_db
 from server.utils import rand, libpr, id_setter
 from server.new_thing import new_Thing
@@ -32,7 +31,7 @@ def make_world(seed):
                 y = rand.next() % world_db["MAP_LENGTH"]
                 x = rand.next() % world_db["MAP_LENGTH"]
                 if chr(world_db["MAP"][y * world_db["MAP_LENGTH"] + x]) in \
-                    symbols_passable and pos_test_func(type, y, x):
+                    symbols_passable and pos_test(type, y, x):
                     break
                 i += 1
                 if i == 65535:
@@ -46,13 +45,13 @@ def make_world(seed):
                 break
         return (y, x)
 
-    playertype = world_makable_func()
+    playertype = world_makable()
     if playertype < 0:
         return
     rand.seed = seed
     libpr.set_maplength(world_db["MAP_LENGTH"])
     world_db["Things"] = {}
-    make_map_func()
+    make_map()
     world_db["WORLD_ACTIVE"] = 1
     world_db["TURN"] = 1
     for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]):
diff --git a/server/world.py b/server/world.py
index 90b26de..cde0198 100644
--- a/server/world.py
+++ b/server/world.py
@@ -53,7 +53,7 @@ def turn_over():
     """Run game world and its inhabitants until new player input expected."""
     from server.ai import ai
     from server.config.actions import action_db
-    from server.config.misc import calc_effort_func
+    from server.config.misc import calc_effort
     from server.update_map_memory import update_map_memory
     from server.thingproliferation import thingproliferation
     id = 0
@@ -82,7 +82,7 @@ def turn_over():
                     taid = [a for a in world_db["ThingActions"]
                               if a == Thing["T_COMMAND"]][0]
                     ThingAction = world_db["ThingActions"][taid]
-                    effort = calc_effort_func(ThingAction, Thing)
+                    effort = calc_effort(ThingAction, Thing)
                     if Thing["T_PROGRESS"] == effort:
                         action = action_db["actor_" + ThingAction["TA_NAME"]]
                         action(Thing)