diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index def1a113..bee08710 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -15,5 +15,6 @@ keybind.switch_team_btw.name = Switch Team btw / keybind.switch_team.name = Switch Team keybind.look_at.name = Look at Cursor keybind.teleport.name = Teleport ([accent]Hold & Select[]) +keybind.self-dest.name = Self Destruction ([accent]Hold & Respawn[]) updater.info = [red]⚠[]Outdated Mod!\n\nYour version of [accent]Scheme Size[] is outdated...\nYou can [green]update[] it by reinstall in mods\n\nTo disable this feature, turn it off in [accent]Settings->Mod->Checking for Updates[] \ No newline at end of file diff --git a/assets/bundles/bundle_es.properties b/assets/bundles/bundle_es.properties index f6fe4033..09acf8d5 100644 --- a/assets/bundles/bundle_es.properties +++ b/assets/bundles/bundle_es.properties @@ -15,5 +15,6 @@ keybind.switch_team_btw.name = Cambia el equipo entre / keybind.switch_team.name = Cambiar el equipo keybind.look_at.name = Mira el cursor keybind.teleport.name = Teletran. ([accent]Mantener pulsado y Seleccionar[]) +keybind.self-dest.name = Autodestrucción ([accent]Mantener y Reaparecer[]) updater.info = [red]⚠[]Mod obsoleto!\n\nSu versión de [accent]Scheme Size[] está desactualizada...\nPuede [green]actualizarlo[] reinstalando en mods\n\nPara deshabilitar esta función, apáguela en [accent]Ajustes->Modificación->Buscar actualizaciones[] \ No newline at end of file diff --git a/assets/bundles/bundle_ru.properties b/assets/bundles/bundle_ru.properties index 4153f9a9..8f48dc5f 100644 --- a/assets/bundles/bundle_ru.properties +++ b/assets/bundles/bundle_ru.properties @@ -15,5 +15,6 @@ keybind.switch_team_btw.name = Сменить команду между / keybind.switch_team.name = Сменить команду keybind.look_at.name = Посмотреть на курсор keybind.teleport.name = Телепорт ([accent]Удерж. и Выбор[]) +keybind.self-dest.name = Самоуничтожение ([accent]Удерж. и Возрождение[]) updater.info = [red]⚠[]Устаревший мод!\n\nВаша версия [accent]Scheme Size[] устарела...\nВы можете [green]обновить[] его, переустановив в модах\n\nЧтобы отключить эту функцию, выключите её в [accent]Настройки->Модификация->Проверять наличие обновлений[] \ No newline at end of file diff --git a/assets/bundles/bundle_uk_UA.properties b/assets/bundles/bundle_uk_UA.properties index c4ee27a0..98cfaac2 100644 --- a/assets/bundles/bundle_uk_UA.properties +++ b/assets/bundles/bundle_uk_UA.properties @@ -15,5 +15,6 @@ keybind.switch_team_btw.name = Змінити команду між / keybind.switch_team.name = Змінити команду keybind.look_at.name = Подивіться на курсор keybind.teleport.name = Телепорт ([accent]Утримувати і Вибір[]) +keybind.self-dest.name = Самознищення ([accent]Утримувати і Відродження[]) updater.info = [red]⚠[]Застарілий мод!\n\nВаша версія [accent]Scheme Size[] застаріла...\nВи можете [green]оновити[] його, перевстановивши в модифікації\n\nЩоб вимкнути цю функцію, вимкніть її в [accent]Налаштування->Модифікація->Перевірити наявність оновлень[] \ No newline at end of file diff --git a/assets/mod.json b/assets/mod.json index 994489ed..8492a92e 100644 --- a/assets/mod.json +++ b/assets/mod.json @@ -3,7 +3,7 @@ "displayName": "Scheme Size", "description": "Mod that could... Increases the maximum size of schemes to 512 blocks!\nMobile Support!", "author": "xzxADIxzx", - "version": "1.7", + "version": "1.74", "minGameVersion": "131", "hidden": true, "main": "mindustry.game.SchemeSize" diff --git a/assets/scripts/main.js b/assets/scripts/main.js index 928505f8..a5019c0f 100644 --- a/assets/scripts/main.js +++ b/assets/scripts/main.js @@ -1,23 +1,23 @@ require("Scheme-Size/mod"); Events.on(EventType.ClientLoadEvent, e => { + // delete old interface... idk why but does work in java? + Time.runTask(10, () => { + Vars.ui.hudGroup.children.get(5).clear(); + }); + // don`t check for updates if(!Core.settings.getBool("checkupdate")) return; var ver = Vars.mods.locateMod("scheme-size").meta.version; - Http.get("https://api.github.com/repos/xzxADIxzx/Scheme-Size/tags", res => { + Http.get("https://api.github.com/repos/xzxADIxzx/Scheme-Size/releases", res => { var str = res.getResultAsString(); var json = JSON.parse(str); - if(json[0].name.slice(1) != ver){ + if(json[0].tag_name.slice(1) != ver){ Vars.ui.showInfo("@updater.info") } }); - - // delete old interface... idk why but does work in java? - Time.runTask(10, () => { - Vars.ui.hudGroup.children.get(5).clear(); - }); }); // why not diff --git a/src/input/ModBinding.java b/src/input/ModBinding.java index 6229f2c5..f317fa89 100644 --- a/src/input/ModBinding.java +++ b/src/input/ModBinding.java @@ -10,7 +10,8 @@ public enum ModBinding implements KeyBind{ switch_team_btw(KeyCode.semicolon), switch_team(KeyCode.apostrophe), look_at(KeyCode.altLeft), - teleport(KeyCode.altLeft); + teleport(KeyCode.altLeft), + self_dest(KeyCode.altLeft); private final KeybindValue defaultValue; private final String category; diff --git a/src/input/ModDesktopInput.java b/src/input/ModDesktopInput.java index efc1c7a1..3b0dbb47 100644 --- a/src/input/ModDesktopInput.java +++ b/src/input/ModDesktopInput.java @@ -237,9 +237,13 @@ public void update(){ updateMovement(player.unit()); if(Core.input.keyTap(Binding.respawn)){ - controlledType = null; - recentRespawnTimer = 1f; - Call.unitClear(player); + if(Core.input.keyDown(ModBinding.self_dest)){ + player.unit().kill(); + }else{ + controlledType = null; + recentRespawnTimer = 1f; + Call.unitClear(player); + } SchemeSize.hudfrag.updateShield(player.unit()); } diff --git a/src/ui/dialogs/ModSettingsMenuDialog.java b/src/ui/dialogs/ModSettingsMenuDialog.java index 072b5698..e77d2e27 100644 --- a/src/ui/dialogs/ModSettingsMenuDialog.java +++ b/src/ui/dialogs/ModSettingsMenuDialog.java @@ -291,8 +291,8 @@ public void rebuildMenu(){ } void addSettings(){ - mod.sliderPref("maxzoommul", 4, 4, 8, 1, i -> i / 4f + "x"); - mod.sliderPref("minzoommul", 4, 4, 8, 1, i -> i / 4f + "x"); + mod.sliderPref("maxzoommul", 4, 4, 16, 1, i -> i / 4f + "x"); + mod.sliderPref("minzoommul", 4, 4, 16, 1, i -> i / 4f + "x"); mod.sliderPref("copysize", 512, 32, 512, 32, i -> Core.bundle.format("setting.blocks", i)); mod.sliderPref("breaksize", 512, 32, 512, 32, i -> Core.bundle.format("setting.blocks", i)); mod.checkPref("copyshow", true);