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

Merge branch 'master' of https://git.inpt.fr/tobgang/sagittarius

Browse source
This commit is contained in:
Damien 2021-05-14 11:32:43 +02:00
parent 2d377766df 061cb0be2a
commit 08d0802731
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,8 +32,8 @@ public class Arrow extends EntityQuad {
private Planet crash; private Planet crash;
private Vector2 offset; private Vector2 offset;
private Sound arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/sf_fleche_plante_01.mp3")); private Sound arrowLandedSound;
private Sound arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav")); private Sound arrowHitSound;
private ArrayList<Texture> texture; private ArrayList<Texture> texture;
// ---------- CONSTRUCTORs ---------- // ---------- CONSTRUCTORs ----------
@ -55,6 +55,10 @@ public class Arrow extends EntityQuad {
this.landed = false; this.landed = false;
if (!preview) { if (!preview) {
arrowLandedSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/sf_fleche_plante_01.mp3"));
arrowHitSound = Gdx.audio.newSound(Gdx.files.internal("core/assets/sounds/VOXScrm_Cri wilhelm (ID 0477)_LS.wav"));
texture = new ArrayList<>(); texture = new ArrayList<>();
String path = "core/assets/arrow" + MathUtils.random(2); String path = "core/assets/arrow" + MathUtils.random(2);

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

@ -101,11 +101,11 @@ public class SettingsScreen extends BaseScreen {
// Table structure // Table structure
table.add(gConstField).width(250); table.add(gConstField).width(250);
table.row(); table.row();
table.add(disableMusic).width(250); table.add(disableMusic).align(Align.left);
table.row(); table.row();
table.add(musicVolume).width(250); table.add(musicVolume).width(250);
table.row(); table.row();
table.add(disableSounds).width(250); table.add(disableSounds).align(Align.left);
table.row(); table.row();
table.add(musicSounds).width(250); table.add(musicSounds).width(250);
table.row(); table.row();