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

Rename and clean up MapleMonster

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:06:11 +02:00
parent 38c700ca48
commit 02786eab63
42 changed files with 520 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/life/LifeFactory.java
View File

@@ -237,7 +237,7 @@ public class LifeFactory {
return new Pair<>(stats, attackInfos);
}
public static MapleMonster getMonster(int mid) {
public static Monster getMonster(int mid) {
try {
MapleMonsterStats stats = monsterStats.get(mid);
if (stats == null) {
@@ -247,7 +247,7 @@ public class LifeFactory {
monsterStats.put(mid, stats);
}
MapleMonster ret = new MapleMonster(mid, stats);
Monster ret = new Monster(mid, stats);
return ret;
} catch (NullPointerException npe) {
System.out.println("[SEVERE] MOB " + mid + " failed to load. Issue: " + npe.getMessage() + "\n\n");

2
src/main/java/server/life/MobAttackInfoFactory.java
View File

@@ -39,7 +39,7 @@ public class MobAttackInfoFactory {
private static Map<String, MobAttackInfo> mobAttacks = new HashMap<>();
private static DataProvider dataSource = DataProviderFactory.getDataProvider(WZFiles.MOB);
public static MobAttackInfo getMobAttackInfo(MapleMonster mob, int attack) {
public static MobAttackInfo getMobAttackInfo(Monster mob, int attack) {
MobAttackInfo ret = mobAttacks.get(mob.getId() + "" + attack);
if (ret != null) {
return ret;

14
src/main/java/server/life/MobSkill.java
View File

@@ -106,7 +106,7 @@ public class MobSkill {
this.limit = limit;
}
public void applyDelayedEffect(final Character player, final MapleMonster monster, final boolean skill, int animationTime) {
public void applyDelayedEffect(final Character player, final Monster monster, final boolean skill, int animationTime) {
Runnable toRun = () -> {
if (monster.isAlive()) {
applyEffect(player, monster, skill, null);
@@ -117,7 +117,7 @@ public class MobSkill {
service.registerOverallAction(monster.getMap().getId(), toRun, animationTime);
}
public void applyEffect(Character player, MapleMonster monster, boolean skill, List<Character> banishPlayers) {
public void applyEffect(Character player, Monster monster, boolean skill, List<Character> banishPlayers) {
Disease disease = null;
Map<MonsterStatus, Integer> stats = new ArrayMap<>();
List<Integer> reflection = new LinkedList<>();
@@ -147,7 +147,7 @@ public class MobSkill {
List<MapleMapObject> objects = getObjectsInRange(monster, MapleMapObjectType.MONSTER);
final int hps = (getX() / 1000) * (int) (950 + 1050 * Math.random());
for (MapleMapObject mons : objects) {
((MapleMonster) mons).heal(hps, getY());
((Monster) mons).heal(hps, getY());
}
} else {
monster.heal(getX(), getY());
@@ -254,7 +254,7 @@ public class MobSkill {
Collections.shuffle(summons);
for (Integer mobId : summons.subList(0, summonLimit)) {
MapleMonster toSpawn = LifeFactory.getMonster(mobId);
Monster toSpawn = LifeFactory.getMonster(mobId);
if (toSpawn != null) {
if (bossRushMap) {
toSpawn.disableDrops(); // no littering on BRPQ pls
@@ -318,7 +318,7 @@ public class MobSkill {
if (stats.size() > 0) {
if (lt != null && rb != null && skill) {
for (MapleMapObject mons : getObjectsInRange(monster, MapleMapObjectType.MONSTER)) {
((MapleMonster) mons).applyMonsterBuff(stats, getX(), getSkillId(), getDuration(), this, reflection);
((Monster) mons).applyMonsterBuff(stats, getX(), getSkillId(), getDuration(), this, reflection);
}
} else {
monster.applyMonsterBuff(stats, getX(), getSkillId(), getDuration(), this, reflection);
@@ -345,7 +345,7 @@ public class MobSkill {
}
}
private List<Character> getPlayersInRange(MapleMonster monster) {
private List<Character> getPlayersInRange(Monster monster) {
return monster.getMap().getPlayersInRange(calculateBoundingBox(monster.getPosition()));
}
@@ -412,7 +412,7 @@ public class MobSkill {
return bounds;
}
private List<MapleMapObject> getObjectsInRange(MapleMonster monster, MapleMapObjectType objectType) {
private List<MapleMapObject> getObjectsInRange(Monster monster, MapleMapObjectType objectType) {
return monster.getMap().getMapObjectsInBox(calculateBoundingBox(monster.getPosition()), Collections.singletonList(objectType));
}
}

663
src/main/java/server/life/MapleMonster.java → src/main/java/server/life/Monster.java
View File

File diff suppressed because it is too large Load Diff

6
src/main/java/server/life/SpawnPoint.java
View File

@@ -35,7 +35,7 @@ public class SpawnPoint {
private AtomicInteger spawnedMonsters = new AtomicInteger(0);
private boolean immobile, denySpawn = false;
public SpawnPoint(final MapleMonster monster, Point pos, boolean immobile, int mobTime, int mobInterval, int team) {
public SpawnPoint(final Monster monster, Point pos, boolean immobile, int mobTime, int mobInterval, int team) {
this.monster = monster.getId();
this.pos = new Point(pos);
this.mobTime = mobTime;
@@ -74,8 +74,8 @@ public class SpawnPoint {
return true;
}
public MapleMonster getMonster() {
MapleMonster mob = new MapleMonster(LifeFactory.getMonster(monster));
public Monster getMonster() {
Monster mob = new Monster(LifeFactory.getMonster(monster));
mob.setPosition(new Point(pos));
mob.setTeam(team);
mob.setFh(fh);