X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=d29d5bec15655cf5f4038b6a3b1e86b4a96715fe;hb=2bf9dbbeca48cfde11566275d10ca91912257a0b;hp=770ce51aa76d488d285270eefcde6261d54b543e;hpb=218ca1703f2d9f85178f43c6035b0d5ca69fcb69;p=plomrogue

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index 770ce51..d29d5be 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -193,10 +193,10 @@ def actor_move(t):
     altar_msg_6 = "The Island God speaks to you: \"You have proven yourself " \
     "worthy of my respect. You were a good citizen to the island, and someti" \
     "mes a better steward to its inhabitants than me. The island shall miss " \
-    "you when you leave. But you have earned the right to do so. Take this" + \
-    world_db["ThingTypes"][world_db["SLIPPERS"]]["TT_NAME"] + " and USE it w" \
-    "hen you please. It will take you to where you came from. (But do feel f" \
-    "ree to stay here as long as you like.)\""
+    "you when you leave. But you have earned the right to do so. Take this "  \
+    + world_db["ThingTypes"][world_db["SLIPPERS"]]["TT_NAME"] + " and USE i" \
+    "t when you please. It will take you to where you came from. (But do fe" \
+    "el free to stay here as long as you like.)\""
 
     def enter_altar():
         from server.new_thing import new_Thing
@@ -375,7 +375,7 @@ def play_use_attempt_hook(t, tt):
                 wood_id = tid
                 break
         if wood_id == None:
-            log("You CAN'T use a " + world_db["ThingTypes"][type]["TT_NAME"]
+            log("You CAN'T use a " + tt["TT_NAME"]
                 + " without some wood in your inventory.")
             return False
         return True
@@ -387,7 +387,7 @@ def play_use_attempt_hook(t, tt):
     elif tt["TT_TOOL"] == "wood":
         log("To use wood, you NEED a carpentry tool.")
         return False
-    elif type == world_db["SLIPPERS"]:
+    elif tt == world_db["ThingTypes"][world_db["SLIPPERS"]]:
         return True
 
 def play_pickup_attempt_hook(t):
@@ -412,19 +412,17 @@ def write_metamap_A():
     ord_v = ord("v")
     length = world_db["MAP_LENGTH"]
     metamapA = bytearray(b'0' * (length ** 2))
-    for id in [id for id in world_db["Things"]
-                  if not world_db["Things"][id]["carried"]
-                  if world_db["Things"][id]["T_LIFEPOINTS"]
+    for tid in [tid for tid in world_db["Things"]
+                  if not world_db["Things"][tid]["carried"]
+                  if world_db["Things"][tid]["T_LIFEPOINTS"]
                   if world_db["Things"][0]["fovmap"][
-                       world_db["Things"][id]["T_POSY"] * length
-                       + world_db["Things"][id]["T_POSX"]] == ord_v]:
-        pos = (world_db["Things"][id]["T_POSY"] * length
-              + world_db["Things"][id]["T_POSX"])
-        if id == 0 or world_db["EMPATHY"]:
-            type = world_db["Things"][id]["T_TYPE"]
-            max_hp = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]
+                       world_db["Things"][tid]["pos"]] == ord_v]:
+        pos = (world_db["Things"][tid]["pos"])
+        if tid == 0 or world_db["EMPATHY"]:
+            ttid = world_db["Things"][tid]["T_TYPE"]
+            max_hp = world_db["ThingTypes"][ttid]["TT_LIFEPOINTS"]
             third_of_hp = max_hp / 3
-            hp = world_db["Things"][id]["T_LIFEPOINTS"]
+            hp = world_db["Things"][tid]["T_LIFEPOINTS"]
             add = 0
             if hp > 2 * third_of_hp:
                  add = 2
@@ -444,16 +442,14 @@ def write_metamap_B():
     ord_v = ord("v")
     length = world_db["MAP_LENGTH"]
     metamapB = bytearray(b' ' * (length ** 2))
-    for id in [id for id in world_db["Things"]
-                  if not world_db["Things"][id]["carried"]
-                  if world_db["Things"][id]["T_LIFEPOINTS"]
+    for tid in [tid for tid in world_db["Things"]
+                  if not world_db["Things"][tid]["carried"]
+                  if world_db["Things"][tid]["T_LIFEPOINTS"]
                   if world_db["Things"][0]["fovmap"][
-                       world_db["Things"][id]["T_POSY"] * length
-                       + world_db["Things"][id]["T_POSX"]] == ord_v]:
-        pos = (world_db["Things"][id]["T_POSY"] * length
-              + world_db["Things"][id]["T_POSX"])
-        if id == 0 or world_db["EMPATHY"]:
-            action = world_db["Things"][id]["T_COMMAND"]
+                       world_db["Things"][tid]["pos"]] == ord_v]:
+        pos = (world_db["Things"][tid]["pos"])
+        if tid == 0 or world_db["EMPATHY"]:
+            action = world_db["Things"][tid]["T_COMMAND"]
             if 0 != action:
                 name = world_db["ThingActions"][action]["TA_NAME"]
             else:
@@ -494,6 +490,7 @@ io_db["worldstate_write_order"] += [[write_metamap_B, "func"]]
 
 import server.config.world_data
 server.config.world_data.symbols_passable += ":_"
+server.config.world_data.symbols_hide += "|"
 server.config.world_data.thingprol_field_spreadable = thingprol_field_spreadable
 server.config.world_data.thingprol_test_hook = thingprol_test
 server.config.world_data.thingprol_post_create_hook = thingprol_post_create
@@ -532,7 +529,7 @@ 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 = make_map
+#server.config.misc.make_map = make_map
 server.config.misc.decrement_lifepoints = decrement_lifepoints
 server.config.misc.calc_effort = calc_effort