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

v0.9.4: various bugfixes

Browse Source 
- crash on Android text input
- crash on stone of clairvoyance
- bags not working with a full inventory
- missing vfx on wandmaker
This commit is contained in:
Evan Debenham 2021-08-08 19:51:12 -04:00
parent 65a45d19dc
commit 4b6f487f1b
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPD-classes/src/main/java/com/watabou/noosa/Halo.java
View File

@ -41,6 +41,10 @@ public class Halo extends Image {
if (!TextureCache.contains( CACHE_KEY )) { if (!TextureCache.contains( CACHE_KEY )) {
Pixmap pixmap = TextureCache.create( CACHE_KEY, 2*RADIUS+1, 2*RADIUS+1 ).bitmap; Pixmap pixmap = TextureCache.create( CACHE_KEY, 2*RADIUS+1, 2*RADIUS+1 ).bitmap;
pixmap.setColor( 0x00000000 );
pixmap.fill();
pixmap.setColor( 0xFFFFFF08 ); pixmap.setColor( 0xFFFFFF08 );
for (int i = 0; i < RADIUS; i+=2) { for (int i = 0; i < RADIUS; i+=2) {
pixmap.fillCircle(RADIUS, RADIUS, (RADIUS - i)); pixmap.fillCircle(RADIUS, RADIUS, (RADIUS - i));

4
android/proguard-rules.pro vendored
View File

@ -18,6 +18,10 @@
-dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild -dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild
-dontwarn com.badlogic.gdx.jnigen.BuildTarget* -dontwarn com.badlogic.gdx.jnigen.BuildTarget*
# needed for libGDX skin reflection used in text fields. Perhaps just don't use skin?
-keepnames class com.badlogic.gdx.graphics.Color { *; }
-keepnames class com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle { *; }
-keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* { -keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* {
<init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration); <init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);
} }

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -187,10 +187,6 @@ public class Item implements Bundlable {
return true; return true;
} }
if (!container.canHold(this)){
return false;
}
ArrayList<Item> items = container.items; ArrayList<Item> items = container.items;
if (items.contains( this )) { if (items.contains( this )) {
@ -205,6 +201,10 @@ public class Item implements Bundlable {
} }
} }
if (!container.canHold(this)){
return false;
}
if (stackable) { if (stackable) {
for (Item item:items) { for (Item item:items) {
if (isSimilar( item )) { if (isSimilar( item )) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/mechanics/ShadowCaster.java
View File

@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
//based on: http://www.roguebasin.com/index.php?title=FOV_using_recursive_shadowcasting //based on: http://www.roguebasin.com/index.php?title=FOV_using_recursive_shadowcasting
public final class ShadowCaster { public final class ShadowCaster {
public static final int MAX_DISTANCE = 14; public static final int MAX_DISTANCE = 20;
//max length of rows as FOV moves out, for each FOV distance //max length of rows as FOV moves out, for each FOV distance
//This is used to make the overall FOV circular, instead of square //This is used to make the overall FOV circular, instead of square