merged master

src/client/css/colors.less

@@ -29,6 +29,7 @@
 @redA: #ff4252;
 @redB: #d43346;
 @redC: #a82841;
+@redD: #802343;
 
 @orangeB: #db5538;
 @orangeC: #b34b3a;

src/client/js/components/effects.js

@@ -114,6 +114,12 @@ define([
 			}, this);
 		},
 
+		setVisible: function (visible) {
+			this.effects.forEach(function (e) {
+				e.sprite.visible = visible;
+			}, this);
+		},
+
 		destroy: function () {
 			this.effects.forEach(function (e) {
 				renderer.destroyObject({

src/client/js/rendering/renderer.js

@@ -194,11 +194,28 @@ define([
 
 					alpha = Math.min(Math.max(0.15, alpha), 0.65);
 
+					//Hack for xmas
+					tile = 3;
+					let min = Math.min(
+						(i + j),
+						(w - i + j),
+						(i + h - j),
+						(w - i + h - j)
+					);
+					let tree = false;
+					let val = min + (Math.random() * 10);
+					if (val < 23) {
+						if (val < 18)
+							tree = true;
+						tile = 184;
+					}
+
 					if (mRandom() < 0.35) {
 						tile = {
 							5: 6,
 							3: 0,
 							4: 1,
+							184: 185,
 							53: 54
 						}[tile];
 					}
@@ -217,6 +234,25 @@ define([
 					}
 
 					container.addChild(sprite);
+
+					if (tree) {
+						let s = [216, 216, 217, 217, 217, 217, 217, 218, 219, 219, 219][~~(Math.random() * 11)];
+						s += 224;
+						tile = new pixi.Sprite(this.getTexture('sprites', s));
+
+						tile.alpha = 0.7 + (Math.random() * 0.3);
+						tile.position.x = i * scale;
+						tile.position.y = j * scale;
+						tile.width = scale;
+						tile.height = scale;
+
+						if (Math.random() < 0.5) {
+							tile.position.x += scale;
+							tile.scale.x = -scaleMult;
+						}
+
+						container.addChild(tile);
+					}
 				}
 			}
 		},

src/client/ui/templates/characters/styles.less

@@ -103,7 +103,7 @@
 		}
 
 		.btn {
-			background-color: @blueC;
+			background-color: @redC;
 			width: calc((100% - (16px * 2)) / 3);
 			float: left;
 			margin-right: 16px;
@@ -114,12 +114,12 @@
 			}
 
 			&:hover {
-				background-color: @blueB;
+				background-color: @redB;
 			}
 
 			&.deleting {
-				background-color: @red;
-				color: @white;
+				background-color: @yellow;
+				color: @black;
 			}
 
 		}

src/client/ui/templates/characters/template.html

@@ -1,5 +1,5 @@
 <div class="uiCharacters">
-	<img class="logo" src="images/logo_0.png" alt="">
+	<img class="logo" src="server/mods/iwd-merrywinter/images/logo.png" alt="">
 	<div class="left">
 		<div class="character">loading characters...</div>
 	</div>

src/client/ui/templates/createCharacter/styles.less

@@ -130,7 +130,7 @@
 		}
 
 		.btn {
-			background-color: @blueC;
+			background-color: @redC;
 			width: calc((100% - @boxPadding) / 2);
 			float: left;
 			margin-right: @boxPadding;
@@ -141,7 +141,7 @@
 			}
 
 			&:hover {
-				background-color: @blueB;
+				background-color: @redB;
 			}
 
 		}

src/client/ui/templates/createCharacter/template.html

@@ -1,5 +1,5 @@
 <div class="uiCreateCharacter">
-	<img class="logo" src="images/logo_0.png" alt="">
+	<img class="logo" src="server/mods/iwd-merrywinter/images/logo.png" alt="">
 	<div class="box-left">
 		<div class="left">
 			<div class="label">name</div>

src/client/ui/templates/login/styles.less

@@ -86,7 +86,7 @@
 			height: 35px;
 
 			.btn {
-				background-color: @blueC;
+				background-color: @redC;
 				width: calc((100% - @boxPadding) / 2);
 				float: left;
 				margin-right: @boxPadding;
@@ -97,7 +97,7 @@
 				}
 
 				&:hover {
-					background-color: @blueB;
+					background-color: @redB;
 				}
 
 			}
@@ -136,7 +136,7 @@
 			padding-right: 10px;
 			width: 100%;
 			margin-bottom: 10px;
-			background-color: @blueD;
+			background-color: @redD;
 			color: @white;
 
 			&:last-child {
@@ -144,7 +144,7 @@
 			}
 
 			&:hover {
-				background-color: @blueC;
+				background-color: @redC;
 			}
 
 		}

src/client/ui/templates/login/template.html

@@ -1,5 +1,5 @@
 <div class="uiLogin">
-	<img class="logo" src="images/logo_0.png" alt="">
+	<img class="logo" src="server/mods/iwd-merrywinter/images/logo.png" alt="">
 	<div class="right">
 		<div class="label">username</div>
 		<input type="text" class="el textbox txtUsername" placeholder="username">
@@ -17,5 +17,5 @@
 		<div class="el btn btnPaypal" location="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BR2CC82WUAVEA">Donate on Paypal</div>
 		<div class="el btn btnWiki" location="http://wiki.isleward.com/Main_Page">Access the Wiki</div>
 	</div>
-	<div class="version" location="https://gitlab.com/Isleward/isleward/tags/v0.4.0">v0.4.0</div>
+	<div class="version" location="https://gitlab.com/Isleward/isleward/tags/v0.4.0">v0.4.1</div>
 </div>

src/server/components/inventory/useItem.js

@@ -15,7 +15,7 @@ const isOnCooldown = (obj, cpnInv, item) => {
 				}
 			});
 
-			return;
+			return true;
 		}
 
 		item.cd = item.cdMax;

src/server/config/itemEffects/doubleProjectile.js

@@ -1,16 +1,16 @@
 module.exports = {
 	events: {
 		onGetText: function (item) {
-			let rolls = item.effects.find(e => (e.type === 'doubleProjectile')).rolls;
+			const rolls = item.effects.find(e => (e.type === 'doubleProjectile')).rolls;
 
-			return `${rolls.chance}% chance for Magic Missile to attack an additional target`;
+			return `${rolls.chance}% chance for ${rolls.spellName} to hit an additional target`;
 		},
 
 		beforeSpawnProjectile: function (item, spell, projectileConfig) {
-			if (spell.name !== 'Magic Missile')
-				return;
+			const rolls = item.effects.find(e => (e.type === 'doubleProjectile')).rolls;
 
-			let rolls = item.effects.find(e => (e.type === 'doubleProjectile')).rolls;
+			if (spell.name !== rolls.spellName)
+				return;
 
 			let chanceRoll = Math.random() * 100;
 			if (chanceRoll >= rolls.chance)

src/server/config/maps/dungeon/zone.js

@@ -6,6 +6,41 @@ let balance = {
 	dmgMult: dmgMult,
 
 	mobs: {
+		albinoSerpent: {
+			name: 'Albino Serpent',
+			cell: 82,
+			count: 1,
+			chance: 1,
+			hpMult: hpMult * 1.5,
+			dmgMult: dmgMult * 1.5,
+
+			drops: {
+				noRandom: true,
+				alsoRandom: true,
+				blueprints: [{
+					chance: 2,
+					name: 'Corrupted Blossom',
+					level: 20,
+					quality: 4,
+					slot: 'oneHanded',
+					type: 'Wand',
+					sprite: [9, 10],
+					implicitStat: {
+						stat: 'castSpeed',
+						value: [5, 15]
+					},
+					stats: ['int', 'int', 'regenMana', 'elementPoisonResist', 'elementPoisonResist'],
+					effects: [{
+						type: 'doubleProjectile',
+						rolls: {
+							i_chance: [5, 25],
+							spellName: 'Magic Missile'
+						}
+					}]
+				}]
+			}
+		},
+
 		violetSerpent: {
 			level: 20,
 			hpMult: hpMult * 1,
@@ -30,7 +65,7 @@ let balance = {
 			chargeDmg: 0.4,
 			chargeCd: 25,
 			chargeElement: null,
-			chargeStunDuration: 0			
+			chargeStunDuration: 0
 		},
 
 		viridianSerpent: {
@@ -79,13 +114,7 @@ module.exports = {
 
 			rare: {
 				hpMult: balance.hpMult * 1.25,
-				dmgMult: balance.dmgMult * 1.25,
-
-				drops: {
-					chance: 100,
-					rolls: 1,
-					magicFind: 2000
-				}
+				dmgMult: balance.dmgMult * 1.25
 			}
 		},
 
@@ -96,6 +125,8 @@ module.exports = {
 				hpMult: balance.mobs.violetSerpent.hpMult
 			},
 
+			rare: balance.mobs.albinoSerpent,
+
 			spells: [{
 				type: 'melee',
 				element: balance.mobs.violetSerpent.meleeElement,
@@ -175,6 +206,8 @@ module.exports = {
 				hpMult: balance.mobs.scarletSerpent.hpMult
 			},
 
+			rare: balance.mobs.albinoSerpent,
+
 			spells: [{
 				type: 'melee',
 				element: balance.mobs.scarletSerpent.meleeElement,
@@ -197,6 +230,8 @@ module.exports = {
 				hpMult: balance.mobs.viridianSerpent.hpMult
 			},
 
+			rare: balance.mobs.albinoSerpent,
+
 			spells: [{
 				type: 'smokeBomb',
 				element: balance.mobs.viridianSerpent.poolElement,

src/server/config/maps/sewer/zone.js

@@ -8,7 +8,7 @@ const balance = {
 	stinktooth: {
 		runestoneChance: 10,
 		recipeChance: 3,
-		shankChance: 0.1
+		shankChance: 0.2
 	},
 	bandit: {
 		keyChance: 1
@@ -180,7 +180,7 @@ module.exports = {
 					name: 'Spitter Rat',
 					cell: 24,
 					hpPercent: 10,
-					dmgPercent: 0.2,
+					dmgPercent: 0.175,
 					basicSpell: 'projectile'
 				}]
 			}, {

src/server/config/spells/spellCharge.js

@@ -120,6 +120,8 @@ module.exports = {
 		let damage = this.getDamage(target);
 		target.stats.takeDamage(damage, this.threatMult, obj);
 
+		this.obj.fireEvent('afterPositionChange', targetPos);
+
 		if (this.castOnEnd)
 			this.obj.spellbook.spells[this.castOnEnd].cast();
 	},

src/server/config/spells/spellProjectile.js

@@ -31,6 +31,7 @@ module.exports = {
 
 		let projectileConfig = {
 			caster: this.obj.id,
+			extraTargets: 0,
 			components: [{
 				idSource: this.obj.id,
 				idTarget: target.id,

src/server/config/spellsConfig.js

@@ -26,7 +26,7 @@ let spells = {
 		statMult: 1,
 		element: 'arcane',
 		cdMax: 6,
-		castTimeMax: 8,
+		castTimeMax: 7,
 		manaCost: 4,
 		range: 9,
 		random: {

src/server/items/config/types.js

@@ -360,7 +360,7 @@ let types = {
 				cdMax: 5,
 				castTimeMax: 0,
 				manaCost: 0,
-				range: 6,
+				range: 9,
 				random: {
 					damage: [1.17, 7.72]
 				}