Merge branch 'master' into mod-dependencies

core/assets/bundles/bundle.properties

@@ -454,6 +454,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
@@ -510,7 +515,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
@@ -599,6 +606,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
@@ -622,6 +630,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?
@@ -998,6 +1008,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
@@ -1099,7 +1110,7 @@ bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
 bullet.healpercent = [stat]{0}%[lightgray] repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
-bullet.multiplier = [stat]{0}x[lightgray] ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray] ammo/item
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
@@ -1124,6 +1135,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
@@ -1133,6 +1145,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
@@ -1332,7 +1346,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
@@ -2081,7 +2098,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.
@@ -2110,7 +2127,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.
@@ -2160,7 +2177,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.
@@ -2337,7 +2354,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.
@@ -2368,13 +2385,14 @@ lst.setrate = Set processor execution speed in instructions/tick.
 lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
 lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
 lst.setrule = Set a game rule.
-lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.flushmessage = Display a message on the screen from the text buffer.\nIf the success result variable is [accent]@wait[],\nwill wait until the previous message finishes.\nOtherwise, outputs whether displaying the message succeeded.
 lst.cutscene = Manipulate the player camera.
 lst.setflag = Set a global flag that can be read by all processors.
 lst.getflag = Check if a global flag is set.
 lst.setprop = Sets a property of a unit or building.
 lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
@@ -2430,6 +2448,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.
@@ -2553,6 +2572,8 @@ unitlocate.outx = Output X coordinate.
 unitlocate.outy = Output Y coordinate.
 unitlocate.group = Building group to look for.
 
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
 lenum.idle = Don't move, but keep building/mining.\nThe default state.
 lenum.stop = Stop moving/mining/building.
 lenum.unbind = Completely disable logic control.\nResume standard AI.
@@ -2570,7 +2591,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.