diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 1b134f14c2..0e8ec146d5 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -499,14 +499,14 @@ waves.units.show = Показать все wavemode.counts = количество единиц wavemode.totals = всего единиц wavemode.health = всего прочности -all = All +all = всего editor.default = [lightgray]<По умолчанию> details = Подробности... edit = Редактировать... variables = Переменные logic.clear.confirm = Are you sure you want to clear all code from this processor? -logic.globals = Built-in Variables +logic.globals = Встроенные переменные editor.name = Название: editor.spawn = Создать боевую единицу editor.removeunit = Удалить боевую единицу @@ -594,7 +594,7 @@ filter.clear = Очистить filter.option.ignore = Игнорировать filter.scatter = Сеятель filter.terrain = Ландшафт -filter.logic = Logic +filter.logic = Логика filter.option.scale = Масштаб фильтра filter.option.chance = Шанс @@ -781,8 +781,8 @@ sector.curlost = Сектор потерян sector.missingresources = [scarlet]Недостаточно ресурсов для высадки sector.attacked = Сектор [accent]{0}[white] атакован! sector.lost = Сектор [accent]{0}[white] потерян! -sector.capture = Sector [accent]{0}[white]Captured! -sector.capture.current = Sector Captured! +sector.capture = Сектор [accent]{0}[white] захвачен! +sector.capture.current = Сектор захвачен! sector.changeicon = Изменить иконку sector.noswitch.title = Перемещение между секторами sector.noswitch = Вы не можете переключаться между секторами, пока существующий сектор находится под атакой.\n\nСектор: [accent]{0}[] на [accent]{1}[] @@ -794,10 +794,10 @@ threat.high = Высокая threat.extreme = Экстремальная threat.eradication = Истребляющая difficulty.casual = Casual -difficulty.easy = Easy -difficulty.normal = Normal -difficulty.hard = Hard -difficulty.eradication = Eradication +difficulty.easy = Лёгкая +difficulty.normal = Нормальная +difficulty.hard = Сложная +difficulty.eradication = Истребляющая planets = Планеты @@ -1163,7 +1163,7 @@ category.items = Предметы category.crafting = Ввод/вывод category.function = Действие category.optional = Дополнительные улучшения -setting.alwaysmusic.name = Always Play Music +setting.alwaysmusic.name = Всегда играть музыку setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals. setting.skipcoreanimation.name = Пропускать анимацию запуска/приземления ядра setting.landscape.name = Только альбомный (горизонтальный) режим @@ -1413,12 +1413,13 @@ rules.title.teams = Команды rules.title.planet = Планета rules.lighting = Освещение rules.fog = Туман войны -rules.invasions = Enemy Sector Invasions +rules.invasions = Вторжения врагов на сектора rules.legacylaunchpads = Legacy Launch Pad Mechanics rules.legacylaunchpads.info = Allows using launch pads without landing pads, as in 7.0. landingpad.legacy.disabled = [scarlet]\ue815 Disabled[lightgray] (Legacy Launch Pads enabled) -rules.showspawns = Show Enemy Spawns -rules.randomwaveai = Unpredictable Wave AI +rules.showspawns = Показывать появление врагов +rules.randomwaveai = Непредсказуемый ИИ волн + rules.fire = Огонь rules.anyenv = <Любая> rules.explosions = Урон от взрывов блоков/единиц diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index d3a949d34e..d2d074ae56 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -45,9 +45,9 @@ public class LExecutor{ public LInstruction[] instructions = {}; /** Non-constant variables used for network sync */ public LVar[] vars = {}; - + public LVar counter, unit, thisv, ipt; - + public int[] binds; public boolean yield; @@ -226,7 +226,7 @@ public class LExecutor{ cache.found = false; outFound.setnum(0); } - + if(res != null && res.build != null && (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){ cache.build = res.build; @@ -1512,6 +1512,7 @@ public class LExecutor{ case dropZoneRadius -> state.rules.dropZoneRadius = value.numf() * 8f; case unitCap -> state.rules.unitCap = Math.max(value.numi(), 0); case lighting -> state.rules.lighting = value.bool(); + case canGameOver -> state.rules.canGameOver = value.bool(); case mapArea -> { int x = p1.numi(), y = p2.numi(), w = p3.numi(), h = p4.numi(); if(!checkMapArea(x, y, w, h, false)){ @@ -1963,7 +1964,7 @@ public class LExecutor{ public void run(LExecutor exec){ Sound sound = Sounds.getSound(id.numi()); if(sound == null || sound == Sounds.swish) sound = Sounds.none; //no. - + if(positional){ sound.at(World.unconv(x.numf()), World.unconv(y.numf()), pitch.numf(), Math.min(volume.numf(), 2f), limit.bool()); }else{ diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java index 211064e271..b6ca757bb7 100644 --- a/core/src/mindustry/logic/LogicRule.java +++ b/core/src/mindustry/logic/LogicRule.java @@ -13,6 +13,7 @@ public enum LogicRule{ unitCap, mapArea, lighting, + canGameOver, ambientLight, solarMultiplier, dragMultiplier, diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java index 03a7b867bc..9fe01d436e 100644 --- a/core/src/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -40,6 +40,7 @@ public class GenericCrafter extends Block{ public Effect craftEffect = Fx.none; public Effect updateEffect = Fx.none; public float updateEffectChance = 0.04f; + public float updateEffectSpread = 4f; public float warmupSpeed = 0.019f; /** Only used for legacy cultivator blocks. */ public boolean legacyReadWarmup = false; @@ -233,7 +234,7 @@ public class GenericCrafter extends Block{ } if(wasVisible && Mathf.chanceDelta(updateEffectChance)){ - updateEffect.at(x + Mathf.range(size * 4f), y + Mathf.range(size * 4)); + updateEffect.at(x + Mathf.range(size * updateEffectSpread), y + Mathf.range(size * updateEffectSpread)); } }else{ warmup = Mathf.approachDelta(warmup, 0f, warmupSpeed); diff --git a/servers_v7.json b/servers_v7.json index 4bc4be8f7b..f96e0426ba 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -223,7 +223,8 @@ "address": [ "mindustry.icu", "sx.mindustry.icu", - "9k38.igla.pics" + "9k38.igla.pics", + "frp-oak.com:26979" ] }, {