preview 2

Yuria-Shikibe · Oct 10, 2024 · e97e08e · e97e08e
1 parent dc8ee98
commit e97e08e
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 180 deletions.
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
@@ -206,6 +206,9 @@ block.new-horizon-metal-scrap.name = Armor Scarp
 
 
 #Buildings
+block.new-horizon-hard-light-conveyor.name = Hard Light Conveyor
+block.new-horizon-hard-light-conveyor.description = Use static and solidified photon as carrier to transport items. Capable to carry huge amount of stacked items.
+
 block.new-horizon-metal-floor-groove.name = Groove Floor
 block.new-horizon-plating-metal-floor.name = Plating Floor
 block.new-horizon-lab-floor-light.name = Lab Floor (Light)

diff --git a/assets/bundles/bundle_zh_CN.properties b/assets/bundles/bundle_zh_CN.properties
@@ -42,6 +42,8 @@ nh.stat.power-cons-modifier = +@% 能耗\n+@/s 额外能耗
 nh.stat.miner-boost-modifier = +@% 开采速度\n@% 最终速度修正
 nh.stat.percent = +@% 最大速度加成限制
 
+block.new-horizon-hard-light-conveyor.name = 固化光带
+block.new-horizon-hard-light-conveyor.description = 使用静态滞化光子作为载荷介质以传输物品。可以运输大量堆叠物品。
 
 block.new-horizon-metal-floor-groove.name = 深沟地板
 block.new-horizon-plating-metal-floor.name = 镀层地板

diff --git a/assets/shaders/overphased.frag b/assets/shaders/overphased.frag
@@ -6,6 +6,7 @@
 uniform sampler2D u_texture;
 uniform vec2 u_texsize;
 uniform vec2 u_invsize;
+uniform float u_time;
 
 varying vec2 v_texCoords;
 

diff --git a/assets/shaders/statusXWave.frag b/assets/shaders/statusXWave.frag
@@ -0,0 +1,27 @@
+#define HIGHP
+
+uniform sampler2D u_texture;
+uniform vec2 u_texsize;
+uniform vec2 u_invsize;
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 T = v_texCoords.xy;
+    vec2 coords = (T * u_texsize);
+    vec4 color = texture2D(u_texture, T);
+
+    float timeFactor = u_time / 15.0;
+    float sinFactor = abs(sin(timeFactor)) * 0.05;
+    float baseAlpha = 0.37 + sinFactor;
+
+    float stripe1 = step(mod(coords.x + coords.y + u_time / 4.0, 10.0), 3.0);
+    float stripe2 = step(mod(coords.x - coords.y + u_time / 4.0, 10.0), 3.0);
+
+    float alpha = max(baseAlpha + 0.2 * stripe1, baseAlpha + 0.2 * stripe2);
+
+    color.a *= alpha;
+
+    gl_FragColor = color;
+}
diff --git a/...prites/blocks/distribution/hard-light-transport/hard-light-conveyor-stacker.png b/...prites/blocks/distribution/hard-light-transport/hard-light-conveyor-stacker.png
diff --git a/mod.hjson b/mod.hjson
@@ -3,6 +3,6 @@ author: "Yuria"
 name: "new-horizon"
 main: "newhorizon.NewHorizon"
 description: "Warning: Beta Version For V7."
-version: "0.5.4-preview-1"
+version: "0.5.4-preview-2"
 
 minGameVersion: 146
diff --git a/src/newhorizon/NewHorizon.java b/src/newhorizon/NewHorizon.java
@@ -30,6 +30,7 @@
 import mindustry.ui.dialogs.PlanetDialog;
 import mindustry.world.modules.ItemModule;
 import newhorizon.content.*;
+import newhorizon.content.blocks.DistributionBlock;
 import newhorizon.content.blocks.ProductionBlocks;
 import newhorizon.expand.NHVars;
 import newhorizon.expand.entities.EntityRegister;
@@ -82,12 +83,7 @@ public static String name(String name){
 
 	public static FeatureLog[] getUpdateContent(){
 		return new FeatureLog[]{
-			new FeatureLog(ProductionBlocks.resonanceMiningFacility),
-			new FeatureLog(ProductionBlocks.beamMiningFacility),
-			new FeatureLog(ProductionBlocks.implosionMiningFacility),
-			new FeatureLog(ProductionBlocks.refineModule),
-			new FeatureLog(ProductionBlocks.speedModule),
-			new FeatureLog(ProductionBlocks.deliveryModule),
+			new FeatureLog(DistributionBlock.hardLightConveyor),
 		};
 	}
 

diff --git a/src/newhorizon/content/NHShaders.java b/src/newhorizon/content/NHShaders.java
@@ -24,10 +24,11 @@ public class NHShaders{
 
 	public static ShadowShader shadowShader;
 	public static ModSurfaceShader quantum;
-	public static StatusEffectShader overPhased;
+	public static StatusEffectShader statusAlpha, statusXWave;
 
 	public static void init(){
-		overPhased = new StatusEffectShader("screenspace", "overphased");
+		statusAlpha = new StatusEffectShader("screenspace", "overphased");
+		statusXWave = new StatusEffectShader("screenspace", "statusXWave");
 
 		tiler = new Tiler();
 
@@ -269,8 +270,9 @@ public StatusEffectShader(String vert, String frag) {
 
 		@Override
 		public void apply(){
-			setUniformf("u_texsize", Core.camera.width, Core.camera.height);
-			setUniformf("u_invsize", 1f/Core.camera.width, 1f/Core.camera.height);
+			setUniformf("u_texsize", Core.camera.width * renderer.getDisplayScale(), Core.camera.height * renderer.getDisplayScale());
+			setUniformf("u_invsize", 1f/Core.camera.width * renderer.getDisplayScale(), 1f/Core.camera.height * renderer.getDisplayScale());
+			setUniformf("u_time", Time.time);
 		}
 	}
 

diff --git a/src/newhorizon/expand/block/graph/GraphBlock.java b/src/newhorizon/expand/block/graph/GraphBlock.java
@@ -58,13 +58,12 @@ public GraphBlock(String name) {
     @Override
     public void setStats(){
         super.setStats();
-        stats.add(Stat.itemsMoved, itemPerSecond, StatUnit.itemsSecond);
+        stats.add(Stat.itemsMoved, itemPerSecond * itemCapacity, StatUnit.itemsSecond);
     }
 
     @Override
     public void setBars() {
         super.setBars();
-        addBar("progress", (GraphBlockBuild b) -> new Bar(() -> b.recDir + "", () -> Pal.techBlue, () -> 1f));
     }
 
     @Override

diff --git a/src/newhorizon/util/graphic/StatusRenderer.java b/src/newhorizon/util/graphic/StatusRenderer.java
@@ -15,13 +15,15 @@
 import arc.math.geom.Geometry;
 import arc.struct.IntMap;
 import arc.struct.Seq;
+import arc.util.Log;
 import arc.util.Time;
 import arc.util.Tmp;
 import arc.util.pooling.Pool;
 import arc.util.pooling.Pools;
 import mindustry.Vars;
 import mindustry.gen.Unit;
 import mindustry.graphics.Layer;
+import mindustry.graphics.Pal;
 import mindustry.graphics.Shaders;
 import mindustry.type.StatusEffect;
 import newhorizon.content.NHColor;
@@ -91,7 +93,7 @@ public long statusRandId(StatusEffect status){
 	}
 
 	public void registerStatusEffects(){
-		register(NHStatusEffects.ultFireBurn, 20, (warmup, unit, status) -> {
+		register(NHStatusEffects.ultFireBurn, 80, (warmup, unit, status) -> {
 			Color from = NHColor.lightSkyFront, to = NHColor.deeperBlue;
 
 			float rad = width() / 32f;
@@ -122,15 +124,15 @@ public void registerStatusEffects(){
 
 			Draw.blend();
 		});
-		register(NHStatusEffects.overphased, 60, Shaders.buildBeam, (warmup, unit, status) -> {
-			int step = 32;
+		register(NHStatusEffects.invincible, 60, NHShaders.statusXWave, (warmup, unit, status) -> {
+			int step = 36;
 			float rad = (width() + height()) / 2 / step;
 			float stroke = rad * 0.16f;
 			float inner = rad * 0.70f;
 
 			float cx = centerX(), cy = centerY(), dst = rad * Mathf.sqrt3;
 
-			float min = 0.7f;
+			float min = 0.65f;
 			float max = 0.85f;
 			rand.setSeed(statusRandId(status));
 			for (int i = 1; i < step/2; i++){
@@ -144,15 +146,19 @@ public void registerStatusEffects(){
 							float maxDst = Mathf.dst(Mathf.cosDeg(ang) * width()/2, Mathf.sinDeg(ang) * height()/2);
 							float frac = toCenter / maxDst;
 							float chance = frac > min? frac < max? Mathf.curve(frac, min, max): 1f: 0f;
+
 							if (rand.chance(chance)){
-								Tmp.c1.set(NHColor.lightSky).lerp(NHColor.lightSkyFront, warmup * MathUtil.timeValue(0.2f, 0.6f, 1.5f, rand.random(360)));
+								float mmax = 1.3f;
+								float innerFrac = Mathf.clamp(((frac - max) / (mmax - max)) * rand.random(0.72f, 1.2f));
+								float innerWarmup = Interp.bounceOut.apply(Interp.smoother.apply(Mathf.clamp(-Interp.reverse.apply(innerFrac) + warmup * 2)));
+
+								Tmp.c1.set(NHColor.lightSky).lerp(NHColor.lightSkyFront, innerWarmup * MathUtil.timeValue(0.2f, 0.6f, 1.5f, rand.random(360)));
 								Draw.color(Tmp.c1);
-								Draw.alpha(0.75f + MathUtil.timeValue(-0.1f, 0.2f, 2f, rand.random(360)) * warmup);
-								float innerFrac = Mathf.curve(frac, max, 1.3f);
-								float innerWarmup = Interp.exp5In.apply(Mathf.clamp(innerFrac + warmup * 2));;
-								Lines.stroke(stroke * innerWarmup);
-								Lines.poly(Tmp.v2.x, Tmp.v2.y, 6, rad * innerWarmup, 30);
-								Fill.poly(Tmp.v2.x, Tmp.v2.y, 6, inner * innerWarmup, 30);
+								Draw.alpha((1.25f * Mathf.clamp(0.32f + innerFrac * 0.6f) + MathUtil.timeValue(0.1f, 0.4f, 2f, rand.random(360))) * innerWarmup);
+
+								Lines.stroke(stroke);
+								Lines.poly(Tmp.v2.x, Tmp.v2.y, 6, rad, 30);
+								Fill.poly(Tmp.v2.x, Tmp.v2.y, 6, inner, 30);
 							}
 						}
 					}
@@ -161,168 +167,41 @@ public void registerStatusEffects(){
 
 
 		});
-		/*
-		register(NHStatusEffects.scannerDown, 100, new StatusDrawer(NHShaders.scannerDown){
-			private final Color from = Pal.heal, to = NHColor.lightSkyBack;
-
-			@Override
-			public void drawEffect(float warmup Unit unit){
-				float particleLen = width / 8f;
-				float stroke = height / 35f;
-				float life = width / 10f;
-				Lines.stroke(stroke * f);
-
-				float base = (Time.time / life);
-				rand.setSeed(seed);
-
-				Draw.blend(Blending.additive);
-
-				Draw.color(from, Color.white, to, Mathf.absin(4f, 1f));
-				Draw.alpha((0.7f + Mathf.absin(2f, 0.2f)) * Mathf.curve(f, 0, 0.5f));
-				Fill.quad(0, 0, width, 0, width, height, 0, height);
-
-				Draw.blend();
-
-				for(int i = -40; i < 40; i++){
-					for(int j = -15; j < 15; j++){
-						float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
-						int angle = Mathf.sign(rand.range(1));
-						float len = width / 35f * Interp.pow2Out.apply(fin);
-						Draw.alpha((rand.random(0.925f, 1f) + Mathf.absin(2f, 0.05f)) * Mathf.curve(f, 0, 0.5f));
-						Draw.tint(
-							Tmp.c1.set(from).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							Tmp.c2.set(to).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							rand.random(0f, 1f)
-						);
-
-						Draw.getColor().lerp(Color.white, Mathf.absin(2f, 0.075f));
-
-						Lines.lineAngle(width / 2 + rand.range(0.5f) * particleLen + j / 10f * width * fin, height / 2 + rand.range(0.5f) * stroke + i * height / 60, angle * 90 + 90, particleLen * (fout * 0.4f + 0.6f) * f);
-					}
-				}
-			}
-		});
-		register(NHStatusEffects.scannerDown, 100, new StatusDrawer(NHShaders.scannerDown){
-			{
-				cannotSkip = true;
-			}
-			private final Color from = Pal.heal, to = NHColor.lightSkyBack;
-			
-			@Override
-			public void drawEffect(StatusEffect effect, Unit unit, float f){
-				float particleLen = width / 8f;
-				float stroke = height / 35f;
-				float life = width / 10f;
-				Lines.stroke(stroke * f);
-				
-				float base = (Time.time / life);
-				rand.setSeed(seed);
-				
-				Draw.blend(Blending.additive);
-				
-				Draw.color(from, Color.white, to, Mathf.absin(4f, 1f));
-				Draw.alpha((0.7f + Mathf.absin(2f, 0.2f)) * Mathf.curve(f, 0, 0.5f));
-				Fill.quad(0, 0, width, 0, width, height, 0, height);
-				
-				Draw.blend();
-				
-				for(int i = -40; i < 40; i++){
-					for(int j = -15; j < 15; j++){
-						float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
-						int angle = Mathf.sign(rand.range(1));
-						float len = width / 35f * Interp.pow2Out.apply(fin);
-						Draw.alpha((rand.random(0.925f, 1f) + Mathf.absin(2f, 0.05f)) * Mathf.curve(f, 0, 0.5f));
-						Draw.tint(
-							Tmp.c1.set(from).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							Tmp.c2.set(to).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							rand.random(0f, 1f)
-						);
-						
-						Draw.getColor().lerp(Color.white, Mathf.absin(2f, 0.075f));
-						
-						Lines.lineAngle(width / 2 + rand.range(0.5f) * particleLen + j / 10f * width * fin, height / 2 + rand.range(0.5f) * stroke + i * height / 60, angle * 90 + 90, particleLen * (fout * 0.4f + 0.6f) * f);
-					}
-				}
-			}
-		});
-		register(NHStatusEffects.ultFireBurn, 20, new StatusDrawer(){
-			private final Color from = NHColor.lightSkyFront, to = NHColor.deeperBlue;
-			
-			@Override
-			public void drawEffect(StatusEffect effect, Unit unit, float f){
-				float rad = width / 22f;
-				float life = 180f;
-				int num = (int)(width * height / 5000);
-				
-				float base = (Time.time / life);
-				rand.setSeed(seed);
-				
-				Draw.blend(Blending.additive);
-				
-				Draw.color(from, Color.white, to, Mathf.absin(4f, 1f));
-				Draw.alpha((0.2f + Mathf.absin(1f, 0.15f)) * Mathf.curve(f, 0, 0.5f));
-				Fill.quad(0, 0, width, 0, width, height, 0, height);
-				
-				for(int i = 0; i < num; i++){
+		register(NHStatusEffects.scannerDown, 100, (warmup, unit, status) -> {
+			Color from = Pal.heal, to = NHColor.lightSkyBack;
+			float particleLen = width() / 8f;
+			float stroke = height() / 35f;
+			float life = width() / 10f;
+			Lines.stroke(stroke * warmup);
+
+			float base = (Time.time / life);
+			rand.setSeed(statusRandId(status));
+
+			Draw.blend(Blending.additive);
+
+			Draw.color(from, Color.white, to, Mathf.absin(4f, 1f));
+			Draw.alpha((0.7f + Mathf.absin(2f, 0.2f)) * Mathf.curve(warmup, 0, 0.5f));
+			Fill.quad(left(), bottom(), left(), top(), right(), top(), right(), bottom());
+
+			Draw.blend();
+
+			for(int i = -40; i < 40; i++){
+				for(int j = -15; j < 15; j++){
 					float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin;
-					Draw.alpha((rand.random(0.8f, 0.875f) + Mathf.absin(2f, 0.15f)) * (Mathf.curve(fout, 0.35f, 0.55f) + 3) / 4 * f);
+					int angle = Mathf.sign(rand.range(1));
+					Draw.alpha((rand.random(0.925f, 1f) + Mathf.absin(2f, 0.05f)) * Mathf.curve(warmup, 0, 0.5f));
 					Draw.tint(
-							Tmp.c1.set(from).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							Tmp.c2.set(to).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
-							rand.random(0f, 1f)
+						Tmp.c1.set(from).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
+						Tmp.c2.set(to).mul(rand.random(0.9f, 1.1f)).lerp(Color.white, rand.random(0.4f, 0.8f) * Mathf.curve(fout, 0.8f, 1f)),
+						rand.random(0f, 1f)
 					);
-					
-					Tmp.v1.setToRandomDirection(rand).scl(width / 2.075f, height / 2.05f).scl((rand.random(0.95f, 1.15f)) * Interp.fastSlow.apply(fout) + 0.165f + rand.random(0.05f, 0.125f));
-					Fill.square(Tmp.v1.x + width / 2, Tmp.v1.y + height / 2, rad * rand.random(0.8f, 1.8f) * fout * fout * f, 45);
-				}
-				
-				Draw.blend();
-			}
-		});
-		register(NHStatusEffects.invincible, 25, new StatusDrawer(){
-			private final Seq<Vec3> lastCoord = new Seq<>();
-			private final Color from = NHColor.lightSkyFront, to = NHColor.deeperBlue;
-			
-			@Override
-			public void drawEffect(StatusEffect effect, Unit unit, float f){
-				float rad = width / 1.75f;
-				float stroke = width / 27f;
-				float life = 125f;
-				int itr = 4;
-				
-				rand.setSeed(seed);
-				
-				Draw.blend(Blending.additive);
-				
-				if(lastCoord.isEmpty())for(int i = 0; i < itr; i++){
-					lastCoord.add(new Vec3(Core.camera.position.x, Core.camera.position.y, life * (i / (float)itr)));
-				}
-				
-				for(int i = 0; i < itr; i++){
-					Vec3 vec3 = lastCoord.get(i);
-					
-					if(!Vars.state.isPaused()){
-						vec3.z -= Time.delta;
-						if(vec3.z < -2){
-							vec3.set(Core.camera.position.x, Core.camera.position.y, life);
-						}
-					}
-					
-					Tmp.v1.set(vec3.x, vec3.y).sub(Core.camera.position).scl(renderer.getDisplayScale() / 3f);
-					float fin = vec3.z / life, fout = 1f - fin;
-					
-					Draw.alpha(Mathf.curve(fin, 0, 0.55f) * f);
-					Lines.stroke(stroke * fout * f);
-					Draw.tint(from, to, fout);
-					
-					Lines.square(width / 2 + Tmp.v1.x, height / 2 + Tmp.v1.y, rad * fout + 0.22f, 45);
+
+					Draw.getColor().lerp(Color.white, Mathf.absin(2f, 0.075f));
+
+					Lines.lineAngle(width() / 2 + rand.range(0.5f) * particleLen + j / 10f * width() * fin, height() / 2 + rand.range(0.5f) * stroke + i * height() / 60, angle * 90 + 90, particleLen * (fout * 0.4f + 0.6f) * warmup);
 				}
-				
-				Draw.blend();
 			}
 		});
-
-		 */
 	}
 
 	public void register(StatusEffect effect, int priority, Cons3<Float, Unit, StatusEffect> statusRenderer){