more fixes for #497 and #498

sims/dpt/sim.js

@@ -13,7 +13,6 @@ define([
 	spells['harvest life'] = {
 		statType: ['str', 'int'],
 		statMult: 0.76,
-		element: 'physical',
 		auto: true,
 		cdMax: 6,
 		manaCost: 0,
@@ -28,7 +27,6 @@ define([
 	spells['skeleton melee'] = {
 		statType: ['str', 'int'],
 		statMult: 0.27 * bloodBarrierMult,
-		element: 'physical',
 		auto: true,
 		cdMax: 5,
 		manaCost: 0,
@@ -117,7 +115,6 @@ define([
 								elementArcanePercent: 0,
 								elementFrostPercent: 0,
 								elementPoisonPercent: 0,
-								elementPhysicalPercent: 0,
 								elementHolyPercent: 0,
 								elementFirePercent: 0
 							}
@@ -131,7 +128,6 @@ define([
 								elementArcaneResist: 0,
 								elementFrostResist: 0,
 								elementPoisonResist: 0,
-								elementPhysicalResist: 0,
 								elementHolyResist: 0,
 								elementFireResist: 0
 							}

src/client/js/misc/statTranslations.js

@@ -28,7 +28,6 @@ define([
 		'elementFrostPercent': 'increased frost damage',
 		'elementFirePercent': 'increased fire damage',
 		'elementHolyPercent': 'increased holy damage',
-		'elementPhysicalPercent': 'increased physical damage',
 		'elementPoisonPercent': 'increased poison damage',
 
 		'elementAllResist': 'all resistance',
@@ -36,7 +35,6 @@ define([
 		'elementFrostResist': 'frost resistance',
 		'elementFireResist': 'fire resistance',
 		'elementHolyResist': 'holy resistance',
-		'elementPhysicalResist': 'physical resistance',
 		'elementPoisonResist': 'poison resistance',
 		'elementAllResist': 'all resistance',
 

src/client/js/resources.js

@@ -28,7 +28,8 @@ define([
 			'animBoss',
 			'white',
 			'ray',
-			'images/skins/0001.png'
+			'images/skins/0001.png',
+			'images/skins/0010.png'
 		],
 		sprites: {},
 		ready: false,

src/client/ui/templates/equipment/equipment.js

@@ -343,7 +343,6 @@ define([
 					'fire increase': stats.elementFirePercent + '%',
 					'frost increase': stats.elementFrostPercent + '%',
 					'holy increase': stats.elementHolyPercent + '%',
-					'physical increase': stats.elementPhysicalPercent + '%',
 					'poison increase': stats.elementPoisonPercent + '%',
 					gap2: '',
 					'damage increase': stats.dmgPercent + '%',
@@ -360,7 +359,6 @@ define([
 					'fire resist': stats.elementFireResist,
 					'frost resist': stats.elementFrostResist,
 					'holy resist': stats.elementHolyResist,
-					'physical resist': stats.elementPhysicalResist,
 					'poison resist': stats.elementPoisonResist,
 					gap2: '',
 					'all resist': stats.elementAllResist

src/server/combat/combat.js

@@ -58,7 +58,7 @@ define([
 
 				if (!config.noCrit) {
 					var critChance = srcValues.critChance;
-					if ((config.crit) || (roll < critChance)) {
+					if ((config.crit) || (mathRandom() * 100 < critChance)) {
 						isCrit = true;
 						amount *= (srcValues.critMultiplier / 100);
 					}

src/server/components/stats.js

@@ -44,14 +44,12 @@ define([
 		elementFrostPercent: 0,
 		elementFirePercent: 0,
 		elementHolyPercent: 0,
-		elementPhysicalPercent: 0,
 		elementPoisonPercent: 0,
 
 		elementArcaneResist: 0,
 		elementFrostResist: 0,
 		elementFireResist: 0,
 		elementHolyResist: 0,
-		elementPhysicalResist: 0,
 		elementPoisonResist: 0,
 
 		elementAllResist: 0,
@@ -60,7 +58,7 @@ define([
 
 		xpIncrease: 0,
 
-		//fishing stats
+		//Fishing stats
 		catchChance: 0,
 		catchSpeed: 0,
 		fishRarity: 0,
@@ -197,7 +195,7 @@ define([
 					this.obj.syncer.setObject(true, 'stats', 'values', s, this.values[s]);
 				}, this);
 			} else if (stat == 'elementAllResist') {
-				['arcane', 'frost', 'fire', 'holy', 'physical', 'poison'].forEach(function (s) {
+				['arcane', 'frost', 'fire', 'holy', 'poison'].forEach(function (s) {
 					var element = 'element' + (s[0].toUpperCase() + s.substr(1)) + 'Resist';
 
 					this.values[element] += value;

src/server/config/roles.js

@@ -16,7 +16,7 @@ define([
 					keyId: 'world'
 				}],
 				skins: [
-					'1.1', '1.2', '1.3', '1.4', '1.5', 'bearded wizard'
+					'1.1', '1.2', '1.3', '1.4', '1.5', 'bearded wizard', '2.1', '2.2', '2.3', '2.4', '2.5'
 				]
 			}
 		},

src/server/config/skins.js

@@ -59,6 +59,7 @@ define([
 			class: 'cleric'
 		},
 
+		//Elite Skin Pack
 		'1.1': {
 			name: 'Sorcerer',
 			spritesheet: 'images/skins/0001.png',
@@ -88,6 +89,38 @@ define([
 			spritesheet: 'images/skins/0001.png',
 			sprite: [4, 0],
 			class: 'necromancer'
+		},
+
+		//Templar Skin Pack
+		'2.1': {
+			name: 'Crusader 1',
+			spritesheet: 'images/skins/0010.png',
+			sprite: [0, 0],
+			class: ['cleric', 'warrior']
+		},
+		'2.2': {
+			name: 'Crusader 2',
+			spritesheet: 'images/skins/0010.png',
+			sprite: [1, 0],
+			class: ['cleric', 'warrior']
+		},
+		'2.3': {
+			name: 'Crusader 3',
+			spritesheet: 'images/skins/0010.png',
+			sprite: [2, 0],
+			class: ['cleric', 'warrior']
+		},
+		'2.4': {
+			name: 'Crusader 4',
+			spritesheet: 'images/skins/0010.png',
+			sprite: [3, 0],
+			class: ['cleric', 'warrior']
+		},
+		'2.5': {
+			name: 'Grand Crusader',
+			spritesheet: 'images/skins/0010.png',
+			sprite: [4, 0],
+			class: ['cleric', 'warrior']
 		}
 	};
 
@@ -112,16 +145,22 @@ define([
 				});
 
 			var result = {};
-			list.forEach(function (l) {
-				if (!result[l.class])
-					result[l.class] = [];
+			list.forEach(function (skin) {
+				var classList = skin.class;
+				if (!classList.push)
+					classList = [classList];
 
-				result[l.class].push({
-					name: l.name,
-					id: l.id,
-					sprite: l.sprite[0] + ',' + l.sprite[1],
-					spritesheet: l.spritesheet
-				});
+				classList.forEach(function (className) {
+					if (!result[className])
+						result[className] = [];
+
+					result[className].push({
+						name: skin.name,
+						id: skin.id,
+						sprite: skin.sprite[0] + ',' + skin.sprite[1],
+						spritesheet: skin.spritesheet
+					});
+				}, this);
 			});
 
 			return result;

src/server/items/generators/names.js

@@ -31,14 +31,12 @@ define([
 			elementFrostPercent: 'Frigid',
 			elementFirePercent: 'Burning',
 			elementHolyPercent: 'Righteous',
-			elementPhysicalPercent: `Brawler's`,
 			elementPoisonPercent: 'Bubbling',
 
 			elementArcaneResist: 'Protective',
 			elementFrostResist: 'Protective',
 			elementFireResist: 'Protective',
 			elementHolyResist: 'Protective',
-			elementPhysicalResist: `Protective`,
 			elementPoisonResist: 'Protective',
 			elementAllResist: 'Protective',
 
@@ -64,21 +62,19 @@ define([
 			elementFrostPercent: 'Winter',
 			elementFirePercent: 'the Inferno',
 			elementHolyPercent: 'the Gods',
-			elementPhysicalPercent: 'Combat',
 			elementPoisonPercent: 'Poison',
 
 			elementArcaneResist: 'Arcane Resistance',
 			elementFrostResist: 'Frost Resistance',
 			elementFireResist: 'Fire Resistance',
 			elementHolyResist: 'Holy Resistance',
-			elementPhysicalResist: `Physical Resistance`,
 			elementPoisonResist: 'Poison Resistance',
 			elementAllResist: 'Arcane Resistance',
 
 			xpIncrease: 'Experience',
 			lvlRequire: 'Ease'
 		},
-		generate: function(item, blueprint) {
+		generate: function (item, blueprint) {
 			if (blueprint.name) {
 				item.name = blueprint.name;
 				return;

src/server/mods/class-necromancer/index.js

@@ -138,7 +138,6 @@ define([
 			spells['harvest life'] = {
 				statType: ['str', 'int'],
 				statMult: 0.76,
-				element: 'physical',
 				auto: true,
 				cdMax: 6,
 				manaCost: 0,
@@ -152,7 +151,6 @@ define([
 			spells['summon skeleton'] = {
 				statType: ['str', 'int'],
 				statMult: 0.27,
-				element: 'physical',
 				cdMax: 7,
 				manaCost: 5,
 				range: 9,
@@ -165,7 +163,6 @@ define([
 			spells['blood barrier'] = {
 				statType: ['str', 'int'],
 				statMult: 0.1,
-				element: 'physical',
 				cdMax: 20,
 				manaCost: 5,
 				range: 9,

src/server/mods/event-halloween/index.js

@@ -82,7 +82,6 @@ define([
 			spells['scatter pumpkin pieces'] = {
 				statType: ['str'],
 				statMult: 0.1,
-				element: 'physical',
 				auto: true,
 				cdMax: 7,
 				manaCost: 0,

src/server/world/mobBuilder.js

@@ -111,7 +111,7 @@ define([
 			var statValues = mob.stats.values;
 
 			var preferStat = ['str', 'dex', 'int'][~~(Math.random() * 3)];
-			var elementType = ['physical', 'poison', 'frost', 'fire', 'holy', 'arcane'][~~(Math.random() * 6)];
+			var elementType = [null, 'poison', 'frost', 'fire', 'holy', 'arcane'][~~(Math.random() * 6)];
 
 			mob.equipment.unequipAll();
 			mob.inventory.clear();