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

v0.3.4: moved capitalization to Messages, added title case functionality, removed Utils

Browse Source
This commit is contained in:
Evan Debenham
2016-01-27 20:11:17 -05:00
committed by Evan Debenham
parent 16426c02ee
commit 551638f972
29 changed files with 71 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/windows/IconTitle.java
+2 -2
View File
@@ -20,6 +20,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.Image;
import com.watabou.noosa.RenderedTextMultiline;
import com.watabou.noosa.ui.Component;
@@ -28,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.HealthBar;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class IconTitle extends Component {
@@ -49,7 +49,7 @@ public class IconTitle extends Component {
public IconTitle( Item item ) {
ItemSprite icon = new ItemSprite();
icon( icon );
label( Utils.capitalize( item.toString() ) );
label( Messages.titleCase( item.toString() ) );
icon.view( item );
}
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java
+2 -2
View File
@@ -41,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
@@ -48,7 +49,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.ColorBlock;
import com.watabou.noosa.Image;
@@ -113,7 +113,7 @@ public class WndBag extends WndTabbed {
int slotsWidth = SLOT_SIZE * nCols + SLOT_MARGIN * (nCols - 1);
int slotsHeight = SLOT_SIZE * nRows + SLOT_MARGIN * (nRows - 1);
RenderedText txtTitle = PixelScene.renderText( title != null ? title : Utils.capitalize( bag.name() ), 9 );
RenderedText txtTitle = PixelScene.renderText( title != null ? title : Messages.titleCase( bag.name() ), 9 );
txtTitle.hardlight( TITLE_COLOR );
txtTitle.x = (int)(slotsWidth - txtTitle.width()) / 2;
txtTitle.y = (int)(TITLE_HEIGHT - txtTitle.height()) / 2;
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBlacksmith.java
+1 -2
View File
@@ -35,7 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class WndBlacksmith extends Window {
@@ -56,7 +55,7 @@ public class WndBlacksmith extends Window {
IconTitle titlebar = new IconTitle();
titlebar.icon( troll.sprite() );
titlebar.label( Utils.capitalize( troll.name ) );
titlebar.label( Messages.titleCase( troll.name ) );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndChooseWay.java
+2 -3
View File
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedTextMultiline;
public class WndChooseWay extends Window {
@@ -51,7 +50,7 @@ public class WndChooseWay extends Window {
hl.setPos( titlebar.left(), titlebar.bottom() + GAP );
add( hl );
RedButton btnWay1 = new RedButton( Utils.capitalize( way1.title() ) ) {
RedButton btnWay1 = new RedButton( way1.title().toUpperCase() ) {
@Override
protected void onClick() {
hide();
@@ -61,7 +60,7 @@ public class WndChooseWay extends Window {
btnWay1.setRect( 0, hl.bottom() + GAP, (WIDTH - GAP) / 2, BTN_HEIGHT );
add( btnWay1 );
RedButton btnWay2 = new RedButton( Utils.capitalize( way2.title() ) ) {
RedButton btnWay2 = new RedButton( way2.title().toUpperCase() ) {
@Override
protected void onClick() {
hide();
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndClass.java
+1 -3
View File
@@ -27,8 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedText;
import com.watabou.noosa.RenderedTextMultiline;
public class WndClass extends WndTabbed {
@@ -51,7 +49,7 @@ public class WndClass extends WndTabbed {
tabPerks = new PerksTab();
add( tabPerks );
Tab tab = new RankingTab( Utils.capitalize( cl.title() ), tabPerks );
Tab tab = new RankingTab( cl.title().toUpperCase(), tabPerks );
tab.setSize( TAB_WIDTH, tabHeight() );
add( tab );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndImp.java
+1 -2
View File
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedTextMultiline;
public class WndImp extends Window {
@@ -45,7 +44,7 @@ public class WndImp extends Window {
IconTitle titlebar = new IconTitle();
titlebar.icon( new ItemSprite( tokens.image(), null ) );
titlebar.label( Utils.capitalize( tokens.name() ) );
titlebar.label( Messages.titleCase( tokens.name() ) );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoBuff.java
+2 -2
View File
@@ -22,9 +22,9 @@ package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache;
import com.watabou.noosa.Image;
@@ -52,7 +52,7 @@ public class WndInfoBuff extends Window {
buffIcon.frame( film.get(buff.icon()) );
titlebar.icon( buffIcon );
titlebar.label( Utils.capitalize(buff.toString()), Window.TITLE_COLOR );
titlebar.label( Messages.titleCase(buff.toString()), Window.TITLE_COLOR );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoItem.java
+1 -2
View File
@@ -32,7 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedTextMultiline;
public class WndInfoItem extends Window {
@@ -115,7 +114,7 @@ public class WndInfoItem extends Window {
IconTitle titlebar = new IconTitle();
titlebar.icon( new ItemSprite( image, glowing ) );
titlebar.label( Utils.capitalize( title ), titleColor );
titlebar.label( Messages.titleCase( title ), titleColor );
titlebar.setRect( 0, 0, width, 0 );
add( titlebar );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoMob.java
+2 -3
View File
@@ -20,7 +20,7 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.watabou.noosa.BitmapText;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.watabou.noosa.RenderedText;
import com.watabou.noosa.ui.Component;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.shatteredpixel.shatteredpixeldungeon.ui.HealthBar;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class WndInfoMob extends WndTitledMessage {
@@ -58,7 +57,7 @@ public class WndInfoMob extends WndTitledMessage {
public MobTitle( Mob mob ) {
name = PixelScene.renderText( Utils.capitalize( mob.name ), 9 );
name = PixelScene.renderText( Messages.titleCase( mob.name ), 9 );
name.hardlight( TITLE_COLOR );
add( name );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndQuest.java
+2 -2
View File
@@ -21,11 +21,11 @@
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
public class WndQuest extends WndTitledMessage {
public WndQuest( NPC questgiver, String text ) {
super( questgiver.sprite(), Utils.capitalize( questgiver.name ), text );
super( questgiver.sprite(), Messages.titleCase( questgiver.name ), text );
}
}
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
+1 -2
View File
@@ -45,7 +45,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class WndRanking extends WndTabbed {
@@ -321,7 +320,7 @@ public class WndRanking extends WndTabbed {
name.x = slot.right() + 2;
name.y = y + (height - name.baseLine()) / 2;
String str = Utils.capitalize( item.name() );
String str = Messages.titleCase( item.name() );
name.text( str );
if (name.width() > width - name.x) {
do {
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java
+1 -2
View File
@@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedTextMultiline;
public class WndTradeItem extends Window {
@@ -200,7 +199,7 @@ public class WndTradeItem extends Window {
titlebar.icon( new ItemSprite( item ) );
titlebar.label( forSale ?
Messages.get(this, "sale", item.toString(), price( item ) ) :
Utils.capitalize( item.toString() ) );
Messages.titleCase( item.toString() ) );
titlebar.setRect( 0, 0, WIDTH, 0 );
add( titlebar );
src/com/shatteredpixel/shatteredpixeldungeon/windows/WndWandmaker.java
+1 -2
View File
@@ -33,7 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.watabou.noosa.RenderedTextMultiline;
public class WndWandmaker extends Window {
@@ -48,7 +47,7 @@ public class WndWandmaker extends Window {
IconTitle titlebar = new IconTitle();
titlebar.icon(new ItemSprite(item.image(), null));
titlebar.label(Utils.capitalize(item.name()));
titlebar.label(Messages.titleCase(item.name()));
titlebar.setRect(0, 0, WIDTH, 0);
add( titlebar );