diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Board.java b/app/src/main/java/com/iutlaval/myapplication/Game/Board.java index b5cd4bc..bdf42be 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Board.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Board.java @@ -1,8 +1,8 @@ package com.iutlaval.myapplication.Game; import com.iutlaval.myapplication.Game.Cards.Card; -import com.iutlaval.myapplication.Game.Player.Player; -import com.iutlaval.myapplication.Game.Player.PlayerLocal; +import com.iutlaval.myapplication.Game.Players.Player; +import com.iutlaval.myapplication.Game.Players.PlayerLocal; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java index 47ac8a3..bacad2c 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import com.iutlaval.myapplication.Game.Board; -import com.iutlaval.myapplication.Game.Player.Player; +import com.iutlaval.myapplication.Game.Players.Player; import com.iutlaval.myapplication.R; import com.iutlaval.myapplication.Video.Drawables.DrawableCard; @@ -56,12 +56,11 @@ public abstract class Card { */ public Bitmap getFrameBitmap(Context c) { - //TODO add a frame if(frameBitmap == null) { - frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.cadre_carte); + frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.t_cc_defaut); } - if(getFrameTexture() == R.drawable.cadre_carte) + if(getFrameTexture() == R.drawable.t_cc_defaut) { return frameBitmap; }else{ @@ -79,7 +78,7 @@ public abstract class Card { */ public int getFrameTexture() { - return R.drawable.cadre_carte; + return R.drawable.t_cc_defaut; } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java index 7b415ae..52535a4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java @@ -20,7 +20,7 @@ public class DemoCard extends Card{ @Override public int getCardPicture() { - return R.drawable.elfe_fournisseur; + return R.drawable.t_cp_elfe_fournisseur; } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java index 4b1c9a7..472ba5b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -33,7 +33,7 @@ public class GameLogicThread extends Thread{ public void run() { //renderer.addToDraw(new Drawable(new Rectangle(0,0,100,100),"background", Color.BLUE)); - Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.background); + Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background); renderer.addToDraw(new Drawable(bitmap, 0,0, "background", 100, 100 )); //renderer.addToDraw(new Drawable(bm,0.0F,0.0F,"running",8F,16F)); //renderer.addToDraw(new DrawableCard(new DemoCard(),0.0F,0.0F,"card2",cont)); diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerBot.java b/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerBot.java deleted file mode 100644 index 6023375..0000000 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerBot.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.iutlaval.myapplication.Game.Player; - -public class PlayerBot extends Player{ -} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerLocal.java b/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerLocal.java deleted file mode 100644 index a6a66e7..0000000 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerLocal.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.iutlaval.myapplication.Game.Player; - -public class PlayerLocal extends Player{ -} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Player/Player.java b/app/src/main/java/com/iutlaval/myapplication/Game/Players/Player.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Player/Player.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Players/Player.java index c0a33cb..cba4e28 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Player/Player.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Players/Player.java @@ -1,11 +1,10 @@ -package com.iutlaval.myapplication.Game.Player; +package com.iutlaval.myapplication.Game.Players; import com.iutlaval.myapplication.Game.Cards.Card; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Random; public abstract class Player { private static final int MAX_HAND_SIZE = 10; diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerBot.java b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerBot.java new file mode 100644 index 0000000..d9d3fc9 --- /dev/null +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerBot.java @@ -0,0 +1,4 @@ +package com.iutlaval.myapplication.Game.Players; + +public class PlayerBot extends Player{ +} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerLocal.java b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerLocal.java new file mode 100644 index 0000000..74cafe6 --- /dev/null +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerLocal.java @@ -0,0 +1,4 @@ +package com.iutlaval.myapplication.Game.Players; + +public class PlayerLocal extends Player{ +} diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerOnlineAdversary.java b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerOnlineAdversary.java similarity index 52% rename from app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerOnlineAdversary.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerOnlineAdversary.java index 12e1dba..54f8e80 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Player/PlayerOnlineAdversary.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Players/PlayerOnlineAdversary.java @@ -1,4 +1,4 @@ -package com.iutlaval.myapplication.Game.Player; +package com.iutlaval.myapplication.Game.Players; public class PlayerOnlineAdversary extends Player{ } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java index 5d978ea..8008abf 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java @@ -41,8 +41,10 @@ public class DrawableCard extends Drawable{ /** * ce constructeur permet de crée un drawable simplifier pour les carte qui integre : * _le supoort de la description + * _le support du titre * _le changement d'etat entre grand et terrain * _les point de vie + * _les point attaque * _l'image * _les deplacement du tout * diff --git a/app/src/main/res/drawable/debug_card.png b/app/src/main/res/drawable/debug.png similarity index 100% rename from app/src/main/res/drawable/debug_card.png rename to app/src/main/res/drawable/debug.png diff --git a/app/src/main/res/drawable/batiut.jpg b/app/src/main/res/drawable/t_b_batiut.jpg similarity index 100% rename from app/src/main/res/drawable/batiut.jpg rename to app/src/main/res/drawable/t_b_batiut.jpg diff --git a/app/src/main/res/drawable-v24/background.jpg b/app/src/main/res/drawable/t_b_board_background.jpg similarity index 100% rename from app/src/main/res/drawable-v24/background.jpg rename to app/src/main/res/drawable/t_b_board_background.jpg diff --git a/app/src/main/res/drawable/cadre_carte.png b/app/src/main/res/drawable/t_cc_defaut.png similarity index 100% rename from app/src/main/res/drawable/cadre_carte.png rename to app/src/main/res/drawable/t_cc_defaut.png diff --git a/app/src/main/res/drawable/compagnon_des_elfes.jpg b/app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg similarity index 100% rename from app/src/main/res/drawable/compagnon_des_elfes.jpg rename to app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg diff --git a/app/src/main/res/drawable/elfe_fournisseur.jpg b/app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg similarity index 100% rename from app/src/main/res/drawable/elfe_fournisseur.jpg rename to app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg diff --git a/app/src/main/res/drawable/elfe_nul.png b/app/src/main/res/drawable/t_cp_elfe_nul.png similarity index 100% rename from app/src/main/res/drawable/elfe_nul.png rename to app/src/main/res/drawable/t_cp_elfe_nul.png diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index b59d2ef..6f262b7 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -19,7 +19,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" - app:srcCompat="@drawable/batiut" /> + app:srcCompat="@drawable/t_b_batiut" /> + app:srcCompat="@drawable/t_b_batiut" />