Browse Source

merrywinter theming - undo later

tags/v0.4.1^2
Big Bad Waffle 4 years ago
parent
commit
f13c0723e5
7 changed files with 49 additions and 13 deletions
  1. +36
    -0
      src/client/js/rendering/renderer.js
  2. +4
    -4
      src/client/ui/templates/characters/styles.less
  3. +1
    -1
      src/client/ui/templates/characters/template.html
  4. +2
    -2
      src/client/ui/templates/createCharacter/styles.less
  5. +1
    -1
      src/client/ui/templates/createCharacter/template.html
  6. +4
    -4
      src/client/ui/templates/login/styles.less
  7. +1
    -1
      src/client/ui/templates/login/template.html

+ 36
- 0
src/client/js/rendering/renderer.js View File

@@ -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);
}
}
}
},


+ 4
- 4
src/client/ui/templates/characters/styles.less View File

@@ -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;
}
}



+ 1
- 1
src/client/ui/templates/characters/template.html View File

@@ -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>


+ 2
- 2
src/client/ui/templates/createCharacter/styles.less View File

@@ -128,7 +128,7 @@
}

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

&:hover {
background-color: @blueB;
background-color: @redB;
}
}



+ 1
- 1
src/client/ui/templates/createCharacter/template.html View File

@@ -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>


+ 4
- 4
src/client/ui/templates/login/styles.less View File

@@ -92,7 +92,7 @@
height: 35px;

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

&:hover {
background-color: @blueB;
background-color: @redB;
}
}
}
@@ -140,7 +140,7 @@
padding-right: 10px;
width: 100%;
margin-bottom: 10px;
background-color: @blueD;
background-color: @redC;
color: @white;

&:last-child {
@@ -148,7 +148,7 @@
}

&:hover {
background-color: @blueC;
background-color: @redB;
}
}
}


+ 1
- 1
src/client/ui/templates/login/template.html View File

@@ -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">


Loading…
Cancel
Save