diff --git a/res/img/dudes-b.png b/res/img/dudes-b.png deleted file mode 100644 index bba1327..0000000 Binary files a/res/img/dudes-b.png and /dev/null differ diff --git a/res/img/dudes.png b/res/img/dudes.png index 46fc775..ef107f8 100644 Binary files a/res/img/dudes.png and b/res/img/dudes.png differ diff --git a/res/img/dudes.xcf b/res/img/dudes.xcf index 2d002cb..f019eff 100644 Binary files a/res/img/dudes.xcf and b/res/img/dudes.xcf differ diff --git a/src/mightypork/rogue/Res.java b/src/mightypork/rogue/Res.java index c87f2ff..a65672b 100644 --- a/src/mightypork/rogue/Res.java +++ b/src/mightypork/rogue/Res.java @@ -76,9 +76,10 @@ public final class Res { textures.addQuad("panel", gui.makeQuad(0, 3.75, 4, .25)); // sprites - texture = textures.loadTexture("mob", "/res/img/dudes-b.png", FilterMode.NEAREST, WrapMode.CLAMP); + texture = textures.loadTexture("mob", "/res/img/dudes.png", FilterMode.NEAREST, WrapMode.CLAMP); tiles = texture.grid(8, 8); textures.addSheet("sprite.player", tiles.makeSheet(0, 0, 4, 1)); + textures.addSheet("sprite.rat", tiles.makeSheet(0, 1, 4, 1)); // small sheet texture = textures.loadTexture("tiles", "/res/img/tiles16.png", FilterMode.NEAREST, WrapMode.CLAMP); diff --git a/src/mightypork/rogue/world/entity/Entity.java b/src/mightypork/rogue/world/entity/Entity.java index 3365901..b57e372 100644 --- a/src/mightypork/rogue/world/entity/Entity.java +++ b/src/mightypork/rogue/world/entity/Entity.java @@ -151,7 +151,9 @@ public abstract class Entity implements IonObjBundled, Updateable { @DefaultImpl public final void render(MapRenderContext context) { - getRenderer().render(context); + if (context.getTile(getCoord()).isExplored()) { + getRenderer().render(context); + } } diff --git a/src/mightypork/rogue/world/entity/entities/PlayerEntity.java b/src/mightypork/rogue/world/entity/entities/PlayerEntity.java index d263fc1..82a9b50 100644 --- a/src/mightypork/rogue/world/entity/entities/PlayerEntity.java +++ b/src/mightypork/rogue/world/entity/entities/PlayerEntity.java @@ -116,4 +116,10 @@ public class PlayerEntity extends Entity { { return EntityType.PLAYER; } + + @Override + public void receiveAttack(Entity attacker, int attackStrength) + { + // FIXME ignore attack + } } diff --git a/src/mightypork/rogue/world/entity/entities/RatEntity.java b/src/mightypork/rogue/world/entity/entities/RatEntity.java index 07a06da..f57111b 100644 --- a/src/mightypork/rogue/world/entity/entities/RatEntity.java +++ b/src/mightypork/rogue/world/entity/entities/RatEntity.java @@ -53,7 +53,7 @@ public class RatEntity extends Entity { protected EntityRenderer getRenderer() { if (renderer == null) { - renderer = new EntityRendererMobLR(this, "sprite.player"); + renderer = new EntityRendererMobLR(this, "sprite.rat"); } return renderer; diff --git a/src/mightypork/rogue/world/entity/renderers/EntityRendererMobLR.java b/src/mightypork/rogue/world/entity/renderers/EntityRendererMobLR.java index 329f061..8d550ea 100644 --- a/src/mightypork/rogue/world/entity/renderers/EntityRendererMobLR.java +++ b/src/mightypork/rogue/world/entity/renderers/EntityRendererMobLR.java @@ -44,7 +44,7 @@ public class EntityRendererMobLR extends EntityRenderer { final Vect visualPos = entity.pos.getVisualPos(); Rect spriteRect = Rect.make(visualPos.x() * w, visualPos.y() * w, w, w); - spriteRect = spriteRect.shrink(w * 0.1); + spriteRect = spriteRect.shrink(w * 0.05); Render.quadTextured(spriteRect, q); } diff --git a/src/mightypork/rogue/world/gen/LevelGenerator.java b/src/mightypork/rogue/world/gen/LevelGenerator.java index 392a011..e6a66d2 100644 --- a/src/mightypork/rogue/world/gen/LevelGenerator.java +++ b/src/mightypork/rogue/world/gen/LevelGenerator.java @@ -45,7 +45,7 @@ public class LevelGenerator { // spawn rats final Coord pos = Coord.make(0, 0); - for (int i = 0; i < 1; i++) { // 4+complexity + rand.nextInt(1+complexity) + for (int i = 0; i < 4+complexity + rand.nextInt(1+complexity); i++) { final Entity e = Entities.RAT.createEntity(world); diff --git a/src/mightypork/rogue/world/level/render/MapRenderContext.java b/src/mightypork/rogue/world/level/render/MapRenderContext.java index 0aceb8b..4d8a6e5 100644 --- a/src/mightypork/rogue/world/level/render/MapRenderContext.java +++ b/src/mightypork/rogue/world/level/render/MapRenderContext.java @@ -5,6 +5,7 @@ import mightypork.gamecore.util.math.algo.Coord; import mightypork.gamecore.util.math.constraints.rect.Rect; import mightypork.gamecore.util.math.constraints.rect.builders.TiledRect; import mightypork.rogue.world.level.MapAccess; +import mightypork.rogue.world.tile.Tile; public abstract class MapRenderContext { @@ -33,4 +34,8 @@ public abstract class MapRenderContext { { return mapRect; } + + public Tile getTile(Coord pos) { + return map.getTile(pos); + } }