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

Orbis PQ

Browse Source 
Implemented Orbis PQ.
This commit is contained in:
ronancpl
2017-06-11 00:12:11 -03:00
parent dbac58e871
commit 1afbac2429
142 changed files with 2600 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scripting/AbstractPlayerInteraction.java
View File

@@ -88,9 +88,10 @@ public class AbstractPlayerInteraction {
public MapleMap getMap() {
return c.getPlayer().getMap();
}
public void warp(int map) {
getPlayer().changeMap(map, 0);
public void warp(int mapid) {
MapleMap map = getWarpMap(mapid);
getPlayer().changeMap(map, map.getRandomPlayerSpawnpoint());
}
public void warp(int map, int portal) {

67
src/scripting/event/EventInstanceManager.java
View File

@@ -43,12 +43,15 @@ import net.server.world.MaplePartyCharacter;
import provider.MapleDataProviderFactory;
import server.MaplePortal;
import server.TimerManager;
import server.MapleStatEffect;
import server.expeditions.MapleExpedition;
import server.life.MapleMonster;
import server.maps.MapleMap;
import server.maps.MapleMapFactory;
import tools.DatabaseConnection;
import client.MapleCharacter;
import client.SkillFactory;
import client.Skill;
import constants.ItemConstants;
import constants.ServerConstants;
import java.awt.Point;
@@ -56,6 +59,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import scripting.AbstractPlayerInteraction;
import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory;
import server.life.MapleNPC;
import tools.MaplePacketCreator;
@@ -113,6 +117,35 @@ public class EventInstanceManager {
return em;
}
public void applyEventPlayersItemBuff(int itemId) {
List<MapleCharacter> players = getPlayerList();
MapleStatEffect mse = MapleItemInformationProvider.getInstance().getItemEffect(itemId);
if(mse != null) {
for (MapleCharacter player: players) {
mse.applyTo(player);
}
}
}
public void applyEventPlayersSkillBuff(int skillId) {
applyEventPlayersSkillBuff(skillId, Integer.MAX_VALUE);
}
public void applyEventPlayersSkillBuff(int skillId, int skillLv) {
List<MapleCharacter> players = getPlayerList();
Skill skill = SkillFactory.getSkill(skillId);
if(skill != null) {
MapleStatEffect mse = skill.getEffect(Math.min(skillLv, skill.getMaxLevel()));
if(mse != null) {
for (MapleCharacter player: players) {
mse.applyTo(player);
}
}
}
}
public void giveEventPlayersExp(int gain) {
giveEventPlayersExp(gain, -1);
}
@@ -193,6 +226,7 @@ public class EventInstanceManager {
timeStarted = System.currentTimeMillis();
eventTime = time;
for(MapleCharacter chr: getPlayers()) chr.announce(MaplePacketCreator.getClock((int) (time / 1000)));
event_schedule = TimerManager.getInstance().schedule(new Runnable() {
public void run() {
try {
@@ -496,6 +530,14 @@ public class EventInstanceManager {
return map;
}
public void setIntProperty(String key, Integer value) {
setProperty(key, value);
}
public void setProperty(String key, Integer value) {
setProperty(key, "" + value);
}
public void setProperty(String key, String value) {
props.setProperty(key, value);
}
@@ -512,8 +554,12 @@ public class EventInstanceManager {
return props;
}
public int getIntProperty(String key) {
return Integer.parseInt(props.getProperty(key));
public Integer getIntProperty(String key) {
try {
return Integer.parseInt(props.getProperty(key));
} catch(Exception e) {
return null;
}
}
public void leftParty(MapleCharacter chr) {
@@ -811,6 +857,23 @@ public class EventInstanceManager {
}
}
public final void warpEventTeamToMapSpawnPoint(int warpFrom, int warpTo, int toSp) {
List<MapleCharacter> players = getPlayerList();
for (MapleCharacter chr : players) {
if(chr.getMapId() == warpFrom)
chr.changeMap(warpTo, toSp);
}
}
public final void warpEventTeamToMapSpawnPoint(int warpTo, int toSp) {
List<MapleCharacter> players = getPlayerList();
for (MapleCharacter chr : players) {
chr.changeMap(warpTo, toSp);
}
}
public final MapleCharacter getLeader() {
rL.lock();
try {

5
src/scripting/event/EventManager.java
View File

@@ -272,6 +272,7 @@ public class EventManager {
eim.registerExpedition(exped);
exped.start();
iv.invokeFunction("afterSetup", eim);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -303,6 +304,7 @@ public class EventManager {
instanceLocks.put(eim.getName(), lobbyId);
eim.registerPlayer(chr);
iv.invokeFunction("afterSetup", eim);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -335,6 +337,7 @@ public class EventManager {
eim.registerParty(party, map);
party.setEligibleMembers(null);
iv.invokeFunction("afterSetup", eim);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -367,6 +370,7 @@ public class EventManager {
eim.registerParty(party, map);
party.setEligibleMembers(null);
iv.invokeFunction("afterSetup", eim);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -398,6 +402,7 @@ public class EventManager {
iv.invokeFunction("setup", eim);
eim.setProperty("leader", leader);
iv.invokeFunction("afterSetup", eim);
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}

4
src/scripting/reactor/ReactorActionManager.java
View File

@@ -101,7 +101,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
} else {
drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId));
}
reactor.getMap().spawnItemDrop(reactor, getPlayer(), drop, reactor.getMap().calcDropPos(dropPos, reactor.getPosition()), false, false);
reactor.getMap().spawnItemDrop(reactor, getPlayer(), drop, reactor.getMap().calcDropPos(dropPos, reactor.getPosition()), (byte)(getPlayer().getParty() != null ? 1 : 0), false);
}
dropPos.x += 25;
}
@@ -127,7 +127,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
spawnMonster(id, qty, new Point(x, y));
}
private void spawnMonster(int id, int qty, Point pos) {
public void spawnMonster(int id, int qty, Point pos) {
for (int i = 0; i < qty; i++) {
reactor.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(id), pos);
}