From 5c0297c2fc2cff3e3e4cb6e33007146e0790ad23 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Fri, 30 May 2014 19:38:13 +0200
Subject: [PATCH] Minor vendor fixes

---
 scripts/radial/terminal/vendor.py             | 43 ++++++++++---------
 .../AuctionQueryHeadersResponseMessage.java   |  8 ++--
 src/services/bazaar/BazaarService.java        |  7 ++-
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/scripts/radial/terminal/vendor.py b/scripts/radial/terminal/vendor.py
index 3d32c3b5..1ebb5c4b 100644
--- a/scripts/radial/terminal/vendor.py
+++ b/scripts/radial/terminal/vendor.py
@@ -8,35 +8,36 @@ import sys
 
 def createRadial(core, owner, target, radials):
 	radials.clear()	
-	#radials.add(RadialOptions(0, 11, 1, ''))
-	#radials.add(RadialOptions(0, 55, 0, ''))
-	#radials.add(RadialOptions(2, 56, 1, ''))
-	#radials.add(RadialOptions(2, 57, 1, ''))
-	#radials.add(RadialOptions(2, 58, 1, ''))
-	#radials.add(RadialOptions(2, 59, 1, ''))
-	#radials.add(RadialOptions(0, 52, 0, ''))
-	#radials.add(RadialOptions(3, 53, 1, ''))
-	#radials.add(RadialOptions(3, 54, 1, ''))
-	
+	radials.add(RadialOptions(0, 7, 1, ''))
+	radials.add(RadialOptions(0, 11, 1, ''))
 	if not long(target.getAttachment('vendorOwner')) == owner.getObjectID():
 		return
-
+	radials.add(RadialOptions(0, 55, 0, ''))
+	radials.add(RadialOptions(0, 52, 0, ''))
 	radials.add(RadialOptions(0, 112, 3, '@player_structure:vendor_control'))
+	radials.add(RadialOptions(3, 56, 1, ''))
+	radials.add(RadialOptions(3, 57, 1, ''))
+	radials.add(RadialOptions(3, 58, 1, ''))
+	radials.add(RadialOptions(3, 59, 1, ''))
+	radials.add(RadialOptions(4, 53, 1, ''))
+	radials.add(RadialOptions(4, 54, 1, ''))
+	
+
 	if target.getAttachment('initialized') == False:
-		radials.add(RadialOptions(1, 118, 3, '@player_structure:vendor_init'))
+		radials.add(RadialOptions(5, 118, 3, '@player_structure:vendor_init'))
 	else:
 		# soe reuses option 118
-		radials.add(RadialOptions(1, 118, 3, '@player_structure:vendor_status'))
-		radials.add(RadialOptions(1, 217, 3, '@player_structure:give_maintenance'))
-		radials.add(RadialOptions(1, 115, 3, '@player_structure:take_maintenance'))
+		radials.add(RadialOptions(5, 118, 3, '@player_structure:vendor_status'))
+		radials.add(RadialOptions(5, 217, 3, '@player_structure:give_maintenance'))
+		radials.add(RadialOptions(5, 115, 3, '@player_structure:take_maintenance'))
 		if owner.getSkillModBase('private_register_vendor') >= 1:
-			radials.add(RadialOptions(1, 116, 3, '@player_structure:register_vendor'))
-		radials.add(RadialOptions(1, 205, 3, '@player_structure:enable_vendor_search'))
-		radials.add(RadialOptions(1, 206, 3, '@player_structure:disable_vendor_search'))
-		radials.add(RadialOptions(1, 121, 3, '@player_structure:customize_vendor'))
+			radials.add(RadialOptions(5, 116, 3, '@player_structure:register_vendor'))
+		radials.add(RadialOptions(5, 205, 3, '@player_structure:enable_vendor_search'))
+		radials.add(RadialOptions(5, 206, 3, '@player_structure:disable_vendor_search'))
+		radials.add(RadialOptions(5, 121, 3, '@player_structure:customize_vendor'))
 		
-	radials.add(RadialOptions(1, 114, 3, '@player_structure:vendor_pack'))		
-	radials.add(RadialOptions(1, 117, 3, '@player_structure:remove_vendor'))	
+	radials.add(RadialOptions(5, 114, 3, '@player_structure:vendor_pack'))		
+	radials.add(RadialOptions(5, 117, 3, '@player_structure:remove_vendor'))	
 	
 	return
 	
diff --git a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java
index 3ea90dd0..65fbbf26 100644
--- a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java
+++ b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java
@@ -97,15 +97,17 @@ public class AuctionQueryHeadersResponseMessage extends SWGMessage {
 			result.putInt(item.getPrice());
 			result.putInt((int) ((item.getExpireTime() - System.currentTimeMillis()) / 1000));
 			result.putInt(item.getPrice());
+			result.putShort((short) getStringIndex(item.getOwnerName()));
+			result.putInt(0);
 			result.putShort((short) 0);
-			result.putLong(item.getOwnerId());
+			result.put((byte) 0);
 			result.put((byte) (item.isAuction() ? 0 : 1));
 			result.putLong(0);
-			result.put((byte) 0);
+			result.putShort((short) 0);
 			result.putInt(2); // unk
 			result.putInt(0);
 			result.putShort((short) 0);
-			result.putInt(item.getItemType());
+			result.putInt(0);
 
 			//result.putInt(0x400C); // category bitmask?
 			result.putInt(0);
diff --git a/src/services/bazaar/BazaarService.java b/src/services/bazaar/BazaarService.java
index 2c90047d..adf3bd9b 100644
--- a/src/services/bazaar/BazaarService.java
+++ b/src/services/bazaar/BazaarService.java
@@ -736,7 +736,12 @@ public class BazaarService implements INetworkDispatch {
 		
 		if(vendor.getTemplate().contains("terminal_bazaar"))
 			auctionItem.setOnBazaar(true);
-		
+		else {
+			if(!((long) vendor.getAttachment("vendorOwner") == player.getObjectID())) {
+				auctionItem.setOfferToId((long) vendor.getAttachment("owner"));
+				auctionItem.setStatus(AuctionItem.OFFERED);
+			}
+		}
 		addAuctionItem(auctionItem);
 		
 		return auctionItem;