Modularise! Also add some unit tests.

This commit is contained in:
Major-
2015-05-26 13:49:27 +01:00
parent 902a203861
commit e4778105f5
658 changed files with 1532 additions and 1004 deletions
+1 -3
View File
@@ -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
+1 -2
View File
@@ -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)