Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CharonInferar
2014-05-05 00:50:10 +02:00
3 changed files with 8 additions and 4 deletions
+2 -2
View File
@@ -6,12 +6,12 @@ def setup(core, actor, buff):
def add(core, actor, buff):
core.skillModService.addSkillMod(actor, 'expertise_damage_all', 10)
core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_ranged', 40)
core.skillModService.addSkillMod(actor, 'invis', 1)
actor.setRadarVisible(False)
return
def remove(core, actor, buff):
core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 10)
core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_ranged', 40)
core.skillModService.deductSkillMod(actor, 'invis', 1)
actor.setRadarVisible(True)
return
+5 -1
View File
@@ -4,8 +4,12 @@ def setup(core, actor, buff):
return
def add(core, actor, buff):
actor.setInStealth(True)
actor.setRadarVisible(False)
return
def remove(core, actor, buff):
actor.setInStealth(False)
actor.setRadarVisible(True)
return
+1 -1
View File
@@ -257,7 +257,7 @@ public class DevService implements INetworkDispatch {
rifle1.setMaxDamage(1250);
rifle1.setWeaponType(WeaponType.RIFLE);
inventory.add(rifle1);
// inventory.add(rifle1);
WeaponObject carbine1 = (WeaponObject) core.objectService.createObject("object/weapon/ranged/carbine/shared_carbine_cdef.iff", planet);
carbine1.setIntAttribute("required_combat_level", 90);