mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 09:40:44 +00:00
Replace hardcoded defaults (#3885)
## Description: Replaced hard coded defaults with defaultKeybinds ## Please complete the following: - [X] I have added screenshots for all UI updates - [X] I process any text displayed to the user through translateText() and I've added it to the en.json file - [X] I have added relevant tests to the test directory - [X] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: babyboucher
This commit is contained in:
@@ -395,7 +395,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="toggleView"
|
||||
label=${translateText("user_setting.toggle_view")}
|
||||
description=${translateText("user_setting.toggle_view_desc")}
|
||||
defaultKey="Space"
|
||||
defaultKey=${this.defaultKeybinds.toggleView}
|
||||
.value=${this.getKeyValue("toggleView")}
|
||||
.display=${this.getKeyChar("toggleView")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -421,7 +421,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildCity"
|
||||
label=${translateText("user_setting.build_city")}
|
||||
description=${translateText("user_setting.build_city_desc")}
|
||||
defaultKey="Digit1"
|
||||
defaultKey=${this.defaultKeybinds.buildCity}
|
||||
.value=${this.getKeyValue("buildCity")}
|
||||
.display=${this.getKeyChar("buildCity")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -431,7 +431,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildFactory"
|
||||
label=${translateText("user_setting.build_factory")}
|
||||
description=${translateText("user_setting.build_factory_desc")}
|
||||
defaultKey="Digit2"
|
||||
defaultKey=${this.defaultKeybinds.buildFactory}
|
||||
.value=${this.getKeyValue("buildFactory")}
|
||||
.display=${this.getKeyChar("buildFactory")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -441,7 +441,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildPort"
|
||||
label=${translateText("user_setting.build_port")}
|
||||
description=${translateText("user_setting.build_port_desc")}
|
||||
defaultKey="Digit3"
|
||||
defaultKey=${this.defaultKeybinds.buildPort}
|
||||
.value=${this.getKeyValue("buildPort")}
|
||||
.display=${this.getKeyChar("buildPort")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -451,7 +451,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildDefensePost"
|
||||
label=${translateText("user_setting.build_defense_post")}
|
||||
description=${translateText("user_setting.build_defense_post_desc")}
|
||||
defaultKey="Digit4"
|
||||
defaultKey=${this.defaultKeybinds.buildDefensePost}
|
||||
.value=${this.getKeyValue("buildDefensePost")}
|
||||
.display=${this.getKeyChar("buildDefensePost")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -461,7 +461,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildMissileSilo"
|
||||
label=${translateText("user_setting.build_missile_silo")}
|
||||
description=${translateText("user_setting.build_missile_silo_desc")}
|
||||
defaultKey="Digit5"
|
||||
defaultKey=${this.defaultKeybinds.buildMissileSilo}
|
||||
.value=${this.getKeyValue("buildMissileSilo")}
|
||||
.display=${this.getKeyChar("buildMissileSilo")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -471,7 +471,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildSamLauncher"
|
||||
label=${translateText("user_setting.build_sam_launcher")}
|
||||
description=${translateText("user_setting.build_sam_launcher_desc")}
|
||||
defaultKey="Digit6"
|
||||
defaultKey=${this.defaultKeybinds.buildSamLauncher}
|
||||
.value=${this.getKeyValue("buildSamLauncher")}
|
||||
.display=${this.getKeyChar("buildSamLauncher")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -481,7 +481,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildWarship"
|
||||
label=${translateText("user_setting.build_warship")}
|
||||
description=${translateText("user_setting.build_warship_desc")}
|
||||
defaultKey="Digit7"
|
||||
defaultKey=${this.defaultKeybinds.buildWarship}
|
||||
.value=${this.getKeyValue("buildWarship")}
|
||||
.display=${this.getKeyChar("buildWarship")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -491,7 +491,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildAtomBomb"
|
||||
label=${translateText("user_setting.build_atom_bomb")}
|
||||
description=${translateText("user_setting.build_atom_bomb_desc")}
|
||||
defaultKey="Digit8"
|
||||
defaultKey=${this.defaultKeybinds.buildAtomBomb}
|
||||
.value=${this.getKeyValue("buildAtomBomb")}
|
||||
.display=${this.getKeyChar("buildAtomBomb")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -501,7 +501,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildHydrogenBomb"
|
||||
label=${translateText("user_setting.build_hydrogen_bomb")}
|
||||
description=${translateText("user_setting.build_hydrogen_bomb_desc")}
|
||||
defaultKey="Digit9"
|
||||
defaultKey=${this.defaultKeybinds.buildHydrogenBomb}
|
||||
.value=${this.getKeyValue("buildHydrogenBomb")}
|
||||
.display=${this.getKeyChar("buildHydrogenBomb")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -511,7 +511,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="buildMIRV"
|
||||
label=${translateText("user_setting.build_mirv")}
|
||||
description=${translateText("user_setting.build_mirv_desc")}
|
||||
defaultKey="Digit0"
|
||||
defaultKey=${this.defaultKeybinds.buildMIRV}
|
||||
.value=${this.getKeyValue("buildMIRV")}
|
||||
.display=${this.getKeyChar("buildMIRV")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -585,7 +585,7 @@ export class UserSettingModal extends BaseModal {
|
||||
description=${translateText("user_setting.attack_ratio_down_desc", {
|
||||
amount: this.userSettings.attackRatioIncrement(),
|
||||
})}
|
||||
defaultKey="KeyT"
|
||||
defaultKey=${this.defaultKeybinds.attackRatioDown}
|
||||
.value=${this.getKeyValue("attackRatioDown")}
|
||||
.display=${this.getKeyChar("attackRatioDown")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -597,7 +597,7 @@ export class UserSettingModal extends BaseModal {
|
||||
description=${translateText("user_setting.attack_ratio_up_desc", {
|
||||
amount: this.userSettings.attackRatioIncrement(),
|
||||
})}
|
||||
defaultKey="KeyY"
|
||||
defaultKey=${this.defaultKeybinds.attackRatioUp}
|
||||
.value=${this.getKeyValue("attackRatioUp")}
|
||||
.display=${this.getKeyChar("attackRatioUp")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -613,7 +613,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="boatAttack"
|
||||
label=${translateText("user_setting.boat_attack")}
|
||||
description=${translateText("user_setting.boat_attack_desc")}
|
||||
defaultKey="KeyB"
|
||||
defaultKey=${this.defaultKeybinds.boatAttack}
|
||||
.value=${this.getKeyValue("boatAttack")}
|
||||
.display=${this.getKeyChar("boatAttack")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -623,7 +623,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="groundAttack"
|
||||
label=${translateText("user_setting.ground_attack")}
|
||||
description=${translateText("user_setting.ground_attack_desc")}
|
||||
defaultKey="KeyG"
|
||||
defaultKey=${this.defaultKeybinds.groundAttack}
|
||||
.value=${this.getKeyValue("groundAttack")}
|
||||
.display=${this.getKeyChar("groundAttack")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -633,7 +633,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="retaliateAttack"
|
||||
label=${translateText("user_setting.retaliate_attack")}
|
||||
description=${translateText("user_setting.retaliate_attack_desc")}
|
||||
defaultKey="Shift+KeyR"
|
||||
defaultKey=${this.defaultKeybinds.retaliateAttack}
|
||||
.value=${this.getKeyValue("retaliateAttack")}
|
||||
.display=${this.getKeyChar("retaliateAttack")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -659,7 +659,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="requestAlliance"
|
||||
label=${translateText("user_setting.request_alliance")}
|
||||
description=${translateText("user_setting.request_alliance_desc")}
|
||||
defaultKey="KeyK"
|
||||
defaultKey=${this.defaultKeybinds.requestAlliance}
|
||||
.value=${this.getKeyValue("requestAlliance")}
|
||||
.display=${this.getKeyChar("requestAlliance")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -669,7 +669,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="breakAlliance"
|
||||
label=${translateText("user_setting.break_alliance")}
|
||||
description=${translateText("user_setting.break_alliance_desc")}
|
||||
defaultKey="KeyL"
|
||||
defaultKey=${this.defaultKeybinds.breakAlliance}
|
||||
.value=${this.getKeyValue("breakAlliance")}
|
||||
.display=${this.getKeyChar("breakAlliance")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -685,7 +685,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="zoomOut"
|
||||
label=${translateText("user_setting.zoom_out")}
|
||||
description=${translateText("user_setting.zoom_out_desc")}
|
||||
defaultKey="KeyQ"
|
||||
defaultKey=${this.defaultKeybinds.zoomOut}
|
||||
.value=${this.getKeyValue("zoomOut")}
|
||||
.display=${this.getKeyChar("zoomOut")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -695,7 +695,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="zoomIn"
|
||||
label=${translateText("user_setting.zoom_in")}
|
||||
description=${translateText("user_setting.zoom_in_desc")}
|
||||
defaultKey="KeyE"
|
||||
defaultKey=${this.defaultKeybinds.zoomIn}
|
||||
.value=${this.getKeyValue("zoomIn")}
|
||||
.display=${this.getKeyChar("zoomIn")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -711,7 +711,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="centerCamera"
|
||||
label=${translateText("user_setting.center_camera")}
|
||||
description=${translateText("user_setting.center_camera_desc")}
|
||||
defaultKey="KeyC"
|
||||
defaultKey=${this.defaultKeybinds.centerCamera}
|
||||
.value=${this.getKeyValue("centerCamera")}
|
||||
.display=${this.getKeyChar("centerCamera")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -721,7 +721,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="moveUp"
|
||||
label=${translateText("user_setting.move_up")}
|
||||
description=${translateText("user_setting.move_up_desc")}
|
||||
defaultKey="KeyW"
|
||||
defaultKey=${this.defaultKeybinds.moveUp}
|
||||
.value=${this.getKeyValue("moveUp")}
|
||||
.display=${this.getKeyChar("moveUp")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -731,7 +731,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="moveLeft"
|
||||
label=${translateText("user_setting.move_left")}
|
||||
description=${translateText("user_setting.move_left_desc")}
|
||||
defaultKey="KeyA"
|
||||
defaultKey=${this.defaultKeybinds.moveLeft}
|
||||
.value=${this.getKeyValue("moveLeft")}
|
||||
.display=${this.getKeyChar("moveLeft")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -741,7 +741,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="moveDown"
|
||||
label=${translateText("user_setting.move_down")}
|
||||
description=${translateText("user_setting.move_down_desc")}
|
||||
defaultKey="KeyS"
|
||||
defaultKey=${this.defaultKeybinds.moveDown}
|
||||
.value=${this.getKeyValue("moveDown")}
|
||||
.display=${this.getKeyChar("moveDown")}
|
||||
@change=${this.handleKeybindChange}
|
||||
@@ -751,7 +751,7 @@ export class UserSettingModal extends BaseModal {
|
||||
action="moveRight"
|
||||
label=${translateText("user_setting.move_right")}
|
||||
description=${translateText("user_setting.move_right_desc")}
|
||||
defaultKey="KeyD"
|
||||
defaultKey=${this.defaultKeybinds.moveRight}
|
||||
.value=${this.getKeyValue("moveRight")}
|
||||
.display=${this.getKeyChar("moveRight")}
|
||||
@change=${this.handleKeybindChange}
|
||||
|
||||
Reference in New Issue
Block a user