mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-04 15:27:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored color names

Browse Source 
Refactored color names since they are used globally
This commit is contained in:
Collin Smith
2019-02-16 14:25:09 -08:00
parent 2ba6542728
commit ece4016b7c
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/gdx/diablo/Colors.java
View File

@ -5,29 +5,29 @@ import com.badlogic.gdx.graphics.Color;
public class Colors {
public static final Color WHITE = new Color(0xFFFFFFFF); // 0 #FFFFFF
public static final Color SERVER = new Color(0xFF4D4DFF); // 1 #FF4D4D
public static final Color SET = new Color(0x00FF00FF); // 2 #00FF00
public static final Color MAGIC = new Color(0x6969FFFF); // 3 #6969FF
public static final Color UNIQUE = new Color(0xC7B377FF); // 4 #C7B377
public static final Color RED = new Color(0xFF4D4DFF); // 1 #FF4D4D
public static final Color GREEN = new Color(0x00FF00FF); // 2 #00FF00
public static final Color BLUE = new Color(0x6969FFFF); // 3 #6969FF
public static final Color GOLD = new Color(0xC7B377FF); // 4 #C7B377
public static final Color GREY = new Color(0x696969FF); // 5 #696969
public static final Color BLACK = new Color(0x000000FF); // 6 #000000
public static final Color C7 = new Color(0xD0C27DFF); // 7 #D0C27D
public static final Color CRAFT = new Color(0xFFA800FF); // 8 #FFA800
public static final Color RARE = new Color(0xFFFF64FF); // 9 #FFFF64
public static final Color ORANGE = new Color(0xFFA800FF); // 8 #FFA800
public static final Color YELLOW = new Color(0xFFFF64FF); // 9 #FFFF64
public static final Color C10 = new Color(0x008000FF); // 10 #008000
public static final Color PURPLE = new Color(0xAE00FFFF); // 11 #AE00FF
public static final Color C12 = new Color(0x00C800FF); // 12 #00C800
public Color white = WHITE.cpy();
public Color server = SERVER.cpy();
public Color set = SET.cpy();
public Color magic = MAGIC.cpy();
public Color unique = UNIQUE.cpy();
public Color red = RED.cpy();
public Color green = GREEN.cpy();
public Color blue = BLUE.cpy();
public Color gold = GOLD.cpy();
public Color grey = GREY.cpy();
public Color black = BLACK.cpy();
public Color c7 = C7.cpy();
public Color craft = CRAFT.cpy();
public Color rare = RARE.cpy();
public Color orange = ORANGE.cpy();
public Color yellow = YELLOW.cpy();
public Color c10 = C10.cpy();
public Color purple = PURPLE.cpy();
public Color c12 = C12.cpy();

18
core/src/gdx/diablo/screen/LobbyScreen.java
View File

@ -236,19 +236,19 @@ public class LobbyScreen extends ScreenAdapter {
creategamebckg.getRegionWidth() / 2 - getWidth() / 2,
creategamebckg.getRegionHeight() - getHeight());
}});
addActor(new Label(5274, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5274, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(12, 315);
}});
addActor(new Label(5256, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5256, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(12, 260);
}});
addActor(new Label(5257, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5257, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(12, 205);
}});
addActor(new Label(5258, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5258, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(20, 140);
}});
addActor(new Label(5259, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5259, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(20, 105);
}});
@ -369,13 +369,13 @@ public class LobbyScreen extends ScreenAdapter {
joingamebckg.getRegionWidth() / 2 - getWidth() / 2,
joingamebckg.getRegionHeight() - getHeight());
}});
addActor(new Label(5274, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5274, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(12, 328);
}});
addActor(new Label(5225, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5225, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(188, 328);
}});
addActor(new Label(5275, Diablo.fonts.font16, Diablo.colors.unique) {{
addActor(new Label(5275, Diablo.fonts.font16, Diablo.colors.gold) {{
setPosition(16, 236);
}});
@ -390,7 +390,7 @@ public class LobbyScreen extends ScreenAdapter {
tfPassword.setSize(160, 20);
addActor(tfPassword);
List.ListStyle style3 = new List.ListStyle(Diablo.fonts.fontformal10, Diablo.colors.unique, Diablo.colors.white,
List.ListStyle style3 = new List.ListStyle(Diablo.fonts.fontformal10, Diablo.colors.gold, Diablo.colors.white,
new TextureRegionDrawable(Diablo.textures.white));
final List<Session> list = new List<>(style3);
list.setPosition(14, 54);

4
core/src/gdx/diablo/screen/LoginScreen.java
View File

@ -168,12 +168,12 @@ public class LoginScreen extends ScreenAdapter {
setAlignment(Align.center);
}}).width(400).space(8).row();
add(new Table() {{
add(new Label(5224, Diablo.fonts.font16, Diablo.colors.unique)).align(Align.left).row();
add(new Label(5224, Diablo.fonts.font16, Diablo.colors.gold)).align(Align.left).row();
add(new TextField(textFieldStyle)).row();
align(Align.left);
}}).space(8).row();
add(new Table() {{
add(new Label(5225, Diablo.fonts.font16, Diablo.colors.unique)).align(Align.left).row();
add(new Label(5225, Diablo.fonts.font16, Diablo.colors.gold)).align(Align.left).row();
add(new TextField(textFieldStyle)).row();
}}).space(8).row();
add(btnLogIn).space(8).row();

4
core/src/gdx/diablo/screen/TCPIPScreen.java
View File

@ -155,14 +155,14 @@ public class TCPIPScreen extends ScreenAdapter {
ip = address.getHostAddress();
} catch (UnknownHostException e) {}
lbHostIP = new Label(Diablo.string.lookup(5121) + '\n' + ip, Diablo.fonts.font16);
lbHostIP.setColor(Diablo.colors.unique);
lbHostIP.setColor(Diablo.colors.gold);
lbHostIP.setAlignment(Align.center);
btnHostGame = new TextButton(5118, style);
btnHostGame.addListener(clickListener);
btnJoinGame = new TextButton(5119, style);
btnJoinGame.addListener(clickListener);
lbDescription = new Label(null, Diablo.fonts.fontformal12);
lbDescription.setColor(Diablo.colors.unique);
lbDescription.setColor(Diablo.colors.gold);
lbDescription.setAlignment(Align.center | Align.top);
lbDescription.setWrap(true);

8
core/src/gdx/diablo/widget/SelectButton.java
View File

@ -44,15 +44,15 @@ public class SelectButton extends Table implements Disposable {
preview = new CharacterPreview();
title = new Label(Diablo.fonts.font16);
title.setColor(Diablo.colors.unique);
title.setColor(Diablo.colors.gold);
name = new Label(Diablo.fonts.font16);
name.setColor(Diablo.colors.unique);
name.setColor(Diablo.colors.gold);
levelClass = new Label(Diablo.fonts.font16);
expansion = new Label(Diablo.fonts.font16);
expansion.setColor(Diablo.colors.set);
expansion.setColor(Diablo.colors.green);
Table previewColumn = new Table();
previewColumn.add(preview).width(72).growY();
@ -83,7 +83,7 @@ public class SelectButton extends Table implements Disposable {
preview.set(d2s);
title.setText(d2s.getProgressionString());
name.setText(d2s.name);
name.setColor(d2s.isHardcore() ? Diablo.colors.server : Diablo.colors.unique);
name.setColor(d2s.isHardcore() ? Diablo.colors.red : Diablo.colors.gold);
levelClass.setText(Diablo.string.format(5017, d2s.level) + " " + Diablo.string.lookup(CharClass.get(d2s.charClass).name));
expansion.setText(d2s.isExpansion() ? 11077 : -1);
}