JonathanHager
/
OrbitalThrow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lol

Browse Source
master
GammelJan 6 years ago
parent 4973d15265
commit c04e7e7f36
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File

1
android/assets/levellol.json
Unescape View File

@ -0,0 +1 @@
{goal:{xPos:1000,yPos:580,sizeX:350,sizeY:100,thickness:0.2},projectile:{xPos:350,yPos:200,mass:5,radius:10},math:{},xPosPivot:200,yPosPivot:200,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]}

2
android/assets/levels/level2.json
Unescape View File

@ -1 +1 @@
{goal:{xPos:417,yPos:629,sizeX:300,sizeY:200,thickness:0.2},projectile:{xPos:979,yPos:595,mass:5,radius:10},math:{},xPosPivot:979,yPosPivot:445,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} {goal:{xPos:883,yPos:229,sizeX:250,sizeY:140,thickness:0.2},projectile:{xPos:579,yPos:496,mass:5,radius:10},math:{},xPosPivot:579,yPosPivot:346,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]}

18
core/src/controller/Controller.java
Unescape View File

@ -167,11 +167,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
double tempY = level.get(currentChapter).get(currentLevel).getProjectile().getyPos(); double tempY = level.get(currentChapter).get(currentLevel).getProjectile().getyPos();
for(Rectangle rect : gs.getGoalRects()){ for(Rectangle rect : gs.getGoalRects()){
if(Intersector.overlaps(gs.getProjectileCirc(), rect)) { if(Intersector.overlaps(gs.getProjectileCirc(), rect) && !collision) {
collision = true; collision = true;
level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY);
if (rect.getHeight() == 1) { if (rect.getHeight() == 1) {
level.get(currentChapter).get(currentLevel).horizontalCollision(); level.get(currentChapter).get(currentLevel).horizontalCollision();
} else if (rect.getWidth() == 1) { } else if (rect.getWidth() == 1) {
@ -182,14 +180,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
if(gs.getObjectRects() != null) { if(gs.getObjectRects() != null) {
for (Rectangle rect : gs.getObjectRects()) { for (Rectangle rect : gs.getObjectRects()) {
if (Intersector.overlaps(gs.getProjectileCirc(), rect)) { if (Intersector.overlaps(gs.getProjectileCirc(), rect) && !collision) {
collision = true; collision = true;
level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY); if (rect.getHeight() == 1) {
if (rect.getHeight() == 5) {
level.get(currentChapter).get(currentLevel).horizontalCollision(); level.get(currentChapter).get(currentLevel).horizontalCollision();
} else if (rect.getWidth() == 5) { } else if (rect.getWidth() == 1) {
level.get(currentChapter).get(currentLevel).verticalCollision(); level.get(currentChapter).get(currentLevel).verticalCollision();
} }
//break; //break;
@ -198,6 +195,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
} }
if(collision){
level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY);
}
} }
} }
} }

4
core/src/model/Level.java
Unescape View File

@ -168,8 +168,8 @@ public class Level {
public void setGoal(int x, int y){ public void setGoal(int x, int y){
goal.setxPos(x); goal.setxPos(x);
goal.setyPos(y); goal.setyPos(y);
goal.setSizeX(300); goal.setSizeX(250);
goal.setSizeY(200); goal.setSizeY(140);
} }
public void removeObstacle(Rectangle rect){ public void removeObstacle(Rectangle rect){
objects.remove(rect); objects.remove(rect);

10
core/src/view/Gamescreen.java
Unescape View File

@ -87,12 +87,12 @@ public class Gamescreen{
goalRects[6] = new Rectangle(x + w-1 ,y ,1 ,h ); goalRects[6] = new Rectangle(x + w-1 ,y ,1 ,h );
goalRects[7] = new Rectangle(x ,y ,w ,1 ); goalRects[7] = new Rectangle(x ,y ,w ,1 );
int hitboxWidth = 5; // CHANGE IN STEP TIMER IN CONTROLLER TOO int hitboxWidth = 1; // CHANGE IN STEP TIMER IN CONTROLLER TOO
for (Rectangle object : objects) { for (Rectangle object : objects) {
objectRects.add(new Rectangle(object.getX(), object.getY(), hitboxWidth, object.getHeight())); objectRects.add(new Rectangle(object.getX() + 2, object.getY(), object.getWidth() - 4, hitboxWidth)); // UNTEN
objectRects.add(new Rectangle(object.getX(), object.getY() + object.getHeight() - hitboxWidth, object.getWidth(), hitboxWidth)); objectRects.add(new Rectangle(object.getX() + 2, object.getY() + object.getHeight() - hitboxWidth, object.getWidth() - 4, hitboxWidth)); // OBEN
objectRects.add(new Rectangle(object.getX() + object.getWidth() - hitboxWidth, object.getY(), hitboxWidth, object.getHeight())); objectRects.add(new Rectangle(object.getX() + object.getWidth() - hitboxWidth, object.getY() + 2, hitboxWidth, object.getHeight() - 4)); // RECHTS
objectRects.add(new Rectangle(object.getX(), object.getY(), object.getWidth(), hitboxWidth)); objectRects.add(new Rectangle(object.getX(), object.getY() + 2, hitboxWidth, object.getHeight() - 4)); // LINKS
} }
goalRect = new Rectangle(x + w*th, y + h*th, w * th * 3, h * 0.1f); goalRect = new Rectangle(x + w*th, y + h*th, w * th * 3, h * 0.1f);

4
desktop/src/com/throwgame/main/desktop/DesktopLauncher.java
Unescape View File

@ -9,8 +9,8 @@ public class DesktopLauncher {
public static void main (String[] arg) { public static void main (String[] arg) {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
config.fullscreen = false; config.fullscreen = false;
config.height = 480; config.height = 900;
config.width = 720; config.width = 1600;
new LwjglApplication(new Controller(), config); new LwjglApplication(new Controller(), config);
} }
} }

Write Preview
Loading…
Cancel
Save