Instructions Jenkins Doxygen

[Fixed] the previously incorrect combatSpam references to both 95/4595/14
authorNee Shadowfire <nee@swgemu.com>
Fri, 17 Feb 2017 09:41:48 +0000 (09:41 +0000)
committerNee Shadowfire <nee@swgemu.com>
Fri, 17 Feb 2017 09:58:34 +0000 (09:58 +0000)
'mindshot1' & 'mindshot2', as well as their DOT duration (Mantis
#7212)

Change-Id: I22a1a8b4cbb0153e407688a189bfb315c6a6164f

MMOCoreORB/bin/scripts/commands/mindShot1.lua
MMOCoreORB/bin/scripts/commands/mindShot2.lua

index c2db58f..1685f24 100755 (executable)
@@ -53,28 +53,27 @@ MindShot1Command = {
 
        poolsToDamage = MIND_ATTRIBUTE,
 
-       animation = "fire_1_special_single", \r
+       animation = "fire_1_special_single",
        animType = GENERATE_RANGED,
 
-       combatSpam = "head",
-           
+       combatSpam = "distractshot",
+
        dotEffects = {
-         DotEffect( 
-               BLEEDING, 
+         DotEffect(
+               BLEEDING,
                { "resistance_bleeding", "bleed_resist" },
                MIND,
                true,
                0,
                100,
-               60, 
-               60
+               60,
+               120
          )
        },
-       
+
        weaponType = RIFLEWEAPON,
 
        range = -1
 }
 
 AddCommand(MindShot1Command)
-
index 9e52e41..0917f09 100755 (executable)
@@ -53,28 +53,27 @@ MindShot2Command = {
 
        poolsToDamage = MIND_ATTRIBUTE,
 
-       animation = "fire_1_special_single", \r
+       animation = "fire_1_special_single",
        animType = GENERATE_RANGED,
 
-       combatSpam = "headshot",
+       combatSpam = "mindbender",
 
        dotEffects = {
-         DotEffect( 
-               BLEEDING, 
+         DotEffect(
+               BLEEDING,
                { "resistance_bleeding", "bleed_resist" },
                MIND,
                true,
                0,
                100,
-               60, 
-               60
+               60,
+               180
          )
        },
-       
+
        weaponType = RIFLEWEAPON,
 
        range = -1
 }
 
 AddCommand(MindShot2Command)
-