Lenheart
/
MXD-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

This commit is contained in:
雪风 2025-04-06 17:16:44 +08:00
parent 036b83cc2c
commit 8263aed9d8
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/client/MapleCharacter.java
View File

@ -2026,7 +2026,8 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
bl = Math.max(bl, (blobj.getBl())); bl = Math.max(bl, (blobj.getBl()));
} }
} }
num = (num + (num*bl/100)); long aa = (long)num *bl;
num = (int) (num + (aa/100));
switch (item1.getItemId()) { switch (item1.getItemId()) {
case 0: case 0:
@ -5334,10 +5335,24 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
} }
} }
Num = Num.add((this.getQG()).divide(BigInteger.valueOf(100))); BigInteger qg = this.getQG();
Num = Num.add((this.getQGjs()).multiply(BigInteger.valueOf(100))); if (qg!=null) {
Num = Num.add((this.getDD()).multiply(BigInteger.valueOf(666))); Num = Num.add(qg.divide(BigInteger.valueOf(100)));
Num = Num.add((this.getDB()).multiply(BigInteger.valueOf(1000))); }
BigInteger qgjs = this.getQGjs();
if (qgjs!=null) {
Num = Num.add(qgjs.divide(BigInteger.valueOf(100)));
}
BigInteger dd = this.getDD();
if (dd!=null) {
Num = Num.add(dd.divide(BigInteger.valueOf(666)));
}
BigInteger db = this.getDB();
if (db!=null) {
Num = Num.add(this.getDB().divide(BigInteger.valueOf(1000)));
}
return DamageParse.process(Num.toString()); return DamageParse.process(Num.toString());
} }

6
src/client/PlayerStats.java
View File

@ -639,11 +639,9 @@ public class PlayerStats implements Serializable {
dsbbh++; dsbbh++;
if (!first_login) { if (!first_login) {
for (AotuNpc npc : Start.aotuNpcs) { for (AotuNpc npc : Start.aotuNpcs) {
if ((npc.getMapId() == chra.getMapId()||npc.getMapId()==0) && (npc.getItemId() == 0 || chra.getItemNum(npc.getItemId())>=npc.getItemNum()) && (npc.getEquId() == 0 || chra.hasEquipped(npc.getEquId()))) {
Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS); Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS);
} }
} }
}
for (final IItem item2 : chra.getInventory(MapleInventoryType.CASH)) { for (final IItem item2 : chra.getInventory(MapleInventoryType.CASH)) {
@ -985,11 +983,13 @@ public class PlayerStats implements Serializable {
private void dsnpcfw(MapleCharacter chra, AotuNpc aotuNpc,int dsbbh2) { private void dsnpcfw(MapleCharacter chra, AotuNpc aotuNpc,int dsbbh2) {
if (dsbbh2!=this.dsbbh)return; if (dsbbh2!=this.dsbbh)return;
if ((aotuNpc.getMapId() == chra.getMapId()||aotuNpc.getMapId()==0) && (aotuNpc.getItemId() == 0 || chra.getItemNum(aotuNpc.getItemId())>=aotuNpc.getItemNum()) && (aotuNpc.getEquId() == 0 || chra.hasEquipped(aotuNpc.getEquId()))) { if ((aotuNpc.getMapId() == chra.getMapId()||aotuNpc.getMapId()==0)) {
if ((aotuNpc.getItemId() == 0 || chra.getItemNum(aotuNpc.getItemId())>=aotuNpc.getItemNum()) && (aotuNpc.getEquId() == 0 || chra.hasEquipped(aotuNpc.getEquId()))){
final NPCConversationManager cm = NPCScriptManager.getInstance().getCM(chra.getClient()); final NPCConversationManager cm = NPCScriptManager.getInstance().getCM(chra.getClient());
if (cm == null || chra.getConversation() == 0 || cm.getLastMsg() != 4) { if (cm == null || chra.getConversation() == 0 || cm.getLastMsg() != 4) {
NPCScriptManager.getInstance().startds(chra.getClient(), aotuNpc.getNpcId(),0,aotuNpc.getScriptsName()); NPCScriptManager.getInstance().startds(chra.getClient(), aotuNpc.getNpcId(),0,aotuNpc.getScriptsName());
} }
}
Start.executor.schedule(()->dsnpcfw(chra,aotuNpc,dsbbh2), aotuNpc.getTime(), TimeUnit.MILLISECONDS); Start.executor.schedule(()->dsnpcfw(chra,aotuNpc,dsbbh2), aotuNpc.getTime(), TimeUnit.MILLISECONDS);
} }
} }

4
src/gui/tw/AotuNpc.java
View File

@ -13,6 +13,8 @@ public class AotuNpc {
int equId; int equId;
int time;
public int getItemNum() { public int getItemNum() {
return itemNum; return itemNum;
} }
@ -21,7 +23,7 @@ public class AotuNpc {
this.itemNum = itemNum; this.itemNum = itemNum;
} }
int time;
public int getMapId() { public int getMapId() {
return mapId; return mapId;

3
src/gui/tw/rw/XuanShangRenWu.java
View File

@ -1,6 +1,8 @@
package gui.tw.rw; package gui.tw.rw;
import gui.Start; import gui.Start;
import provider.MapleDataTool;
import server.life.MapleLifeFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -53,6 +55,7 @@ public class XuanShangRenWu {
} }
public void setMobId(int mobId) { public void setMobId(int mobId) {
this.setMobName(MapleDataTool.getString((this.getMobId() + "/name"), MapleLifeFactory.mobStringData, "未知怪物"));
this.mobId = mobId; this.mobId = mobId;
} }