Merge master into msvc_warnings

Author: ShelbyZ

.gitattributes

@@ -11,6 +11,7 @@
 *.cpp text eol=lf
 *.h text eol=lf
 *.sql text eol=lf
+*.sh text eol=lf
 
 # Retaining CRLF line ends in the documentation dir (for now..)
 *.txt text eol=crlf

conf/login_darkstar.conf

@@ -60,7 +60,7 @@ servername: DarkStar
 
 #Central message server settings (ensure these are the same on both all map servers and the central (lobby) server
 msg_server_port: 54003
-msg_server_ip: 127.0.0.1
+msg_server_ip: 192.168.1.150
 
 #Logging of user IP address to database (true/false)
 log_user_ip: false

conf/map_darkstar.conf

@@ -185,4 +185,4 @@ healing_tick_delay: 10
 
 #Central message server settings (ensure these are the same on both all map servers and the central (lobby) server
 msg_server_port: 54003
-msg_server_ip: 127.0.0.1
+msg_server_ip: 192.168.1.150

scripts/globals/effects/doom.lua

@@ -20,23 +20,18 @@ end;
 -----------------------------------
 
 function onEffectTick(target,effect)
-    effect:setPower(effect:getPower()-1);
+    local remainingTicks = 1 + (effect:getTimeRemaining() / 1000) / 3
 
-    if (effect:getPower() == 0) then
-        -- sorry, you are the weakest link
-        target:setHP(0);
-    else
-        -- doom counter
-        target:messagePublic(112, target, effect:getPower(), effect:getPower());
-    end
+    -- doom counter
+    target:messagePublic(112, target, remainingTicks, remainingTicks);
 end;
 
 -----------------------------------
 -- onEffectLose Action
 -----------------------------------
 
 function onEffectLose(target,effect)
-    if (effect:getPower() == 0) then
+    if (effect:getTimeRemaining() == 0) then
         target:setHP(0);
     end
-end;
+end;

scripts/globals/mobskills/cyclonic_torrent.lua

@@ -7,11 +7,12 @@
 --  Range: 20' radial
 --  Notes: Only used by Urd, Verthandi, and Carabosse.
 ---------------------------------------------
+require("scripts/globals/monstertpmoves");
 require("scripts/globals/settings");
 require("scripts/globals/status");
-require("scripts/globals/monstertpmoves");
-
+require("scripts/globals/msg");
 ---------------------------------------------
+
 function onMobSkillCheck(target,mob,skill)
     return 0;
 end;

scripts/globals/mobskills/plenilune_embrace.lua

@@ -1,5 +1,17 @@
 ---------------------------------------------
 -- Plenilune_Embrace
 --
---
 ---------------------------------------------
+require("scripts/globals/monstertpmoves");
+require("scripts/globals/status");
+require("scripts/globals/msg");
+---------------------------------------------
+
+function onMobSkillCheck(target,mob,skill)
+    return 1;
+end;
+
+function onMobWeaponSkill(target, mob, skill)
+    -- Saw no math at any online source describing mob version, only player version..
+    -- Someone needs to go figure out what the retail math is.
+end;

scripts/globals/spells/cursna.lua

@@ -22,7 +22,7 @@ function onSpellCast(caster,target,spell)
     local curse2 = target:getStatusEffect(EFFECT_CURSE_II);
     local bane = target:getStatusEffect(EFFECT_BANE);
     local bonus = caster:getMod(MOD_ENHANCES_CURSNA) + target:getMod(MOD_ENHANCES_CURSNA_RCVD);
-    local power = 25*(bonus/100); -- This 25 is temp until the skill calculation is in.
+    local power = 25*((100+bonus)/100); -- This 25 is temp until the skill calculation is in.
 
     spell:setMsg(75);
     if (target:hasStatusEffect(EFFECT_DOOM) and power > math.random(1, 100)) then

sql/item_mods.sql

@@ -37675,7 +37675,7 @@ INSERT INTO `item_mods` VALUES (27340,27,5);
 INSERT INTO `item_mods` VALUES (27340,29,1);
 INSERT INTO `item_mods` VALUES (27340,31,43);
 INSERT INTO `item_mods` VALUES (27340,68,23);
-INSERT INTO `item_mods` VALUES (27340,162,-4);
+INSERT INTO `item_mods` VALUES (27340,163,-4); -- Magic Damage Taken -4%
 INSERT INTO `item_mods` VALUES (27340,384,30);
 INSERT INTO `item_mods` VALUES (27340,837,10);
 INSERT INTO `item_mods` VALUES (27341,1,89);
@@ -37690,7 +37690,7 @@ INSERT INTO `item_mods` VALUES (27341,27,6);
 INSERT INTO `item_mods` VALUES (27341,29,2);
 INSERT INTO `item_mods` VALUES (27341,31,64);
 INSERT INTO `item_mods` VALUES (27341,68,49);
-INSERT INTO `item_mods` VALUES (27341,162,-5);
+INSERT INTO `item_mods` VALUES (27341,163,-5); -- Magic Damage Taken -5%
 INSERT INTO `item_mods` VALUES (27341,384,30);
 INSERT INTO `item_mods` VALUES (27341,837,15);
 INSERT INTO `item_mods` VALUES (27342,1,64);
@@ -42398,7 +42398,7 @@ INSERT INTO `item_mods` VALUES (27949,14,12);
 INSERT INTO `item_mods` VALUES (27949,27,4);
 INSERT INTO `item_mods` VALUES (27949,31,18);
 INSERT INTO `item_mods` VALUES (27949,68,10);
-INSERT INTO `item_mods` VALUES (27949,162,-5);
+INSERT INTO `item_mods` VALUES (27949,163,-5); -- Magic Damage Taken -5%
 INSERT INTO `item_mods` VALUES (27949,384,30);
 INSERT INTO `item_mods` VALUES (27950,1,75);
 INSERT INTO `item_mods` VALUES (27950,2,29);
@@ -42722,7 +42722,7 @@ INSERT INTO `item_mods` VALUES (27970,14,19);
 INSERT INTO `item_mods` VALUES (27970,27,4);
 INSERT INTO `item_mods` VALUES (27970,31,26);
 INSERT INTO `item_mods` VALUES (27970,68,22);
-INSERT INTO `item_mods` VALUES (27970,162,-5);
+INSERT INTO `item_mods` VALUES (27970,163,-5);
 INSERT INTO `item_mods` VALUES (27970,384,40);
 INSERT INTO `item_mods` VALUES (27971,1,104);
 INSERT INTO `item_mods` VALUES (27971,2,44);