update

KC3Kai · Jul 5, 2024 · 79846c8 · 79846c8
1 parent b2d12ba
commit 79846c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/js/data/strings_en.json b/js/data/strings_en.json
@@ -161,7 +161,8 @@
 	"resupply_cost": "Resupply Cost",
 	"submarine_only": "Submarine Only",
 	"add_cost": "Add Cost (% of current supply before battle)",
-	"max": "Max",
+	"add_cost_max": "Max",
+	"add_cost_max_tooltip": "Fixed max amount that can be subtracted.\nExample: 5-5-D maelstrom has Max = 80. If fuel cost = 35% and fuel supply = 253, then cost is normally 88, but Max caps it to 80.",
 	"player_formation": "Player Formation",
 	"use_form_if_special_impossible": "Use \u00a0{img_form}\u00a0 if Special Attack becomes impossible",
 	"line_ahead": "Line Ahead",
@@ -386,6 +387,7 @@
 	"require_radar_after_fcf": "Require Ships with Surface Radar (after FCF)",
 	"require_ship_counts": "Require Ship Counts (after FCF)",
 	"ship_counts_desc": "e.g. \"DD\", \"DE/DD/CL\", \"XX\"",
+	"ship_counts_list": "",
 	"add": "Add",
 	"never_use_on": "Never Use On",
 	"note_require_on_node": "* (\"on Node\" = applies check after battle on this node and on all nodes before it, for example: \"on Node 2\" = checks on nodes 1 and 2, does not check on node 3 and after)",

diff --git a/js/data/strings_ja.json b/js/data/strings_ja.json
@@ -161,7 +161,8 @@
 	"resupply_cost": "資源消費タイプ",
 	"submarine_only": "潜水艦のみ",
 	"add_cost": "追加コスト(戦闘開始前に現在の残り資源から)",
-	"max": "Max",
+	"add_cost_max": "Max",
+	"add_cost_max_tooltip": "Fixed max amount that can be subtracted.\nExample: 5-5-D maelstrom has Max = 80. If fuel cost = 35% and fuel supply = 253, then cost is normally 88, but Max caps it to 80.",
 	"player_formation": "自艦隊陣形",
 	"use_form_if_special_impossible": "特殊砲撃が不可能な場合、\u00a0{img_form}\u00a0を使用",
 	"line_ahead": "単縦陣",
@@ -175,7 +176,7 @@
 	"enable_atoll_node_effects": "特四式内火艇/改による越環礁攻撃を実施する",
     "use_anchorage_repair_before_battle": "戦闘前に緊急泊地修理を実施する",
 	"override_historical_bonuses": "史実ボーナス上書き",
-	"enemy_fleet": "Enemy Fleet",
+	"enemy_fleet": "敵艦隊",
 	"set_bonuses": "手動セット",
 	"main_fleet_set": "出撃艦隊",
 	"lbas_set": "基地航空隊",
@@ -224,7 +225,7 @@
 	"bonus_acc_desc": "マップ全体で命中ボーナスを付与します(倍率)",
 	"bonus_eva": "回避{br}ボーナス",
 	"bonus_eva_desc": "マップ全体で回避ボーナスを付与します(倍率)",
-	"debuff_dmg": "ダメージ{br}ボーナス{br}(ボス旗艦)",
+	"debuff_dmg": "ボス特効",
 	"debuff_dmg_desc": "最終Nodeにおける敵旗艦へのダメージボーナス(倍率)。ボーナスダメージに累積します。※敵旗艦へのボーナスがインポートできない段階でのみ使用してください",
 	"slot_size": "搭載数",
 	"proficiency": "艦載機熟練度",
@@ -386,6 +387,7 @@
 	"require_radar_after_fcf": "退避後に必要な水上電探の数",
 	"require_ship_counts": "退避後に必要な艦数及び艦種",
 	"ship_counts_desc": "例: \"DD\", \"DE/DD/CL\", \"XX\"",
+	"ship_counts_list": "（SS：潜水　SSV：潜空　AV：水母　AR：工作　AS：潜母　AO：補給　LHA：揚陸　DE：海防　DD：駆逐　CL：軽巡　CLT：雷巡　CT：練巡　CA：重巡　CAV：航巡　CVL：軽空　CV：正空　CVB：装空　FBB：高戦　BB：戦艦　BBV：航戦）",
 	"add": "決定",
 	"never_use_on": "離脱を許可しない艦",
 	"note_require_on_node": "「Node: [Node番号] において」は指定したNodeとそれより前の全てのNodeに対して適用します。例.Node番号に2を指定: Node1とNode2に適用し、Node3以降には適用しない",

diff --git a/simulator.html b/simulator.html
@@ -27,7 +27,7 @@
 		<h1>KanColle Sortie Simulator</h1>
 
 		<div>
-			<label><input type="radio" value="en" v-model="$i18n.locale" @change="onchangeLang"/>EN</label> <label><input type="radio" value="ja" v-model="$i18n.locale" @change="onchangeLang"/>JP (艦船/装備)</label>
+			<label><input type="radio" value="en" v-model="$i18n.locale" @change="onchangeLang"/>EN</label> <label><input type="radio" value="ja" v-model="$i18n.locale" @change="onchangeLang"/>JP</label>
 		</div>
 
 		<div id="divPlayer">
@@ -543,7 +543,7 @@ <h3>{{$t('statistics')}}</h3>
 					<div class="space"><span class="header">{{$t('add_cost')}}:</span></div>
 					<div><label><img src="assets/stats/fuel.png" /><input type="number" min="0" max="100" v-model="battle.addCostFuel"/>%</label></div>
 					<div><label><img src="assets/stats/ammo.png" /><input type="number" min="0" max="100" v-model="battle.addCostAmmo"/>%</label></div>
-					<div><label>{{$t('max')}}: <input type="number" min="0" max="999" v-model="battle.addCostMax"/></label></div>
+					<div><label><span class="tooltip" :title="$t('add_cost_max_tooltip')">{{$t('add_cost_max')}}</span>: <input type="number" min="0" max="999" v-model="battle.addCostMax"/></label></div>
 				</div>
 				<div>
 					<div><span class="header">{{$t('player_formation')}}:</span></div>
@@ -1227,7 +1227,7 @@ <h3>{{$t('statistics')}}</h3>
 					</tr>
 					</table>
 					<div v-show="isFriendFleet"><label><input type="checkbox" v-model="ffStrong"/><img src="assets/stats/ibuild.png"/>?</label></div>
-					<div v-show="isFriendFleet"><label><input type="checkbox" v-model="ffSkipSame"/>{{$t('ff_skip_comps')}}</label></div>
+					<div v-show="isFriendFleet" style="width:300px"><label><input type="checkbox" v-model="ffSkipSame"/>{{$t('ff_skip_comps')}}</label></div>
 					<div><label>{{$t('date')}}: <input type="date" v-model="dateStart"/></label>~<input type="date" v-model="dateEnd"/></div>
 				</div>
 			</div>
@@ -1367,6 +1367,7 @@ <h3>{{$t('statistics')}}</h3>
 					</i18n-t>
 					&nbsp;<input type="button" :value="$t('add')" @click="onclickAddRule"/>
 				</div>
+				<div style="word-break:keep-all;font-size:.9em" v-show="$t('ship_counts_list').length">{{$t('ship_counts_list')}}</div>
 			</div>
 			<div>
 				<span class="header">{{$t('never_use_on')}}:</span>