cubemaster21
/
Chuck-Proto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Breakable Walls!

Browse Source
master
Edward Peterson 9 years ago
parent 9e6b58ec19
commit 64ffe0ff09
6 changed files with 118 additions and 8 deletions
Show Stats Download Patch File Download Diff File

81
core/assets/testmap.tmx
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-up" width="50" height="50" tilewidth="16" tileheight="16" nextobjectid="149">
<map version="1.0" orientation="orthogonal" renderorder="right-up" width="50" height="50" tilewidth="16" tileheight="16" nextobjectid="163">
<tileset firstgid="1" name="env" tilewidth="16" tileheight="16" tilecount="64" columns="8">
<image source="env.png" width="128" height="128"/>
</tileset>
@ -55,6 +55,60 @@
3,4,16,4,16,4,16,6,7,15,7,8,16,4,16,4,16,4,5,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<layer name="secretRoom1" width="50" height="50">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,12,14,20,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,16,4,4,16,20,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,4,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<objectgroup name="collisions">
@ -109,8 +163,21 @@
<object id="59" x="592" y="720" width="32" height="64"/>
<object id="60" x="624" y="784" width="176" height="16"/>
<object id="61" x="800" y="352" width="32" height="448"/>
<object id="63" x="608" y="352" width="192" height="40"/>
<object id="63" x="608" y="240" width="128" height="152"/>
<object id="65" x="608" y="240" width="48" height="112"/>
<object id="150" x="768" y="240" width="32" height="152"/>
<object id="151" x="736" y="352" width="32" height="40">
<properties>
<property name="destructable" value="secretRoom1"/>
</properties>
</object>
<object id="152" x="784" y="224" width="16" height="32"/>
<object id="153" x="704" y="224" width="16" height="32"/>
<object id="154" x="704" y="64" width="16" height="24"/>
<object id="155" x="784" y="64" width="16" height="24"/>
<object id="156" x="720" y="48" width="64" height="24"/>
<object id="157" x="688" y="80" width="16" height="160"/>
<object id="160" x="800" y="80" width="16" height="160"/>
</objectgroup>
<objectgroup name="staticLights"/>
<objectgroup name="objectSpawn">
@ -279,5 +346,15 @@
<property name="type" value="torch"/>
</properties>
</object>
<object id="161" x="720" y="57" width="16" height="16">
<properties>
<property name="type" value="torch"/>
</properties>
</object>
<object id="162" x="768" y="57" width="16" height="16">
<properties>
<property name="type" value="torch"/>
</properties>
</object>
</objectgroup>
</map>

17
core/src/com/toasted/chuck/ChuckGame.java
Unescape Escape View File

@ -3,16 +3,18 @@ package com.toasted.chuck;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.maps.MapLayer;
import com.badlogic.gdx.maps.MapObject;
import com.badlogic.gdx.maps.objects.RectangleMapObject;
import com.badlogic.gdx.maps.tiled.TiledMap;
import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
import com.badlogic.gdx.maps.tiled.TmxMapLoader;
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
import com.badlogic.gdx.math.Rectangle;
@ -27,11 +29,13 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
EntityPlayer player;
ArrayList<Entity> entities = new ArrayList<Entity>();
Comparator<Entity> zSorter;
TiledMap tiledMap;
public static TiledMap tiledMap;
OrthogonalTiledMapRenderer tmRenderer;
ArrayList<Rectangle> collisions = new ArrayList<Rectangle>();
ArrayList<Light> lights = new ArrayList<Light>();
boolean testLightFade = false;
public static HashMap<Rectangle, MapObject> collisionLookupTable = new HashMap<Rectangle, MapObject>();
// public static ArrayList<String> hiddenLayers = new ArrayList<String>();
@Override
public void create () {
@ -53,11 +57,19 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
tmRenderer = new OrthogonalTiledMapRenderer(tiledMap, graphics.getBatch());
lights.add(player.getLight());
for(MapLayer ml: tiledMap.getLayers()){
if(ml.getName().contains("secret")){
// hiddenLayers.add(ml.getName());
ml.setVisible(false);
}
}
MapLayer ml = tiledMap.getLayers().get("collisions");
for(MapObject o: ml.getObjects()){
RectangleMapObject rmo = (RectangleMapObject) o;
Rectangle r = new Rectangle(rmo.getRectangle());
collisions.add(r);
collisionLookupTable.put(r, o);
}
MapLayer lightLayer = tiledMap.getLayers().get("staticLights");
@ -109,6 +121,7 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
tmRenderer.setView(graphics.cam);
tmRenderer.render();
graphics.startSprite();
for(Entity e: entities){

7
core/src/com/toasted/chuck/entities/Entity.java
Unescape Escape View File

@ -15,11 +15,13 @@ public abstract class Entity {
protected float flyLength;
protected boolean isChuckable = true;
protected boolean shouldDrawSelf = true;
protected float weight = 0; //used for destruction capabilities and pressure plate triggering
public Entity(){
}
public abstract void update(float delta, ArrayList<Entity> entities, ArrayList<Rectangle> collisions);
protected void doCollisions(float delta, ArrayList<Rectangle> collisions){
protected Rectangle doCollisions(float delta, ArrayList<Rectangle> collisions){
Rectangle collidedWith = null;
position.x += velocity.x * delta;
collision.x = position.x;
@ -35,6 +37,7 @@ public abstract class Entity {
position.x += overlap;
velocity.x = 0;
}
collidedWith = r;
}
}
collision.x = position.x;
@ -55,9 +58,11 @@ public abstract class Entity {
position.y += overlap;
velocity.y = 0;
}
collidedWith = r;
}
}
collision.y = position.y;
return collidedWith;
}
public abstract void draw(Graphics g);
public Vector2 getCenterPoint(){

18
core/src/com/toasted/chuck/entities/EntityBox.java
Unescape Escape View File

@ -2,9 +2,10 @@ package com.toasted.chuck.entities;
import java.util.ArrayList;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.maps.MapLayer;
import com.badlogic.gdx.math.Rectangle;
import com.toasted.chuck.ChuckGame;
import com.toasted.chuck.Graphics;
public class EntityBox extends Entity{
@ -17,12 +18,25 @@ public class EntityBox extends Entity{
position.x = x;
position.y = y;
collision = new Rectangle(x, y, 16, 16);
weight = 1;
}
public void update(float delta, ArrayList<Entity> entities, ArrayList<Rectangle> collisions) {
flyLength -= delta;
if(flyLength <= 0)
velocity.mulAdd(velocity, -delta * decel);
doCollisions(delta, collisions);
Rectangle r = doCollisions(delta, collisions);
if(r != null){
if(ChuckGame.collisionLookupTable.get(r).getProperties().containsKey("destructable") && weight > .75f){
String layerOpened = (String) ChuckGame.collisionLookupTable.get(r).getProperties().get("destructable");
collisions.remove(r);
MapLayer layer = ChuckGame.tiledMap.getLayers().get(layerOpened);
if(layer != null){
layer.setVisible(true);
} else {
System.err.println("Woah, no layer?");
}
}
}
}
public void draw(Graphics g) {

2
core/src/com/toasted/chuck/entities/EntityPlayer.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class EntityPlayer extends Entity implements LightEmitter{
private ArrayList<Integer> directionals = new ArrayList<Integer>();//Don't think I'll use this
private boolean[] arrowKeys = new boolean[4]; //UDLR
public EntityPlayer(){
weight = 1;
isChuckable = false;
for(int i = 0;i < 4;i++){
sprites[i] = new TextureRegion(playerArt, i * 16, 0, 16, 16);

1
core/src/com/toasted/chuck/entities/EntityTorch.java
Unescape Escape View File

@ -15,6 +15,7 @@ public class EntityTorch extends EntityBox implements LightEmitter{
public EntityTorch(float x, float y) {
super(x, y);
emitter = new Light(x + collision.width / 2, y + collision.height / 2, .3f);
weight = 0;
}
@Override

Write Preview
Loading…
Cancel
Save