Resprites energy sword and double energy sword (#22797)

* Removes old inhand visuals from e_sword.rsi and its meta.json

* Adds new visuals with a longer blade for the e sword

* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands

* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)

* Removes old desword sprites and modifies meta.json

* Temporarily removes esword blade sprites

* Adds back esword sprites after modifying them to flash instead of shimmer

* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them

* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict

* Removes blade inhands

* Adds back blade inhands

* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 450fc4dfe73adb330e8465fcb0e21fb46102e6f3..d6d79edcef775e7829c84e8929d2b34971f8889d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -853,7 +853,7 @@
       colorOptions:
         - DodgerBlue
     - type: Sprite
-      sprite: Objects/Weapons/Melee/e_sword.rsi
+      sprite: Objects/Fun/toy_sword.rsi
       layers:
         - state: e_sword
         - state: e_sword_blade
@@ -863,7 +863,7 @@
           map: [ "blade" ]
     - type: Item
       size: Small
-      sprite: Objects/Weapons/Melee/e_sword.rsi
+      sprite: Objects/Fun/toy_sword.rsi
     - type: UseDelay
       delay: 1.0
     - type: PointLight

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 5b06f09946c80904a3eaf3cd6692174b3919587d..b2b7bfd20ca7542b377eaa366eef6291045d8a4d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -31,7 +31,7 @@
         Blunt: 4.5
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Melee/e_sword.rsi
+    sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
   - type: UseDelay
     delay: 1.0
   - type: PointLight
@@ -165,6 +165,15 @@
   - type: Item
     size: Small
     sprite: Objects/Weapons/Melee/e_cutlass.rsi
+  - type: ToggleableLightVisuals
+    spriteLayer: blade
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+      right:
+      - state: inhand-right-blade
+        shader: unshaded
 
 - type: entity
   name: Double Bladed Energy Sword
@@ -201,10 +210,19 @@
         map: [ "blade" ]
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Melee/e_sword_double.rsi
+    sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
   - type: Reflect
     enabled: true
     reflectProb: .75
     spread: 75
   - type: UseDelay
     delay: 1
+  - type: ToggleableLightVisuals
+    spriteLayer: blade
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+      right:
+      - state: inhand-right-blade
+        shader: unshaded

diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png
new file mode 100644 (file)
index 0000000..c231db0
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png differ

diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png
new file mode 100644 (file)
index 0000000..28e0ec6
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png differ

diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png
new file mode 100644 (file)
index 0000000..535d9de
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png
rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png
rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png
rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png
rename to Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png

diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json
new file mode 100644 (file)
index 0000000..2026e22
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "e_sword"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "e_sword_blade",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png
new file mode 100644 (file)
index 0000000..a0e957d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..f9a6e34
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png
new file mode 100644 (file)
index 0000000..a536ccf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..13b78ac
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json
new file mode 100644 (file)
index 0000000..c5ff7a5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json
@@ -0,0 +1,63 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Inhands by RiceMar1244.",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json
index 58c2a67aac61f804459bb1def93ea63fb063dddf..602e03296393ef32568cb868156aa51aa5292472 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json
@@ -12,14 +12,6 @@
     },
     {
       "name": "e_sword"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     },
        {
       "name": "e_sword_blade",
@@ -29,50 +21,6 @@
           0.1
         ]
       ]
-    },
-    {
-      "name": "inhand-left-blade",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-right-blade",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ]
-      ]
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png
new file mode 100644 (file)
index 0000000..c540386
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..5c1b0e2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png
new file mode 100644 (file)
index 0000000..e8ad570
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..3e354dd
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json
new file mode 100644 (file)
index 0000000..a28cd72
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json
@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by RiceMar1244",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-blade",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..a442878
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..a1b6f2b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png
index dfd3bb9ace240d3fec0f3f1c84f93381e6e63098..5601092c2e949a44bf3960eb62b265787d9e3f50 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png
index 9c19655cd432ab094929111268992fd01ef3bf77..31aecac1d25ac471222c4d716858b6669b9334e3 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png and b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png
deleted file mode 100644 (file)
index 96d2136..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png
deleted file mode 100644 (file)
index 2f06869..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png
deleted file mode 100644 (file)
index 18b785e..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png
deleted file mode 100644 (file)
index ebaeb95..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json
index d7ae4a0ad30f82c7c2d6bc6ef6070a671d93788a..9e17f6e51ab95c063dc144bb7f0199900636eef7 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json
@@ -6,81 +6,21 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "e_sword_double"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-         {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    },
-       {
-      "name": "e_sword_double_blade",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left-blade",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-right-blade",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ],
-               [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "e_sword_double"
+        },
+        {
+            "name": "e_sword_double_blade",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png
deleted file mode 100644 (file)
index 0160caf..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png
deleted file mode 100644 (file)
index 727fa41..0000000
Binary files a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png and /dev/null differ