From afae0e63ba637e5c3ad791ce4462a108cf9dfff3 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 2 Apr 2024 20:23:38 -0500 Subject: [PATCH] saetor can now take "Chaos Boon" --- src/engine/net/client/handlers/MerchantMsgHandler.java | 7 +++++-- src/engine/objects/Shrine.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java index 0df4fd97..03171cab 100644 --- a/src/engine/net/client/handlers/MerchantMsgHandler.java +++ b/src/engine/net/client/handlers/MerchantMsgHandler.java @@ -147,8 +147,8 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { Building shrineBuilding; Shrine shrine; - if (npc.getGuild().getNation() != player.getGuild().getNation()) - return; + //if (npc.getGuild().getNation() != player.getGuild().getNation()) + // return; shrineBuilding = npc.getBuilding(); @@ -191,6 +191,9 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { return; } + if(shrinePower.getName().equals("Boon: Nephilim")) + shrinePower.name = "Boon: Chaos"; + int trains = 5 * npc.getRank() + 5;//40 - (rank * 10); if (trains < 0) trains = 0; diff --git a/src/engine/objects/Shrine.java b/src/engine/objects/Shrine.java index 928be579..d7ced00a 100644 --- a/src/engine/objects/Shrine.java +++ b/src/engine/objects/Shrine.java @@ -94,6 +94,7 @@ public class Shrine extends AbstractWorldObject implements Comparable { return true; break; + case 1999://saetor case 2025: case 2026: if (shrine.shrineType == ShrineType.Nephilim)