diff --git a/files/icons/los33.xcf b/files/icons/los33.xcf index 3c92570c6a..04d6cd750d 100644 Binary files a/files/icons/los33.xcf and b/files/icons/los33.xcf differ diff --git a/src/assets/img/stats/los0.png b/src/assets/img/stats/los0.png new file mode 100644 index 0000000000..d7c474a333 Binary files /dev/null and b/src/assets/img/stats/los0.png differ diff --git a/src/assets/img/stats/los1.png b/src/assets/img/stats/los1.png index d7c474a333..9e3d76be44 100644 Binary files a/src/assets/img/stats/los1.png and b/src/assets/img/stats/los1.png differ diff --git a/src/assets/img/stats/los2.png b/src/assets/img/stats/los2.png index 7ba072540e..77aac27d29 100644 Binary files a/src/assets/img/stats/los2.png and b/src/assets/img/stats/los2.png differ diff --git a/src/assets/img/stats/los3.png b/src/assets/img/stats/los3.png index 8498032613..b6f67e5d8c 100644 Binary files a/src/assets/img/stats/los3.png and b/src/assets/img/stats/los3.png differ diff --git a/src/assets/img/stats/los4.png b/src/assets/img/stats/los4.png index 72c66e50e5..68c399aca1 100644 Binary files a/src/assets/img/stats/los4.png and b/src/assets/img/stats/los4.png differ diff --git a/src/assets/img/stats/ls_f33.png b/src/assets/img/stats/ls_f33.png new file mode 100644 index 0000000000..7ba072540e Binary files /dev/null and b/src/assets/img/stats/ls_f33.png differ diff --git a/src/assets/img/stats_p2/los0.png b/src/assets/img/stats_p2/los0.png new file mode 100644 index 0000000000..d1db495e92 Binary files /dev/null and b/src/assets/img/stats_p2/los0.png differ diff --git a/src/assets/img/stats_p2/los1.png b/src/assets/img/stats_p2/los1.png index d1db495e92..261105129c 100644 Binary files a/src/assets/img/stats_p2/los1.png and b/src/assets/img/stats_p2/los1.png differ diff --git a/src/assets/img/stats_p2/los2.png b/src/assets/img/stats_p2/los2.png index 261105129c..3adbd72a6e 100644 Binary files a/src/assets/img/stats_p2/los2.png and b/src/assets/img/stats_p2/los2.png differ diff --git a/src/data/lang b/src/data/lang index 99ffb409be..089085fb08 160000 --- a/src/data/lang +++ b/src/data/lang @@ -1 +1 @@ -Subproject commit 99ffb409be97676b063302d1deb9b080ca5a2ab6 +Subproject commit 089085fb08c8a33b5ed083081e7adcb74418150f diff --git a/src/data/settings.json b/src/data/settings.json index 0fb7237cff..77591514c5 100644 --- a/src/data/settings.json +++ b/src/data/settings.json @@ -332,8 +332,8 @@ "type" : "radio", "options" : { "choices" : [ - [ 1, "SettingsELosSum" ], - [ 2, "SettingsELosF33" ], + [ 1, "SettingsELosF33" ], + [ 2, "SettingsELosF33x2" ], [ 3, "SettingsELosF33x3" ], [ 4, "SettingsELosF33x4" ] ] diff --git a/src/library/managers/ConfigManager.js b/src/library/managers/ConfigManager.js index 71c685ef28..ba9159fb27 100644 --- a/src/library/managers/ConfigManager.js +++ b/src/library/managers/ConfigManager.js @@ -18,7 +18,7 @@ Retrieves when needed to apply on components version : 8, language : this.detectBrowserLanguage(), hqInfoPage : 1, - elosFormula : 2, + elosFormula : 1, aaFormation : 1, imaginaryEnemyType : 0, imaginaryEnemyArmor : 0, diff --git a/src/library/objects/Fleet.js b/src/library/objects/Fleet.js index 01d6630ff8..05a6c11257 100644 --- a/src/library/objects/Fleet.js +++ b/src/library/objects/Fleet.js @@ -998,7 +998,8 @@ Contains summary information about a fleet and its ships ------------------------------------*/ KC3Fleet.prototype.eLoS = function(){ switch(ConfigManager.elosFormula){ - case 1: return this.eLos1(); + case 0: return this.eLos1(); + case 2: return this.eLos4(2); case 3: return this.eLos4(3); case 4: return this.eLos4(4); default: return this.eLos4(); @@ -1128,7 +1129,6 @@ Contains summary information about a fleet and its ships availableShips.forEach(ship => { // According tests, visible LoS bonus from equipment should be added to ship part, // except these pieces for now: SG Radar (Initial Model) - // Untested yet: Swordfish Mk.III Kai (Seaplane Model / Skilled) // https://wikiwiki.jp/kancolle/%E3%83%AB%E3%83%BC%E3%83%88%E5%88%86%E5%B2%90#equipment_bonus const losOnShipBonus = ship.equipmentTotalStats("saku", true, true, true, null, null, null, [315]) || 0; // sum ship's naked LoS diff --git a/src/pages/devtools/themes/moonlight/moonlight.js b/src/pages/devtools/themes/moonlight/moonlight.js index ad4541eeec..a6142a20ec 100644 --- a/src/pages/devtools/themes/moonlight/moonlight.js +++ b/src/pages/devtools/themes/moonlight/moonlight.js @@ -2285,7 +2285,6 @@ $(".summary-eqlos .summary_textf332").text( "x2: {1}".format(f33Cn) ); $(".summary-eqlos .summary_textf333").text( "x3: {2}".format(f33Cn) ); $(".summary-eqlos .summary_textf334").text( "x4: {3}".format(f33Cn) ); - // No reference values for combined fleet yet, only show computed values } else if(selectedFleet === 5){ const mainFleet = PlayerManager.fleets[0], escortFleet = PlayerManager.fleets[1], diff --git a/src/pages/devtools/themes/natsuiro/natsuiro.js b/src/pages/devtools/themes/natsuiro/natsuiro.js index ac5a42d361..923c837124 100644 --- a/src/pages/devtools/themes/natsuiro/natsuiro.js +++ b/src/pages/devtools/themes/natsuiro/natsuiro.js @@ -2144,7 +2144,7 @@ .attr("title", KC3Meta.term("PanelFleetAATip")) .lazyInitTooltip(); $(".summary-speed .summary_text").text(FleetSummary.speed); - if(ConfigManager.elosFormula > 1){ + if(ConfigManager.elosFormula > 0){ // F33 different factors for Phase 1: 6-2(F,H)/6-3(H):x3, 3-5(G)/6-1(E,F):x4 if(selectedFleet < 5){ const f33Cn = Array.numbers(1, 4) @@ -2153,7 +2153,6 @@ "x1={0}\nx2={1}\nx3={2}\nx4={3}" .format(f33Cn) ).lazyInitTooltip(); - // No reference values for combined fleet yet, only show computed values } else if(selectedFleet === 5){ const mainFleet = PlayerManager.fleets[0], escortFleet = PlayerManager.fleets[1], diff --git a/src/pages/strategy/tabs/fleet/fleet.js b/src/pages/strategy/tabs/fleet/fleet.js index 87289ecbc6..5390f94cba 100644 --- a/src/pages/strategy/tabs/fleet/fleet.js +++ b/src/pages/strategy/tabs/fleet/fleet.js @@ -10,6 +10,7 @@ viewType: "", currentFleetsObj: null, suggestedName: "", + sortiedMap: "", /* "fleets" object format: @@ -285,6 +286,7 @@ $("#fleet_description").text("Current Fleets"); this.currentFleetsObj = this.getCurrentFleetsObj(); this.suggestedName = "Fleets (" + new Date().format("yyyy-mm-dd HH:MM:ss") + ")"; + this.sortiedMap = ""; }, showSavedFleets: function(name) { @@ -306,6 +308,7 @@ $("#fleet_description").text("Saved Fleets '" + name + "'"); this.currentFleetsObj = fleetsObj; this.suggestedName = name; + this.sortiedMap = ""; }, showFleetFromSortieId: function(sortieId) { @@ -329,9 +332,14 @@ }); self.currentFleetsObj = fleetsObj; - self.suggestedName = "Sortie #" + sortieId; + self.sortiedMap = [sortieData.world, sortieData.mapnum].join(""); + self.suggestedName = "Sortie #{0} {1}{2}-{3}".format( + sortieId, KC3Meta.isEventWorld(sortieData.world) ? "E" : "W", sortieData.world, sortieData.mapnum + ); self.showAllKCFleets( kcFleets ); - $("#fleet_description").text("Sortie #" + sortieId + " Fleets"); + $("#fleet_description").text("{0}{1} Fleets".format( + self.suggestedName, sortieData.combined ? " Combined" : "" + )); }); }, @@ -391,7 +399,7 @@ )); $(".detail_los .detail_icon img", fleetBox).attr("src", "/assets/img/stats/los"+ConfigManager.elosFormula+".png" ); $(".detail_los .detail_value", fleetBox).text( Math.qckInt("floor", kcFleet.eLoS(), 1) ); - if(ConfigManager.elosFormula > 1) { + if(ConfigManager.elosFormula > 0) { const f33CnHq4 = Array.numbers(1, 5).map(cn => Math.qckInt("floor", kcFleet.eLos4(cn), 1).toLocaleString(undefined, KC3Meta.formatDecimalOptions(1, false) )); diff --git a/src/pages/strategy/tabs/gears/gears.js b/src/pages/strategy/tabs/gears/gears.js index 93fe8c8d88..8a6aac5850 100644 --- a/src/pages/strategy/tabs/gears/gears.js +++ b/src/pages/strategy/tabs/gears/gears.js @@ -102,6 +102,8 @@ "t46": "tp", // ASW land base bomber "t47": "as", + // land base heavy bomber + "t49": "dv", // all types "tall": "type", },