Merge branch 'release' into canary

project-topaz · Jun 18, 2020 · c230a57 · c230a57
2 parents d2f916e + af9fc92
commit c230a57
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/scripts/globals/ability.lua b/scripts/globals/ability.lua
@@ -467,10 +467,9 @@ function corsairSetup(caster, ability, action, effect, job)
     caster:setLocalVar("corsairRollTotal", roll)
     action:speceffect(caster:getID(), roll)
     if (checkForElevenRoll(caster)) then
-        action:recast(action:recast()/2)
+        action:recast(action:recast()/2) -- halves phantom roll recast timer for all rolls while under the effects of an 11 (upon first hitting 11, phantom roll cooldown is reset in double-up.lua)
     end
     checkForJobBonus(caster, job)
-    caster:addRecast(tpz.recast.ABILITY, 194, 8)
 end
 
 function atMaxCorsairBusts(caster)

diff --git a/sql/abilities.sql b/sql/abilities.sql
@@ -144,7 +144,7 @@ INSERT INTO `abilities` VALUES (103,'casters_roll',17,79,1,60,193,420,0,119,2000
 INSERT INTO `abilities` VALUES (104,'coursers_roll',17,81,1,60,193,420,0,120,2000,0,6,8.0,1,1,80,0,8,'ABYSSEA');
 INSERT INTO `abilities` VALUES (105,'blitzers_roll',17,83,1,60,193,420,0,121,2000,0,6,8.0,1,1,80,0,8,'ABYSSEA');
 INSERT INTO `abilities` VALUES (106,'tacticians_roll',17,86,1,60,193,420,0,122,2000,0,6,8.0,1,1,80,0,8,'ABYSSEA');
-INSERT INTO `abilities` VALUES (107,'double-up',17,5,1,8,194,424,0,116,2000,0,6,8.0,1,1,80,0,0,'TOAU');
+INSERT INTO `abilities` VALUES (107,'double-up',17,5,1,5,194,424,0,116,2000,0,6,8.0,1,1,80,0,0,'TOAU');
 INSERT INTO `abilities` VALUES (108,'quick_draw',17,40,1,1,0,0,0,0,2000,0,6,18.0,0,0,0,1410,0,'TOAU');
 INSERT INTO `abilities` VALUES (109,'fire_shot',17,40,4,1,195,110,0,125,2000,0,6,18.0,0,0,0,1410,0,'TOAU');
 INSERT INTO `abilities` VALUES (110,'ice_shot',17,40,4,1,195,110,0,126,2000,0,6,18.0,0,0,0,1410,0,'TOAU');

diff --git a/sql/merits.sql b/sql/merits.sql
@@ -198,7 +198,7 @@ INSERT INTO `merits` VALUES (1734,'blaze_of_glory_recast',5,20,1048576,6,26);
 INSERT INTO `merits` VALUES (1736,'dematerialize_recast',5,20,1048576,6,26);
 INSERT INTO `merits` VALUES (2048,'warriors_charge',5,5,1,7,31);
 INSERT INTO `merits` VALUES (2050,'tomahawk',5,15,1,7,31);
-INSERT INTO `merits` VALUES (2052,'savagery',5,10,1,7,31);
+INSERT INTO `merits` VALUES (2052,'savagery',5,100,1,7,31);
 INSERT INTO `merits` VALUES (2054,'aggressive_aim',5,4,1,7,31);
 INSERT INTO `merits` VALUES (2112,'mantra',5,4,2,7,32);
 INSERT INTO `merits` VALUES (2114,'formless_strikes',5,5,2,7,32);
@@ -288,7 +288,7 @@ INSERT INTO `merits` VALUES (2952,'thunderstorm',5,40,16384,7,45);
 INSERT INTO `merits` VALUES (2954,'grandfall',5,40,16384,7,45);
 INSERT INTO `merits` VALUES (3008,'convergence',5,5,32768,7,46);
 INSERT INTO `merits` VALUES (3010,'diffusion',5,5,32768,7,46);
-INSERT INTO `merits` VALUES (3012,'enchainment',5,10,32768,7,46);
+INSERT INTO `merits` VALUES (3012,'enchainment',5,100,32768,7,46);
 INSERT INTO `merits` VALUES (3014,'assimilation',5,1,32768,7,46);
 INSERT INTO `merits` VALUES (3072,'snake_eye',5,5,65536,7,47);
 INSERT INTO `merits` VALUES (3074,'fold',5,10,65536,7,47);

diff --git a/sql/mob_droplist.sql b/sql/mob_droplist.sql
@@ -10670,8 +10670,8 @@ INSERT INTO `mob_droplist` VALUES (2007,0,0,1000,1724,90);
 INSERT INTO `mob_droplist` VALUES (2007,0,0,1000,2335,90);
 INSERT INTO `mob_droplist` VALUES (2007,0,0,1000,3102,100);
 INSERT INTO `mob_droplist` VALUES (2008,2,0,1000,656,0);
-INSERT INTO `mob_droplist` VALUES (2008,0,0,1000,12923,900);
-INSERT INTO `mob_droplist` VALUES (2008,0,0,1000,13728,90);
+INSERT INTO `mob_droplist` VALUES (2008,1,1,1000,12923,909);
+INSERT INTO `mob_droplist` VALUES (2008,1,1,1000,13728,91);
 INSERT INTO `mob_droplist` VALUES (2009,0,0,1000,4373,80);
 INSERT INTO `mob_droplist` VALUES (2009,2,0,1000,4374,0);
 INSERT INTO `mob_droplist` VALUES (2009,0,0,1000,4374,220);

diff --git a/sql/npc_list.sql b/sql/npc_list.sql
@@ -18077,7 +18077,7 @@ INSERT INTO `npc_list` VALUES (17399858,'Stone_Lid','Stone Lid',156,-316.439,24.
 INSERT INTO `npc_list` VALUES (17404351,'NPC[1bc]','Hidhaegg',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1);
 INSERT INTO `npc_list` VALUES (17404352,'NPC[1bd]','Hidhaegg',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1);
 -- NC: INSERT INTO `npc_list` VALUES (17404353,'NOT_CAPTURED','Hidhaegg',0,0.000,0.000,0.000,0,50,50,0,0,0,0,0,0x0000320000000000000000000000000000000000,0,NULL,0);
-INSERT INTO `npc_list` VALUES (17404356,'qm1','???',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1);
+INSERT INTO `npc_list` VALUES (17404356,'qm1','???',0,-11.077,-19.331,-176.733,1,50,50,0,0,0,0,3,0x0000320000000000000000000000000000000000,0,NULL,1);
 INSERT INTO `npc_list` VALUES (17404357,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,7,40,40,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17404358,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,7,40,40,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
 INSERT INTO `npc_list` VALUES (17404359,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,7,40,40,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
@@ -533,12 +533,14 @@ int access_ipmask(const char* str, AccessControl* acc)
 				mask = (mask >> 1) | 0x80000000;
 				--m[0];
 			}
-			mask = ntohl(mask);
 		} else
 		{// just this ip
 			mask = 0xFFFFFFFF;
 		}
 	}
+
+    ip = ntohl(ip);
+
 	if( access_debug ){
 		ShowInfo("access_ipmask: Loaded IP:%d.%d.%d.%d mask:%d.%d.%d.%d\n", CONVIP(ip), CONVIP(mask));
 	}

diff --git a/src/map/merit.cpp b/src/map/merit.cpp
@@ -462,7 +462,7 @@ void CMeritPoints::LowerMerit(MERIT_TYPE merit)
 int32 CMeritPoints::GetMeritValue(MERIT_TYPE merit, CCharEntity* PChar)
 {
     Merit_t* PMerit = GetMeritPointer(merit);
-	uint8 meritValue = 0;
+	uint16 meritValue = 0;
 
     if (PMerit)
     {