projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Several Fixes for lairs

Browse Source 
- Fixed staying in combat with a lair
- Fixed lairs spawning under ground
- Fixed vehicle spawn bug
- Fixed lair to spawn more waves
- Fixed data type error in calculation for lair damage
- Fixed some lairs not having health due to incorrect level
This commit is contained in:
CharonInferar
2014-09-06 16:43:51 +02:00
parent e054a4bbd9
commit f538c274c0
6 changed files with 137 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/spawn/SpawnService.java
+19 -5
View File
@@ -459,18 +459,23 @@ public class SpawnService {
}
public LairActor spawnLair(String lairSpawnTemplate, Planet planet, Point3D position, short level) {
LairTemplate lairTemplate = lairTemplates.get(lairSpawnTemplate);
if(lairTemplate == null)
return null;
// adapt to terrain
float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z);
Point3D adaptedPosition = new Point3D(position.x, positionY, position.z);
TangibleObject lairObject = null;
if (lairTemplate.getLairCRC()==null){
String lairCRC = lairTemplate.getLairCRCs().get(new Random().nextInt(lairTemplate.getLairCRCs().size()));
System.out.println("Lair CRC " + lairCRC);
lairObject = (TangibleObject) core.objectService.createObject(lairCRC, 0, planet, position, new Quaternion(1, 0, 0, 0));
//System.out.println("Lair CRC " + lairCRC);
lairObject = (TangibleObject) core.objectService.createObject(lairCRC, 0, planet, adaptedPosition, new Quaternion(1, 0, 0, 0));
} else {
lairObject = (TangibleObject) core.objectService.createObject(lairTemplate.getLairCRC().trim(), 0, planet, position, new Quaternion(1, 0, 0, 0));
lairObject = (TangibleObject) core.objectService.createObject(lairTemplate.getLairCRC().trim(), 0, planet, adaptedPosition, new Quaternion(1, 0, 0, 0));
}
if(lairObject == null)
@@ -478,8 +483,17 @@ public class SpawnService {
lairObject.setOptionsBitmask(Options.ATTACKABLE);
lairObject.setPvpBitmask(PvpStatus.Attackable);
lairObject.setMaximumCondition(1000 * level);
if (lairTemplate.getMobiles()!=null){
MobileTemplate mobileTemplate = mobileTemplates.get(lairTemplate.getMobiles().get(0));
level = mobileTemplate.getLevel();
}
lairObject.setMaximumCondition(1000 * level);
LairActor lairActor = new LairActor(lairObject, lairTemplate.getMobileName(), 10, level);
if (lairTemplate.getMobiles()!=null)