mirror of
https://github.com/Klagarge/PokeHES.git
synced 2025-07-07 00:41:10 +00:00
Merge branch 'master' into change
This commit is contained in:
@ -52,6 +52,16 @@ public class ScreenMap extends RenderingScreen{
|
||||
createMap("test");
|
||||
createMap("test_couloir");
|
||||
createMap("desert");
|
||||
createMap("SS");
|
||||
createMap("21RI");
|
||||
createMap("21RS");
|
||||
createMap("21N2");
|
||||
createMap("21N3");
|
||||
createMap("21N205");
|
||||
createMap("21N304");
|
||||
createMap("21N307");
|
||||
createMap("21N308");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -17,6 +17,7 @@ public class ScreenPlayer {
|
||||
|
||||
// One player by ScreenPlayer
|
||||
p = new Player(8, 15, "desert");
|
||||
//p = new Player(4, 2, "21RI");
|
||||
|
||||
b = new Battle(new Enemy("enemi", 0, 0, "charachter", "desert", 50, "enemi"));
|
||||
|
||||
|
Reference in New Issue
Block a user