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

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Treeku
2014-07-13 22:56:58 +01:00
parent 042ccaebe9 5321b916ea
commit a7d354fbe0
8 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/setgodmode.py
+17 -2
View File
@@ -50,9 +50,9 @@ def run(core, actor, target, commandString):
core.playerService.grantLevel(actor, int(arg1))
elif command == 'setSpeed' and arg1:
actor.sendSystemMessage('Your speed was ' + str(actor.getSpeedMultiplierBase()) + '. Don\'t forget to set this back or it\'ll permanently imbalance your speed. Default without buffs or mods is 1.', 2)
#actor.sendSystemMessage("Your speed was " + str(actor.getSpeedMultiplierBase()) + ". Don\'t forget to set this back or it\'ll permanently imbalance your speed. Default without buffs or mods is 1.", 2)
actor.setSpeedMultiplierBase(float(arg1))
actor.sendSystemMessage('Your new speed is ' + str(actor.getSpeedMultiplierBase()) + '.', 2)
actor.sendSystemMessage('Your new speed is ' + arg1 + '.', 2)
elif command == 'teleport' and arg2 and arg3 and arg4:
position = Point3D(float(arg2), float(arg3), float(arg4))
@@ -146,10 +146,15 @@ def run(core, actor, target, commandString):
planetName = actor.getPlanet().getName()
actor.sendSystemMessage('Position.x : %s' % pos.x, 0)
print ('Position.x : %s' % pos.x, 0)
actor.sendSystemMessage('Position.y : %s' % pos.y, 0)
print ('Position.y : %s' % pos.y, 0)
actor.sendSystemMessage('Position.z : %s' % pos.z, 0)
print ('Position.z : %s' % pos.z, 0)
actor.sendSystemMessage('Orientation.y : %s' % ori.y, 0)
print ('Orientation.y : %s' % ori.y, 0)
actor.sendSystemMessage('Orientation.w : %s' % ori.w, 0)
print ('Orientation.w : %s' % ori.w, 0)
if (actor.getContainer()):
cid = actor.getContainer().getObjectID()
cellid = cid
@@ -185,4 +190,14 @@ def run(core, actor, target, commandString):
playerObject.setCurrentRank(int(arg1))
print (playerObject.getCurrentRank())
return
elif command == 'addToFrogAdminList':
frogBuilding = core.objectService.getObject(core.devService.getFrogBuildingId())
if frogBuilding is None:
return
frogBuilding.addPlayerToAdminList(None, actor.getObjectID(), actor.getCustomName().split(' ')[0])
actor.sendSystemMessage('You were added to the Admin list for the Frog Building.', 0)
return
return
scripts/radial/item/recolorable.py
-3
View File
@@ -4,7 +4,6 @@ import sys
def createRadial(core, owner, target, radials):
radials.add(RadialOptions(0, 98, 0, 'Modify primary color'))
radials.add(RadialOptions(0, 99, 0, 'Modify secondary color'))
radials.add(RadialOptions(0, 100, 0, 'Modify tertiary color'))
return
def handleSelection(core, owner, target, option):
@@ -12,7 +11,5 @@ def handleSelection(core, owner, target, option):
core.suiService.sendColorPicker(owner, target, '/private/index_color_1')
if option == 99 and target:
core.suiService.sendColorPicker(owner, target, '/private/index_color_2')
if option == 100 and target:
core.suiService.sendColorPicker(owner, target, '/private/index_color_3')
return
scripts/static_spawns/tatooine/tatooine.py
+1 -1
View File
@@ -10,7 +10,7 @@ def addPlanetSpawns(core, planet):
########################################################
stcSvc = core.staticService
# Blue Frog: Uncomment only when needed for testing.
stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(3525), float(4), float(-4801), float(0.70), float(0.71))
#stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(3525), float(4), float(-4801), float(0.70), float(0.71))
########################################################
# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
src/main/NGECore.java
+1 -1
View File
@@ -344,7 +344,6 @@ public class NGECore {
skillModService = new SkillModService(this);
equipmentService = new EquipmentService(this);
entertainmentService = new EntertainmentService(this);
devService = new DevService(this);
conversationService = new ConversationService(this);
bazaarService = new BazaarService(this);
housingService = new HousingService(this);
@@ -561,6 +560,7 @@ public class NGECore {
browserService = new BrowserService(this);
//battlefieldService = new BattlefieldService(this);
devService = new DevService(this);
DevLogQueuer devLogQueuer = new DevLogQueuer();
src/resources/objects/mission/MissionObject.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class MissionObject extends IntangibleObject implements Serializable {
baseline.put("repeatCounter", 0);
baseline.put("missionType", 0);
baseline.put("targetName", "");
baseline.put("waypoint", (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/base/shared_base_waypoint.iff", NGECore.getInstance().terrainService.getPlanetByID(0)));
baseline.put("waypoint", (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/base/shared_base_waypoint.iff", NGECore.getInstance().terrainService.getPlanetByID(1)));
return baseline;
}
src/services/DevService.java
+32 -2
View File
@@ -58,6 +58,7 @@ 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;
@@ -65,9 +66,11 @@ import engine.resources.service.INetworkRemoteEvent;
public class DevService implements INetworkDispatch {
private NGECore core;
private long frogBuildingId = 0;
public DevService(NGECore core) {
this.core = core;
loadFrogBuilding();
}
public void sendCharacterBuilderSUI(CreatureObject creature, int childMenu)
@@ -82,6 +85,8 @@ public class DevService implements INetworkDispatch {
suiOptions.put((long) 3, "Locations");
if (System.getProperty("user.name").equals("Charon"))
suiOptions.put((long) 4, "Treasure chest test");
if (creature.getClient().isGM())
suiOptions.put((long) 200, "Get new CBT");
break;
case 1: // Character
suiOptions.put((long) 10, "Set combat level to 90");
@@ -214,7 +219,7 @@ public class DevService implements INetworkDispatch {
//treasureContainer.add(droppedItem);
return;
// Character
case 10: // Set combat level to 90
if (player.getAttachment("hasLeveled") != null) {
@@ -1362,6 +1367,11 @@ public class DevService implements INetworkDispatch {
core.lootService.prepInv2(player);
return;
case 200:
TangibleObject frog = (TangibleObject) core.objectService.createObject("object/tangible/terminal/shared_terminal_character_builder.iff", planet);
inventory.add(frog);
return;
}
}
});
@@ -1369,6 +1379,26 @@ public class DevService implements INetworkDispatch {
core.suiService.openSUIWindow(window);
}
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<Integer, INetworkRemoteEvent> swgOpcodes, Map<Integer, INetworkRemoteEvent> objControllerOpcodes) {
}
src/services/SimulationService.java
+2 -2
View File
@@ -550,8 +550,8 @@ public class SimulationService implements INetworkDispatch {
object.getContainer()._remove(object);
if (object.getClient() == null)
System.err.println("Client is null! This is a very strange error.");
if (object.getClient() != null && object.getClient().isGM() && parent != null && parent instanceof CellObject && parent.getContainer() != null)
object.sendSystemMessage("BuildingId - Dec: " + parent.getContainer().getObjectID() + " Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
//if (object.getClient() != null && object.getClient().isGM() && parent != null && parent instanceof CellObject && parent.getContainer() != null)
//object.sendSystemMessage("BuildingId - Dec: " + parent.getContainer().getObjectID() + " Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
parent._add(object);
}
object.setPosition(newPos);
src/services/sui/SUIService.java
-12
View File
@@ -148,12 +148,6 @@ public class SUIService implements INetworkDispatch {
sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount());
return;
}
if(target.getTemplate().contains("object/tangible/wearables") && ((CreatureObject)owner).hasAbility("admin"))
{
core.scriptService.callScript("scripts/radial/", "item/recolorable", "createRadial", core, owner, target, request.getRadialOptions());
if(getRadialFilename(target).equals("default")) sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount());
}
core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "createRadial", core, owner, target, request.getRadialOptions());
if(getRadialFilename(target).equals("default"))
@@ -195,12 +189,6 @@ public class SUIService implements INetworkDispatch {
core.scriptService.callScript("scripts/radial/", "structure/moveable", "handleSelection", core, owner, target, objMenuSelect.getSelection());
return;
}
if(target.getTemplate().contains("object/tangible/wearables") && ((CreatureObject)owner).hasAbility("admin"))
{
core.scriptService.callScript("scripts/radial/", "item/recolorable", "handleSelection", core, owner, target, objMenuSelect.getSelection());
}
core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "handleSelection", core, owner, target, objMenuSelect.getSelection());