From fc9fab4bcf0430d359ba5b88586e7e09fd0649b8 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 11 Aug 2014 21:58:01 +0200 Subject: [PATCH] Changed Missionservice to use Datatable Added Datatable for Terminaltypes Changed Terminals to use Datatable Changed Entertainermissions to use randomized Missions(still dont popup in Mission browser) --- .../tangible/terminal/terminal_mission.py | 4 +-- .../terminal/terminal_mission_artisan.py | 3 +- .../terminal/terminal_mission_bounty.py | 3 +- .../terminal/terminal_mission_entertainer.py | 3 +- src/resources/datatables/TerminalType.java | 32 +++++++++++++++++++ src/services/mission/MissionService.java | 11 +++++-- 6 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 src/resources/datatables/TerminalType.java diff --git a/scripts/object/tangible/terminal/terminal_mission.py b/scripts/object/tangible/terminal/terminal_mission.py index 10fe46c8..4d8fd379 100644 --- a/scripts/object/tangible/terminal/terminal_mission.py +++ b/scripts/object/tangible/terminal/terminal_mission.py @@ -1,7 +1,7 @@ import sys - +from resources.datatables import TerminalType def setup(core, object): core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission', object.getPosition().x, object.getPosition().z, 41, 44, 0) - object.setAttachment("terminalType", 1) + object.setAttachment("terminalType", TerminalType.GENERIC) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_artisan.py b/scripts/object/tangible/terminal/terminal_mission_artisan.py index 7bbd42dd..6263cbe4 100644 --- a/scripts/object/tangible/terminal/terminal_mission_artisan.py +++ b/scripts/object/tangible/terminal/terminal_mission_artisan.py @@ -1,7 +1,8 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 4) + object.setAttachment("terminalType", TerminalType.ARTISAN) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_artisan', object.getPosition().x, object.getPosition().z, 41, 76, 0) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_bounty.py b/scripts/object/tangible/terminal/terminal_mission_bounty.py index f97abb2a..65e30df3 100644 --- a/scripts/object/tangible/terminal/terminal_mission_bounty.py +++ b/scripts/object/tangible/terminal/terminal_mission_bounty.py @@ -1,6 +1,7 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 2) + object.setAttachment("terminalType", TerminalType.BOUNTY) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_bounty', object.getPosition().x, object.getPosition().z, 41, 78, 0) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_entertainer.py b/scripts/object/tangible/terminal/terminal_mission_entertainer.py index efd0e92f..f53c23b2 100644 --- a/scripts/object/tangible/terminal/terminal_mission_entertainer.py +++ b/scripts/object/tangible/terminal/terminal_mission_entertainer.py @@ -1,6 +1,7 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 3) + object.setAttachment("terminalType", TerminalType.ENTERTAINER) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_entertainer', object.getPosition().x, object.getPosition().z, 41, 75, 0) return \ No newline at end of file diff --git a/src/resources/datatables/TerminalType.java b/src/resources/datatables/TerminalType.java new file mode 100644 index 00000000..49c64bf8 --- /dev/null +++ b/src/resources/datatables/TerminalType.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.datatables; + +public class TerminalType { + + public static final int GENERIC = 1; + public static final int BOUNTY = 2; + public static final int ENTERTAINER = 3; + public static final int ARTISAN = 4; + public static final int EXPLORER = 5; + +} diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index d0b6d843..c9ddba28 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -55,6 +55,7 @@ import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; +import resources.datatables.TerminalType; import engine.clientdata.StfTable; import engine.clients.Client; import engine.resources.common.CRC; @@ -660,7 +661,8 @@ public class MissionService implements INetworkDispatch { missionStf = "mission/mission_npc_dancer_neutral_easy"; } - mission.setMissionId(10); + + mission.setMissionId(getRandomStringEntry(missionStf)); mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "o"); @@ -680,15 +682,18 @@ public class MissionService implements INetworkDispatch { System.out.println("Profession: " + playera.getProfession()); System.out.println("Faction: " + creature.getFaction()); System.out.println("Difficulty: " + mission.getDifficultyLevel()); + System.out.println("missionid: " + mission.getMissionId()); + System.out.println("MissionTitle: " + mission.getTitle().getStfValue()); + System.out.println("Missiondesc: " + mission.getDescription().getStfValue()); } - + /* public enum TerminalType {; public static final int GENERIC = 1; public static final int BOUNTY = 2; public static final int ENTERTAINER = 3; public static final int ARTISAN = 4; public static final int EXPLORER = 5; - } + }*/ public Map getBountyMap() { return this.bountyMap;