Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleSkinColor

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:24:36 +02:00
parent 448c02033d
commit 8f91d8e7ac
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/client/Character.java
View File

@@ -165,7 +165,7 @@ public class Character extends AbstractCharacterObject {
private final Pet[] pets = new Pet[3]; private final Pet[] pets = new Pet[3];
private MaplePlayerShop playerShop = null; private MaplePlayerShop playerShop = null;
private MapleShop shop = null; private MapleShop shop = null;
private MapleSkinColor skinColor = MapleSkinColor.NORMAL; private SkinColor skinColor = SkinColor.NORMAL;
private MapleStorage storage = null; private MapleStorage storage = null;
private MapleTrade trade = null; private MapleTrade trade = null;
private MonsterBook monsterbook; private MonsterBook monsterbook;
@@ -5830,7 +5830,7 @@ public class Character extends AbstractCharacterObject {
return skills.get(skill).expiration; return skills.get(skill).expiration;
} }
public MapleSkinColor getSkinColor() { public SkinColor getSkinColor() {
return skinColor; return skinColor;
} }
@@ -6848,7 +6848,7 @@ public class Character extends AbstractCharacterObject {
ret.id = rs.getInt("id"); ret.id = rs.getInt("id");
ret.name = rs.getString("name"); ret.name = rs.getString("name");
ret.gender = rs.getInt("gender"); ret.gender = rs.getInt("gender");
ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor")); ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
ret.face = rs.getInt("face"); ret.face = rs.getInt("face");
ret.hair = rs.getInt("hair"); ret.hair = rs.getInt("hair");
@@ -6992,7 +6992,7 @@ public class Character extends AbstractCharacterObject {
ret.meso.set(rs.getInt("meso")); ret.meso.set(rs.getInt("meso"));
ret.merchantmeso = rs.getInt("MerchantMesos"); ret.merchantmeso = rs.getInt("MerchantMesos");
ret.setGMLevel(rs.getInt("gm")); ret.setGMLevel(rs.getInt("gm"));
ret.skinColor = MapleSkinColor.getById(rs.getInt("skincolor")); ret.skinColor = SkinColor.getById(rs.getInt("skincolor"));
ret.gender = rs.getInt("gender"); ret.gender = rs.getInt("gender");
ret.job = Job.getById(rs.getInt("job")); ret.job = Job.getById(rs.getInt("job"));
ret.finishedDojoTutorial = rs.getInt("finishedDojoTutorial") == 1; ret.finishedDojoTutorial = rs.getInt("finishedDojoTutorial") == 1;
@@ -9285,7 +9285,7 @@ public class Character extends AbstractCharacterObject {
search = find; search = find;
} }
public void setSkinColor(MapleSkinColor skinColor) { public void setSkinColor(SkinColor skinColor) {
this.skinColor = skinColor; this.skinColor = skinColor;
} }

18
src/main/java/client/MapleSkinColor.java → src/main/java/client/SkinColor.java
View File

@@ -21,11 +21,19 @@
*/ */
package client; package client;
public enum MapleSkinColor { public enum SkinColor {
NORMAL(0), DARK(1), BLACK(2), PALE(3), BLUE(4), GREEN(5), WHITE(9), PINK(10); NORMAL(0),
DARK(1),
BLACK(2),
PALE(3),
BLUE(4),
GREEN(5),
WHITE(9),
PINK(10);
final int id; final int id;
private MapleSkinColor(int id) { SkinColor(int id) {
this.id = id; this.id = id;
} }
@@ -33,8 +41,8 @@ public enum MapleSkinColor {
return id; return id;
} }
public static MapleSkinColor getById(int id) { public static SkinColor getById(int id) {
for (MapleSkinColor l : MapleSkinColor.values()) { for (SkinColor l : SkinColor.values()) {
if (l.getId() == id) { if (l.getId() == id) {
return l; return l;
} }

4
src/main/java/client/creator/CharacterFactory.java
View File

@@ -21,7 +21,7 @@ package client.creator;
import client.Character; import client.Character;
import client.Client; import client.Client;
import client.MapleSkinColor; import client.SkinColor;
import client.inventory.Inventory; import client.inventory.Inventory;
import client.inventory.InventoryType; import client.inventory.InventoryType;
import client.inventory.Item; import client.inventory.Item;
@@ -48,7 +48,7 @@ public abstract class CharacterFactory {
Character newchar = Character.getDefault(c); Character newchar = Character.getDefault(c);
newchar.setWorld(c.getWorld()); newchar.setWorld(c.getWorld());
newchar.setSkinColor(MapleSkinColor.getById(skin)); newchar.setSkinColor(SkinColor.getById(skin));
newchar.setGender(gender); newchar.setGender(gender);
newchar.setName(name); newchar.setName(name);
newchar.setHair(hair); newchar.setHair(hair);

2
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -296,7 +296,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
} }
public void setSkin(int color) { public void setSkin(int color) {
getPlayer().setSkinColor(MapleSkinColor.getById(color)); getPlayer().setSkinColor(SkinColor.getById(color));
getPlayer().updateSingleStat(MapleStat.SKIN, color); getPlayer().updateSingleStat(MapleStat.SKIN, color);
getPlayer().equipChanged(); getPlayer().equipChanged();
} }