Update existing plugins to use the new utils plugin.

This commit is contained in:
Major-
2014-08-09 17:12:25 +01:00
parent 17975206cb
commit c162705cd4
16 changed files with 79 additions and 98 deletions
+8 -20
View File
@@ -9,13 +9,10 @@ java_import 'org.apollo.game.model.entity.Player'
on :command, :lookup, RIGHTS_ADMIN do |player, command|
args = command.arguments.to_a
unless args.length > 1
player.send_message('Invalid syntax - ::lookup [npc/object/item] [name]')
next
end
next unless valid_arg_length(args, (1..10), player, 'Invalid syntax - ::lookup [npc/object/item] [name]')
type = args.shift.downcase
limit = args.first.to_i != 0 ? args.shift.to_i : 5
limit = args.first.to_i == 0 ? 5 : args.shift.to_i;
name = args.join(' ').downcase
if ['npc', 'object', 'item'].index(type) == nil
@@ -25,22 +22,19 @@ on :command, :lookup, RIGHTS_ADMIN do |player, command|
ids = find_entities(type, name, limit).join(', ')
message = ids.empty? ? "Could not find an #{type} called #{name}." : "Possible ids are: #{ids}."
message = ids.empty? ? "Could not find an #{type} called #{name}." : "Possible ids for \"#{name}\" are: #{ids}."
player.send_message(message)
end
# Sends the user a message with information about the item with the specified id.
on :command, :iteminfo, RIGHTS_ADMIN do |player, command|
args = command.arguments
unless args.length == 1
player.send_message('Invalid syntax - ::iteminfo [item id]')
next
end
next unless valid_arg_length(args, 1, player, 'Invalid syntax - ::iteminfo [item id]')
id = args[0].to_i
definition = ItemDefinition.lookup(id)
members = definition.is_members_only ? 'members' : 'not members'
player.send_message("Item #{id} is called #{definition.name}, is #{members} only, and has a team of #{definition.team}.")
player.send_message("Its description is \"#{definition.description}\".")
end
@@ -48,15 +42,12 @@ end
# Sends the user a message with information about the npc with the specified id.
on :command, :npcinfo, RIGHTS_ADMIN do |player, command|
args = command.arguments
unless args.length == 1
player.send_message('Invalid syntax - ::npcinfo [npc id]')
next
end
next unless valid_arg_length(args, 1, player, 'Invalid syntax - ::npcinfo [npc id]')
id = args[0].to_i
definition = NpcDefinition.lookup(id)
is_combative = definition.has_combat_level ? "has a combat level of #{definition.combat_level}" : "does not have a combat level"
player.send_message("Npc #{id} is called #{definition.name} and #{is_combative}.")
player.send_message("Its description is \"#{definition.description}\".")
end
@@ -64,10 +55,7 @@ end
# Sends the user a message with information about the object with the specified id.
on :command, :objectinfo, RIGHTS_ADMIN do |player, command|
args = command.arguments
unless args.length == 1
player.send_message('Invalid syntax - ::objectinfo [npc id]')
next
end
next unless valid_arg_length(args, 1, player, 'Invalid syntax - ::objectinfo [npc id]')
id = args[0].to_i
definition = ObjectDefinition.lookup(id)