Fixes to Bull Charge + Adding more instructins to purchasing

This commit is contained in:
phobia 2016-04-02 21:43:33 +11:00
parent 15cf7f574d
commit cc09bf6b51
2 changed files with 5 additions and 6 deletions

View File

@ -26,17 +26,17 @@ public class PurchaseItemsObjective extends UnorderedObjective<ClansMainTutorial
this, this,
Material.IRON_HELMET, Material.IRON_HELMET,
"Purchase Iron Helmet", "Purchase Iron Helmet",
"Buy an Iron Helmet", "Buy an Iron Helmet from the PvP Gear NPC",
"The shops sell everything you could ever need and more." "The shops sell everything you could ever need and more."
)); ));
addGoal(new PurchaseGoal(this, Material.IRON_CHESTPLATE, "Purchase Iron Chestplate", addGoal(new PurchaseGoal(this, Material.IRON_CHESTPLATE, "Purchase Iron Chestplate from the PvP Gear NPC",
"Buy an Iron Chestplate")); "Buy an Iron Chestplate"));
addGoal(new PurchaseGoal(this, Material.IRON_LEGGINGS, "Purchase Iron Leggings", addGoal(new PurchaseGoal(this, Material.IRON_LEGGINGS, "Purchase Iron Leggings",
"Buy Iron Leggings")); "Buy Iron Leggings from the PvP Gear NPC"));
addGoal(new PurchaseGoal(this, Material.IRON_BOOTS, "Purchase Iron Boots", addGoal(new PurchaseGoal(this, Material.IRON_BOOTS, "Purchase Iron Boots",
"Buy Iron Boots")); "Buy Iron Boots from the PvP Gear NPC"));
addGoal(new PurchaseGoal(this, Material.IRON_AXE, "Purchase Iron Axe", addGoal(new PurchaseGoal(this, Material.IRON_AXE, "Purchase Iron Axe",
"Buy an Iron Axe")); "Buy an Iron Axe from the PvP Gear NPC"));
// addGoal(new PurchaseGoal(this, Material.IRON_PICKAXE, "Purchase Iron Pickaxe", "Talk to the Pvp Gear NPC and purchase an Iron Pickaxe")); // addGoal(new PurchaseGoal(this, Material.IRON_PICKAXE, "Purchase Iron Pickaxe", "Talk to the Pvp Gear NPC and purchase an Iron Pickaxe"));
setStartMessageDelay(60); setStartMessageDelay(60);

View File

@ -43,7 +43,6 @@ public class UseBullsChargeGoal extends ObjectiveGoal<ClassesObjective> {
@EventHandler @EventHandler
public void checkSkill(SkillTriggerEvent event) { public void checkSkill(SkillTriggerEvent event) {
if (contains(event.GetPlayer())) { if (contains(event.GetPlayer())) {
if (event.GetSkillName().toLowerCase().contains("bulls charge"))
finish(event.GetPlayer()); finish(event.GetPlayer());
} }
} }