bane commander NPC

src/engine/net/client/msg/VendorDialogMsg.java

@@ -121,7 +121,8 @@ public class VendorDialogMsg extends ClientNetMsg {
         Contract contract = npc.getContract();
 
         if(contract.getContractID() == 1502042){
-           vd = Contract.HandleBaneCommanderOptions(msg.unknown03);
+           vd = Contract.HandleBaneCommanderOptions(msg.unknown03, npc);
+           msg.updateMessage(3, vd);
         }else {
 
             if (contract == null)
@@ -135,13 +136,12 @@ public class VendorDialogMsg extends ClientNetMsg {
                 vd = contract.getVendorDialog();
             if (vd == null)
                 vd = VendorDialog.getHostileVendorDialog();
-        }
         if (msg.messageType == 1 || msg.unknown03 == vd.getObjectUUID()) {
             msg.updateMessage(3, vd);
         } else {
             if (VendorDialogMsg.handleSpecialCase(msg, npc, playerCharacter, vd, origin))
                 return;
-
+        }
             vd = VendorDialog.getVendorDialog(msg.unknown03);
             msg.updateMessage(3, vd);
         }

src/engine/objects/Contract.java

@@ -11,7 +11,9 @@ package engine.objects;
 
 import ch.claude_martin.enumbitset.EnumBitSet;
 import engine.Enum;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -190,18 +192,41 @@ public class Contract extends AbstractGameObject {
         return this.vendorDialog;
     }
 
-    public static VendorDialog HandleBaneCommanderOptions(int optionId){
+    public static VendorDialog HandleBaneCommanderOptions(int optionId, NPC npc){
-        if(optionId == 0) {
+        VendorDialog vd;
-            VendorDialog vd = VendorDialog.getHostileVendorDialog();
+        Building building = npc.building;
-            vd.getOptions().clear();
+        Bane bane = null;
-            MenuOption option1 = new MenuOption(796, "Set Bane Day", 796);
+        if(building != null)
-            vd.getOptions().add(option1);
+        {
-            MenuOption option2 = new MenuOption(797, "Set Bane Time", 797);
+            City city = ZoneManager.getCityAtLocation(npc.loc);
-            vd.getOptions().add(option2);
+            if(city != null){
-            return vd;
+                bane = city.getBane();
+            }
         }
-
+        if(bane == null){
-        return VendorDialog.getHostileVendorDialog();
+            return VendorDialog.getHostileVendorDialog();
+        }
+        switch(optionId){
+            default:
+                vd = VendorDialog.getHostileVendorDialog();
+                vd.getOptions().clear();
+                MenuOption option1 = new MenuOption(796, "Set Bane Day", 796);
+                vd.getOptions().add(option1);
+                MenuOption option2 = new MenuOption(797, "Set Bane Time", 797);
+                vd.getOptions().add(option2);
+                break;
+            case 796: // set bane day
+                vd = VendorDialog.getHostileVendorDialog();
+                vd.getOptions().clear();
+                MenuOption dayOption1 = new MenuOption(7961, "Set Bane Day", 796);
+                vd.getOptions().add(dayOption1);
+                break;
+            case 797: // set bane time
+                vd = VendorDialog.getHostileVendorDialog();
+                vd.getOptions().clear();
+                break;
+        }
+        return vd;
     }
 
     public ArrayList<Integer> getNPCMenuOptions() {