From 8b879ec88fd287a77e721db3f9963499b22f82ac Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 25 Aug 2019 00:35:01 -0300
Subject: Market version bump

---
 localserver/beta.patch2 | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'localserver')

diff --git a/localserver/beta.patch2 b/localserver/beta.patch2
index 90102d8..33f872a 100644
--- a/localserver/beta.patch2
+++ b/localserver/beta.patch2
@@ -11,9 +11,29 @@ index fe7a64b51..f9066fcb8 100644
  
  static bool battle_set_value_sub(int index, int value)
 diff --git a/src/map/npc.c b/src/map/npc.c
-index 4b79a9fed..8196460f7 100644
+index 4b79a9fed..e11f00b2a 100644
 --- a/src/map/npc.c
 +++ b/src/map/npc.c
+@@ -2069,9 +2069,6 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
+ 		w += itemdb_weight(entry->id) * entry->amount;
+ 	}
+ 
+-	if (nd->master_nd != NULL) //Script-based shops.
+-		return npc->buylist_sub(sd, item_list, nd->master_nd);
+-
+ 	if (z > sd->status.zeny)
+ 		return 1; // Not enough Zeny
+ 	if( w + sd->weight > sd->max_weight )
+@@ -2108,6 +2105,9 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
+ 		}
+ 	}
+ 
++	if (nd->master_nd != NULL) // TMW2 Script-based shops.
++		return npc->buylist_sub(sd, item_list, nd->master_nd);
++
+ 	return 0;
+ }
+ 
 @@ -2178,6 +2178,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
  				return 1;
  		}
@@ -24,6 +44,16 @@ index 4b79a9fed..8196460f7 100644
  		z += (int64)value * entry->amount;
  		w += itemdb_weight(entry->id) * entry->amount;
  	}
+@@ -2217,6 +2220,9 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
+ 		}
+ 	}
+ 
++	if (nd->master_nd != NULL) // TMW2 Script-based shops.
++		return npc->buylist_sub(sd, item_list, nd->master_nd);
++
+ 	return 0;
+ }
+ 
 diff --git a/src/map/rodex.c b/src/map/rodex.c
 index 766fdc5ea..996576fd3 100644
 --- a/src/map/rodex.c
-- 
cgit v1.2.3-60-g2f50