diff --git a/res/bundles/bundle.properties b/res/bundles/bundle.properties index 4d249f0..fc48485 100644 --- a/res/bundles/bundle.properties +++ b/res/bundles/bundle.properties @@ -2,7 +2,7 @@ mod.currentversion = [gray]Current Version:[] -fos.earlyaccesstitle = [#ff0000]Disclaimer[] +fos.earlyaccesstitle = [red]Disclaimer[] fos.earlyaccess = Fictional Octo System is still very far from being finished, and thus not intended to be played yet. Almost none of its content is currently finished and/or balanced. If you happen to encounter an issue (whether bugs, unbalanced content, etc.), please make sure to report it in [accent]GitHub[]. fos.errortitle = [#ff0000]Incompatible Mod Detected[] fos.errortext = Found a mod incompatible with FOS: [#ff0000]{0}[]. Please delete it from your game. @@ -11,6 +11,8 @@ fos.noost = It seems like the [accent]Fictional Octo System Original Soundtrack[ fos.ostdisabledtitle = Music Disabled fos.ostdisabled = [accent]Fictional Octo System Soundtrack[] is installed but currently disabled. Do you want to enable it? fos-dangerzone = Enabling this feature may have dire consequences, up to crashing the game indefinitely. Are you really sure you want to enable this?.\n[red]Restart required to apply changes. +fos.beunsupportedtitle = Bleeding Edge Unsupported +fos.beunsupported = Fictional Octo System is not supported in Bleeding Edge right now. We are already aware of the issues regarding those builds, and we have no plans of resolving them at the moment. requirement.defeatboss = Defeat {0} requirement.findincrates = Find in Loot Crates @@ -351,6 +353,10 @@ status.fos-shotgun3.name = Explosive Launcher Mount status.fos-shotgun3.description = Shoots a volley of shells that violently explode on hit. status.fos-support1.name = Build Cannon Mount status.fos-support1.description = An additional cannon for faster building. +status.fos-support2.name = Mender Mount +status.fos-support2.description = Shoots mending lasers at allied structures. +status.fos-support3.name = EMP Mender Generator +status.fos-support3.description = Repairs allied structures and damages enemies near the bearer. status.fos-legion-fabricator.name = Legion's Mini-Fabricator Replica status.fos-legion-fabricator.description = Periodically fabricates Legionnaire replicas that follow the player; each one gives +5% damage resistance to the bearer. diff --git a/res/bundles/bundle_ru.properties b/res/bundles/bundle_ru.properties index cb8ccac..1f03f5d 100644 --- a/res/bundles/bundle_ru.properties +++ b/res/bundles/bundle_ru.properties @@ -351,6 +351,10 @@ status.fos-shotgun3.name = Бомбомёт status.fos-shotgun3.description = Стреляет множеством снарядов, которые сильно взрываются при попадании. status.fos-support1.name = Строительная пушка status.fos-support1.description = Дополнительное орудие для быстрого строительства. +status.fos-support2.name = Ремонтная пушка +status.fos-support2.description = Стреляет восстанавливающим лазером по союзным постройкам. +status.fos-support3.name = Генератор ремонтного ЭМИ +status.fos-support3.description = Чинит союзные постройки и боевые единицы и наносит урон врагам около носителя. status.fos-legion-fabricator.name = Мини-фабрика Легиона (реплика) status.fos-legion-fabricator.description = Периодически производит реплики Легионеров, которые следуют за игроком; каждый из них дает +5% устойчивости к урону носителю. diff --git a/src/fos/core/FOSMod.java b/src/fos/core/FOSMod.java index d5db1a2..7782074 100644 --- a/src/fos/core/FOSMod.java +++ b/src/fos/core/FOSMod.java @@ -25,7 +25,7 @@ import mindustry.graphics.Layer; import mindustry.mod.Mod; import mindustry.mod.Mods.LoadedMod; -import mindustry.ui.*; +import mindustry.ui.Styles; import mindustry.ui.dialogs.PlanetDialog; import mma.annotations.ModAnnotations; @@ -156,6 +156,9 @@ public void init() { //initialize mod variables FOSVars.load(); + //anything after this is client-side only. + if (headless) return; + //debug-only insect pathfinder test if (settings.getBool("fos-pathfinder-debug", false)) { Events.run(EventType.Trigger.draw, () -> { @@ -173,9 +176,6 @@ public void init() { }); } - //anything after this should not be initialized on dedicated servers. - if (headless) return; - //an anti-cheat system from long ago, is it really necessary now? LoadedMod xf = mods.list().find(m -> /* some mods don't even have the author field, apparently. how stupid. */ m.meta.author != null && @@ -205,11 +205,14 @@ public void init() { new DamageDisplay(); //add a new font page for... reasons + //FIXME +/* Seq fonts = Seq.with(Fonts.def, Fonts.outline); fonts.each(f -> { var regions = f.getRegions(); regions.add(new TextureRegion()); }); +*/ //init modded teams FOSTeams.load(); @@ -241,6 +244,10 @@ public void clientLoaded() { if (FOSVars.earlyAccess && !FOSVars.debug) ui.showOkText("@fos.earlyaccesstitle", bundle.get("fos.earlyaccess"), () -> {}); + //unsupported on bleeding-edge notice + if (becontrol.active()) + ui.showOkText("@fos.beunsupportedtitle", bundle.get("fos.beunsupported"), () -> {}); + //unlock every planet if debug if (FOSVars.debug) PlanetDialog.debugSelect = true; @@ -398,12 +405,12 @@ void main(){ } """, """ - uniform sampler2D u_texture; - varying vec2 v_texCoords; - void main(){ - gl_FragColor = texture2D(u_texture, v_texCoords); - } - """ + uniform sampler2D u_texture; + varying vec2 v_texCoords; + void main(){ + gl_FragColor = texture2D(u_texture, v_texCoords); + } + """ ); final ScreenQuad quad = new ScreenQuad();