diff --git a/python/guilds/guild_dues.py b/python/guilds/guild_dues.py index 301fecce1..3d61e78f3 100644 --- a/python/guilds/guild_dues.py +++ b/python/guilds/guild_dues.py @@ -45,7 +45,7 @@ if whoami.Name=='Jack': buddylist = ['buddy','buddy','buddy','buddy','pal','friend','friend','friend','friend','dude','chum', 'sweetie'] guildname=Crossfire.ScriptParameters() # 6 is say event - text = string.split(Crossfire.WhatIsMessage()) + text = Crossfire.WhatIsMessage().split() if (guildname): guild = CFGuilds.CFGuild(guildname) diff --git a/python/guilds/guild_entry.py b/python/guilds/guild_entry.py index 265ac914b..e36156103 100644 --- a/python/guilds/guild_entry.py +++ b/python/guilds/guild_entry.py @@ -34,7 +34,7 @@ guildname=Crossfire.ScriptParameters() # 6 is say event if (guildname): guild = CFGuilds.CFGuild(guildname) - text = string.split(Crossfire.WhatIsMessage()) + text = Crossfire.WhatIsMessage().split() guildrecord = CFGuilds.CFGuildHouses().info(guildname) found = 0 if text[0] == 'enter' or text[0] == 'Enter': diff --git a/python/guilds/guildoracle.py b/python/guilds/guildoracle.py index dcd4bd2b5..30a3ca18c 100644 --- a/python/guilds/guildoracle.py +++ b/python/guilds/guildoracle.py @@ -36,7 +36,7 @@ print "Activated %s" %guildname if (guildname): guild = CFGuilds.CFGuild(guildname) guildhouse = CFGuilds.CFGuildHouses() - text = string.split(Crossfire.WhatIsMessage()) + text = Crossfire.WhatIsMessage().split() if guild.info(activatorname) == 0 and isDM == 0: message = 'You don\'t belong to this guild!' diff --git a/python/guilds/guildpay.py b/python/guilds/guildpay.py index 678eaa2be..e4395e2b7 100644 --- a/python/guilds/guildpay.py +++ b/python/guilds/guildpay.py @@ -40,7 +40,7 @@ y2=6 if (guildname): guild = CFGuilds.CFGuild(guildname) - text = string.split(Crossfire.WhatIsMessage()) + text = Crossfire.WhatIsMessage().split() guildrecord = CFGuilds.CFGuildHouses().info(guildname) found = 0 if text[0] == 'dues' or text[0] == 'Dues': diff --git a/python/guilds/storage_entry.py b/python/guilds/storage_entry.py index ba2739b80..a77423b9b 100644 --- a/python/guilds/storage_entry.py +++ b/python/guilds/storage_entry.py @@ -34,7 +34,7 @@ guildname=Crossfire.ScriptParameters() # 6 is say event if (guildname): guild = CFGuilds.CFGuild(guildname) - text = string.split(Crossfire.WhatIsMessage()) + text = Crossfire.WhatIsMessage().split() guildrecord = CFGuilds.CFGuildHouses().info(guildname) found = 0 if text[0] == 'enter' or text[0] == 'Enter': diff --git a/python/tod/filter.py b/python/tod/filter.py index 26411def3..a7d53883c 100644 --- a/python/tod/filter.py +++ b/python/tod/filter.py @@ -43,10 +43,10 @@ inverse = "inverse" in parameters and parameters["inverse"] == True Crossfire.SetReturnValue(not inverse) if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script filter.py didn't get a 'match' parameter. Only got %s" %parameters) -elif string.lower(parameters["match"]) == "one": +elif parameters["match"].lower() == "one": if TimeOfDay().matchAny(parameters["when"]): Crossfire.SetReturnValue(inverse) -elif string.lower(parameters["match"]) == "all": +elif parameters["match"].lower() == "all": if TimeOfDay().matchAll(parameters["when"]): Crossfire.SetReturnValue(inverse) else: diff --git a/python/tod/push.py b/python/tod/push.py index 7950eb932..d7fe2fa80 100644 --- a/python/tod/push.py +++ b/python/tod/push.py @@ -61,9 +61,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True match = False if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %parameters) -elif string.lower(parameters["match"]) == "one": +elif parameters["match"].lower() == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse -elif string.lower(parameters["match"]) == "all": +elif parameters["match"].lower() == "all": match=TimeOfDay().matchAll(parameters["when"]) != inverse else: Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %parameters) diff --git a/python/tod/replace.py b/python/tod/replace.py index 849a993b0..4df8c4620 100644 --- a/python/tod/replace.py +++ b/python/tod/replace.py @@ -51,9 +51,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True match = False if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %parameters) -elif string.lower(parameters["match"]) == "one": +elif parameters["match"].lower() == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse -elif string.lower(parameters["match"]) == "all": +elif parameters["match"].lower() == "all": match=TimeOfDay().matchAll(parameters["when"]) != inverse else: Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %parameters) diff --git a/python/tod/replace_in_map.py b/python/tod/replace_in_map.py index 9b17bda24..88283d5cd 100644 --- a/python/tod/replace_in_map.py +++ b/python/tod/replace_in_map.py @@ -15,9 +15,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True match = False if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script replace_in_map_period.py didn't get a 'match' parameter. Only got %s" %parameters) -elif string.lower(parameters["match"]) == "one": +elif parameters["match"].lower() == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse -elif string.lower(parameters["match"]) == "all": +elif parameters["match"].lower() == "all": match=TimeOfDay().matchAll(parameters["when"]) != inverse else: Crossfire.Log(Crossfire.LogError,"Script replace_in_map_period.py didn't get a 'match' parameter. Only got %s" %parameters) diff --git a/python/tod/sleep.py b/python/tod/sleep.py index 22d8411b9..04fa17d57 100644 --- a/python/tod/sleep.py +++ b/python/tod/sleep.py @@ -53,9 +53,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True match = False if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters) -elif string.lower(parameters["match"]) == "one": +elif parameters["match"].lower() == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse -elif string.lower(parameters["match"]) == "all": +elif parameters["match"].lower() == "all": match=TimeOfDay().matchAll(parameters["when"]) != inverse else: Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters)