ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat: bow cancel function

Browse source
This commit is contained in:
Laureηt 2021-04-23 16:26:17 +02:00
parent ed9e805c88
commit ce3b1e265a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/sagittarius/model/Bow.java
View file

@ -2,6 +2,7 @@ package sagittarius.model;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Buttons; import com.badlogic.gdx.Input.Buttons;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
@ -41,10 +42,12 @@ public class Bow extends Actor {
aim = this.anchor.cpy().sub(GameScreen.worldCursor); aim = this.anchor.cpy().sub(GameScreen.worldCursor);
angle = aim.angleDeg(); angle = aim.angleDeg();
power = MathUtils.clamp(aim.len(), 0, 1000); power = MathUtils.clamp(aim.len(), 0, 1000);
} else if (pressed) { } else if (pressed && power > 50) {
pressed = false; pressed = false;
GameScreen.playerCurrent.setActive(false); GameScreen.playerCurrent.setActive(false);
GameScreen.arrows.addActor(new Arrow(angle, power, GameScreen.playerCurrent)); GameScreen.arrows.addActor(new Arrow(angle, power, GameScreen.playerCurrent));
} else {
pressed = false;
} }
} }
@ -52,6 +55,7 @@ public class Bow extends Actor {
public void drawDebug(ShapeRenderer shapes) { public void drawDebug(ShapeRenderer shapes) {
super.drawDebug(shapes); super.drawDebug(shapes);
if (pressed) { if (pressed) {
if (power > 50) shapes.setColor(Color.RED);
shapes.line(this.anchor, GameScreen.worldCursor); shapes.line(this.anchor, GameScreen.worldCursor);
if (aimAssist) { if (aimAssist) {
float[] traj = Arrow.traj(angle, power, GameScreen.playerCurrent, 400, 0.05f); float[] traj = Arrow.traj(angle, power, GameScreen.playerCurrent, 400, 0.05f);

2
core/src/sagittarius/view/GameScreen.java
View file

@ -112,7 +112,7 @@ public class GameScreen extends BaseScreen {
int index = players.getChildren().indexOf(player, true); int index = players.getChildren().indexOf(player, true);
if (index < playerIndex) { if (index < playerIndex) {
players.removeActor(player); players.removeActor(player);
//playerIndex++; // ? keeping ? playerIndex++;
playerIndex %= players.getChildren().size; playerIndex %= players.getChildren().size;
} else if (index == playerIndex) { } else if (index == playerIndex) {
players.removeActor(player); players.removeActor(player);