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

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index 770ce51..8cb5734 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -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: