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

GMS-like Wedding + Scissors of Karma + Maple Life + Buyback

Browse Source 
Properly developed the Marriage feature in the source.
Added TRAVEL_RATE server flag, a modifier for the travel frequency rate.
Corrected stance for players in 3rd party view when entering a map to work similarly as GMS.
Fixed mobs spamming skills incoherently.
Added code support for old GMS-like PQ NPCs, where party leaders just need to click once to start a new PQ.
Implemented podium system for the Hall of Fame PlayerNPCs.
Improved character load-out system, now using way less queries to the DB in the process.
Fixed birthday field for accounts not being read correctly.
Further implemented the incomplete yet-existing Scissors of Karma mechanic.
Fixed Duey not propagating item flags when packaging an item.
Added a custom buyback system.
Refactored the character creation system, now offering support for Maple Life.
Fixed some issues with the PlayerNPC positioning system.
Added server flag allowing AP assignment for novices (beginners under level 11).
Fixed Strategy Time (GPQ) announcement being sent twice to guilds in certain cases.
Tweaked mount EXP system now awarding it accordingly with the amount of tiredness healed.
Removed the randomness aspect of closeness gain when feeding the pet, now acting accordingly with amount of fullness gained.
Fixed an exploit with Arwen script.
Fixed travel-back from Florina forcefully sending players to Lith Harbor in certain situations.
Thoroughly reviewed job skill questlines for Explorers and Aran.
Localhost edit: removed MTS block in certain maps (useful for the buyback system).
Localhost edit: removed party blocks for novices.
Localhost edit: removed AP assigning block for novices.
Localhost edit: removed speed cap.
Localhost edit: removed Maker block popping up when inputting ATK gems on non-weapons.
This commit is contained in:
ronancpl
2018-06-05 02:40:53 -03:00
parent fca7b2adaa f6c06e5f2e
commit 6cef01f946
230 changed files with 11509 additions and 3590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/life/MaplePlayerNPC.java
+95 -37
View File
@@ -21,6 +21,8 @@
*/
package server.life;
import server.life.positioner.MaplePlayerNPCPositioner;
import server.life.positioner.MaplePlayerNPCPodium;
import java.awt.Point;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -41,6 +43,7 @@ import client.MapleClient;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import constants.GameConstants;
import constants.ServerConstants;
import net.server.Server;
import net.server.channel.Channel;
import net.server.world.World;
@@ -58,7 +61,7 @@ import tools.Pair;
* @author Ronan
*/
public class MaplePlayerNPC extends AbstractMapleMapObject {
private static final Map<Byte, AtomicInteger> runningPlayerNpcScriptIds = new HashMap<>();
private static final Map<Byte, List<Integer>> availablePlayerNpcScriptIds = new HashMap<>();
private static final AtomicInteger runningOverallRank = new AtomicInteger();
private static final List<AtomicInteger> runningWorldRank = new ArrayList<>();
private static final Map<Pair<Integer, Integer>, AtomicInteger> runningWorldJobRank = new HashMap<>();
@@ -220,7 +223,6 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
try {
Connection con = DatabaseConnection.getConnection();
getRunningPlayerNpcScriptIds(con);
getRunningOverallRanks(con);
getRunningWorldRanks(con);
getRunningWorldJobRanks(con);
@@ -231,25 +233,6 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
}
}
private static void getRunningPlayerNpcScriptIds(Connection con) throws SQLException {
PreparedStatement ps = con.prepareStatement("SELECT floor(scriptid / 100), max(scriptid) FROM playernpcs GROUP BY floor(scriptid / 100) ORDER BY floor(scriptid / 100)");
ResultSet rs = ps.executeQuery();
while(rs.next()) {
byte branch = (byte) (rs.getInt(1) % 100);
int maxid = rs.getInt(2);
if(branch < 26) {
runningPlayerNpcScriptIds.put(branch, new AtomicInteger(maxid));
} else {
runningPlayerNpcScriptIds.put((byte)(branch - ((branch - 26) % 4)), new AtomicInteger(maxid));
}
}
rs.close();
ps.close();
}
private static void getRunningOverallRanks(Connection con) throws SQLException {
PreparedStatement ps = con.prepareStatement("SELECT max(overallrank) FROM playernpcs");
ResultSet rs = ps.executeQuery();
@@ -356,17 +339,69 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
}
}
private static MaplePlayerNPC createPlayerNPCInternal(MapleMap map, Point pos, MapleCharacter chr) {
if(pos == null) {
pos = map.getNextPlayerNpcPosition();
if(pos == null) {
return null;
private static void fetchAvailableScriptIdsFromDb(byte branch, List<Integer> list) {
try {
int branchLen = (branch < 26) ? 100 : 400;
int branchSid = 9900000 + (branch * 100);
int nextBranchSid = branchSid + branchLen;
Set<Integer> usedScriptIds = new HashSet<>();
Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT scriptid FROM playernpcs WHERE scriptid >= ? AND scriptid < ? ORDER BY scriptid");
ps.setInt(1, branchSid);
ps.setInt(2, nextBranchSid);
ResultSet rs = ps.executeQuery();
while(rs.next()) {
usedScriptIds.add(rs.getInt(1));
}
List<Integer> availables = new ArrayList<>(20);
int j = 0;
for(int i = branchSid; i < nextBranchSid; i++) {
if(!usedScriptIds.contains(i)) {
availables.add(i);
j++;
if(j == 20) {
break;
}
}
}
rs.close();
ps.close();
con.close();
for(int i = availables.size() - 1; i >= 0; i--) {
list.add(availables.get(i));
}
} catch(SQLException sqle) {
sqle.printStackTrace();
}
}
private static int getNextScriptId(byte branch) {
List<Integer> availablesBranch = availablePlayerNpcScriptIds.get(branch);
if(availablesBranch == null) {
availablesBranch = new ArrayList<>(20);
availablePlayerNpcScriptIds.put(branch, availablesBranch);
}
if(availablesBranch.isEmpty()) {
fetchAvailableScriptIdsFromDb(branch, availablesBranch);
if(availablesBranch.isEmpty()) {
return -1;
}
}
return availablesBranch.remove(availablesBranch.size() - 1);
}
private static MaplePlayerNPC createPlayerNPCInternal(MapleMap map, Point pos, MapleCharacter chr) {
int mapId = map.getId();
int worldId = chr.getWorld();
int jobId = (chr.getJob().getId() / 100) * 100;
/*
if(!canSpawnPlayerNpc(chr.getName(), mapId)) {
@@ -376,18 +411,28 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
byte branch = GameConstants.getHallOfFameBranch(chr.getJob(), mapId);
int scriptId;
try {
scriptId = runningPlayerNpcScriptIds.get(branch).getAndIncrement();
int scriptId = getNextScriptId(branch);
if (scriptId == -1) {
return null;
}
if(pos == null) {
if(GameConstants.isPodiumHallOfFameMap(map.getId())) {
pos = MaplePlayerNPCPodium.getNextPlayerNpcPosition(map);
} else {
pos = MaplePlayerNPCPositioner.getNextPlayerNpcPosition(map);
}
if(!GameConstants.canPnpcBranchUseScriptId(branch, scriptId)) {
if(pos == null) {
return null;
}
} catch (NullPointerException npe) {
scriptId = 9900000 + (branch * 100);
runningPlayerNpcScriptIds.put(branch, new AtomicInteger(scriptId + 1));
}
if(ServerConstants.USE_DEBUG) System.out.println("GOT SID " + scriptId + " POS " + pos);
int worldId = chr.getWorld();
int jobId = (chr.getJob().getId() / 100) * 100;
MaplePlayerNPC ret;
int npcId;
try {
@@ -516,8 +561,9 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
}
public static boolean spawnPlayerNPC(int mapid, Point pos, MapleCharacter chr) {
MaplePlayerNPC pn = processPlayerNPCInternal(chr.getClient().getChannelServer().getMapFactory().getMap(mapid), pos, chr, true).getLeft();
if(chr == null) return false;
MaplePlayerNPC pn = processPlayerNPCInternal(chr.getClient().getChannelServer().getMapFactory().getMap(mapid), pos, chr, true).getLeft();
if(pn != null) {
for (Channel channel : Server.getInstance().getChannelsFromWorld(chr.getWorld())) {
MapleMap m = channel.getMapFactory().getMap(mapid);
@@ -547,6 +593,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
}
public static void removePlayerNPC(MapleCharacter chr) {
if(chr == null) return;
List<Integer> updateMapids = processPlayerNPCInternal(null, null, chr, false).getRight();
int worldid = updateMapids.remove(0);
@@ -608,8 +656,10 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
PreparedStatement ps = con.prepareStatement("SELECT DISTINCT world, map FROM playernpcs");
ResultSet rs = ps.executeQuery();
int wsize = Server.getInstance().getWorlds().size();
while(rs.next()) {
int world = rs.getInt("world"), map = rs.getInt("map");
if(world >= wsize) continue;
World w = Server.getInstance().getWorld(world);
for (Channel channel : w.getChannels()) {
@@ -636,6 +686,14 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
ps.executeUpdate();
ps.close();
ps = con.prepareStatement("DELETE FROM playernpcs_field");
ps.executeUpdate();
ps.close();
for(World w : Server.getInstance().getWorlds()) {
w.resetPlayerNpcMapData();
}
con.close();
} catch (SQLException e) {
e.printStackTrace();