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

ariantpq + correct use catch item

Browse Source
This commit is contained in:
Diego Armando de Freitas Matos
2019-03-20 19:51:45 -03:00
parent 0a8efa4238
commit 0d7e8daf8e
36 changed files with 2399 additions and 2444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/scripting/AbstractPlayerInteraction.java
View File

@@ -55,7 +55,6 @@ import tools.MaplePacketCreator;
import client.MapleCharacter;
import client.MapleClient;
import client.MapleQuestStatus;
import client.MapleStat;
import client.SkillFactory;
import client.inventory.Equip;
import client.inventory.Item;
@@ -331,7 +330,7 @@ public class AbstractPlayerInteraction {
return true;
}
//---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ----
//---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ----
public final MapleQuestStatus getQuestRecord(final int id) {
return c.getPlayer().getQuestNAdd(MapleQuest.getInstance(id));
}
@@ -340,7 +339,7 @@ public class AbstractPlayerInteraction {
return c.getPlayer().getQuestNoAdd(MapleQuest.getInstance(id));
}
//---- /\ /\ /\ /\ /\ /\ /\ NOT TESTED /\ /\ /\ /\ /\ /\ /\ /\ /\ ----
//---- /\ /\ /\ /\ /\ /\ /\ NOT TESTED /\ /\ /\ /\ /\ /\ /\ /\ /\ ----
public void openNpc(int npcid) {
openNpc(npcid, null);
}
@@ -745,7 +744,7 @@ public class AbstractPlayerInteraction {
}
public void givePartyExp(String PQ, boolean instance) {
//1 player = +0% bonus (100)
//1 player = +0% bonus (100)
//2 players = +0% bonus (100)
//3 players = +0% bonus (100)
//4 players = +10% bonus (110)
@@ -1025,6 +1024,33 @@ public class AbstractPlayerInteraction {
return null;
}
public String getNomeDosMembrosExpedition(MapleExpeditionType tipo) {
String membros = "";
MapleExpedition expedicao = getExpedition(tipo);
for (String memberName : expedicao.getMembers().values()) {
membros += "" + memberName + ", ";
}
return membros;
}
public boolean getIsLeaderExpedition(MapleExpeditionType tipo) {
MapleExpedition expedicao = getExpedition(tipo);
return expedicao.isLeader(getPlayer());
}
public void warpExpedition(int mapId, MapleExpeditionType tipo) {
if (tipo != null ) {
MapleExpedition expedicao = getExpedition(tipo);
for (MapleCharacter chr : expedicao.getActiveMembers()) {
chr.changeMap(mapId);
}
} else {
for (MapleCharacter chr : getMap().getAllPlayers()) {
chr.changeMap(mapId);
}
}
}
public long getJailTimeLeft() {
return getPlayer().getJailExpirationTimeLeft();
}