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

Knights' Seal & I. MaxHP + Adherent mob status + Script point-warps

Browse Source 
Fixed Seal skill not working for Blaze Wizard.
Added a check against Seal skill on bosses.
Reviewed improper usage of "random spawn point arrival" at several warps on scripts.
Refactored CPQ modules fetching players from the channel storage, this should be unneeded after a recent update on the player object from MPC.
Added door objects as a visible map object for the player server-side view component.
Fixed a few scenarios where mobs would unexpectedly show up impervious to mob status.
Fixed scenario where a player wouldn't receive disease informations from other players after changing maps.
Fixed some magic-type skills (such as Magic Claw or Freeze) not displaying damage value for other players when the player is within melee-range from the mob.
Added check for whether a given quest is scripted before trying to find the script.
Fixed registering items onto MTS leading to loss of a few of its properties (expiration, item level, etc).
Fixed "Improved MaxHP" skill gains not working for Thunderbreakers.
Refactored pet autopot to also apply on HP/MP consumption by items/skills.
Added portal sound effect on Mystic Doors.
This commit is contained in:
ronancpl
2019-09-13 03:04:44 -03:00
parent 259c2e5ba1
commit e169971384
115 changed files with 783 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/scripting/npc/NPCConversationManager.java
View File

@@ -679,12 +679,11 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
try {
final MapleMap map, mapExit;
Channel cs = c.getChannelServer();
PlayerStorage ps = cs.getPlayerStorage();
map = cs.getMapFactory().getMap(980000100 + 100 * field);
mapExit = cs.getMapFactory().getMap(980000000);
for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) {
final MapleCharacter mc = ps.getCharacterById(mpc.getId());
final MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setChallenged(false);
mc.changeMap(map, map.getPortal(0));
@@ -715,9 +714,8 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public void cancelCPQLobby() {
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.clearCpqTimer();
}
@@ -741,11 +739,11 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
final MapleMap lobbyMap = getPlayer().getMap();
if (challenger != null) {
if (challenger.getParty() == null) {
throw new RuntimeException("Nao existe oponente!");
throw new RuntimeException("No opponent found!");
}
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.changeMap(lobbyMap, lobbyMap.getPortal(0));
TimerManager tMan = TimerManager.getInstance();
@@ -758,7 +756,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
}
for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
TimerManager tMan = TimerManager.getInstance();
tMan.schedule(new Runnable() {
@@ -776,15 +774,14 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
@Override
public void run() {
try {
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(null);
}
}
for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(null);
}
@@ -809,11 +806,11 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
final MapleMap lobbyMap = getPlayer().getMap();
if (challenger != null) {
if (challenger.getParty() == null) {
throw new RuntimeException("Não existe oponente!");
throw new RuntimeException("No opponent found!");
}
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.changeMap(lobbyMap, lobbyMap.getPortal(0));
mapClock(10);
@@ -826,15 +823,14 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
@Override
public void run() {
try {
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
for (MaplePartyCharacter mpc : getPlayer().getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(null);
}
}
for (MaplePartyCharacter mpc : challenger.getParty().getMembers()) {
MapleCharacter mc = ps.getCharacterById(mpc.getId());
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setMonsterCarnival(null);
}
@@ -907,12 +903,11 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
try {
final MapleMap map, mapExit;
Channel cs = c.getChannelServer();
PlayerStorage ps = c.getChannelServer().getPlayerStorage();
mapExit = cs.getMapFactory().getMap(980030000);
map = cs.getMapFactory().getMap(980031000 + 1000 * field);
for (MaplePartyCharacter mpc : c.getPlayer().getParty().getMembers()) {
final MapleCharacter mc = ps.getCharacterById(mpc.getId());
final MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
mc.setChallenged(false);
mc.changeMap(map, map.getPortal(0));

10
src/scripting/npc/NPCScriptManager.java
View File

@@ -29,8 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.script.Invocable;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
import jdk.nashorn.api.scripting.NashornScriptEngine;
@@ -54,10 +52,10 @@ public class NPCScriptManager extends AbstractScriptManager {
}
private Map<MapleClient, NPCConversationManager> cms = new HashMap<>();
private Map<MapleClient, Invocable> scripts = new HashMap<>();
private Map<MapleClient, NashornScriptEngine> scripts = new HashMap<>();
public boolean isNpcScriptAvailable(MapleClient c, String fileName) {
Invocable iv = null;
NashornScriptEngine iv = null;
if (fileName != null) {
iv = getScriptEngine("npc/" + fileName + ".js", c);
}
@@ -96,7 +94,7 @@ public class NPCScriptManager extends AbstractScriptManager {
NashornScriptEngine iv = getScriptEngine("npc/" + filename + ".js", c);
if (iv == null) {
c.getPlayer().dropMessage(1, npc + "");
c.getPlayer().dropMessage(1, "NPC " + npc + " is uncoded.");
cm.dispose();
return;
}
@@ -173,7 +171,7 @@ public class NPCScriptManager extends AbstractScriptManager {
}
public void action(MapleClient c, byte mode, byte type, int selection) {
Invocable iv = scripts.get(c);
NashornScriptEngine iv = scripts.get(c);
if (iv != null) {
try {
c.setClickedNPC();