konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.2.0: further improved clarity of gold in stitched wall tiles

Browse Source
This commit is contained in:
Evan Debenham
2023-08-01 14:02:52 -04:00
parent 0b754e9626
commit 8f741edbc9
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/environment/tiles_caves.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

35
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java
View File

@@ -42,6 +42,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.StormTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.SummoningTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WarpingTrap;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTileSheet;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTilemap;
import com.watabou.noosa.Game;
import com.watabou.noosa.Group;
@@ -158,11 +159,15 @@ public class CavesLevel extends RegularLevel {
addCavesVisuals( this, visuals );
return visuals;
}
public static void addCavesVisuals( Level level, Group group ) {
addCavesVisuals(level, group, false);
}
public static void addCavesVisuals( Level level, Group group, boolean overHang ) {
for (int i=0; i < level.length(); i++) {
if (level.map[i] == Terrain.WALL_DECO) {
group.add( new Vein( i ) );
group.add( new Vein( i, overHang ) );
}
}
}
@@ -170,13 +175,20 @@ public class CavesLevel extends RegularLevel {
private static class Vein extends Group {
private int pos;
private boolean includeOverhang;
private float delay;
public Vein( int pos ) {
this(pos, false);
}
public Vein( int pos, boolean includeOverhang ) {
super();
this.pos = pos;
this.includeOverhang = includeOverhang;
delay = Random.Float( 2 );
}
@@ -197,11 +209,20 @@ public class CavesLevel extends RegularLevel {
}
delay = Random.Float();
PointF p = DungeonTilemap.tileToWorld( pos );
((Sparkle)recycle( Sparkle.class )).reset(
p.x + Random.Float( DungeonTilemap.SIZE ),
p.y + Random.Float( DungeonTilemap.SIZE ) );
if (includeOverhang && !DungeonTileSheet.wallStitcheable(Dungeon.level.map[pos-Dungeon.level.width()])){
//also sparkles in the bottom 1/2 of the upper tile. Increases particle frequency by 50% accordingly.
delay *= 0.67f;
p.y -= DungeonTilemap.SIZE/2f;
((Sparkle)recycle( Sparkle.class )).reset(
p.x + Random.Float( DungeonTilemap.SIZE ),
p.y + Random.Float( DungeonTilemap.SIZE*1.5f ) );
} else {
((Sparkle)recycle( Sparkle.class )).reset(
p.x + Random.Float( DungeonTilemap.SIZE ),
p.y + Random.Float( DungeonTilemap.SIZE ) );
}
}
}
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/MiningLevel.java
View File

@@ -130,7 +130,7 @@ public class MiningLevel extends CavesLevel {
@Override
public Group addWallVisuals() {
super.addWallVisuals();
CavesLevel.addCavesVisuals(this, wallVisuals);
CavesLevel.addCavesVisuals(this, wallVisuals, true);
return wallVisuals;
}

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

@@ -303,8 +303,7 @@ public class DungeonTileSheet {
if (tile == Terrain.BOOKSHELF || below == Terrain.BOOKSHELF) result = WALL_INTERNAL_WOODEN;
//TODO currently this line on triggers on mining floors, do we want to make it universal?
else if (Dungeon.branch == 1 &&
(tile == Terrain.WALL_DECO || below == Terrain.WALL_DECO)) result = WALL_INTERNAL_DECO;
else if (Dungeon.branch == 1 && tile == Terrain.WALL_DECO) result = WALL_INTERNAL_DECO;
else result = WALL_INTERNAL;
if (!wallStitcheable(right)) result += 1;