projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-01 02:16:15 -04:00
Code Issues Projects Releases Wiki Activity

Multi stat checks added

Browse Source 
Multi stat expertise checks included
This commit is contained in:
CharonInferar
2014-06-08 16:51:46 +02:00
parent 356f1f6bbd
commit eff288cc8b
2 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/LootService.java
+25
View File
@@ -2053,6 +2053,31 @@ public class LootService implements INetworkDispatch {
item24.setCustomName("Droid Motor (Red)");
playerInventory.add(item24);
String modifierBitTemplate = "object/tangible/component/reverse_engineering/shared_modifier_bit.iff";
TangibleObject modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet());
modifierBit.setCustomName("Droid Experimentation");
modifierBit.setStringAttribute("serial_number", "(WHATEVER)");
modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation");
modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4);
playerInventory.add(modifierBit);
modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet());
modifierBit.setCustomName("Droid Experimentation");
modifierBit.setStringAttribute("serial_number", "(WHATEVER)");
modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation");
modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4);
playerInventory.add(modifierBit);
modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet());
modifierBit.setCustomName("Droid Experimentation");
modifierBit.setStringAttribute("serial_number", "(WHATEVER)");
modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation");
modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4);
playerInventory.add(modifierBit);
// TangibleObject stacker1 = (TangibleObject)core.objectService.createObject("object/tangible/loot/misc/shared_damaged_datapad.iff", player.getPlanet());
// stacker1.setCustomName("Damaged Datapad stacker1");
// stacker1.setStackable(true);
src/services/reverseengineering/ReverseEngineeringService.java
+35 -15
View File
@@ -3103,6 +3103,10 @@ public class ReverseEngineeringService implements INetworkDispatch {
}
public void createPowerup(CreatureObject engineer, TangibleObject retool){
PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost");
String profession = player.getProfession();
if (profession.equals("trader_0b")) // Structures can't make PUPs
return;
final Vector<SWGObject> reToolContentList = new Vector<SWGObject>();
SWGObject engineerInventory = engineer.getSlottedObject("inventory");
retool.viewChildren(engineer, false, false, new Traverser() {
@@ -3160,14 +3164,12 @@ public class ReverseEngineeringService implements INetworkDispatch {
String powerUpDescription = "item_reverse_engineering_powerup_armor_02_01";
String powerUpTemplate = "object/tangible/powerup/base/shared_armor_base.iff";
PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost");
String profession = player.getProfession();
if (profession=="Domestic"){
if (profession.equals("trader_0a")){ // Domestic
powerUpLabel = "item_reverse_engineering_powerup_clothing_02_01";
powerUpDescription = "item_reverse_engineering_powerup_clothing_02_01";
powerUpTemplate = "object/tangible/powerup/base/shared_base.iff";
}
if (profession=="Engineer"){
if (profession.equals("trader_0d")){ // Engineer
powerUpLabel = "item_reverse_engineering_powerup_weapon_02_01";
powerUpDescription = "item_reverse_engineering_powerup_weapon_02_01";
powerUpTemplate = "object/tangible/powerup/base/shared_weapon_base.iff";
@@ -3191,6 +3193,11 @@ public class ReverseEngineeringService implements INetworkDispatch {
@SuppressWarnings("unchecked")
public void createSEA(CreatureObject engineer, TangibleObject retool){
PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost");
String profession = player.getProfession();
if (profession.equals("trader_0b")) // Structures can't make SEAs
return;
final Vector<SWGObject> reToolContentList = new Vector<SWGObject>();
SWGObject engineerInventory = engineer.getSlottedObject("inventory");
retool.viewChildren(engineer, false, false, new Traverser() {
@@ -3240,14 +3247,13 @@ public class ReverseEngineeringService implements INetworkDispatch {
String SEADescription = "socket_gem";
String SEATemplate = "object/tangible/gem/shared_clothing.iff";
PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost");
String profession = player.getProfession();
if (profession=="Domestic"){
if (profession.equals("trader_0a")){
SEALabel = "socket_gem_clothing";
SEADescription = "socket_gem";
SEATemplate = "object/tangible/gem/shared_clothing.iff";
}
if (profession=="Engineer"){
if (profession.equals("trader_0d")){
SEALabel = "socket_gem_weapon";
SEADescription = "socket_gem";
SEATemplate = "object/tangible/gem/shared_clothing.iff";
@@ -3286,6 +3292,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
int powerBitOrder = 1;
Vector<String> effectNameList = new Vector<String>();
Vector<Integer> effectValueList = new Vector<Integer>();
String SEASTFName = "";
//verify RE tool content requirement
List<String> contentVerification = new ArrayList<String>();
@@ -3306,6 +3313,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
if (bit1.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){
effectNameList = (Vector<String>) bit1.getAttachment("SEAeffectNameList");
effectValueList = (Vector<Integer>) bit1.getAttachment("SEAmodifierValueList");
SEASTFName = bit1.getStfName();
if (effectNameList.size()==3)
return;
contentVerification.remove("sea");
@@ -3324,6 +3332,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
if (bit2.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){
effectNameList = (Vector<String>) bit2.getAttachment("SEAeffectNameList");
effectValueList = (Vector<Integer>) bit2.getAttachment("SEAmodifierValueList");
SEASTFName = bit2.getStfName();
if (effectNameList.size()==3)
return;
contentVerification.remove("sea");
@@ -3342,6 +3351,7 @@ public class ReverseEngineeringService implements INetworkDispatch {
if (bit3.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){
effectNameList = (Vector<String>) bit3.getAttachment("SEAeffectNameList");
effectValueList = (Vector<Integer>) bit3.getAttachment("SEAmodifierValueList");
SEASTFName = bit3.getStfName();
if (effectNameList.size()==3)
return;
contentVerification.remove("sea");
@@ -3356,14 +3366,21 @@ public class ReverseEngineeringService implements INetworkDispatch {
String SEADescription = "socket_gem";
String SEATemplate = "object/tangible/gem/shared_clothing.iff";
PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost");
String profession = player.getProfession();
if (profession=="Domestic"){
if (profession.equals("trader_0c")){ // QA
if (! SEASTFName.equals("socket_gem_armor"))
return; // Wrong SEA type inserted
}
if (profession.equals("trader_0a")){
if (! SEASTFName.equals("socket_gem_clothing"))
return; // Wrong SEA type inserted
SEALabel = "socket_gem_clothing";
SEADescription = "socket_gem";
SEATemplate = "object/tangible/gem/shared_clothing.iff";
}
if (profession=="Engineer"){
if (profession.equals("trader_0d")){
if (! SEASTFName.equals("socket_gem_weapon"))
return; // Wrong SEA type inserted
SEALabel = "socket_gem_weapon";
SEADescription = "socket_gem";
SEATemplate = "object/tangible/gem/shared_clothing.iff";
@@ -3373,7 +3390,10 @@ public class ReverseEngineeringService implements INetworkDispatch {
core.objectService.destroyObject(bit2.getObjectID());
core.objectService.destroyObject(bit3.getObjectID());
if (powerBitOrder>effectNameList.size()){ // Only add a stat if the power bit is higher
int attachmentUpgrade = engineer.getSkillModBase("expertise_attachment_upgrade");
System.out.println("attachmentUpgrade " + attachmentUpgrade);
System.out.println("player.getProfession() " + player.getProfession());
if (powerBitOrder>effectNameList.size() && attachmentUpgrade>=1){ // Only add a stat if the power bit is higher
effectNameList.add(effectName);
effectValueList.add(modifierValue);
}
@@ -3389,8 +3409,8 @@ public class ReverseEngineeringService implements INetworkDispatch {
skillEnhancingAttachment.setIntAttribute(effectNameList.get(i), effectValueList.get(i));
}
skillEnhancingAttachment.setAttachment("SEAeffectNameArray", effectNameList);
skillEnhancingAttachment.setAttachment("SEAmodifierValueArray", effectValueList);
skillEnhancingAttachment.setAttachment("SEAeffectNameList", effectNameList);
skillEnhancingAttachment.setAttachment("SEAmodifierValueList", effectValueList);
engineerInventory.add(skillEnhancingAttachment);
}