From 83d97679a72babed8d8472ecc3d240b40480564b Mon Sep 17 00:00:00 2001 From: tacef Date: Thu, 7 Aug 2014 20:16:41 +0200 Subject: [PATCH] Changed Removed Frogbuilding placed Frog only --- .../static_spawns/tatooine/mos_espa_frog.py | 14 +++ src/main/NGECore.java | 3 - src/services/DevService.java | 107 ------------------ 3 files changed, 14 insertions(+), 110 deletions(-) create mode 100644 scripts/static_spawns/tatooine/mos_espa_frog.py delete mode 100644 src/services/DevService.java diff --git a/scripts/static_spawns/tatooine/mos_espa_frog.py b/scripts/static_spawns/tatooine/mos_espa_frog.py new file mode 100644 index 00000000..8f87f45c --- /dev/null +++ b/scripts/static_spawns/tatooine/mos_espa_frog.py @@ -0,0 +1,14 @@ +# Project SWG: Mos Espa: Frogbuilding +# (C)2014 ProjectSWG + +import sys + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(-3308), float(5.4), float(2174), float(0.70), float(0.71)) + return + diff --git a/src/main/NGECore.java b/src/main/NGECore.java index 3e14ffb4..2bd40112 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -62,7 +62,6 @@ import services.BuffService; import services.CharacterService; import services.ConnectionService; import services.ConversationService; -import services.DevService; import services.EntertainmentService; import services.GroupService; import services.housing.HousingService; @@ -197,7 +196,6 @@ public class NGECore { public AIService aiService; public MissionService missionService; public InstanceService instanceService; - public DevService devService; public SurveyService surveyService; public ResourceService resourceService; public ConversationService conversationService; @@ -554,7 +552,6 @@ public class NGECore { browserService = new BrowserService(this); //battlefieldService = new BattlefieldService(this); - devService = new DevService(this); DevLogQueuer devLogQueuer = new DevLogQueuer(); diff --git a/src/services/DevService.java b/src/services/DevService.java deleted file mode 100644 index c53201fe..00000000 --- a/src/services/DevService.java +++ /dev/null @@ -1,107 +0,0 @@ -/******************************************************************************* - * 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 services; - -import java.nio.ByteOrder; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Vector; - -import org.apache.mina.core.buffer.IoBuffer; -import org.apache.mina.core.session.IoSession; - -import resources.common.Console; -import resources.common.FileUtilities; -import resources.common.Forager; -import resources.common.Opcodes; -import resources.common.SpawnPoint; -import resources.datatables.Posture; -import resources.datatables.WeaponType; -import resources.harvest.SurveyTool; -import resources.objects.building.BuildingObject; -import resources.objects.creature.CreatureObject; -import resources.objects.player.PlayerObject; -import resources.objects.tangible.TangibleObject; -import resources.objects.weapon.WeaponObject; -import services.sui.SUIWindow; -import services.sui.SUIService.ListBoxType; -import services.sui.SUIWindow.SUICallback; -import services.sui.SUIWindow.Trigger; -import main.NGECore; -import engine.clientdata.ClientFileManager; -import engine.clientdata.visitors.DatatableVisitor; -import engine.clients.Client; -import engine.resources.container.CreatureContainerPermissions; -import engine.resources.container.CreaturePermissions; -import engine.resources.container.NullPermissions; -import engine.resources.objects.SWGObject; -import engine.resources.scene.Planet; -import engine.resources.scene.Point3D; -import engine.resources.scene.Quaternion; -import engine.resources.service.INetworkDispatch; -import engine.resources.service.INetworkRemoteEvent; - -@SuppressWarnings("unused") -public class DevService implements INetworkDispatch { - - private NGECore core; - private long frogBuildingId = 0; - - public DevService(NGECore core) { - this.core = core; - loadFrogBuilding(); - } - - private void loadFrogBuilding() { - BuildingObject building = (BuildingObject) core.objectService.createObject("object/building/tatooine/shared_association_hall_civilian_tatooine_02.iff", 0, core.terrainService.getPlanetByName("tatooine"), - new Point3D(-3308, 5, 2174), new Quaternion((float) 0.7323, 0, (float) 0.680961, 0)); - - core.simulationService.add(building, building.getPosition().x, building.getPosition().z); - - this.frogBuildingId = building.getObjectID(); - - building.setAttachment("structureOwner", 0); - - TangibleObject frog = (TangibleObject) core.objectService.createObject("object/tangible/terminal/shared_terminal_character_builder.iff", core.terrainService.getPlanetByID(building.getPlanetId())); - frog.setPosition(new Point3D((float)-1.10475, (float)0.51, (float)-4.3665)); - frog.setOrientation(new Quaternion((float) 0.9965, 0, (float)-0.09, 0)); - building.getCellByCellNumber(2).add(frog); - } - - public long getFrogBuildingId() { - return this.frogBuildingId; - } - - @Override - public void insertOpcodes(Map swgOpcodes, Map objControllerOpcodes) { - } - - - @Override - public void shutdown() { - - } - -} -