Dualwield спрайты (#253)

* Dualwield спрайты * Update revolvers.yml * Revert "Update revolvers.yml" This reverts commit d7e76ad. --------- Co-authored-by: Evgencheg <[email protected]>
Lost-Paradise-Project · Oct 9, 2024 · 81656cb · 81656cb
1 parent 0b2b646
commit 81656cb
Show file tree

Hide file tree

Showing 61 changed files with 194 additions and 51 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -115,8 +115,7 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: db
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
   - type: Gun
     fireRate: 2
     fireOnDropChance: 0.5
@@ -171,8 +170,6 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: pump
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V
   - type: Clothing
@@ -197,8 +194,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: sawn
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi # Delta-V
   - type: Gun
     fireRate: 4
     fireOnDropChance: 0.5
@@ -285,8 +281,7 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: improvised
+    sprite: DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
     fireOnDropChance: 1

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -1,7 +1,7 @@
 
 - type: entity
   name: desert eagle
-  parent: BaseWeaponPistol
+  parent: WeaponPistolUniversal
   id: LPPWeaponPistolDesertEagle
   description: A favorite of gangsters and big gun enthusiasts, uses .35 caliber cartridges.
   components:
@@ -46,7 +46,7 @@
 
 - type: entity
   name: camo desert eagle
-  parent: BaseWeaponPistol
+  parent: WeaponPistolUniversal
   id: LPPWeaponPistolDesertEagleCamo
   description: A special gold piece with a lemited brindle pattern, highly coveted by collectors and crime bosses, chambered in .35 caliber.
   components:
@@ -68,7 +68,7 @@
 
 - type: entity
   name: gold desert eagle
-  parent: BaseWeaponPistol
+  parent: WeaponPistolUniversal
   id: LPPWeaponPistolDesertEagleGold
   description: A symbol of high status in the criminal world and beyond, uses .35 caliber cartridges.
   components:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -90,7 +90,7 @@
 
 - type: entity
   name: scarlet lawyer
-  parent: BaseWeaponSniper
+  parent: LPPBaseWeaponLeverSniper
   id: LPPWeaponRevolverAmina
   description: Used by Amina Ignatieva, in case of "important litigation", the recoil of this weapon is so lethal that a person can barely stand on his feet. Uses .60 anti-materiel rounds.
   components:
@@ -123,7 +123,7 @@
 
 - type: entity
   name: Judge
-  parent: BaseWeaponSniper
+  parent: LPPBaseWeaponLeverSniper
   id: LPPWeaponRevolverJudge
   description: There is only one sentence with this revolver - death, the recoil of this weapon is so lethal that a person can hardly stand on his feet. Uses .60 anti-materiel rounds.
   components:

diff --git a/...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png b/...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json
@@ -7,29 +7,41 @@
         "y": 32
     },
     "states": [
-	  {
-		  "name": "icon"
-	  },
-	  {
-		  "name": "base"
-	  },
-	  {
-		  "name": "mag-0"
-	  },
-	  {
-		  "name": "bolt-open"
-	  },
-	  {
-		  "name": "inhand-left",
-		  "directions": 4
-	  },
-	  {
-		  "name": "inhand-right",
-		  "directions": 4
-	  },
-      {
-        "name": "equipped-BACKPACK",
-        "directions": 4
-      }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
     ]
 }
diff --git a/...ures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png b/...ures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png
diff --git a/...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png b/...res/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json
@@ -30,6 +30,14 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/...Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-left.png b/...Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-left.png
diff --git a/...extures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-right.png b/...extures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json
@@ -30,6 +30,14 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/.../Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png b/.../Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png
diff --git a/...Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png b/...Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
@@ -24,6 +24,14 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/...res/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-left.png b/...res/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-left.png
diff --git a/...es/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-right.png b/...es/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
@@ -24,6 +24,14 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/...tures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png b/...tures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-left.png
diff --git a/...ures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png b/...ures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -24,6 +24,14 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/.../Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png b/.../Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-left.png
diff --git a/...Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png b/...Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/meta.json
@@ -21,6 +21,14 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/...rasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-left.png b/...rasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-left.png
diff --git a/...asen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-right.png b/...asen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/meta.json
@@ -21,6 +21,14 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/...yanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-left.png b/...yanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-left.png
diff --git a/...anotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-right.png b/...anotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,13 +27,21 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
@@ -34,6 +34,14 @@
 		{
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-left.png
diff --git a/...urces/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png b/...urces/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord)",
+  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,14 @@
         {
             "name": "inhand-left",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/.../Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png b/.../Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png
diff --git a/...Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png b/...Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }

diff --git a/...rces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png b/...rces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png
diff --git a/...ces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png b/...ces/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png