Thread: #peekinv money
View Single Post
  #5  
Old 10-23-2012, 09:31 PM
Uleat's Avatar
Uleat
Developer
 
Join Date: Apr 2012
Location: North Carolina
Posts: 2,815
Default

I did get it back up, thanks! Definitely a bad drive... Having other issues now though O.o

I need to do a better job of separating bug fixes from alternative code. If someone wants to bump this thread up to 'Custom Code,' please do.

Anyways... Here is the fully implented and focused '#peekinv money' patch that should be what's posted here.

[PeekMoney.patch]
Code:
Index: client.cpp
===================================================================
--- client.cpp	(revision 2241)
+++ client.cpp	(working copy)
@@ -2229,28 +2229,53 @@
 
 int64 Client::GetCarriedMoney() {
 
-	return ((static_cast<int64>(m_pp.copper) +
+	return (
+	   (static_cast<int64>(m_pp.copper)) +
 	   (static_cast<int64>(m_pp.silver) * 10) +
 	   (static_cast<int64>(m_pp.gold) * 100) +
-	   (static_cast<int64>(m_pp.platinum) * 1000)));
+	   (static_cast<int64>(m_pp.platinum) * 1000));
 }
 
+int64 Client::GetBankMoney() {
+
+	return (
+	   (static_cast<int64>(m_pp.copper_bank)) +
+	   (static_cast<int64>(m_pp.silver_bank) * 10) +
+	   (static_cast<int64>(m_pp.gold_bank) * 100) +
+	   (static_cast<int64>(m_pp.platinum_bank) * 1000));
+}
+
+int64 Client::GetSharedBankMoney() {
+
+	return (
+	   (static_cast<int64>(m_pp.platinum_shared) * 1000));
+}
+
+int64 Client::GetCursorMoney() {
+
+	return (
+	   (static_cast<int64>(m_pp.copper_cursor)) +
+	   (static_cast<int64>(m_pp.silver_cursor) * 10) +
+	   (static_cast<int64>(m_pp.gold_cursor) * 100) +
+	   (static_cast<int64>(m_pp.platinum_cursor) * 1000));
+}
+
 int64 Client::GetAllMoney() {
 
 	return (
-	   (static_cast<int64>(m_pp.copper) +
+	   (static_cast<int64>(m_pp.copper)) +
 	   (static_cast<int64>(m_pp.silver) * 10) +
 	   (static_cast<int64>(m_pp.gold) * 100) +
 	   (static_cast<int64>(m_pp.platinum) * 1000) +
-	   (static_cast<int64>(m_pp.copper_bank) +
+	   (static_cast<int64>(m_pp.copper_bank)) +
 	   (static_cast<int64>(m_pp.silver_bank) * 10) +
 	   (static_cast<int64>(m_pp.gold_bank) * 100) +
 	   (static_cast<int64>(m_pp.platinum_bank) * 1000) +
-	   (static_cast<int64>(m_pp.copper_cursor) +
+	   (static_cast<int64>(m_pp.copper_cursor)) +
 	   (static_cast<int64>(m_pp.silver_cursor) * 10) +
 	   (static_cast<int64>(m_pp.gold_cursor) * 100) +
 	   (static_cast<int64>(m_pp.platinum_cursor) * 1000) +
-	   (static_cast<int64>(m_pp.platinum_shared) * 1000)))));
+	   (static_cast<int64>(m_pp.platinum_shared) * 1000));
 }
 
 bool Client::CheckIncreaseSkill(SkillType skillid, Mob *against_who, int chancemodi) {
Index: client.h
===================================================================
--- client.h	(revision 2241)
+++ client.h	(working copy)
@@ -478,12 +478,20 @@
 	uint32 GetWeight() const { return(weight); }
 	inline void RecalcWeight() { weight = CalcCurrentWeight(); }
 	uint32 CalcCurrentWeight();
-	inline uint32	GetCopper()		const { return m_pp.copper; }
-	inline uint32	GetSilver()		const { return m_pp.silver; }
-	inline uint32	GetGold()		const { return m_pp.gold; }
-	inline uint32	GetPlatinum()	const { return m_pp.platinum; }
+	inline uint32	GetCopper()			const { return m_pp.copper; }
+	inline uint32	GetSilver()			const { return m_pp.silver; }
+	inline uint32	GetGold()			const { return m_pp.gold; }
+	inline uint32	GetPlatinum()		const { return m_pp.platinum; }
+	inline uint32	GetBankCopper()		const { return m_pp.copper_bank; }
+	inline uint32	GetBankSilver()		const { return m_pp.silver_bank; }
+	inline uint32	GetBankGold()		const { return m_pp.gold_bank; }
+	inline uint32	GetBankPlatinum()	const { return m_pp.platinum_bank; }
+	inline uint32	GetSharedPlatinum()	const { return m_pp.platinum_shared; }
+	inline uint32	GetCursorCopper()	const { return m_pp.copper_cursor; }
+	inline uint32	GetCursorSilver()	const { return m_pp.silver_cursor; }
+	inline uint32	GetCursorGold()		const { return m_pp.gold_cursor; }
+	inline uint32	GetCursorPlatinum()	const { return m_pp.platinum_cursor; }
 
-
 	/*Endurance and such*/
 	void	CalcMaxEndurance();	//This calculates the maximum endurance we can have
 	sint32	CalcBaseEndurance();	//Calculates Base End
@@ -619,6 +627,9 @@
 	void	AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold,uint32 platinum,bool updateclient);
 	bool	HasMoney(uint64 copper);
 	int64	GetCarriedMoney();
+	int64	GetBankMoney();
+	int64	GetSharedBankMoney();
+	int64	GetCursorMoney();
 	int64	GetAllMoney();
 
 	bool	IsDiscovered(int32 itemid);
Index: command.cpp
===================================================================
--- command.cpp	(revision 2241)
+++ command.cpp	(working copy)
@@ -263,7 +263,7 @@
 		command_add("appearance","[type] [value] - Send an appearance packet for you or your target",150,command_appearance) ||
 		command_add("charbackup","[list/restore] - Query or restore character backups",150,command_charbackup) ||
 		command_add("nukeitem","[itemid] - Remove itemid from your player target's inventory",150,command_nukeitem) ||
-		command_add("peekinv","[worn/cursor/inv/bank/trade/trib/all] - Print out contents of your player target's inventory",100,command_peekinv) ||
+		command_add("peekinv","[money/worn/cursor/inv/bank/trade/trib/all] - Print out contents of your player target's inventory",100,command_peekinv) ||
 		command_add("findnpctype","[search criteria] - Search database NPC types",100,command_findnpctype) ||
 		command_add("findzone","[search criteria] - Search database zones",100,command_findzone) ||
 		command_add("fz",NULL,100,command_findzone) ||
@@ -3028,8 +3028,38 @@
 	bool bFound = false;
 	Client* client = c->GetTarget()->CastToClient();
 	const Item_Struct* item = NULL;
-	c->Message(0, "Displaying inventory for %s...", client->GetName());
+	c->Message(15, "Displaying inventory for %s:", client->GetName());
 		
+	if (bAll || (strcasecmp(sep->arg[1], "money")==0)) {
+		// Money
+		bFound = true;
+		int64 money_amt;
+		uint32 denom_amt;
+
+		money_amt=client->GetAllMoney();		c->Message((money_amt==0), "TOTAL MONEY (in Copper): %i", money_amt);
+ 		
+		money_amt=client->GetCarriedMoney();	c->Message((money_amt==0), "Carried Money (in Copper): %i", money_amt);
+		denom_amt=client->GetPlatinum();		c->Message((denom_amt==0), "---Carried Platinum: %i", denom_amt);
+		denom_amt=client->GetGold();			c->Message((denom_amt==0), "---Carried Gold: %i", denom_amt);
+		denom_amt=client->GetSilver();			c->Message((denom_amt==0), "---Carried Silver: %i", denom_amt);
+		denom_amt=client->GetCopper();			c->Message((denom_amt==0), "---Carried Copper: %i", denom_amt);
+		
+		money_amt=client->GetBankMoney();		c->Message((money_amt==0), "Bank Money (in Copper): %i", money_amt);
+		denom_amt=client->GetBankPlatinum();	c->Message((denom_amt==0), "---Bank Platinum: %i", denom_amt);
+		denom_amt=client->GetBankGold();		c->Message((denom_amt==0), "---Bank Gold: %i", denom_amt);
+		denom_amt=client->GetBankSilver();		c->Message((denom_amt==0), "---Bank Silver: %i", denom_amt);
+		denom_amt=client->GetBankCopper();		c->Message((denom_amt==0), "---Bank Copper: %i", denom_amt);
+		
+		money_amt=client->GetSharedBankMoney();	c->Message((money_amt==0), "Shared Bank Money (in Copper): %i", money_amt);
+		denom_amt=client->GetSharedPlatinum();	c->Message((denom_amt==0), "---Shared Bank Platinum: %i", denom_amt);
+
+		money_amt=client->GetCursorMoney();		c->Message((money_amt==0), "Cursor Money (in Copper): %i", money_amt);
+		denom_amt=client->GetCursorPlatinum();	c->Message((denom_amt==0), "---Cursor Platinum: %i", denom_amt);
+		denom_amt=client->GetCursorGold();		c->Message((denom_amt==0), "---Cursor Gold: %i", denom_amt);
+		denom_amt=client->GetCursorSilver();	c->Message((denom_amt==0), "---Cursor Silver: %i", denom_amt);
+		denom_amt=client->GetCursorCopper();	c->Message((denom_amt==0), "---Cursor Copper: %i", denom_amt);
+	}
+
 	if (bAll || (strcasecmp(sep->arg[1], "worn")==0)) {
 		// Worn items
 		bFound = true;
@@ -3038,14 +3068,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "WornSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "WornSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-				c->Message((item==0), "WornSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "WornSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
@@ -3060,14 +3090,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-				c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
@@ -3079,7 +3109,7 @@
 					item = (instbag) ? instbag->GetItem() : NULL;
 					if (c->GetClientVersion() >= EQClientSoF)
 					{
-						c->Message((item==0), "   InvBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---InvBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3087,7 +3117,7 @@
 					}
 					else
 					{
-						c->Message((item==0), "   InvBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---InvBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3100,7 +3130,7 @@
 		{
 			const ItemInst* inst = client->GetInv().GetItem(9999);
 			item = (inst) ? inst->GetItem() : NULL;
-			c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", 9999,
+			c->Message((item==0), "InvSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", 9999,
 			((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 			((item==0)?"null":item->Name), 0x12,
 			((item==0)?0:inst->GetCharges()));
@@ -3118,12 +3148,12 @@
 		if(client->GetInv().CursorEmpty()) { // Display 'front' cursor slot even if 'empty' (item(30[0]) == null)
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", SLOT_CURSOR,i,
+				c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", SLOT_CURSOR,i,
 					0, 0x12, 0, "null", 0x12, 0);
 			}
 			else
 			{
-				c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", SLOT_CURSOR,i,
+				c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", SLOT_CURSOR,i,
 					0, 0x12, 0, "null", 0x12, 0);
 			}
 		}
@@ -3133,14 +3163,14 @@
 				item = (inst) ? inst->GetItem() : NULL;
 				if (c->GetClientVersion() >= EQClientSoF)
 				{
-					c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", SLOT_CURSOR,i,
+					c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", SLOT_CURSOR,i,
 						((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 						((item==0)?"null":item->Name), 0x12,
 						((item==0)?0:inst->GetCharges()));
 				}
 				else
 				{
-					c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", SLOT_CURSOR,i,
+					c->Message((item==0), "CursorSlot: %i, Depth: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", SLOT_CURSOR,i,
 						((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 						((item==0)?"null":item->Name), 0x12,
 						((item==0)?0:inst->GetCharges()));
@@ -3152,7 +3182,7 @@
 						item = (instbag) ? instbag->GetItem() : NULL;
 						if (c->GetClientVersion() >= EQClientSoF)
 						{
-							c->Message((item==0), "   CursorBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i",
+							c->Message((item==0), "---CursorBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i",
 								Inventory::CalcSlotId(SLOT_CURSOR, j),
 								SLOT_CURSOR, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 								((item==0)?"null":item->Name), 0x12,
@@ -3160,7 +3190,7 @@
 						}
 						else
 						{
-							c->Message((item==0), "   CursorBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i",
+							c->Message((item==0), "---CursorBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i",
 								Inventory::CalcSlotId(SLOT_CURSOR, j),
 								SLOT_CURSOR, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 								((item==0)?"null":item->Name), 0x12,
@@ -3180,14 +3210,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "TributeSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "TributeSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 				((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 				((item==0)?"null":item->Name), 0x12,
 				((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-			c->Message((item==0), "TributeSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+			c->Message((item==0), "TributeSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 				((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 				((item==0)?"null":item->Name), 0x12,
 				((item==0)?0:inst->GetCharges()));
@@ -3204,14 +3234,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "BankSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "BankSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 				((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 				((item==0)?"null":item->Name), 0x12,
 				((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-			c->Message((item==0), "BankSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+			c->Message((item==0), "BankSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 				((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 				((item==0)?"null":item->Name), 0x12,
 				((item==0)?0:inst->GetCharges()));
@@ -3223,7 +3253,7 @@
 					item = (instbag) ? instbag->GetItem() : NULL;
 					if (c->GetClientVersion() >= EQClientSoF)
 					{
-						c->Message((item==0), "   BankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---BankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3231,7 +3261,7 @@
 					}
 					else
 					{
-						c->Message((item==0), "   BankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---BankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3245,14 +3275,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "ShBankSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "ShBankSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-				c->Message((item==0), "ShBankSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "ShBankSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
@@ -3264,7 +3294,7 @@
 					item = (instbag) ? instbag->GetItem() : NULL;
 					if (c->GetClientVersion() >= EQClientSoF)
 					{
-						c->Message((item==0), "   ShBankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---ShBankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3272,7 +3302,7 @@
 					}
 					else
 					{
-						c->Message((item==0), "   ShBankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---ShBankBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3290,14 +3320,14 @@
 			item = (inst) ? inst->GetItem() : NULL;
 			if (c->GetClientVersion() >= EQClientSoF)
 			{
-				c->Message((item==0), "TradeSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "TradeSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
 			}
 			else
 			{
-				c->Message((item==0), "TradeSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i", i,
+				c->Message((item==0), "TradeSlot: %i, Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i", i,
 					((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 					((item==0)?"null":item->Name), 0x12,
 					((item==0)?0:inst->GetCharges()));
@@ -3309,7 +3339,7 @@
 					item = (instbag) ? instbag->GetItem() : NULL;
 					if (c->GetClientVersion() >= EQClientSoF)
 					{
-						c->Message((item==0), "   TradeBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---TradeBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3317,7 +3347,7 @@
 					}
 					else
 					{
-						c->Message((item==0), "   TradeBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Charges: %i",
+						c->Message((item==0), "---TradeBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%c%06X000000000000000000000000000000000000000%s%c), Count: %i",
 							Inventory::CalcSlotId(i, j),
 							i, j, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID),
 							((item==0)?"null":item->Name), 0x12,
@@ -3331,7 +3361,7 @@
 		
 	if (!bFound)
 	{
-		c->Message(0, "Usage: #peekinv [worn|cursor|inv|bank|trade|trib|all]");
+		c->Message(0, "Usage: #peekinv [money|worn|cursor|inv|bank|trade|trib|all]");
 		c->Message(0, "  Displays a portion of the targeted user's inventory");
 		c->Message(0, "  Caution: 'all' is a lot of information!");
 	}
__________________
Uleat of Bertoxxulous

Compilin' Dirty
Reply With Quote