Merge branch 'ezsoftware-master'

billyvg · Jul 3, 2015 · 255831d · 255831d
2 parents 27492e3 + 4e1ad8d
commit 255831d
Show file tree

Hide file tree

Showing 15 changed files with 720 additions and 56 deletions.
diff --git a/Immutable.html → Bylanders.html b/Immutable.html → Bylanders.html
@@ -6,11 +6,11 @@
     <style>
 .container {
 	border-style: solid;
-	border-width: 76px 104px 21px 57px;
-	-moz-border-image: url(images/overlay.png) 76 104 21 57 repeat;
-	-webkit-border-image: url(images/overlay.png) 76 104 21 57 repeat;
-	-o-border-image: url(images/overlay.png) 76 104 21 57 repeat;
-	border-image: url(images/overlay.png) 76 104 21 57 fill repeat;
+border-width: 67px 37px 18px 62px;
+-moz-border-image: url(images/overlay.png) 67 37 18 62 repeat;
+-webkit-border-image: url(images/overlay.png) 67 37 18 62 repeat;
+-o-border-image: url(images/overlay.png) 67 37 18 62 repeat;
+border-image: url(images/overlay.png) 67 37 18 62 fill repeat;
 }
 html {
 	/*background-image: url(images/handle.png);*/
@@ -48,15 +48,15 @@
 ol {
 	list-style-type: none;
 	margin: 0;
-	padding: 3px;
+	padding: 5px;
 }
  li .encountertitle {
-    font-size: 16px;
+    font-size: 18px;
     text-shadow: inset 0px 1px 1px #000;
     color: #000;
     position: absolute;
     left: 38%;
-    top: 57px;
+    top: 51px;
 
 }
 li .raiddps {
@@ -65,11 +65,11 @@
     width: 70px;
     vertical-align: middle;
     text-align: middle;
-    font-size: 20px;
+    font-size: 23px;
     color: #FFF;
     text-shadow: 0 0 5px #fff, 0 0 10px #fff, 0 0 15px #fff, 0 0 20px #ff2d95, 0 0 30px #ff2d95, 0 0 40px #ff2d95, 0 0 50px #ff2d95, 0 0 75px #ff2d95;
     letter-spacing: 7px;
-    top: 25px;
+    top: 18px;
     left: 41%;
 }
 li {
@@ -113,10 +113,10 @@
     display: block;
     vertical-align: bottom;
     float: right;
-    font-size: 16px;
+    font-size: 18px;
     text-shadow: inset 0px 1px 1px #4d4d4d;
     color: #000;
-    top: 57px;
+    top: 51px;
     right: 75px;
 }
 li .tohit {
@@ -290,7 +290,7 @@
                     }
 					row.find('.tohit').text('ACC' + ' ' + combatant.tohit + '%');
                     row.find('.dps').text(combatant.encdps);
-					row.find('.job-icon').html('<img src="images/default/' + JobOrName(combatant).toLowerCase() + '.png">');
+					row.find('.job-icon').html('<img src="images/default/' + JobOrName(combatant) + '.png" onerror="$(this).attr(\'src\', \'images/error.png\');">');
                     row.find('.name').text(combatant.name);
                     row.find('.number').text(combatant['DAMAGE-k'] + 'k ' + '('+combatant['damage%'] +')');
 					row.find('.crithit').text('CRIT' + ' ' + combatant['crithit%']);
@@ -348,6 +348,22 @@
 					{
 					row.find('.bar').css('background', 'rgba(79,114,255,1.00)');
 					row.find('.bar').css('-webkit-box-shadow', '0px 0px 6px 1px rgba(79,114,255,0.20)');
+					row.find('.hps').text('HPS' + ' ' + combatant.enchps);				
+														}
+					else if(JobOrName(combatant) == 'Drk') //Darkknight//
+					{
+					row.find('.bar').css('background', 'rgba(150, 80, 30,1.00)');
+					row.find('.bar').css('-webkit-box-shadow', '0px 0px 6px 1px rgba(179,0,0,0.70)');
+														}
+					else if(JobOrName(combatant) == 'Mch') //Machinist//
+					{
+					row.find('.bar').css('background', 'rgba(89, 168, 240,1.00)');
+					row.find('.bar').css('-webkit-box-shadow', '0px 0px 6px 1px rgba(89, 168, 240,0.20)');			
+														}
+					else if(JobOrName(combatant) == 'Ast') //Astrologian//
+					{
+					row.find('.bar').css('background', 'rgba(218, 149, 94,1.00)');
+					row.find('.bar').css('-webkit-box-shadow', '0px 0px 6px 1px rgba(218, 149, 94,0.20)');
 					row.find('.hps').text('HPS' + ' ' + combatant.enchps);				
 														}
 					else if(JobOrName(combatant) == 'Mrd') //Marauder//
@@ -495,5 +511,4 @@
     </div>
 </div>
 </body>
-<script src="testing.js"></script>
 </html>
diff --git a/images/colorbg/ast.png b/images/colorbg/ast.png
diff --git a/images/colorbg/drk.png b/images/colorbg/drk.png
diff --git a/images/colorbg/mch.png b/images/colorbg/mch.png
diff --git a/images/glow/ast.png b/images/glow/ast.png
diff --git a/images/glow/drk.png b/images/glow/drk.png
diff --git a/images/glow/mch.png b/images/glow/mch.png
diff --git a/images/overlay.png b/images/overlay.png
diff --git a/kyitrai.html b/kyitrai.html
@@ -49,7 +49,7 @@
             height: 100%;
             /* If you would like a semi-transparent overlay, change the 1.0
                 here to something around 0.5 to 0.6. */
-            background-color: rgba(0, 0, 0, 1.0);
+            background-color: rgba(0, 0, 0, 0.1);
             border-radius: 6px;
         }
 
@@ -151,16 +151,17 @@
         }
         .job-Drg div.bar,    .job-Mnk div.bar,    .job-Nin div.bar,    .job-Blm div.bar,    .job-Brd div.bar,    .job-Smn div.bar,
         .job-Lnc div.bar,    .job-Pgl div.bar,    .job-Rog div.bar,    .job-Thm div.bar,    .job-Arc div.bar,    .job-Acn div.bar
+        .job-Mch div.bar
         {
             border-bottom: 1px solid hsla(0, 100%, 50%, 0.75);
             background: linear-gradient(to left, hsla(0, 100%, 50%, 0.75), hsla(0, 100%, 25%, 0.5) 25px);
         }
-        .job-Pld div.bar,    .job-War div.bar,
+        .job-Pld div.bar,    .job-War div.bar,    .job-Drk div.bar,
         .job-Gld div.bar,    .job-Mrd div.bar {
             border-bottom: 1px solid hsla(240, 100%, 50%, 0.75);
             background: linear-gradient(to left, hsla(240, 100%, 50%, 0.75), hsla(240, 100%, 35%, 0.5) 25px);
         }
-        .job-Whm div.bar,    .job-Sch div.bar,
+        .job-Whm div.bar,    .job-Sch div.bar,    .job-Ast div.bar,
         .job-Cnj div.bar {
             border-bottom: 1px solid hsla(120, 100%, 50%, 0.75);
             background: linear-gradient(to left, hsla(120, 100%, 50%, 0.75), hsla(120, 100%, 25%, 0.5) 25px);
@@ -191,6 +192,9 @@
         div.job-Whm span.name { background-image: url(images/glow/whm.png); }
         div.job-Cnj span.name { background-image: url(images/glow/cnj.png); }
         div.job-Sch span.name { background-image: url(images/glow/sch.png); }
+        div.job-Drk span.name { background-image: url(images/glow/drk.png); }
+        div.job-Mch span.name { background-image: url(images/glow/mch.png); }
+        div.job-Ast span.name { background-image: url(images/glow/ast.png); }
 
     </style>
     <script type="text/javascript" src="lib/jquery-2.1.1.min.js"></script>

diff --git a/miniparseGlowIcon.html b/miniparseGlowIcon.html
@@ -87,6 +87,7 @@
 #combatantTableBody .Gla td,
 #combatantTableBody .Pld td,
 #combatantTableBody .Mrd td,
+#combatantTableBody .Drk td,
 #combatantTableBody .War td {
 	color: #ffffff;
 	background-color: rgba(41,112,243,0.2);
@@ -95,6 +96,7 @@
 
 #combatantTableBody .Cnj td,
 #combatantTableBody .Whm td,
+#combatantTableBody .Ast td,
 #combatantTableBody .Sch td {
 	color: #ffffff;
 	background-color: rgba(107,240,86,0.2);
@@ -112,7 +114,8 @@
 #combatantTableBody .Acn td,
 #combatantTableBody .Smn td,
 #combatantTableBody .Thm td,
-#combatantTableBody .Blm td {
+#combatantTableBody .Blm td,
+#combatantTableBody .Mch td {
 	color: #ffffff;
 	background-color: rgba(200,3,8,0.2);
 	background-blend-mode: soft-light;
@@ -139,7 +142,7 @@
         }
 
 </style>
-<script src="jquery-2.1.1.min.js" type="text/javascript"></script>
+<script src="lib/jquery-2.1.1.min.js" type="text/javascript"></script>
 <script>
 
 		//
@@ -344,8 +347,8 @@
                     		combatant.JobOrName = "choco";
                 		}
 
-                			var tableRow = newTableBody.insertRow(newTableBody.rows.length);
-                			for (var i = 0; i < bodyDefine.length; i++)
+						var tableRow = newTableBody.insertRow(newTableBody.rows.length);
+						for (var i = 0; i < bodyDefine.length; i++)
 
 
 

diff --git a/miniparseGlowIconGraph.html b/miniparseGlowIconGraph.html
@@ -87,6 +87,7 @@
 #combatantTableBody .Gla td,
 #combatantTableBody .Pld td,
 #combatantTableBody .Mrd td,
+#combatantTableBody .Drk td,
 #combatantTableBody .War td {
 	color: #ffffff;
 	background-color: rgba(41,112,243,0.2);
@@ -95,6 +96,7 @@
 
 #combatantTableBody .Cnj td,
 #combatantTableBody .Whm td,
+#combatantTableBody .Ast td,
 #combatantTableBody .Sch td {
 	color: #ffffff;
 	background-color: rgba(107,240,86,0.2);
@@ -112,6 +114,7 @@
 #combatantTableBody .Acn td,
 #combatantTableBody .Smn td,
 #combatantTableBody .Thm td,
+#combatantTableBody .Mch td,
 #combatantTableBody .Blm td {
 	color: #ffffff;
 	background-color: rgba(200,3,8,0.2);
@@ -139,7 +142,7 @@
         }
 
 </style>
-<script src="jquery-2.1.1.min.js" type="text/javascript"></script>
+<script src="lib/jquery-2.1.1.min.js" type="text/javascript"></script>
 <script>
 
 		//
@@ -224,9 +227,9 @@
 
 
 		function dpsBarEffect(cell, combatant, index) {
-    		var tank = ["Gla", "Pld", "Mrd", "War"]
-   		var dps = ["Pgl", "Mnk", "Lnc", "Drg", "Arc", "Brd", "Rog", "Nin", "Acn", "Smn", "Thm", "Blm"]
-    		var healer = ["Cnj", "Whm", "Sch"]
+    		var tank = ["Gla", "Pld", "Mrd", "War", "Drk"]
+			var dps = ["Pgl", "Mnk", "Lnc", "Drg", "Arc", "Brd", "Rog", "Nin", "Acn", "Smn", "Thm", "Blm", "Mch"]
+    		var healer = ["Cnj", "Whm", "Sch", "Ast"]
 
     		if (index == 0 || typeof dpsBarEffect.topdeeps == 'undefined') {
         		dpsBarEffect.topdeeps = combatant["encdps"];

diff --git a/miniparseNoIcon.html b/miniparseNoIcon.html
@@ -87,6 +87,7 @@
 #combatantTableBody .Gla td,
 #combatantTableBody .Pld td,
 #combatantTableBody .Mrd td,
+#combatantTableBody .Drk td,
 #combatantTableBody .War td {
 	color: #ffffff;
 	background-color: rgba(41,112,243,0.2);
@@ -95,6 +96,7 @@
 
 #combatantTableBody .Cnj td,
 #combatantTableBody .Whm td,
+#combatantTableBody .Ast td,
 #combatantTableBody .Sch td {
 	color: #ffffff;
 	background-color: rgba(107,240,86,0.2);
@@ -107,6 +109,7 @@
 #combatantTableBody .Drg td,
 #combatantTableBody .Arc td,
 #combatantTableBody .Brd td,
+#combatantTableBody .Mch td,
 #combatantTableBody .Rog td,
 #combatantTableBody .Nin td,
 #combatantTableBody .Acn td,
@@ -141,7 +144,7 @@
 
 
 </style>
-<script src="jquery-2.1.1.min.js" type="text/javascript"></script>
+<script src="lib/jquery-2.1.1.min.js" type="text/javascript"></script>
 <script>
 
 		//

diff --git a/miniparseStdIcon.html b/miniparseStdIcon.html
@@ -87,6 +87,7 @@
 #combatantTableBody .Gla td,
 #combatantTableBody .Pld td,
 #combatantTableBody .Mrd td,
+#combatantTableBody .Drk td,
 #combatantTableBody .War td {
 	color: #ffffff;
 	background-color: rgba(41,112,243,0.2);
@@ -95,6 +96,7 @@
 
 #combatantTableBody .Cnj td,
 #combatantTableBody .Whm td,
+#combatantTableBody .Ast td,
 #combatantTableBody .Sch td {
 	color: #ffffff;
 	background-color: rgba(107,240,86,0.2);
@@ -107,6 +109,7 @@
 #combatantTableBody .Drg td,
 #combatantTableBody .Arc td,
 #combatantTableBody .Brd td,
+#combatantTableBody .Mch td,
 #combatantTableBody .Rog td,
 #combatantTableBody .Nin td,
 #combatantTableBody .Acn td,
@@ -138,7 +141,7 @@
         }
 
 </style>
-<script src="jquery-2.1.1.min.js" type="text/javascript"></script>
+<script src="lib/jquery-2.1.1.min.js" type="text/javascript"></script>
 <script>
 
 		//

diff --git a/miniparseStdIconGraph.html b/miniparseStdIconGraph.html
@@ -87,6 +87,7 @@
 #combatantTableBody .Gla td,
 #combatantTableBody .Pld td,
 #combatantTableBody .Mrd td,
+#combatantTableBody .Drk td,
 #combatantTableBody .War td {
 	color: #ffffff;
 	background-color: rgba(41,112,243,0.2);
@@ -95,6 +96,7 @@
 
 #combatantTableBody .Cnj td,
 #combatantTableBody .Whm td,
+#combatantTableBody .Ast td,
 #combatantTableBody .Sch td {
 	color: #ffffff;
 	background-color: rgba(107,240,86,0.2);
@@ -107,6 +109,7 @@
 #combatantTableBody .Drg td,
 #combatantTableBody .Arc td,
 #combatantTableBody .Brd td,
+#combatantTableBody .Mch td,
 #combatantTableBody .Rog td,
 #combatantTableBody .Nin td,
 #combatantTableBody .Acn td,
@@ -138,7 +141,7 @@
         }
 
 </style>
-<script src="jquery-2.1.1.min.js" type="text/javascript"></script>
+<script src="lib/jquery-2.1.1.min.js" type="text/javascript"></script>
 <script>
 
 		//
@@ -217,34 +220,34 @@
 			}
 		}
 
-function dpsBarEffect(cell, combatant, index) {
-    var tank = ["Gla", "Pld", "Mrd", "War"]
-    var dps = ["Pgl", "Mnk", "Lnc", "Drg", "Arc", "Brd", "Rog", "Nin", "Acn", "Smn", "Thm", "Blm"]
-    var healer = ["Cnj", "Whm", "Sch"]
-
-    if (index == 0 || typeof dpsBarEffect.topdeeps == 'undefined') {
-        dpsBarEffect.topdeeps = combatant["encdps"];
-    }
-    var deeps = combatant["encdps"];
-
-    // 色指定
-    var job = combatant["Job"];
-    if (dps.indexOf(job) > -1){
-        var color = "rgba(200,3,8,0.3)";
-    } else if (tank.indexOf(job) > -1){
-        var color = "rgba(41,112,243,0.3)";
-    } else if (healer.indexOf(job) > -1){
-        var color = "rgba(107,240,86,0.3)";
-    } else {
-        var color = "rgba(128,0,255,0.3)";
-    }
-    
-    var tableRow = cell.parentNode;
-    tableRow.style.background = "-webkit-gradient(linear, left top,right top, color-stop(0.95,"+ color + "), to(rgba(24,24,24,0.0)))";
-    tableRow.style.backgroundSize = (parseInt(deeps) * 100 / parseInt(dpsBarEffect.topdeeps)) + "% 100%";
-    tableRow.style.backgroundAttachment = "fixed";
-    tableRow.style.backgroundRepeat = "no-repeat";
-}
+		function dpsBarEffect(cell, combatant, index) {
+			var tank = ["Gla", "Pld", "Mrd", "War", "Drk"]
+			var dps = ["Pgl", "Mnk", "Lnc", "Drg", "Arc", "Brd", "Rog", "Nin", "Acn", "Smn", "Thm", "Blm", "Mch"]
+			var healer = ["Cnj", "Whm", "Sch", "Ast"]
+
+			if (index == 0 || typeof dpsBarEffect.topdeeps == 'undefined') {
+				dpsBarEffect.topdeeps = combatant["encdps"];
+			}
+			var deeps = combatant["encdps"];
+
+			// 色指定
+			var job = combatant["Job"];
+			if (dps.indexOf(job) > -1){
+				var color = "rgba(200,3,8,0.3)";
+			} else if (tank.indexOf(job) > -1){
+				var color = "rgba(41,112,243,0.3)";
+			} else if (healer.indexOf(job) > -1){
+				var color = "rgba(107,240,86,0.3)";
+			} else {
+				var color = "rgba(128,0,255,0.3)";
+			}
+			
+			var tableRow = cell.parentNode;
+			tableRow.style.background = "-webkit-gradient(linear, left top,right top, color-stop(0.95,"+ color + "), to(rgba(24,24,24,0.0)))";
+			tableRow.style.backgroundSize = (parseInt(deeps) * 100 / parseInt(dpsBarEffect.topdeeps)) + "% 100%";
+			tableRow.style.backgroundAttachment = "fixed";
+			tableRow.style.backgroundRepeat = "no-repeat";
+		}