mise a jours git ignore + ajour glissé deposer + patch card onboard

This commit is contained in:
marc barbier
2020-11-11 18:12:40 +01:00
parent 3606a9a564
commit cda44fd8f0
8 changed files with 87 additions and 51 deletions
@@ -11,6 +11,7 @@ import com.iutlaval.myapplication.Game.Decks.Deck;
import com.iutlaval.myapplication.Game.Decks.DeckDemo;
import com.iutlaval.myapplication.GameActivity;
import com.iutlaval.myapplication.R;
import com.iutlaval.myapplication.Video.Drawables.Drawable;
import com.iutlaval.myapplication.Video.Drawables.DrawableBitmap;
import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
import com.iutlaval.myapplication.Video.Renderer;
@@ -137,8 +138,17 @@ public class GameLogicThread extends Thread{
touch.onTouchEvent(event);
if(currentlySelected !=null)
{
//jouer une carte
int zone = playableZonesHandler.getHoveredZone(currentlySelected);
if(zone != -1)
{
currentlySelected.setOnBoard(true);
currentlySelected.setCoordinates((DrawableCard.getCardWith()+1)*zone,55F);
currentlySelected.setDraggable(false);
}else{
currentlySelected.setCoordinates(currentlySelected.getX(),currentlySelected.getY() + SELECTING_OFFSET);
}
renderer.removeToDraw(currentlySelected.getName()+"BIG");
currentlySelected.setCoordinates(currentlySelected.getX(),currentlySelected.getY() + SELECTING_OFFSET);
currentlySelected=null;
}
playableZonesHandler.hidePlayableZones(renderer);