LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0: improved several aspects of custom visuals in NewCityBossLevel

Browse Source
This commit is contained in:
Evan Debenham 2020-02-06 21:08:35 -05:00
parent 83def4a4b3
commit 36d5e0384c
5 changed files with 107 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/custom_tiles/city_boss.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java
View File

@ -23,9 +23,16 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.sprites.KingSprite;
//TODO currently just regular DK but with no summoning ability
public class DwarfKing extends King {
public class DwarfKing extends Mob {
{
spriteClass = KingSprite.class;
HP = HT = 1;
}
protected boolean canTryToSummon() {
return false;

125
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCityBossLevel.java
View File

@ -116,7 +116,7 @@ public class NewCityBossLevel extends Level {
Painter.fillDiamond(this, arena, 1, Terrain.EMPTY);
Painter.fill(this, arena, 5, Terrain.EMPTY_SP);
Painter.fill(this, arena, 6, Terrain.STATUE_SP);
Painter.fill(this, arena, 6, Terrain.SIGN);
c = arena.center();
Painter.set(this, c.x-3, c.y, Terrain.STATUE);
@ -134,8 +134,8 @@ public class NewCityBossLevel extends Level {
//exit hallway
Painter.fill(this, end, Terrain.CHASM);
Painter.fill(this, end.left+4, end.top+5, 7, 18, Terrain.EMPTY);
Painter.fill(this, end.left+4, end.top+5, 7, 3, Terrain.EXIT);
exit = end.left+7 + (end.top+7)*width();
Painter.fill(this, end.left+4, end.top+5, 7, 2, Terrain.EXIT);
exit = end.left+7 + (end.top+6)*width();
impShop = new ImpShopRoom();
impShop.set(end.left+3, end.top+12, end.left+11, end.top+20);
@ -313,7 +313,7 @@ public class NewCityBossLevel extends Level {
tileH = 48;
}
private static final int STAIR_ROWS = 8;
private static final int STAIR_ROWS = 7;
@Override
public Tilemap create() {
@ -328,7 +328,7 @@ public class NewCityBossLevel extends Level {
for (int i = tileW; i < tileW*22; i++){
if (map[i] == Terrain.EXIT && stairsTop == -1){
stairsTop = i - tileW;
stairsTop = i;
}
//pillars
@ -344,11 +344,11 @@ public class NewCityBossLevel extends Level {
//imp's pedestal
} else if (map[i] == Terrain.PEDESTAL) {
data[i] = 12*8 + 5;
data[i] = 13*8 + 5;
//skull piles
} else if (map[i] == Terrain.STATUE) {
data[i] = 13*8 + 5;
data[i] = 15*8 + 5;
//ground tiles
} else if (map[i] == Terrain.EMPTY || map[i] == Terrain.EMPTY_DECO){
@ -383,21 +383,9 @@ public class NewCityBossLevel extends Level {
}
//custom for stairs
int[] rowData = null;
for (int i = 0; i < STAIR_ROWS; i++){
if (i == 0){
rowData = new int[]{-1, -1, 7*8+2, 7*8+3, 7*8+4, -1, -1};
} else if (i == 1){
rowData = new int[]{8*8+0, 8*8+1, 8*8+2, 8*8+3, 8*8+4, 8*8+5, 8*8+6};
} else if (i < STAIR_ROWS-2){
rowData = new int[]{9*8+0, 8*8+3, 8*8+3, 8*8+3, 8*8+3, 8*8+3, 9*8+6};
} else if (i == STAIR_ROWS-2){
rowData = new int[]{9*8+0, 9*8+1, 9*8+2, 9*8+3, 9*8+4, 9*8+5, 9*8+6};
} else {
rowData = new int[]{10*8+0, 10*8+1, 10*8+2, 10*8+3, 10*8+4, 10*8+5, 10*8+6};
}
for (int j = 0; j < rowData.length; j++){
data[stairsTop+j] = rowData[j];
for (int j = 0; j < 7; j++){
data[stairsTop+j] = (i+4)*8 + j;
}
stairsTop += tileW;
}
@ -422,9 +410,9 @@ public class NewCityBossLevel extends Level {
data[++i] = 13 * 8 + 3;
//mid row of DK's throne
}else if (map[i + 1] == Terrain.STATUE_SP) {
}else if (map[i + 1] == Terrain.SIGN) {
data[i] = 14 * 8 + 1;
data[++i] = 15 * 8 + 5;
data[++i] = 14 * 8 + 2; //TODO finalize throne visuals
data[++i] = 14 * 8 + 3;
//bottom row of DK's throne
@ -451,6 +439,54 @@ public class NewCityBossLevel extends Level {
v.map( data, tileW );
return v;
}
@Override
public String name(int tileX, int tileY) {
int cell = (this.tileX + tileX) + (this.tileY + tileY)*tileW;
//demon halls tiles
if (cell < Dungeon.level.width*22){
if (Dungeon.level.map[cell] == Terrain.STATUE){
return Messages.get(HallsLevel.class, "statue_name");
}
//DK arena tiles
} else {
if (Dungeon.level.map[cell] == Terrain.SIGN){
return Messages.get(NewCityBossLevel.class, "throne_name");
} else if (Dungeon.level.map[cell] == Terrain.PEDESTAL){
return Messages.get(NewCityBossLevel.class, "summoning_name");
}
}
return super.name(tileX, tileY);
}
@Override
public String desc(int tileX, int tileY) {
int cell = (this.tileX + tileX) + (this.tileY + tileY)*tileW;
//demon halls tiles
if (cell < Dungeon.level.width*22){
if (Dungeon.level.map[cell] == Terrain.EXIT){
return Messages.get(HallsLevel.class, "exit_desc");
} else if (Dungeon.level.map[cell] == Terrain.STATUE){
return Messages.get(HallsLevel.class, "statue_desc");
} else if (Dungeon.level.map[cell] == Terrain.EMPTY_DECO){
return "";
}
//DK arena tiles
} else {
if (Dungeon.level.map[cell] == Terrain.SIGN){
return Messages.get(NewCityBossLevel.class, "throne_desc");
} else if (Dungeon.level.map[cell] == Terrain.PEDESTAL){
return Messages.get(NewCityBossLevel.class, "summoning_desc");
}
}
return super.desc(tileX, tileY);
}
}
public static class CustomWallVisuals extends CustomTilemap {
@ -467,13 +503,13 @@ public class NewCityBossLevel extends Level {
int[] map = Dungeon.level.map;
int stairsTop = -1;
int shadowTop = -1;
//upper part of the level, mostly demon halls tiles
for (int i = tileW; i < tileW*21; i++) {
if (map[i] == Terrain.EXIT && stairsTop == -1){
stairsTop = i - tileW;
if (map[i] == Terrain.EXIT && shadowTop == -1){
shadowTop = i - tileW*4;
}
//pillars
@ -484,38 +520,39 @@ public class NewCityBossLevel extends Level {
data[i] = 13 * 8 + 6;
data[++i] = 13 * 8 + 7;
//skull tops
} else if (map[i+tileW] == Terrain.STATUE) {
data[i] = 14*8 + 5;
//otherwise no tile here
} else {
data[i] = -1;
}
}
//custom shadow (and skull tops) for stairs
//TODO this doesn't look so great. Should try baking some of the shadow into the stairs themselves
for (int i = 0; i < CustomGroundVisuals.STAIR_ROWS; i++){
if (i == CustomGroundVisuals.STAIR_ROWS-1){
data[stairsTop] = i*8 + 0;
data[stairsTop+1] = i*8 + 1;
data[stairsTop+2] = data[stairsTop+3] = data[stairsTop+4] = -1;
data[stairsTop+5] = i*8 + 5;
data[stairsTop+6] = i*8 + 6;
//custom shadow for stairs
for (int i = 0; i < 8; i++){
if (i < 4){
data[shadowTop] = i*8 + 0;
data[shadowTop+1] = data[shadowTop+2] = data[shadowTop+3] = data[shadowTop+4] =
data[shadowTop+5] = data[shadowTop+6] = i*8 + 1;
data[shadowTop+7] = i*8 + 2;
} else {
for (int j = 0; j < 7; j++) {
data[stairsTop + j] = i*8 + j;
int j = i - 4;
data[shadowTop] = j*8 + 3;
data[shadowTop+1] = data[shadowTop+2] = data[shadowTop+3] = data[shadowTop+4] =
data[shadowTop+5] = data[shadowTop+6] = j*8 + 4;
data[shadowTop+7] = j*8 + 5;
}
}
stairsTop += tileW;
shadowTop += tileW;
}
//lower part. Just need to handle statue tiles here
for (int i = tileW*21; i < tileW * tileH; i++){
//DK's throne
if (map[i] == Terrain.STATUE_SP){
data[i-tileW] = 14*8 + 5;
//Statues that need to face left instead of right
} else if (map[i] == Terrain.STATUE && i%tileW > 7){
if (map[i] == Terrain.STATUE && i%tileW > 7){
data[i-tileW] = 14*8 + 4;
}

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/TerrainFeaturesTilemap.java
View File

@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.tiles;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.LastShopLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
@ -65,7 +66,7 @@ public class TerrainFeaturesTilemap extends DungeonTilemap {
}
int stage = (Dungeon.depth-1)/5;
if (Dungeon.depth == 21) stage--;
if (Dungeon.depth == 21 && Dungeon.level instanceof LastShopLevel) stage--;
if (tile == Terrain.HIGH_GRASS){
return 9 + 16*stage + (DungeonTileSheet.tileVariance[pos] >= 50 ? 1 : 0);
} else if (tile == Terrain.FURROWED_GRASS){

5
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels.properties
View File

@ -136,6 +136,11 @@ levels.newcavesbosslevel.gate_desc=A large metal gate that blocks the path into
levels.newcavesbosslevel.gate_desc_broken=The gate must have been connected to DM-300 in some way, as it exploded when DM-300 was defeated. Now only broken pieces remain.
levels.newcavesbosslevel.water_desc=With all the electricity around here water might not always be safe...
levels.newcitybosslevel.throne_name=Throne
levels.newcitybosslevel.throne_desc=TODO
levels.newcitybosslevel.summoning_name=Summoning pedestal
levels.newcitybosslevel.pedestal_desc=TODO
levels.caveslevel.grass_name=Fluorescent moss
levels.caveslevel.high_grass_name=Fluorescent mushrooms
levels.caveslevel.water_name=Freezing cold water