projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into DantooineSpawns

Browse Source
This commit is contained in:
CharonInferar
2014-05-19 15:57:26 +02:00
parent 16f82b50a6 7a94d4438b
commit ac1128b00d
60 changed files with 1654 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/dismissgroupmember.py
+10
View File
@@ -0,0 +1,10 @@
import sys
def setup():
return
def run(core, actor, target, commandString):
if actor and target:
core.groupService.handleGroupKick(actor, target)
return
scripts/commands/pvp.py
+7
View File
@@ -14,6 +14,9 @@ def run(core, actor, target, commandString):
if actor.getPvpStatus(PvpStatus.GoingOvert) or actor.getPvpStatus(PvpStatus.GoingCovert):
actor.sendSystemMessage('@faction_recruiter:pvp_status_changing', 0)
return
if core.gcwService.isInPvpZone(actor):
actor.sendSystemMessage('@gcw:pvp_advanced_region_cannot_go_covert', 0)
return
if commandString != '' and commandString != faction:
if commandString == 'rebel' or commandString == 'imperial' or commandString == 'neutral':
@@ -60,6 +63,8 @@ def run(core, actor, target, commandString):
actor.sendSystemMessage('@faction_recruiter:covert_to_overt', 0)
actor.setPvpStatus(PvpStatus.GoingOvert, True)
time.sleep(30)
if core.gcwService.isInPvpZone(actor):
return
actor.setFactionStatus(FactionStatus.SpecialForces)
actor.setPvpStatus(PvpStatus.GoingOvert, False)
actor.sendSystemMessage('@faction_recruiter:overt_complete', 0)
@@ -70,6 +75,8 @@ def run(core, actor, target, commandString):
actor.sendSystemMessage('@faction_recruiter:overt_to_covert', 0)
actor.setPvpStatus(PvpStatus.GoingCovert, True)
time.sleep(300)
if core.gcwService.isInPvpZone(actor):
return
actor.setFactionStatus(FactionStatus.Combatant)
actor.setPvpStatus(PvpStatus.GoingCovert, False)
actor.sendSystemMessage('@faction_recruiter:covert_complete', 0)
scripts/commands/transferitemmisc.py
+2 -2
View File
@@ -28,7 +28,7 @@ def run(core, actor, target, commandString):
if target.isLootItem():
target.setLootItem(0)
actor.sendSystemMessage('You looted ' + target.getStf().getStfValue() + ' from corpse.', 0)
actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0)
if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
target.getContainer().transferTo(actor, container, target)
@@ -95,4 +95,4 @@ def run(core, actor, target, commandString):
#core.scriptService.callScript(path, 'unequip', module, core, actor, target)
core.equipmentService.unequip(actor, target)
return
return
scripts/mobiles/dantooine/dark_jedi_master.py
+26
View File
@@ -42,6 +42,32 @@ def addTemplate(core):
attacks = Vector()
mobileTemplate.setDefaultAttack('saberHit')
mobileTemplate.setAttacks(attacks)
lootPoolNames_1 = ['Junk']
lootPoolChances_1 = [100]
lootGroupChance_1 = 65
mobileTemplate.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1)
lootPoolNames_2 = ['jedi_relic_1']
lootPoolChances_2 = [100]
lootGroupChance_2 = 85
mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
lootPoolNames_3 = ['powercrystals_hiq']
lootPoolChances_3 = [100]
lootGroupChance_3 = 12
mobileTemplate.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
lootPoolNames_4 = ['random_stat_jewelry']
lootPoolChances_4 = [100]
lootGroupChance_4 = 8
mobileTemplate.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4)
lootPoolNames_5 = ['sithholocrons']
lootPoolChances_5 = [100]
lootGroupChance_5 = 3
mobileTemplate.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5)
core.spawnService.addMobileTemplate('dark_jedi_master', mobileTemplate)
scripts/mobiles/tatooine/bocatt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bocatt")
mobileTemplate.setAssistRange(12)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bocatt.iff')
scripts/mobiles/tatooine/bull_ronto.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("ronto")
mobileTemplate.setAssistRange(0)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_ronto.iff')
scripts/mobiles/tatooine/cannibal_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback cannibal")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dewback.iff')
scripts/mobiles/tatooine/canyon_krayt_dragon.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(36)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/death_kreetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("uber kreetle")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_kreetle.iff')
scripts/mobiles/tatooine/desert_squill.py
+2 -1
View File
@@ -26,7 +26,8 @@ def addTemplate(core):
mobileTemplate.setHideAmount(3)
mobileTemplate.setSocialGroup("squill")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_squill.iff')
scripts/mobiles/tatooine/diseased_bocatt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bocatt")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bocatt.iff')
scripts/mobiles/tatooine/dragonet.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dragonet")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dune_lizard.iff')
scripts/mobiles/tatooine/dune_lizard.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dune lizard")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dune_lizard.iff')
scripts/mobiles/tatooine/feral_bantha.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("bantha")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_bantha_hue.iff')
scripts/mobiles/tatooine/giant_canyon_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(34)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/giant_sand_beetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("giant sand beetle")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_giant_sand_beetle.iff')
scripts/mobiles/tatooine/giant_worrt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("worrt")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_giant_worrt.iff')
scripts/mobiles/tatooine/gorg.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("gorg")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_gorg.iff')
scripts/mobiles/tatooine/grand_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_canyon_krayt_dragon.iff')
scripts/mobiles/tatooine/greater_desert_womprat.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_greater_desert_womp_rat.iff')
scripts/mobiles/tatooine/grizzled_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_dewback.iff')
scripts/mobiles/tatooine/juvenile_canyon_krayt_dragon.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/krayt_dragon.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(24)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/krayt_dragon_ancient.py
+1 -2
View File
@@ -27,8 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("krayt dragon")
mobileTemplate.setAssistRange(36)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
scripts/mobiles/tatooine/mountain_squill.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("squill")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_mountain_squill.iff')
scripts/mobiles/tatooine/mountain_worrt.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("mountain worrt")
mobileTemplate.setAssistRange(0)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
scripts/mobiles/tatooine/mutant_womprat.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_womp_rat.iff')
scripts/mobiles/tatooine/overkreetle.py
+1
View File
@@ -25,6 +25,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("uber kreetle")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_kreetle.iff')
scripts/mobiles/tatooine/scyk.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("scyk")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_scyk.iff')
scripts/mobiles/tatooine/swarming_lesser_dewback.py
+1
View File
@@ -27,6 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("dewback")
mobileTemplate.setAssistRange(10)
mobileTemplate.setStalker(True)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_swarming_lesser_dewback.iff')
scripts/mobiles/tatooine/variegated_womprat.py
+1 -1
View File
@@ -27,7 +27,7 @@ def addTemplate(core):
mobileTemplate.setSocialGroup("variegated womprat")
mobileTemplate.setAssistRange(6)
mobileTemplate.setStalker(False)
mobileTemplate.setOptionsBitmask(192)
templates = Vector()
templates.add('object/mobile/shared_variegated_womp_rat.iff')
scripts/pvpzones.py
+9
View File
@@ -0,0 +1,9 @@
import sys
def addZones(core):
gcwService = core.gcwService
gcwService.addPvPZone('rori', 5318, 5680, 400)
scripts/skillMods/expertise_stance_saber_block.py
+2
View File
@@ -1,8 +1,10 @@
import sys
def add(core, actor, skillMod, value):
core.skillModService.addSkillMod(actor, 'display_only_parry', skillMod.getBase() * 100)
return
def deduct(core, actor, skillMod, value):
core.skillModService.deductSkillMod(actor, 'display_only_parry', skillMod.getBase() * 100)
return