Skip to content

Commit

Permalink
code update and bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
WilloIzCitron committed May 12, 2024
1 parent c62ddc6 commit b6e712f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 29 deletions.
25 changes: 18 additions & 7 deletions assets/bundles/bundle_it.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
setting.ba-firstTime.name = È la prima volta che installi questa mod?
setting.ba-firstTime.name = È la prima volta che installi questa mod?
setting.ba-firstTime.description = Misono Mika appare all'avvio.
setting.ba-addHalo.name = Attiva le aureole delle unità
setting.ba-addHalo.description = Aggiunge delle aureole alle unità, [red]Riavvio Necessario[]
ba-firstTimeDialog.description = Ciao Sensei! vedo che hai appena installato questa mod.\nTi avviso che è ancora in via di sviluppo e che il suo creatore, [accent]WilloIzCitron[],\nha bisogno di tempo per implementare i vari contenuti. Grazie della comprensione!
setting.ba-addHalo.name = Attiva le aureole delle unità
setting.ba-addHalo.description = Aggiunge delle aureole alle unità, [scarlet]Riavvio Necessario
ba-firstTimeDialog.description = Ciao Sensei! vedo che hai appena installato questa mod.\nTi avviso che è ancora in via di sviluppo e che il suo creatore, [accent]WilloIzCitron[],\nha bisogno di tempo per implementare i vari contenuti. Grazie della comprensione!
ba-firstTimeDialog.button = Grazie Mika.
ba-firstTimeDialog.title = Grazie di aver installato ArchiveDustry!
setting.ba-youtube.name = Canale Youtube di Blue Archive
setting.ba-github.name = Repositorio di ArchiveDustry
setting.ba-github.description = Puoi stellare questa mod affinché lo sviluppatore possa ottenere il ruolo di Modder
setting.ba-github.description = Puoi supportare lo sviluppatore stellando questa mod
setting.category.general-setting = < Impostazioni Generali >
setting.category.links = < Collegamenti >
setting.setSong.name = Musica Menù Principale
setting.ba-setSong.description = Sostituisce la canzone originale (Const. Moderato) con [red][ATTENZIONE, SPOILER!!][] "Where All Miracle Begin" (RE Aoharu)
setting.setSong.name = Musica Menù Principale
ba-music1.name = Constant Moderato
ba-music2.name = Where All Miracles Begin
ba-music3.name = Recollection Lobby
setting.setSong.description = Cambia la canzone del menù principale in:\n- «Constant Moderato»\n- [scarlet][ATTENZIONE, SPOILER!!][] «Where All Miracles Begin» di RE Aoharu\n- Recollection Lobby (deve essere attiva nelle impostazioni)
setting.enableL2D.name = Attiva l'Atrio del Ricordo (Recollection Lobby)
setting.enableL2D.description = [scarlet]Riavvio Necessario
setting.setL2D.name = Atrio del Ricordo
ba-l2d1.name = Otose Kotama
ba-l2d2.name = Ushio Noa

setting.gameOver.name = Fine Partita
setting.research.name = Ricerca
setting.coreDatabase.name = Banca Dati del Nucleo
Expand Down
File renamed without changes
43 changes: 21 additions & 22 deletions src/bluearchive/ArchiveDustry.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import arc.*;
import arc.audio.*;
import arc.graphics.Color;
import arc.scene.style.Drawable;
import arc.scene.style.TextureRegionDrawable;
import arc.scene.ui.*;
Expand All @@ -14,7 +13,6 @@
import mindustry.game.EventType.*;
import mindustry.mod.*;
import bluearchive.units.*;
import mindustry.ui.Links;
import mindustry.ui.dialogs.*;
import mindustry.ui.dialogs.SettingsMenuDialog.*;
import mindustry.ui.dialogs.SettingsMenuDialog.SettingsTable.*;
Expand Down Expand Up @@ -109,17 +107,17 @@ public void init(){
UnitHalo.init();
}
if (!Core.graphics.isPortrait() && Core.settings.getBool("enableL2D", true)) {
switch (Core.settings.getInt("setL2D")) {
case 1:
ArchivDBackground.buildL2D("kotama", 68, 5f);
recollectionMusic = tree.loadMusic("menuaira");
break;
case 2:
ArchivDBackground.buildL2D("noa", 68, 5f);
recollectionMusic = tree.loadMusic("menurcl");
break;
}
switch (Core.settings.getInt("setL2D")) {
case 1:
ArchivDBackground.buildL2D("kotama", 68, 5f);
recollectionMusic = tree.loadMusic("menuaira");
break;
case 2:
ArchivDBackground.buildL2D("noa", 68, 5f);
recollectionMusic = tree.loadMusic("menurcl");
break;
}
}
loadSettings();
switch (Core.settings.getInt("setSong")) {
case 1:
Expand Down Expand Up @@ -186,28 +184,29 @@ void loadSettings(){
t.pref(new ButtonSetting("Credits", Icon.info, this::showCredits, 32));
t.pref(new TextSeparator(Core.bundle.get("setting.category.mixer")));
t.pref(new Separator(4));
t.sliderPref("gameOver", 100,0, 100,1,i -> {
int defaultVolume = Core.settings.has("musicvol") ? Core.settings.getInt("musicvol") : (int) Core.settings.getDefault("musicvol");
t.sliderPref("gameOver", defaultVolume,0, 100,1,i -> {
tree.loadMusic("win").setVolume(i / 100f);
tree.loadMusic("lose").setVolume(i / 100f);
return i + "%";
});
t.sliderPref("research", 100,0, 100,1,i -> {
t.sliderPref("research", defaultVolume,0, 100,1,i -> {
tree.loadMusic("research").setVolume(i / 100f);
return i + "%";
});
t.sliderPref("coreDatabase", 100,0, 100,1,i -> {
t.sliderPref("coreDatabase", defaultVolume,0, 100,1,i -> {
tree.loadMusic("database").setVolume(i / 100f);
return i + "%";
});
t.sliderPref("loadout", 100,0, 100,1,i -> {
t.sliderPref("loadout", defaultVolume,0, 100,1,i -> {
tree.loadMusic("loadout").setVolume(i / 100f);
return i + "%";
});
t.pref(new Separator(2));
if (OS.username.startsWith("willoizcitron")){
t.pref(new Separator(2));
t.pref(new TextSeparator("< Developer Settings >"));
};
};
});
}

Expand Down Expand Up @@ -257,11 +256,11 @@ public void showCredits() {
image(Tex.clear).height(25f).padTop(3f).row();
add("Legal Notice").row();
image(Tex.clear).height(5f).padTop(3f).row();
add("This mod is fanmade! and also obey the Fankit Guidelines.").row();
add("THIS MOD NOT INTENDED FOR COMMERCIAL USE!").row();
add("This is a fanmade mod! it obeys the Fankit Guidelines.").row();
add("THIS MOD IS NOT INTENDED FOR COMMERCIAL USE!").row();
image(Tex.clear).height(2f).padTop(3f).row();
image(Tex.clear).height(1f).padTop(3f).row();
add("Mindustry is developed by Anuke, and was licensed to GNU GPLv3.0").row();
add("Mindustry is developed by Anuke, and is licensed under GNU GPLv3.0").row();
image(Tex.clear).height(1f).padTop(3f).row();
add("This mod is MIT Licensed").row();
image(Tex.clear).height(25f).padTop(25f).row();
Expand Down Expand Up @@ -298,7 +297,7 @@ public void add(SettingsTable table){
}
}

static class TextSeparator extends Setting {
static class TextSeparator extends Setting {
String text;
public TextSeparator(String text){
super("");
Expand All @@ -313,7 +312,7 @@ public void add(SettingsTable table){
table.add(b).growX();
table.row();
}
}
}
static class Separator extends Setting{
float height;
public Separator(float height){
Expand Down

0 comments on commit b6e712f

Please sign in to comment.