diff --git a/HeatUp/doc/allclasses-frame.html b/HeatUp/doc/allclasses-frame.html
new file mode 100644
index 0000000..2ea4537
--- /dev/null
+++ b/HeatUp/doc/allclasses-frame.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+All Classes
+
+
+
+
+All Classes
+
+
+
diff --git a/HeatUp/doc/allclasses-noframe.html b/HeatUp/doc/allclasses-noframe.html
new file mode 100644
index 0000000..d63f6ea
--- /dev/null
+++ b/HeatUp/doc/allclasses-noframe.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+All Classes
+
+
+
+
+All Classes
+
+
+
diff --git a/HeatUp/doc/constant-values.html b/HeatUp/doc/constant-values.html
new file mode 100644
index 0000000..4de24ad
--- /dev/null
+++ b/HeatUp/doc/constant-values.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+Constant Field Values
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/MapEngine.html b/HeatUp/doc/de/heatup/mapengine/MapEngine.html
new file mode 100644
index 0000000..aaa7183
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/MapEngine.html
@@ -0,0 +1,335 @@
+
+
+
+
+
+MapEngine
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+de.heatup.mapengine.MapEngine
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+
+Constructor and Description
+
+
+MapEngine ()
+
+
+MapEngine (int mapNumber)
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+MapEngine
+public MapEngine()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/class-use/MapEngine.html b/HeatUp/doc/de/heatup/mapengine/class-use/MapEngine.html
new file mode 100644
index 0000000..f7d5edd
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/class-use/MapEngine.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+Uses of Class de.heatup.mapengine.MapEngine
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+No usage of de.heatup.mapengine.MapEngine
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/package-frame.html b/HeatUp/doc/de/heatup/mapengine/package-frame.html
new file mode 100644
index 0000000..e861551
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/package-frame.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+de.heatup.mapengine
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/package-summary.html b/HeatUp/doc/de/heatup/mapengine/package-summary.html
new file mode 100644
index 0000000..0bfb451
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/package-summary.html
@@ -0,0 +1,131 @@
+
+
+
+
+
+de.heatup.mapengine
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Prev Package
+Next Package
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Class Summary
+
+Class
+Description
+
+
+
+MapEngine
+
+
+
+
+
+
+
+
+
+
+
+Prev Package
+Next Package
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/package-tree.html b/HeatUp/doc/de/heatup/mapengine/package-tree.html
new file mode 100644
index 0000000..29aeb44
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/package-tree.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+de.heatup.mapengine Class Hierarchy
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/mapengine/package-use.html b/HeatUp/doc/de/heatup/mapengine/package-use.html
new file mode 100644
index 0000000..6ddb5b1
--- /dev/null
+++ b/HeatUp/doc/de/heatup/mapengine/package-use.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+Uses of Package de.heatup.mapengine
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+No usage of de.heatup.mapengine
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/GameLoopD.html b/HeatUp/doc/de/heatup/testing/GameLoopD.html
new file mode 100644
index 0000000..1e71be2
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/GameLoopD.html
@@ -0,0 +1,489 @@
+
+
+
+
+
+GameLoopD
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+
+java.awt.Component
+
+
+java.awt.Container
+
+
+java.awt.Window
+
+
+java.awt.Frame
+
+
+javax.swing.JFrame
+
+
+de.heatup.testing.GameLoopD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Nested Class Summary
+
+
+
+
+Nested classes/interfaces inherited from class java.awt.Window
+java.awt.Window.Type
+
+
+
+
+
+Nested classes/interfaces inherited from class java.awt.Component
+java.awt.Component.BaselineResizeBehavior
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+
+Modifier and Type
+Field and Description
+
+
+static de.heatup.ui.KeyBindings
+kb
+
+
+static de.heatup.testing.Opponent
+opponent01
+
+
+static de.heatup.testing.Opponent
+opponent02
+
+
+static de.heatup.testing.Opponent
+opponent03
+
+
+static de.heatup.testing.Player
+player01
+
+
+
+
+
+
+Fields inherited from class javax.swing.JFrame
+EXIT_ON_CLOSE
+
+
+
+
+
+Fields inherited from class java.awt.Frame
+CROSSHAIR_CURSOR, DEFAULT_CURSOR, E_RESIZE_CURSOR, HAND_CURSOR, ICONIFIED, MAXIMIZED_BOTH, MAXIMIZED_HORIZ, MAXIMIZED_VERT, MOVE_CURSOR, N_RESIZE_CURSOR, NE_RESIZE_CURSOR, NORMAL, NW_RESIZE_CURSOR, S_RESIZE_CURSOR, SE_RESIZE_CURSOR, SW_RESIZE_CURSOR, TEXT_CURSOR, W_RESIZE_CURSOR, WAIT_CURSOR
+
+
+
+
+
+Fields inherited from class java.awt.Component
+BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
+
+
+
+
+
+Fields inherited from interface javax.swing.WindowConstants
+DISPOSE_ON_CLOSE, DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE
+
+
+
+
+
+Fields inherited from interface java.awt.image.ImageObserver
+ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+
+Constructor and Description
+
+
+GameLoopD ()
+
+
+
+
+
+
+
+
+
+Method Summary
+
+Methods
+
+Modifier and Type
+Method and Description
+
+
+static void
+main (java.lang.String[] args)
+
+
+void
+run ()
+
+
+
+
+
+
+Methods inherited from class javax.swing.JFrame
+getAccessibleContext, getContentPane, getDefaultCloseOperation, getGlassPane, getGraphics, getJMenuBar, getLayeredPane, getRootPane, getTransferHandler, isDefaultLookAndFeelDecorated, remove, repaint, setContentPane, setDefaultCloseOperation, setDefaultLookAndFeelDecorated, setGlassPane, setIconImage, setJMenuBar, setLayeredPane, setLayout, setTransferHandler, update
+
+
+
+
+
+Methods inherited from class java.awt.Frame
+addNotify, getCursorType, getExtendedState, getFrames, getIconImage, getMaximizedBounds, getMenuBar, getState, getTitle, isResizable, isUndecorated, remove, removeNotify, setBackground, setCursor, setExtendedState, setMaximizedBounds, setMenuBar, setOpacity, setResizable, setShape, setState, setTitle, setUndecorated
+
+
+
+
+
+Methods inherited from class java.awt.Window
+addPropertyChangeListener, addPropertyChangeListener, addWindowFocusListener, addWindowListener, addWindowStateListener, applyResourceBundle, applyResourceBundle, createBufferStrategy, createBufferStrategy, dispose, getBackground, getBufferStrategy, getFocusableWindowState, getFocusCycleRootAncestor, getFocusOwner, getFocusTraversalKeys, getIconImages, getInputContext, getListeners, getLocale, getModalExclusionType, getMostRecentFocusOwner, getOpacity, getOwnedWindows, getOwner, getOwnerlessWindows, getShape, getToolkit, getType, getWarningString, getWindowFocusListeners, getWindowListeners, getWindows, getWindowStateListeners, hide, isActive, isAlwaysOnTop, isAlwaysOnTopSupported, isAutoRequestFocus, isFocusableWindow, isFocusCycleRoot, isFocused, isLocationByPlatform, isOpaque, isShowing, isValidateRoot, pack, paint, postEvent, removeWindowFocusListener, removeWindowListener, removeWindowStateListener, reshape, setAlwaysOnTop, setAutoRequestFocus, setBounds, setBounds, setCursor, setFocusableWindowState, setFocusCycleRoot, setIconImages, setLocation, setLocation, setLocationByPlatform, setLocationRelativeTo, setMinimumSize, setModalExclusionType, setSize, setSize, setType, setVisible, show, toBack, toFront
+
+
+
+
+
+Methods inherited from class java.awt.Container
+add, add, add, add, add, addContainerListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalPolicy, getInsets, getLayout, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, layout, list, list, locate, minimumSize, paintComponents, preferredSize, print, printComponents, remove, removeAll, removeContainerListener, setComponentZOrder, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, transferFocusDownCycle, validate
+
+
+
+
+
+Methods inherited from class java.awt.Component
+action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, dispatchEvent, enable, enable, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isPreferredSizeSet, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, prepareImage, prepareImage, printAll, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, requestFocus, requestFocusInWindow, resize, resize, revalidate, setComponentOrientation, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setMaximumSize, setName, setPreferredSize, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
+
+
+
+
+
+Methods inherited from class java.lang.Object
+equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
+
+
+
+
+
+Methods inherited from interface java.awt.MenuContainer
+getFont, postEvent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+GameLoopD
+public GameLoopD()
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+run
+public void run()
+
+Specified by:
+run in interface java.lang.Runnable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/class-use/GameLoopD.html b/HeatUp/doc/de/heatup/testing/class-use/GameLoopD.html
new file mode 100644
index 0000000..0cb70a4
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/class-use/GameLoopD.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+Uses of Class de.heatup.testing.GameLoopD
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+No usage of de.heatup.testing.GameLoopD
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/package-frame.html b/HeatUp/doc/de/heatup/testing/package-frame.html
new file mode 100644
index 0000000..6687bf4
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/package-frame.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+de.heatup.testing
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/package-summary.html b/HeatUp/doc/de/heatup/testing/package-summary.html
new file mode 100644
index 0000000..0ac10d5
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/package-summary.html
@@ -0,0 +1,131 @@
+
+
+
+
+
+de.heatup.testing
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Prev Package
+Next Package
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Class Summary
+
+Class
+Description
+
+
+
+GameLoopD
+
+
+
+
+
+
+
+
+
+
+
+Prev Package
+Next Package
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/package-tree.html b/HeatUp/doc/de/heatup/testing/package-tree.html
new file mode 100644
index 0000000..187e406
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/package-tree.html
@@ -0,0 +1,142 @@
+
+
+
+
+
+de.heatup.testing Class Hierarchy
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+
+java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable)
+
+java.awt.Container
+
+java.awt.Window (implements javax.accessibility.Accessible)
+
+java.awt.Frame (implements java.awt.MenuContainer)
+
+javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants)
+
+de.heatup.testing.GameLoopD (implements java.lang.Runnable)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/de/heatup/testing/package-use.html b/HeatUp/doc/de/heatup/testing/package-use.html
new file mode 100644
index 0000000..e168d02
--- /dev/null
+++ b/HeatUp/doc/de/heatup/testing/package-use.html
@@ -0,0 +1,134 @@
+
+
+
+
+
+Uses of Package de.heatup.testing
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/deprecated-list.html b/HeatUp/doc/deprecated-list.html
new file mode 100644
index 0000000..fb31e4d
--- /dev/null
+++ b/HeatUp/doc/deprecated-list.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+Deprecated List
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/help-doc.html b/HeatUp/doc/help-doc.html
new file mode 100644
index 0000000..25d79e7
--- /dev/null
+++ b/HeatUp/doc/help-doc.html
@@ -0,0 +1,214 @@
+
+
+
+
+
+API Help
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+Package
+Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
+
+Interfaces (italic)
+Classes
+Enums
+Exceptions
+Errors
+Annotation Types
+
+
+
+Class/Interface
+Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
+
+Class inheritance diagram
+Direct Subclasses
+All Known Subinterfaces
+All Known Implementing Classes
+Class/interface declaration
+Class/interface description
+
+
+Nested Class Summary
+Field Summary
+Constructor Summary
+Method Summary
+
+
+Field Detail
+Constructor Detail
+Method Detail
+
+Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
+
+
+Annotation Type
+Each annotation type has its own separate page with the following sections:
+
+Annotation Type declaration
+Annotation Type description
+Required Element Summary
+Optional Element Summary
+Element Detail
+
+
+
+Enum
+Each enum has its own separate page with the following sections:
+
+Enum declaration
+Enum description
+Enum Constant Summary
+Enum Constant Detail
+
+
+
+Use
+Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
+
+
+Tree (Class Hierarchy)
+There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.
+
+When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
+When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
+
+
+
+Deprecated API
+The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
+
+
+Index
+The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
+
+
+Prev/Next
+These links take you to the next or previous class, interface, package, or related page.
+
+
+Frames/No Frames
+These links show and hide the HTML frames. All pages are available with or without frames.
+
+
+All Classes
+The All Classes link shows all classes and interfaces except non-static nested types.
+
+
+Serialized Form
+Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
+
+
+Constant Field Values
+The Constant Field Values page lists the static final fields and their values.
+
+
+
This help file applies to API documentation generated using the standard doclet.
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-1.html b/HeatUp/doc/index-files/index-1.html
new file mode 100644
index 0000000..3e8f678
--- /dev/null
+++ b/HeatUp/doc/index-files/index-1.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+D-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
D
+
+de.heatup.testing - package de.heatup.testing
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-2.html b/HeatUp/doc/index-files/index-2.html
new file mode 100644
index 0000000..50d0a62
--- /dev/null
+++ b/HeatUp/doc/index-files/index-2.html
@@ -0,0 +1,120 @@
+
+
+
+
+
+G-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
G
+
+GameLoopD - Class in de.heatup.testing
+
+GameLoopD() - Constructor for class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-3.html b/HeatUp/doc/index-files/index-3.html
new file mode 100644
index 0000000..aa3fff4
--- /dev/null
+++ b/HeatUp/doc/index-files/index-3.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+K-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
K
+
+kb - Static variable in class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-4.html b/HeatUp/doc/index-files/index-4.html
new file mode 100644
index 0000000..67afd25
--- /dev/null
+++ b/HeatUp/doc/index-files/index-4.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+M-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
M
+
+main(String[]) - Static method in class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-5.html b/HeatUp/doc/index-files/index-5.html
new file mode 100644
index 0000000..a15fad5
--- /dev/null
+++ b/HeatUp/doc/index-files/index-5.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+O-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
O
+
+opponent01 - Static variable in class de.heatup.testing.GameLoopD
+
+opponent02 - Static variable in class de.heatup.testing.GameLoopD
+
+opponent03 - Static variable in class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-6.html b/HeatUp/doc/index-files/index-6.html
new file mode 100644
index 0000000..ea030e0
--- /dev/null
+++ b/HeatUp/doc/index-files/index-6.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+P-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
P
+
+player01 - Static variable in class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index-files/index-7.html b/HeatUp/doc/index-files/index-7.html
new file mode 100644
index 0000000..6604655
--- /dev/null
+++ b/HeatUp/doc/index-files/index-7.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+R-Index
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+D G K M O P R
+
+
+
R
+
+run() - Method in class de.heatup.testing.GameLoopD
+
+
+
D G K M O P R
+
+
+
+
+
+
diff --git a/HeatUp/doc/index.html b/HeatUp/doc/index.html
new file mode 100644
index 0000000..63933c3
--- /dev/null
+++ b/HeatUp/doc/index.html
@@ -0,0 +1,71 @@
+
+
+
+
+
+Generated Documentation (Untitled)
+
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+Frame Alert
+This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to Non-frame version .
+
+
+
diff --git a/HeatUp/doc/overview-tree.html b/HeatUp/doc/overview-tree.html
new file mode 100644
index 0000000..8cdb771
--- /dev/null
+++ b/HeatUp/doc/overview-tree.html
@@ -0,0 +1,146 @@
+
+
+
+
+
+Class Hierarchy
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+
+java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable)
+
+java.awt.Container
+
+java.awt.Window (implements javax.accessibility.Accessible)
+
+java.awt.Frame (implements java.awt.MenuContainer)
+
+javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants)
+
+de.heatup.testing.GameLoopD (implements java.lang.Runnable)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/package-list b/HeatUp/doc/package-list
new file mode 100644
index 0000000..8333566
--- /dev/null
+++ b/HeatUp/doc/package-list
@@ -0,0 +1 @@
+de.heatup.testing
diff --git a/HeatUp/doc/resources/background.gif b/HeatUp/doc/resources/background.gif
new file mode 100644
index 0000000..f471940
Binary files /dev/null and b/HeatUp/doc/resources/background.gif differ
diff --git a/HeatUp/doc/resources/tab.gif b/HeatUp/doc/resources/tab.gif
new file mode 100644
index 0000000..1a73a83
Binary files /dev/null and b/HeatUp/doc/resources/tab.gif differ
diff --git a/HeatUp/doc/resources/titlebar.gif b/HeatUp/doc/resources/titlebar.gif
new file mode 100644
index 0000000..17443b3
Binary files /dev/null and b/HeatUp/doc/resources/titlebar.gif differ
diff --git a/HeatUp/doc/resources/titlebar_end.gif b/HeatUp/doc/resources/titlebar_end.gif
new file mode 100644
index 0000000..3ad78d4
Binary files /dev/null and b/HeatUp/doc/resources/titlebar_end.gif differ
diff --git a/HeatUp/doc/serialized-form.html b/HeatUp/doc/serialized-form.html
new file mode 100644
index 0000000..f3f0003
--- /dev/null
+++ b/HeatUp/doc/serialized-form.html
@@ -0,0 +1,283 @@
+
+
+
+
+
+Serialized Form
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HeatUp/doc/stylesheet.css b/HeatUp/doc/stylesheet.css
new file mode 100644
index 0000000..0aeaa97
--- /dev/null
+++ b/HeatUp/doc/stylesheet.css
@@ -0,0 +1,474 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:76%;
+ margin:0;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color:#4c6b87;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color:#bb7a2a;
+}
+a:active {
+ text-decoration:none;
+ color:#4c6b87;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+pre {
+ font-size:1.3em;
+}
+h1 {
+ font-size:1.8em;
+}
+h2 {
+ font-size:1.5em;
+}
+h3 {
+ font-size:1.4em;
+}
+h4 {
+ font-size:1.3em;
+}
+h5 {
+ font-size:1.2em;
+}
+h6 {
+ font-size:1.1em;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-size:1.2em;
+}
+dt code {
+ font-size:1.2em;
+}
+table tr td dt code {
+ font-size:1.2em;
+ vertical-align:top;
+}
+sup {
+ font-size:.6em;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:.8em;
+ z-index:200;
+ margin-top:-7px;
+}
+.legalCopy {
+ margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+ color:#bb7a2a;
+}
+.tab {
+ background-color:#0066FF;
+ background-image:url(resources/titlebar.gif);
+ background-position:left top;
+ background-repeat:no-repeat;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-image:url(resources/background.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:1em;
+ margin:0;
+}
+.topNav {
+ background-image:url(resources/background.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.bottomNav {
+ margin-top:10px;
+ background-image:url(resources/background.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.subNav {
+ background-color:#dee3e9;
+ border-bottom:1px solid #9eadc0;
+ float:left;
+ width:100%;
+ overflow:hidden;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding:3px 6px;
+}
+ul.subNavList li{
+ list-style:none;
+ float:left;
+ font-size:90%;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color:#bb7a2a;
+}
+.navBarCell1Rev {
+ background-image:url(resources/tab.gif);
+ background-color:#a88834;
+ color:#FFFFFF;
+ margin: auto 5px;
+ border:1px solid #c9aa44;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexHeader {
+ margin:10px;
+ position:relative;
+}
+.indexHeader h1 {
+ font-size:1.3em;
+}
+.title {
+ color:#2c4557;
+ margin:10px 0;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 25px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:1.2em;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+ padding:0;
+ margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+ padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ clear:both;
+ padding:10px 20px;
+ position:relative;
+}
+.indexContainer {
+ margin:10px;
+ position:relative;
+ font-size:1.0em;
+}
+.indexContainer h2 {
+ font-size:1.1em;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:1.1em;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:10px 0 10px 20px;
+}
+.serializedFormContainer dl.nameValue dt {
+ margin-left:1px;
+ font-size:1.1em;
+ display:inline;
+ font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+ margin:0 0 0 1px;
+ font-size:1.1em;
+ display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+ display:inline;
+ font-size:0.9em;
+}
+ul.inheritance {
+ margin:0;
+ padding:0;
+}
+ul.inheritance li {
+ display:inline;
+ list-style:none;
+}
+ul.inheritance li ul.inheritance {
+ margin-left:15px;
+ padding-left:15px;
+ padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+ margin:10px 0 10px 0;
+ padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+ list-style:none;
+ margin-bottom:25px;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #9eadc0;
+ background-color:#f9f9f9;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+ padding:0 0 5px 8px;
+ background-color:#ffffff;
+ border:1px solid #9eadc0;
+ border-top:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+ border-bottom:1px solid #9eadc0;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+ list-style:none;
+ border-bottom:none;
+ padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+ margin-top:0;
+ margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.contentContainer table, .classUseContainer table, .constantValuesContainer table {
+ border-bottom:1px solid #9eadc0;
+ width:100%;
+}
+.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
+ width:100%;
+}
+.contentContainer .description table, .contentContainer .details table {
+ border-bottom:none;
+}
+.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
+ vertical-align:top;
+ padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
+.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
+.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
+ padding-right:3px;
+}
+.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#FFFFFF;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ margin:0px;
+}
+caption a:link, caption a:hover, caption a:active, caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
+ white-space:nowrap;
+ padding-top:8px;
+ padding-left:8px;
+ display:block;
+ float:left;
+ background-image:url(resources/titlebar.gif);
+ height:18px;
+}
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
+ width:10px;
+ background-image:url(resources/titlebar_end.gif);
+ background-repeat:no-repeat;
+ background-position:top right;
+ position:relative;
+ float:left;
+}
+ul.blockList ul.blockList li.blockList table {
+ margin:0 0 12px 0px;
+ width:100%;
+}
+.tableSubHeadingColor {
+ background-color: #EEEEFF;
+}
+.altColor {
+ background-color:#eeeeef;
+}
+.rowColor {
+ background-color:#ffffff;
+}
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
+ background:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+ font-weight:bold;
+}
+td.colFirst, th.colFirst {
+ border-left:1px solid #9eadc0;
+ white-space:nowrap;
+}
+td.colLast, th.colLast {
+ border-right:1px solid #9eadc0;
+}
+td.colOne, th.colOne {
+ border-right:1px solid #9eadc0;
+ border-left:1px solid #9eadc0;
+}
+table.overviewSummary {
+ padding:0px;
+ margin-left:0px;
+}
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+ width:25%;
+ vertical-align:middle;
+}
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+ width:25%;
+ vertical-align:middle;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:.9em;
+}
+.block {
+ display:block;
+ margin:3px 0 0 0;
+}
+.strong {
+ font-weight:bold;
+}
diff --git a/HeatUp/src/de/heatup/cfg/Config.java b/HeatUp/src/de/heatup/cfg/Config.java
index 9988a2b..439c9f5 100644
--- a/HeatUp/src/de/heatup/cfg/Config.java
+++ b/HeatUp/src/de/heatup/cfg/Config.java
@@ -13,6 +13,13 @@ public class Config {
public static final int mapMaxTilesHeight = 24;
public static int gamePanelWidth = 800;
public static int singleTilePixels = gamePanelWidth/mapMaxTilesWidth;
+ public static String mapFilePath = "";
+
+ public static final char wayChar = '#';
+ public static final char wallChar = '-';
+ public static final char firstHardwareChar = '0';
+ public static final char lastHardwareChar = '9';
+
/*
* Attribute
* de.heatup.ein.anderes.package.*
diff --git a/HeatUp/src/de/heatup/highscore/ChecksumGenerator.java b/HeatUp/src/de/heatup/highscore/ChecksumGenerator.java
new file mode 100644
index 0000000..5f06695
--- /dev/null
+++ b/HeatUp/src/de/heatup/highscore/ChecksumGenerator.java
@@ -0,0 +1,31 @@
+package de.heatup.highscore;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class ChecksumGenerator {
+ public static String generateCheckSum(String path) {
+ String checksum = null;
+ try {
+ FileInputStream fis = new FileInputStream(path);
+ MessageDigest md = MessageDigest.getInstance("MD5");
+
+ byte[] buffer = new byte[8192];
+ int numOfBytesRead;
+ while ((numOfBytesRead = fis.read(buffer)) > 0) {
+ md.update(buffer, 0, numOfBytesRead);
+ }
+ byte[] hash = md.digest();
+ checksum = new BigInteger(1, hash).toString(16);
+ fis.close();
+ } catch (IOException ex) {
+
+ } catch (NoSuchAlgorithmException ex) {
+
+ }
+ return checksum;
+ }
+}
diff --git a/HeatUp/src/de/heatup/highscore/HighscoreHandler.java b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java
new file mode 100644
index 0000000..05e38db
--- /dev/null
+++ b/HeatUp/src/de/heatup/highscore/HighscoreHandler.java
@@ -0,0 +1,5 @@
+package de.heatup.highscore;
+
+public class HighscoreHandler {
+
+}
diff --git a/HeatUp/src/de/heatup/highscore/MapHighscore.java b/HeatUp/src/de/heatup/highscore/MapHighscore.java
new file mode 100644
index 0000000..71d9321
--- /dev/null
+++ b/HeatUp/src/de/heatup/highscore/MapHighscore.java
@@ -0,0 +1,5 @@
+package de.heatup.highscore;
+
+public class MapHighscore {
+
+}
diff --git a/HeatUp/src/de/heatup/mapengine/MapEngine.java b/HeatUp/src/de/heatup/mapengine/MapEngine.java
index f630a76..c5ef370 100644
--- a/HeatUp/src/de/heatup/mapengine/MapEngine.java
+++ b/HeatUp/src/de/heatup/mapengine/MapEngine.java
@@ -3,19 +3,16 @@ package de.heatup.mapengine;
import java.awt.Point;
-import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Scanner;
-import javax.swing.JFileChooser;
-
import de.heatup.cfg.Config;
import de.heatup.logging.Logger;
import de.heatup.objects.*;
/**
- * Diese Klasse soll als primäre Schnittstelle zu anderen Spielmodulen dienen.
+ * Diese Klasse soll als primäre Schnittstelle dieses Packages zu anderen Spielmodulen dienen.
* Sie generiert die Map als StaticObjects um diese dann auf ein Spielfeld zu malen.
* Außerdem erstellt sie eine MapGrid, welches zur Kollisionserkennung und Positionierung
* von Entitäten dient.
@@ -38,24 +35,22 @@ public class MapEngine {
public MapEngine(int mapNumber) {
Scanner input = null;
try {
- input = new Scanner(new File("src/de/heatup/resources/maps/map"+mapNumber+".txt"));
+ input = new Scanner(MapLoader.loadMap(mapNumber));
} catch (FileNotFoundException e) {
- Logger.write("Konnte Map Datei nicht finden");
+ Logger.write("Could not find map file");
System.exit(-1);
e.printStackTrace();
}
+
this.createTiles(input);
}
public MapEngine() {
Scanner input = null;
try {
- JFileChooser chooser = new JFileChooser();
- chooser.showOpenDialog(null);
- input = new Scanner(chooser.getSelectedFile());
+ input = new Scanner(MapLoader.chooseMap());
} catch (FileNotFoundException e) {
- Logger.write("Konnte Map Datei nicht finden");
- System.exit(-1);
+ Logger.write("Map file not found");
e.printStackTrace();
}
this.createTiles(input);
@@ -128,7 +123,7 @@ public class MapEngine {
ArrayList newTileType = new ArrayList();
newTileType.add(new Point(x,y));
allMapTiles.put(currentLine.charAt(i), newTileType);
- for (char j = '0'; j <= '9'; j++) {
+ for (char j = Config.firstHardwareChar; j <=Config.lastHardwareChar; j++) {
if (j==currentLine.charAt(i)) {
availableHardwareTileTypes.add(currentLine.charAt(i));
}
@@ -207,11 +202,11 @@ public class MapEngine {
}
private boolean checkIfPath(char c) {
- return (c=='#');
+ return (c==Config.wayChar);
}
private boolean checkIfHardware(char c) {
- for (char j = '0'; j <= '9'; j++) {
+ for (char j = Config.firstHardwareChar; j <=Config.lastHardwareChar; j++) {
if (j==c) {
return true;
}
@@ -222,16 +217,16 @@ public class MapEngine {
* Schreibt eine mit Trigger konvertierte Map-Datei in die Konsole
*/
public void printMapGridWithTriggers() {
- for (int i = 0; i < 24; i++) {
- for (int j = 0; j < 32; j++) {
+ for (int i = 0; i < Config.mapMaxTilesHeight; i++) {
+ for (int j = 0; j < Config.mapMaxTilesWidth; j++) {
if (!MapGrid.getGridCell(j, i).isPath() && !MapGrid.getGridCell(j, i).isTrigger()) {
- System.out.print("-");
+ System.out.print(Config.wallChar + "");
} else {
if (MapGrid.getGridCell(j, i).isTrigger()) {
System.out.print(MapGrid.getGridCell(j, i).getCorrespondingHardwareToTrigger()+"");
}
if (MapGrid.getGridCell(j, i).isPath() && !MapGrid.getGridCell(j, i).isTrigger()) {
- System.out.print("#");
+ System.out.print(Config.wayChar + "");
}
}
diff --git a/HeatUp/src/de/heatup/mapengine/MapLoader.java b/HeatUp/src/de/heatup/mapengine/MapLoader.java
new file mode 100644
index 0000000..106cb9e
--- /dev/null
+++ b/HeatUp/src/de/heatup/mapengine/MapLoader.java
@@ -0,0 +1,35 @@
+package de.heatup.mapengine;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JFileChooser;
+
+import de.heatup.cfg.Config;
+import de.heatup.logging.Logger;
+
+public class MapLoader {
+ protected static File chooseMap() {
+ JFileChooser chooser = new JFileChooser();
+ chooser.showOpenDialog(null);
+ File mapFile = null;
+ try {
+ Config.mapFilePath = chooser.getSelectedFile().getCanonicalPath().toString();
+ mapFile = chooser.getSelectedFile();
+ Logger.write("Map \""+ chooser.getSelectedFile().getCanonicalPath().toString() + "\" loaded");
+ } catch (IOException e) {
+ Logger.write("Could not load map file");
+ e.printStackTrace();
+ }
+ return mapFile;
+ }
+ protected static File loadMap(int mapNumber) {
+ File mapFile = null;
+
+ String mapPath = "src/de/heatup/resources/maps/map"+mapNumber+".txt";
+
+ mapFile = new File(mapPath);
+ Logger.write("Map \""+ mapPath + "\" loaded");
+ return mapFile;
+ }
+}
diff --git a/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java b/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
index 7e9372b..3182ead 100644
--- a/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
+++ b/HeatUp/src/de/heatup/mapengine/MapObjectHandler.java
@@ -51,18 +51,18 @@ public class MapObjectHandler {
}
}
protected static void addAllWallsAndWaysTiles(MapEngine me) {
- ArrayList allCoordinatesOfWayTileType = me.getAllCoordinatesOfTileType('#');
- ArrayList allCoordinatesOfWallTileType = me.getAllCoordinatesOfTileType('-');
+ ArrayList allCoordinatesOfWayTileType = me.getAllCoordinatesOfTileType(Config.wayChar);
+ ArrayList allCoordinatesOfWallTileType = me.getAllCoordinatesOfTileType(Config.wallChar);
for (int i = 0; i < allCoordinatesOfWayTileType.size(); i++) {
Point currentPoint = allCoordinatesOfWayTileType.get(i);
- StaticObject newStaticObject = new StaticObject('#', currentPoint);
+ StaticObject newStaticObject = new StaticObject(Config.wayChar, currentPoint);
MapObjectHandler.allMapObjects.add(newStaticObject);
MapObjectHandler.allWayObjects.add(newStaticObject);
}
for (int i = 0; i < allCoordinatesOfWallTileType.size(); i++) {
Point currentPoint = allCoordinatesOfWallTileType.get(i);
- StaticObject newStaticObject = new StaticObject('-', currentPoint);
+ StaticObject newStaticObject = new StaticObject(Config.wallChar, currentPoint);
MapObjectHandler.allMapObjects.add(newStaticObject);
MapObjectHandler.allWallObjects.add(newStaticObject);
}
diff --git a/HeatUp/src/de/heatup/testing/Query.java b/HeatUp/src/de/heatup/testing/Query.java
deleted file mode 100644
index f230bab..0000000
--- a/HeatUp/src/de/heatup/testing/Query.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.heatup.testing;
-
-public class Query {
- private static Player player1;
-
- public static void setPlayer(Player playerX) {
- Query.player1 = playerX;
- }
- public static Player getPlayer() {
- return Query.player1;
- }
-}