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

core/assets/bundles/bundle.properties

@@ -729,14 +729,18 @@ loadout = Loadout
 resources = Resources
 resources.max = Max
 bannedblocks = Banned Blocks
+unbannedblocks = Unbanned Blocks
 objectives = Objectives
 bannedunits = Banned Units
+unbannedunits = Unbanned Units
 bannedunits.whitelist = Banned Units As Whitelist
 bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}
 launch.destination = Destination: {0}
+landing.sources = Source Sectors: [accent]{0}[]
+landing.import = Max Total Import: {0}[accent]{1}[lightgray]/min
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
 guardian = Guardian
@@ -776,7 +780,9 @@ sectors.stored = Stored:
 sectors.resume = Resume
 sectors.launch = Launch
 sectors.select = Select
+sectors.launchselect = Select Launch Destination
 sectors.nonelaunch = [lightgray]none (sun)
+sectors.redirect = Redirect Launch Pads
 sectors.rename = Rename Sector
 sectors.enemybase = [scarlet]Enemy Base
 sectors.vulnerable = [scarlet]Vulnerable
@@ -1043,6 +1049,7 @@ stat.buildspeedmultiplier = Build Speed Multiplier
 stat.reactive = Reacts
 stat.immunities = Immunities
 stat.healing = Healing
+stat.efficiency = [stat]{0}% Efficiency
 
 ability.forcefield = Force Field
 ability.forcefield.description = Projects a force shield that absorbs bullets
@@ -1090,6 +1097,7 @@ ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 bar.drilltierreq = Better Drill Required
+bar.nobatterypower = Insufficient Battery Power
 bar.noresources = Missing Resources
 bar.corereq = Core Base Required
 bar.corefloor = Core Zone Tile Required
@@ -1098,6 +1106,7 @@ bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
 bar.boost = Boost: +{0}%
+bar.powerbuffer = Batteries: {0}/{1}
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
@@ -1108,6 +1117,7 @@ bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Liquid
 bar.heat = Heat
+bar.cooldown = Cooldown
 bar.instability = Instability
 bar.heatamount = Heat: {0}
 bar.heatpercent = Heat: {0} ({1}%)
@@ -1132,6 +1142,7 @@ bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
 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.shielddamage = [stat]{0}%[lightgray] shield damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
@@ -1158,6 +1169,7 @@ unit.minutes = mins
 unit.persecond = /sec
 unit.perminute = /min
 unit.timesspeed = x speed
+unit.multiplier = x
 unit.percent = %
 unit.shieldhealth = shield health
 unit.items = items
@@ -1234,11 +1246,13 @@ setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
+setting.communityservers.name = Fetch Community Server List
 setting.savecreate.name = Auto-Create Saves
 setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
+setting.unitlaseropacity.name = Unit Mining Beam Opacity
 setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
@@ -1397,12 +1411,14 @@ rules.unitcostmultiplier = Unit Cost Multiplier
 rules.unithealthmultiplier = Unit Health Multiplier
 rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitminespeedmultiplier = Unit Mine Speed 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)
+rules.extracorebuildradius = Extra No-Build Radius:[lightgray] (tiles)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.initialwavespacing = Initial Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
@@ -1425,6 +1441,9 @@ rules.title.planet = Planet
 rules.lighting = Lighting
 rules.fog = Fog of War
 rules.invasions = Enemy Sector 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.fire = Fire
@@ -1745,7 +1764,10 @@ block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Container
-block.launch-pad.name = Launch Pad
+block.launch-pad.name = Launch Pad [lightgray](Legacy)
+block.advanced-launch-pad.name = Launch Pad
+block.landing-pad.name = Landing Pad
+
 block.segment.name = Segment
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
@@ -2133,7 +2155,7 @@ block.door.description = A wall that can be opened and closed.
 block.door-large.description = A wall that can be opened and closed.
 block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency.
 block.mend-projector.description = Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency.
-block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency.
+block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency. Does not stack.
 block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size.
 block.shock-mine.description = Releases electric arcs upon enemy unit contact.
 block.conveyor.description = Transports items forward.
@@ -2195,7 +2217,9 @@ block.vault.description = Stores a large amount of items of each type. Expands s
 block.container.description = Stores a small amount of items of each type. Expands storage when placed next to a core. Contents can be retrieved with an unloader.
 block.unloader.description = Unloads the selected item from nearby blocks.
 block.launch-pad.description = Launches batches of items to selected sectors.
-block.launch-pad.details = Sub-orbital system for point-to-point transportation of resources. Payload pods are fragile and incapable of surviving re-entry.
+block.advanced-launch-pad.description = Launches batches of items to selected sectors. Only accepts one item type at a time.
+block.advanced-launch-pad.details = Sub-orbital system for point-to-point transportation of resources.
+block.landing-pad.description = Receives items from launch pads in other sectors. Requires large amounts of water to protect against impacts of landings.
 block.duo.description = Fires alternating bullets at enemies.
 block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
@@ -2217,7 +2241,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. Does not stack.
 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.
@@ -2396,6 +2420,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.printchar = Add a UTF-16 character or content icon 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.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.
@@ -2644,3 +2669,30 @@ lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
 lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
 lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
 lenum.colori = Indexed color, used for line and quad markers with index zero being the first color.
+
+lenum.wavetimer = Whether the waves come automatically on a timer. If not, waves come when the play button is pressed.
+lenum.wave = Current wave number. Can be anything in non-wave modes.
+lenum.currentwavetime = Wave countdown in ticks.
+lenum.waves = Whether waves are spawnable at all.
+lenum.wavesending = Whether the waves can be manually summoned with the play button.
+lenum.attackmode = Determines if gamemode is attack mode.
+lenum.wavespacing = Time between waves in ticks.
+lenum.enemycorebuildradius = No-build zone around enemy core radius.
+lenum.dropzoneradius = Radius around enemy wave drop zones.
+lenum.unitcap = Base unit cap. Can still be increased by blocks.
+lenum.lighting = Whether ambient lighting is enabled.
+lenum.buildspeed = Multiplier for building speed.
+lenum.unithealth = How much health units start with.
+lenum.unitbuildspeed = How fast unit factories build units.
+lenum.unitcost = Multiplier of resources that units take to build.
+lenum.unitdamage = How much damage units deal.
+lenum.blockhealth = How much health blocks start with.
+lenum.blockdamage = How much damage blocks (turrets) deal.
+lenum.rtsminweight = Minimum "advantage" needed for a squad to attack. Higher -> more cautious.
+lenum.rtsminsquad = Minimum size of attack squads.
+lenum.maparea = Playable map area. Anything outside the area will not be interactable.
+lenum.ambientlight = Ambient light color. Used when lighting is enabled.
+lenum.solarmultiplier = Multiplies power output of solar panels.
+lenum.dragmultiplier = Environment drag multiplier.
+lenum.ban = Blocks or units that cannot be placed or built.
+lenum.unban = Unban a unit or block.