projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-02 17:12:58 -04:00
Code Issues Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
CharonInferar
2014-04-30 19:58:18 +02:00
parent 2a23dd8076 924d52b3b0
commit 4f2b50fa97
224 changed files with 1539 additions and 2312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/DevService.java
+91 -130
View File
@@ -39,8 +39,6 @@ import resources.common.SpawnPoint;
import resources.datatables.WeaponType;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.deed.Harvester_Deed;
import resources.objects.deed.Player_House_Deed;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
@@ -1028,190 +1026,140 @@ public class DevService implements INetworkDispatch {
inventory.add(solarSurveyTool);
return;
case 111:
SWGObject deed1;
// Minerals
String templateString="object/tangible/deed/harvester_deed/shared_harvester_ore_s1_deed.iff";
Harvester_Deed deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(5);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_ore_s1_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 5);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_ore_s2_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(11);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_ore_s2_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 11);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_ore_heavy_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(135400);
deed1.setBER(14);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_ore_heavy_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 135400);
deed1.setIntAttribute("examine_maintenance_rate", 14);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_ore_deed_elite.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(44);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_ore_deed_elite.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 44);
inventory.add(deed1);
// Chemicals
templateString="object/tangible/deed/harvester_deed/shared_harvester_liquid_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(5);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_liquid_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 5);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_medium.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(11);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_medium.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 11);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_heavy.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(135400);
deed1.setBER(14);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_heavy.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 135400);
deed1.setIntAttribute("examine_maintenance_rate", 14);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_elite.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(44);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_liquid_deed_elite.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 44);
inventory.add(deed1);
// Flora
templateString="object/tangible/deed/harvester_deed/shared_harvester_flora_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(5);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_flora_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 5);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_flora_deed_medium.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(11);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_flora_deed_medium.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 11);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_flora_deed_heavy.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(135400);
deed1.setBER(14);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_flora_deed_heavy.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 135400);
deed1.setIntAttribute("examine_maintenance_rate", 14);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_flora_deed_elite.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(44);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_flora_deed_elite.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 44);
inventory.add(deed1);
// Gas
templateString="object/tangible/deed/harvester_deed/shared_harvester_gas_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(5);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_gas_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 5);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_gas_deed_medium.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(11);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_gas_deed_medium.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 11);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_gas_deed_heavy.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(135400);
deed1.setBER(14);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_gas_deed_heavy.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 135400);
deed1.setIntAttribute("examine_maintenance_rate", 14);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_gas_deed_elite.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(44);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_gas_deed_elite.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 44);
inventory.add(deed1);
// Water
templateString="object/tangible/deed/harvester_deed/shared_harvester_moisture_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(5);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_moisture_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 5);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_medium.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(27344);
deed1.setBER(11);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_medium.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 27344);
deed1.setIntAttribute("examine_maintenance_rate", 11);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_heavy.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(135400);
deed1.setBER(14);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_heavy.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 135400);
deed1.setIntAttribute("examine_maintenance_rate", 14);
inventory.add(deed1);
templateString="object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_elite.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(44);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/harvester_deed/shared_harvester_moisture_deed_elite.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 44);
inventory.add(deed1);
// Generators
templateString="object/tangible/deed/generator_deed/shared_generator_fusion_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(19);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/generator_deed/shared_generator_fusion_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 19);
inventory.add(deed1);
templateString="object/tangible/deed/generator_deed/shared_generator_wind_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(10);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/generator_deed/shared_generator_wind_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 10);
inventory.add(deed1);
templateString="object/tangible/deed/generator_deed/shared_generator_solar_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(15);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/generator_deed/shared_generator_solar_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 15);
inventory.add(deed1);
// templateString="object/tangible/deed/generator_deed/shared_generator_photo_bio_deed.iff";
// deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
// deed1.setOutputHopperCapacity(250000);
// deed1.setBER(19);
// deed1 = core.objectService.createObject("object/tangible/deed/generator_deed/shared_generator_photo_bio_deed.iff", planet);
// deed1.setIntAttribute("examine_hoppersize", 250000);
// deed1.setIntAttribute("examine_maintenance_rate", 19);
// inventory.add(deed1);
templateString="object/tangible/deed/generator_deed/shared_generator_geothermal_deed.iff";
deed1 = (Harvester_Deed)core.objectService.createObject(templateString, planet);
deed1.setOutputHopperCapacity(250000);
deed1.setBER(15);
deed1.setAttributes();
deed1 = core.objectService.createObject("object/tangible/deed/generator_deed/shared_generator_geothermal_deed.iff", planet);
deed1.setIntAttribute("examine_hoppersize", 250000);
deed1.setIntAttribute("examine_maintenance_rate", 15);
inventory.add(deed1);
return;
case 112:
core.resourceService.spawnSpecificResourceContainer("Radioactive", player, 100000);
@@ -1219,6 +1167,7 @@ public class DevService implements INetworkDispatch {
case 120:
// SWGObject houseDeed = core.objectService.createObject("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", planet);
// inventory.add(houseDeed);
<<<<<<< HEAD
templateString="object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff";
Player_House_Deed deed = (Player_House_Deed)core.objectService.createObject(templateString, planet);
@@ -1240,6 +1189,18 @@ public class DevService implements INetworkDispatch {
return;
=======
TangibleObject deed = (TangibleObject) core.objectService.createObject("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", planet);
deed.setIntAttribute("examine_maintenance_rate", 15);
inventory.add(deed);
deed = (TangibleObject) core.objectService.createObject("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", planet);
deed.setIntAttribute("examine_maintenance_rate", 15);
inventory.add(deed);
return;
>>>>>>> origin/master
case 125:
TangibleObject genericCraftingTool = (TangibleObject) core.objectService.createObject("object/tangible/crafting/station/shared_generic_tool.iff", planet);
genericCraftingTool.setCustomName("Generic Crafting Tool");