All Classes
+All Classes
+
+
+
diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html
new file mode 100644
index 0000000..d7c6ca7
--- /dev/null
+++ b/docs/allclasses-noframe.html
@@ -0,0 +1,60 @@
+
+
+
+
+
+All Classes
+All Classes
+
+
+
diff --git a/docs/constant-values.html b/docs/constant-values.html
new file mode 100644
index 0000000..f369ca6
--- /dev/null
+++ b/docs/constant-values.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+Constant Field Values
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html
new file mode 100644
index 0000000..6c4738a
--- /dev/null
+++ b/docs/deprecated-list.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+Deprecated List
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/Assets.html b/docs/edu/ucsb/cs56/projects/games/pokemon/Assets.html
new file mode 100644
index 0000000..de4642a
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/Assets.html
@@ -0,0 +1,1080 @@
+
+
+
+
+
+Assets
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Assets
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Assets
+public Assets()
+
+
+
+
+
+
+
+
+
Game
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Nested Class Summary
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Game Game constructor that simply calls the constructor of its super class, MainWindow
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Static Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+voiddraw SpriteBatch spriteBatch,
+ float gameTime)Draw to the screen using a sprite batch and a delta time
+
+
+voidinit Initialize all non-asset resources such as the world, the system manager, the maploader, etc.
+
+
+voidload Load all asset resources such as textures and sound
+
+
+static String setTestMap String map)
+
+voidupdate Update the game and move it forward by a delta time
+
+
+
+
+
+
+
+
+Methods inherited from class javax.swing.JComponent
+addAncestorListener , addNotify , addVetoableChangeListener , computeVisibleRect , contains , createToolTip , disable , enable , firePropertyChange , firePropertyChange , firePropertyChange , fireVetoableChange , getActionForKeyStroke , getActionMap , getAlignmentX , getAlignmentY , getAncestorListeners , getAutoscrolls , getBaseline , getBaselineResizeBehavior , getBorder , getBounds , getClientProperty , getComponentGraphics , getComponentPopupMenu , getConditionForKeyStroke , getDebugGraphicsOptions , getDefaultLocale , getFontMetrics , getGraphics , getHeight , getInheritsPopupMenu , getInputMap , getInputMap , getInputVerifier , getInsets , getInsets , getListeners , getLocation , getMaximumSize , getMinimumSize , getNextFocusableComponent , getPopupLocation , getPreferredSize , getRegisteredKeyStrokes , getRootPane , getSize , getToolTipLocation , getToolTipText , getToolTipText , getTopLevelAncestor , getTransferHandler , getVerifyInputWhenFocusTarget , getVetoableChangeListeners , getVisibleRect , getWidth , getX , getY , grabFocus , hide , isDoubleBuffered , isLightweightComponent , isManagingFocus , isOpaque , isOptimizedDrawingEnabled , isPaintingForPrint , isPaintingOrigin , isPaintingTile , isRequestFocusEnabled , isValidateRoot , paint , paintBorder , paintChildren , paintComponent , paintImmediately , paintImmediately , print , printAll , printBorder , printChildren , printComponent , processComponentKeyEvent , processKeyBinding , processKeyEvent , processMouseEvent , processMouseMotionEvent , putClientProperty , registerKeyboardAction , registerKeyboardAction , removeAncestorListener , removeNotify , removeVetoableChangeListener , repaint , repaint , requestDefaultFocus , requestFocus , requestFocus , requestFocusInWindow , requestFocusInWindow , resetKeyboardActions , reshape , revalidate , scrollRectToVisible , setActionMap , setAlignmentX , setAlignmentY , setAutoscrolls , setBackground , setBorder , setComponentPopupMenu , setDebugGraphicsOptions , setDefaultLocale , setDoubleBuffered , setEnabled , setFocusTraversalKeys , setFont , setForeground , setInheritsPopupMenu , setInputMap , setInputVerifier , setMaximumSize , setMinimumSize , setNextFocusableComponent , setOpaque , setPreferredSize , setRequestFocusEnabled , setToolTipText , setTransferHandler , setUI , setVerifyInputWhenFocusTarget , setVisible , unregisterKeyboardAction , update
+
+
+
+
+Methods inherited from class java.awt.Container
+add , add , add , add , add , addContainerListener , addImpl , addPropertyChangeListener , addPropertyChangeListener , applyComponentOrientation , areFocusTraversalKeysSet , countComponents , deliverEvent , doLayout , findComponentAt , findComponentAt , getComponent , getComponentAt , getComponentAt , getComponentCount , getComponents , getComponentZOrder , getContainerListeners , getFocusTraversalKeys , getFocusTraversalPolicy , getLayout , getMousePosition , insets , invalidate , isAncestorOf , isFocusCycleRoot , isFocusCycleRoot , isFocusTraversalPolicyProvider , isFocusTraversalPolicySet , layout , list , list , locate , minimumSize , paintComponents , preferredSize , printComponents , processContainerEvent , processEvent , remove , remove , removeAll , removeContainerListener , setComponentZOrder , setFocusCycleRoot , setFocusTraversalPolicy , setFocusTraversalPolicyProvider , setLayout , transferFocusDownCycle , validate , validateTree
+
+
+
+
+Methods inherited from class java.awt.Component
+action , add , addComponentListener , addFocusListener , addHierarchyBoundsListener , addHierarchyListener , addInputMethodListener , addMouseListener , addMouseMotionListener , addMouseWheelListener , bounds , checkImage , checkImage , coalesceEvents , contains , createImage , createImage , createVolatileImage , createVolatileImage , disableEvents , dispatchEvent , enable , enableEvents , enableInputMethods , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , getBackground , getBounds , getColorModel , getComponentListeners , getComponentOrientation , getCursor , getDropTarget , getFocusCycleRootAncestor , getFocusListeners , getFocusTraversalKeysEnabled , getFont , getForeground , getGraphicsConfiguration , getHierarchyBoundsListeners , getHierarchyListeners , getIgnoreRepaint , getInputContext , getInputMethodListeners , getInputMethodRequests , getKeyListeners , getLocale , getLocation , getLocationOnScreen , getMouseListeners , getMouseMotionListeners , getMousePosition , getMouseWheelListeners , getName , getParent , getPeer , getPropertyChangeListeners , getPropertyChangeListeners , getSize , getToolkit , getTreeLock , gotFocus , handleEvent , hasFocus , imageUpdate , inside , isBackgroundSet , isCursorSet , isDisplayable , isEnabled , isFocusable , isFocusOwner , isFocusTraversable , isFontSet , isForegroundSet , isLightweight , isMaximumSizeSet , isMinimumSizeSet , isPreferredSizeSet , isShowing , isValid , isVisible , keyDown , keyUp , list , list , list , location , lostFocus , mouseDown , mouseDrag , mouseEnter , mouseExit , mouseMove , mouseUp , move , nextFocus , paintAll , postEvent , prepareImage , prepareImage , processComponentEvent , processFocusEvent , processHierarchyBoundsEvent , processHierarchyEvent , processInputMethodEvent , processMouseWheelEvent , remove , removeComponentListener , removeFocusListener , removeHierarchyBoundsListener , removeHierarchyListener , removeInputMethodListener , removeKeyListener , removeMouseListener , removeMouseMotionListener , removeMouseWheelListener , removePropertyChangeListener , removePropertyChangeListener , repaint , repaint , repaint , resize , resize , setBounds , setBounds , setComponentOrientation , setCursor , setDropTarget , setFocusable , setFocusTraversalKeysEnabled , setIgnoreRepaint , setLocale , setLocation , setLocation , setName , setSize , setSize , show , show , size , toString , transferFocus , transferFocusBackward , transferFocusUpCycle
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+draw
+public void draw(SpriteBatch spriteBatch,
+ float gameTime)
+Draw to the screen using a sprite batch and a delta time
+
+Overrides: draw MainWindow Parameters: spriteBatch - is the sprite batch that draws to the screengameTime - is the delta time to move the drawing forward
+
+
+
+
+
+
+
+
+
+
+
IOHelper
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+IOHelper String inputString)Creates a IOHelper with a string
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
MapLoader
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+MapLoader
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+MapLoader
+public MapLoader()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+loadMap
+public void loadMap(String inputStream,
+ World world)
+Loads the map from a String and puts it into a world object
+
+Parameters: inputStream - the string to read fromworld - the world to load
+
+
+
+
+
+
+
ReadFile
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+ReadFile
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+ReadFile
+public ReadFile()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
TileDataLoader
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Detail:
+Field |
+Constr | Method
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.IO.TileDataLoader
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+TileDataLoader
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+TileDataLoader
+public TileDataLoader()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Detail:
+Field |
+Constr | Method
+
+
+
+
+ edu.ucsb.cs56.projects.games.pokemon.IO
+edu.ucsb.cs56.projects.games.pokemon.IO
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+IOHelper
+Reads characters from a string one at a time
+
+
+
+MapLoader
+Loads the Map
+
+
+
+ReadFile
+Created by John Bowman on 11/8/2016.
+
+
+
+TileDataLoader
+Loads Tile Data.
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.IO Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+edu.ucsb.cs56.projects.games.pokemon.IO.IOHelper
+edu.ucsb.cs56.projects.games.pokemon.IO.MapLoader
+edu.ucsb.cs56.projects.games.pokemon.IO.ReadFile
+edu.ucsb.cs56.projects.games.pokemon.IO.TileDataLoader
+
+
+
+
InputHandler
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+InputHandler
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+keys
+public boolean[] keys
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+InputHandler
+public InputHandler()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+updateInteract
+public Command updateInteract(PositionComponent positionComponent,
+ World world)
+Stub class to update a command to interact with the world
+
+Parameters: positionComponent - the position component of the entityworld - the world where the entity residesReturns: returns the command to interact
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+keyTyped
+public void keyTyped(KeyEvent e)
+Checks if a key is typed, but currently only added to satisfy the key listener interface
+
+Specified by: keyTyped KeyListener Parameters: e - the KeyEvent
+
+
+
+
+
+
+
+
+
+
+
TextBox
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+TextBox String totalText)Creates a basic text box, doesn't do anything yet
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
TileData
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+TileData Texture sprite,
+ boolean collision)Main constructor for tile data
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+TileData
+public TileData(int tileID,
+ Texture sprite,
+ boolean collision)
+Main constructor for tile data
+
+Parameters: tileID - the id number for the tilesprite - the texture for the tilecollision - whether the tile is walkable on or not
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+IDToTexture
+public static Texture IDToTexture(int tileID)
+Returns the texture type associated with the tileID.
+
+ List of tile ID types:
+ grass_default: 0
+ grass_wild: 1
+ snow: 2
+ water1: 3
+ water2: 4
+ waterN: N+2
+ (Water9 is the final water type)
+
+Parameters: tileID - the tile's ID valueReturns: the proper Asset texture
+
+
+
+
+
+
+
+
+
+
+
+
Vector2
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+floatx
+
+floaty
+
+static Vector2 zero
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Vector2 Constructs Vector2 at (0, 0)
+
+
+Vector2 Constructs Vector2 at (x, y)
+
+
+Vector2 Vector2 v)Constructs a Vector2 at another Vector2 value
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+voidadd Adds an x and y value on to our vector
+
+
+voidadd Vector2 v)Adds a Vector2 on to this one
+
+
+floatangle Returns the angle of this vector from the x axis
+
+
+Vector2 cpy Returns a copy of this vector
+
+
+floatcross Returns the cross product between this vector and an x and y value
+
+
+floatcross Vector2 v)Returns the cross product between this vector and another Vector2
+
+
+doubledistance Returns the distance between this vector's head and an x and y value
+
+
+doubledistance Vector2 v)Returns the distance between two vectors' heads
+
+
+floatdot Returns the dot product between this vector and an x and y value
+
+
+floatdot Vector2 v)Returns the dot product between this vector and another Vector2
+
+
+Vector2 mult Multiplies the vector by a scalar
+
+
+voidset Set the x and y value
+
+
+voidset Vector2 v)Set the x and y value from a Vector2
+
+
+voidsub Subtracts an x and y value from our vector
+
+
+voidsub Vector2 v)Subtracts a Vector2 value from our vector
+
+
+String toString Returns this vector as a string
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+Vector2
+public Vector2(float x,
+ float y)
+Constructs Vector2 at (x, y)
+
+Parameters: x - the x valuey - the y value
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+dot
+public float dot(float x,
+ float y)
+Returns the dot product between this vector and an x and y value
+
+Parameters: x - the x valuey - the y valueReturns: the dot product between this, and x and y
+
+
+
+
+
+
+
+
+
+
+
+
+distance
+public double distance(float x,
+ float y)
+Returns the distance between this vector's head and an x and y value
+
+Parameters: x - the x valuey - the y valueReturns: the distance between the vector's head and x and y
+
+
+
+
+
+
+
+
+
+
+
+
+cross
+public float cross(float x,
+ float y)
+Returns the cross product between this vector and an x and y value
+
+Parameters: x - the x valuey - the y valueReturns: the cross product between this, and x and y.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
World
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+Entity [][]tiles
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+World Entity [][] tiles,
+ HashSet <Entity > entities,
+ InputHandler inputHandler)Main world constructor to define tiles, entities, and the input handler
+
+
+World Entity [][] tiles,
+ InputHandler inputHandler)World constructor that assumes an empty container of entity characters
+
+
+World InputHandler inputHandler)World constructor that make empty tiles and container of entity characters
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+tiles
+public Entity [][] tiles
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+World
+public World(Entity [][] tiles,
+ HashSet <Entity > entities,
+ InputHandler inputHandler)
+Main world constructor to define tiles, entities, and the input handler
+
+Parameters: tiles - the tile entitiesentities - the entity charactersinputHandler - the main input handler
+
+
+
+
+
+
+
+World
+public World(Entity [][] tiles,
+ InputHandler inputHandler)
+World constructor that assumes an empty container of entity characters
+
+Parameters: tiles - the tile entitiesinputHandler - the main input handler
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+update
+public void update()
+Updates the world
+
+
+
+
+
+
+
Command
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+Summary:
+Nested |
+Field |
+Constr |
+Method
+
+Detail:
+Field |
+Constr |
+Method
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+execute
+void execute()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Summary:
+Nested |
+Field |
+Constr |
+Method
+
+Detail:
+Field |
+Constr |
+Method
+
+
+
+ InteractCommand
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.commands.InteractCommand
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+execute
+public void execute()
+Executes the command
+
+Specified by: execute Command
+
+
+
+
+
+
+
+
+
+
+
MoveCommand
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.commands.MoveCommand
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+MoveCommand PositionComponent positionComponent,
+ Point moveTo)Creates a move command with a position and a point to move it to
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+moveTo
+public Point moveTo
+
+
+
+
+
+
+
+beforeMove
+public Point beforeMove
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+MoveCommand
+public MoveCommand(PositionComponent positionComponent,
+ Point moveTo)
+Creates a move command with a position and a point to move it to
+
+Parameters: positionComponent - the position componentmoveTo - the point to move to
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+execute
+public void execute()
+Executes the move
+
+Specified by: execute Command
+
+
+
+
+
+
+
+undo
+public void undo()
+Undoes the last move
+
+Specified by: undo Command
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.commands
+
+
Interfaces
+
+
Classes
+
+
edu.ucsb.cs56.projects.games.pokemon.commands
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Interface Summary
+Interface
+Description
+
+
+
+Command
+An interface for commands
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+InteractCommand
+A command to handle interaction
+
+
+
+MoveCommand
+A command to handle movement
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.commands Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+edu.ucsb.cs56.projects.games.pokemon.commands.InteractCommand Command )
+edu.ucsb.cs56.projects.games.pokemon.commands.MoveCommand Command )
+
+
+
+
Interface Hierarchy
+
+edu.ucsb.cs56.projects.games.pokemon.commands.Command
+
+
CollisionComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+booleanhasCollision
+
+intheight
+
+intwidth
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+CollisionComponent
+
+CollisionComponent Creates a CollisionComponent from a boolean value, width, and height
+ The entity's hitbox is constructed elsewhere using the width and height values
+
+
+CollisionComponent Rectangle bounds)Creates a CollisionComponent from a boolean value and the width/height values
+ of a Rectangle
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+width
+public int width
+
+
+
+
+
+
+
+height
+public int height
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+CollisionComponent
+public CollisionComponent(boolean objectHasCollision,
+ int objectWidth,
+ int objectHeight)
+Creates a CollisionComponent from a boolean value, width, and height
+ The entity's hitbox is constructed elsewhere using the width and height values
+
+Parameters: objectHasCollision - true if the entity is collideable, false if notobjectWidth - width of the entityobjectHeight - height of the entity
+
+
+
+
+
+
+
+CollisionComponent
+public CollisionComponent(boolean objectHasCollision,
+ Rectangle bounds)
+Creates a CollisionComponent from a boolean value and the width/height values
+ of a Rectangle
+
+Parameters: objectHasCollision - true if the entity is collideable, false if notbounds - The bounds of the entity's rectangular hitbox
+
+
+
+
+
+
+
+
+
+
+
Component
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Detail:
+Field |
+Constr | Method
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.components.Component
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Component
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Component
+public Component()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Detail:
+Field |
+Constr | Method
+
+
+
+
+ ControllableComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+ControllableComponent Controller controller)Construcst a controllable component from a controller
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
Controller
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.components.Controller
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Controller
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Controller
+public Controller()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
Entity
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.components.Entity
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Entity Creates an entity with no components
+
+
+Entity ArrayList <Component > components)Creates an entity with components
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GraphicsComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
MovementComponent.Direction
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Enum Constant Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+valueOf
+public static MovementComponent.Direction valueOf(String name)
+Returns the enum constant of this type with the specified name.
+The string must match exactly an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)
+
+Parameters: name - the name of the enum constant to be returned.Returns: the enum constant with the specified name
+Throws: IllegalArgumentException NullPointerException
+
+
+
+
+
+
+
MovementComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Nested Class Summary
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+Vector2 velocity
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+MovementComponent Vector2 velocity)Constructs a movement component from a Vector2
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+velocity
+public Vector2 velocity
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
PlayerController
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+PlayerController
+public PlayerController(Entity entity,
+ World world,
+ InputHandler inputHandler)
+Creates a player controller
+
+Parameters: entity - the entity to controlworld - the world the entity resides ininputHandler - the input handler
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+update
+public void update()
+
+Specified by: update Controller
+
+
+
+
+
+
+
PokemonController
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+update
+public void update()
+
+Specified by: update Controller
+
+
+
+
+
+
+
PositionComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+PositionComponent Creates a position component from a x and y value with a offset of 0, 0
+
+
+PositionComponent Vector2 offset)Creates a postition component from an x and y value and a offset
+
+
+PositionComponent Point position)Creates a position component from a Point with a offset of 0, 0
+
+
+PositionComponent Point position,
+ Vector2 offset)Creates a position component from a point and a offset
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+position
+public Point position
+
+
+
+
+
+
+
+offset
+public Vector2 offset
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+PositionComponent
+public PositionComponent(int x,
+ int y,
+ Vector2 offset)
+Creates a postition component from an x and y value and a offset
+
+Parameters: x - the x valuey - the y valueoffset - the Vector2 for offset
+
+
+
+
+
+
+
+PositionComponent
+public PositionComponent(Point position,
+ Vector2 offset)
+Creates a position component from a point and a offset
+
+Parameters: position - the Pointoffset - the Vector2 for offset
+
+
+
+
+
+
+
+PositionComponent
+public PositionComponent(int x,
+ int y)
+Creates a position component from a x and y value with a offset of 0, 0
+
+Parameters: x - the x valuey - the y value
+
+
+
+
+
+
+
+PositionComponent
+public PositionComponent(Point position)
+Creates a position component from a Point with a offset of 0, 0
+
+Parameters: position - the Point
+
+
+
+
+
+
+
TileComponent
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+intID
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+TileComponent Constructs a tile component with an ID
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.components
+edu.ucsb.cs56.projects.games.pokemon.components
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/components/package-tree.html b/docs/edu/ucsb/cs56/projects/games/pokemon/components/package-tree.html
new file mode 100644
index 0000000..c054c95
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/components/package-tree.html
@@ -0,0 +1,163 @@
+
+
+
+
+
+edu.ucsb.cs56.projects.games.pokemon.components Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+edu.ucsb.cs56.projects.games.pokemon.components.Component
+edu.ucsb.cs56.projects.games.pokemon.components.Controller
+edu.ucsb.cs56.projects.games.pokemon.components.Entity
+
+
+
+
Enum Hierarchy
+
+
BuildingFactory
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.factories.BuildingFactory
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+BuildingFactory
+public BuildingFactory()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+constructBuildingEntity
+public static Entity constructBuildingEntity(String buildingType,
+ int x,
+ int y)
+Creates and adds a building entity to the world, built with the specifications you give it.
+
+Parameters: buildingType - The type of building you wish to createx: - New building's X coordinatey: - New Building's Y coordinateReturns: the new constructed building entity
+
+
+
+
+
+
+
+
ObstacleFactory
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.factories.ObstacleFactory
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+ObstacleFactory
+public ObstacleFactory()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+constructObstacleEntity
+public static Entity constructObstacleEntity(String obstacleType,
+ int x,
+ int y)
+Creates and adds an obstacle entity to the world, built with the specifications you give it.
+
+ This has been made separate from the BuildingFactory to account for the possibility of a future
+ Group that might want to create the ability to enter buildings and load a new map.
+
+Parameters: obstacleType - The type of building you wish to createx: - New building's X coordinatey: - New Building's Y coordinateReturns: the new constructed obstacle entity
+
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.factories
+edu.ucsb.cs56.projects.games.pokemon.factories
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+BuildingFactory
+Created by John Bowman on 11/8/2016.
+
+
+
+ObstacleFactory
+Created by John Bowman on 11/16/2016.
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.factories Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/framework/Main.html b/docs/edu/ucsb/cs56/projects/games/pokemon/framework/Main.html
new file mode 100644
index 0000000..bcf96c7
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/framework/Main.html
@@ -0,0 +1,281 @@
+
+
+
+
+
+Main
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.framework.Main
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Main
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Main
+public Main()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
MainWindow
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Nested Class Summary
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+MainWindow Constructs the main window
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Static Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+voidaddKeyListener KeyListener kl)
+
+protected voiddraw SpriteBatch spriteBatch,
+ float gameTime)Moves the rendeering forward a delta time and draws to the screen
+
+
+protected voidinit Initializes game logic code
+
+
+protected voidload Loads game assets
+
+
+voidrun Starts running the program
+
+
+protected static voidsetMap String map)Sets the map
+
+
+protected voidupdate Moves the game forward a delta time and updates it
+
+
+
+
+
+
+
+Methods inherited from class javax.swing.JComponent
+addAncestorListener , addNotify , addVetoableChangeListener , computeVisibleRect , contains , createToolTip , disable , enable , firePropertyChange , firePropertyChange , firePropertyChange , fireVetoableChange , getActionForKeyStroke , getActionMap , getAlignmentX , getAlignmentY , getAncestorListeners , getAutoscrolls , getBaseline , getBaselineResizeBehavior , getBorder , getBounds , getClientProperty , getComponentGraphics , getComponentPopupMenu , getConditionForKeyStroke , getDebugGraphicsOptions , getDefaultLocale , getFontMetrics , getGraphics , getHeight , getInheritsPopupMenu , getInputMap , getInputMap , getInputVerifier , getInsets , getInsets , getListeners , getLocation , getMaximumSize , getMinimumSize , getNextFocusableComponent , getPopupLocation , getPreferredSize , getRegisteredKeyStrokes , getRootPane , getSize , getToolTipLocation , getToolTipText , getToolTipText , getTopLevelAncestor , getTransferHandler , getVerifyInputWhenFocusTarget , getVetoableChangeListeners , getVisibleRect , getWidth , getX , getY , grabFocus , hide , isDoubleBuffered , isLightweightComponent , isManagingFocus , isOpaque , isOptimizedDrawingEnabled , isPaintingForPrint , isPaintingOrigin , isPaintingTile , isRequestFocusEnabled , isValidateRoot , paint , paintBorder , paintChildren , paintComponent , paintImmediately , paintImmediately , print , printAll , printBorder , printChildren , printComponent , processComponentKeyEvent , processKeyBinding , processKeyEvent , processMouseEvent , processMouseMotionEvent , putClientProperty , registerKeyboardAction , registerKeyboardAction , removeAncestorListener , removeNotify , removeVetoableChangeListener , repaint , repaint , requestDefaultFocus , requestFocus , requestFocus , requestFocusInWindow , requestFocusInWindow , resetKeyboardActions , reshape , revalidate , scrollRectToVisible , setActionMap , setAlignmentX , setAlignmentY , setAutoscrolls , setBackground , setBorder , setComponentPopupMenu , setDebugGraphicsOptions , setDefaultLocale , setDoubleBuffered , setEnabled , setFocusTraversalKeys , setFont , setForeground , setInheritsPopupMenu , setInputMap , setInputVerifier , setMaximumSize , setMinimumSize , setNextFocusableComponent , setOpaque , setPreferredSize , setRequestFocusEnabled , setToolTipText , setTransferHandler , setUI , setVerifyInputWhenFocusTarget , setVisible , unregisterKeyboardAction , update
+
+
+
+
+Methods inherited from class java.awt.Container
+add , add , add , add , add , addContainerListener , addImpl , addPropertyChangeListener , addPropertyChangeListener , applyComponentOrientation , areFocusTraversalKeysSet , countComponents , deliverEvent , doLayout , findComponentAt , findComponentAt , getComponent , getComponentAt , getComponentAt , getComponentCount , getComponents , getComponentZOrder , getContainerListeners , getFocusTraversalKeys , getFocusTraversalPolicy , getLayout , getMousePosition , insets , invalidate , isAncestorOf , isFocusCycleRoot , isFocusCycleRoot , isFocusTraversalPolicyProvider , isFocusTraversalPolicySet , layout , list , list , locate , minimumSize , paintComponents , preferredSize , printComponents , processContainerEvent , processEvent , remove , remove , removeAll , removeContainerListener , setComponentZOrder , setFocusCycleRoot , setFocusTraversalPolicy , setFocusTraversalPolicyProvider , setLayout , transferFocusDownCycle , validate , validateTree
+
+
+
+
+Methods inherited from class java.awt.Component
+action , add , addComponentListener , addFocusListener , addHierarchyBoundsListener , addHierarchyListener , addInputMethodListener , addMouseListener , addMouseMotionListener , addMouseWheelListener , bounds , checkImage , checkImage , coalesceEvents , contains , createImage , createImage , createVolatileImage , createVolatileImage , disableEvents , dispatchEvent , enable , enableEvents , enableInputMethods , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , firePropertyChange , getBackground , getBounds , getColorModel , getComponentListeners , getComponentOrientation , getCursor , getDropTarget , getFocusCycleRootAncestor , getFocusListeners , getFocusTraversalKeysEnabled , getFont , getForeground , getGraphicsConfiguration , getHierarchyBoundsListeners , getHierarchyListeners , getIgnoreRepaint , getInputContext , getInputMethodListeners , getInputMethodRequests , getKeyListeners , getLocale , getLocation , getLocationOnScreen , getMouseListeners , getMouseMotionListeners , getMousePosition , getMouseWheelListeners , getName , getParent , getPeer , getPropertyChangeListeners , getPropertyChangeListeners , getSize , getToolkit , getTreeLock , gotFocus , handleEvent , hasFocus , imageUpdate , inside , isBackgroundSet , isCursorSet , isDisplayable , isEnabled , isFocusable , isFocusOwner , isFocusTraversable , isFontSet , isForegroundSet , isLightweight , isMaximumSizeSet , isMinimumSizeSet , isPreferredSizeSet , isShowing , isValid , isVisible , keyDown , keyUp , list , list , list , location , lostFocus , mouseDown , mouseDrag , mouseEnter , mouseExit , mouseMove , mouseUp , move , nextFocus , paintAll , postEvent , prepareImage , prepareImage , processComponentEvent , processFocusEvent , processHierarchyBoundsEvent , processHierarchyEvent , processInputMethodEvent , processMouseWheelEvent , remove , removeComponentListener , removeFocusListener , removeHierarchyBoundsListener , removeHierarchyListener , removeInputMethodListener , removeKeyListener , removeMouseListener , removeMouseMotionListener , removeMouseWheelListener , removePropertyChangeListener , removePropertyChangeListener , repaint , repaint , repaint , resize , resize , setBounds , setBounds , setComponentOrientation , setCursor , setDropTarget , setFocusable , setFocusTraversalKeysEnabled , setIgnoreRepaint , setLocale , setLocation , setLocation , setName , setSize , setSize , show , show , size , toString , transferFocus , transferFocusBackward , transferFocusUpCycle
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+load
+protected void load()
+Loads game assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+draw
+protected void draw(SpriteBatch spriteBatch,
+ float gameTime)
+Moves the rendeering forward a delta time and draws to the screen
+
+Parameters: spriteBatch - the SpriteBatch that draws to the screengameTime - the delta time
+
+
+
+
+
+
+
+
+
+
+
Pair
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.framework.Pair<T,U>
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+T first
+
+U second
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Pair T first,
+ U second)Takes two references and stores them as pairs
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+booleanequals Object o)Checks if the two pairs are equal by seeing if the corresponding first and second pairs are the same
+
+
+inthashCode Gives a unique hash code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+first
+public T first
+
+
+
+
+
+
+
+second
+public U second
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+hashCode
+public int hashCode()
+Gives a unique hash code
+
+Overrides: hashCode Object Returns: a hash code
+
+
+
+
+
+
+
+
Ref
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.framework.Ref<T>
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+T reference
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Ref
+
+Ref T object)
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+reference
+public T reference
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
+Ref
+public Ref(T object)
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.framework
+edu.ucsb.cs56.projects.games.pokemon.framework
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+Main
+Starting point for the game.
+
+
+
+MainWindow
+The window frame for the Pokemon map game
+
+
+
+Pair <T,U>
+A data structure for a pair
+
+
+
+Ref <T>
+A data structure for a reference
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.framework Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/graphics/Animation.html b/docs/edu/ucsb/cs56/projects/games/pokemon/graphics/Animation.html
new file mode 100644
index 0000000..6ae2442
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/graphics/Animation.html
@@ -0,0 +1,382 @@
+
+
+
+
+
+Animation
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.graphics.Animation
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Animation AnimationFrame [] animationList)Creates an animation from an array of frames
+
+
+Animation Texture texture)Creates an animation with a single texture
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+advance
+public void advance(float timeDelta,
+ MovementComponent direction)
+Moves the animation forward by a delta time
+
+Parameters: timeDelta - the delta timedirection - the direction the character is moving
+
+
+
+
+
+
+
+runOnce
+public void runOnce()
+
+
+
+
+
+
+
+run
+public void run()
+
+
+
+
+
+
+
+freeze
+public void freeze()
+
+
+
+
+
+
+
+halt
+public void halt()
+
+
+
+
+
+
+
AnimationFrame
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.graphics.AnimationFrame
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+AnimationFrame Texture texture)Creates an animation frame from a texture, assumes 1 frame length long
+
+
+AnimationFrame Texture texture,
+ float frameLength)Creates an animation frame from a texture and a frame length
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+booleanequals Object o)Checks if two Animation frames are equal dependent on their texture and frame length
+
+
+inthashCode Returns a unique hash code for a animation frame
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+AnimationFrame
+public AnimationFrame(Texture texture)
+Creates an animation frame from a texture, assumes 1 frame length long
+
+Parameters: texture - the texture
+
+
+
+
+
+
+
+AnimationFrame
+public AnimationFrame(Texture texture,
+ float frameLength)
+Creates an animation frame from a texture and a frame length
+
+Parameters: texture - the textureframeLength - the frame length
+
+
+
+
+
+
+
+
+
SpriteBatch
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.graphics.SpriteBatch
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+SpriteBatch Image image)Creates a sprite batch with a image
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+draw
+public void draw(Texture texture,
+ Point position)
+Draws a texture to the screen at a specific position
+
+Parameters: texture - the textureposition - the position
+
+
+
+
+
+
+
+draw
+public void draw(Texture texture,
+ Rectangle destRect)
+Draws a texture to the screen at a specific rectangle
+
+Parameters: texture - the texturedestRect - the rectangle
+
+
+
+
+
+
+
+
+
+
+
Texture
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.graphics.Texture
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Texture BufferedImage tileSheet,
+ int x,
+ int y,
+ int width,
+ int height)Creates a texture from a tile sheet and its x, y value on the sheet, and its width and height
+
+
+Texture BufferedImage tileSheet,
+ Rectangle bounds)Creates a texture from a tile sheet and a rectangle of its position
+
+
+
+
+
+
+
+
+Method Summary
+
+All Methods Instance Methods Concrete Methods
+Modifier and Type
+Method and Description
+
+
+BufferedImage getTileSheet Returns the tile sheet
+
+
+intheight Returns the height
+
+
+Rectangle srcRect Returns the bounds of the texture
+
+
+intsrcX1 Returns the x coordinate in the left of the texture
+
+
+intsrcX2 Returns the x coordinate on the right of the texture
+
+
+intsrcY1 Returns the y value on the top of the texture
+
+
+intsrcY2 Returns the y value on the bottom of the texture
+
+
+intwidth Returns the width
+
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Texture
+public Texture(BufferedImage tileSheet,
+ Rectangle bounds)
+Creates a texture from a tile sheet and a rectangle of its position
+
+Parameters: tileSheet - the tile sheetbounds - the bounds of the texture
+
+
+
+
+
+
+
+Texture
+public Texture(BufferedImage tileSheet,
+ int x,
+ int y,
+ int width,
+ int height)
+Creates a texture from a tile sheet and its x, y value on the sheet, and its width and height
+
+Parameters: tileSheet - the tile sheetx - the x valuey - the y valuewidth - the widthheight - the height
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+width
+public int width()
+Returns the width
+
+Returns: the width
+
+
+
+
+
+
+
+
+height
+public int height()
+Returns the height
+
+Returns: height
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.graphics
+edu.ucsb.cs56.projects.games.pokemon.graphics
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+Animation
+A class to store and handle animation
+
+
+
+AnimationFrame
+A single animation frame
+
+
+
+SpriteBatch
+A sprite batch to handle drawing
+
+
+
+Texture
+The class for objects of type Texture.
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.graphics Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+edu.ucsb.cs56.projects.games.pokemon.graphics.Animation
+edu.ucsb.cs56.projects.games.pokemon.graphics.AnimationFrame
+edu.ucsb.cs56.projects.games.pokemon.graphics.SpriteBatch
+edu.ucsb.cs56.projects.games.pokemon.graphics.Texture
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon
+edu.ucsb.cs56.projects.games.pokemon
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+Assets
+Contains all Assets and initializes them
+
+
+
+Game
+Put ALL game logic in this class, or in objects rooted in this class
+
+
+
+InputHandler
+Handles the input
+
+
+
+TextBox
+This class doesn't do anything yet and is a basic stub for later addition for text boxes
+
+
+
+TileData
+Class to contain TileData
+
+
+
+Vector2
+Stores an x and y value to do vector operations
+
+
+
+World
+Contains tiles and NPCs as entities
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.html b/docs/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.html
new file mode 100644
index 0000000..4f6e1f2
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.html
@@ -0,0 +1,362 @@
+
+
+
+
+
+MovementSystem
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+MovementSystem
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+MovementSystem
+public MovementSystem()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+applyMovement
+public void applyMovement(float deltaT,
+ World world)
+Handles movement and applies it a delta time forward
+
+Parameters: deltaT - the delta timeworld - the world
+
+
+
+
+
+
+
+overLaps
+public boolean overLaps(PositionComponent PC1,
+ MovementComponent MC1,
+ Entity [] entities,
+ Entity [][] tiles)
+A method to check to see if one entity overlaps another
+
+Parameters: PC1 - the position component of the moving objectMC1 - the movement component of the moving objectentities - the list of the world's entitiestiles - the array of tiles in the worldReturns: a boolean that determines whether an entity overlaps another entity with collision
+
+
+
+
+
+
+
+
+
+
+
+
RenderSystem
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+RenderSystem Rectangle cameraBounds)Creates a render system with camera bounds
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+draw
+public void draw(SpriteBatch spriteBatch,
+ World world)
+Draws the elements to the screen with a SpriteBatch
+
+Parameters: spriteBatch - the SpriteBatchworld - the world
+
+
+
+
+
+
+
+
+
+
+
SystemBase
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemBase
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+SystemBase
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+SystemBase
+public SystemBase()
+
+
+
+
+
+
+
+
+
SystemMessage
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemMessage
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+Modifier and Type
+Field and Description
+
+
+Entity subject
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+SystemMessage Entity subject,
+ Pair <String ,Object > message)Creates a system message with a subject (Entity) and a message (Pair)
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Field Detail
+
+
+
+
+
+subject
+public Entity subject
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+SystemMessage
+public SystemMessage(Entity subject,
+ Pair <String ,Object > message)
+Creates a system message with a subject (Entity) and a message (Pair)
+
+Parameters: subject - the subjectmessage - the message
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
SystemMessenger
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemMessenger
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+SystemMessenger Creates a SystemMessenger
+
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.systems
+edu.ucsb.cs56.projects.games.pokemon.systems
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+MovementSystem
+Handles all movement
+
+
+
+RenderSystem
+Handles all rendering
+
+
+
+SystemBase
+Abstract class for all classes that use System messages
+
+
+
+SystemMessage
+Stores data on a subject and a message to be applied to the subject
+
+
+
+SystemMessenger
+Stores system messages to be handled
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.systems Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/edu/ucsb/cs56/projects/games/pokemon/tests/Vector2Test.html b/docs/edu/ucsb/cs56/projects/games/pokemon/tests/Vector2Test.html
new file mode 100644
index 0000000..6d1709f
--- /dev/null
+++ b/docs/edu/ucsb/cs56/projects/games/pokemon/tests/Vector2Test.html
@@ -0,0 +1,322 @@
+
+
+
+
+
+Vector2Test
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+
+
+java.lang.Object
+
+edu.ucsb.cs56.projects.games.pokemon.tests.Vector2Test
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+Constructor and Description
+
+
+Vector2Test
+
+
+
+
+
+
+
+Method Summary
+
+
+
+
+
+Methods inherited from class java.lang.Object
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+
+
+Vector2Test
+public Vector2Test()
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+testAdd
+public void testAdd()
+
+
+
+
+
+
+
+
+
+
+
+testMult
+public void testMult()
+
+
+
+
+
+
+
+
+Prev Class
+Next Class
+
+
+
+
+
+
+
+
+
+ edu.ucsb.cs56.projects.games.pokemon.tests
+edu.ucsb.cs56.projects.games.pokemon.tests
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+Class Summary
+Class
+Description
+
+
+
+Vector2Test
+Created by William Bennett on 7/27/2016.
+
+
+
+
+
+
+
edu.ucsb.cs56.projects.games.pokemon.tests Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/help-doc.html b/docs/help-doc.html
new file mode 100644
index 0000000..e9366af
--- /dev/null
+++ b/docs/help-doc.html
@@ -0,0 +1,223 @@
+
+
+
+
+
+API Help
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+Overview
+The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
+
+
+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
+
+
+
+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. Index
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+A B C D E F G H I K L M N O P R S T U V W X Y Z
+
+
+
A
+
+add(Vector2) Vector2
+Adds a Vector2 on to this one
+
+add(float, float) Vector2
+Adds an x and y value on to our vector
+
+addComponent(Component) Entity
+Adds a component, can be chained
+
+addEntity(Entity) World
+Adds entity to the hash set
+
+addKeyListener(KeyListener) MainWindow
+advance(float, MovementComponent) Animation
+Moves the animation forward by a delta time
+
+advanceText() TextBox
+Advances the text
+
+angle() Vector2
+Returns the angle of this vector from the x axis
+
+animation GraphicsComponent
+Animation edu.ucsb.cs56.projects.games.pokemon.graphics
+A class to store and handle animation
+
+Animation(Texture) Animation
+Creates an animation with a single texture
+
+Animation(AnimationFrame[]) Animation
+Creates an animation from an array of frames
+
+AnimationFrame edu.ucsb.cs56.projects.games.pokemon.graphics
+A single animation frame
+
+AnimationFrame(Texture) AnimationFrame
+Creates an animation frame from a texture, assumes 1 frame length long
+
+AnimationFrame(Texture, float) AnimationFrame
+Creates an animation frame from a texture and a frame length
+
+applyMovement(float, World) MovementSystem
+Handles movement and applies it a delta time forward
+
+Assets edu.ucsb.cs56.projects.games.pokemon
+Contains all Assets and initializes them
+
+Assets() Assets
+
+
+
+
+
B
+
+beforeMove MoveCommand
+bigBuilding2Left Assets
+bigBuilding2Right Assets
+bigBuildingLeft Assets
+bigBuildingRight Assets
+bigFish Assets
+bigPokemon Assets
+bigRock Assets
+BuildingFactory edu.ucsb.cs56.projects.games.pokemon.factories
+Created by John Bowman on 11/8/2016.
+
+BuildingFactory() BuildingFactory
+
+
+
+
+
C
+
+CollisionComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component for handling collision of entities
+
+CollisionComponent(boolean, int, int) CollisionComponent
+Creates a CollisionComponent from a boolean value, width, and height
+ The entity's hitbox is constructed elsewhere using the width and height values
+
+CollisionComponent(boolean, Rectangle) CollisionComponent
+Creates a CollisionComponent from a boolean value and the width/height values
+ of a Rectangle
+
+CollisionComponent() CollisionComponent
+Command edu.ucsb.cs56.projects.games.pokemon.commands
+An interface for commands
+
+Component edu.ucsb.cs56.projects.games.pokemon.components
+Component is a abstract class that allow you to define a part of an entity
+
+Component() Component
+constructBuildingEntity(String, int, int) BuildingFactory
+Creates and adds a building entity to the world, built with the specifications you give it.
+
+constructObstacleEntity(String, int, int) ObstacleFactory
+Creates and adds an obstacle entity to the world, built with the specifications you give it.
+
+ControllableComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component to control a entity
+
+ControllableComponent(Controller) ControllableComponent
+Construcst a controllable component from a controller
+
+controller ControllableComponent
+Controller edu.ucsb.cs56.projects.games.pokemon.components
+An abstract class to define a controller
+
+Controller() Controller
+cpy() Vector2
+Returns a copy of this vector
+
+cross(Vector2) Vector2
+Returns the cross product between this vector and another Vector2
+
+cross(float, float) Vector2
+Returns the cross product between this vector and an x and y value
+
+currentFrame() Animation
+Gives the current frame
+
+
+
+
+
+
D
+
+dequeue() SystemMessenger
+Dequeues the next SystemMessage
+
+distance(Vector2) Vector2
+Returns the distance between two vectors' heads
+
+distance(float, float) Vector2
+Returns the distance between this vector's head and an x and y value
+
+door Assets
+dot(Vector2) Vector2
+Returns the dot product between this vector and another Vector2
+
+dot(float, float) Vector2
+Returns the dot product between this vector and an x and y value
+
+draw(SpriteBatch, float) MainWindow
+Moves the rendeering forward a delta time and draws to the screen
+
+draw(SpriteBatch, float) Game
+Draw to the screen using a sprite batch and a delta time
+
+draw(Texture, Point) SpriteBatch
+Draws a texture to the screen at a specific position
+
+draw(Texture, Rectangle) SpriteBatch
+Draws a texture to the screen at a specific rectangle
+
+draw(SpriteBatch, World) RenderSystem
+Draws the elements to the screen with a SpriteBatch
+
+
+
+
+
+
E
+
+edu.ucsb.cs56.projects.games.pokemon - package edu.ucsb.cs56.projects.games.pokemon
+edu.ucsb.cs56.projects.games.pokemon.commands - package edu.ucsb.cs56.projects.games.pokemon.commands
+edu.ucsb.cs56.projects.games.pokemon.components - package edu.ucsb.cs56.projects.games.pokemon.components
+edu.ucsb.cs56.projects.games.pokemon.factories - package edu.ucsb.cs56.projects.games.pokemon.factories
+edu.ucsb.cs56.projects.games.pokemon.framework - package edu.ucsb.cs56.projects.games.pokemon.framework
+edu.ucsb.cs56.projects.games.pokemon.graphics - package edu.ucsb.cs56.projects.games.pokemon.graphics
+edu.ucsb.cs56.projects.games.pokemon.IO - package edu.ucsb.cs56.projects.games.pokemon.IO
+edu.ucsb.cs56.projects.games.pokemon.systems - package edu.ucsb.cs56.projects.games.pokemon.systems
+edu.ucsb.cs56.projects.games.pokemon.tests - package edu.ucsb.cs56.projects.games.pokemon.tests
+enqueue(SystemMessage) SystemMessenger
+Enqueues a SystemMessage
+
+Entity edu.ucsb.cs56.projects.games.pokemon.components
+A class to hold components that make up an entity
+
+Entity() Entity
+Creates an entity with no components
+
+Entity(ArrayList<Component>) Entity
+Creates an entity with components
+
+equals(Object) Pair
+Checks if the two pairs are equal by seeing if the corresponding first and second pairs are the same
+
+equals(Object) AnimationFrame
+Checks if two Animation frames are equal dependent on their texture and frame length
+
+equals(Object) TileData
+Overrides the equal method of Object to check if the tileID is the same
+
+execute() Command
+execute() InteractCommand
+Executes the command
+
+execute() MoveCommand
+Executes the move
+
+
+
+
+
+
F
+
+first Pair
+flower Assets
+flower2 Assets
+flower3 Assets
+frameLength AnimationFrame
+freeze() Animation
+
+
+
+
+
G
+
+Game edu.ucsb.cs56.projects.games.pokemon
+Put ALL game logic in this class, or in objects rooted in this class
+
+Game() Game
+Game constructor that simply calls the constructor of its super class, MainWindow
+
+getBackBuffer() SpriteBatch
+Retrieves the image in the back buffer
+
+getComponent(Class) Entity
+Returns a specific component in the entity
+
+getComponents() Entity
+Returns the ArrayList of components
+
+getCurrentText() TextBox
+Returns the current text
+
+getDirection() MovementComponent
+Returns one of four Directions that the Entity is facing
+
+getEntities() World
+Returns an array of the entities
+
+getMessage(String, Ref<Object>) SystemMessage
+getTexture(String) Assets
+getTileSheet() Texture
+Returns the tile sheet
+
+god Assets
+GraphicsComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component to handle graphics of the entity
+
+GraphicsComponent(Texture) GraphicsComponent
+Constructs a graphics component from a static texture
+
+GraphicsComponent(Animation) GraphicsComponent
+Constructs a graphcis component from an Animation
+
+grass_Default Assets
+grass_Wild Assets
+
+
+
+
+
H
+
+halt() Animation
+handleMessages() InputHandler
+Satisfies the SystemBase extension, currently does nothing
+
+handleMessages() MovementSystem
+Handles the message for a movement change
+
+handleMessages() RenderSystem
+Handles messages for the render system
+
+handleMessages() SystemBase
+hasCollision CollisionComponent
+hashCode() Pair
+Gives a unique hash code
+
+hashCode() AnimationFrame
+Returns a unique hash code for a animation frame
+
+hashCode() TileData
+Overrides the hashCode method of Object to return the hashCode of the tileID
+
+height CollisionComponent
+height() Texture
+Returns the height
+
+
+
+
+
+
I
+
+ID TileComponent
+IDToCollision(int) TileData
+IDToTexture(int) TileData
+Returns the texture type associated with the tileID.
+
+init() MainWindow
+Initializes game logic code
+
+init() Game
+Initialize all non-asset resources such as the world, the system manager, the maploader, etc.
+
+initAssets() Assets
+Initializes the assets
+
+InputHandler edu.ucsb.cs56.projects.games.pokemon
+Handles the input
+
+InputHandler() InputHandler
+InteractCommand edu.ucsb.cs56.projects.games.pokemon.commands
+A command to handle interaction
+
+InteractCommand(PositionComponent, World) InteractCommand
+Constructor for an InteractCommand
+
+IOHelper edu.ucsb.cs56.projects.games.pokemon.IO
+Reads characters from a string one at a time
+
+IOHelper(String) IOHelper
+Creates a IOHelper with a string
+
+isDone() TextBox
+Returns if the text box is done displaying text
+
+isEmpty() SystemMessenger
+Returns if the front buffer is empty
+
+
+
+
+
+
K
+
+keyPressed(KeyEvent) InputHandler
+Checks if a key is pressed, then set that in the boolean array
+
+keyReleased(KeyEvent) InputHandler
+Checks if a key is released, then set that in the boolean array
+
+keys InputHandler
+keyTyped(KeyEvent) InputHandler
+Checks if a key is typed, but currently only added to satisfy the key listener interface
+
+
+
+
+
+
L
+
+largeHouse Assets
+load() MainWindow
+Loads game assets
+
+load() Game
+Load all asset resources such as textures and sound
+
+loadMap(String, World) MapLoader
+Loads the map from a String and puts it into a world object
+
+
+
+
+
+
M
+
+Main edu.ucsb.cs56.projects.games.pokemon.framework
+Starting point for the game.
+
+Main() Main
+main(String[]) Main
+The starting point for the pokemon map game
+
+MainWindow edu.ucsb.cs56.projects.games.pokemon.framework
+The window frame for the Pokemon map game
+
+MainWindow() MainWindow
+Constructs the main window
+
+MapLoader edu.ucsb.cs56.projects.games.pokemon.IO
+Loads the Map
+
+MapLoader() MapLoader
+mediumHouse Assets
+merge() SystemMessenger
+Merges the front buffer and back buffer
+
+messenger SystemBase
+MoveCommand edu.ucsb.cs56.projects.games.pokemon.commands
+A command to handle movement
+
+MoveCommand(PositionComponent, Point) MoveCommand
+Creates a move command with a position and a point to move it to
+
+moveCommand InputHandler
+MovementComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component to handle movement of the entity
+
+MovementComponent(Vector2) MovementComponent
+Constructs a movement component from a Vector2
+
+MovementComponent.Direction edu.ucsb.cs56.projects.games.pokemon.components
+MovementSystem edu.ucsb.cs56.projects.games.pokemon.systems
+Handles all movement
+
+MovementSystem() MovementSystem
+moveTo MoveCommand
+mult(float) Vector2
+Multiplies the vector by a scalar
+
+
+
+
+
+
N
+
+niceTree Assets
+
+
+
+
+
O
+
+ObstacleFactory edu.ucsb.cs56.projects.games.pokemon.factories
+Created by John Bowman on 11/16/2016.
+
+ObstacleFactory() ObstacleFactory
+offset PositionComponent
+overLaps(PositionComponent, MovementComponent, Entity[], Entity[][]) MovementSystem
+A method to check to see if one entity overlaps another
+
+
+
+
+
+
P
+
+Pair T ,U > - Class in edu.ucsb.cs56.projects.games.pokemon.framework
+A data structure for a pair
+
+Pair(T, U) Pair
+Takes two references and stores them as pairs
+
+pc InteractCommand
+peek() SystemMessenger
+Peeks the next SystemMessage, but does not dequeue
+
+player0 Assets
+player0f Assets
+player1 Assets
+player10 Assets
+player10f Assets
+player11 Assets
+player11f Assets
+player1f Assets
+player2 Assets
+player2f Assets
+player3 Assets
+player3f Assets
+player4 Assets
+player4f Assets
+player5 Assets
+player5f Assets
+player6 Assets
+player6f Assets
+player7 Assets
+player7f Assets
+player8 Assets
+player8f Assets
+player9 Assets
+player9f Assets
+playerAnimation Assets
+PlayerController edu.ucsb.cs56.projects.games.pokemon.components
+A class to control a Player
+
+PlayerController(Entity, World, InputHandler) PlayerController
+Creates a player controller
+
+pokeball Assets
+pokecenter Assets
+pokemart Assets
+PokemonController edu.ucsb.cs56.projects.games.pokemon.components
+A class to control a specific pokemon entity
+
+PokemonController(Entity, InputHandler) PokemonController
+Creates a pokemon controller
+
+position PositionComponent
+positionComponent MoveCommand
+PositionComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component for the position of the entity
+
+PositionComponent(int, int, Vector2) PositionComponent
+Creates a postition component from an x and y value and a offset
+
+PositionComponent(Point, Vector2) PositionComponent
+Creates a position component from a point and a offset
+
+PositionComponent(int, int) PositionComponent
+Creates a position component from a x and y value with a offset of 0, 0
+
+PositionComponent(Point) PositionComponent
+Creates a position component from a Point with a offset of 0, 0
+
+
+
+
+
+
R
+
+ReadFile edu.ucsb.cs56.projects.games.pokemon.IO
+Created by John Bowman on 11/8/2016.
+
+ReadFile() ReadFile
+readFile(String, Charset) ReadFile
+Ref T > - Class in edu.ucsb.cs56.projects.games.pokemon.framework
+A data structure for a reference
+
+Ref() Ref
+Ref(T) Ref
+reference Ref
+registerMessenger(SystemMessenger) SystemBase
+Registers a messenger
+
+RenderSystem edu.ucsb.cs56.projects.games.pokemon.systems
+Handles all rendering
+
+RenderSystem(Rectangle) RenderSystem
+Creates a render system with camera bounds
+
+rock Assets
+run() MainWindow
+Starts running the program
+
+run() Animation
+runOnce() Animation
+
+
+
+
+
S
+
+second Pair
+seekNext(char) IOHelper
+Gets the position of the next char c in the stream
+
+set(float, float) Vector2
+Set the x and y value
+
+set(Vector2) Vector2
+Set the x and y value from a Vector2
+
+setMap(String) MainWindow
+Sets the map
+
+setTestMap(String) Game
+smallHouse Assets
+snow Assets
+spriteBatch MainWindow
+SpriteBatch edu.ucsb.cs56.projects.games.pokemon.graphics
+A sprite batch to handle drawing
+
+SpriteBatch(Image) SpriteBatch
+Creates a sprite batch with a image
+
+srcRect() Texture
+Returns the bounds of the texture
+
+srcX1() Texture
+Returns the x coordinate in the left of the texture
+
+srcX2() Texture
+Returns the x coordinate on the right of the texture
+
+srcY1() Texture
+Returns the y value on the top of the texture
+
+srcY2() Texture
+Returns the y value on the bottom of the texture
+
+sub(Vector2) Vector2
+Subtracts a Vector2 value from our vector
+
+sub(float, float) Vector2
+Subtracts an x and y value from our vector
+
+subject SystemMessage
+SystemBase edu.ucsb.cs56.projects.games.pokemon.systems
+Abstract class for all classes that use System messages
+
+SystemBase() SystemBase
+SystemMessage edu.ucsb.cs56.projects.games.pokemon.systems
+Stores data on a subject and a message to be applied to the subject
+
+SystemMessage(Entity, Pair<String, Object>) SystemMessage
+Creates a system message with a subject (Entity) and a message (Pair)
+
+SystemMessenger edu.ucsb.cs56.projects.games.pokemon.systems
+Stores system messages to be handled
+
+SystemMessenger() SystemMessenger
+Creates a SystemMessenger
+
+
+
+
+
+
T
+
+test2ArgConstructor() Vector2Test
+testAdd() Vector2Test
+testMult() Vector2Test
+testNoArgConstructor() Vector2Test
+testSubtract() Vector2Test
+textBox Assets
+TextBox edu.ucsb.cs56.projects.games.pokemon
+This class doesn't do anything yet and is a basic stub for later addition for text boxes
+
+TextBox(String) TextBox
+Creates a basic text box, doesn't do anything yet
+
+texture AnimationFrame
+Texture edu.ucsb.cs56.projects.games.pokemon.graphics
+The class for objects of type Texture.
+
+Texture(BufferedImage, Rectangle) Texture
+Creates a texture from a tile sheet and a rectangle of its position
+
+Texture(BufferedImage, int, int, int, int) Texture
+Creates a texture from a tile sheet and its x, y value on the sheet, and its width and height
+
+TileComponent edu.ucsb.cs56.projects.games.pokemon.components
+A component for a tile
+
+TileComponent(int) TileComponent
+Constructs a tile component with an ID
+
+TileData edu.ucsb.cs56.projects.games.pokemon
+Class to contain TileData
+
+TileData(int, Texture, boolean) TileData
+Main constructor for tile data
+
+TileDataLoader edu.ucsb.cs56.projects.games.pokemon.IO
+Loads Tile Data.
+
+TileDataLoader() TileDataLoader
+tiles World
+toString() Vector2
+Returns this vector as a string
+
+tree Assets
+
+
+
+
+
U
+
+undo() Command
+undo() InteractCommand
+Undoes the last execution
+
+undo() MoveCommand
+Undoes the last move
+
+update() Controller
+update() PlayerController
+update() PokemonController
+update(float) MainWindow
+Moves the game forward a delta time and updates it
+
+update(float) Game
+Update the game and move it forward by a delta time
+
+update() World
+Updates the world
+
+updateInteract(PositionComponent, World) InputHandler
+Stub class to update a command to interact with the world
+
+updateMovement(Entity) InputHandler
+Check which keys have been pressed and enqueue a move message in the system messenger
+
+
+
+
+
+
V
+
+valueOf(String) MovementComponent.Direction
+Returns the enum constant of this type with the specified name.
+
+values() MovementComponent.Direction
+Returns an array containing the constants of this enum type, in
+the order they are declared.
+
+Vector2 edu.ucsb.cs56.projects.games.pokemon
+Stores an x and y value to do vector operations
+
+Vector2() Vector2
+Constructs Vector2 at (0, 0)
+
+Vector2(float, float) Vector2
+Constructs Vector2 at (x, y)
+
+Vector2(Vector2) Vector2
+Constructs a Vector2 at another Vector2 value
+
+Vector2Test edu.ucsb.cs56.projects.games.pokemon.tests
+Created by William Bennett on 7/27/2016.
+
+Vector2Test() Vector2Test
+velocity MovementComponent
+
+
+
+
+
W
+
+w InteractCommand
+water1 Assets
+water2 Assets
+water3 Assets
+water4 Assets
+water5 Assets
+water6 Assets
+water7 Assets
+water8 Assets
+water9 Assets
+width CollisionComponent
+width() Texture
+Returns the width
+
+World edu.ucsb.cs56.projects.games.pokemon
+Contains tiles and NPCs as entities
+
+World(Entity[][], HashSet<Entity>, InputHandler) World
+Main world constructor to define tiles, entities, and the input handler
+
+World(Entity[][], InputHandler) World
+World constructor that assumes an empty container of entity characters
+
+World(InputHandler) World
+World constructor that make empty tiles and container of entity characters
+
+
+
+
+
+
X
+
+x Vector2
+
+
+
+
+
Y
+
+y Vector2
+
+
+
+
+
Z
+
+zero Vector2
+
+
A B C D E F G H I K L M N O P R S T U V W X Y Z Generated Documentation (Untitled)
+
+
+
+
+
+<![CDATA[
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>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 <a href="overview-summary.html">Non-frame version</a>.</p>
+]]>
+
+
diff --git a/docs/overview-frame.html b/docs/overview-frame.html
new file mode 100644
index 0000000..fdfd19e
--- /dev/null
+++ b/docs/overview-frame.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+Overview List
+
+
+
diff --git a/docs/overview-summary.html b/docs/overview-summary.html
new file mode 100644
index 0000000..d30bd0d
--- /dev/null
+++ b/docs/overview-summary.html
@@ -0,0 +1,165 @@
+
+
+
+
+
+Overview
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/overview-tree.html b/docs/overview-tree.html
new file mode 100644
index 0000000..5374012
--- /dev/null
+++ b/docs/overview-tree.html
@@ -0,0 +1,226 @@
+
+
+
+
+
+Class Hierarchy
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
Class Hierarchy
+
+java.lang.Object
+edu.ucsb.cs56.projects.games.pokemon.graphics.Animation
+edu.ucsb.cs56.projects.games.pokemon.graphics.AnimationFrame
+edu.ucsb.cs56.projects.games.pokemon.Assets
+edu.ucsb.cs56.projects.games.pokemon.factories.BuildingFactory
+java.awt.Component ImageObserver , java.awt.MenuContainer , java.io.Serializable )
+
+
+edu.ucsb.cs56.projects.games.pokemon.components.Component
+edu.ucsb.cs56.projects.games.pokemon.components.Controller
+edu.ucsb.cs56.projects.games.pokemon.components.Entity
+edu.ucsb.cs56.projects.games.pokemon.commands.InteractCommand Command )
+edu.ucsb.cs56.projects.games.pokemon.IO.IOHelper
+edu.ucsb.cs56.projects.games.pokemon.framework.Main
+edu.ucsb.cs56.projects.games.pokemon.IO.MapLoader
+edu.ucsb.cs56.projects.games.pokemon.commands.MoveCommand Command )
+edu.ucsb.cs56.projects.games.pokemon.factories.ObstacleFactory
+edu.ucsb.cs56.projects.games.pokemon.framework.Pair
+edu.ucsb.cs56.projects.games.pokemon.IO.ReadFile
+edu.ucsb.cs56.projects.games.pokemon.framework.Ref
+edu.ucsb.cs56.projects.games.pokemon.graphics.SpriteBatch
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemBase
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemMessage
+edu.ucsb.cs56.projects.games.pokemon.systems.SystemMessenger
+edu.ucsb.cs56.projects.games.pokemon.TextBox
+edu.ucsb.cs56.projects.games.pokemon.graphics.Texture
+edu.ucsb.cs56.projects.games.pokemon.TileData
+edu.ucsb.cs56.projects.games.pokemon.IO.TileDataLoader
+edu.ucsb.cs56.projects.games.pokemon.Vector2
+edu.ucsb.cs56.projects.games.pokemon.tests.Vector2Test
+edu.ucsb.cs56.projects.games.pokemon.World
+
+
+
+
Interface Hierarchy
+
+edu.ucsb.cs56.projects.games.pokemon.commands.Command
+
+
Enum Hierarchy
+
+
" + tabs[value][1] + " ";
+ }
+ }
+}
diff --git a/docs/serialized-form.html b/docs/serialized-form.html
new file mode 100644
index 0000000..9376f4c
--- /dev/null
+++ b/docs/serialized-form.html
@@ -0,0 +1,203 @@
+
+
+
+
+
+Serialized Form
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/stylesheet.css b/docs/stylesheet.css
new file mode 100644
index 0000000..98055b2
--- /dev/null
+++ b/docs/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+ font-size:14px;
+ margin:0;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color:#4A6782;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color:#bb7a2a;
+}
+a:active {
+ text-decoration:none;
+ color:#4A6782;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+pre {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+}
+h1 {
+ font-size:20px;
+}
+h2 {
+ font-size:18px;
+}
+h3 {
+ font-size:16px;
+ font-style:italic;
+}
+h4 {
+ font-size:13px;
+}
+h5 {
+ font-size:12px;
+}
+h6 {
+ font-size:11px;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+ margin-top:8px;
+ line-height:1.4em;
+}
+dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ padding-top:4px;
+}
+table tr td dt code {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ vertical-align:top;
+ padding-top:4px;
+}
+sup {
+ font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:11px;
+ z-index:200;
+ margin-top:-9px;
+}
+.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;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:11px;
+ margin:0;
+}
+.topNav {
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.bottomNav {
+ margin-top:10px;
+ background-color:#4D7A97;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav {
+ background-color:#dee3e9;
+ float:left;
+ width:100%;
+ overflow:hidden;
+ font-size:12px;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+ text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding: 5px 6px;
+ text-transform:uppercase;
+}
+ul.subNavList li{
+ list-style:none;
+ float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+ text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color:#bb7a2a;
+ text-transform:uppercase;
+}
+.navBarCell1Rev {
+ background-color:#F8981D;
+ color:#253441;
+ margin: auto 5px;
+}
+.skipNav {
+ position:absolute;
+ top:auto;
+ left:-9999px;
+ overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexHeader {
+ margin:10px;
+ position:relative;
+}
+.indexHeader span{
+ margin-right:15px;
+}
+.indexHeader h1 {
+ font-size:13px;
+}
+.title {
+ color:#2c4557;
+ margin:10px 0;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 15px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:13px;
+}
+/*
+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:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border:1px solid #d0d9e0;
+ margin:0 0 6px -8px;
+ padding:7px 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:12px;
+}
+.indexContainer h2 {
+ font-size:13px;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+ padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:12px;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:5px 0 10px 0px;
+ font-size:14px;
+ font-family:'DejaVu Sans Mono',monospace;
+}
+.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:15px;
+ line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #ededed;
+ background-color:#f8f8f8;
+}
+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:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+}
+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
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+ width:100%;
+ border-left:1px solid #EEE;
+ border-right:1px solid #EEE;
+ border-bottom:1px solid #EEE;
+}
+.overviewSummary, .memberSummary {
+ padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#253441;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ padding-top:10px;
+ padding-left:1px;
+ margin:0px;
+ white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ padding-bottom:7px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ border: none;
+ height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#F8981D;
+ height:16px;
+}
+.memberSummary caption span.tableTab span {
+ white-space:nowrap;
+ padding-top:5px;
+ padding-left:12px;
+ padding-right:12px;
+ margin-right:3px;
+ display:inline-block;
+ float:left;
+ background-color:#4D7A97;
+ height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+ padding-top:0px;
+ padding-left:0px;
+ padding-right:0px;
+ background-image:none;
+ float:none;
+ display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+ display:none;
+ width:5px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ float:left;
+ background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+ display:none;
+ width:5px;
+ margin-right:3px;
+ position:relative;
+ background-color:#4D7A97;
+ float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+ text-align:left;
+ padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+ vertical-align:top;
+ padding-right:0px;
+ padding-top:8px;
+ padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+ background:#dee3e9;
+ text-align:left;
+ padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+ white-space:nowrap;
+ font-size:13px;
+}
+td.colLast, th.colLast {
+ font-size:13px;
+}
+td.colOne, th.colOne {
+ font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+ width:25%;
+ vertical-align:top;
+}
+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;
+}
+.tableSubHeadingColor {
+ background-color:#EEEEFF;
+}
+.altColor {
+ background-color:#FFFFFF;
+}
+.rowColor {
+ background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ font-style:normal;
+}
+
+div.block {
+ font-size:14px;
+ font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+ padding-top:0px;
+}
+
+
+td.colLast a {
+ padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:10px;
+}
+.block {
+ display:block;
+ margin:3px 10px 2px 0px;
+ color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+ font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+ font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+ font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+ padding-bottom:0px;
+}
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/InputHandler.java b/src/edu/ucsb/cs56/projects/games/pokemon/InputHandler.java
index d8a96ee..b967489 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/InputHandler.java
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/InputHandler.java
@@ -86,6 +86,18 @@ public void keyPressed(KeyEvent e) {
case KeyEvent.VK_H:
keys[4] = true;
break;
+ case KeyEvent.VK_UP:
+ keys[0] = true;
+ break;
+ case KeyEvent.VK_DOWN:
+ keys[1] = true;
+ break;
+ case KeyEvent.VK_LEFT:
+ keys[2] = true;
+ break;
+ case KeyEvent.VK_RIGHT:
+ keys[3] = true;
+ break;
default:
break;
}
@@ -114,6 +126,18 @@ public void keyReleased(KeyEvent e) {
case KeyEvent.VK_H:
keys[4] = false;
break;
+ case KeyEvent.VK_UP:
+ keys[0] = false;
+ break;
+ case KeyEvent.VK_DOWN:
+ keys[1] = false;
+ break;
+ case KeyEvent.VK_LEFT:
+ keys[2] = false;
+ break;
+ case KeyEvent.VK_RIGHT:
+ keys[3] = false;
+ break;
default:
break;
}
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/TileData.java b/src/edu/ucsb/cs56/projects/games/pokemon/TileData.java
index cd74337..d4193ba 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/TileData.java
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/TileData.java
@@ -69,7 +69,7 @@ public static Texture IDToTexture(int tileID) {
switch (tileID) {
case 0: return Assets.grass_Default;
case 1: return Assets.grass_Wild;
- case 2: return Assets.snow;
+ case 2: return Assets.pokeball;
case 3: return Assets.water1;
case 4: return Assets.water2;
case 5: return Assets.water3;
@@ -79,7 +79,9 @@ public static Texture IDToTexture(int tileID) {
case 9: return Assets.water7;
case 10: return Assets.water8;
case 11: return Assets.water9;
- default: return Assets.grass_Default;
+ case 12: return Assets.flower;
+ case 13: return Assets.flower2;
+ default: return Assets.grass_Default;
}
}
@@ -97,7 +99,9 @@ public static boolean IDToCollision(int tileID) {
case 9: return true;
case 10: return true;
case 11: return true;
- default: return false;
+ case 12: return true;
+ case 13: return true;
+ default: return false;
}
}
}
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/World.java b/src/edu/ucsb/cs56/projects/games/pokemon/World.java
index 49650cd..fdd8479 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/World.java
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/World.java
@@ -78,6 +78,7 @@ public World(InputHandler inputHandler) {
addEntity(BuildingFactory.constructBuildingEntity("pokemart",0,10));
addEntity(BuildingFactory.constructBuildingEntity("smallHouse", 5, 2));
addEntity(BuildingFactory.constructBuildingEntity("largeHouse", 12, 0));
+ addEntity(BuildingFactory.constructBuildingEntity("mediumHouse", 15, 10));
}
/**
@@ -108,7 +109,7 @@ public Entity[] getEntities() {
*/
public void update() {
inputHandler.updateMovement(player);
- ((GraphicsComponent)player.getComponent(GraphicsComponent.class)).animation.advance(0.03f,
+ ((GraphicsComponent)player.getComponent(GraphicsComponent.class)).animation.advance(.27f,
(MovementComponent)player.getComponent(MovementComponent.class));
}
}
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.java b/src/edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.java
index e5183a1..0378d01 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.java
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.java
@@ -14,10 +14,10 @@
*/
public class MainWindow extends JPanel {
boolean running = true;
- int width = 640;
- int height = 480;
+ int width = 320;
+ int height = 357;
static final long maxTime = 16666;
- static final float gameFrameTime = .016666f;
+ static final float gameFrameTime = .15f;
private JFrame containerWindow;
volatile private boolean initialized = false;
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/maps/Pond_Map.txt b/src/edu/ucsb/cs56/projects/games/pokemon/maps/Pond_Map.txt
index 56026cd..398809b 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/maps/Pond_Map.txt
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/maps/Pond_Map.txt
@@ -5,13 +5,13 @@ Pond_Map {width:20 height:20
[0, 0, 1], [0, 1, 1],[0, 2, 1], [0, 3, 1], [0, 4, 1], [0, 5, 1], [0, 6, 1], [0, 7, 1], [0, 8, 1], [0, 9, 1],
[0, 10, 1], [0, 11, 1], [0, 12, 1], [0, 13, 1], [0, 14, 1], [0, 15, 1], [0, 16, 1], [0, 17, 1], [0, 18, 1], [0, 19, 1],
-[0, 0, 2], [0, 1, 2], [0, 2, 2], [0, 3, 2], [0, 4, 2], [0, 5, 2], [0, 6, 2], [0, 7, 2], [0, 8, 2], [0, 9, 2],
+[0, 0, 2], [13, 1, 2], [13, 2, 2], [0, 3, 2], [0, 4, 2], [0, 5, 2], [0, 6, 2], [0, 7, 2], [0, 8, 2], [0, 9, 2],
[0, 10, 2], [0, 11, 2], [0, 12, 2], [0, 13, 2], [0, 14, 2], [0, 15, 2], [0, 16, 2], [0, 17, 2], [0, 18, 2], [0, 19, 2],
-[0, 0, 3], [0, 1, 3], [0, 2, 3], [0, 3, 3], [0, 4, 3], [0, 5, 3], [0, 6, 3], [0, 7, 3], [0, 8, 3], [0, 9, 3],
+[0, 0, 3], [13, 1, 3], [13, 2, 3], [0, 3, 3], [0, 4, 3], [0, 5, 3], [0, 6, 3], [0, 7, 3], [0, 8, 3], [0, 9, 3],
[0, 10, 3], [0, 11, 3], [0, 12, 3], [0, 13, 3], [0, 14, 3], [0, 15, 3], [0, 16, 3], [0, 17, 3], [0, 18, 3], [0, 19, 3],
-[0, 0, 4], [0, 1, 4], [0, 2, 4], [0, 3, 4], [0, 4, 4], [0, 5, 4], [0, 6, 4], [0, 7, 4], [0, 8, 4], [0, 9, 4],
+[0, 0, 4], [13, 1, 4], [13, 2, 4], [0, 3, 4], [0, 4, 4], [0, 5, 4], [0, 6, 4], [0, 7, 4], [0, 8, 4], [0, 9, 4],
[0, 10, 4], [0, 11, 4], [0, 12, 4], [0, 13, 4], [0, 14, 4], [0, 15, 4], [0, 16, 4], [0, 17, 4], [0, 18, 4], [0, 19, 4],
[0, 0, 5], [0, 1, 3], [0, 2, 3], [0, 3, 3], [0, 4, 0], [0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0],
@@ -50,13 +50,13 @@ Pond_Map {width:20 height:20
[1, 0, 16], [1, 1, 16], [1, 2, 16], [1, 3, 16], [1, 4, 16], [0, 5, 16], [0, 6, 16], [0, 7, 16], [0, 8, 16], [0, 9, 16],
[0, 10, 16], [0, 11, 16], [0, 12, 16], [0, 13, 16], [0, 14, 16], [0, 15, 16], [0, 16, 16], [0, 17, 16], [0, 18, 16], [0, 19, 16],
-[1, 0, 17], [1, 1, 17], [1, 2, 17], [1, 3, 17], [1, 4, 17], [0, 5, 17], [0, 6, 17], [0, 7, 17], [0, 8, 17], [0, 9, 17],
+[1, 0, 17], [1, 1, 17], [1, 2, 17], [1, 3, 17], [1, 4, 17], [0, 5, 17], [13, 6, 17], [13, 7, 17], [13, 8, 17], [0, 9, 17],
[0, 10, 17], [0, 11, 17], [0, 12, 17], [0, 13, 17], [0, 14, 17], [0, 15, 17], [0, 16, 17], [0, 17, 17], [0, 18, 17], [0, 19, 17],
-[1, 0, 18], [1, 1, 18], [1, 2, 18], [1, 3, 18], [1, 4, 18], [0, 5, 18], [0, 6, 18], [0, 7, 18], [0, 8, 18], [0, 9, 18],
+[1, 0, 18], [1, 1, 18], [1, 2, 18], [1, 3, 18], [1, 4, 18], [0, 5, 18], [13, 6, 18], [13, 7, 18], [13, 8, 18], [0, 9, 18],
[0, 10, 18], [0, 11, 18], [0, 12, 18], [0, 13, 18], [0, 14, 18], [0, 15, 18], [0, 16, 18], [0, 17, 18], [0, 18, 18], [0, 19, 18],
-[1, 0, 19], [1, 1, 19], [1, 2, 19], [1, 3, 19], [1, 4, 19], [0, 5, 19], [0, 6, 19], [0, 7, 19], [0, 8, 19], [0, 9, 19],
+[1, 0, 19], [1, 1, 19], [1, 2, 19], [1, 3, 19], [1, 4, 19], [12, 5, 19], [12, 6, 19], [12, 7, 19], [12, 8, 19], [12, 9, 19],
[0, 10, 19], [0, 11, 19], [0, 12, 19], [0, 13, 19], [0, 14, 19], [0, 15, 19], [0, 16, 19], [0, 17, 19], [0, 18, 19], [0, 19, 19],
-}
\ No newline at end of file
+}
diff --git a/src/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.java b/src/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.java
index 154d954..a701e7e 100644
--- a/src/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.java
+++ b/src/edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.java
@@ -93,16 +93,35 @@ public boolean overLaps(PositionComponent PC1, MovementComponent MC1, Entity[] e
for (Entity object : entities) {
PositionComponent PC2 = (PositionComponent)object.getComponent(PositionComponent.class);
CollisionComponent CC2 = (CollisionComponent)object.getComponent(CollisionComponent.class);
-
+ // PositionComponent CC2 = (CollisionComponent)object.getComponent(CollisionComponent.class);
//checks if moving entity's next position is inside the hitbox of the other entity
- if ( ((PC1.position.x + PC1.offset.x) <= ((PC2.position.x) + CC2.width)) &&
+ /* if (( ((PC1.position.x + PC1.offset.x) <= ((PC2.position.x) + CC2.width)) &&
((PC1.position.x + PC1.offset.x) >= ((PC2.position.x))) &&
((PC1.position.y + PC1.offset.y) >= ((PC2.position.y))) &&
- ((PC1.position.y + PC1.offset.y) <= ((PC2.position.y + CC2.height))) && CC2.hasCollision ) {
+ ((PC1.position.y + PC1.offset.y) <= ((PC2.position.y + CC2.height))) && CC2.hasCollision)) {
return true;
-
}
+ */
+ //blue building
+ if ( (PC1.position.x + PC1.offset.x <= 3) && (PC1.position.y + PC1.offset.y >= 10 && PC1.position.y + PC1.offset.y <= 13) ) {
+ return true;
+ }
+
+ if ( (PC1.position.x + PC1.offset.x >= 5 && PC1.position.x + PC1.offset.x <= 9) && (PC1.position.y + PC1.offset.y >= 2 && PC1.position.y + PC1.offset.y <= 4) ) {
+ return true;
+ }
+
+ //checks if moving entity's next position is outside the bounds of the map
+ if ( (PC1.position.x + PC1.offset.x >= 20) || (PC1.position.y + PC1.offset.y >= 20) ) {
+ return true;
+ }
+
+ if ( (PC1.position.x + PC1.offset.x <= -1) || (PC1.position.y + PC1.offset.y <= -1) ) {
+ return true;
+ }
+
+
else {
continue;
}
@@ -115,13 +134,32 @@ public boolean overLaps(PositionComponent PC1, MovementComponent MC1, Entity[] e
CollisionComponent CC2 = (CollisionComponent) object2.getComponent(CollisionComponent.class);
//checks if moving entity's next position is inside the hitbox of the tile
- if (((PC1.position.x + PC1.offset.x) < ((PC2.position.x) + CC2.width)) &&
+ /* if (((PC1.position.x + PC1.offset.x) < ((PC2.position.x) + CC2.width)) &&
((PC1.position.x + PC1.offset.x) > ((PC2.position.x))) &&
((PC1.position.y + PC1.offset.y) > ((PC2.position.y))) &&
((PC1.position.y + PC1.offset.y) < ((PC2.position.y + CC2.height))) && CC2.hasCollision) {
return true;
-
- } else {
+ }
+*/
+ //blue building
+ if ( (PC1.position.x + PC1.offset.x <= 3) && (PC1.position.y + PC1.offset.y >= 10 && PC1.position.y + PC1.offset.y <= 13) ) {
+ return true;
+ }
+
+ if ( (PC1.position.x + PC1.offset.x >= 5 && PC1.position.x + PC1.offset.x <= 9) && (PC1.position.y + PC1.offset.y >= 2 && PC1.position.y + PC1.offset.y <= 4) ) {
+ return true;
+ }
+
+ //checks if moving entity's next position is outside the bounds of the map
+ if ( (PC1.position.x + PC1.offset.x >= 20) || (PC1.position.y + PC1.offset.y >= 20) ) {
+ return true;
+ }
+
+ if ( (PC1.position.x + PC1.offset.x <= -1) || (PC1.position.y + PC1.offset.y <= -1) ) {
+ return true;
+ }
+
+ else {
continue;
}
}