Sprite refactor (#63)

* Sprite refactor compatibility.

* Sprite-level rotation.

* Dude it works.

Welder now has an unshaded flame toggle!

Door component no longer on client!

* Remove debug text.

* Update.

Resources/Prototypes/1_Temperature.yml

@@ -5,11 +5,10 @@
   - type: Transform
   - type: Clickable
   - type: Sprite
-    sprites:
-    - Items/shoes.png
+    texture: Items/shoes.png
 
   - type: Icon
-    icon: Items/shoes.png
+    texture: Items/shoes.png
 
   - type: Damageable
     resistanceset: Standard

Resources/Prototypes/Entities/Clothing.yml

@@ -16,9 +16,11 @@
   name: Shoes
   components:
   - type: Sprite
-    sprite: Items/shoes.png
+    texture: Items/shoes.png
+
   - type: Icon
-    icon: Items/shoes.png
+    texture: Items/shoes.png
+
   - type: Clothing
     Slots:
     - shoes
@@ -29,51 +31,53 @@
   name: Janitor Jumpsuit
   components:
   - type: Sprite
-    sprite: Items/janitorsuit.png
+    texture: Items/janitorsuit.png
+
   - type: Icon
-    icon: Items/janitorsuit.png
+    texture: Items/janitorsuit.png
+
   - type: Clothing
     Slots:
     - innerclothing
-    
+
 - type: entity
   parent: Clothing
   id: SecurityVestClothing
   name: Security Vest
   components:
   - type: Sprite
-    sprite: Clothing/armorvest.png
+    texture: Clothing/armorvest.png
   - type: Icon
-    icon: Clothing/armorvest.png
+    texture: Clothing/armorvest.png
   - type: Clothing
     Slots:
     - outerclothing
-    
+
 - type: entity
   parent: Clothing
   id: UtilityBeltClothing
   name: Utility Belt
   components:
   - type: Sprite
-    sprite: Clothing/belt_utility.png
+    texture: Clothing/belt_utility.png
   - type: Icon
-    icon: Clothing/belt_utility.png
+    texture: Clothing/belt_utility.png
     Size: 30
   - type: Clothing
     Slots:
     - belt
   - type: Storage
     Capacity: 30
-    
+
 - type: entity
   parent: Clothing
   id: BackpackClothing
   name: Backpack
   components:
   - type: Sprite
-    sprite: Clothing/backpack.png
+    texture: Clothing/backpack.png
   - type: Icon
-    icon: Clothing/backpack.png
+    texture: Clothing/backpack.png
     Size: 9999
   - type: Clothing
     Slots:
@@ -87,9 +91,9 @@
   name: Mesons
   components:
   - type: Sprite
-    sprite: Clothing/glasses_meson.png
+    texture: Clothing/glasses_meson.png
   - type: Icon
-    icon: Clothing/glasses_meson.png
+    texture: Clothing/glasses_meson.png
   - type: Clothing
     Slots:
     - eyes
@@ -100,9 +104,9 @@
   name: Insulated Gloves
   components:
   - type: Sprite
-    sprite: Clothing/gloves_yellow.png
+    texture: Clothing/gloves_yellow.png
   - type: Icon
-    icon: Clothing/gloves_yellow.png
+    texture: Clothing/gloves_yellow.png
   - type: Clothing
     Slots:
     - gloves
@@ -113,48 +117,48 @@
   name: Security Helmet
   components:
   - type: Sprite
-    sprite: Clothing/helmet_sec.png
+    texture: Clothing/helmet_sec.png
   - type: Icon
-    icon: Clothing/helmet_sec.png
+    texture: Clothing/helmet_sec.png
   - type: Clothing
     Slots:
     - head
-    
+
 - type: entity
   parent: Clothing
   id: GasMaskClothing
   name: Gas Mask
   components:
   - type: Sprite
-    sprite: Clothing/gasmask.png
+    texture: Clothing/gasmask.png
   - type: Icon
-    icon: Clothing/gasmask.png
+    texture: Clothing/gasmask.png
   - type: Clothing
     Slots:
     - mask
-    
+
 - type: entity
   parent: Clothing
   id: IDCardStandard
   name: Identification Card
   components:
   - type: Sprite
-    sprite: Clothing/idcard_standard.png
+    texture: Clothing/idcard_standard.png
   - type: Icon
-    icon: Clothing/idcard_standard.png
+    texture: Clothing/idcard_standard.png
   - type: Clothing
     Slots:
     - idcard
-    
+
 - type: entity
   parent: Clothing
   id: RadioHeadsetEars
   name: Headset Radio
   components:
   - type: Sprite
-    sprite: Clothing/ears_headset.png
+    texture: Clothing/ears_headset.png
   - type: Icon
-    icon: Clothing/ears_headset.png
+    texture: Clothing/ears_headset.png
   - type: Clothing
     Slots:
-    - ears
+    - ears

Resources/Prototypes/Entities/Door.yml

@@ -6,12 +6,10 @@
   - type: Clickable
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/door_ew.png
-    - Objects/door_ewo.png
+    texture: Objects/door_ew.png
 
   - type: Icon
-    icon: Objects/door_ew.png
+    texture: Objects/door_ew.png
 
   - type: BoundingBox
     aabb: "1,-0.75,2,0.75"

Resources/Prototypes/Entities/Items.yml

@@ -16,9 +16,9 @@
   id: RedToolboxItem
   components:
   - type: Sprite
-    sprite: Items/toolbox_r.png
+    texture: Items/toolbox_r.png
   - type: Icon
-    icon: Items/toolbox_r.png
+    texture: Items/toolbox_r.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -30,9 +30,9 @@
   id: BlueToolboxItem
   components:
   - type: Sprite
-    sprite: Items/toolbox_b.png
+    texture: Items/toolbox_b.png
   - type: Icon
-    icon: Items/toolbox_b.png
+    texture: Items/toolbox_b.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -44,9 +44,9 @@
   id: YellowToolboxItem
   components:
   - type: Sprite
-    sprite: Items/toolbox_y.png
+    texture: Items/toolbox_y.png
   - type: Icon
-    icon: Items/toolbox_y.png
+    texture: Items/toolbox_y.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -58,9 +58,9 @@
   id: MopItem
   components:
   - type: Sprite
-    sprite: Items/mop.png
+    texture: Items/mop.png
   - type: Icon
-    icon: Items/mop.png
+    texture: Items/mop.png
   - type: Item
     Size: 10
 
@@ -71,7 +71,7 @@
   id: FlashlightLantern
   components:
   - type: Sprite
-    sprite: Items/Flashlight.png
+    texture: Items/Flashlight.png
   - type: Icon
-    icon: Items/Flashlight.png
+    texture: Items/Flashlight.png
   - type: PointLight

Resources/Prototypes/Entities/Power.yml

@@ -8,10 +8,9 @@
   - type: Sprite
     drawdepth: FloorPlaceable
     color: Red
-    sprites:
-    - Objects/eightdirwire.png
+    texture: Objects/eightdirwire.png
   - type: Icon
-    icon: Objects/eightdirwire.png
+    texture: Objects/eightdirwire.png
   - type: PowerTransfer
 
   snap:
@@ -34,10 +33,9 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/generator.png
+    texture: Objects/generator.png
   - type: Icon
-    icon: Objects/generator.png
+    texture: Objects/generator.png
   - type: PowerGenerator
 
 - type: entity
@@ -49,10 +47,9 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/provider.png
+    texture: Objects/provider.png
   - type: Icon
-    icon: Objects/provider.png
+    texture: Objects/provider.png
   - type: PowerProvider
     Range: 5
     Priority: Provider
@@ -78,10 +75,9 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/storage.png
+    texture: Objects/storage.png
   - type: Icon
-    icon: Objects/storage.png
+    texture: Objects/storage.png
   - type: PowerStorage
     Capacity: 3000
     Charge: 1000
@@ -98,10 +94,9 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/wiredmachine.png
+    texture: Objects/wiredmachine.png
   - type: Icon
-    icon: Objects/wiredmachine.png
+    texture: Objects/wiredmachine.png
   - type: PowerDevice
     Drawtype: Node
     Load: 100
@@ -116,10 +111,9 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - Objects/wirelessmachine.png
+    texture: Objects/wirelessmachine.png
   - type: Icon
-    icon: Objects/wirelessmachine.png
+    texture: Objects/wirelessmachine.png
   - type: PowerDevice
     Drawtype: Both
     Load: 200

Resources/Prototypes/Entities/Projectiles.yml

@@ -4,10 +4,13 @@
   components:
   - type: Transform
   - type: Sprite
+    directional: false
     drawdepth: FloorPlaceable
-    sprite: Objects/projectilebullet.png
+    texture: Objects/projectilebullet.png
+    rotation: 180
+
   - type: Icon
-    icon: Objects/projectilebullet.png
+    texture: Objects/projectilebullet.png
   - type: BoundingBox
   - type: Physics
     edgeslide: false

Resources/Prototypes/Entities/Tools.yml

@@ -5,9 +5,9 @@
   components:
   - type: Wirecutter
   - type: Sprite
-    sprite: Objects/wirecutter.png
+    texture: Objects/wirecutter.png
   - type: Icon
-    icon: Objects/wirecutter.png
+    texture: Objects/wirecutter.png
   - type: MeleeWeapon
 
 - type: entity
@@ -17,9 +17,9 @@
   components:
   - type: Screwdriver
   - type: Sprite
-    sprite: Objects/screwdriver.png
+    texture: Objects/screwdriver.png
   - type: Icon
-    icon: Objects/screwdriver.png
+    texture: Objects/screwdriver.png
   - type: MeleeWeapon
 
 - type: entity
@@ -29,9 +29,16 @@
   components:
   - type: Welder
   - type: Sprite
-    sprite: Objects/welder.png
+    sprite: Objects/tools.rsi
+    layers:
+    - state: welder
+    - state: welder_flame
+      shader: unshaded
+      visible: false
+
   - type: Icon
-    icon: Objects/welder.png
+    sprite: Objects/tools.rsi
+    state: welder
   - type: MeleeWeapon
 
 - type: entity
@@ -41,9 +48,9 @@
   components:
   - type: Wrench
   - type: Sprite
-    sprite: Objects/wrench.png
+    texture: Objects/wrench.png
   - type: Icon
-    icon: Objects/wrench.png
+    texture: Objects/wrench.png
   - type: MeleeWeapon
 
 - type: entity
@@ -53,9 +60,9 @@
   components:
   - type: Crowbar
   - type: Sprite
-    sprite: Objects/crowbar.png
+    texture: Objects/crowbar.png
   - type: Icon
-    icon: Objects/crowbar.png
+    texture: Objects/crowbar.png
   - type: MeleeWeapon
 
 - type: entity
@@ -65,6 +72,6 @@
   components:
   - type: Multitool
   - type: Sprite
-    sprite: Objects/multitool.png
+    texture: Objects/multitool.png
   - type: Icon
-    icon: Objects/multitool.png
+    texture: Objects/multitool.png

Resources/Prototypes/Entities/Turret.yml

@@ -7,9 +7,8 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: FloorPlaceable
-    sprites:
-    - TurrBase
-    
+    texture: Buildings/TurrBase.png
+
 - type: entity
   id: TurretTopGun
   name: Turret (Gun)
@@ -19,12 +18,11 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: WallMountedItems
-    sprites:
-    - TurrTop
+    texture: Buildings/TurrTop.png
   - type: AiController
     logic: AimShootLife
     vision: 6.0
-    
+
 - type: entity
   id: TurretTopLight
   name: Turret (Light)
@@ -34,8 +32,7 @@
   - type: BoundingBox
   - type: Sprite
     drawdepth: WallMountedItems
-    sprites:
-    - TurrLamp
+    texture: Buildings/TurrLamp.png
   - type: AiController
     logic: AimShootLife
     vision: 6.0
@@ -43,4 +40,3 @@
     radius: 512
     mask: flashlight_mask
     autoRot: true
-    

Resources/Prototypes/Entities/Weapons.yml

@@ -4,9 +4,9 @@
   id: LaserItem
   components:
   - type: Sprite
-    sprite: Objects/gun.png
+    texture: Objects/gun.png
   - type: Icon
-    icon: Objects/gun.png
+    texture: Objects/gun.png
   - type: HitscanWeapon
   - type: Item
     Size: 24
@@ -17,9 +17,9 @@
   id: GUNITEM
   components:
   - type: Sprite
-    sprite: Objects/projectileweapon.png
+    texture: Objects/projectileweapon.png
   - type: Icon
-    icon: Objects/projectileweapon.png
+    texture: Objects/projectileweapon.png
   - type: ProjectileWeapon
   - type: Item
     Size: 24

Resources/Prototypes/Entities/prototype_test.yml

@@ -5,8 +5,8 @@
   - type: Transform
   - type: Clickable
   - type: Sprite
-    sprite: Items/medkit_r.png
+    texture: Items/medkit_r.png
 
   - type: Icon
-    icon: Items/medkit_r.png
+    texture: Items/medkit_r.png
 

Resources/Textures/Objects/tools.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "welder",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "welder_flame",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}