projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-01-17 00:05:17 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1275 from Mesagoppinmypants/master

Browse Source 
Read Description
This commit is contained in:
Skorpios0
2014-11-09 03:19:01 +00:00
parent 3666877027 bd33445757
commit 2ad1646cb2
9 changed files with 120 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
scripts/character_builder_terminal.py
View File

@@ -595,6 +595,7 @@ def compositeArmor(owner, inventory):
comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
comp_boots = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_boots.iff", owner.getPlanet())
comp_gloves = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_gloves.iff", owner.getPlanet())
inventory.add(comp_bicep_r);
inventory.add(comp_bicep_l);
inventory.add(comp_bracer_r);
@@ -610,60 +611,11 @@ def compositeArmor(owner, inventory):
def clonetrooperArmor(owner, inventory):
clonetrooper_bicep_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_r.iff", owner.getPlanet())
clonetrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_bicep_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bicep_l.iff", owner.getPlanet())
clonetrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_bracer_r = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_r.iff", owner.getPlanet())
clonetrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_bracer_l = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_bracer_l.iff", owner.getPlanet())
clonetrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_leggings = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.iff", owner.getPlanet())
clonetrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_helmet = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_helmet.iff", owner.getPlanet())
clonetrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_chest = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.iff", owner.getPlanet())
clonetrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
clonetrooper_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
clonetrooper_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
clonetrooper_boots = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_boots.iff", owner.getPlanet())
clonetrooper_gloves = core.objectService.createObject("object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_gloves.iff", owner.getPlanet())

80
scripts/mobiles/dathomir/undead_deathtrooper.py Normal file
View File

@@ -0,0 +1,80 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from resources.datatables import WeaponType
from resources.datatables import Difficulty
from resources.datatables import Options
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('eow_outbreak_undead_deathtrooper') ##TODO: Needs correct stf name
mobileTemplate.setLevel(5)
mobileTemplate.setDifficulty(Difficulty.NORMAL)
mobileTemplate.setMinSpawnDistance(5)
mobileTemplate.setMaxSpawnDistance(10)
mobileTemplate.setDeathblow(True)
mobileTemplate.setSocialGroup('undead')
mobileTemplate.setAssistRange(15)
mobileTemplate.setRespawnTime(300)
mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_01_f.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_01_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_02_f.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_03_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_04_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_05_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_06_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_07_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_08_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_09_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_10_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_11_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_12_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_13_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_14_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_15_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_16_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_17_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_18_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_19_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_20_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_21_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_22_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_23_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_24_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_25_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_26_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_27_m.iff')
templates.add('object/mobile/shared_outbreak_undead_deathtrooper_28_m.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_e11.iff', WeaponType.RIFLE, 0.8, 0, 'energy')
weaponTemplates.add(weapontemplate)
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.ONEHANDEDMELEE, 1.0, 4, 'kinetic')
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('RangedShot')
mobileTemplate.setDefaultAttack('MeleeHit')
mobileTemplate.setAttacks(attacks)
lootPoolNames_1 = ['Junk']
lootPoolChances_1 = [100]
lootGroupChance_1 = 65
mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1)
lootPoolNames_4 = ['random_stat_jewelry']
lootPoolChances_4 = [100]
lootGroupChance_4 = 8
mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4)
core.spawnService.addMobileTemplate('undead_deathtrooper', mobileTemplate)
return

16
scripts/mobiles/dynamicgroups/dathomir_quarantine_1.py Normal file
View File

@@ -0,0 +1,16 @@
import sys
from java.util import Vector
from services.spawn import DynamicSpawnGroup
from services.spawn import MobileTemplate
def addDynamicGroup(core):
dynamicGroup = DynamicSpawnGroup()
mobileTemplates = Vector()
mobileTemplates.add('undead_deathtrooper')
dynamicGroup.setMobiles(mobileTemplates)
dynamicGroup.setGroupMembersNumber(5)
dynamicGroup.setName('dathomir_deathtroopers_1')
dynamicGroup.setMaxSpawns(-1)
dynamicGroup.setMinSpawnDistance(10)
core.spawnService.addDynamicGroup('dathomir_level_5_deathtroopers', dynamicGroup)
return

12
scripts/mobiles/spawnareas/dathomir_quarantine.py Normal file
View File

@@ -0,0 +1,12 @@
import sys
from java.util import Vector
def addSpawnArea(core):
dynamicGroups = Vector()
dynamicGroups.add('dathomir_level_5_deathtroopers')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6500, 100, 'dathomir')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5640, -6550, 100, 'dathomir')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5850, -6400, 100, 'dathomir')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5800, -6500, 100, 'dathomir')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5600, -6525, 100, 'dathomir')
return

9
scripts/mobiles/spawnareas/dathomir_quarantine_entrance.py
View File

@@ -1,9 +0,0 @@
# Spawn Area file created with PSWG Planetary Spawn Tool
import sys
from java.util import Vector
def addSpawnArea(core):
dynamicGroups = Vector()
dynamicGroups.add('dark_jedi_wild_1')
core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6478, 100, 'dathomir')
return

7
scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py
View File

@@ -1,4 +1,9 @@
import sys
def setup(core, object):
return
object.setStringAttribute('condition', '100/100')
object.setStringAttribute('@obj_attr_n:color', 'Blackwing Bezoar')
object.setAttachment('radial_filename', 'item/tunable')
object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
return

1
scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py
View File

@@ -2,6 +2,7 @@ import sys
def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setIntAttribute('reuse_time', 5)
object.setAttachment('radial_filename', 'object/usable')
object.setStfFilename('static_item_n')
object.setStfName('invasion_gcw_binoculars_01_01')

0
scripts/static_spawns/dathomir/placeholder.txt
View File

7
src/services/object/ObjectService.java
View File

@@ -1288,7 +1288,8 @@ public class ObjectService implements INetworkDispatch {
if(! checkIfObjectAlreadyInList(object.getObjectID()))
objectList.put(object.getObjectID(), object);
} else {
Thread.currentThread().dumpStack();
Thread.currentThread();
Thread.dumpStack();
}
});
@@ -1731,12 +1732,12 @@ public class ObjectService implements INetworkDispatch {
}
private void addCellsToBuildings(){
Iterator it = null;
Iterator<?> it = null;
synchronized(buildingMap){
it = buildingMap.entrySet().iterator();
}
while (it.hasNext()) {
Map.Entry pairs = (Map.Entry)it.next();
Map.Entry<?, ?> pairs = (Map.Entry<?, ?>)it.next();
long buildingId = (long) pairs.getKey();
BuildingObject building = (BuildingObject)pairs.getValue();
//System.out.println("We have buildingId " +buildingId);