diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java index adfec6f4e..4348bddb0 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java @@ -24,6 +24,7 @@ package com.watabou.noosa; import com.badlogic.gdx.Application; import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.glutils.GLVersion; import com.badlogic.gdx.utils.TimeUtils; import com.watabou.glscripts.Script; import com.watabou.gltextures.TextureCache; @@ -97,14 +98,16 @@ public class Game implements ApplicationListener { dispHeight = Gdx.graphics.getDisplayMode().height; dispWidth = Gdx.graphics.getDisplayMode().width; - Blending.useDefault(); - inputHandler = new InputHandler( Gdx.input ); //refreshes texture and vertex data stored on the gpu + versionContextRef = Gdx.graphics.getGLVersion(); + Blending.useDefault(); TextureCache.reload(); Vertexbuffer.refreshAllBuffers(); } + + private GLVersion versionContextRef; @Override public void resize(int width, int height) { @@ -112,9 +115,14 @@ public class Game implements ApplicationListener { return; } - Blending.useDefault(); - TextureCache.reload(); - Vertexbuffer.refreshAllBuffers(); + //If the EGL context was destroyed, we need to refresh some data stored on the GPU. + // This checks that by seeing if GLVersion has a new object reference + if (versionContextRef != Gdx.graphics.getGLVersion()) { + versionContextRef = Gdx.graphics.getGLVersion(); + Blending.useDefault(); + TextureCache.reload(); + Vertexbuffer.refreshAllBuffers(); + } if (height != Game.height || width != Game.width) { diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 207736aef..5f4b47683 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -57,7 +57,7 @@ items.armor.glyphs.stone.name=%s of stone items.armor.glyphs.stone.desc=This glyph surrounds the armor with heavy magical stone that makes dodging impossible, but blocks damage in proportion with evasion. items.armor.glyphs.swiftness.name=%s of swiftness -items.armor.glyphs.swiftness.desc=This glyph enhances the speed of the wearer whenever they aren't NEAR to an enemy. +items.armor.glyphs.swiftness.desc=This glyph enhances the speed of the wearer whenever they aren't near to an enemy. items.armor.glyphs.thorns.name=%s of thorns items.armor.glyphs.thorns.desc=This powerful glyph harms attackers, causing them to slowly bleed when they attack the wearer. @@ -1210,7 +1210,7 @@ items.wands.wandofregrowth.stats_desc=When used, this wand will blast magical re items.wands.wandofregrowth$dewcatcher.name=Dewcatcher items.wands.wandofregrowth$dewcatcher.desc=Dewcatchers are wonderous plants that fill themselves with magical dew. They attempt to camouflage as grass to avoid attention, but their bulges of collected dew give them away. items.wands.wandofregrowth$seedpod.name=Seed Pod -items.wands.wandofregrowth$seedpod.desc=Seed Pods are magical plants that produce seeds from other plan types, rather than any seeds of their own. They somehow manage to spread despite having no seed of their own. +items.wands.wandofregrowth$seedpod.desc=Seed Pods are magical plants that produce seeds from other plant types, rather than any seeds of their own. They somehow manage to spread despite having no seed of their own. items.wands.wandofregrowth$lotus.name=Golden Lotus items.wands.wandofregrowth$lotus.desc=The golden lotus is a mystical plant that can only be conjured by a powerful wand of regrowth. Its aura enhances all plants and plant effects, but it burns through its energy and dies after a short time.\n\nThis lotus was produced by a _+%1$d_ wand of regrowth. All plants in its effect will _instantly trigger_ if they are planted on a character. Plants will also have a _%2$d%% chance_ to drop their seed, and tipped darts gain _%3$d%% extra durability_. @@ -1425,7 +1425,7 @@ items.weapon.melee.runicblade.desc=A mysterious weapon from a distant land, with items.weapon.melee.sai.name=sai items.weapon.melee.sai.stats_desc=This is a very fast weapon. -items.weapon.melee.sai.desc=Two thin blades meant to be wielded in one hand each. Excellent for tearing down enemy with a flurry of cuts. +items.weapon.melee.sai.desc=Two thin blades meant to be wielded in one hand each. Excellent for tearing down enemies with a flurry of cuts. items.weapon.melee.scimitar.name=scimitar items.weapon.melee.scimitar.stats_desc=This is a rather fast weapon. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java index e02cfe971..5ca4d42a6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java @@ -36,7 +36,7 @@ public class Greataxe extends MeleeWeapon { @Override public int max(int lvl) { - return 5*(tier+3) + //40 base, up from 30 + return 5*(tier+4) + //45 base, up from 30 lvl*(tier+1); //scaling unchanged }