reverted merrywinter theme changes

src/client/js/rendering/renderer.js

@@ -194,28 +194,11 @@ 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];
 					}
@@ -234,25 +217,6 @@ 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

@@ -1,16 +1,11 @@
 @import "../../../css/colors.less";
-
 @leftWidth: 400px;
 @rightWidth: 400px;
 @boxPadding: 35px;
-
 @logoWidth: 559px;
 @logoHeight: 200px;
-
 @boxHeight: 300px;
-
 @messageHeight: @boxPadding;
-
 @totalWidth: (@leftWidth + @rightWidth + @boxPadding);
 @totalHeight: (@logoHeight + @boxHeight + (@boxPadding * 3) + @messageHeight);
 
@@ -25,7 +20,8 @@
 		margin-bottom: (@boxPadding * 2);
 	}
 
-	.left, .right {
+	.left,
+	.right {
 		height: @boxHeight;
 		float: left;
 		background-color: #3a3b4a;
@@ -50,7 +46,9 @@
 			&.selected {
 				background-color: fade(@white, 25%);
 			}
+
 		}
+
 	}
 
 	.right {
@@ -74,6 +72,7 @@
 				image-rendering: crisp-edges;
 				display: none;
 			}
+
 		}
 
 		.info {
@@ -100,10 +99,11 @@
 				text-align: right;
 				color: darken(@white, 25%);
 			}
+
 		}
 
 		.btn {
-			background-color: @redC;
+			background-color: @blueC;
 			width: calc((100% - (16px * 2)) / 3);
 			float: left;
 			margin-right: 16px;
@@ -114,18 +114,20 @@
 			}
 
 			&:hover {
-				background-color: @redB;
+				background-color: @blueB;
 			}
 
 			&.deleting {
-				background-color: @yellow;
-				color: @black;
+				background-color: @red;
+				color: @white;
 			}
+
 		}
 
 		.spacer-h {
 			height: 91px;
 		}
+
 	}
 
 	.message {
@@ -135,12 +137,12 @@
 		float: left;
 		text-align: center;
 		color: @white;
-		filter:
-			drop-shadow(0px -2px 0px @blackD) 
-			drop-shadow(0px 2px 0px @blackD)
-			drop-shadow(2px 0px 0px @blackD) 
-			drop-shadow(-2px 0px 0px @blackD);
+		filter: drop-shadow(0px -2px 0px @blackD) 
+		drop-shadow(0px 2px 0px @blackD)
+		drop-shadow(2px 0px 0px @blackD) 
+		drop-shadow(-2px 0px 0px @blackD);
 	}
+
 }
 
 .mobile .uiCharacters {
@@ -149,4 +151,5 @@
 	.logo {
 		display: none;
 	}
+
 }

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

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

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

@@ -1,13 +1,9 @@
 @import "../../../css/colors.less";
-
 @boxHeight: 276px;
 @boxPadding: 27px;
-
 @logoWidth: 559px;
 @logoHeight: 200px;
-
 @messageHeight: @boxPadding;
-
 @totalWidth: (@logoWidth + (@boxPadding * 2) + 427px);
 @totalHeight: (@logoHeight + @boxHeight + (@boxPadding * 3) + @messageHeight);
 
@@ -28,7 +24,8 @@
 		width: 613px;
 		background-color: #3a3b4a;
 
-		.left, .right {
+		.left,
+		.right {
 			float: left;
 			height: 100%;
 		}
@@ -37,17 +34,18 @@
 			width: calc(100% - (@boxPadding * 2) - 160px);
 			padding: @boxPadding 0px @boxPadding @boxPadding;
 
-			.txtClass, .txtCostume {
+			.txtClass,
+			.txtCostume {
 				cursor: pointer;
 				-webkit-user-select: none;
 
 				&:active {
 					background-color: darken(@gray, 20%);
 				}
+
 			}
 
 			.txtClass {
-
 			}
 
 			.label {
@@ -83,6 +81,7 @@
 					&:hover {
 						background-color: @grayC;
 					}
+
 				}
 
 				.txtCostume {
@@ -92,7 +91,9 @@
 					align-items: center;
 					padding: 0px;
 				}
-			}			
+
+			}
+
 		}
 
 		.right {
@@ -117,6 +118,7 @@
 				image-rendering: crisp-edges;
 				background: url('../../../images/charas.png') -64px 0px;
 			}
+
 		}
 
 		.textbox {
@@ -128,7 +130,7 @@
 		}
 
 		.btn {
-			background-color: @redC;
+			background-color: @blueC;
 			width: calc((100% - @boxPadding) / 2);
 			float: left;
 			margin-right: @boxPadding;
@@ -139,8 +141,9 @@
 			}
 
 			&:hover {
-				background-color: @redB;
+				background-color: @blueB;
 			}
+
 		}
 
 		.message {
@@ -151,6 +154,7 @@
 			text-align: center;
 			color: @redA;
 		}
+
 	}
 
 	.box-right {
@@ -195,6 +199,7 @@
 						&:after {
 							content: '  ✔';
 						}
+
 					}
 
 					&.disabled {
@@ -204,10 +209,15 @@
 					&:hover {
 						color: @white;
 					}
+
 				}
+
 			}
+
 		}
+
 	}
+
 }
 
 .mobile .uiCreateCharacter {
@@ -228,9 +238,11 @@
 		.skinBox {
 			height: 70px;
 		}
+
 	}
 
 	.box-right {
 		width: 45%;
 	}
+
 }

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

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

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

@@ -96,7 +96,7 @@
 			height: 35px;
 
 			.btn {
-				background-color: @redC;
+				background-color: @blueC;
 				width: calc((100% - @boxPadding) / 2);
 				float: left;
 				margin-right: @boxPadding;
@@ -107,7 +107,7 @@
 				}
 
 				&:hover {
-					background-color: @redB;
+					background-color: @blueB;
 				}
 
 			}
@@ -146,7 +146,7 @@
 			padding-left: 10px;
 			padding-right: 10px;
 			margin-left: 10px;
-			background-color: @greenC;
+			background-color: @blueD;
 			color: @white;
 
 			&:first-child {
@@ -154,7 +154,7 @@
 			}
 
 			&:hover {
-				background-color: @greenB;
+				background-color: @blueC;
 			}
 
 		}

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

@@ -1,5 +1,5 @@
 <div class="uiLogin">
-	<img class="logo" src="server/mods/iwd-merrywinter/images/logo.png" alt="">
+	<img class="logo" src="images/logo_0.png" alt="">
 	<div class="right">
 		<div class="label">username</div>
 		<input type="text" class="el textbox txtUsername" placeholder="username">