drunkendog
/
final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	out/production/final/GamePanel.class
#	out/production/final/GenericSprite.class
master
bob 2022-06-01 14:49:50 -04:00
parent 77e85f72f4 21edb5f4f4
commit 5de61a7ba7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

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

BIN
out/production/final/Player.class
View File

Binary file not shown.

4
src/GamePanel.java
View File

@ -141,10 +141,10 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
move(); move();
checkCollision(); checkCollision();
repaint(); repaint();
if (frameCounter > 10) { if (frameCounter > 5) {
// increment sprite image to be used and keeps it below 12 // increment sprite image to be used and keeps it below 12
frame = (frame + 1) % 11; frame = (frame + 1) % 11;
frameCounter -= 10; frameCounter -= 5;
} }
delta--; delta--;
} }

2
src/Player.java
View File

@ -48,7 +48,7 @@ public class Player extends GenericSprite {
public int draw(Graphics g, int frame) { public int draw(Graphics g, int frame) {
// g.setColor(Color.WHITE); // g.setColor(Color.WHITE);
if (!upPressed && !downPressed && !leftPressed && !rightPressed) { if (!upPressed && !downPressed && !leftPressed && !rightPressed) {
g.drawImage(spriteArray[lastXDirection][lastYDirection][lastFrame], x, y, null); g.drawImage(spriteArray[lastXDirection][lastYDirection][0], x, y, null);
return 0; return 0;
} else { } else {
lastXDirection = (int)(Math.signum(xVelocity) + 1) / 2; lastXDirection = (int)(Math.signum(xVelocity) + 1) / 2;