projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-05 06:17:19 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Light2
2014-04-13 00:20:00 +02:00
parent 5510ace39a 6f791819e6
commit 83aa0ab2b0
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mobiles/tatooine/tusken_raider.py
+3 -4
View File
@@ -5,7 +5,7 @@ from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('tuskenraider')
mobileTemplate.setCreatureName('tusken_raider')
mobileTemplate.setLevel(90)
mobileTemplate.setDifficulty(0)
mobileTemplate.setAttackRange(24)
@@ -15,8 +15,7 @@ def addTemplate(core):
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_e11.iff')
weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_t21.iff')
weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_tusken.iff')
mobileTemplate.setWeaponTemplates(weaponTemplates)
@@ -24,5 +23,5 @@ def addTemplate(core):
mobileTemplate.setDefaultAttack('rangedShot')
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('tuskenraider', mobileTemplate)
core.spawnService.addMobileTemplate('tusken_raider', mobileTemplate)
src/resources/objects/building/BuildingObject.java
+1 -1
View File
@@ -151,7 +151,7 @@ public class BuildingObject extends TangibleObject implements IPersistent {
public Vector<TangibleObject> getItemsList() {
Vector<TangibleObject> items = new Vector<TangibleObject>();
getCells().forEach(c -> c.viewChildren(c, true, false, (item) -> {
if(!(item instanceof CreatureObject))
if(!(item instanceof CreatureObject) && item.getTemplate() != "object/tangible/terminal/shared_terminal_player_structure.iff")
items.add((TangibleObject) item);
}));
return items;
src/services/housing/HousingService.java
+2 -1
View File
@@ -456,7 +456,8 @@ public class HousingService implements INetworkDispatch {
Vector<TangibleObject> itemList = building.getItemsList();
for (int i=0;i<itemList.size();i++){
window.addListBoxMenuItem("#"+(i+1)+": " + itemList.get(i).getTemplate(), i);
String itemName = (itemList.get(i).getCustomName() != null) ? itemList.get(i).getCustomName() : "@" + itemList.get(i).getStfFilename() + ":" + itemList.get(i).getStfName();
window.addListBoxMenuItem(itemName, i);
}
window.setProperty("btnOk:visible", "True");
src/services/resources/HarvesterService.java
+1 -5
View File
@@ -903,11 +903,9 @@ public class HarvesterService implements INetworkDispatch {
public void placeHarvester(SWGObject object) {
CreatureObject actor = (CreatureObject) object.getAttachment("Owner");
String structureTemplate = (String)object.getAttachment("Deed_StructureTemplate");
HarvesterObject harvester = (HarvesterObject) NGECore.getInstance().objectService.createObject(structureTemplate, actor.getPlanet());
long objectId = harvester.getObjectID();
Vector<String> adminList = harvester.getAdminList();
//String[] fullName = ((CreatureObject)actor).getCustomName().split(" ");
adminList.add(actor.getCustomName());
@@ -927,9 +925,7 @@ public class HarvesterService implements INetworkDispatch {
// build harvester
float positionY = NGECore.getInstance().terrainService.getHeight(actor.getPlanetId(), object.getPosition().x, object.getPosition().z);
harvester.setPosition(new Point3D(object.getPosition().x,positionY, object.getPosition().z));
core.simulationService.add(harvester, harvester.getPosition().x, harvester.getPosition().x, true);
core.simulationService.add(harvester, harvester.getPosition().x, harvester.getPosition().z, true);
PlayerObject player = (PlayerObject) actor.getSlottedObject("ghost");
WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", actor.getPlanet(), harvester.getPosition().x, 0 ,harvester.getPosition().z);
String displayname = "@installation_n:"+harvester.getStfName();