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

fix: broken paths

Browse source
This commit is contained in:
Laureηt 2021-05-15 22:14:27 +02:00
parent baa70f4aa1
commit 49a8b39f9e
12 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/sagittarius/model/Arrow.java
View file

@ -56,8 +56,8 @@ public class Arrow extends EntityQuad {
if (!preview) { if (!preview) {
arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_landed.mp3")); arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/arrow_landed.mp3"));
arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/player_death.wav")); arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/player_death.wav"));
texture = new ArrayList<>(); texture = new ArrayList<>();
String path = "core/assets/arrow" + MathUtils.random(2); String path = "core/assets/arrow" + MathUtils.random(2);

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

@ -19,7 +19,7 @@ public class Bow extends Actor {
private boolean aimAssist = false; private boolean aimAssist = false;
private boolean pressed = false; private boolean pressed = false;
private float angle; private float angle;
private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/arrow_shot.mp3")); private Sound shotSound = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/arrow_shot.mp3"));
private Vector2 anchor = new Vector2(); private Vector2 anchor = new Vector2();
private Vector2 aim = new Vector2(); private Vector2 aim = new Vector2();

3
core/src/sagittarius/model/Player.java
View file

@ -11,9 +11,6 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
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.audio.Sound;
import sagittarius.SagittariusGame;
public class Player extends EntityQuad { public class Player extends EntityQuad {

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

@ -45,7 +45,7 @@ public abstract class BaseScreen implements Screen {
@Override public void dispose() { @Override public void dispose() {
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/Ghostrifter-Deflector.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/Ghostrifter-Deflector.mp3"));
uiStage.dispose(); uiStage.dispose();
mainStage.dispose(); mainStage.dispose();
} }

2
core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java
View file

@ -9,7 +9,7 @@ import sagittarius.SagittariusGame;
public class ButtonTextSounded extends com.kotcrab.vis.ui.widget.VisTextButton{ public class ButtonTextSounded extends com.kotcrab.vis.ui.widget.VisTextButton{
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3"));
public ButtonTextSounded(String name){ public ButtonTextSounded(String name){
super(name); super(name);

2
core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java
View file

@ -9,7 +9,7 @@ import sagittarius.SagittariusGame;
public class CheckBoxSounded extends com.kotcrab.vis.ui.widget.VisCheckBox{ public class CheckBoxSounded extends com.kotcrab.vis.ui.widget.VisCheckBox{
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3"));
public CheckBoxSounded(String name){ public CheckBoxSounded(String name){
super(name); super(name);

2
core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java
View file

@ -10,7 +10,7 @@ import sagittarius.SagittariusGame;
public class SpinnerSounded extends com.kotcrab.vis.ui.widget.spinner.Spinner{ public class SpinnerSounded extends com.kotcrab.vis.ui.widget.spinner.Spinner{
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/effects/clickbutton.mp3")); private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3"));
public SpinnerSounded(String name,SimpleFloatSpinnerModel SpinnerModel){ public SpinnerSounded(String name,SimpleFloatSpinnerModel SpinnerModel){
super(name,SpinnerModel); super(name,SpinnerModel);

3
core/src/sagittarius/view/CreditScreen.java
View file

@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTable;
import com.badlogic.gdx.audio.Sound;
import sagittarius.view.ButtonSounded.*; import sagittarius.view.ButtonSounded.*;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
@ -19,7 +18,7 @@ public class CreditScreen extends BaseScreen {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/credit_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/credit_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();

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

@ -51,7 +51,7 @@ public class GameScreen extends BaseScreen implements InputProcessor {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/game_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();

6
core/src/sagittarius/view/ResumeScreen.java
View file

@ -1,13 +1,11 @@
package sagittarius.view; package sagittarius.view;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTable;
import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel;
import com.badlogic.gdx.audio.Sound;
import sagittarius.view.ButtonSounded.*; import sagittarius.view.ButtonSounded.*;
@ -26,7 +24,7 @@ public class ResumeScreen extends BaseScreen {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();
@ -95,7 +93,7 @@ public class ResumeScreen extends BaseScreen {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/game_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/game_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();

5
core/src/sagittarius/view/SettingsScreen.java
View file

@ -7,7 +7,6 @@ import com.badlogic.gdx.utils.Align;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTable;
import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel;
import com.badlogic.gdx.audio.Sound;
import sagittarius.view.ButtonSounded.*; import sagittarius.view.ButtonSounded.*;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
@ -19,7 +18,7 @@ public class SettingsScreen extends BaseScreen {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();
@ -74,7 +73,7 @@ public class SettingsScreen extends BaseScreen {
} }
else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){ else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/resumeMenu_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/resumeMenu_music.mp3"));
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();
SagittariusGame.disableMusic = false; SagittariusGame.disableMusic = false;

5
core/src/sagittarius/view/StartScreen.java
View file

@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTable;
import com.badlogic.gdx.audio.Sound;
import sagittarius.view.ButtonSounded.ButtonTextSounded; import sagittarius.view.ButtonSounded.ButtonTextSounded;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
@ -19,7 +18,7 @@ public class StartScreen extends BaseScreen {
if (!SagittariusGame.disableMusic){ if (!SagittariusGame.disableMusic){
if ( SagittariusGame.music != null ){ if ( SagittariusGame.music != null ){
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/mainMenu_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();
@ -27,7 +26,7 @@ public class StartScreen extends BaseScreen {
} }
else { else {
SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("core/assets/sounds/music/mainMenu_music.mp3")); SagittariusGame.music = Gdx.audio.newMusic(Gdx.files.internal("sounds/music/mainMenu_music.mp3"));
SagittariusGame.music.setLooping(true); SagittariusGame.music.setLooping(true);
SagittariusGame.music.setVolume(SagittariusGame.musicVolume); SagittariusGame.music.setVolume(SagittariusGame.musicVolume);
SagittariusGame.music.play(); SagittariusGame.music.play();