diff --git a/assets/mods/basegame/crafting/wires.json b/assets/mods/basegame/crafting/wires.json index 47ade4c8a..cfd936012 100644 --- a/assets/mods/basegame/crafting/wires.json +++ b/assets/mods/basegame/crafting/wires.json @@ -16,6 +16,12 @@ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ ] }, + "wire@basegame:8195": { /* signal wire purple */ + "workbench": "", + "ingredients": [ + [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ + ] + }, "wire@basegame:8192": { /* signal wire red */ "workbench": "wirerollingmill", @@ -34,6 +40,12 @@ [10, 1, "item@basegame:112"] /* 1 copper */ ] }, + "wire@basegame:8195": { /* signal wire purble */ + "workbench": "wirerollingmill", + "ingredients": [ + [10, 1, "item@basegame:112"] /* 1 copper */ + ] + }, "item@basegame:50": { /* soldering wire */ "workbench": "wirerollingmill", diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 9462e4115..ebde7f0e7 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed45623a6ab909f57b54b4529df14941787df3d4f6034d80c5ba60b78eab2cdc +oid sha256:fad6ff7047c0adbcf5fc348112e405bd85d601e44e10983a0569e9ff438cdfef size 2408466 diff --git a/assets/mods/basegame/wires/8192.tga b/assets/mods/basegame/wires/8192.tga index 61bc8b1d8..bf8b4a454 100644 --- a/assets/mods/basegame/wires/8192.tga +++ b/assets/mods/basegame/wires/8192.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae3d03d8cb7f23169965a7703b6fd1d632dee96289fe3dd6daa4734546d7e4de +oid sha256:8a3a3d6f7899a03fcff20b3e22f7e1e6db47e3b442effe09fdf0b1756f02cc01 size 32786 diff --git a/assets/mods/basegame/wires/8193.tga b/assets/mods/basegame/wires/8193.tga index 1ade45809..210cf4e23 100644 --- a/assets/mods/basegame/wires/8193.tga +++ b/assets/mods/basegame/wires/8193.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb93a18e9926ce70c46d21321614cb954f2165c080a0af9cc9f09112f6f5484e +oid sha256:e5fff08a55e4197de92ea4ab88062222a295874b286e842a25d8ee6698c28ba5 size 32786 diff --git a/assets/mods/basegame/wires/8194.tga b/assets/mods/basegame/wires/8194.tga index fe0c59244..a0d37d44b 100644 --- a/assets/mods/basegame/wires/8194.tga +++ b/assets/mods/basegame/wires/8194.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7aaed6bb9ca0d13574126ef009563f60864c6b0a8e2276dce39a757cce765a2 +oid sha256:b0aa3ed4b5571945739323fe708ea820360a8fb40026e882582d6c11e3c97611 size 32786 diff --git a/assets/mods/basegame/wires/8195.tga b/assets/mods/basegame/wires/8195.tga index 87a138f6e..690a054c1 100644 --- a/assets/mods/basegame/wires/8195.tga +++ b/assets/mods/basegame/wires/8195.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b82523a6f81b036afd2fa520a96f741e38247983cd47a404ad37f80946a046a -size 131090 +oid sha256:93a0cd779bbe4b1fd1c45debd68557e46ac5fcb7aa47f4ed0d68920b10a01cd5 +size 32786 diff --git a/assets/mods/basegame/wires/decayconsts.csv b/assets/mods/basegame/wires/decayconsts.csv new file mode 100644 index 000000000..b753b7e46 --- /dev/null +++ b/assets/mods/basegame/wires/decayconsts.csv @@ -0,0 +1,9 @@ +wireItemID;const +wire@basegame:8192;0.995 +wire@basegame:8193;0.995 +wire@basegame:8194;0.995 +wire@basegame:8195;0.995 +wire@basegame:8196;0.999 +wire@basegame:8197;0.999 +wire@basegame:8198;0.999 + diff --git a/assets/mods/basegame/wires/ports.tga b/assets/mods/basegame/wires/ports.tga index d851eb86d..37620b950 100644 --- a/assets/mods/basegame/wires/ports.tga +++ b/assets/mods/basegame/wires/ports.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de40e6eb9a9f47a96a20134d798c3c44f03c85b6c332e47448c99265f432dbc8 +oid sha256:3724be48c1f4c98f58e1fe84ec15eff1fabf89c3c7f108253bc3b4d0399773bd size 4114 diff --git a/assets/mods/basegame/wires/wires.csv b/assets/mods/basegame/wires/wires.csv index e1ddf397e..09e8d6a50 100644 --- a/assets/mods/basegame/wires/wires.csv +++ b/assets/mods/basegame/wires/wires.csv @@ -2,10 +2,10 @@ id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;invent 8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;1;"SIGNALWIRE" 8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;1;"SIGNALWIRE" 8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;1;"SIGNALWIRE" -#8195;8195;WIRE_BUNDLE;signal;digital_3bits;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,0;1;"SIGNALWIRE" -8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1;"POWERWIRE_LOW" -8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1;"POWERWIRE_HIGH" -8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1;"ETHERNETWIRE" +8195;8195;WIRE_PURPLE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1;"SIGNALWIRE" +8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1;"POWERWIRE_LOW" +8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1;"POWERWIRE_HIGH" +8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,6,4;1;"ETHERNETWIRE" # accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka not wires) diff --git a/src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt b/src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt index 75822cd0b..83f09f92a 100644 --- a/src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt +++ b/src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt @@ -19,6 +19,7 @@ import org.dyn4j.geometry.Vector2 import java.lang.Math.pow import kotlin.math.cosh import kotlin.math.min +import kotlin.math.pow import kotlin.math.roundToInt /** @@ -519,7 +520,7 @@ object WorldSimulator { } private fun calculateDecay(signal: Vector2, dist: Int, wire: ItemID, signalType: WireEmissionType): Vector2 { - return signal * pow(0.99, dist.toDouble()) + return signal * 0.995.pow(dist.toDouble()) } private fun traverseWireGraph(world: GameWorld, wire: ItemID, startingPoint: WireGraphCursor, signal: Vector2, signalType: WireEmissionType) { diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt index 4bf29afe3..81b2ab677 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt @@ -49,9 +49,9 @@ open class Electric : FixtureBase { } companion object { - const val ELECTRIC_THRESHOLD_HIGH = 0.9 - const val ELECTRIC_THRESHOLD_LOW = 0.1 - const val ELECTRIC_THRESHOLD_EDGE_DELTA = 0.7 + const val ELECTRIC_THRESHOLD_HIGH = 0.6666666666666666 + const val ELECTRIC_THRESHOLD_LOW = 0.3333333333333333 + const val ELECTRIC_THRESHOLD_EDGE_DELTA = 0.33333333333333337 } fun getWireEmitterAt(blockBoxIndex: BlockBoxIndex) = this.wireEmitterTypes[blockBoxIndex] diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 5038aad32..47a625b24 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a55db688bd9078eb5c27c4d08a6cb847d2d391e664c2d100a3498f6600b9ec09 -size 1606430 +oid sha256:64f8fa2f1d1c2ddfc3e613920f94d3410c66199aa63c9548299cabbb661567db +size 1643324 diff --git a/work_files/graphics/wires/four_signal_wires.kra b/work_files/graphics/wires/four_signal_wires.kra index ddc6f0654..a10da3e8e 100644 --- a/work_files/graphics/wires/four_signal_wires.kra +++ b/work_files/graphics/wires/four_signal_wires.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:030e34af2cf77dc3e23fab37f9a36fb999a481ba32986523eef1584b7c31096a -size 61485 +oid sha256:37fd64414c634bcfdeea931ec5b71d1f5bc1550b7800b9fae106ceb0fb08d30d +size 58898