Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions
@@ -7,7 +7,7 @@ varying vec2 v_texCoords;

 void main(){
 	vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
-	vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity; 	
-    original = original *  (vec4(1.0) - bloom);	 	
- 	gl_FragColor =  original + bloom; 	
+	vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity;
+    original = original *  (vec4(1.0) - bloom);
+ 	gl_FragColor =  original + bloom;
 }
@@ -1,9 +0,0 @@
-uniform lowp sampler2D u_texture0;
-uniform lowp vec2 threshold;
-varying vec2 v_texCoords;
-
-void main(){
-	vec4 tex = texture2D(u_texture0, v_texCoords);
-	vec3 colors = (tex.rgb - threshold.r)  * threshold.g * tex.a;
- 	gl_FragColor = vec4(colors, tex.a);
-}
@@ -67,6 +67,14 @@ schematic.delete.confirm = This schematic will be utterly eradicated.
 schematic.rename = Rename Schematic
 schematic.info = {0}x{1}, {2} blocks
 schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+schematic.icontag = Icon Tag
+schematic.renametag = Rename Tag
+schematic.tagdelconfirm = Delete this tag completely?
+schematic.tagexists = That tag already exists.

 stats = Stats
 stat.wave = Waves Defeated:[accent] {0}
@@ -306,7 +314,6 @@ data.exported = Data exported.
 data.invalid = This isn't valid game data.
 data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
 quit.confirm = Are you sure you want to quit?
-quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
 loading = [accent]Loading...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
@@ -498,6 +505,7 @@ load = Load
 save = Save
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Restart your game for the language settings to take effect.
@@ -530,7 +538,7 @@ launch.from = Launching From: [accent]{0}
 launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
-boss.health = Guardian Health
+guardian = Guardian

 connectfail = [scarlet]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -574,6 +582,7 @@ sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 #note: the missing space in the line below is intentional
 sector.captured = Sector [accent]{0}[white]captured!
+sector.changeicon = Change Icon

 threat.low = Low
 threat.medium = Medium
@@ -626,6 +635,7 @@ status.wet.name = Wet
 status.muddy.name = Muddy
 status.melting.name = Melting
 status.sapped.name = Sapped
+status.electrified.name = Electrified
 status.spore-slowed.name = Spore Slowed
 status.tarred.name = Tarred
 status.overclock.name = Overclock
@@ -654,6 +664,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Yes
 no = No
 info.title = Info
@@ -692,6 +703,7 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
 stat.weapons = Weapons
 stat.bullet = Bullet
 stat.speedincrease = Speed Increase
@@ -741,10 +753,11 @@ stat.healing = Healing

 ability.forcefield = Force Field
 ability.repairfield = Repair Field
-ability.statusfield = Status Field
+ability.statusfield = {0} Status Field
 ability.unitspawn = {0} Factory
 ability.shieldregenfield = Shield Regen Field
 ability.movelightning = Movement Lightning
+ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets

 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
@@ -767,6 +780,7 @@ bar.power = Power
 bar.progress = Build Progress
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength

 units.processorcontrol = [lightgray]Processor Controlled

@@ -975,6 +989,7 @@ rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.buildai = AI Building
+rules.corecapture = Capture Core On Destruction
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
@@ -1030,6 +1045,7 @@ item.blast-compound.name = Blast Compound
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
+
 liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
@@ -1121,6 +1137,7 @@ block.sand-water.name = Sand Water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
@@ -1228,6 +1245,7 @@ block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
 block.repair-point.name = Repair Point
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
 block.phase-conduit.name = Phase Conduit
@@ -1289,9 +1307,8 @@ block.memory-cell.name = Memory Cell
 block.memory-bank.name = Memory Bank

 team.blue.name = blue
-team.crux.name = red
-team.sharded.name = orange
-team.orange.name = orange
+team.crux.name = crux
+team.sharded.name = sharded
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
@@ -1312,6 +1329,7 @@ hint.placeConveyor.mobile = Conveyors move items from drills into other blocks.
 hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
 hint.breaking = [accent]Right-click[] and drag to break blocks.
 hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
 hint.research = Use the \ue875 [accent]Research[] button to research new technology.
 hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
 hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
@@ -1345,7 +1363,7 @@ item.graphite.description = Used in electrical components and turret ammunition.
 item.sand.description = Used for production of other refined materials.
 item.coal.description = Used for fuel and refined material production.
 item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
-item.titanium.description = Used in liquid transportation structures, drills and aircraft.
+item.titanium.description = Used in liquid transportation structures, drills and factories.
 item.thorium.description = Used in durable structures and as nuclear fuel.
 item.scrap.description = Used in Melters and Pulverizers for refining into other materials.
 item.scrap.details = Leftover remnants of old structures and units.
@@ -1566,7 +1584,7 @@ logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
-lenum.configure = Building configuration, e.g. sorter item.
+lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.

 laccess.color = Illuminator color.
@@ -1574,6 +1592,7 @@ laccess.controller = Unit controller. If processor controlled, returns processor
 laccess.dead = Whether a unit/building is dead or no longer valid.
 laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
 laccess.commanded = [red]Deprecated. Will be removed![]\nUse [accent]controlled[] instead.
+laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.

 graphicstype.clear = Fill the display with a color.
 graphicstype.color = Set color for next drawing operations.
@@ -740,7 +740,7 @@ stat.reactive = Реактивен

 ability.forcefield = Силовое поле
 ability.repairfield = Ремонтирующее поле
-ability.statusfield = Усиливающее поле
+ability.statusfield = {0} Усиливающее поле
 ability.unitspawn = Завод единиц «{0}»
 ability.shieldregenfield = Поле восстановления щита
 ability.movelightning = Молнии при движении
@@ -1,336 +1,353 @@
-63743=spawn|block-spawn-medium
-63742=deepwater|block-deepwater-medium
-63741=water|block-water-medium
-63740=tainted-water|block-tainted-water-medium
-63739=darksand-tainted-water|block-darksand-tainted-water-medium
-63738=sand-water|block-sand-water-medium
-63737=darksand-water|block-darksand-water-medium
-63736=tar|block-tar-medium
-63735=stone|block-stone-medium
-63734=craters|block-craters-medium
-63733=char|block-char-medium
-63732=ignarock|block-ignarock-medium
-63731=hotrock|block-hotrock-medium
-63730=magmarock|block-magmarock-medium
-63729=sand|block-sand-medium
-63728=darksand|block-darksand-medium
-63726=grass|block-grass-medium
-63725=salt|block-salt-medium
-63724=snow|block-snow-medium
-63723=ice|block-ice-medium
-63722=ice-snow|block-ice-snow-medium
-63721=cliffs|block-cliffs-medium
-63718=rock|block-rock-medium
-63717=snowrock|block-snowrock-medium
-63711=spore-pine|block-spore-pine-medium
-63710=snow-pine|block-snow-pine-medium
-63709=pine|block-pine-medium
-63708=shrubs|block-shrubs-medium
-63707=white-tree-dead|block-white-tree-dead-medium
-63706=white-tree|block-white-tree-medium
-63705=spore-cluster|block-spore-cluster-medium
-63704=shale|block-shale-medium
-63702=shale-boulder|block-shale-boulder-medium
-63701=sand-boulder|block-sand-boulder-medium
-63700=moss|block-moss-medium
-63699=spore-moss|block-spore-moss-medium
-63698=metal-floor|block-metal-floor-medium
-63697=metal-floor-damaged|block-metal-floor-damaged-medium
-63696=metal-floor-2|block-metal-floor-2-medium
-63695=metal-floor-3|block-metal-floor-3-medium
-63694=metal-floor-5|block-metal-floor-5-medium
-63693=dark-panel-1|block-dark-panel-1-medium
-63692=dark-panel-2|block-dark-panel-2-medium
-63691=dark-panel-3|block-dark-panel-3-medium
-63690=dark-panel-4|block-dark-panel-4-medium
-63689=dark-panel-5|block-dark-panel-5-medium
-63688=dark-panel-6|block-dark-panel-6-medium
-63687=dark-metal|block-dark-metal-medium
-63686=pebbles|block-pebbles-medium
-63685=tendrils|block-tendrils-medium
-63684=ore-copper|block-ore-copper-medium
-63683=ore-lead|block-ore-lead-medium
-63682=ore-scrap|block-ore-scrap-medium
-63681=ore-coal|block-ore-coal-medium
-63680=ore-titanium|block-ore-titanium-medium
-63679=ore-thorium|block-ore-thorium-medium
-63678=graphite-press|block-graphite-press-medium
-63677=multi-press|block-multi-press-medium
-63676=silicon-smelter|block-silicon-smelter-medium
-63675=kiln|block-kiln-medium
-63674=plastanium-compressor|block-plastanium-compressor-medium
-63673=phase-weaver|block-phase-weaver-medium
-63672=alloy-smelter|block-alloy-smelter-medium
-63671=cryofluid-mixer|block-cryofluid-mixer-medium
-63670=blast-mixer|block-blast-mixer-medium
-63669=pyratite-mixer|block-pyratite-mixer-medium
-63668=melter|block-melter-medium
-63667=separator|block-separator-medium
-63666=spore-press|block-spore-press-medium
-63665=pulverizer|block-pulverizer-medium
-63664=coal-centrifuge|block-coal-centrifuge-medium
-63663=incinerator|block-incinerator-medium
-63662=copper-wall|block-copper-wall-medium
-63661=copper-wall-large|block-copper-wall-large-medium
-63660=titanium-wall|block-titanium-wall-medium
-63659=titanium-wall-large|block-titanium-wall-large-medium
-63658=plastanium-wall|block-plastanium-wall-medium
-63657=plastanium-wall-large|block-plastanium-wall-large-medium
-63656=thorium-wall|block-thorium-wall-medium
-63655=thorium-wall-large|block-thorium-wall-large-medium
-63654=phase-wall|block-phase-wall-medium
-63653=phase-wall-large|block-phase-wall-large-medium
-63652=surge-wall|block-surge-wall-medium
-63651=surge-wall-large|block-surge-wall-large-medium
-63650=door|block-door-medium
-63649=door-large|block-door-large-medium
-63648=scrap-wall|block-scrap-wall-medium
-63647=scrap-wall-large|block-scrap-wall-large-medium
-63646=scrap-wall-huge|block-scrap-wall-huge-medium
-63645=scrap-wall-gigantic|block-scrap-wall-gigantic-medium
-63644=thruster|block-thruster-medium
-63643=mender|block-mender-medium
-63642=mend-projector|block-mend-projector-medium
-63641=overdrive-projector|block-overdrive-projector-medium
-63640=force-projector|block-force-projector-medium
-63639=shock-mine|block-shock-mine-medium
-63638=conveyor|block-conveyor-medium
-63637=titanium-conveyor|block-titanium-conveyor-medium
-63636=armored-conveyor|block-armored-conveyor-medium
-63635=junction|block-junction-medium
-63634=bridge-conveyor|block-bridge-conveyor-medium
-63633=phase-conveyor|block-phase-conveyor-medium
-63632=sorter|block-sorter-medium
-63631=inverted-sorter|block-inverted-sorter-medium
-63630=router|block-router-medium
-63629=distributor|block-distributor-medium
-63628=overflow-gate|block-overflow-gate-medium
-63627=mass-driver|block-mass-driver-medium
-63626=mechanical-pump|block-mechanical-pump-medium
-63625=rotary-pump|block-rotary-pump-medium
-63624=thermal-pump|block-thermal-pump-medium
-63623=conduit|block-conduit-medium
-63622=pulse-conduit|block-pulse-conduit-medium
-63621=plated-conduit|block-plated-conduit-medium
-63620=liquid-router|block-liquid-router-medium
-63619=liquid-tank|block-liquid-tank-medium
-63618=liquid-junction|block-liquid-junction-medium
-63617=bridge-conduit|block-bridge-conduit-medium
-63616=phase-conduit|block-phase-conduit-medium
-63615=power-node|block-power-node-medium
-63614=power-node-large|block-power-node-large-medium
-63613=surge-tower|block-surge-tower-medium
-63612=diode|block-diode-medium
-63611=battery|block-battery-medium
-63610=battery-large|block-battery-large-medium
-63609=combustion-generator|block-combustion-generator-medium
-63608=thermal-generator|block-thermal-generator-medium
-63607=steam-generator|block-steam-generator-medium
-63606=differential-generator|block-differential-generator-medium
-63605=rtg-generator|block-rtg-generator-medium
-63604=solar-panel|block-solar-panel-medium
-63603=solar-panel-large|block-solar-panel-large-medium
-63602=thorium-reactor|block-thorium-reactor-medium
-63601=impact-reactor|block-impact-reactor-medium
-63600=mechanical-drill|block-mechanical-drill-medium
-63599=pneumatic-drill|block-pneumatic-drill-medium
-63598=laser-drill|block-laser-drill-medium
-63597=blast-drill|block-blast-drill-medium
-63596=water-extractor|block-water-extractor-medium
-63595=cultivator|block-cultivator-medium
-63594=oil-extractor|block-oil-extractor-medium
-63593=core-shard|block-core-shard-medium
-63592=core-foundation|block-core-foundation-medium
-63591=core-nucleus|block-core-nucleus-medium
-63590=vault|block-vault-medium
-63589=container|block-container-medium
-63588=unloader|block-unloader-medium
-63587=launch-pad|block-launch-pad-medium
-63586=launch-pad-large|block-launch-pad-large-medium
-63585=duo|block-duo-medium
-63584=scatter|block-scatter-medium
-63583=scorch|block-scorch-medium
-63582=hail|block-hail-medium
-63581=wave|block-wave-medium
-63580=lancer|block-lancer-medium
-63579=arc|block-arc-medium
-63578=swarmer|block-swarmer-medium
-63577=salvo|block-salvo-medium
-63576=fuse|block-fuse-medium
-63575=ripple|block-ripple-medium
-63574=cyclone|block-cyclone-medium
-63573=spectre|block-spectre-medium
-63572=meltdown|block-meltdown-medium
-63571=draug-factory|block-draug-factory-medium
-63570=spirit-factory|block-spirit-factory-medium
-63569=phantom-factory|block-phantom-factory-medium
-63568=command-center|block-command-center-medium
-63567=wraith-factory|block-wraith-factory-medium
-63566=ghoul-factory|block-ghoul-factory-medium
-63565=revenant-factory|block-revenant-factory-medium
-63564=dagger-factory|block-dagger-factory-medium
-63563=crawler-factory|block-crawler-factory-medium
-63562=titan-factory|block-titan-factory-medium
-63561=fortress-factory|block-fortress-factory-medium
-63560=repair-point|block-repair-point-medium
-63559=dart-mech-pad|block-dart-mech-pad-medium
-63558=delta-mech-pad|block-delta-mech-pad-medium
-63557=tau-mech-pad|block-tau-mech-pad-medium
-63556=omega-mech-pad|block-omega-mech-pad-medium
-63555=javelin-ship-pad|block-javelin-ship-pad-medium
-63554=trident-ship-pad|block-trident-ship-pad-medium
-63553=glaive-ship-pad|block-glaive-ship-pad-medium
-63552=power-source|block-power-source-medium
-63551=power-void|block-power-void-medium
-63550=item-source|block-item-source-medium
-63549=item-void|block-item-void-medium
-63548=liquid-source|block-liquid-source-medium
-63547=liquid-void|block-liquid-void-medium
-63546=message|block-message-medium
-63545=illuminator|block-illuminator-medium
-63544=copper|item-copper-icon
-63543=lead|item-lead-icon
-63542=metaglass|item-metaglass-icon
-63541=graphite|item-graphite-icon
-63540=sand|item-sand-icon
-63539=coal|item-coal-icon
-63538=titanium|item-titanium-icon
-63537=thorium|item-thorium-icon
-63536=scrap|item-scrap-icon
-63535=silicon|item-silicon-icon
-63534=plastanium|item-plastanium-icon
-63533=phase-fabric|item-phase-fabric-icon
-63532=surge-alloy|item-surge-alloy-icon
-63531=spore-pod|item-spore-pod-icon
-63530=blast-compound|item-blast-compound-icon
-63529=pyratite|item-pyratite-icon
-63528=water|liquid-water-icon
-63527=slag|liquid-slag-icon
-63526=oil|liquid-oil-icon
-63525=cryofluid|liquid-cryofluid-icon
-63524=underflow-gate|block-underflow-gate-medium
-63523=dart-ship-pad|block-dart-ship-pad-medium
-63522=alpha-mech-pad|block-alpha-mech-pad-medium
-63521=cliff|block-cliff-medium
-63520=legacy-mech-pad|block-legacy-mech-pad-medium
-63519=ground-factory|block-ground-factory-medium
-63518=legacy-unit-factory|block-legacy-unit-factory-medium
-63517=mass-conveyor|block-mass-conveyor-medium
-63516=legacy-command-center|block-legacy-command-center-medium
-63515=block-forge|block-block-forge-medium
-63514=block-launcher|block-block-launcher-medium
-63513=plastanium-conveyor|block-plastanium-conveyor-medium
+63743=spawn|block-spawn-ui
+63742=deepwater|block-deepwater-ui
+63741=water|block-water-ui
+63740=tainted-water|block-tainted-water-ui
+63739=darksand-tainted-water|block-darksand-tainted-water-ui
+63738=sand-water|block-sand-water-ui
+63737=darksand-water|block-darksand-water-ui
+63736=tar|block-tar-ui
+63735=stone|block-stone-ui
+63734=craters|block-craters-ui
+63733=char|block-char-ui
+63732=ignarock|block-ignarock-ui
+63731=hotrock|block-hotrock-ui
+63730=magmarock|block-magmarock-ui
+63729=sand|block-sand-ui
+63728=darksand|block-darksand-ui
+63726=grass|block-grass-ui
+63725=salt|block-salt-ui
+63724=snow|block-snow-ui
+63723=ice|block-ice-ui
+63722=ice-snow|block-ice-snow-ui
+63721=cliffs|block-cliffs-ui
+63718=rock|block-rock-ui
+63717=snowrock|block-snowrock-ui
+63711=spore-pine|block-spore-pine-ui
+63710=snow-pine|block-snow-pine-ui
+63709=pine|block-pine-ui
+63708=shrubs|block-shrubs-ui
+63707=white-tree-dead|block-white-tree-dead-ui
+63706=white-tree|block-white-tree-ui
+63705=spore-cluster|block-spore-cluster-ui
+63704=shale|block-shale-ui
+63702=shale-boulder|block-shale-boulder-ui
+63701=sand-boulder|block-sand-boulder-ui
+63700=moss|block-moss-ui
+63699=spore-moss|block-spore-moss-ui
+63698=metal-floor|block-metal-floor-ui
+63697=metal-floor-damaged|block-metal-floor-damaged-ui
+63696=metal-floor-2|block-metal-floor-2-ui
+63695=metal-floor-3|block-metal-floor-3-ui
+63694=metal-floor-5|block-metal-floor-5-ui
+63693=dark-panel-1|block-dark-panel-1-ui
+63692=dark-panel-2|block-dark-panel-2-ui
+63691=dark-panel-3|block-dark-panel-3-ui
+63690=dark-panel-4|block-dark-panel-4-ui
+63689=dark-panel-5|block-dark-panel-5-ui
+63688=dark-panel-6|block-dark-panel-6-ui
+63687=dark-metal|block-dark-metal-ui
+63686=pebbles|block-pebbles-ui
+63685=tendrils|block-tendrils-ui
+63684=ore-copper|block-ore-copper-ui
+63683=ore-lead|block-ore-lead-ui
+63682=ore-scrap|block-ore-scrap-ui
+63681=ore-coal|block-ore-coal-ui
+63680=ore-titanium|block-ore-titanium-ui
+63679=ore-thorium|block-ore-thorium-ui
+63678=graphite-press|block-graphite-press-ui
+63677=multi-press|block-multi-press-ui
+63676=silicon-smelter|block-silicon-smelter-ui
+63675=kiln|block-kiln-ui
+63674=plastanium-compressor|block-plastanium-compressor-ui
+63673=phase-weaver|block-phase-weaver-ui
+63672=alloy-smelter|block-alloy-smelter-ui
+63671=cryofluid-mixer|block-cryofluid-mixer-ui
+63670=blast-mixer|block-blast-mixer-ui
+63669=pyratite-mixer|block-pyratite-mixer-ui
+63668=melter|block-melter-ui
+63667=separator|block-separator-ui
+63666=spore-press|block-spore-press-ui
+63665=pulverizer|block-pulverizer-ui
+63664=coal-centrifuge|block-coal-centrifuge-ui
+63663=incinerator|block-incinerator-ui
+63662=copper-wall|block-copper-wall-ui
+63661=copper-wall-large|block-copper-wall-large-ui
+63660=titanium-wall|block-titanium-wall-ui
+63659=titanium-wall-large|block-titanium-wall-large-ui
+63658=plastanium-wall|block-plastanium-wall-ui
+63657=plastanium-wall-large|block-plastanium-wall-large-ui
+63656=thorium-wall|block-thorium-wall-ui
+63655=thorium-wall-large|block-thorium-wall-large-ui
+63654=phase-wall|block-phase-wall-ui
+63653=phase-wall-large|block-phase-wall-large-ui
+63652=surge-wall|block-surge-wall-ui
+63651=surge-wall-large|block-surge-wall-large-ui
+63650=door|block-door-ui
+63649=door-large|block-door-large-ui
+63648=scrap-wall|block-scrap-wall-ui
+63647=scrap-wall-large|block-scrap-wall-large-ui
+63646=scrap-wall-huge|block-scrap-wall-huge-ui
+63645=scrap-wall-gigantic|block-scrap-wall-gigantic-ui
+63644=thruster|block-thruster-ui
+63643=mender|block-mender-ui
+63642=mend-projector|block-mend-projector-ui
+63641=overdrive-projector|block-overdrive-projector-ui
+63640=force-projector|block-force-projector-ui
+63639=shock-mine|block-shock-mine-ui
+63638=conveyor|block-conveyor-ui
+63637=titanium-conveyor|block-titanium-conveyor-ui
+63636=armored-conveyor|block-armored-conveyor-ui
+63635=junction|block-junction-ui
+63634=bridge-conveyor|block-bridge-conveyor-ui
+63633=phase-conveyor|block-phase-conveyor-ui
+63632=sorter|block-sorter-ui
+63631=inverted-sorter|block-inverted-sorter-ui
+63630=router|block-router-ui
+63629=distributor|block-distributor-ui
+63628=overflow-gate|block-overflow-gate-ui
+63627=mass-driver|block-mass-driver-ui
+63626=mechanical-pump|block-mechanical-pump-ui
+63625=rotary-pump|block-rotary-pump-ui
+63624=thermal-pump|block-thermal-pump-ui
+63623=conduit|block-conduit-ui
+63622=pulse-conduit|block-pulse-conduit-ui
+63621=plated-conduit|block-plated-conduit-ui
+63620=liquid-router|block-liquid-router-ui
+63619=liquid-tank|block-liquid-tank-ui
+63618=liquid-junction|block-liquid-junction-ui
+63617=bridge-conduit|block-bridge-conduit-ui
+63616=phase-conduit|block-phase-conduit-ui
+63615=power-node|block-power-node-ui
+63614=power-node-large|block-power-node-large-ui
+63613=surge-tower|block-surge-tower-ui
+63612=diode|block-diode-ui
+63611=battery|block-battery-ui
+63610=battery-large|block-battery-large-ui
+63609=combustion-generator|block-combustion-generator-ui
+63608=thermal-generator|block-thermal-generator-ui
+63607=steam-generator|block-steam-generator-ui
+63606=differential-generator|block-differential-generator-ui
+63605=rtg-generator|block-rtg-generator-ui
+63604=solar-panel|block-solar-panel-ui
+63603=solar-panel-large|block-solar-panel-large-ui
+63602=thorium-reactor|block-thorium-reactor-ui
+63601=impact-reactor|block-impact-reactor-ui
+63600=mechanical-drill|block-mechanical-drill-ui
+63599=pneumatic-drill|block-pneumatic-drill-ui
+63598=laser-drill|block-laser-drill-ui
+63597=blast-drill|block-blast-drill-ui
+63596=water-extractor|block-water-extractor-ui
+63595=cultivator|block-cultivator-ui
+63594=oil-extractor|block-oil-extractor-ui
+63593=core-shard|block-core-shard-ui
+63592=core-foundation|block-core-foundation-ui
+63591=core-nucleus|block-core-nucleus-ui
+63590=vault|block-vault-ui
+63589=container|block-container-ui
+63588=unloader|block-unloader-ui
+63587=launch-pad|block-launch-pad-ui
+63586=launch-pad-large|block-launch-pad-large-ui
+63585=duo|block-duo-ui
+63584=scatter|block-scatter-ui
+63583=scorch|block-scorch-ui
+63582=hail|block-hail-ui
+63581=wave|block-wave-ui
+63580=lancer|block-lancer-ui
+63579=arc|block-arc-ui
+63578=swarmer|block-swarmer-ui
+63577=salvo|block-salvo-ui
+63576=fuse|block-fuse-ui
+63575=ripple|block-ripple-ui
+63574=cyclone|block-cyclone-ui
+63573=spectre|block-spectre-ui
+63572=meltdown|block-meltdown-ui
+63571=draug-factory|block-draug-factory-ui
+63570=spirit-factory|block-spirit-factory-ui
+63569=phantom-factory|block-phantom-factory-ui
+63568=command-center|block-command-center-ui
+63567=wraith-factory|block-wraith-factory-ui
+63566=ghoul-factory|block-ghoul-factory-ui
+63565=revenant-factory|block-revenant-factory-ui
+63564=dagger-factory|block-dagger-factory-ui
+63563=crawler-factory|block-crawler-factory-ui
+63562=titan-factory|block-titan-factory-ui
+63561=fortress-factory|block-fortress-factory-ui
+63560=repair-point|block-repair-point-ui
+63559=dart-mech-pad|block-dart-mech-pad-ui
+63558=delta-mech-pad|block-delta-mech-pad-ui
+63557=tau-mech-pad|block-tau-mech-pad-ui
+63556=omega-mech-pad|block-omega-mech-pad-ui
+63555=javelin-ship-pad|block-javelin-ship-pad-ui
+63554=trident-ship-pad|block-trident-ship-pad-ui
+63553=glaive-ship-pad|block-glaive-ship-pad-ui
+63552=power-source|block-power-source-ui
+63551=power-void|block-power-void-ui
+63550=item-source|block-item-source-ui
+63549=item-void|block-item-void-ui
+63548=liquid-source|block-liquid-source-ui
+63547=liquid-void|block-liquid-void-ui
+63546=message|block-message-ui
+63545=illuminator|block-illuminator-ui
+63544=copper|item-copper-ui
+63543=lead|item-lead-ui
+63542=metaglass|item-metaglass-ui
+63541=graphite|item-graphite-ui
+63540=sand|item-sand-ui
+63539=coal|item-coal-ui
+63538=titanium|item-titanium-ui
+63537=thorium|item-thorium-ui
+63536=scrap|item-scrap-ui
+63535=silicon|item-silicon-ui
+63534=plastanium|item-plastanium-ui
+63533=phase-fabric|item-phase-fabric-ui
+63532=surge-alloy|item-surge-alloy-ui
+63531=spore-pod|item-spore-pod-ui
+63530=blast-compound|item-blast-compound-ui
+63529=pyratite|item-pyratite-ui
+63528=water|liquid-water-ui
+63527=slag|liquid-slag-ui
+63526=oil|liquid-oil-ui
+63525=cryofluid|liquid-cryofluid-ui
+63524=underflow-gate|block-underflow-gate-ui
+63523=dart-ship-pad|block-dart-ship-pad-ui
+63522=alpha-mech-pad|block-alpha-mech-pad-ui
+63521=cliff|block-cliff-ui
+63520=legacy-mech-pad|block-legacy-mech-pad-ui
+63519=ground-factory|block-ground-factory-ui
+63518=legacy-unit-factory|block-legacy-unit-factory-ui
+63517=mass-conveyor|block-mass-conveyor-ui
+63516=legacy-command-center|block-legacy-command-center-ui
+63515=block-forge|block-block-forge-ui
+63514=block-launcher|block-block-launcher-ui
+63513=plastanium-conveyor|block-plastanium-conveyor-ui
 63512=crater|crater
-63511=naval-factory|block-naval-factory-medium
-63510=air-factory|block-air-factory-medium
-63509=basic-reconstructor|block-basic-reconstructor-medium
-63508=block-loader|block-block-loader-medium
-63507=block-unloader|block-block-unloader-medium
-63506=core-silo|block-core-silo-medium
-63505=data-processor|block-data-processor-medium
-63504=payload-router|block-payload-router-medium
-63503=silicon-crucible|block-silicon-crucible-medium
-63502=segment|block-segment-medium
-63501=large-overdrive-projector|block-large-overdrive-projector-medium
-63500=disassembler|block-disassembler-medium
-63499=advanced-reconstructor|block-advanced-reconstructor-medium
-63498=reconstructor-basis|block-reconstructor-basis-medium
-63497=reconstructor-morphism|block-reconstructor-morphism-medium
-63496=reconstructor-functor|block-reconstructor-functor-medium
-63495=reconstructor-prime|block-reconstructor-prime-medium
-63494=additive-reconstructor|block-additive-reconstructor-medium
-63493=multiplicative-reconstructor|block-multiplicative-reconstructor-medium
-63492=exponential-reconstructor|block-exponential-reconstructor-medium
-63491=tetrative-reconstructor|block-tetrative-reconstructor-medium
-63490=resupply-point|block-resupply-point-medium
-63489=parallax|block-parallax-medium
-63488=dagger|unit-dagger-medium
-63487=mace|unit-mace-medium
-63486=fortress|unit-fortress-medium
-63485=nova|unit-nova-medium
-63484=pulsar|unit-pulsar-medium
-63483=quasar|unit-quasar-medium
-63482=crawler|unit-crawler-medium
-63481=atrax|unit-atrax-medium
-63480=spiroct|unit-spiroct-medium
-63479=arkyid|unit-arkyid-medium
-63478=flare|unit-flare-medium
-63477=horizon|unit-horizon-medium
-63476=zenith|unit-zenith-medium
-63475=antumbra|unit-antumbra-medium
-63474=eclipse|unit-eclipse-medium
-63473=mono|unit-mono-medium
-63472=poly|unit-poly-medium
-63471=mega|unit-mega-medium
-63470=risse|unit-risse-medium
-63469=minke|unit-minke-medium
-63468=bryde|unit-bryde-medium
-63467=alpha|unit-alpha-medium
-63466=beta|unit-beta-medium
-63465=gamma|unit-gamma-medium
-63464=block|unit-block-medium
-63463=risso|unit-risso-medium
-63462=overdrive-dome|block-overdrive-dome-medium
-63461=logic-processor|block-logic-processor-medium
-63460=micro-processor|block-micro-processor-medium
-63459=logic-display|block-logic-display-medium
-63458=switch|block-switch-medium
-63457=memory-cell|block-memory-cell-medium
-63456=payload-conveyor|block-payload-conveyor-medium
-63455=hyper-processor|block-hyper-processor-medium
-63454=toxopid|unit-toxopid-medium
-63453=vestige|unit-vestige-medium
-63452=cataclyst|unit-cataclyst-medium
-63451=scepter|unit-scepter-medium
-63450=reign|unit-reign-medium
-63449=dirt|block-dirt-medium
-63447=stone-wall|block-stone-wall-medium
-63446=spore-wall|block-spore-wall-medium
-63445=ice-wall|block-ice-wall-medium
-63444=snow-wall|block-snow-wall-medium
-63443=dune-wall|block-dune-wall-medium
-63442=sand-wall|block-sand-wall-medium
-63441=salt-wall|block-salt-wall-medium
-63440=shale-wall|block-shale-wall-medium
-63439=dirt-wall|block-dirt-wall-medium
-63437=basalt|block-basalt-medium
-63436=dacite|block-dacite-medium
-63435=boulder|block-boulder-medium
-63434=snow-boulder|block-snow-boulder-medium
-63433=dacite-wall|block-dacite-wall-medium
-63432=dacite-boulder|block-dacite-boulder-medium
-63431=large-logic-display|block-large-logic-display-medium
-63430=omura|unit-omura-medium
-63429=mud|block-mud-medium
-63428=sei|unit-sei-medium
-63427=quad|unit-quad-medium
-63426=oct|unit-oct-medium
-63425=vela|unit-vela-medium
-63424=corvus|unit-corvus-medium
-63423=memory-bank|block-memory-bank-medium
-63422=foreshadow|block-foreshadow-medium
-63421=tsunami|block-tsunami-medium
-63420=space|block-space-medium
-63419=legacy-unit-factory-air|block-legacy-unit-factory-air-medium
-63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-medium
-63417=interplanetary-accelerator|block-interplanetary-accelerator-medium
-63416=basalt-boulder|block-basalt-boulder-medium
-63415=none|status-none-icon
-63414=burning|status-burning-icon
-63413=freezing|status-freezing-icon
-63412=unmoving|status-unmoving-icon
-63411=slow|status-slow-icon
-63410=wet|status-wet-icon
-63409=muddy|status-muddy-icon
-63408=melting|status-melting-icon
-63407=sapped|status-sapped-icon
-63406=spore-slowed|status-spore-slowed-icon
-63405=tarred|status-tarred-icon
-63404=overdrive|status-overdrive-icon
-63403=overclock|status-overclock-icon
-63402=shielded|status-shielded-icon
-63401=boss|status-boss-icon
-63400=shocked|status-shocked-icon
-63399=blasted|status-blasted-icon
-63398=corroded|status-corroded-icon
-63397=disarmed|status-disarmed-icon
+63511=naval-factory|block-naval-factory-ui
+63510=air-factory|block-air-factory-ui
+63509=basic-reconstructor|block-basic-reconstructor-ui
+63508=block-loader|block-block-loader-ui
+63507=block-unloader|block-block-unloader-ui
+63506=core-silo|block-core-silo-ui
+63505=data-processor|block-data-processor-ui
+63504=payload-router|block-payload-router-ui
+63503=silicon-crucible|block-silicon-crucible-ui
+63502=segment|block-segment-ui
+63501=large-overdrive-projector|block-large-overdrive-projector-ui
+63500=disassembler|block-disassembler-ui
+63499=advanced-reconstructor|block-advanced-reconstructor-ui
+63498=reconstructor-basis|block-reconstructor-basis-ui
+63497=reconstructor-morphism|block-reconstructor-morphism-ui
+63496=reconstructor-functor|block-reconstructor-functor-ui
+63495=reconstructor-prime|block-reconstructor-prime-ui
+63494=additive-reconstructor|block-additive-reconstructor-ui
+63493=multiplicative-reconstructor|block-multiplicative-reconstructor-ui
+63492=exponential-reconstructor|block-exponential-reconstructor-ui
+63491=tetrative-reconstructor|block-tetrative-reconstructor-ui
+63490=resupply-point|block-resupply-point-ui
+63489=parallax|block-parallax-ui
+63488=dagger|unit-dagger-ui
+63487=mace|unit-mace-ui
+63486=fortress|unit-fortress-ui
+63485=nova|unit-nova-ui
+63484=pulsar|unit-pulsar-ui
+63483=quasar|unit-quasar-ui
+63482=crawler|unit-crawler-ui
+63481=atrax|unit-atrax-ui
+63480=spiroct|unit-spiroct-ui
+63479=arkyid|unit-arkyid-ui
+63478=flare|unit-flare-ui
+63477=horizon|unit-horizon-ui
+63476=zenith|unit-zenith-ui
+63475=antumbra|unit-antumbra-ui
+63474=eclipse|unit-eclipse-ui
+63473=mono|unit-mono-ui
+63472=poly|unit-poly-ui
+63471=mega|unit-mega-ui
+63470=risse|unit-risse-ui
+63469=minke|unit-minke-ui
+63468=bryde|unit-bryde-ui
+63467=alpha|unit-alpha-ui
+63466=beta|unit-beta-ui
+63465=gamma|unit-gamma-ui
+63464=block|unit-block-ui
+63463=risso|unit-risso-ui
+63462=overdrive-dome|block-overdrive-dome-ui
+63461=logic-processor|block-logic-processor-ui
+63460=micro-processor|block-micro-processor-ui
+63459=logic-display|block-logic-display-ui
+63458=switch|block-switch-ui
+63457=memory-cell|block-memory-cell-ui
+63456=payload-conveyor|block-payload-conveyor-ui
+63455=hyper-processor|block-hyper-processor-ui
+63454=toxopid|unit-toxopid-ui
+63453=vestige|unit-vestige-ui
+63452=cataclyst|unit-cataclyst-ui
+63451=scepter|unit-scepter-ui
+63450=reign|unit-reign-ui
+63449=dirt|block-dirt-ui
+63447=stone-wall|block-stone-wall-ui
+63446=spore-wall|block-spore-wall-ui
+63445=ice-wall|block-ice-wall-ui
+63444=snow-wall|block-snow-wall-ui
+63443=dune-wall|block-dune-wall-ui
+63442=sand-wall|block-sand-wall-ui
+63441=salt-wall|block-salt-wall-ui
+63440=shale-wall|block-shale-wall-ui
+63439=dirt-wall|block-dirt-wall-ui
+63437=basalt|block-basalt-ui
+63436=dacite|block-dacite-ui
+63435=boulder|block-boulder-ui
+63434=snow-boulder|block-snow-boulder-ui
+63433=dacite-wall|block-dacite-wall-ui
+63432=dacite-boulder|block-dacite-boulder-ui
+63431=large-logic-display|block-large-logic-display-ui
+63430=omura|unit-omura-ui
+63429=mud|block-mud-ui
+63428=sei|unit-sei-ui
+63427=quad|unit-quad-ui
+63426=oct|unit-oct-ui
+63425=vela|unit-vela-ui
+63424=corvus|unit-corvus-ui
+63423=memory-bank|block-memory-bank-ui
+63422=foreshadow|block-foreshadow-ui
+63421=tsunami|block-tsunami-ui
+63420=space|block-space-ui
+63419=legacy-unit-factory-air|block-legacy-unit-factory-air-ui
+63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-ui
+63417=interplanetary-accelerator|block-interplanetary-accelerator-ui
+63416=basalt-boulder|block-basalt-boulder-ui
+63415=none|status-none-ui
+63414=burning|status-burning-ui
+63413=freezing|status-freezing-ui
+63412=unmoving|status-unmoving-ui
+63411=slow|status-slow-ui
+63410=wet|status-wet-ui
+63409=muddy|status-muddy-ui
+63408=melting|status-melting-ui
+63407=sapped|status-sapped-ui
+63406=spore-slowed|status-spore-slowed-ui
+63405=tarred|status-tarred-ui
+63404=overdrive|status-overdrive-ui
+63403=overclock|status-overclock-ui
+63402=shielded|status-shielded-ui
+63401=boss|status-boss-ui
+63400=shocked|status-shocked-ui
+63399=blasted|status-blasted-ui
+63398=corroded|status-corroded-ui
+63397=disarmed|status-disarmed-ui
+63385=duct|block-duct-ui
+63376=repair-turret|block-repair-turret-ui
+63375=payload-propulsion-tower|block-payload-propulsion-tower-ui
+63374=payload-incinerator|block-payload-incinerator-ui
+63373=payload-void|block-payload-void-ui
+63372=payload-source|block-payload-source-ui
+63368=retusa|unit-retusa-ui
+63367=directional-item-bridge|block-directional-item-bridge-ui
+63366=duct-router|block-duct-router-ui
+63365=duct-bridge|block-duct-bridge-ui
+63364=oxynoe|unit-oxynoe-ui
+63363=cyerce|unit-cyerce-ui
+63362=aegires|unit-aegires-ui
+63361=electrified|status-electrified-ui
+63360=navanax|unit-navanax-ui
+63354=payload-launch-pad|block-payload-launch-pad-ui
+63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
@@ -53,10 +53,12 @@ function extend(/*Base, ..., def*/){
 const extendContent = extend;

 importPackage(Packages.arc)
+importPackage(Packages.arc.audio)
 importPackage(Packages.arc.func)
 importPackage(Packages.arc.graphics)
 importPackage(Packages.arc.graphics.g2d)
 importPackage(Packages.arc.graphics.gl)
+importPackage(Packages.arc.input)
 importPackage(Packages.arc.math)
 importPackage(Packages.arc.math.geom)
 importPackage(Packages.arc.scene)
@@ -68,6 +70,12 @@ importPackage(Packages.arc.scene.ui.layout)
 importPackage(Packages.arc.scene.utils)
 importPackage(Packages.arc.struct)
 importPackage(Packages.arc.util)
+importPackage(Packages.arc.util.async)
+importPackage(Packages.arc.util.io)
+importPackage(Packages.arc.util.noise)
+importPackage(Packages.arc.util.pooling)
+importPackage(Packages.arc.util.serialization)
+importPackage(Packages.arc.util.viewport)
 importPackage(Packages.mindustry)
 importPackage(Packages.mindustry.ai)
 importPackage(Packages.mindustry.ai.formations)
@@ -97,7 +105,9 @@ importPackage(Packages.mindustry.maps.filters)
 importPackage(Packages.mindustry.maps.generators)
 importPackage(Packages.mindustry.maps.planet)
 importPackage(Packages.mindustry.net)
+importPackage(Packages.mindustry.service)
 importPackage(Packages.mindustry.type)
+importPackage(Packages.mindustry.type.weapons)
 importPackage(Packages.mindustry.type.weather)
 importPackage(Packages.mindustry.ui)
 importPackage(Packages.mindustry.ui.dialogs)
@@ -123,7 +133,6 @@ importPackage(Packages.mindustry.world.blocks.units)
 importPackage(Packages.mindustry.world.consumers)
 importPackage(Packages.mindustry.world.draw)
 importPackage(Packages.mindustry.world.meta)
-importPackage(Packages.mindustry.world.meta.values)
 importPackage(Packages.mindustry.world.modules)
 const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent
 const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent
@@ -132,6 +141,8 @@ const PlayerBanEvent = Packages.mindustry.game.EventType.PlayerBanEvent
 const PlayerLeave = Packages.mindustry.game.EventType.PlayerLeave
 const PlayerConnect = Packages.mindustry.game.EventType.PlayerConnect
 const PlayerJoin = Packages.mindustry.game.EventType.PlayerJoin
+const ConnectPacketEvent = Packages.mindustry.game.EventType.ConnectPacketEvent
+const ConnectionEvent = Packages.mindustry.game.EventType.ConnectionEvent
 const UnitChangeEvent = Packages.mindustry.game.EventType.UnitChangeEvent
 const UnitUnloadEvent = Packages.mindustry.game.EventType.UnitUnloadEvent
 const UnitCreateEvent = Packages.mindustry.game.EventType.UnitCreateEvent
@@ -145,6 +156,7 @@ const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent
 const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent
 const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent
 const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent
+const TilePreChangeEvent = Packages.mindustry.game.EventType.TilePreChangeEvent
 const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent
 const UnitControlEvent = Packages.mindustry.game.EventType.UnitControlEvent
 const PickupEvent = Packages.mindustry.game.EventType.PickupEvent
@@ -1,3 +1,5 @@
+#define HIGHP
+
 const float PI = 3.14159265359;
 const float MAX = 10000.0;

@@ -1,3 +1,5 @@
+#define HIGHP
+
 uniform sampler2D u_texture;

 uniform vec2 u_texsize;
@@ -0,0 +1,24 @@
+#define HIGHP
+
+#define NSCALE 200.0 / 1.8
+
+uniform sampler2D u_texture;
+uniform sampler2D u_noise;
+
+uniform vec2 u_campos;
+uniform vec2 u_resolution;
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 c = v_texCoords.xy;
+    vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
+
+    float btime = u_time / 3400.0;
+    vec4 noise1 = texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8));
+    vec4 noise2 = texture2D(u_noise, (coords) / NSCALE + vec2(btime * 1.1) * vec2(0.8, -1.0));
+    //vec4 noise3 = texture2D(u_noise, (coords) / (NSCALE * 2.0) + vec2(btime * 0.9) * vec2(0.8, 1.0));
+
+    gl_FragColor = vec4(vec3(min(noise1.r, noise2.r)), 0.2);
+}
@@ -14,7 +14,6 @@ const float mth = 7.0;
 void main(){

 	vec2 c = v_texCoords;
-
 	vec2 v = vec2(1.0/u_resolution.x, 1.0/u_resolution.y);
 	vec2 coords = vec2(c.x / v.x + u_campos.x, c.y / v.y + u_campos.y);