AC Softcaps disabled until late Velious. Fixed two cases where partia…

…l resist curves and softcaps were applying wrongly to level 50 players.

common/ruletypes.h

@@ -254,6 +254,7 @@ RULE_INT(Quarm, AutomatedRaidRotationRaidGuildMemberCountRequirement, 12) // Req
 RULE_INT(Quarm, AutomatedRaidRotationRaidNonMemberCountRequirement, 18) // Required amount of same-guild members to participate in a raid encounter. These must be in the same guild, and one officer from the current guild must be in the raid.
 RULE_INT(Quarm, MinStatusToZoneIntoAnyGuildZone, 100) // Required amount of same-guild members to participate in a raid encounter. These must be in the same guild, and one officer from the current guild must be in the raid.
 RULE_BOOL(Quarm, EnableGuildZoneRequirementOnEntry, false) // Classic behavior is true. Live Quarm has this false by default. CSR complaints about training warranted this behavior.
+RULE_BOOL(Quarm, EnforceClassicEraHardCaps, true) // Classic behavior is true, Late velious and later is false. Master switch for AC softcaps.
 RULE_CATEGORY_END()
 
 RULE_CATEGORY( Map )

zone/attack.cpp

@@ -5140,7 +5140,12 @@ int Client::GetMitigation(bool ignoreCap, int item_ac_sum, int shield_ac, int sp
 
 	if (!ignoreCap && acSum > softcap)
 	{
-		if (level < 50)
+		if (RuleB(Quarm, EnforceClassicEraHardCaps))
+		{
+				return softcap;
+		}
+
+		if (level <= 50)
 		{
 			return softcap;		// it's hard < level 50
 		}

zone/spells.cpp

@@ -4018,7 +4018,7 @@ float Mob::CheckResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, Mob
 					partial_modifier += 5;
 				}
 
-				if(target_level >= 30 && caster_level < 50)
+				if(target_level >= 30 && caster_level <= 50)
 				{
 					partial_modifier += (caster_level - 25);
 				}