Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-10-31 11:39:17 +00:00
Code Releases Activity

polish done

Browse Source
This commit is contained in:
Rémi Heredero
2022-06-12 17:02:27 +02:00
parent 23fe6f1ad9
commit 317aae0432
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main/PokeMudry.java
View File

@@ -2,11 +2,8 @@ package Main;
import java.util.Vector; import java.util.Vector;
import java.util.Map.Entry;
import org.lwjgl.opencl.CLSampler;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import Control.Controller; import Control.Controller;
import Entity.Enemy; import Entity.Enemy;
import Entity.Entity; import Entity.Entity;
@@ -67,7 +64,6 @@ public class PokeMudry extends PortableApplication {
// Switch screen // Switch screen
if (sp.p.frontOfEnemy && onMapScreen){ if (sp.p.frontOfEnemy && onMapScreen){
sp.e = sp.p.lastEnemy; sp.e = sp.p.lastEnemy;
//sp.screenManager.activateNextScreen();
sp.sb = sp.screenManager.getScreenBattle(); sp.sb = sp.screenManager.getScreenBattle();
sp.b = new Battle(sp.e); sp.b = new Battle(sp.e);
g.resetCamera(); g.resetCamera();

12
src/Screen/ScreenBattle.java
View File

@@ -1,8 +1,5 @@
package Screen; package Screen;
import ch.hevs.gdx2d.components.screen_management.RenderingScreen;
import ch.hevs.gdx2d.lib.GdxGraphics;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
@@ -10,16 +7,15 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
import com.badlogic.gdx.utils.Align;
import Control.Controller; import Control.Controller;
import Entity.Enemy; import Entity.Enemy;
import Entity.Player; import Entity.Player;
import Game.Battle; import Game.Battle;
import Text.Line;
import Text.TextEnemy;
import Main.PokeMudry; import Main.PokeMudry;
import Main.Settings; import Main.Settings;
import ch.hevs.gdx2d.components.screen_management.RenderingScreen;
import ch.hevs.gdx2d.lib.GdxGraphics;
public class ScreenBattle extends RenderingScreen{ public class ScreenBattle extends RenderingScreen{
@@ -37,9 +33,6 @@ public class ScreenBattle extends RenderingScreen{
@Override @Override
public void onInit() { public void onInit() {
//new battle game
//battle = new Battle(enemy);
//display the question //display the question
generateFont("resources/font/OptimusPrinceps.ttf", 40, Color.BLACK); generateFont("resources/font/OptimusPrinceps.ttf", 40, Color.BLACK);
@@ -83,7 +76,6 @@ public class ScreenBattle extends RenderingScreen{
g.drawFilledRectangle(Settings.SIDE/2, HEIGHT_DIALOG/2 + EDGE, WIDTH_DIALOG, HEIGHT_DIALOG, 0); g.drawFilledRectangle(Settings.SIDE/2, HEIGHT_DIALOG/2 + EDGE, WIDTH_DIALOG, HEIGHT_DIALOG, 0);
//dialog //dialog
if(b != null) g.drawString(15, 245 ,b.getLine() , optimus40); if(b != null) g.drawString(15, 245 ,b.getLine() , optimus40);

4
src/Screen/ScreenPlayer.java
View File

@@ -26,7 +26,9 @@ public class ScreenPlayer {
} }
public void render(GdxGraphics g){ public void render(GdxGraphics g){
sm.setPlayer(p); if(sm != null){
sm.setPlayer(p);
}
if(sb != null){ if(sb != null){
sb.setEnemy(e); sb.setEnemy(e);