projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-16 06:13:45 -04:00
Code Issues Projects Releases Wiki Activity

Fixed #740 - Mission on wrong planets, Fixed delivery mission conversations

Browse Source
This commit is contained in:
Waverunner
2014-06-12 19:03:05 -04:00
parent df82035f66
commit 7b7f1ed5bc
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/conversation/missions/deliver.py
+3 -3
View File
@@ -43,7 +43,7 @@ def handlePickupStage(core, actor, npc, objective, mission):
endConversation(core, actor, npc)
return
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p')
core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'p')
objective.createDeliveryItem(core, actor)
objective.update(core, actor)
return
@@ -54,7 +54,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission):
endConversation(core, actor, npc)
return
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r')
core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'r')
core.objectService.destroyObject(objective.getDeliveryObject())
objective.update(core, actor)
return
@@ -65,6 +65,6 @@ def handleCompletionStage(core, actor, npc, objective, mission):
endConversation(core, actor, npc)
return
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's')
core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 's')
core.missionService.handleMissionComplete(actor, mission)
return
src/resources/objects/building/BuildingObject.java
+1
View File
@@ -161,6 +161,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
PortalVisitor portal = ClientFileManager.loadFile(portalLayoutFilename, PortalVisitor.class);
for (int i = 0; i <= portal.cellCount; i++) {
System.out.println("Cellname: " + portal.cells.get(i).name);
if (cellName.equals(portal.cells.get(i).name)) {
return getCellByCellNumber(i + 1);
}
src/services/mission/MissionService.java
+5
View File
@@ -383,6 +383,11 @@ public class MissionService implements INetworkDispatch {
return false;
}
if (mission.getPlanetId() != creature.getPlanetId()) {
mission.setPlanet(creature.getPlanet());
mission.setPlanetId(creature.getPlanetId());
}
missionBag.transferTo(creature, datapad, mission);
createMissionObjective(creature, mission);
return true;