coldsore
/
Server
forked from MagicBane/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revert "use total skill instea dof modified for ATR" 

This reverts commit ab45d92bd1.
lakebane-ai
FatBoy-DOTC 9 months ago
parent
ab45d92bd1
commit
65e391f6f7
16 changed files with 2 additions and 3330 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2499
      .idea/inspectionProfiles/Project_Default.xml
  2. 9
      .idea/libraries/EnumBitSet.xml
  3. 9
      .idea/libraries/HikariCP_4_0_3.xml
  4. 9
      .idea/libraries/JDA_4_2_0_168_withDependencies_min.xml
  5. 9
      .idea/libraries/joda_time_2_3.xml
  6. 9
      .idea/libraries/json.xml
  7. 9
      .idea/libraries/json_simple_1_1_1.xml
  8. 9
      .idea/libraries/mysql_connector_java_8_0_23.xml
  9. 9
      .idea/libraries/tinylog_1_3_5.xml
  10. 6
      .idea/misc.xml
  11. 8
      .idea/modules.xml
  12. 124
      .idea/uiDesigner.xml
  13. 6
      .idea/vcs.xml
  14. 594
      .idea/workspace.xml
  15. 19
      Server.iml
  16. 4
      src/engine/objects/PlayerCombatStats.java

2499
.idea/inspectionProfiles/Project_Default.xml
View File

File diff suppressed because it is too large Load Diff

9
.idea/libraries/EnumBitSet.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="EnumBitSet">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/EnumBitSet.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/HikariCP_4_0_3.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="HikariCP-4.0.3">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/HikariCP-4.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/JDA_4_2_0_168_withDependencies_min.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="JDA-4.2.0_168-withDependencies-min">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/JDA-4.2.0_168-withDependencies-min.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/joda_time_2_3.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="joda-time-2.3">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/joda-time-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/json.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="json">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/json.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/json_simple_1_1_1.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="json-simple-1.1.1">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/json-simple-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/mysql_connector_java_8_0_23.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="mysql-connector-java-8.0.23">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/mysql-connector-java-8.0.23.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/tinylog_1_3_5.xml
Unescape View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="tinylog-1.3.5">
<CLASSES>
<root url="jar://E:/Magicbane Dependencies/tinylog-1.3.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

6
.idea/misc.xml
Unescape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml
Unescape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Server.iml" filepath="$PROJECT_DIR$/Server.iml" />
</modules>
</component>
</project>

124
.idea/uiDesigner.xml
Unescape View File

@ -1,124 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

6
.idea/vcs.xml
Unescape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

594
.idea/workspace.xml
Unescape View File

@ -1,594 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="db966dff-d91a-485f-a998-bb80124fce53" name="Changes" comment="temporary enchant timers" />
<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="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Rebase.Settings">
<option name="NEW_BASE" value="lakebane-master" />
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="lakebane-dex-penalty" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RESET_MODE" value="HARD" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="2ehriaXNTLpJi38eiozIzCJBGHM" />
<component name="ProjectLevelVcsManager">
<OptionsSetting value="false" id="Update" />
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="autoscrollToSource" value="true" />
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;Git.Branch.Popup.ShowAllRemotes&quot;: &quot;true&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-1.8&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/fatbo/IdeaProjects/Server&quot;,
&quot;project.structure.last.edited&quot;: &quot;Libraries&quot;,
&quot;project.structure.proportion&quot;: &quot;0.15&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;run.code.analysis.last.selected.profile&quot;: &quot;aDefault&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.build&quot;
}
}</component>
<component name="RecentsManager">
<key name="MoveMembersDialog.RECENTS_KEY">
<recent name="engine.gameManager.NPCManager" />
<recent name="engine.gameManager.PlayerManager" />
<recent name="engine.wpak.WpakPowerManager" />
<recent name="engine.mobileAI.utilities.CombatUtilities" />
<recent name="engine.workthreads.BoxLimiterThread" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="engine.workthreads" />
<recent name="engine.devcmd.cmds" />
<recent name="engine.mobileAI.Threads" />
<recent name="engine.jobs" />
</key>
</component>
<component name="RunManager" selected="Remote JVM Debug.Lakebane-Test">
<configuration name="Battlebane" type="Remote">
<module name="Server" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="192.151.145.242" />
<option name="PORT" value="5000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
<configuration name="Lakebane - New" type="Remote">
<module name="Server" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="63.141.245.218" />
<option name="PORT" value="5000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
<configuration name="Lakebane-Prod" type="Remote">
<module name="Server" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="63.141.245.218" />
<option name="PORT" value="5000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
<configuration name="Lakebane-Test" type="Remote">
<module name="Server" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="208.110.84.202" />
<option name="PORT" value="5000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
<configuration name="Magicbane-Dev" type="Remote">
<module name="Server" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="63.141.251.154" />
<option name="PORT" value="5000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="5000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
<list>
<item itemvalue="Remote JVM Debug.Lakebane - New" />
<item itemvalue="Remote JVM Debug.Lakebane-Test" />
<item itemvalue="Remote JVM Debug.Battlebane" />
<item itemvalue="Remote JVM Debug.Lakebane-Prod" />
<item itemvalue="Remote JVM Debug.Magicbane-Dev" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="db966dff-d91a-485f-a998-bb80124fce53" name="Changes" comment="" />
<created>1712367779387</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1712367779387</updated>
</task>
<task id="LOCAL-01416" summary="PlayerCombatStats final">
<created>1737515237688</created>
<option name="number" value="01416" />
<option name="presentableId" value="LOCAL-01416" />
<option name="project" value="LOCAL" />
<updated>1737515237688</updated>
</task>
<task id="LOCAL-01417" summary="PlayerCombatStats final">
<created>1737515326661</created>
<option name="number" value="01417" />
<option name="presentableId" value="LOCAL-01417" />
<option name="project" value="LOCAL" />
<updated>1737515326661</updated>
</task>
<task id="LOCAL-01418" summary="PlayerCombatStats proper delays">
<created>1737583501062</created>
<option name="number" value="01418" />
<option name="presentableId" value="LOCAL-01418" />
<option name="project" value="LOCAL" />
<updated>1737583501062</updated>
</task>
<task id="LOCAL-01419" summary="PlayerCombatStats atr">
<created>1737586585870</created>
<option name="number" value="01419" />
<option name="presentableId" value="LOCAL-01419" />
<option name="project" value="LOCAL" />
<updated>1737586585870</updated>
</task>
<task id="LOCAL-01420" summary="PlayerCombatStats atr calculations completed">
<created>1737595111610</created>
<option name="number" value="01420" />
<option name="presentableId" value="LOCAL-01420" />
<option name="project" value="LOCAL" />
<updated>1737595111610</updated>
</task>
<task id="LOCAL-01421" summary="PlayerCombatStats def calculations">
<created>1737597204148</created>
<option name="number" value="01421" />
<option name="presentableId" value="LOCAL-01421" />
<option name="project" value="LOCAL" />
<updated>1737597204148</updated>
</task>
<task id="LOCAL-01422" summary="PlayerCombatStats def calculations completed">
<created>1737600273867</created>
<option name="number" value="01422" />
<option name="presentableId" value="LOCAL-01422" />
<option name="project" value="LOCAL" />
<updated>1737600273867</updated>
</task>
<task id="LOCAL-01423" summary="PlayerCombatStats weapon speed calculations">
<created>1737600787792</created>
<option name="number" value="01423" />
<option name="presentableId" value="LOCAL-01423" />
<option name="project" value="LOCAL" />
<updated>1737600787793</updated>
</task>
<task id="LOCAL-01424" summary="PlayerCombatStats weapon speed calculations complete">
<created>1737601718953</created>
<option name="number" value="01424" />
<option name="presentableId" value="LOCAL-01424" />
<option name="project" value="LOCAL" />
<updated>1737601718953</updated>
</task>
<task id="LOCAL-01425" summary="PlayerCombatStats revision">
<created>1737602931883</created>
<option name="number" value="01425" />
<option name="presentableId" value="LOCAL-01425" />
<option name="project" value="LOCAL" />
<updated>1737602931883</updated>
</task>
<task id="LOCAL-01426" summary="PlayerCombatStats weapon speed enchants applied separately">
<created>1737671907453</created>
<option name="number" value="01426" />
<option name="presentableId" value="LOCAL-01426" />
<option name="project" value="LOCAL" />
<updated>1737671907453</updated>
</task>
<task id="LOCAL-01427" summary="PlayerCombatStats weapon speed enchants applied separately">
<created>1737671961502</created>
<option name="number" value="01427" />
<option name="presentableId" value="LOCAL-01427" />
<option name="project" value="LOCAL" />
<updated>1737671961502</updated>
</task>
<task id="LOCAL-01428" summary="PlayerCombatStats modified skills">
<created>1737687583521</created>
<option name="number" value="01428" />
<option name="presentableId" value="LOCAL-01428" />
<option name="project" value="LOCAL" />
<updated>1737687583521</updated>
</task>
<task id="LOCAL-01429" summary="PlayerCombatStats modified skills">
<created>1737687627428</created>
<option name="number" value="01429" />
<option name="presentableId" value="LOCAL-01429" />
<option name="project" value="LOCAL" />
<updated>1737687627428</updated>
</task>
<task id="LOCAL-01430" summary="PlayerCombatStats modified skills">
<created>1737689810776</created>
<option name="number" value="01430" />
<option name="presentableId" value="LOCAL-01430" />
<option name="project" value="LOCAL" />
<updated>1737689810776</updated>
</task>
<task id="LOCAL-01431" summary="PlayerCombatStats attack delay">
<created>1737720364136</created>
<option name="number" value="01431" />
<option name="presentableId" value="LOCAL-01431" />
<option name="project" value="LOCAL" />
<updated>1737720364136</updated>
</task>
<task id="LOCAL-01432" summary="PlayerCombatStats 30% damage reduction for duel wielding">
<created>1737720488464</created>
<option name="number" value="01432" />
<option name="presentableId" value="LOCAL-01432" />
<option name="project" value="LOCAL" />
<updated>1737720488464</updated>
</task>
<task id="LOCAL-01433" summary="PlayerCombatStats use in combat">
<created>1737721271643</created>
<option name="number" value="01433" />
<option name="presentableId" value="LOCAL-01433" />
<option name="project" value="LOCAL" />
<updated>1737721271643</updated>
</task>
<task id="LOCAL-01434" summary="PlayerCombatStats use in combat">
<created>1737721364029</created>
<option name="number" value="01434" />
<option name="presentableId" value="LOCAL-01434" />
<option name="project" value="LOCAL" />
<updated>1737721364029</updated>
</task>
<task id="LOCAL-01435" summary="PlayerCombatStats proc chances">
<created>1737721775478</created>
<option name="number" value="01435" />
<option name="presentableId" value="LOCAL-01435" />
<option name="project" value="LOCAL" />
<updated>1737721775478</updated>
</task>
<task id="LOCAL-01436" summary="PlayerCombatStats defense formula">
<created>1737813234358</created>
<option name="number" value="01436" />
<option name="presentableId" value="LOCAL-01436" />
<option name="project" value="LOCAL" />
<updated>1737813234359</updated>
</task>
<task id="LOCAL-01437" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737836127709</created>
<option name="number" value="01437" />
<option name="presentableId" value="LOCAL-01437" />
<option name="project" value="LOCAL" />
<updated>1737836127709</updated>
</task>
<task id="LOCAL-01438" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737836404643</created>
<option name="number" value="01438" />
<option name="presentableId" value="LOCAL-01438" />
<option name="project" value="LOCAL" />
<updated>1737836404643</updated>
</task>
<task id="LOCAL-01439" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737836598500</created>
<option name="number" value="01439" />
<option name="presentableId" value="LOCAL-01439" />
<option name="project" value="LOCAL" />
<updated>1737836598500</updated>
</task>
<task id="LOCAL-01440" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737836845709</created>
<option name="number" value="01440" />
<option name="presentableId" value="LOCAL-01440" />
<option name="project" value="LOCAL" />
<updated>1737836845710</updated>
</task>
<task id="LOCAL-01441" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737838131800</created>
<option name="number" value="01441" />
<option name="presentableId" value="LOCAL-01441" />
<option name="project" value="LOCAL" />
<updated>1737838131800</updated>
</task>
<task id="LOCAL-01442" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737844316321</created>
<option name="number" value="01442" />
<option name="presentableId" value="LOCAL-01442" />
<option name="project" value="LOCAL" />
<updated>1737844316321</updated>
</task>
<task id="LOCAL-01443" summary="PlayerCombatStats dex penalty applied correctly">
<created>1737844767422</created>
<option name="number" value="01443" />
<option name="presentableId" value="LOCAL-01443" />
<option name="project" value="LOCAL" />
<updated>1737844767422</updated>
</task>
<task id="LOCAL-01444" summary="defense calc">
<created>1737848384568</created>
<option name="number" value="01444" />
<option name="presentableId" value="LOCAL-01444" />
<option name="project" value="LOCAL" />
<updated>1737848384568</updated>
</task>
<task id="LOCAL-01445" summary="defense calc">
<created>1737848944869</created>
<option name="number" value="01445" />
<option name="presentableId" value="LOCAL-01445" />
<option name="project" value="LOCAL" />
<updated>1737848944869</updated>
</task>
<task id="LOCAL-01446" summary="defense calc">
<created>1737849719778</created>
<option name="number" value="01446" />
<option name="presentableId" value="LOCAL-01446" />
<option name="project" value="LOCAL" />
<updated>1737849719778</updated>
</task>
<task id="LOCAL-01447" summary="defense calc completed">
<created>1737852688835</created>
<option name="number" value="01447" />
<option name="presentableId" value="LOCAL-01447" />
<option name="project" value="LOCAL" />
<updated>1737852688836</updated>
</task>
<task id="LOCAL-01448" summary="defense calc completed">
<created>1737852918588</created>
<option name="number" value="01448" />
<option name="presentableId" value="LOCAL-01448" />
<option name="project" value="LOCAL" />
<updated>1737852918588</updated>
</task>
<task id="LOCAL-01449" summary="defense calc completed">
<created>1737853392783</created>
<option name="number" value="01449" />
<option name="presentableId" value="LOCAL-01449" />
<option name="project" value="LOCAL" />
<updated>1737853392784</updated>
</task>
<task id="LOCAL-01450" summary="100 ms delay between mob spawns">
<created>1737902960502</created>
<option name="number" value="01450" />
<option name="presentableId" value="LOCAL-01450" />
<option name="project" value="LOCAL" />
<updated>1737902960503</updated>
</task>
<task id="LOCAL-01451" summary="allow gimme">
<created>1737903532265</created>
<option name="number" value="01451" />
<option name="presentableId" value="LOCAL-01451" />
<option name="project" value="LOCAL" />
<updated>1737903532266</updated>
</task>
<task id="LOCAL-01452" summary="Phaedra's Fury added to exception list for form break">
<created>1737933275648</created>
<option name="number" value="01452" />
<option name="presentableId" value="LOCAL-01452" />
<option name="project" value="LOCAL" />
<updated>1737933275649</updated>
</task>
<task id="LOCAL-01453" summary="saetor can parry">
<created>1737934513500</created>
<option name="number" value="01453" />
<option name="presentableId" value="LOCAL-01453" />
<option name="project" value="LOCAL" />
<updated>1737934513500</updated>
</task>
<task id="LOCAL-01454" summary="AP applies only to mele damage">
<created>1737934746103</created>
<option name="number" value="01454" />
<option name="presentableId" value="LOCAL-01454" />
<option name="project" value="LOCAL" />
<updated>1737934746103</updated>
</task>
<task id="LOCAL-01455" summary="blood mage fix">
<created>1737937513382</created>
<option name="number" value="01455" />
<option name="presentableId" value="LOCAL-01455" />
<option name="project" value="LOCAL" />
<updated>1737937513383</updated>
</task>
<task id="LOCAL-01456" summary="shade backstabs">
<created>1737939350351</created>
<option name="number" value="01456" />
<option name="presentableId" value="LOCAL-01456" />
<option name="project" value="LOCAL" />
<updated>1737939350351</updated>
</task>
<task id="LOCAL-01457" summary="shade backstabs">
<created>1737940008048</created>
<option name="number" value="01457" />
<option name="presentableId" value="LOCAL-01457" />
<option name="project" value="LOCAL" />
<updated>1737940008049</updated>
</task>
<task id="LOCAL-01458" summary="dex reductions">
<created>1737941339822</created>
<option name="number" value="01458" />
<option name="presentableId" value="LOCAL-01458" />
<option name="project" value="LOCAL" />
<updated>1737941339822</updated>
</task>
<task id="LOCAL-01459" summary="aI delay">
<created>1737992808829</created>
<option name="number" value="01459" />
<option name="presentableId" value="LOCAL-01459" />
<option name="project" value="LOCAL" />
<updated>1737992808830</updated>
</task>
<task id="LOCAL-01460" summary="aI delay">
<created>1737993653916</created>
<option name="number" value="01460" />
<option name="presentableId" value="LOCAL-01460" />
<option name="project" value="LOCAL" />
<updated>1737993653916</updated>
</task>
<task id="LOCAL-01461" summary="aI delay">
<created>1737993837085</created>
<option name="number" value="01461" />
<option name="presentableId" value="LOCAL-01461" />
<option name="project" value="LOCAL" />
<updated>1737993837085</updated>
</task>
<task id="LOCAL-01462" summary="temporary enchant stripping">
<created>1738001281197</created>
<option name="number" value="01462" />
<option name="presentableId" value="LOCAL-01462" />
<option name="project" value="LOCAL" />
<updated>1738001281198</updated>
</task>
<task id="LOCAL-01463" summary="temporary enchant stripping">
<created>1738003570322</created>
<option name="number" value="01463" />
<option name="presentableId" value="LOCAL-01463" />
<option name="project" value="LOCAL" />
<updated>1738003570322</updated>
</task>
<task id="LOCAL-01464" summary="temporary enchant timers">
<created>1738004570958</created>
<option name="number" value="01464" />
<option name="presentableId" value="LOCAL-01464" />
<option name="project" value="LOCAL" />
<updated>1738004570958</updated>
</task>
<option name="localTasksCounter" value="1465" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ID_ORDER">
<list>
<option value="Default.Root" />
<option value="Default.Author" />
<option value="Default.Date" />
<option value="Default.Subject" />
<option value="Space.CommitStatus" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="lakebane" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="PlayerCombatStats def calculations completed" />
<MESSAGE value="PlayerCombatStats weapon speed calculations" />
<MESSAGE value="PlayerCombatStats weapon speed calculations complete" />
<MESSAGE value="PlayerCombatStats revision" />
<MESSAGE value="PlayerCombatStats weapon speed enchants applied separately" />
<MESSAGE value="PlayerCombatStats modified skills" />
<MESSAGE value="PlayerCombatStats attack delay" />
<MESSAGE value="PlayerCombatStats 30% damage reduction for duel wielding" />
<MESSAGE value="PlayerCombatStats use in combat" />
<MESSAGE value="PlayerCombatStats proc chances" />
<MESSAGE value="PlayerCombatStats defense formula" />
<MESSAGE value="PlayerCombatStats dex penalty applied correctly" />
<MESSAGE value="defense calc" />
<MESSAGE value="defense calc completed" />
<MESSAGE value="100 ms delay between mob spawns" />
<MESSAGE value="allow gimme" />
<MESSAGE value="Phaedra's Fury added to exception list for form break" />
<MESSAGE value="saetor can parry" />
<MESSAGE value="AP applies only to mele damage" />
<MESSAGE value="blood mage fix" />
<MESSAGE value="shade backstabs" />
<MESSAGE value="dex reductions" />
<MESSAGE value="aI delay" />
<MESSAGE value="temporary enchant stripping" />
<MESSAGE value="temporary enchant timers" />
<option name="LAST_COMMIT_MESSAGE" value="temporary enchant timers" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/engine/net/client/ClientMessagePump.java</url>
<line>2105</line>
<option name="timeStamp" value="99" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/engine/gameManager/MaintenanceManager.java</url>
<line>68</line>
<option name="timeStamp" value="145" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/engine/objects/CharacterItemManager.java</url>
<line>1152</line>
<option name="timeStamp" value="171" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>

19
Server.iml
Unescape View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="EnumBitSet" level="project" />
<orderEntry type="library" name="HikariCP-4.0.3" level="project" />
<orderEntry type="library" name="JDA-4.2.0_168-withDependencies-min" level="project" />
<orderEntry type="library" name="joda-time-2.3" level="project" />
<orderEntry type="library" name="json-simple-1.1.1" level="project" />
<orderEntry type="library" name="json" level="project" />
<orderEntry type="library" name="mysql-connector-java-8.0.23" level="project" />
<orderEntry type="library" name="tinylog-1.3.5" level="project" />
</component>
</module>

4
src/engine/objects/PlayerCombatStats.java
Unescape View File

@ -123,10 +123,10 @@ public class PlayerCombatStats {
float masteryLevel = 0; float masteryLevel = 0;
if(this.owner.skills.containsKey(skill)) { if(this.owner.skills.containsKey(skill)) {
skillLevel = this.owner.skills.get(skill).getTotalSkillPercet(); skillLevel = this.owner.skills.get(skill).getModifiedAmount();
} }
if(this.owner.skills.containsKey(mastery)) if(this.owner.skills.containsKey(mastery))
masteryLevel = this.owner.skills.get(mastery).getTotalSkillPercet(); masteryLevel = this.owner.skills.get(mastery).getModifiedAmount();
float stanceValue = 0.0f; float stanceValue = 0.0f;
float atrEnchants = 0; float atrEnchants = 0;

Write Preview
Loading…
Cancel
Save