X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=770ce51aa76d488d285270eefcde6261d54b543e;hb=218ca1703f2d9f85178f43c6035b0d5ca69fcb69;hp=2fb0f20cda6b385f32777a3be664dd26cfde67b4;hpb=36c9978ab87646e8b72284bfcafd9e126abc670d;p=plomrogue
diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index 2fb0f20..770ce51 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -85,10 +85,10 @@ def actor_pickup(t):
log("CAN'T pick up object: No storage room to carry more.")
def actor_pickup_test_hook(t, tid):
- from server.ai import eat_vs_hunger_threshold
tt = world_db["ThingTypes"][tid]
return not (t != world_db["Things"][0] and (tt["TT_TOOL"] != "food" or
- (tt["TT_TOOLPOWER"] <= eat_vs_hunger_threshold(t["T_TYPE"]))))
+ (tt["TT_TOOLPOWER"] <=
+ world_db["ThingTypes"][t["T_TYPE"]]["eat_vs_hunger_threshold"])))
def actor_drop(t):
from server.actions import actor_drop
@@ -101,7 +101,7 @@ def actor_use_attempts_hook(t, ty):
if t == world_db["Things"][0]:
log("You use the " + world_db["ThingTypes"][ty]["TT_NAME"] + ". " \
"It glows in wondrous colors, and emits a sound as if from a d"
- "ying cat. The Island God laughs.\n")
+ "ying cat. The Island God laughs.")
t["T_LIFEPOINTS"] = 1
from server.config.misc import decrement_lifepoints
decrement_lifepoints(t)
@@ -211,7 +211,7 @@ def actor_move(t):
altar_msg_wait(100)
elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100:
world_db["FAVOR_STAGE"] = 2
- log(altar_msg_2)
+ log(altar_msg_1)
id = id_setter(-1, "Things")
world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
world_db["altar"])
@@ -378,10 +378,12 @@ def play_use_attempt_hook(t, tt):
log("You CAN'T use a " + world_db["ThingTypes"][type]["TT_NAME"]
+ " without some wood in your inventory.")
return False
- elif (tt["TT_TOOL"] == "fertilizer"
- and not world_db["MAP"][pos] == ord(".")):
- log("Can only make soil out of NON-SOIL earth.")
- return False
+ return True
+ elif tt["TT_TOOL"] == "fertilizer":
+ if not world_db["MAP"][pos] == ord("."):
+ log("Can only make soil out of NON-SOIL earth.")
+ return False
+ return True
elif tt["TT_TOOL"] == "wood":
log("To use wood, you NEED a carpentry tool.")
return False
@@ -512,7 +514,7 @@ from server.config.commands import commands_db
commands_db["GOD_FAVOR"] = (1, False, setter(None, "GOD_FAVOR", -32768, 32767))
commands_db["TT_STORAGE"] = (1, False, setter("ThingType", "TT_STORAGE", 0, 255))
commands_db["T_PLAYERDROP"] = (1, False, setter("Thing", "T_PLAYERDROP", 0, 1))
-commands_db["FAVOR_STAGE"] = (1, False, setter(None, "FAVOR_STAGE", 0, 1))
+commands_db["FAVOR_STAGE"] = (1, False, setter(None, "FAVOR_STAGE", 0, 255))
commands_db["SLIPPERS"] = (1, False, specialtypesetter("SLIPPERS"))
commands_db["TOOL_0"] = (1, False, specialtypesetter("TOOL_0"))
commands_db["TOOL_1"] = (1, False, specialtypesetter("TOOL_1"))