mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
Gptaqbc
dcc7984e27
* Update NpcHandler.class Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it. Still have some issue around objects but that's another story. * Update NpcHandler.java Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it. Still have some issue around objects but that's another story. closes #47 * Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix - Added buy/sell X feature - Fixed a lag with the buying loop when buying high amount. Instead of spam buying 1 at a times it divide the amount to buy in equal parts and buy in increments. - Cant remember at all I'll edit after eating. * Removing double sell message "You sold x items for x gp". Removing double sell message "You sold x items for x gp". * Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice * reverting stuff I broke in this file reverting stuff I broke in this file * Teleother fixed Teleother fixed. * fixed an issue I forgot to test :) fixed an issue I forgot to test :)
242 lines
12 KiB
XML
242 lines
12 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="ArtifactsWorkspaceSettings">
|
|
<artifacts-to-build>
|
|
<artifact name="localhost_2006rebotted:jar" />
|
|
</artifacts-to-build>
|
|
</component>
|
|
<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$/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" />
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<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="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
|
|
<component name="PropertiesComponent">
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
|
|
<property name="project.structure.last.edited" value="Project" />
|
|
<property name="project.structure.proportion" value="0.15" />
|
|
<property name="project.structure.side.proportion" value="0.2" />
|
|
</component>
|
|
<component name="RunDashboard">
|
|
<option name="ruleStates">
|
|
<list>
|
|
<RuleState>
|
|
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
</RuleState>
|
|
<RuleState>
|
|
<option name="name" value="StatusDashboardGroupingRule" />
|
|
</RuleState>
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="RunManager" selected="Application.Server">
|
|
<configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="Client" />
|
|
<module name="2006rebotted" />
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<configuration name="FileServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="org.apollo.jagcached.FileServer" />
|
|
<module name="2006rebotted" />
|
|
<option name="WORKING_DIRECTORY" value="2006Redone file_server" />
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<option name="PATTERN" value="org.apollo.jagcached.*" />
|
|
<option name="ENABLED" value="true" />
|
|
</pattern>
|
|
</extension>
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="redone.Server" />
|
|
<module name="2006rebotted" />
|
|
<option name="WORKING_DIRECTORY" value="2006Redone Server" />
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<option name="PATTERN" value="redone.*" />
|
|
<option name="ENABLED" value="true" />
|
|
</pattern>
|
|
</extension>
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<list>
|
|
<item itemvalue="Application.FileServer" />
|
|
<item itemvalue="Application.Server" />
|
|
<item itemvalue="Application.Client" />
|
|
</list>
|
|
<recent_temporary>
|
|
<list>
|
|
<item itemvalue="Application.Server" />
|
|
<item itemvalue="Application.FileServer" />
|
|
<item itemvalue="Application.Client" />
|
|
</list>
|
|
</recent_temporary>
|
|
</component>
|
|
<component name="SvnConfiguration">
|
|
<configuration />
|
|
</component>
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="e34c4650-a3c9-498e-b05e-c1cbb72d0ad7" name="Default Changelist" comment="" />
|
|
<created>1572306880139</created>
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1572306880139</updated>
|
|
</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	" 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>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
<option name="RECENT_FILTERS">
|
|
<map>
|
|
<entry key="Branch">
|
|
<value>
|
|
<list />
|
|
</value>
|
|
</entry>
|
|
<entry key="User">
|
|
<value>
|
|
<list />
|
|
</value>
|
|
</entry>
|
|
</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> |