API tools faq
paste
Advertisement
Guest User

TEST

a guest
Apr 5th, 2019
137
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 10.04 KB | None | 0 0
raw download clone embed print report
  1. ### Eclipse Workspace Patch 1.0
  2. #P Core
  3. Index: java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListBuy.java
  4. ===================================================================
  5. --- java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListBuy.java (revision 17)
  6. +++ java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListBuy.java (working copy)
  7. @@ -34,7 +34,7 @@
  8. public PrivateStoreListBuy(L2PcInstance player, L2PcInstance storePlayer)
  9. {
  10. _objId = storePlayer.getObjectId();
  11. - _playerAdena = player.getAdena();
  12. + _playerAdena = player.getBuyStoreCurrency();
  13. storePlayer.getSellList().updateItems(); // Update SellList for case inventory content has changed
  14. _items = storePlayer.getBuyList().getAvailableItems(player.getInventory());
  15. }
  16. Index: java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListSell.java
  17. ===================================================================
  18. --- java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListSell.java (revision 17)
  19. +++ java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreListSell.java (working copy)
  20. @@ -31,7 +31,7 @@
  21. public PrivateStoreListSell(L2PcInstance player, L2PcInstance storePlayer)
  22. {
  23. _objId = storePlayer.getObjectId();
  24. - _playerAdena = player.getAdena();
  25. + _playerAdena = player.getSellStoreCurrency();
  26. _items = storePlayer.getSellList().getItems();
  27. _packageSale = storePlayer.getSellList().isPackaged();
  28. }
  29. Index: java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
  30. ===================================================================
  31. --- java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListBuy.java (revision 17)
  32. +++ java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListBuy.java (working copy)
  33. @@ -32,7 +32,7 @@
  34. public PrivateStoreManageListBuy(L2PcInstance player)
  35. {
  36. _objId = player.getObjectId();
  37. - _playerAdena = player.getAdena();
  38. + _playerAdena = player.getBuyStoreCurrency();
  39. _itemList = player.getInventory().getUniqueItems(false, true);
  40. _buyList = player.getBuyList().getItems();
  41. }
  42. Index: java/l2j/crimmer/gameserver/model/itemcontainer/PcInventory.java
  43. ===================================================================
  44. --- java/l2j/crimmer/gameserver/model/itemcontainer/PcInventory.java (revision 17)
  45. +++ java/l2j/crimmer/gameserver/model/itemcontainer/PcInventory.java (working copy)
  46. @@ -25,7 +25,6 @@
  47. import java.util.logging.Logger;
  48.  
  49. import javolution.util.FastList;
  50. -
  51. import l2j.crimmer.Config;
  52. import l2j.crimmer.L2DatabaseFactory;
  53. import l2j.crimmer.gameserver.datatables.ItemTable;
  54. @@ -141,14 +140,19 @@
  55. {
  56. continue;
  57. }
  58. - if ((!allowAdena && (item.getItemId() == ADENA_ID)))
  59. + final int itemId = item.getItemId();
  60. + if ((!allowAdena && (itemId == ADENA_ID)))
  61. {
  62. continue;
  63. }
  64. - if ((!allowAncientAdena && (item.getItemId() == ANCIENT_ADENA_ID)))
  65. + if ((!allowAncientAdena && (itemId == ANCIENT_ADENA_ID)))
  66. {
  67. continue;
  68. }
  69. + if (itemId == Config.STORE_BUY_CURRENCY)
  70. + {
  71. + continue;
  72. + }
  73. boolean isDuplicate = false;
  74. for (L2ItemInstance litem : list)
  75. {
  76. Index: java/l2j/crimmer/gameserver/model/actor/instance/L2PcInstance.java
  77. ===================================================================
  78. --- java/l2j/crimmer/gameserver/model/actor/instance/L2PcInstance.java (revision 40)
  79. +++ java/l2j/crimmer/gameserver/model/actor/instance/L2PcInstance.java (working copy)
  80. @@ -6375,6 +6375,25 @@
  81. }
  82.  
  83. /**
  84. + * TODO: Private Story Currency variables
  85. + * @author ThiagoPrati
  86. + * @return
  87. + */
  88. + public synchronized long getBuyStoreCurrency()
  89. + {
  90. + L2ItemInstance item = this.getInventory().getItemByItemId(Config.STORE_BUY_CURRENCY);
  91. +
  92. + return item == null ? 0 : item.getCount();
  93. + }
  94. +
  95. + public synchronized long getSellStoreCurrency()
  96. + {
  97. + L2ItemInstance item = this.getInventory().getItemByItemId(Config.STORE_SELL_CURRENCY);
  98. +
  99. + return item == null ? 0 : item.getCount();
  100. + }
  101. +
  102. + /**
  103. * TODO: Unhardcode by implementing Lucky effect (Support for effects on passive skills required).
  104. * @return Returns {@code true} if player has Lucky skill and is level 9 or less.
  105. */
  106. Index: java/l2j/crimmer/Config.java
  107. ===================================================================
  108. --- java/l2j/crimmer/Config.java (revision 47)
  109. +++ java/l2j/crimmer/Config.java (working copy)
  110. @@ -799,6 +799,8 @@
  111. // --------------------------------------------------
  112. // Custom Settings
  113. // --------------------------------------------------
  114. + public static int STORE_BUY_CURRENCY;
  115. + public static int STORE_SELL_CURRENCY;
  116.  
  117. // --------------------------------------------------
  118. // NPC Settings
  119. @@ -2802,6 +2804,8 @@
  120. {
  121. _log.log(Level.SEVERE, "Error while loading Crimmer settings!", e);
  122. }
  123. + STORE_BUY_CURRENCY = Integer.parseInt(Crimmer.getProperty("PrivateStoreBuyMoneda", "57"));
  124. + STORE_SELL_CURRENCY = Integer.parseInt(Crimmer.getProperty("PrivateStoreSellMoneda", "57"));
  125.  
  126. // Load Olympiad L2Properties file (if exists)
  127. final File oly = new File(OLYMPIAD_CONFIG_FILE);
  128. Index: dist/game/config/InGame/Custom.properties
  129. ===================================================================
  130. --- dist/game/config/InGame/Custom.properties (revision 47)
  131. +++ dist/game/config/InGame/Custom.properties (working copy)
  132. @@ -2,4 +2,12 @@
  133. # Custom - non-retail-like systems that have been integrated into the L2J project.
  134. # Be warned that there may be no support for these mods beyond the original author's assistance.
  135. # ---------------------------------------------------------------------------
  136. +# Private Store Buy/Sell - Trade Item
  137. +# ---------------------------------------------------------------------------
  138. +# Choose the item for use in the Private Store Buy (Yellow)
  139. +# Retail: 57
  140. +PrivateStoreBuyMoneda = 57
  141.  
  142. +# Choose the item for use in the Private Store Sell (Purple)
  143. +# Retail: 57
  144. +PrivateStoreSellMoneda = 57
  145. \ No newline at end of file
  146. Index: java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListSell.java
  147. ===================================================================
  148. --- java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListSell.java (revision 17)
  149. +++ java/l2j/crimmer/gameserver/network/serverpackets/PrivateStoreManageListSell.java (working copy)
  150. @@ -32,7 +32,7 @@
  151. public PrivateStoreManageListSell(L2PcInstance player, boolean isPackageSale)
  152. {
  153. _objId = player.getObjectId();
  154. - _playerAdena = player.getAdena();
  155. + _playerAdena = player.getSellStoreCurrency();
  156. player.getSellList().updateItems();
  157. _packageSale = isPackageSale;
  158. _itemList = player.getInventory().getAvailableItems(player.getSellList());
  159. Index: java/l2j/crimmer/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
  160. ===================================================================
  161. --- java/l2j/crimmer/gameserver/network/clientpackets/SetPrivateStoreListBuy.java (revision 17)
  162. +++ java/l2j/crimmer/gameserver/network/clientpackets/SetPrivateStoreListBuy.java (working copy)
  163. @@ -19,7 +19,6 @@
  164. package l2j.crimmer.gameserver.network.clientpackets;
  165.  
  166. import static l2j.crimmer.gameserver.model.itemcontainer.PcInventory.MAX_ADENA;
  167. -
  168. import l2j.crimmer.Config;
  169. import l2j.crimmer.gameserver.model.TradeList;
  170. import l2j.crimmer.gameserver.model.actor.instance.L2PcInstance;
  171. @@ -143,7 +142,7 @@
  172. }
  173.  
  174. // Check for available funds
  175. - if (totalCost > player.getAdena())
  176. + if (totalCost > player.getBuyStoreCurrency())
  177. {
  178. player.sendPacket(new PrivateStoreManageListBuy(player));
  179. player.sendPacket(SystemMessageId.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY);
  180. Index: java/l2j/crimmer/gameserver/model/TradeList.java
  181. ===================================================================
  182. --- java/l2j/crimmer/gameserver/model/TradeList.java (revision 17)
  183. +++ java/l2j/crimmer/gameserver/model/TradeList.java (working copy)
  184. @@ -25,7 +25,6 @@
  185.  
  186. import javolution.util.FastList;
  187. import javolution.util.FastSet;
  188. -
  189. import l2j.crimmer.Config;
  190. import l2j.crimmer.gameserver.datatables.ItemTable;
  191. import l2j.crimmer.gameserver.model.actor.instance.L2PcInstance;
  192. @@ -771,9 +770,10 @@
  193. }
  194. }
  195.  
  196. - if (totalPrice > playerInventory.getAdena())
  197. + if (totalPrice > player.getBuyStoreCurrency())
  198. {
  199. - player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
  200. + final String name = ItemTable.getInstance().getTemplate(Config.STORE_BUY_CURRENCY).getName();
  201. + player.sendMessage("You dont have enough " + name);
  202. return 1;
  203. }
  204.  
  205. @@ -793,15 +793,16 @@
  206. final InventoryUpdate ownerIU = new InventoryUpdate();
  207. final InventoryUpdate playerIU = new InventoryUpdate();
  208.  
  209. - final L2ItemInstance adenaItem = playerInventory.getAdenaInstance();
  210. - if (!playerInventory.reduceAdena("PrivateStore", totalPrice, player, _owner))
  211. + final int moneda = Config.STORE_BUY_CURRENCY;
  212. + final L2ItemInstance adenaItem = playerInventory.getItemByItemId(moneda);
  213. + if (!player.destroyItemByItemId("PrivateStore", moneda, totalPrice, _owner, true))
  214. {
  215. player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
  216. return 1;
  217. }
  218. playerIU.addItem(adenaItem);
  219. - ownerInventory.addAdena("PrivateStore", totalPrice, _owner, player);
  220. - // ownerIU.addItem(ownerInventory.getAdenaInstance());
  221. + ownerInventory.addItem("PrivateStore", moneda, totalPrice, _owner, player);
  222. + ownerIU.addItem(ownerInventory.getItemByItemId(moneda));
  223.  
  224. boolean ok = true;
  225.  
  226. @@ -962,7 +963,7 @@
  227. break;
  228. }
  229.  
  230. - if (ownerInventory.getAdena() < _totalPrice)
  231. + if (_owner.getSellStoreCurrency() < _totalPrice)
  232. {
  233. continue;
  234. }
  235. @@ -1065,11 +1066,12 @@
  236. // should not happens, just a precaution
  237. return false;
  238. }
  239. - final L2ItemInstance adenaItem = ownerInventory.getAdenaInstance();
  240. - ownerInventory.reduceAdena("PrivateStore", totalPrice, _owner, player);
  241. + final int moneda = Config.STORE_SELL_CURRENCY;
  242. + final L2ItemInstance adenaItem = ownerInventory.getItemByItemId(moneda);
  243. + ownerInventory.destroyItemByItemId("PrivateStore", moneda, totalPrice, _owner, player);
  244. ownerIU.addItem(adenaItem);
  245. - playerInventory.addAdena("PrivateStore", totalPrice, player, _owner);
  246. - playerIU.addItem(playerInventory.getAdenaInstance());
  247. + playerInventory.addItem("PrivateStore", moneda, totalPrice, player, _owner);
  248. + playerIU.addItem(playerInventory.getItemByItemId(moneda));
  249. }
  250.  
  251. if (ok)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!