Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 55 additions & 3 deletions js/vec.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ var type_minFire = [ 142,142,140,128,126,124,124 ];

// 살상1 살상2 선봉 격양
var selected_talent = [ 0, 0, 0, 0 ];
var fairy_talent = [ 12, 15, 8, 10 ];
//var fairy_talent = [ 12, 15, 8, 10 ];
var fairy_talent = [[5, 7, 9, 10, 12 ],
[6, 8, 11, 13, 15 ],
[3, 4, 6, 7, 8 ],
[3, 6, 7, 9, 10 ]] ;

var selected_rare = [ 0, 0, 0, 0, 0 ];
var buff_talent = 0;

$(function (){
Expand Down Expand Up @@ -78,18 +84,45 @@ function disp_selTalent(){
function btn_selTalent(id){
if(selected_talent[id] == 1){
selected_talent[id] = 0;
buff_talent = 0;
//buff_talent = 0;
}else{
for(var i = 0; i < selected_talent.length; i++){
selected_talent[i] = 0;
}
selected_talent[id] = 1;
buff_talent = fairy_talent[id];
//buff_talent = fairy_talent[id];
}
disp_selTalent();
reCalc();
}

function disp_selRare(){
for(var i = 0; i < 5; i++){
if(selected_rare[i] == 1){
$('#btn-rare-' + i).removeClass('btn-default');
$('#btn-rare-' + i).addClass('btn-success');
}else{
$('#btn-rare-' + i).removeClass('btn-success');
$('#btn-rare-' + i).addClass('btn-default');
}
}
}

function btn_selRare(id){
if(selected_rare[id] == 1){
selected_rare[id] = 0;
//buff_talent = 0;
}else{
for(var i = 0; i < 5; i++){
selected_rare[i] = 0;
}
selected_rare[id] = 1;
//buff_talent = fairy_talent[id];
}
disp_selRare();
reCalc();
}

function disp_selType(){
for(var i = 0; i < selected_enc.length; i++){
var btn = document.getElementById('btn-type-' + i);
Expand Down Expand Up @@ -170,6 +203,20 @@ function reCalc(){
$('#buff_fire').val(250);
}

var talent_id=-1;
var rare_id=-1;

for(var i = 0; i < 5; i++){
if(selected_rare[i]==1)
rare_id=i;
}
for(var i = 0; i < 4; i++){
if(selected_talent[i]==1)
talent_id=i;
}

buff_talent= (talent_id != -1 && rare_id != -1) ? (fairy_talent[talent_id][rare_id]) : 0;

var finalFire = Math.ceil(Math.ceil(dollFire * (1 + (fairyFire / 100))) * (1 + (buffFire / 100)) * (1 + (buff_talent / 100)));

chkFire(finalFire);
Expand Down Expand Up @@ -275,6 +322,11 @@ function setLanguage(){
$('#btn-talent-'+(i-1)).text(langPack.talent['t'+ i]);
}

$('#text-rare-title').html(langPack.rare.title);
for (let i = 1; i <= 5; i++) {
$('#btn-rare-'+(i-1)).text( "★".repeat(i) );
}

$('#text-result-title').text(langPack.result.title);

$('#help_pic_stat').attr("src", 'img/vec/help_stat_' + selLang + '.png');
Expand Down
68 changes: 62 additions & 6 deletions js/zas.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,23 @@ var dangerZone = 0;

// 살상1 살상2 돌격 격양
var selected_talent = [ 0, 0, 0, 0 ];
var fairy_talent_fire = [ 12, 15, 10, 8 ];
var fairy_talent_rate = [ 0, 0, 8, 0 ];
//var fairy_talent_fire = [ 12, 15, 10, 8 ];
//var fairy_talent_rate = [ 0, 0, 8, 0 ];
var buff_talent_fire = 0;
var buff_talent_rate = 0;

var fairy_talent_fire = [[5, 7, 9, 10, 12 ],
[6, 8, 11, 13, 15 ],
[4, 6, 7, 9, 10 ],
[3, 6, 7, 9, 10 ]];

var fairy_talent_rate = [[0, 0, 0, 0, 0 ],
[0, 0, 0, 0, 0 ],
[3, 4, 6, 7, 8 ],
[0, 0, 0, 0, 0 ]];

var selected_rare = [ 0, 0, 0, 0, 0 ];

var selLang = 'ko';
var langPack;
var langPacks;
Expand Down Expand Up @@ -110,20 +122,45 @@ function disp_selTalent(){
function btn_selTalent(id){
if(selected_talent[id] == 1){
selected_talent[id] = 0;
buff_talent_fire = 0;
buff_talent_rate = 0;
//buff_talent_fire = 0;
//buff_talent_rate = 0;
}else{
for(var i = 0; i < selected_talent.length; i++){
selected_talent[i] = 0;
}
selected_talent[id] = 1;
buff_talent_fire = fairy_talent_fire[id];
buff_talent_rate = fairy_talent_rate[id];
//buff_talent_fire = fairy_talent_fire[id];
//buff_talent_rate = fairy_talent_rate[id];
}
disp_selTalent();
reCalc();
}

function disp_selRare(){
for(var i = 0; i < 5; i++){
if(selected_rare[i] == 1){
$('#btn-rare-' + i).removeClass('btn-default');
$('#btn-rare-' + i).addClass('btn-success');
}else{
$('#btn-rare-' + i).removeClass('btn-success');
$('#btn-rare-' + i).addClass('btn-default');
}
}
}

function btn_selRare(id){
if(selected_rare[id] == 1){
selected_rare[id] = 0;
}else{
for(var i = 0; i < 5; i++){
selected_rare[i] = 0;
}
selected_rare[id] = 1;
}
disp_selRare();
reCalc();
}

function btn_selArea(idx){
switch(idx){
case 81:
Expand Down Expand Up @@ -217,7 +254,21 @@ function reCalc(){
buffRate = 100;
$('#buff_rate').val(100);
}

var talent_id=-1;
var rare_id=-1;
for(var i = 0; i < 5; i++){
if(selected_rare[i]==1)
rare_id=i;
}
for(var i = 0; i < 4; i++){
if(selected_talent[i]==1)
talent_id=i;
}

buff_talent_fire=(talent_id != -1 && rare_id != -1) ? (fairy_talent_fire[talent_id][rare_id]) : 0;
buff_talent_rate=(talent_id != -1 && rare_id != -1) ? (fairy_talent_rate[talent_id][rare_id]) : 0;

var finalFire = Math.floor(Math.floor(dollFire * (1 + (fairyFire / 100))) * (1 + (buffFire / 100)) * (1 + (buff_talent_fire / 100)) + 1); // * (0.85)
var finalRate = Math.floor(dollRate * (1 + (buffRate / 100)) * (1 + (buff_talent_rate / 100)));

Expand Down Expand Up @@ -366,6 +417,11 @@ function setLanguage(){
$('#btn-talent-'+(i-1)).text(langPack.talent['t'+ i]);
}

$('#text-rare-title').html(langPack.rare.title);
for (let i = 1; i <= 5; i++) {
$('#btn-rare-'+(i-1)).text( "★".repeat(i) );
}

$('#text-result-title').text(langPack.result.title);

$('#help_pic_stat').attr("src", 'img/zas/help_stat_' + selLang + '.png');
Expand Down
11 changes: 10 additions & 1 deletion lang/lang_vec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ var languagepack_vec =
"title":"승객: "
},
"talent":{
"title":"요정 특성: <small>(5성 필수 = 100% 발동)</small>",
"title":"요정 특성: ",
"t1":"살상계 I",
"t2":"살상계 II",
"t3":"선봉계",
"t4":"격양계"
},
"rare":{
"title":"요정 레어도(3.0): "
},
"result":{
"title":"계산 결과: ",
"fire":{
Expand Down Expand Up @@ -73,6 +76,9 @@ var languagepack_vec =
"t3":"先鋒型",
"t4":"激昂型"
},
"rare":{
"title":"妖精ランク(3.0): <small>(★5推薦 = 100% 発動)</small>"
},
"result":{
"title":"計算結果: ",
"fire":{
Expand Down Expand Up @@ -119,6 +125,9 @@ var languagepack_vec =
"t3":"Charge",
"t4":"Fervor"
},
"rare":{
"title":"Fairy Rarity(3.0): <small>(Recommend 5-Star, active rate 100%)</small>"
},
"result":{
"title":"Result: ",
"fire":{
Expand Down
13 changes: 11 additions & 2 deletions lang/lang_zas.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ var languagepack_zas =
"rate":"사속버프 합계(%) 입력"
},
"talent":{
"title":"요정 특성: <small>(★5 필수 = 100% 발동)</small>",
"title":"요정 특성: ",
"t1":"살상계 I",
"t2":"살상계 II",
"t3":"돌격계",
"t4":"격양계"
},
"rare":{
"title":"요정 레어도(3.0): "
},
"result":{
"title":"계산 결과: ",
"fire":{
Expand Down Expand Up @@ -86,6 +89,9 @@ var languagepack_zas =
"t3":"突撃型",
"t4":"激昂型"
},
"rare":{
"title":"妖精ランク(3.0): <small>(★5推薦 = 100% 発動)</small>"
},
"result":{
"title":"計算結果: ",
"fire":{
Expand Down Expand Up @@ -140,12 +146,15 @@ var languagepack_zas =
"rate":"RoF. Buff (%)"
},
"talent":{
"title":"Fairy Talent: <small>(Recommend ★5 = active rate 100%)</small>",
"title":"Fairy Talent: <small>(Recommend 5-Star, active rate 100%)</small>",
"t1":"Damage I",
"t2":"Damage II",
"t3":"Assualt",
"t4":"Fervor"
},
"rare":{
"title":"Fairy Rarity(3.0): <small>(Recommend 5-Star, active rate 100%)</small>"
},
"result":{
"title":"Result: ",
"fire":{
Expand Down
23 changes: 22 additions & 1 deletion vec.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,27 @@
</div>
</div>

<hr style="margin-top:5px; margin-bottom:5px;">
<div>
<div style="width:100%;">
<span id="text-rare-title" style="font-size:0.9em;"></span>
</div>
<div style="width:100%; display:inline-block;">
<div class="col-sm-12" style="padding:0px;">
<button id="btn-rare-0" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(0);">
</button>
<button id="btn-rare-1" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(1);">
</button>
<button id="btn-rare-2" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(2);">
</button>
<button id="btn-rare-3" type="button" class="btn btn-sm btn-default col-sm-offset-2 col-xs-offset-2 col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(3);">
</button>
<button id="btn-rare-4" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(4);">
</button>
</div>
</div>
</div>

<hr style="margin-top:5px; margin-bottom:5px;">
<div>
<div style="width:100%;">
Expand Down Expand Up @@ -245,4 +266,4 @@
<script src="lang/lang_vec.js"></script>
<script src="js/vec.js"></script>
</body>
</html>
</html>
21 changes: 21 additions & 0 deletions zas.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,27 @@
</div>
</div>

<hr style="margin-top:5px; margin-bottom:5px;">
<div>
<div style="width:100%;">
<span id="text-rare-title" style="font-size:0.9em;"></span>
</div>
<div style="width:100%; display:inline-block;">
<div class="col-sm-12" style="padding:0px;">
<button id="btn-rare-0" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(0);">
</button>
<button id="btn-rare-1" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(1);">
</button>
<button id="btn-rare-2" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(2);">
</button>
<button id="btn-rare-3" type="button" class="btn btn-sm btn-default col-sm-offset-2 col-sm-4 col-xs-offset-2 col-xs-4" style="padding:0rem;" onclick="btn_selRare(3);">
</button>
<button id="btn-rare-4" type="button" class="btn btn-sm btn-default col-sm-4 col-xs-4" style="padding:0rem;" onclick="btn_selRare(4);">
</button>
</div>
</div>
</div>

<hr style="margin-top:5px; margin-bottom:5px;">
<div>
<div style="width:100%;">
Expand Down