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

Remove configurable language feature

Browse Source
This commit is contained in:
P0nk
2024-09-14 15:34:01 +02:00
parent 4778482cdd
commit f8726640c3
10 changed files with 54 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package scripting.npc;
import client.Character;
import client.*;
import client.Client;
import client.Job;
import client.Skill;
import client.SkillFactory;
import client.SkinColor;
import client.Stat;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.Pet;
@@ -31,7 +36,6 @@ import constants.game.GameConstants;
import constants.id.MapId;
import constants.id.NpcId;
import constants.inventory.ItemConstants;
import constants.string.LanguageConstants;
import net.server.Server;
import net.server.channel.Channel;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
@@ -46,8 +50,13 @@ import provider.Data;
import provider.DataProviderFactory;
import provider.wz.WZFiles;
import scripting.AbstractPlayerInteraction;
import server.*;
import server.ItemInformationProvider;
import server.MapleLeafLogger;
import server.Marriage;
import server.SkillbookInformationProvider;
import server.SkillbookInformationProvider.SkillBookEntry;
import server.StatEffect;
import server.TimerManager;
import server.events.gm.Event;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionType;
@@ -68,8 +77,13 @@ import tools.packets.WeddingPackets;
import java.awt.*;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.*;
import java.util.Map;
import java.util.Set;
import static java.util.concurrent.TimeUnit.MINUTES;
@@ -622,7 +636,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public boolean sendCPQMapLists() {
String msg = LanguageConstants.getMessage(getPlayer(), LanguageConstants.CPQPickRoom);
String msg = MonsterCarnival.PICK_ROOM_TEXT;
int msgLen = msg.length();
for (int i = 0; i < 6; i++) {
if (fieldTaken(i)) {
@@ -678,7 +692,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
if (mc != null) {
mc.setChallenged(false);
mc.changeMap(map, map.getPortal(0));
mc.sendPacket(PacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby)));
mc.sendPacket(PacketCreator.serverNotice(6, MonsterCarnival.ENTER_LOBBY_TEXT));
TimerManager tMan = TimerManager.getInstance();
tMan.schedule(() -> mapClock((int) MINUTES.toSeconds(3)), 1500);
@@ -865,7 +879,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public boolean sendCPQMapLists2() {
String msg = LanguageConstants.getMessage(getPlayer(), LanguageConstants.CPQPickRoom);
String msg = MonsterCarnival.PICK_ROOM_TEXT;
int msgLen = msg.length();
for (int i = 0; i < 3; i++) {
if (fieldTaken2(i)) {
@@ -921,7 +935,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
if (mc != null) {
mc.setChallenged(false);
mc.changeMap(map, map.getPortal(0));
mc.sendPacket(PacketCreator.serverNotice(6, LanguageConstants.getMessage(mc, LanguageConstants.CPQEntryLobby)));
mc.sendPacket(PacketCreator.serverNotice(6, MonsterCarnival.ENTER_LOBBY_TEXT));
TimerManager tMan = TimerManager.getInstance();
tMan.schedule(() -> mapClock((int) MINUTES.toSeconds(3)), 1500);
@@ -955,7 +969,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
for (MapObject mmo : map.getAllPlayer()) {
Character mc = (Character) mmo;
if (mc.getParty() == null) {
sendOk(LanguageConstants.getMessage(mc, LanguageConstants.CPQFindError));
sendOk(MonsterCarnival.FIND_ERROR_TEXT);
return;
}
if (mc.getParty().getLeader().getId() == mc.getId()) {
@@ -966,13 +980,13 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
if (leader != null) {
if (!leader.isChallenged()) {
if (!sendCPQChallenge("cpq2", leader.getId())) {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQChallengeRoomAnswer));
sendOk(MonsterCarnival.FACING_CHALLENGE_TEXT);
}
} else {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQChallengeRoomAnswer));
sendOk(MonsterCarnival.FACING_CHALLENGE_TEXT);
}
} else {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQLeaderNotFound));
sendOk(MonsterCarnival.LEADER_NOT_FOUND_TEXT);
}
}
@@ -986,7 +1000,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
for (MapObject mmo : map.getAllPlayer()) {
Character mc = (Character) mmo;
if (mc.getParty() == null) {
sendOk(LanguageConstants.getMessage(mc, LanguageConstants.CPQFindError));
sendOk(MonsterCarnival.FIND_ERROR_TEXT);
return;
}
if (mc.getParty().getLeader().getId() == mc.getId()) {
@@ -997,13 +1011,13 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
if (leader != null) {
if (!leader.isChallenged()) {
if (!sendCPQChallenge("cpq1", leader.getId())) {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQChallengeRoomAnswer));
sendOk(MonsterCarnival.FACING_CHALLENGE_TEXT);
}
} else {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQChallengeRoomAnswer));
sendOk(MonsterCarnival.FACING_CHALLENGE_TEXT);
}
} else {
sendOk(LanguageConstants.getMessage(leader, LanguageConstants.CPQLeaderNotFound));
sendOk(MonsterCarnival.LEADER_NOT_FOUND_TEXT);
}
}