From 9fd820b93d0429cb56f8ea681f4eb751a88ec236 Mon Sep 17 00:00:00 2001 From: Levarrishawk Date: Tue, 26 Nov 2013 07:34:18 -0500 Subject: [PATCH] Commented out Kaas Entries Commented out Dromund Kaas related entries for future use. --- scripts/static_map_locations.py | 20 ++++++++++---------- scripts/static_travel_points.py | 14 +++++++------- src/main/NGECore.java | 5 +++-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/scripts/static_map_locations.py b/scripts/static_map_locations.py index cfaf3644..46efc478 100644 --- a/scripts/static_map_locations.py +++ b/scripts/static_map_locations.py @@ -32,11 +32,11 @@ def addLocations(core, planet): if planet.getName() == 'lok': lokLocations(core, planet) - if planet.getName() == 'kaas': - kaasLocations(core, planet) + #if planet.getName() == 'kaas': + #kaasLocations(core, planet) - if planet.getName() == 'taanab': - taanabLocations(core, planet) + #if planet.getName() == 'taanab': + #taanabLocations(core, planet) def tatooineLocations(core, planet): @@ -143,19 +143,19 @@ def lokLocations(core, planet): mapService.addLocation(planet, 'Nym\'s Stronghold', 440, 5029, 17, 0, 0) mapService.addLocation(planet, 'Imperial outpost', -1920, -3084, 17, 0, 0) -def kaasLocations(core, planet): - mapService = core.mapService +#def kaasLocations(core, planet): + #mapService = core.mapService # Cities - mapService.addLocation(planet, 'Imperial Outpost', -5118, -2386, 17, 0, 0) + #mapService.addLocation(planet, 'Imperial Outpost', -5118, -2386, 17, 0, 0) -def taanabLocations(core, planet): +#def taanabLocations(core, planet): - mapService = core.mapService + #mapService = core.mapService # Cities - mapService.addLocation(planet, 'Pandath Spaceport', 0, 0, 17, 0, 0) + #mapService.addLocation(planet, 'Pandath Spaceport', 0, 0, 17, 0, 0) \ No newline at end of file diff --git a/scripts/static_travel_points.py b/scripts/static_travel_points.py index 32ae6564..3bffc125 100644 --- a/scripts/static_travel_points.py +++ b/scripts/static_travel_points.py @@ -105,7 +105,7 @@ def roriPoints(core, planet): trvSvc.addTravelPoint(planet, "Narmle Starport", -5374, 80, -2188) trvSvc.addTravelPoint(planet, "Narmle Shuttleport", -5255, 80, -2161) trvSvc.addTravelPoint(planet, "Rebel Outpost", 3672, 96, -6421) - trvSvc.addTravelPoint(planet, "Restuss Starport", 5298, 80, 6188) + trvSvc.addTravelPoint(planet, "Restuss Starport", 5281, 80, 6171) trvSvc.addTravelPoint(planet, "Restuss Shuttleport", 5398, 80, 6195) return @@ -157,10 +157,10 @@ def mustafarPoints(core, planet): trvSvc.addTravelPoint(planet, "Mensix Mining Facility", 405, 230, -1352) return -def kaasPoints(core, planet): - trvSvc = core.travelService - return +#def kaasPoints(core, planet): + #trvSvc = core.travelService + #Return -def taanabPoints(core, planet): - trvSvc = core.travelService - return \ No newline at end of file +#def taanabPoints(core, planet): + #trvSvc = core.travelService + #return \ No newline at end of file diff --git a/src/main/NGECore.java b/src/main/NGECore.java index c417f3c8..93ca7e9d 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -253,8 +253,9 @@ public class NGECore { 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.addPlanet(13, "kaas", "terrain/kaas.trn", true); - terrainService.addPlanet(14, "taanab", "terrain/taanab.trn", true); + //terrainService.addPlanet(13, "kaas", "terrain/kaas.trn", true); + //terrainService.addPlanet(14, "taanab", "terrain/taanab.trn", true); + // Travel Points travelService.loadTravelPoints(); simulationService = new SimulationService(this);