Merge branch 'Anuken:master' into balancing_burst-drill-optional-multiplier

core/assets/bundles/bundle.properties

@@ -445,6 +445,11 @@ editor.rules = Rules
 editor.generation = Generation
 editor.objectives = Objectives
 editor.locales = Locale Bundles
+editor.worldprocessors = World Processors
+editor.worldprocessors.editname = Edit Name
+editor.worldprocessors.none = [lightgray]No world processor blocks found!\nAdd one in the map editor, or use the \ue813 Add button below.
+editor.worldprocessors.nospace = No free space to place a world processor!\nDid you fill the map with structures? Why would you do this?
+editor.worldprocessors.delete.confirm = Are you sure you want to delete this world processor?\n\nIf it is surrounded by walls, it will be replaced by an environmental wall.
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -501,7 +506,9 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit
 variables = Vars
+logic.clear.confirm = Are you sure you want to clear all code from this processor?
 logic.globals = Built-in Variables
+
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -590,6 +597,7 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
+filter.logic = Logic
 
 filter.option.scale = Scale
 filter.option.chance = Chance
@@ -613,6 +621,8 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
+filter.option.code = Code
+filter.option.loop = Loop
 
 locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
@@ -688,6 +698,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Background
 marker.outline = Outline
@@ -738,7 +749,7 @@ error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
@@ -988,6 +999,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -998,17 +1010,47 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Repair Suppression
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
-ability.regen = Regeneration
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Self Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 bar.drilltierreq = Better Drill Required
@@ -1051,15 +1093,15 @@ bullet.armorpierce = [stat]armor piercing
 bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
 bullet.suppression = [stat]{0}[lightgray] seconds of repair suppression ~ [stat]{1}[lightgray] tiles
 bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
-bullet.frags = [stat]{0}[lightgray]x frag bullets:
-bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.frags = [stat]{0}x[lightgray] frag bullets:
+bullet.lightning = [stat]{0}x[lightgray] lightning ~ [stat]{1}[lightgray] damage
 bullet.buildingdamage = [stat]{0}%[lightgray] building damage
 bullet.knockback = [stat]{0}[lightgray] knockback
-bullet.pierce = [stat]{0}[lightgray]x pierce
+bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
-bullet.healpercent = [stat]{0}[lightgray]% repair
+bullet.healpercent = [stat]{0}%[lightgray] repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray] ammo/item
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
@@ -1084,6 +1126,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General
@@ -1093,6 +1136,8 @@ category.items = Items
 category.crafting = Input/Output
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
 setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Lock Landscape
 setting.shadows.name = Shadows
@@ -1206,15 +1251,16 @@ keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
 
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
@@ -1291,7 +1337,10 @@ rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
 rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
 rules.waves = Waves
+rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode
 rules.buildai = Base Builder AI
 rules.buildaitier = Builder AI Tier
@@ -1313,6 +1362,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
@@ -1346,6 +1396,9 @@ rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
 
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
 content.item.name = Items
 content.liquid.name = Fluids
 content.unit.name = Units
@@ -2036,7 +2089,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Releases electric arcs upon enemy unit contact.
 block.conveyor.description = Transports items forward.
 block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor.
-block.plastanium-conveyor.description =  Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
+block.plastanium-conveyor.description = Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
 block.junction.description = Acts as a bridge for two crossing conveyor belts.
 block.bridge-conveyor.description = Transports items over terrain or buildings.
 block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power.
@@ -2065,7 +2118,7 @@ block.power-node-large.description = An advanced power node with greater range.
 block.surge-tower.description = A long-range power node with fewer available connections.
 block.diode.description = Moves battery power in one direction, but only if the other side has less power stored.
 block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit.
-block.battery-large.description =  Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery.
+block.battery-large.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
 block.steam-generator.description = Generates power by burning flammable materials and converting water to steam.
@@ -2115,7 +2168,7 @@ block.parallax.description = Fires a tractor beam that pulls in air targets, dam
 block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
 block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
 block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
-block.overdrive-dome.description =  Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
 block.payload-conveyor.description = Moves large payloads, such as units from factories. Magnetic. Usable in zero-G environments.
 block.payload-router.description = Splits input payloads into 3 output directions. Functions as a sorter when a filter is set. Magnetic. Usable in zero-G environments.
 block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
@@ -2292,7 +2345,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2315,7 +2368,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a unit.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Spawn a wave.
 lst.explosion = Create an explosion at a location.
@@ -2385,6 +2438,7 @@ lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
 
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
@@ -2525,7 +2579,7 @@ lenum.payenter = Enter/land on the payload block the unit is on.
 lenum.flag = Numeric unit flag.
 lenum.mine = Mine at a position.
 lenum.build = Build a structure.
-lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
+lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.