2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 08:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from Major-/issue_170

Browse Source 
Fix #170
This commit is contained in:
Major
2016-02-14 19:44:46 +00:00
parent c545015501 8f5ddb0761
commit 420fe587da
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/skill/herblore/potion.rb
+7 -6
View File
@@ -3,6 +3,7 @@ require 'java'
java_import 'org.apollo.game.action.Action' java_import 'org.apollo.game.action.Action'
java_import 'org.apollo.game.model.Animation' java_import 'org.apollo.game.model.Animation'
java_import 'org.apollo.game.model.Item' java_import 'org.apollo.game.model.Item'
java_import 'org.apollo.game.model.entity.Skill'
java_import 'org.apollo.game.model.inter.EnterAmountListener' java_import 'org.apollo.game.model.inter.EnterAmountListener'
java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter' java_import 'org.apollo.game.model.inter.dialogue.DialogueAdapter'
@@ -274,15 +275,15 @@ class FinishedMixingAction < MixingAction
@ingredient = ingredient @ingredient = ingredient
end end
def executeAction def execute_action
player = mob ingredient = name_of(:item, @ingredient).downcase
ingredient = name_of(@ingredient).downcase
name = @potion.item.definition.name.sub('(3)', '') name = @potion.item.definition.name.sub('(3)', '')
player.send_message("You add the #{ingredient} to the mixture to make an #{name}.") name = "#{LanguageUtil.get_indefinite_article(name)} #{name}"
player.skill_set.add_experience(HERBLORE_SKILL_ID, @potion.experience) mob.send_message("You add the #{ingredient} to the mixture to make #{name}.")
mob.skill_set.add_experience(Skill::HERBLORE, @potion.experience)
inventory = player.inventory inventory = mob.inventory
@slots.each do |slot, amount| @slots.each do |slot, amount|
unless inventory.remove_slot(slot, amount) # TODO: will this remove stuff incorrectly? unless inventory.remove_slot(slot, amount) # TODO: will this remove stuff incorrectly?