# HG changeset patch
# User Asa Ayers <Asa.Ayers@Gmail.com>
# Date 1281582185 25200
# Node ID e2dab8e34b327eb2e0ec9ab048fb75d9469491f0
# Parent  fab2c434160201730feca25011f16177c87e08e0
Fixed an issue where trading an item and gold in exchange for a different item was not considering the gold in the price of the new item.

diff -r fab2c4341602 -r e2dab8e34b32 CHANGELOG.txt
--- a/CHANGELOG.txt	Wed Aug 11 00:09:16 2010 -0700
+++ b/CHANGELOG.txt	Wed Aug 11 20:03:05 2010 -0700
@@ -1,3 +1,7 @@
+2010-08-11  Asa Ayers  <Asa.Ayers@Gmail.com>
+
+- Fixed an issue where trading an item and gold in exchange for a different item was not considering the gold in the price of the new item.
+
 2010-08-10  Asa Ayers  <Asa.Ayers@Gmail.com>
 
 - Changed the ArkInventory rule to consider items with no competition to be profitable.
diff -r fab2c4341602 -r e2dab8e34b32 Modules/Events.lua
--- a/Modules/Events.lua	Wed Aug 11 00:09:16 2010 -0700
+++ b/Modules/Events.lua	Wed Aug 11 20:03:05 2010 -0700
@@ -290,6 +290,7 @@
 			
 			totalChange = totalChange + (itemCost * abs(change))
 		end
+		totalChange = totalChange - diff.money
 		
 		distributeValue(self, totalChange, positive)
 	else