From f9a9eae3562708e11d2b9309a40eb8626ff9ca36 Mon Sep 17 00:00:00 2001
From: Qweqker <60119671+Qweqker@users.noreply.github.com>
Date: Fri, 13 Mar 2020 20:33:52 -0400
Subject: [PATCH] Bank Adjustment, Cabbage Patch (Pun intended) (#396)

* Added Cabbage ID for the cabbage that is supposed to spawn south of falador
Moved unique food dialogue inside the text handler to avoid duplicate messages
Added unique message for south of falador cabbage

* Adjusted Lumbridge Bank Boundary

Co-authored-by: Qweqker <qweqker@mail.com>
---
 .../game/content/consumables/Food.java        | 32 ++++++++++++-------
 .../java/com/rebotted/world/Boundary.java     |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java b/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java
index 0887bba9..d958a39e 100644
--- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java	
+++ b/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java	
@@ -38,7 +38,7 @@ public class Food {
 				//MOONLIGHT_MEAD(2955, 4, "Moonlight mead", 1919, "Drink", false), 
 				MONKFISH(7946, 16, "Monkfish", 0,
 				"Food", false), SEA_TURTLE(397, 21, "Sea Turtle", 0, "Food",
-				false), CABBAGE(1965, 1, "Cabbage", 0, "Food", false), SPINACH(
+				false), CABBAGE(1965, 1, "Cabbage", 0, "Food", false), CABBAGE_SOUTH_OF_FALADOR(1967, 1, "Cabbage", 0, "Food", false), SPINACH(
 				1969, 2, "Spinach Roll", 0, "Food", false), CAKE(1891, 4,
 				"Cake", 1893, "Food", false), CAKE2(1893, 4, "2/3 Cake", 1895,
 				"Food", false), SLICE_OF_CAKE(1895, 4, "2/3 Cake", 0, "Food",
@@ -177,19 +177,27 @@ public class Food {
 				c.getItemAssistant().addItem(f.replaceWith(), 1);
 			}
 			if (f.getType().equalsIgnoreCase("Food")) {
-				c.getPacketSender().sendMessage(
-						"You eat the " + f.getName() + ".");
-			} else if (f.getType().equalsIgnoreCase("Drink")) {
-				c.getPacketSender().sendMessage(
-						"You drink the " + f.getName() + ".");
+				if (id == 1965) {
+					c.getPacketSender().sendMessage(
+							"You eat the cabbage. Yuck!");
+				}
+				else if (id == 1967){
+					c.getPacketSender().sendMessage(
+							"You eat the cabbage. It seems to taste nicer than normal.");
+				} else {
+					c.getPacketSender().sendMessage(
+							"You eat the " + f.getName() + ".");
+				}
 			}
-			if (id == 1965) {
-				c.getPacketSender().sendMessage(
-						"You eat the cabbage. Yuck!");
-			}
-			if (id == 2955) {
-				c.getPacketSender().sendMessage("It tastes like something just died in your mouth.");
+			else if (f.getType().equalsIgnoreCase("Drink")) {
+				if (id == 2955) {
+					c.getPacketSender().sendMessage("It tastes like something just died in your mouth.");
+				} else {
+					c.getPacketSender().sendMessage(
+							"You drink the " + f.getName() + ".");
+				}
 			}
+
 			if (f.getType().equalsIgnoreCase("Food")) {
 				c.getPacketSender().sendSound(SoundList.FOOD_EAT, 100, 0);
 			} else if (f.getType().equalsIgnoreCase("Drink")) {
diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java
index f27d138b..7f54cf1f 100644
--- a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java	
+++ b/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java	
@@ -181,7 +181,7 @@ public class Boundary {
 	public static final Boundary AL_KHARID = new Boundary(3327, 3423, 3131, 3324);
 	
 	public static final Boundary[] BANK_AREA = new Boundary[] {
-		new Boundary(3205, 3226, 3211, 3214, 2), //Lumbridge
+		new Boundary(3205, 3212, 3217, 3224, 2), //Lumbridge
 		new Boundary(3162, 3271, 3266, 3272),//Al Kharid
 		new Boundary(2436, 2453, 5174, 5186),//TzHaar
 		new Boundary(2842, 2860, 2950, 2957),//Shilo