Skip to content

Commit dbb17d1

Browse files
committed
made swimming into types for player
1 parent f414d28 commit dbb17d1

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/com/redomar/game/entities/Player.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class Player extends Mob {
1919
private int colour = Colours.get(-1, 111, 240, 310);
2020
private int tickCount = 0;
2121
private String userName;
22+
private boolean[] swimType;
2223

2324

2425
public static String guestPlayerName = customeName.setName("Player ");
@@ -62,7 +63,11 @@ public void tick() {
6263
isMoving = false;
6364
}
6465

65-
swimming();
66+
setSwim(new Swim(level, getX(), getY()));
67+
swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
68+
isSwimming = swimType[0];
69+
isMagma = swimType[1];
70+
isMuddy = swimType[2];
6671

6772
if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 11) {
6873
changeLevels = true;
@@ -71,15 +76,7 @@ public void tick() {
7176
tickCount++;
7277
}
7378

74-
private void swimming() {
75-
76-
setSwim(new Swim(level, getX(), getY()));
77-
78-
isSwimming = getSwim().water(isSwimming);
79-
isMagma = getSwim().magma(isMagma);
80-
isMuddy = getSwim().mud(isMuddy);
81-
}
82-
79+
8380
public void render(Screen screen) {
8481
int xTile = 0;
8582
int yTile = 28;

src/com/redomar/game/entities/efx/Swim.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,12 @@ public boolean mud(boolean isMuddy){
5252
return isMuddy;
5353
}
5454

55+
public boolean[] swimming(boolean isSwimming, boolean isMagma, boolean isMuddy) {
56+
boolean[] swimminhType;
57+
swimminhType = new boolean[3];
58+
swimminhType [0] = water(isSwimming);
59+
swimminhType [1] = magma(isMagma);
60+
swimminhType [2] = mud(isMuddy);
61+
return swimminhType;
62+
}
5563
}

0 commit comments

Comments
 (0)