2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fixup shops

Browse Source
This commit is contained in:
RedSparr0w
2019-11-22 21:23:36 +13:00
parent abc3a9859f
commit d6ec93b199
32 changed files with 29 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+24 -109
View File
@@ -8,12 +8,33 @@
<component name="ChangeListManager">
<list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/data/logs/shopbuying/bot.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/content/combat/CombatAssistant.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/Bot.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/Bot.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/BotConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/BotConstants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/BotHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/bots/BotHandler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopAssistant.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopAssistant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopHandler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/Constants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/Constants.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Client.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Player.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Player.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/players/Trading.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/ActionSender.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/ActionSender.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -21,61 +42,9 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/shops/ShopAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="618">
<caret line="396" column="115" selection-start-line="396" selection-start-column="115" selection-end-line="396" selection-end-column="115" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404">
<caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/util/Misc.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>math.sq</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-7" />
<option name="width" value="1294" />
@@ -163,50 +132,12 @@
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="0" width="974" height="1047" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.25" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.032822758" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Messages" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
<window_info anchor="right" id="Palette" order="2" />
<window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
<window_info anchor="right" id="Maven" order="4" />
<window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
</layout>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
@@ -228,20 +159,4 @@
</map>
</option>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/players/Trading.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="404">
<caret line="74" column="108" lean-forward="true" selection-start-line="74" selection-start-column="108" selection-end-line="74" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/2006Redone Server/src/redone/game/content/combat/CombatAssistant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="2066" column="71" selection-start-line="2066" selection-start-column="71" selection-end-line="2066" selection-end-column="71" />
</state>
</provider>
</entry>
</component>
</project>
2006Redone Server/src/redone/game/bots/Bot.java
-1
View File
@@ -1,6 +1,5 @@
package redone.game.bots;
import redone.Server;
import redone.game.players.Client;
import redone.game.players.Player;
2006Redone Server/src/redone/game/bots/BotConstants.java
+1 -2
View File
@@ -1,6 +1,5 @@
package redone.game.bots;
public class BotConstants
{
public class BotConstants {
public static final int MAX_BOTS = 100;
}
2006Redone Server/src/redone/game/bots/BotHandler.java
-2
View File
@@ -2,10 +2,8 @@ package redone.game.bots;
import redone.Constants;
import redone.game.players.Client;
import redone.game.players.Player;
import redone.game.players.PlayerHandler;
import redone.game.shops.ShopHandler;
import redone.util.Misc;
import java.security.SecureRandom;
import java.util.ArrayList;
2006Redone Server/src/redone/game/shops/ShopAssistant.java
+4 -4
View File
@@ -26,7 +26,7 @@ public class ShopAssistant {
public static final int RANGE_SHOP = 111, PEST_SHOP = 175, CASTLE_SHOP = 112;
public boolean shopSellsItem(int itemID) {
for (int i = 0; i < ShopHandler.ShopItems.length; i++) {
for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) {
if (itemID == ShopHandler.ShopItems[player.myShopId][i] - 1) {
return true;
}
@@ -82,7 +82,7 @@ public class ShopAssistant {
player.getOutStream().writeWord(3900);
player.getOutStream().writeWord(player.TotalShopItems);
int TotalCount = 0;
for (int i = 0; i < ShopHandler.ShopItems.length; i++)
for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++)
{
if (ShopHandler.ShopItems[ShopID][i] > 0
|| i <= ShopHandler.ShopItemsStandard[ShopID])
@@ -449,14 +449,14 @@ public class ShopAssistant {
if (Item.itemIsNote[itemID]) {
itemID = player.getItemAssistant().getUnnotedItem(itemID);
}
for (int i = 0; i < ShopHandler.ShopItems.length; i++) {
for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) {
if (ShopHandler.ShopItems[player.myShopId][i] - 1 == itemID) {
ShopHandler.ShopItemsN[player.myShopId][i] += amount;
Added = true;
}
}
if (Added == false) {
for (int i = 0; i < ShopHandler.ShopItems.length; i++) {
for (int i = 0; i < ShopHandler.ShopItems[player.myShopId].length; i++) {
if (ShopHandler.ShopItems[player.myShopId][i] == 0) {
ShopHandler.ShopItems[player.myShopId][i] = itemID + 1;
ShopHandler.ShopItemsN[player.myShopId][i] = amount;
2006Redone Server/src/redone/game/shops/ShopHandler.java
-2
View File
@@ -179,8 +179,6 @@ public class ShopHandler {
player.myShopId = id;
ShopSModifier[id] = 0;
ShopName[id] = player.properName + "'s Store";
ShopItems[id][0] = 2;
ShopItemsN[id][0] = 1;
TotalShops++;
}
CompiledServer/production/2006rebotted/redone/Constants.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/bots/Bot.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/bots/BotConstants.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/items/ItemAssistant.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/npcs/Npc.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Client$2.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Client$3.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Client$4.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Client.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Player.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Trading$1.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/players/Trading.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/net/ActionSender.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/net/ConnectionHandler.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands$1.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/net/packets/impl/Commands.class
BIN
View File
Binary file not shown.
CompiledServer/production/2006rebotted/redone/net/packets/impl/IdleLogout.class
BIN
View File
Binary file not shown.