From 28e8d8b70cfd56088128de42e0ba6f7f6c90d205 Mon Sep 17 00:00:00 2001 From: cer0m Date: Thu, 3 Nov 2022 21:54:50 +0100 Subject: [PATCH] Bugfixes --- Thorg/thorg.html | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/Thorg/thorg.html b/Thorg/thorg.html index 6510f1f89e..19537d3800 100644 --- a/Thorg/thorg.html +++ b/Thorg/thorg.html @@ -2722,7 +2722,7 @@ - + @@ -2799,7 +2799,7 @@ - + @@ -4805,7 +4805,7 @@ on("change:repeating_nwtalente:nwt_name change:repeating_wspezs:wspez change:all for(var i=0; i < tmp_list.length; i++) { id_list[i] = tmp_list[i].match(/-(.*?)(?=_)/g); }; - getAttrs(tmp_list, function(values) { + getAttrs(tmp_list, function(values) { var nwt_list = Object.values(values); getAttrs(nw_talente, function(v) { var nwt_tw_list = Object.values(v); @@ -4813,11 +4813,11 @@ on("change:repeating_nwtalente:nwt_name change:repeating_wspezs:wspez change:all var kk = parseInt(values["kk"])||0; for (var i=0; i < nwt_list.length; i++) { var id = id_list[i]; - var nwt_nr = nwt_list[i]; - var tw = nwt_tw_list[nwt_nr]; + var nwt_nr = parseInt(nwt_list[i])||0; + var tw = parseInt(nwt_tw_list[nwt_nr])||0; var tn = nw_namen[nwt_nr]; var sb = 0; - var sbw = Math.round( (tw + kk) / 2 ); + var sbw = Math.round((tw + kk)/2); var mauv = 0; if ( sbw >= 61 && sbw <= 70 ) { sb = 1; }; if ( sbw >= 71 && sbw <= 80 ) { sb = 2; }; @@ -4839,10 +4839,10 @@ on("change:repeating_nwtalente:nwt_name change:repeating_wspezs:wspez change:all if ( sbw >= 231 && sbw <= 240 ) { sb = 18; }; if ( sbw >= 241 && sbw <= 250 ) { sb = 19; }; if ( sbw >= 251 && sbw <= 260 ) { sb = 20; }; - if ( sbw >= 261 && sbw <= 270 ) { sb = 21; }; + if ( sbw >= 261 ) { sb = 21; }; if ( tw >= 80 && tw <= 90 ) { mauv = 1; }; if ( tw >= 91 && tw <= 100 ) { mauv = 2; }; - if ( tw >= 101 ) { auv = 3; }; + if ( tw >= 101 ) { mauv = 3; }; setAttrs({["repeating_nwtalente_" + id + "_nwt_tw"]: tw}); setAttrs({["repeating_nwtalente_" + id + "_nwt_sb"]: sb}); setAttrs({["repeating_nwtalente_" + id + "_nwt_mauv"]: mauv}); @@ -4852,7 +4852,7 @@ on("change:repeating_nwtalente:nwt_name change:repeating_wspezs:wspez change:all var ws_tw; var ws = 0; var ws_list = []; - for(var i=0; i < idArray.length; i++) { + for(var i=0; i < idArray2.length; i++) { ws_name = "repeating_wspezs_" + idArray2[i] + "_wspez_name"; ws_tw = "repeating_wspezs_" + idArray2[i] + "_wspez"; ws_list.push(ws_name, ws_tw); @@ -4862,7 +4862,7 @@ on("change:repeating_nwtalente:nwt_name change:repeating_wspezs:wspez change:all var vals = Object.values(values); for (var j = 0; j < nwt_list.length; j++) { var ws_bonus = 0; - var nr = nwt_list[j]; + var nr = parseInt(nwt_list[j])||0; var ident = id_list[j]; var t_name = nw_namen[nr]; setAttrs({ ["repeating_nwtalente_" + ident + "_nwt_ws"]: 0 }); @@ -4928,22 +4928,17 @@ on("change:repeating_fwtalente:fwt_name change:repeating_wspezs:wspez change:arm }; getAttrs(tmp_list, function(values) { var fwt_list = Object.values(values); - console.log(fwt_list); getAttrs(fw_talente, function(v) { - var fwt_tw_list = Object.values(v); - console.log(Object.values(v)); + var fwt_tw_list = Object.values(v); for (var i=0; i < fwt_list.length; i++) { var id = id_list[i]; - console.log(id); - var fwt_nr = fwt_list[i]; - var tw = fwt_tw_list[fwt_nr]; + var fwt_nr = parseInt(fwt_list[i])||0; + var tw = parseInt(fwt_tw_list[fwt_nr])||0; var tn = fw_namen[fwt_nr]; - console.log("Talent: " + tn); - console.log("Talentwert: " + tw); var mauv = 0; if ( tw >= 80 && tw <= 90 ) { mauv = 1; }; if ( tw >= 91 && tw <= 100 ) { mauv = 2; }; - if ( tw >= 101 ) { auv = 3; }; + if ( tw >= 101 ) { mauv = 3; }; setAttrs({["repeating_fwtalente_" + id + "_fwt_tw"]: tw}); setAttrs({["repeating_fwtalente_" + id + "_fwt_mauv"]: mauv}); }; @@ -4952,34 +4947,28 @@ on("change:repeating_fwtalente:fwt_name change:repeating_wspezs:wspez change:arm var ws_tw; var ws = 0; var ws_list = []; - for(var i=0; i < idArray.length; i++) { + for(var i=0; i < idArray2.length; i++) { ws_name = "repeating_wspezs_" + idArray2[i] + "_wspez_name"; - console.log(ws_name); ws_tw = "repeating_wspezs_" + idArray2[i] + "_wspez"; - console.log(ws_tw); ws_list.push(ws_name, ws_tw); }; ws_tw = 0; getAttrs(ws_list, function(values) { var vals = Object.values(values); - console.log(vals); for (var j = 0; j < fwt_list.length; j++) { var ws_bonus = 0; - var nr = fwt_list[j]; + var nr = parseInt(fwt_list[j])||0; var ident = id_list[j]; var t_name = fw_namen[nr]; - console.log(t_name); setAttrs({ ["repeating_fwtalente_" + ident + "_fwt_ws"]: 0 }); setAttrs({ ["repeating_fwtalente_" + ident + "_fwt_twws"]: 0 }); setAttrs({ ["repeating_fwtalente_" + ident + "_fwt_apws"]: 0 }); setAttrs({ ["repeating_fwtalente_" + ident + "_fwt_tpws"]: 0 }); for (var i=0; i < vals.length; i=i+2) { ws_name = vals[i].toString(); - console.log(ws_name); if ( ws_name == t_name ) { ws = 1; ws_tw = parseInt(vals[i+1])||0; - console.log(ws_tw); if ( ws_tw <= 60 ) { ws_bonus = 0; }; if ( ws_tw >= 61 && ws_tw <= 70 ) { ws_bonus = 1; }; if ( ws_tw >= 71 && ws_tw <= 80 ) { ws_bonus = 2; };