Revert "Merge pull request #1101 from KinglyKrab/custom"

This reverts commit 43108acae1, reversing
changes made to daa1db65b9.

common/classes.cpp

@@ -378,8 +378,6 @@ const char *GetClassIDName(uint8 class_id, uint8 level)
 			return "Berserker Guildmaster";
 		case MERCHANT:
 			return "Merchant";
-		case DISCORD_MERCHANT:
-			return "Discord Merchant";
 		case ADVENTURERECRUITER:
 			return "Adventure Recruiter";
 		case ADVENTUREMERCHANT:
@@ -390,18 +388,6 @@ const char *GetClassIDName(uint8 class_id, uint8 level)
 			return "Tribute Master";
 		case GUILD_TRIBUTE_MASTER:
 			return "Guild Tribute Master";
-		case GUILD_BANKER:
-			return "Guild Banker";
-		case NORRATHS_KEEPERS_MERCHANT:
-			return "Radiant Crystal Merchant";
-		case DARK_REIGN_MERCHANT:
-			return "Radiant Crystal Merchant";
-		case FELLOWSHIP_MASTER:
-			return "Fellowship Master";
-		case ALT_CURRENCY_MERCHANT:
-			return "Alternate Currency Merchant";
-		case MERCERNARY_MASTER:
-			return "Mercenary Liaison";
 		default:
 			return "Unknown";
 	}

common/classes.h

@@ -61,7 +61,6 @@
 #define CORPSE_CLASS 62	// only seen on Danvi's Corpse in Akheva so far..
 #define TRIBUTE_MASTER 63
 #define GUILD_TRIBUTE_MASTER 64	// not sure
-#define GUILD_BANKER 66
 #define NORRATHS_KEEPERS_MERCHANT 67
 #define DARK_REIGN_MERCHANT 68
 #define FELLOWSHIP_MASTER 69

common/ruletypes.h

@@ -497,12 +497,6 @@ RULE_INT(Combat, LevelToStopACTwinkControl, 50, "Level to stop armorclass twink
 RULE_BOOL(Combat, ClassicNPCBackstab, false, "True disables npc facestab - NPCget normal attack if not behind")
 RULE_BOOL(Combat, UseNPCDamageClassLevelMods, true, "Uses GetClassLevelDamageMod calc in npc_scale_manager")
 RULE_BOOL(Combat, UseExtendedPoisonProcs, false, "Allow old school poisons to last until characrer zones, at a lower proc rate")
-RULE_BOOL(Combat, CustomScaling, false, "Use Custom Scaling.")
-RULE_REAL(Combat, CustomScalingMeleeMitigation, 2500.0, "Custom Melee Mitigation Scaling (AGI / VALUE)")
-RULE_REAL(Combat, CustomScalingMeleeDamage, 100.0, "Custom Melee Damage Scaling (STR / VALUE)")
-RULE_REAL(Combat, CustomScalingSkillDamage, 100.0, "Custom Skill Damage Scaling (DEX / VALUE)")
-RULE_REAL(Combat, CustomScalingSpellDamage, 100.0, "Custom Spell Damage Scaling (INT / VALUE)")
-RULE_REAL(Combat, CustomScalingSpellHealing, 100.0, "Custom Spell Healing Scaling (WIS / VALUE)")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(NPC)