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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Evan Debenham 2014-09-22 19:27:33 -04:00
commit eaf2fcf81b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
View File

@ -88,7 +88,8 @@ public class Dungeon {
"Pixel-Mart. Spend money. Live longer.", "Pixel-Mart. Spend money. Live longer.",
"When you're attacked by several monsters at the same time, try to retreat behind a door.", "When you're attacked by several monsters at the same time, try to retreat behind a door.",
"If you are burning, you can't put out the fire in the water while levitating.", "If you are burning, you can't put out the fire in the water while levitating.",
"There is no sense in possessing more than one Ankh at the same time, because you will lose them upon resurrecting.", "There is no sense in possessing more than one unblessed Ankh at the same time, " +
"because you will lose them upon resurrecting.",
"DANGER! Heavy machinery can cause injury, loss of limbs or death!", "DANGER! Heavy machinery can cause injury, loss of limbs or death!",

18
src/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java
View File

@ -31,14 +31,20 @@ public class WelcomeScene extends PixelScene {
"Happy Dungeoneering!"; "Happy Dungeoneering!";
private static final String TXT_LastVer = private static final String TXT_LastVer =
"v0.2.0a corrects a few issues some players were having, and makes a few balance tweaks:" + "v0.2.0a:" +
"\n\n-Fixed a bug with Cape of Thorns\n-Fixed a bug with Sandals of Nature" + "\n-Fixed various artifact bugs \n-Fixed a bug with Rankings & Saves" +
"\n-Fixed a bug with Talisman of Foresight\n-Fixed a bug with Rankings & Saves" +
"\n\n-Chalice now deals 25% less damage\n-Artifacts can now be sold to Pixel Mart" + "\n\n-Chalice now deals 25% less damage\n-Artifacts can now be sold to Pixel Mart" +
"\n-Artifacts & Rings are a little rarer now.\n\n\n" + "\n-Artifacts & Rings are a little rarer now.\n\n\n" +
"v0.2.0b corrects further issues:" + "v0.2.0b:" +
"\n\n-Fixed a bug with saving/moving floors\n-Fixed a bug with randomized item properties" + "\n-Fixed a bug with saving/moving floors\n-Fixed a bug with randomized item properties" +
"\n\n-Tweaked a few descriptions & sprites\n\nHappy Dungeoneering!"; "\n\n-Tweaked a few descriptions & sprites\n\n\n" +
"v0.2.0c:" +
"\n-Fixed a bug with the Ring of Might.\n-Fixed bugs with Scroll of Lullaby." +
"\n-Fixed a bug with the rankings page.\n-Fixed another save/load bug." +
"\n\n-Slightly reduced Horn of Plenty's power.\nSeed pouch capacity increased." +
"\n-Blandfruit can now stack.\n-Various descriptions/messages tweaked." +
"\n\nIf you are having any issues, please email me!" +
"\nHappy Dungeoneering!";
private static final String TXT_From011 = private static final String TXT_From011 =
"Hello early adopter, thank you so much for giving Shattered PD a try in its earliest stages!\n\n"+ "Hello early adopter, thank you so much for giving Shattered PD a try in its earliest stages!\n\n"+