Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 4 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
View
6 .idea/libraries/lwjgl.xml
@@ -2,9 +2,9 @@
<library name="lwjgl">
<CLASSES>
<root url="jar://$PROJECT_DIR$/libroguelike/lib/rlforj.0.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.8.3/jar/lwjgl_util.jar!/" />
- <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.8.3/jar/lwjgl.jar!/" />
- <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.8.3/jar/jinput.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.7.1/jar/jinput.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.7.1/jar/lwjgl.jar!/" />
+ <root url="jar://$PROJECT_DIR$/libroguelike/lib/lwjgl-2.7.1/jar/lwjgl_util.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
View
284 .idea/workspace.xml
@@ -6,7 +6,7 @@
</artifacts-to-build>
</component>
<component name="BookmarkManager">
- <bookmark url="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/combat/RLCombat.java" line="101" />
+ <bookmark url="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/combat/RLCombat.java" line="119" />
</component>
<component name="ChangeListManager">
<list default="true" id="fe8928b9-c58b-49c4-bf18-f2d95651fedd" name="Default" comment="" />
@@ -26,10 +26,8 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <method_breakpoints>
- <breakpoint url="jar://C:/Program Files/Java/jdk1.6.0_24/src.zip!/java/lang/Object.java" line="231" class="java.lang.Object" package="java.lang">
- <option name="WATCH_ENTRY" value="true" />
- <option name="WATCH_EXIT" value="true" />
+ <line_breakpoints>
+ <breakpoint url="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/vgui/effects/FXTextBubble.java" line="7" class="FXTextBubble.java" package="">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -39,10 +37,23 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="&#13;&#13;JAVA" />
- <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
</breakpoint>
- </method_breakpoints>
+ <breakpoint url="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/Game.java" line="40" class="com.nuclearunicorn.libroguelike.core.Game" package="com.nuclearunicorn.libroguelike.core">
+ <option name="ENABLED" value="true" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -56,8 +67,8 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="&#13;&#13;JAVA" />
- <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
</breakpoint>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -71,8 +82,8 @@
<option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="&#13;&#13;JAVA" />
- <option name="LOG_MESSAGE" value="&#13;&#13;JAVA" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
</breakpoint>
</breakpoint_any>
<breakpoint_rules />
@@ -90,35 +101,16 @@
<property name="field_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByClasses" value="true" />
<property name="exception_breakpoints_viewId" value="TABLE" />
- <property name="exception_breakpoints_groupByClasses" value="true" />
<property name="field_breakpoints_viewId" value="TABLE" />
+ <property name="exception_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
<component name="FavoritesManager">
<favorites_list name="jskiller" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="MainMenuUI.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuUI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="51" column="76" selection-start="1758" selection-end="1758" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RLCombat.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/combat/RLCombat.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="136" column="64" selection-start="3903" selection-end="3903" vertical-scroll-proportion="0.70873785">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -133,33 +125,30 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/vgui/VGUIDetailedNPCInformation.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ai/BasicMobAI.java" />
- <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/ai/PoliceAI.java" />
+ <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/world/entities/EntityRLHuman.java" />
+ <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/social/CrimeRecord.java" />
<option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/generators/TownChunkGenerator.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/vgui/NE_GUI_Button.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/IUserInterface.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/Game.java" />
- <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuMode.java" />
+ <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/generators/NPCGenerator.java" />
<option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/in_game/InGameMode.java" />
<option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/SkillerGame.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/MainMenuUI.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/DefaultUI.java" />
- <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/GameUI.java" />
- <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/in_game/InGameUI.java" />
+ <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/vgui/VGUICreateCharacterScreeen.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ent/EntityManager.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/events/EventManager.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/world/WorldModel.java" />
+ <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/Main.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/client/ClientGameEnvironment.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/world/layers/WorldLayer.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/Game.java" />
<option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuUI.java" />
- <option value="$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/combat/RLCombat.java" />
+ <option value="$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/GameEnvironment.java" />
</list>
</option>
</component>
- <component name="MavenRunner">
- <option name="jreName" value="1.6" />
- </component>
<component name="ProjectFrameBounds">
<option name="x" value="-4" />
<option name="y" value="-4" />
- <option name="width" value="1928" />
- <option name="height" value="1088" />
+ <option name="width" value="1608" />
+ <option name="height" value="861" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -187,6 +176,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -431,7 +421,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
<pane id="PackagesPane">
<subPane>
<PATH>
@@ -450,21 +439,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="libroguelike" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jskiller" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="libroguelike" />
+ <option name="myItemId" value="serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="com.nuclearunicorn.libroguelike" />
+ <option name="myItemId" value="com.nuclearunicorn.serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -478,11 +457,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="libroguelike" />
+ <option name="myItemId" value="serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="com.nuclearunicorn.libroguelike" />
+ <option name="myItemId" value="com.nuclearunicorn.serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
@@ -492,26 +471,36 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="libroguelike" />
+ <option name="myItemId" value="serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="com.nuclearunicorn.libroguelike" />
+ <option name="myItemId" value="com.nuclearunicorn.serialkiller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="game" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jskiller" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="libroguelike" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
- <property name="project.structure.last.edited" value="Libraries" />
+ <property name="project.structure.last.edited" value="Facets" />
<property name="project.structure.proportion" value="0.15" />
<property name="OverrideImplement.combined" value="true" />
<property name="options.splitter.main.proportions" value="0.3" />
@@ -522,17 +511,17 @@
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="project.structure.side.proportion" value="0.2" />
- <property name="GenerateAntBuildDialog.outputFileNameProperty" value="jskiller" />
- <property name="MemberChooser.copyJavadoc" value="false" />
<property name="GoToClass.includeJavaFiles" value="false" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="GenerateAntBuildDialog.outputFileNameProperty" value="jskiller" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
- <property name="GenerateAntBuildDialog.backupFiles" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="options.searchVisible" value="true" />
- <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="GenerateAntBuildDialog.backupFiles" value="true" />
<property name="dynamic.classpath" value="false" />
+ <property name="options.splitter.details.proportions" value="0.2" />
+ <property name="options.searchVisible" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -543,11 +532,11 @@
<recent name="D:\DEV\jskiller\libroguelike\src\com\nuclearunicorn\libroguelike\utils\pathfinder" />
</key>
<key name="CreateClassDialog.RecentsKey">
+ <recent name="com.nuclearunicorn.serialkiller.generators" />
+ <recent name="com.nuclearunicorn.serialkiller.game.social" />
<recent name="com.nuclearunicorn.serialkiller.game.events" />
<recent name="com.nuclearunicorn.serialkiller.game" />
<recent name="com.nuclearunicorn.serialkiller.game.world" />
- <recent name="com.nuclearunicorn.serialkiller.render" />
- <recent name="com.nuclearunicorn.serialkiller.game.entities" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="org.newdawn.slick" />
@@ -571,11 +560,11 @@
</configuration>
<configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
<option name="MAIN_CLASS_NAME" value="com.nuclearunicorn.serialkiller.game.Main" />
- <option name="VM_PARAMETERS" value="-Djava.library.path=./libroguelike/lib/lwjgl-2.8.3/native/windows" />
+ <option name="VM_PARAMETERS" value="-Djava.library.path=./libroguelike/lib/lwjgl-2.7.1/native/windows" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
- <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.6.0_24" />
+ <option name="ALTERNATIVE_JRE_PATH" value="F:/DEV/JAVA/jdk_6_29" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
@@ -589,9 +578,7 @@
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <method>
- <option name="BuildArtifacts" enabled="true" />
- </method>
+ <method />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
@@ -616,24 +603,6 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -666,6 +635,24 @@
<option name="Maven.BeforeRunTask" enabled="false" />
</method>
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -767,24 +754,24 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-4" width="1928" height="1088" extended-state="0" />
- <editor active="true" />
+ <frame x="-4" y="-4" width="1608" height="861" extended-state="6" />
+ <editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32979852" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286517" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3107105" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31039324" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32979852" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3286517" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32979852" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16826923" sideWeight="0.21845175" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19284189" sideWeight="0.6818664" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31813362" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15592784" sideWeight="0.7401685" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25983146" sideWeight="0.9974026" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -847,116 +834,123 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/vgui/VGUIDetailedNPCInformation.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/vgui/NE_GUI_Element.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="74" column="9" selection-start="2252" selection-end="2252" vertical-scroll-proportion="0.7385621">
+ <state line="271" column="16" selection-start="6993" selection-end="6993" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ai/BasicMobAI.java">
+ <entry file="jar://F:/DEV/JAVA/jdk_6_29/src.zip!/java/lang/Class.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="8" selection-start="2331" selection-end="2331" vertical-scroll-proportion="0.78213507">
+ <state line="301" column="13" selection-start="12268" selection-end="12268" vertical-scroll-proportion="0.3326226">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/vgui/NE_GUI_Button.java">
+ <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/vgui/VGUICreateCharacterScreeen.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="1719" selection-end="1719" vertical-scroll-proportion="0.0">
+ <state line="6" column="39" selection-start="133" selection-end="159" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/IUserInterface.java">
+ <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/SkillerGame.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="23" selection-start="461" selection-end="461" vertical-scroll-proportion="0.5825243">
- <folding />
+ <state line="13" column="0" selection-start="364" selection-end="364" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/Game.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/modes/ModeInGame.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="0" selection-start="1048" selection-end="1048" vertical-scroll-proportion="0.38511327">
- <folding>
- <element signature="e#829#854#0" expanded="true" />
- </folding>
+ <state line="65" column="0" selection-start="2491" selection-end="2633" vertical-scroll-proportion="0.5575221">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/modes/AbstractGameMode.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ent/EntityManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="30" selection-start="858" selection-end="876" vertical-scroll-proportion="0.87055016">
+ <state line="123" column="16" selection-start="3371" selection-end="3371" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuMode.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/world/layers/WorldLayer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="0" selection-start="440" selection-end="440" vertical-scroll-proportion="0.16181229">
- <folding />
+ <state line="429" column="32" selection-start="13556" selection-end="13556" vertical-scroll-proportion="0.3172269">
+ <folding>
+ <element signature="e#1978#1996#0" expanded="true" />
+ <element signature="e#2062#2078#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/SkillerGame.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/world/WorldModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="35" selection-start="364" selection-end="364" vertical-scroll-proportion="0.45307443">
+ <state line="259" column="21" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.6168033">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/in_game/InGameMode.java">
+ <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuUI.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="219" column="40" selection-start="7722" selection-end="7722" vertical-scroll-proportion="0.0">
+ <state line="51" column="41" selection-start="1716" selection-end="1716" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/MainMenuUI.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/client/ClientGameEnvironment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="249" column="8" selection-start="6959" selection-end="7036" vertical-scroll-proportion="0.0">
+ <state line="21" column="27" selection-start="643" selection-end="643" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/DefaultUI.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/GameEnvironment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="8" selection-start="685" selection-end="762" vertical-scroll-proportion="0.0">
+ <state line="62" column="34" selection-start="1656" selection-end="1656" vertical-scroll-proportion="0.996008">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/ui/GameUI.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/core/Game.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="253" column="8" selection-start="7365" selection-end="7442" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="49" column="0" selection-start="1484" selection-end="1484" vertical-scroll-proportion="0.30938125">
+ <folding>
+ <element signature="e#829#854#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/in_game/InGameUI.java">
+ <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/in_game/InGameMode.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="191" column="8" selection-start="6127" selection-end="6204" vertical-scroll-proportion="0.9341021">
- <folding />
+ <state line="61" column="0" selection-start="2956" selection-end="2956" vertical-scroll-proportion="0.30938125">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/modes/main_menu/MainMenuUI.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/modes/AbstractGameMode.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="76" selection-start="1758" selection-end="1758" vertical-scroll-proportion="0.0">
+ <state line="18" column="0" selection-start="601" selection-end="601" vertical-scroll-proportion="0.30938125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/game/combat/Combat.java">
+ <entry file="file://$PROJECT_DIR$/libroguelike/src/com/nuclearunicorn/libroguelike/events/EventManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="22" selection-start="309" selection-end="309" vertical-scroll-proportion="0.0">
+ <state line="23" column="117" selection-start="612" selection-end="612" vertical-scroll-proportion="0.4790419">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/combat/RLCombat.java">
+ <entry file="file://$PROJECT_DIR$/serialkiller/src/com/nuclearunicorn/serialkiller/game/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="136" column="64" selection-start="3903" selection-end="3903" vertical-scroll-proportion="0.70873785">
+ <state line="26" column="16" selection-start="676" selection-end="676" vertical-scroll-proportion="0.55888224">
<folding />
</state>
</provider>
@@ -972,7 +966,6 @@
<option name="proportions">
<list>
<option value="0.2" />
- <option value="0.5" />
</list>
</option>
</splitter-proportions>
@@ -1020,6 +1013,7 @@
<option name="proportions">
<list>
<option value="0.2" />
+ <option value="0.5" />
</list>
</option>
</splitter-proportions>
View
6 serialkiller/src/com/nuclearunicorn/serialkiller/game/ai/PedestrianAI.java
@@ -17,7 +17,7 @@
import com.nuclearunicorn.serialkiller.game.world.entities.EntityRLHuman;
import com.nuclearunicorn.serialkiller.generators.Apartment;
import com.nuclearunicorn.serialkiller.render.RLMessages;
-import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptivePathNode;
+import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptiveNode;
import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptivePathfinder;
import org.lwjgl.util.Point;
import org.newdawn.slick.Color;
@@ -151,7 +151,7 @@ private void calculateAdaptivePath(NpcController npcController, Point source, Po
AdaptivePathfinder.resetState();
AdaptivePathfinder.calculateAdaptiveRoutes(fromMS);
- List<AdaptivePathNode> path = AdaptivePathfinder.getShortestPathTo(toMS);
+ List<AdaptiveNode> path = AdaptivePathfinder.getShortestPathTo(toMS);
System.out.println("moving from " + owner.origin + " to " + target + " path: " + path);
@@ -163,7 +163,7 @@ private void calculateAdaptivePath(NpcController npcController, Point source, Po
debugPath.add(source);
//debugPath.add(fromMS);
- for (AdaptivePathNode node: path){
+ for (AdaptiveNode node: path){
debugPath.add(node.point);
}
debugPath.add(target);
View
2 serialkiller/src/com/nuclearunicorn/serialkiller/generators/TownChunkGenerator.java
@@ -28,7 +28,7 @@
*/
public class TownChunkGenerator extends ChunkGenerator {
- private static final int NPC_PER_ROAD_RATE = 10; //50% is a hell lot of npc , 35 is sorta ok
+ private static final int NPC_PER_ROAD_RATE = 35; //50% is a hell lot of npc , 35 is sorta ok
private static final int MAX_POLICEMAN_COUNT = 4;
enum RoomType {
View
2 serialkiller/src/com/nuclearunicorn/serialkiller/render/ConsoleRenderer.java
@@ -26,7 +26,7 @@
*/
public class ConsoleRenderer extends LayerRenderer{
- public static int TILE_SIZE = 16;
+ public static int TILE_SIZE = 12;
NLTimer renderTimer = new NLTimer();
private static final boolean ENABLE_TEXTURE = false;
private static final boolean DISABLE_TEXTURE = true;
View
4 serialkiller/src/com/nuclearunicorn/serialkiller/render/overlays/DebugPathfindingGraph.java
@@ -4,8 +4,8 @@
import com.nuclearunicorn.libroguelike.core.client.ClientGameEnvironment;
import com.nuclearunicorn.libroguelike.game.world.WorldView;
import com.nuclearunicorn.libroguelike.render.overlay.OverlaySystem;
+import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptiveNode;
import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptivePath;
-import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptivePathNode;
import com.nuclearunicorn.serialkiller.utils.pathfinder.adaptive.AdaptivePathfinder;
import org.lwjgl.util.Point;
import org.newdawn.slick.Color;
@@ -22,7 +22,7 @@ public static void debugAdaptiveGraph(){
Point tileFrom = new Point(0,0);
Point tileTo = new Point(0,0);
- for (AdaptivePathNode node: AdaptivePathfinder.nodes){
+ for (AdaptiveNode node: AdaptivePathfinder.nodes){
for (AdaptivePath path: node.nb){
tileFrom.setLocation(node.point);
View
8 ...pathfinder/adaptive/AdaptivePathNode.java → ...ils/pathfinder/adaptive/AdaptiveNode.java
@@ -13,19 +13,19 @@
* Time: 13:28
* To change this template use File | Settings | File Templates.
*/
-public class AdaptivePathNode implements Comparable<AdaptivePathNode>{
+public class AdaptiveNode implements Comparable<AdaptiveNode>{
public Point point;
public List<AdaptivePath> nb = new ArrayList<AdaptivePath>(4);
public double minDistance = Double.POSITIVE_INFINITY;
- public AdaptivePathNode prev;
+ public AdaptiveNode prev;
- public AdaptivePathNode(Point point){
+ public AdaptiveNode(Point point){
this.point = point;
}
@Override
- public int compareTo(AdaptivePathNode other) {
+ public int compareTo(AdaptiveNode other) {
return Double.compare(minDistance, other.minDistance);
}
View
6 serialkiller/src/com/nuclearunicorn/serialkiller/utils/pathfinder/adaptive/AdaptivePath.java
@@ -4,11 +4,11 @@
*/
public class AdaptivePath {
- final public AdaptivePathNode from;
- final public AdaptivePathNode to;
+ final public AdaptiveNode from;
+ final public AdaptiveNode to;
final public int cost;
- public AdaptivePath(AdaptivePathNode from, AdaptivePathNode to, int cost) {
+ public AdaptivePath(AdaptiveNode from, AdaptiveNode to, int cost) {
this.from = from;
this.to = to;
this.cost = cost;
View
75 ...ler/src/com/nuclearunicorn/serialkiller/utils/pathfinder/adaptive/AdaptivePathfinder.java
@@ -10,26 +10,26 @@
*/
public class AdaptivePathfinder {
//private static Map<Point, ArrayList<AdaptivePath>> links = new HashMap<Point,ArrayList<Point>>(32);
- //private static Map<AdaptivePathNode ,ArrayList<AdaptivePath>> linkedNodes = new HashMap<AdaptivePathNode,ArrayList<AdaptivePath>>(32);
- public static List<AdaptivePathNode> nodes = new ArrayList<AdaptivePathNode>(32);
+ //private static Map<AdaptiveNode ,ArrayList<AdaptivePath>> linkedNodes = new HashMap<AdaptiveNode,ArrayList<AdaptivePath>>(32);
+ public static List<AdaptiveNode> nodes = new ArrayList<AdaptiveNode>(32);
public static List<AdaptivePath> edges = new ArrayList<AdaptivePath>(16);
- private static AdaptivePathNode getNode(Point point){
- for (AdaptivePathNode node : nodes){
+ private static AdaptiveNode getNode(Point point){
+ for (AdaptiveNode node : nodes){
if (node.isNodeOf(point)){
return node;
}
}
- AdaptivePathNode node = new AdaptivePathNode(point);
+ AdaptiveNode node = new AdaptiveNode(point);
nodes.add(node);
return node;
}
- public static void addLink(AdaptivePathNode from, AdaptivePathNode to, int cost){
- //AdaptivePathNode nodeFrom = getNode(from);
- //AdaptivePathNode nodeTo = getNode(to);
+ public static void addLink(AdaptiveNode from, AdaptiveNode to, int cost){
+ //AdaptiveNode nodeFrom = getNode(from);
+ //AdaptiveNode nodeTo = getNode(to);
AdaptivePath path = new AdaptivePath(
@@ -41,7 +41,7 @@ public static void addLink(AdaptivePathNode from, AdaptivePathNode to, int cost)
}
public static void addPoint(RLWorldChunk chunk, Point newNode){
- //AdaptivePathNode node = new AdaptivePathNode(newNode);
+ //AdaptiveNode node = new AdaptiveNode(newNode);
//nodes.add(node);
@@ -56,15 +56,15 @@ public static void addPoint(RLWorldChunk chunk, Point newNode){
if (pathCost > 0){
System.out.println("adding links from point " + newNode + " to "+nodes.size()+" nodes");
addLink(getNode(registeredNode), getNode(newNode), pathCost);
- //addLink(point, samplePoint, pathCost); //?
+ addLink(getNode(newNode), getNode(registeredNode), pathCost); //?
}
}
}
public static void buildGraph(RLWorldChunk chunk){
- for (AdaptivePathNode node1: nodes){
- for (AdaptivePathNode node2: nodes){
+ for (AdaptiveNode node1: nodes){
+ for (AdaptiveNode node2: nodes){
if (node1.point.equals(node2.point)){
return;
}
@@ -101,21 +101,54 @@ private static int tracePathLength(RLWorldChunk chunk, Point samplePoint, Point
public static void calculateAdaptiveRoutes(Point from){
- AdaptivePathNode source = getNode(from);
+ /*
+ const int INF = 1000000000;
+
+ int main() {
+ int n;
+ ... чтение n ...
+ vector < vector < pair<int,int> > > g (n);
+ ... чтение графа ...
+ int s = ...; // стартовая вершина
+
+ vector<int> d (n, INF), p (n);
+ d[s] = 0;
+ vector<char> u (n);
+ for (int i=0; i<n; ++i) {
+ int v = -1;
+ for (int j=0; j<n; ++j)
+ if (!u[j] && (v == -1 || d[j] < d[v]))
+ v = j;
+ if (d[v] == INF)
+ break;
+ u[v] = true;
+
+ for (size_t j=0; j<g[v].size(); ++j) {
+ int to = g[v][j].first,
+ len = g[v][j].second;
+ if (d[v] + len < d[to]) {
+ d[to] = d[v] + len;
+ p[to] = v;
+ }
+ }
+ }
+ }*/
+
+ AdaptiveNode source = getNode(from);
source.minDistance = 0;
- PriorityQueue<AdaptivePathNode> vertexQueue = new PriorityQueue<AdaptivePathNode>();
+ PriorityQueue<AdaptiveNode> vertexQueue = new PriorityQueue<AdaptiveNode>();
vertexQueue.add(source);
while (!vertexQueue.isEmpty()) {
- AdaptivePathNode u = vertexQueue.poll();
+ AdaptiveNode u = vertexQueue.poll();
//v?
//d?
for (AdaptivePath e : u.nb)
{
- AdaptivePathNode v = e.to;
+ AdaptiveNode v = e.to;
double weight = e.cost;
//relax the edge
double distanceThroughU = u.minDistance + weight;
@@ -132,20 +165,20 @@ public static void calculateAdaptiveRoutes(Point from){
}
}
- public static List<AdaptivePathNode> getShortestPathTo(Point target){
+ public static List<AdaptiveNode> getShortestPathTo(Point target){
- AdaptivePathNode targetNode = getNode(target);
+ AdaptiveNode targetNode = getNode(target);
- List<AdaptivePathNode> path = new ArrayList<AdaptivePathNode>();
- for (AdaptivePathNode vertex = targetNode; vertex != null; vertex = vertex.prev){
+ List<AdaptiveNode> path = new ArrayList<AdaptiveNode>();
+ for (AdaptiveNode vertex = targetNode; vertex != null; vertex = vertex.prev){
path.add(vertex);
}
Collections.reverse(path);
return path;
}
public static void resetState() {
- for (AdaptivePathNode node: nodes){
+ for (AdaptiveNode node: nodes){
node.minDistance = Double.POSITIVE_INFINITY;
node.prev = null;
}

No commit comments for this range

Something went wrong with that request. Please try again.