From 336dfad2077b8fe6b430a410645a731deb470861 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 14 Mar 2024 05:29:03 +0900 Subject: [PATCH] five-coloured wiring --- assets/mods/basegame/crafting/wires.json | 16 ++++++++++++++-- assets/mods/basegame/items/items.tga | 2 +- assets/mods/basegame/wires/1.tga | 3 +++ assets/mods/basegame/wires/{8198.tga => 16.tga} | 0 assets/mods/basegame/wires/{8197.tga => 2.tga} | 0 assets/mods/basegame/wires/8193.tga | 2 +- assets/mods/basegame/wires/8194.tga | 2 +- assets/mods/basegame/wires/8195.tga | 2 +- assets/mods/basegame/wires/8196.tga | 4 ++-- assets/mods/basegame/wires/ports.tga | 2 +- assets/mods/basegame/wires/wires.csv | 10 ++++++---- work_files/graphics/items/basegame_items.kra | 4 ++-- work_files/graphics/wires/five_wires.kra | 3 +++ 13 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 assets/mods/basegame/wires/1.tga rename assets/mods/basegame/wires/{8198.tga => 16.tga} (100%) rename assets/mods/basegame/wires/{8197.tga => 2.tga} (100%) create mode 100644 work_files/graphics/wires/five_wires.kra diff --git a/assets/mods/basegame/crafting/wires.json b/assets/mods/basegame/crafting/wires.json index cfd936012..678366a3d 100644 --- a/assets/mods/basegame/crafting/wires.json +++ b/assets/mods/basegame/crafting/wires.json @@ -16,7 +16,13 @@ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ ] }, - "wire@basegame:8195": { /* signal wire purple */ + "wire@basegame:8195": { /* signal wire yellow */ + "workbench": "", + "ingredients": [ + [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ + ] + }, + "wire@basegame:8196": { /* signal wire purple */ "workbench": "", "ingredients": [ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ @@ -40,7 +46,13 @@ [10, 1, "item@basegame:112"] /* 1 copper */ ] }, - "wire@basegame:8195": { /* signal wire purble */ + "wire@basegame:8195": { /* signal wire yellow */ + "workbench": "wirerollingmill", + "ingredients": [ + [10, 1, "item@basegame:112"] /* 1 copper */ + ] + }, + "wire@basegame:8196": { /* signal wire purple */ "workbench": "wirerollingmill", "ingredients": [ [10, 1, "item@basegame:112"] /* 1 copper */ diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index ebde7f0e7..582af182c 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:fad6ff7047c0adbcf5fc348112e405bd85d601e44e10983a0569e9ff438cdfef +oid sha256:394fe44a8dcbc1dbb9b70be78de5747bfa1d01decf3eed6b725ad7ca76f431c0 size 2408466 diff --git a/assets/mods/basegame/wires/1.tga b/assets/mods/basegame/wires/1.tga new file mode 100644 index 000000000..edfd8e3e0 --- /dev/null +++ b/assets/mods/basegame/wires/1.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0adeaf9078b5eb69ee78ee83c5c7f63edeeb174af5cefc836812991f4bf2cdff +size 16402 diff --git a/assets/mods/basegame/wires/8198.tga b/assets/mods/basegame/wires/16.tga similarity index 100% rename from assets/mods/basegame/wires/8198.tga rename to assets/mods/basegame/wires/16.tga diff --git a/assets/mods/basegame/wires/8197.tga b/assets/mods/basegame/wires/2.tga similarity index 100% rename from assets/mods/basegame/wires/8197.tga rename to assets/mods/basegame/wires/2.tga diff --git a/assets/mods/basegame/wires/8193.tga b/assets/mods/basegame/wires/8193.tga index 210cf4e23..a90446fa6 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:e5fff08a55e4197de92ea4ab88062222a295874b286e842a25d8ee6698c28ba5 +oid sha256:a1086639ba0b4d7418ce7fb3ae9629c8728aaadf019112c14353a90001960c42 size 32786 diff --git a/assets/mods/basegame/wires/8194.tga b/assets/mods/basegame/wires/8194.tga index a0d37d44b..abf4a52fa 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:b0aa3ed4b5571945739323fe708ea820360a8fb40026e882582d6c11e3c97611 +oid sha256:9ff07964a0ed0c0ca7083fc6a134bc714c8022def360dc6931ad3793c42b8aad size 32786 diff --git a/assets/mods/basegame/wires/8195.tga b/assets/mods/basegame/wires/8195.tga index 690a054c1..d7e525e34 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:93a0cd779bbe4b1fd1c45debd68557e46ac5fcb7aa47f4ed0d68920b10a01cd5 +oid sha256:c29f6a27ce14b54da42fdd548f2f53460e98158e602194bfc2e5b254c1a2fefd size 32786 diff --git a/assets/mods/basegame/wires/8196.tga b/assets/mods/basegame/wires/8196.tga index edfd8e3e0..1b853e24d 100644 --- a/assets/mods/basegame/wires/8196.tga +++ b/assets/mods/basegame/wires/8196.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0adeaf9078b5eb69ee78ee83c5c7f63edeeb174af5cefc836812991f4bf2cdff -size 16402 +oid sha256:f62b28d539145107fe1ed5130f719fd080f4887cf1fc94e84ede3ce9c4eed7e6 +size 32786 diff --git a/assets/mods/basegame/wires/ports.tga b/assets/mods/basegame/wires/ports.tga index 37620b950..359285a2f 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:3724be48c1f4c98f58e1fe84ec15eff1fabf89c3c7f108253bc3b4d0399773bd +oid sha256:24a6cc926aa1433366832481ffa9876478b2337a87494a4fa5faddb248f4338d size 4114 diff --git a/assets/mods/basegame/wires/wires.csv b/assets/mods/basegame/wires/wires.csv index 09e8d6a50..804e4167d 100644 --- a/assets/mods/basegame/wires/wires.csv +++ b/assets/mods/basegame/wires/wires.csv @@ -2,10 +2,12 @@ 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_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" +8195;8195;WIRE_YELLOW;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1;"SIGNALWIRE" +8196;8196;WIRE_PURPLE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1;"SIGNALWIRE" + +1;1;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1;"POWERWIRE_LOW" +2;2;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,6,4;1;"POWERWIRE_HIGH" +16;16;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,7,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/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 47a625b24..226949ed9 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:64f8fa2f1d1c2ddfc3e613920f94d3410c66199aa63c9548299cabbb661567db -size 1643324 +oid sha256:c9c616d04cf22859aadba68d21988f6de0f7f7b928eaca3f096d56cb001c31a4 +size 1652930 diff --git a/work_files/graphics/wires/five_wires.kra b/work_files/graphics/wires/five_wires.kra new file mode 100644 index 000000000..c195b7cf0 --- /dev/null +++ b/work_files/graphics/wires/five_wires.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2c425bed0b09a01c6d56adaf847d5b6e27b71419c80fab0822de3a731cd2882 +size 68373