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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -19,7 +19,7 @@
*/
package server.partyquest;
import client.MapleCharacter;
import client.Character;
import constants.game.GameConstants;
import server.TimerManager;
import server.expeditions.MapleExpedition;
@@ -43,8 +43,8 @@ public class AriantColiseum {
private MapleExpedition exped;
private MapleMap map;
private Map<MapleCharacter, Integer> score;
private Map<MapleCharacter, Integer> rewardTier;
private Map<Character, Integer> score;
private Map<Character, Integer> rewardTier;
private boolean scoreDirty = false;
private ScheduledFuture<?> ariantUpdate;
@@ -65,17 +65,17 @@ public class AriantColiseum {
int pqTimer = 10 * 60 * 1000;
int pqTimerBoard = (9 * 60 * 1000) + 50 * 1000;
List<MapleCharacter> players = exped.getActiveMembers();
List<Character> players = exped.getActiveMembers();
score = new HashMap<>();
rewardTier = new HashMap<>();
for (MapleCharacter mc : players) {
for (Character mc : players) {
mc.changeMap(map, 0);
mc.setAriantColiseum(this);
mc.updateAriantScore();
rewardTier.put(mc, 0);
}
for (MapleCharacter mc : players) {
for (Character mc : players) {
mc.sendPacket(PacketCreator.updateAriantPQRanking(score));
}
@@ -125,16 +125,16 @@ public class AriantColiseum {
cancelAriantScoreBoard();
}
public int getAriantScore(MapleCharacter chr) {
public int getAriantScore(Character chr) {
Integer chrScore = score.get(chr);
return chrScore != null ? chrScore : 0;
}
public void clearAriantScore(MapleCharacter chr) {
public void clearAriantScore(Character chr) {
score.remove(chr);
}
public void updateAriantScore(MapleCharacter chr, int points) {
public void updateAriantScore(Character chr, int points) {
if (map != null) {
score.put(chr, points);
scoreDirty = true;
@@ -143,19 +143,19 @@ public class AriantColiseum {
private void broadcastAriantScoreUpdate() {
if (scoreDirty) {
for (MapleCharacter chr : score.keySet()) {
for (Character chr : score.keySet()) {
chr.sendPacket(PacketCreator.updateAriantPQRanking(score));
}
scoreDirty = false;
}
}
public int getAriantRewardTier(MapleCharacter chr) {
public int getAriantRewardTier(Character chr) {
Integer reward = rewardTier.get(chr);
return reward != null ? reward : 0;
}
public void clearAriantRewardTier(MapleCharacter chr) {
public void clearAriantRewardTier(Character chr) {
rewardTier.remove(chr);
}
@@ -163,13 +163,13 @@ public class AriantColiseum {
lostShards += quantity;
}
public void leaveArena(MapleCharacter chr) {
public void leaveArena(Character chr) {
if (!(eventClear && GameConstants.isAriantColiseumArena(chr.getMapId()))) {
leaveArenaInternal(chr);
}
}
private synchronized void leaveArenaInternal(MapleCharacter chr) {
private synchronized void leaveArenaInternal(Character chr) {
if (exped != null) {
if (exped.removeMember(chr)) {
int minSize = eventClear ? 1 : 2;
@@ -185,7 +185,7 @@ public class AriantColiseum {
}
}
public void playerDisconnected(MapleCharacter chr) {
public void playerDisconnected(Character chr) {
leaveArenaInternal(chr);
}
@@ -221,10 +221,10 @@ public class AriantColiseum {
public void distributeAriantPoints() {
int firstTop = -1, secondTop = -1;
MapleCharacter winner = null;
Character winner = null;
List<Integer> runnerups = new ArrayList<>();
for (Entry<MapleCharacter, Integer> e : score.entrySet()) {
for (Entry<Character, Integer> e : score.entrySet()) {
Integer s = e.getValue();
if (s > firstTop) {
secondTop = firstTop;
@@ -261,7 +261,7 @@ public class AriantColiseum {
exped.removeChannelExpedition(map.getChannelServer());
cancelAriantSchedules();
for (MapleCharacter chr : map.getAllPlayers()) {
for (Character chr : map.getAllPlayers()) {
chr.changeMap(980010010, 0);
}
}
@@ -270,7 +270,7 @@ public class AriantColiseum {
if (exped != null) {
exped.dispose(false);
for (MapleCharacter chr : exped.getActiveMembers()) {
for (Character chr : exped.getActiveMembers()) {
chr.setAriantColiseum(null);
chr.changeMap(980010000, 0);
}

42
src/main/java/server/partyquest/MonsterCarnival.java
View File

@@ -1,6 +1,6 @@
package server.partyquest;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import constants.string.LanguageConstants;
import net.server.Server;
@@ -29,7 +29,7 @@ public class MonsterCarnival {
private ScheduledFuture<?> timer, effectTimer, respawnTask;
private long startTime = 0;
private int summonsR = 0, summonsB = 0, room = 0;
private MapleCharacter leader1, leader2, team1, team2;
private Character leader1, leader2, team1, team2;
private int redCP, blueCP, redTotalCP, blueTotalCP, redTimeupCP, blueTimeupCP;
private boolean cpq1;
@@ -51,7 +51,7 @@ public class MonsterCarnival {
bluePortal = 1;
}
for (MaplePartyCharacter mpc : p1.getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(this);
mc.setTeam(0);
@@ -65,7 +65,7 @@ public class MonsterCarnival {
}
}
for (MaplePartyCharacter mpc : p2.getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(this);
mc.setTeam(1);
@@ -80,13 +80,13 @@ public class MonsterCarnival {
}
if (team1 == null || team2 == null) {
for (MaplePartyCharacter mpc : p1.getMembers()) {
MapleCharacter chr = mpc.getPlayer();
Character chr = mpc.getPlayer();
if (chr != null) {
chr.dropMessage(5, LanguageConstants.getMessage(chr, LanguageConstants.CPQError));
}
}
for (MaplePartyCharacter mpc : p2.getMembers()) {
MapleCharacter chr = mpc.getPlayer();
Character chr = mpc.getPlayer();
if (chr != null) {
chr.dropMessage(5, LanguageConstants.getMessage(chr, LanguageConstants.CPQError));
}
@@ -122,7 +122,7 @@ public class MonsterCarnival {
team = 1;
}
}
for (MapleCharacter chrMap : map.getAllPlayers()) {
for (Character chrMap : map.getAllPlayers()) {
if (team == -1) {
team = 1;
}
@@ -199,7 +199,7 @@ public class MonsterCarnival {
out = cs.getMapFactory().getMap(980000010);
}
for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.resetCP();
mc.setTeam(-1);
@@ -210,7 +210,7 @@ public class MonsterCarnival {
}
}
for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.resetCP();
mc.setTeam(-1);
@@ -255,7 +255,7 @@ public class MonsterCarnival {
Channel cs = map.getChannelServer();
if (winningTeam == 0) {
for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.gainFestivalPoints(this.redTotalCP);
mc.setMonsterCarnival(null);
@@ -269,7 +269,7 @@ public class MonsterCarnival {
}
}
for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.gainFestivalPoints(this.blueTotalCP);
mc.setMonsterCarnival(null);
@@ -284,7 +284,7 @@ public class MonsterCarnival {
}
} else if (winningTeam == 1) {
for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.gainFestivalPoints(this.blueTotalCP);
mc.setMonsterCarnival(null);
@@ -298,7 +298,7 @@ public class MonsterCarnival {
}
}
for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
mc.gainFestivalPoints(this.redTotalCP);
mc.setMonsterCarnival(null);
@@ -341,7 +341,7 @@ public class MonsterCarnival {
}
private void extendTime() {
for (MapleCharacter chrMap : map.getAllPlayers()) {
for (Character chrMap : map.getAllPlayers()) {
chrMap.dropMessage(5, LanguageConstants.getMessage(chrMap, LanguageConstants.CPQExtendTime));
}
startTime = System.currentTimeMillis() + 3 * 60 * 1000;
@@ -371,7 +371,7 @@ public class MonsterCarnival {
map.killAllMonsters();
for (MaplePartyCharacter mpc : leader1.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
if (redWin) {
mc.sendPacket(PacketCreator.showEffect("quest/carnival/win"));
@@ -385,7 +385,7 @@ public class MonsterCarnival {
}
}
for (MaplePartyCharacter mpc : leader2.getParty().getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
if (!redWin) {
mc.sendPacket(PacketCreator.showEffect("quest/carnival/win"));
@@ -416,23 +416,23 @@ public class MonsterCarnival {
this.p2 = p2;
}
public MapleCharacter getLeader1() {
public Character getLeader1() {
return leader1;
}
public void setLeader1(MapleCharacter leader1) {
public void setLeader1(Character leader1) {
this.leader1 = leader1;
}
public MapleCharacter getLeader2() {
public Character getLeader2() {
return leader2;
}
public void setLeader2(MapleCharacter leader2) {
public void setLeader2(Character leader2) {
this.leader2 = leader2;
}
public MapleCharacter getEnemyLeader(int team) {
public Character getEnemyLeader(int team) {
switch (team) {
case 0:
return leader2;

28
src/main/java/server/partyquest/MonsterCarnivalParty.java
View File

@@ -1,6 +1,6 @@
package server.partyquest;
import client.MapleCharacter;
import client.Character;
import server.maps.MapleMap;
import tools.PacketCreator;
@@ -12,29 +12,29 @@ import java.util.List;
*/
public class MonsterCarnivalParty {
private List<MapleCharacter> members = new LinkedList<>();
private MapleCharacter leader;
private List<Character> members = new LinkedList<>();
private Character leader;
private byte team;
private short availableCP = 0, totalCP = 0;
private int summons = 8;
private boolean winner = false;
public MonsterCarnivalParty(final MapleCharacter owner, final List<MapleCharacter> members1, final byte team1) {
public MonsterCarnivalParty(final Character owner, final List<Character> members1, final byte team1) {
leader = owner;
members = members1;
team = team1;
for (final MapleCharacter chr : members) {
for (final Character chr : members) {
chr.setMonsterCarnivalParty(this);
chr.setTeam(team);
}
}
public final MapleCharacter getLeader() {
public final Character getLeader() {
return leader;
}
public void addCP(MapleCharacter player, int ammount) {
public void addCP(Character player, int ammount) {
totalCP += ammount;
availableCP += ammount;
player.addCP(ammount);
@@ -48,12 +48,12 @@ public class MonsterCarnivalParty {
return availableCP;
}
public void useCP(MapleCharacter player, int ammount) {
public void useCP(Character player, int ammount) {
availableCP -= ammount;
player.useCP(ammount);
}
public List<MapleCharacter> getMembers() {
public List<Character> getMembers() {
return members;
}
@@ -62,7 +62,7 @@ public class MonsterCarnivalParty {
}
public void warpOut(final int map) {
for (MapleCharacter chr : members) {
for (Character chr : members) {
chr.changeMap(map, 0);
chr.setMonsterCarnivalParty(null);
chr.setMonsterCarnival(null);
@@ -71,7 +71,7 @@ public class MonsterCarnivalParty {
}
public void warp(final MapleMap map, final int portalid) {
for (MapleCharacter chr : members) {
for (Character chr : members) {
chr.changeMap(map, map.getPortal(portalid));
}
}
@@ -85,7 +85,7 @@ public class MonsterCarnivalParty {
public boolean allInMap(MapleMap map) {
boolean status = true;
for (MapleCharacter chr : members) {
for (Character chr : members) {
if (chr.getMap() != map) {
status = false;
}
@@ -93,7 +93,7 @@ public class MonsterCarnivalParty {
return status;
}
public void removeMember(MapleCharacter chr) {
public void removeMember(Character chr) {
members.remove(chr);
chr.changeMap(980000010);
chr.setMonsterCarnivalParty(null);
@@ -111,7 +111,7 @@ public class MonsterCarnivalParty {
public void displayMatchResult() {
final String effect = winner ? "quest/carnival/win" : "quest/carnival/lose";
for (final MapleCharacter chr : members) {
for (final Character chr : members) {
chr.sendPacket(PacketCreator.showEffect(effect));
}
}

19
src/main/java/server/partyquest/PartyQuest.java
View File

@@ -22,15 +22,14 @@
package server.partyquest;
import client.MapleCharacter;
import java.util.ArrayList;
import java.util.List;
import tools.FilePrinter;
import client.Character;
import net.server.Server;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import tools.FilePrinter;
import java.util.ArrayList;
import java.util.List;
/**
*
@@ -39,7 +38,7 @@ import net.server.world.MaplePartyCharacter;
public class PartyQuest {
int channel, world;
MapleParty party;
List<MapleCharacter> participants = new ArrayList<>();
List<Character> participants = new ArrayList<>();
public PartyQuest(MapleParty party) {
this.party = party;
@@ -49,7 +48,7 @@ public class PartyQuest {
int mapid = leader.getMapId();
for (MaplePartyCharacter pchr : party.getMembers()) {
if (pchr.getChannel() == channel && pchr.getMapId() == mapid) {
MapleCharacter chr = Server.getInstance().getWorld(world).getChannel(channel).getPlayerStorage().getCharacterById(pchr.getId());
Character chr = Server.getInstance().getWorld(world).getChannel(channel).getPlayerStorage().getCharacterById(pchr.getId());
if (chr != null)
this.participants.add(chr);
}
@@ -60,11 +59,11 @@ public class PartyQuest {
return party;
}
public List<MapleCharacter> getParticipants() {
public List<Character> getParticipants() {
return participants;
}
public void removeParticipant(MapleCharacter chr) throws Throwable {
public void removeParticipant(Character chr) throws Throwable {
synchronized (participants) {
participants.remove(chr);
chr.setPartyQuest(null);

16
src/main/java/server/partyquest/Pyramid.java
View File

@@ -22,7 +22,7 @@
package server.partyquest;
import client.MapleCharacter;
import client.Character;
import net.server.world.MapleParty;
import server.MapleItemInformationProvider;
import server.TimerManager;
@@ -138,7 +138,7 @@ public class Pyramid extends PartyQuest {
}
public void warp(int mapid) {
for (MapleCharacter chr : getParticipants()) {
for (Character chr : getParticipants()) {
chr.changeMap(mapid, 0);
}
if (stage > -1) {
@@ -150,7 +150,7 @@ public class Pyramid extends PartyQuest {
}
public void broadcastInfo(String info, int amount) {
for (MapleCharacter chr : getParticipants()) {
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_" + info, amount));
chr.sendPacket(PacketCreator.pyramidGauge(count));
}
@@ -169,14 +169,14 @@ public class Pyramid extends PartyQuest {
if (buffcount == 0 && total >= 250) {
buffcount++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants())
for (Character chr : getParticipants())
ii.getItemEffect(2022585).applyTo(chr);
} else if (buffcount == 1 && total >= 500) {
buffcount++;
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022586).applyTo(chr);
}
@@ -184,7 +184,7 @@ public class Pyramid extends PartyQuest {
buffcount++;
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022587).applyTo(chr);
}
@@ -195,7 +195,7 @@ public class Pyramid extends PartyQuest {
buffcount++;
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
for (Character chr : getParticipants()) {
chr.sendPacket(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022588).applyTo(chr);
}
@@ -208,7 +208,7 @@ public class Pyramid extends PartyQuest {
}
}
public void sendScore(MapleCharacter chr) {
public void sendScore(Character chr) {
if (exp == 0) {
int totalkills = (kill + cool);
if (stage == 5) {