mirror of
https://github.com/2006-Scape/apollo.git
synced 2026-07-05 16:49:04 +00:00
Modularise! Also add some unit tests.
This commit is contained in:
@@ -3,7 +3,6 @@ require 'java'
|
||||
java_import 'org.apollo.game.action.Action'
|
||||
java_import 'org.apollo.game.model.Animation'
|
||||
java_import 'org.apollo.game.model.Item'
|
||||
java_import 'org.apollo.game.model.def.ItemDefinition'
|
||||
java_import 'org.apollo.game.model.inter.EnterAmountListener'
|
||||
java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter'
|
||||
|
||||
@@ -190,8 +189,7 @@ class GrindingAction < Action
|
||||
return true if pst_mrt and ingr
|
||||
end
|
||||
|
||||
ingr = ItemDefinition.lookup(raw).name.downcase
|
||||
mob.send_message("You do not have any more #{ingr}s.")
|
||||
mob.send_message("You do not have any more #{name_of(raw).downcase}s.")
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ require 'java'
|
||||
java_import 'org.apollo.game.action.Action'
|
||||
java_import 'org.apollo.game.model.Animation'
|
||||
java_import 'org.apollo.game.model.Item'
|
||||
java_import 'org.apollo.game.model.def.ItemDefinition'
|
||||
java_import 'org.apollo.game.model.inter.EnterAmountListener'
|
||||
java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter'
|
||||
|
||||
@@ -271,7 +270,7 @@ class FinishedMixingAction < MixingAction
|
||||
|
||||
def execute_action
|
||||
player = mob
|
||||
ingredient = ItemDefinition.lookup(@ingredient).name.downcase
|
||||
ingredient = name_of(@ingredient).downcase
|
||||
name = @potion.item.definition.name.sub('(3)', '')
|
||||
|
||||
player.send_message("You add the #{ingredient} to the mixture to make an #{name}.", true)
|
||||
|
||||
Reference in New Issue
Block a user