Instructions Jenkins Doxygen

[Fixed] resists on all types of turrets 68/768/1
authorIvojedi <ivojedi@swgemu.com>
Sat, 7 Sep 2013 22:37:46 +0000 (15:37 -0700)
committerIvojedi <ivojedi@swgemu.com>
Sat, 7 Sep 2013 22:40:08 +0000 (15:40 -0700)
Change-Id: I3b618260fb718b72aa482dbd56fbcdb72b757ff3

MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/block_lg.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/block_med.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/block_sm.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/dish_lg.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/dish_sm.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/tower_lg.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/tower_med.lua
MMOCoreORB/bin/scripts/object/installation/faction_perk/turret/tower_sm.lua
MMOCoreORB/bin/scripts/object/installation/turret/turret_block_med.lua

index 93ae2b9..29d24b0 100644 (file)
@@ -54,14 +54,14 @@ object_installation_faction_perk_turret_block_lg = object_installation_faction_p
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 80,
+       energy = 95,
+       electricity = 80,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 80,
+       cold = 80,
+       acid = 80,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",
index 3e6d24e..9e6b44e 100644 (file)
@@ -45,7 +45,7 @@ object_installation_faction_perk_turret_block_med = object_installation_faction_
        lotSize = 1,
        pvpStatusBitmask = ATTACKABLE,
        optionsBitmask = 0,
-       maxCondition = 300000,
+       maxCondition = 200000,
        zoneComponent = "TurretZoneComponent",
        dataObjectComponent = "TurretDataComponent",
                -- Damagetypes in WeaponObject
@@ -54,14 +54,14 @@ object_installation_faction_perk_turret_block_med = object_installation_faction_
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 80,
+       energy = 95,
+       electricity = 80,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 80,
+       cold = 80,
+       acid = 80,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",
index 5bdeba1..487f198 100644 (file)
@@ -53,14 +53,14 @@ object_installation_faction_perk_turret_block_sm = object_installation_faction_p
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 80,
+       energy = 95,
+       electricity = 80,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 80,
+       cold = 80,
+       acid = 80,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",
index c9683d0..1dd7f18 100644 (file)
@@ -53,14 +53,14 @@ object_installation_faction_perk_turret_dish_lg = object_installation_faction_pe
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 75,
+       energy = 95,
+       electricity = 75,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 75,
+       cold = 75,
+       acid = 75,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",
index cee6687..e02aeb8 100644 (file)
@@ -55,14 +55,14 @@ object_installation_faction_perk_turret_dish_sm = object_installation_faction_pe
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 75,
+       energy = 95,
+       electricity = 75,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 75,
+       cold = 75,
+       acid = 75,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",
index 5dedf47..8abc079 100644 (file)
@@ -55,10 +55,10 @@ object_installation_faction_perk_turret_tower_lg = object_installation_faction_p
        rating = HEAVY,
 
        kinetic = 90,
-       energy = 90,
+       energy = 95,
        electricity = 90,
        stun = 100,
-       blast = 0,
+       blast = -1,
        heat = 90,
        cold = 90,
        acid = 90,
index f166c2e..cd56269 100644 (file)
@@ -55,10 +55,10 @@ object_installation_faction_perk_turret_tower_med = object_installation_faction_
        rating = HEAVY,
 
        kinetic = 90,
-       energy = 90,
+       energy = 95,
        electricity = 90,
        stun = 100,
-       blast = 0,
+       blast = -1,
        heat = 90,
        cold = 90,
        acid = 90,
index 3142db7..bcb4d13 100644 (file)
@@ -55,10 +55,10 @@ object_installation_faction_perk_turret_tower_sm = object_installation_faction_p
        rating = HEAVY,
 
        kinetic = 90,
-       energy = 90,
+       energy = 95,
        electricity = 90,
        stun = 100,
-       blast = 0,
+       blast = -1,
        heat = 90,
        cold = 90,
        acid = 90,
index 3ff87ee..d1108ff 100644 (file)
@@ -44,7 +44,7 @@
 object_installation_turret_turret_block_med = object_installation_turret_shared_turret_block_med:new {
        pvpStatusBitmask = ATTACKABLE,
        optionsBitmask = 0,
-       maxCondition = 300000,
+       maxCondition = 200000,
        zoneComponent = "TurretZoneComponent",
        dataObjectComponent = "TurretDataComponent",
                -- Damagetypes in WeaponObject
@@ -53,14 +53,14 @@ object_installation_turret_turret_block_med = object_installation_turret_shared_
        -- LIGHT, MEDIUM, HEAVY
        rating = HEAVY,
 
-       kinetic = 90,
-       energy = 90,
-       electricity = 90,
+       kinetic = 80,
+       energy = 95,
+       electricity = 80,
        stun = 100,
-       blast = 0,
-       heat = 90,
-       cold = 90,
-       acid = 90,
+       blast = -1,
+       heat = 80,
+       cold = 80,
+       acid = 80,
        lightSaber =100,
        chanceHit = 400,
        weapon = "object/weapon/ranged/turret/turret_block_large.iff",