From 8f676cf6c34c71daaa900029f9d29f5ac65fcd52 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 10 Feb 2022 12:33:18 -0500
Subject: [PATCH] Some logic stuff

---
 .../blocks/turrets/afflict/afflict.png        | Bin 2172 -> 2164 bytes
 core/src/mindustry/logic/Senseable.java       |   5 ++++-
 core/src/mindustry/type/Item.java             |  15 ++++++++++++++-
 core/src/mindustry/type/Liquid.java           |  15 ++++++++++++++-
 core/src/mindustry/world/Block.java           |   2 +-
 gradle.properties                             |   2 +-
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png
index 1ca290067596c0849a7999bac71276d85fdee212..d075c56d0b67a4f2c1917c2fc88077a973d46a6d 100644
GIT binary patch
delta 1910
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

delta 1917
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
D%_DyV

diff --git a/core/src/mindustry/logic/Senseable.java b/core/src/mindustry/logic/Senseable.java
index 6ae99afbfa..f82c485b83 100644
--- a/core/src/mindustry/logic/Senseable.java
+++ b/core/src/mindustry/logic/Senseable.java
@@ -6,7 +6,10 @@ public interface Senseable{
     Object noSensed = new Object();
 
     double sense(LAccess sensor);
-    double sense(Content content);
+
+    default double sense(Content content){
+        return 0;
+    }
 
     default Object senseObject(LAccess sensor){
         return noSensed;
diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java
index fde04f9363..d740b9a116 100644
--- a/core/src/mindustry/type/Item.java
+++ b/core/src/mindustry/type/Item.java
@@ -9,12 +9,13 @@ import mindustry.ctype.*;
 import mindustry.game.EventType.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
+import mindustry.logic.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public class Item extends UnlockableContent{
+public class Item extends UnlockableContent implements Senseable{
     public Color color;
 
     /** how explosive this item is. */
@@ -129,6 +130,18 @@ public class Item extends UnlockableContent{
         }
     }
 
+    @Override
+    public double sense(LAccess sensor){
+        if(sensor == LAccess.color) return color.toFloatBits();
+        return 0;
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
+
     /** Allocates a new array containing all items that generate ores. */
     public static Seq<Item> getAllOres(){
         return content.blocks().select(b -> b instanceof OreBlock).map(b -> b.itemDrop);
diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java
index d68af2a30b..dddde8968d 100644
--- a/core/src/mindustry/type/Liquid.java
+++ b/core/src/mindustry/type/Liquid.java
@@ -10,12 +10,13 @@ import mindustry.entities.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.world.meta.*;
 
 import static mindustry.entities.Puddles.*;
 
 /** A better name for this class would be "fluid", but it's too late for that. */
-public class Liquid extends UnlockableContent{
+public class Liquid extends UnlockableContent implements Senseable{
     //must be static and global so conduits don't conflict - DO NOT INTERACT WITH THESE IN MODS OR I WILL PERSONALLY YELL AT YOU
     public static final int animationFrames = 50;
     public static float animationScaleGas = 190f, animationScaleLiquid = 230f;
@@ -147,6 +148,18 @@ public class Liquid extends UnlockableContent{
         stats.addPercent(Stat.viscosity, viscosity);
     }
 
+    @Override
+    public double sense(LAccess sensor){
+        if(sensor == LAccess.color) return color.toFloatBits();
+        return 0;
+    }
+
+    @Override
+    public Object senseObject(LAccess sensor){
+        if(sensor == LAccess.name) return name;
+        return noSensed;
+    }
+
     @Override
     public String toString(){
         return localizedName;
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 1195767a33..2276995b94 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -1153,7 +1153,7 @@ public class Block extends UnlockableContent implements Senseable{
     @Override
     public double sense(LAccess sensor){
         return switch(sensor){
-            case color -> Color.toDoubleBits(mapColor.r, mapColor.g, mapColor.b, mapColor.a);
+            case color -> mapColor.toDoubleBits();
             case health, maxHealth -> health;
             case size -> size * tilesize;
             case itemCapacity -> itemCapacity;
diff --git a/gradle.properties b/gradle.properties
index c50f6b3d4d..f3173d6724 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=f95111f269
+archash=df5b4b832c