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

Move GlobalState randint to UtilityFunction

master
John 2022-06-19 16:20:58 -07:00
parent 16fd96b3b6
commit 07e56c49cf
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GamePanel.java
View File

@ -515,9 +515,9 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
public void updateParticle() throws IOException { public void updateParticle() throws IOException {
if(particles.size()<10) { if(particles.size()<10) {
for (int i = 0; i < particleTiles.size(); i++) { for (int i = 0; i < particleTiles.size(); i++) {
if (GlobalState.randInt(1, 20) == 1) { if (UtilityFunction.randInt(1, 20) == 1) {
particles.add(new Particle(particleTiles.get(i).x + GlobalState.randInt(0, Tile.length), particleTiles.get(i).y + GlobalState.randInt(0, Tile.length / 2), particles.add(new Particle(particleTiles.get(i).x + UtilityFunction.randInt(0, Tile.length), particleTiles.get(i).y + UtilityFunction.randInt(0, Tile.length / 2),
GlobalState.randInt(-3, 3), GlobalState.randInt(-5, 2), GlobalState.randInt(5, 9), "img/particles/LavaParticle.png")); UtilityFunction.randInt(-3, 3), UtilityFunction.randInt(-5, 2), UtilityFunction.randInt(5, 9), "img/particles/LavaParticle.png"));
} }
} }
} }

3
src/GlobalState.java
View File

@ -2,7 +2,4 @@ import java.io.Serializable;
public class GlobalState implements Serializable { public class GlobalState implements Serializable {
public static final int second = 10; public static final int second = 10;
public static int randInt(int low, int high){
return (int)(Math.random()*(high-low+1))+low;
}
} }

8
src/Player.java
View File

@ -7,8 +7,6 @@ import javax.sound.sampled.UnsupportedAudioFileException;
import java.awt.*; import java.awt.*;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
@ -412,9 +410,9 @@ public class Player extends GenericSprite {
} }
} }
public void addParticle(int x) throws IOException { public void addParticle(int x) throws IOException {
if(GlobalState.randInt(1,3)==3) { if(UtilityFunction.randInt(1,3)==3) {
GameFrame.game.particles.add(new Particle(this.x + GameFrame.game.camera.x + WIDTH / 2 + GlobalState.randInt(-PLAYER_WIDTH / 2, PLAYER_WIDTH / 2) GameFrame.game.particles.add(new Particle(this.x + GameFrame.game.camera.x + WIDTH / 2 + UtilityFunction.randInt(-PLAYER_WIDTH / 2, PLAYER_WIDTH / 2)
, (int) (y + HEIGHT * 0.95), GlobalState.randInt(-2, 2) + x, GlobalState.randInt(-4, 1), GlobalState.randInt(1, 7), "img/particles/GrassParticle.png")); , (int) (y + HEIGHT * 0.95), UtilityFunction.randInt(-2, 2) + x, UtilityFunction.randInt(-4, 1), UtilityFunction.randInt(1, 7), "img/particles/GrassParticle.png"));
} }
} }
public int draw(Graphics g, int frame) { public int draw(Graphics g, int frame) {

4
src/UtilityFunction.java
View File

@ -29,4 +29,8 @@ public final class UtilityFunction {
} }
return currentBox; return currentBox;
} }
public static int randInt(int low, int high){
return (int)(Math.random()*(high-low+1))+low;
}
} }