diff --git a/mbEditorPro2.0/arcane/zones/mobile/MerchantInfo.py b/mbEditorPro2.0/arcane/zones/mobile/MerchantInfo.py index 727eec0..349ebb7 100644 --- a/mbEditorPro2.0/arcane/zones/mobile/MerchantInfo.py +++ b/mbEditorPro2.0/arcane/zones/mobile/MerchantInfo.py @@ -48,3 +48,28 @@ class MerchantInfo(MobileInfo): for l in self.merchant_sell_list: stream.write_qword(l[0]) stream.write_dword(l[1]) + + def save_json(self): + data = super().save_json() + data['merchant_trade_type'] = self.merchant_trade_type + data['merchant_std_buy_margin'] = self.merchant_std_buy_margin + data['merchant_std_sell_margin'] = self.merchant_std_sell_margin + data['merchant_guild_buy_margin'] = self.merchant_guild_buy_margin + data['merchant_guild_sell_margin'] = self.merchant_guild_sell_margin + data['merchant_nation_buy_margin'] = self.merchant_nation_buy_margin + data['merchant_nation_sell_margin'] = self.merchant_nation_sell_margin + data['merchant_buy_list'] = self.merchant_buy_list + data['merchant_sell_list'] = self.merchant_sell_list + return data + + def load_json(self, data): + super().load_json(data) + self.merchant_trade_type = data['merchant_trade_type'] + self.merchant_std_buy_margin = data['merchant_std_buy_margin'] + self.merchant_std_sell_margin = data['merchant_std_sell_margin'] + self.merchant_guild_buy_margin = data['merchant_guild_buy_margin'] + self.merchant_guild_sell_margin = data['merchant_guild_sell_margin'] + self.merchant_nation_buy_margin = data['merchant_nation_buy_margin'] + self.merchant_nation_sell_margin = data['merchant_nation_sell_margin'] + self.merchant_buy_list = data['merchant_buy_list'] + self.merchant_sell_list = data['merchant_sell_list'] diff --git a/mbEditorPro2.0/arcane/zones/mobile/ShopKeeperInfo.py b/mbEditorPro2.0/arcane/zones/mobile/ShopKeeperInfo.py index 2b2e3e2..b0396f5 100644 --- a/mbEditorPro2.0/arcane/zones/mobile/ShopKeeperInfo.py +++ b/mbEditorPro2.0/arcane/zones/mobile/ShopKeeperInfo.py @@ -46,3 +46,26 @@ class ShopKeeperInfo(MobileInfo): for l in self.shopkeeper_sell_list: stream.write_qword(l[0]) stream.write_dword(l[1]) + + def save_json(self): + data = super().save_json() + data['shopkeeper_shop_type'] = self.shopkeeper_shop_type + data['shopkeeper_start_gold'] = self.shopkeeper_start_gold + data['shopkeeper_std_buy_percent'] = self.shopkeeper_std_buy_percent + data['shopkeeper_std_sell_percent'] = self.shopkeeper_std_sell_percent + data['shopkeeper_nation_buy_percent'] = self.shopkeeper_nation_buy_percent + data['shopkeeper_nation_sell_percent'] = self.shopkeeper_nation_sell_percent + data['shopkeeper_buy_list'] = self.shopkeeper_buy_list + data['shopkeeper_sell_list'] = self.shopkeeper_sell_list + return data + + def load_json(self, data): + super().load_json(data) + self.shopkeeper_shop_type = data['shopkeeper_shop_type'] + self.shopkeeper_start_gold = data['shopkeeper_start_gold'] + self.shopkeeper_std_buy_percent = data['shopkeeper_std_buy_percent'] + self.shopkeeper_std_sell_percent = data['shopkeeper_std_sell_percent'] + self.shopkeeper_nation_buy_percent = data['shopkeeper_nation_buy_percent'] + self.shopkeeper_nation_sell_percent = data['shopkeeper_nation_sell_percent'] + self.shopkeeper_buy_list = data['shopkeeper_buy_list'] + self.shopkeeper_sell_list = data['shopkeeper_sell_list']