From aad1ec856c6dfb334f4dd9abe4773b4ff845e866 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Mon, 28 Oct 2013 15:23:10 -0400 Subject: [PATCH] Terminal now displays TravelPoints correctly Can only view the points from Mos Eisley starport travel terminal, Purchase Ticket will not work as command not implemented. --- scripts/static_travel_points.py | 84 +++++++++++++------------- src/main/NGECore.java | 2 + src/services/travel/TravelService.java | 4 +- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/scripts/static_travel_points.py b/scripts/static_travel_points.py index a492ed6c..583a5d22 100644 --- a/scripts/static_travel_points.py +++ b/scripts/static_travel_points.py @@ -21,83 +21,83 @@ def addPoints(core, planet): if planet.getName() == 'tatooine': tatooinePoints(core, planet) if planet.getName() == 'yavin4': - yavin4Points(core, planet) + yavin4Points(core, planet) return def corelliaPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Coronet Starport", -51, 28, -4735) - trvSvc.addTravelPoint(planet, "Tyrena Starport", -4975, 21, -2230) - trvSvc.addTravelPoint(planet, "Kor Vella Starport", -3136, 31, 2894) - trvSvc.addTravelPoint(planet, "Doaba Guerful Starport", 3377, 308, 5605) - return + trvSvc.addTravelPoint(planet, "Coronet Starport", -51, -4735) + trvSvc.addTravelPoint(planet, "Tyrena Starport", -4975, -2230) + trvSvc.addTravelPoint(planet, "Kor Vella Starport", -3136, 2894) + trvSvc.addTravelPoint(planet, "Doaba Guerful Starport", 3377, 5605) + return def dantooinePoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Coronet Starport", -51, 28, -4735) - trvSvc.addTravelPoint(planet, "Tyrena Starport", -4975, 21, -2230) - trvSvc.addTravelPoint(planet, "Kor Vella Starport", -3136, 31, 2894) - trvSvc.addTravelPoint(planet, "Doaba Guerful Starport", 3377, 308, 5605) - return - + trvSvc.addTravelPoint(planet, "Coronet Starport", -51, -4735) + trvSvc.addTravelPoint(planet, "Tyrena Starport", -4975, -2230) + trvSvc.addTravelPoint(planet, "Kor Vella Starport", -3136, 2894) + trvSvc.addTravelPoint(planet, "Doaba Guerful Starport", 3377, 5605) + return + def dathomirPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Science Outpost", -76, 18, -1586) - trvSvc.addTravelPoint(planet, "Trade Outpost", -592, 6, 3087) - return + trvSvc.addTravelPoint(planet, "Science Outpost", -76, -1586) + trvSvc.addTravelPoint(planet, "Trade Outpost", -592, 3087) + return def endorPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Smuggler Outpost", -978, 73, 1554) - trvSvc.addTravelPoint(planet, "Research Outpost", 3222, 24, -3482) - return - + trvSvc.addTravelPoint(planet, "Smuggler Outpost", -978, 1554) + trvSvc.addTravelPoint(planet, "Research Outpost", 3222, -3482) + return + def lokPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Nym's Stronghold", 459, 9, 5494) + trvSvc.addTravelPoint(planet, "Nym's Stronghold", 459, 5494) return def nabooPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Kaadara Starport", 5295, -192, 6664) - trvSvc.addTravelPoint(planet, "Keren Starport", 1352, 13, 2768) - trvSvc.addTravelPoint(planet, "Moenia Starport", 4728, 4, -4650) - return - + trvSvc.addTravelPoint(planet, "Kaadara Starport", 5295, 6664) + trvSvc.addTravelPoint(planet, "Keren Starport", 1352, 2768) + trvSvc.addTravelPoint(planet, "Moenia Starport", 4728, -4650) + return + def roriPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Narmle Starport", -5472, 80, 2161) - trvSvc.addTravelPoint(planet, "Rebel Outpost", 3672, 96, -6421) - return - + trvSvc.addTravelPoint(planet, "Narmle Starport", -5472, 2161) + trvSvc.addTravelPoint(planet, "Rebel Outpost", 3672, -6421) + return + def talusPoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Dearic Starport", 245, 6, -2931) - trvSvc.addTravelPoint(planet, "Nashal Starport", 4480, 2, 6365) - trvSvc.addTravelPoint(planet, "Imperial Outpost", -2212, 20, 2302) - return - + trvSvc.addTravelPoint(planet, "Dearic Starport", 245, -2931) + trvSvc.addTravelPoint(planet, "Nashal Starport", 4480, 6365) + trvSvc.addTravelPoint(planet, "Imperial Outpost", -2212, 2302) + return + def tatooinePoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Bestine Starport", -1376, 12, -3576) - trvSvc.addTravelPoint(planet, "Mos Eisley Starport", 3619, 5, -4801) - trvSvc.addTravelPoint(planet, "Mos Espa Starport", -2829, 5, 2080) - trvSvc.addTravelPoint(planet, "Mos Entha Starport", 1238, 7, 3062) + trvSvc.addTravelPoint(planet, "Bestine Starport", -1376, -3576) + trvSvc.addTravelPoint(planet, "Mos Eisley Starport", 3619, -4801) + trvSvc.addTravelPoint(planet, "Mos Espa Starport", -2829, 2080) + trvSvc.addTravelPoint(planet, "Mos Entha Starport", 1238, 3062) return - + def yavin4Points(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Imperial Base", 4033, 37, -6234) - trvSvc.addTravelPoint(planet, "Labor Outpost", -6939, 73, -5706) - trvSvc.addTravelPoint(planet, "Mining Outpost", -277, 35, 4879) + trvSvc.addTravelPoint(planet, "Imperial Base", 4033, -6234) + trvSvc.addTravelPoint(planet, "Labor Outpost", -6939, -5706) + trvSvc.addTravelPoint(planet, "Mining Outpost", -277, 4879) return \ No newline at end of file diff --git a/src/main/NGECore.java b/src/main/NGECore.java index dc90f6db..30697d12 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -221,6 +221,8 @@ public class NGECore { terrainService.addPlanet(8, "yavin4", "terrain/yavin4.trn", true); terrainService.addPlanet(9, "endor", "terrain/endor.trn", true); terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true); + terrainService.addPlanet(11, "mustafar", "terrain/mustafar.trn", true); + terrainService.addPlanet(12, "kashyyyk_main", "terrain/kashyyyk_main.trn", true); terrainService.loadSnapShotObjects(); // Zone services that need to be loaded after the above diff --git a/src/services/travel/TravelService.java b/src/services/travel/TravelService.java index 147f513a..99639def 100644 --- a/src/services/travel/TravelService.java +++ b/src/services/travel/TravelService.java @@ -102,8 +102,8 @@ public class TravelService implements INetworkDispatch { } - public void addTravelPoint(Planet planet, String name, float x, float y, float z) { - TravelPoint travelPoint = new TravelPoint(name, x, y, z, 100); + public void addTravelPoint(Planet planet, String name, float x, float y) { + TravelPoint travelPoint = new TravelPoint(name, x, y, 0, 100); travelPoint.setPlanetName(WordUtils.capitalize(planet.getName()));