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

Implemented EllinPQ + some bug fixes

Browse Source 
Implemented EllinPQ, adjusted several drop rates and data, fixes some
bugs at quests at client-side.
This commit is contained in:
ronancpl
2017-04-22 16:35:27 -03:00
parent 72ef73a949
commit 828a8a02a2
82 changed files with 753 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/server/maps/MapleMap.java
View File

@@ -223,7 +223,15 @@ public class MapleMap {
for (MapleMapObject o : mapobjects.values()) {
if (o.getType() == MapleMapObjectType.REACTOR) {
if (((MapleReactor) o).getState() < 1) {
((MapleReactor) o).setState((byte) 1);
MapleReactor mr = (MapleReactor) o;
mr.lockReactor();
try {
mr.setState((byte) 1);
mr.setShouldCollect(true);
} finally {
mr.unlockReactor();
}
broadcastMessage(MaplePacketCreator.triggerReactor((MapleReactor) o, 1));
}
}
@@ -511,6 +519,16 @@ public class MapleMap {
return count;
}
public List<Pair> reportReactorStates() {
List<Pair> list = new LinkedList<>();
for (MapleMapObject m : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.REACTOR))) {
MapleReactor mr = (MapleReactor) m;
list.add(new Pair(mr.getId(), mr.getState()));
}
return list;
}
public int countAllMonsters() {
return getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)).size();
}
@@ -797,13 +815,6 @@ public class MapleMap {
reactor.setAlive(false);
removeMapObject(reactor);
reactor.lockReactor();
try {
reactor.setShouldCollect(true);
} finally {
reactor.unlockReactor();
}
if (reactor.getDelay() > 0) {
tMan.schedule(new Runnable() {
@Override
@@ -820,10 +831,10 @@ public class MapleMap {
for (MapleMapObject o : mapobjects.values()) {
if (o.getType() == MapleMapObjectType.REACTOR) {
final MapleReactor r = ((MapleReactor) o);
r.setState((byte) 0);
r.lockReactor();
try {
r.setState((byte) 0);
r.setShouldCollect(true);
} finally {
r.unlockReactor();
@@ -1213,8 +1224,15 @@ public class MapleMap {
}
private void respawnReactor(final MapleReactor reactor) {
reactor.setState((byte) 0);
reactor.setAlive(true);
reactor.lockReactor();
try {
reactor.setShouldCollect(true);
reactor.setState((byte) 0);
reactor.setAlive(true);
} finally {
reactor.unlockReactor();
}
spawnReactor(reactor);
}
@@ -1533,7 +1551,7 @@ public class MapleMap {
MapleStatEffect summonStat = chr.getStatForBuff(MapleBuffStat.SUMMON);
if (summonStat != null) {
MapleSummon summon = chr.getSummons().get(summonStat.getSourceId());
MapleSummon summon = chr.getSummonByKey(summonStat.getSourceId());
summon.setPosition(chr.getPosition());
chr.getMap().spawnSummon(summon);
updateMapObjectVisibility(chr, summon);
@@ -1624,7 +1642,7 @@ public class MapleMap {
}
chr.leaveMap();
chr.cancelMapTimeLimitTask();
for (MapleSummon summon : chr.getSummons().values()) {
for (MapleSummon summon : chr.getSummonsValues()) {
if (summon.isStationary()) {
chr.cancelBuffStats(MapleBuffStat.PUPPET);
} else {
@@ -1734,7 +1752,7 @@ public class MapleMap {
if (o.getType() == MapleMapObjectType.SUMMON) {
MapleSummon summon = (MapleSummon) o;
if (summon.getOwner() == chr) {
if (chr.getSummons().isEmpty() || !chr.getSummons().containsValue(summon)) {
if (chr.isSummonsEmpty() || !chr.containsSummon(summon)) {
objectWLock.lock();
try {
mapobjects.remove(o);
@@ -2105,13 +2123,19 @@ public class MapleMap {
reactor.setShouldCollect(false);
MapleMap.this.broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition());
MapleMap.this.removeMapObject(mapitem);
reactor.hitReactor(c, true);
reactor.hitReactor(c);
if (reactor.getDelay() > 0) {
tMan.schedule(new Runnable() {
@Override
public void run() {
reactor.setState((byte) 0);
reactor.lockReactor();
try {
reactor.setState((byte) 0);
reactor.setShouldCollect(true);
} finally {
reactor.unlockReactor();
}
broadcastMessage(MaplePacketCreator.triggerReactor(reactor, 0));
}
}, reactor.getDelay());
@@ -2120,8 +2144,7 @@ public class MapleMap {
mapitem.itemLock.unlock();
}
}
}
finally {
} finally {
reactor.unlockReactor();
}
}
@@ -2560,12 +2583,12 @@ public class MapleMap {
resetMapObjects();
}
public void resetPQ(int difficulty) {
resetMapObjects(difficulty, true);
public void resetPQ() {
resetPQ(1);
}
public void resetPQ() {
resetMapObjects(1, true);
public void resetPQ(int difficulty) {
resetMapObjects(difficulty, true);
}
public void resetMapObjects(int difficulty, boolean isPq) {

1
src/server/maps/MapleMapFactory.java
View File

@@ -255,6 +255,7 @@ public class MapleMapFactory {
myReactor.setPosition(new Point(x, y));
myReactor.setDelay(MapleDataTool.getInt(reactor.getChildByPath("reactorTime")) * 1000);
myReactor.setState((byte) 0);
myReactor.setShouldCollect(true);
myReactor.setName(MapleDataTool.getString(reactor.getChildByPath("name"), ""));
return myReactor;
}

26
src/server/maps/MapleReactor.java
View File

@@ -26,6 +26,7 @@ import constants.ServerConstants;
import java.awt.Rectangle;
import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -46,7 +47,7 @@ public class MapleReactor extends AbstractMapleMapObject {
private MapleMap map;
private String name;
private boolean alive;
private boolean shouldCollect = true;
private boolean shouldCollect;
private Lock reactorLock = new ReentrantLock(true);
public MapleReactor(MapleReactorStats stats, int rid) {
@@ -143,14 +144,14 @@ public class MapleReactor extends AbstractMapleMapObject {
}
public void forceHitReactor(final byte newState) {
setState((byte) newState);
this.lockReactor();
try {
this.lockReactor();
setState((byte) newState);
this.setShouldCollect(true);
}
finally {
} finally {
this.unlockReactor();
}
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0));
}
@@ -158,16 +159,16 @@ public class MapleReactor extends AbstractMapleMapObject {
TimerManager.getInstance().schedule(new Runnable() {
@Override
public void run() {
hitReactor(c, false);
hitReactor(c);
}
}, delay);
}
public void hitReactor(MapleClient c, boolean itemDrop) {
hitReactor(0, (short) 0, 0, c, itemDrop);
public void hitReactor(MapleClient c) {
hitReactor(0, (short) 0, 0, c);
}
public synchronized void hitReactor(int charPos, short stance, int skillid, MapleClient c, boolean itemDrop) {
public synchronized void hitReactor(int charPos, short stance, int skillid, MapleClient c) {
try {
if(!this.isAlive()) {
return;
@@ -196,11 +197,12 @@ public class MapleReactor extends AbstractMapleMapObject {
ReactorScriptManager.getInstance().act(c, this);
} else { //reactor not broken yet
if (itemDrop) state++; // Duh, if the reactor is triggered by itemdrop, go directly to next state (in this case, instead of staying at 1, it goes to 2)! :)
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
if (state == stats.getNextState(state, b) || itemDrop) {//current state = next state, looping reactor
if (state == stats.getNextState(state, b)) {//current state = next state, looping reactor
ReactorScriptManager.getInstance().act(c, this);
}
setShouldCollect(true); // refresh collectability on item drop-based reactors
}
break;
}
@@ -209,6 +211,8 @@ public class MapleReactor extends AbstractMapleMapObject {
state++;
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
ReactorScriptManager.getInstance().act(c, this);
setShouldCollect(true);
System.out.println("ehh");
}
} catch(Exception e) {
e.printStackTrace();