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

This commit is contained in:
CharonInferar
2014-08-17 13:30:28 +02:00
38 changed files with 1868 additions and 2944 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
@@ -10,7 +10,7 @@ from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('kunga_tribe_member')
mobileTemplate.setCreatureName('kunga_tribesman')
mobileTemplate.setLevel(71)
mobileTemplate.setDifficulty(Difficulty.NORMAL)
@@ -47,5 +47,5 @@ def addTemplate(core):
lootGroupChance_2 = 35
mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
core.spawnService.addMobileTemplate('kunga_tribe_member', mobileTemplate)
core.spawnService.addMobileTemplate('kunga_tribesman', mobileTemplate)
@@ -17,7 +17,7 @@ def addDynamicGroup(core):
mobileTemplates.add('kunga_scout')
mobileTemplates.add('kunga_shaman')
mobileTemplates.add('kunga_soothsayer')
mobileTemplates.add('kunga_tribe_member')
mobileTemplates.add('kunga_tribesman')
mobileTemplates.add('kunga_warrior')
dynamicGroup.setMobiles(mobileTemplates)
dynamicGroup.setGroupMembersNumber(-3)
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(128)
templates = Vector()
templates.add('object/mobile/shared_chuba.iff')
templates.add('object/mobile/shared_chuba_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
+1 -1
View File
@@ -24,7 +24,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()
+1 -1
View File
@@ -30,7 +30,7 @@ def addTemplate(core):
mobileTemplate.setOptionsBitmask(Options.ATTACKABLE)
templates = Vector()
templates.add('object/mobile/shared_worrt.iff')
templates.add('object/mobile/shared_worrt_hue.iff')
mobileTemplate.setTemplates(templates)
weaponTemplates = Vector()