From b0a3f294c5c73b658dc1f79b8704808f38263137 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 2 Aug 2018 10:17:30 +0200 Subject: [PATCH] Remove now-redundant Transform component specifiers. --- Resources/Prototypes/1_Temperature.yml | 1 - Resources/Prototypes/Entities/Construction.yml | 2 -- Resources/Prototypes/Entities/Door.yml | 1 - Resources/Prototypes/Entities/Items.yml | 1 - Resources/Prototypes/Entities/Mobs.yml | 1 - Resources/Prototypes/Entities/Power.yml | 6 ------ Resources/Prototypes/Entities/PoweredLighting.yml | 1 - Resources/Prototypes/Entities/Projectiles.yml | 1 - Resources/Prototypes/Entities/Turret.yml | 3 --- Resources/Prototypes/Entities/prototype_test.yml | 1 - engine | 2 +- 11 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Resources/Prototypes/1_Temperature.yml b/Resources/Prototypes/1_Temperature.yml index 5ce81ce519..fb61693eb1 100644 --- a/Resources/Prototypes/1_Temperature.yml +++ b/Resources/Prototypes/1_Temperature.yml @@ -2,7 +2,6 @@ id: thing_that_heats_up_on_its_own_and_dies name: Thing that heats up on its own and dies components: - - type: Transform - type: Clickable - type: Sprite texture: Items/shoes.png diff --git a/Resources/Prototypes/Entities/Construction.yml b/Resources/Prototypes/Entities/Construction.yml index 69a86d8732..f48bda6ccc 100644 --- a/Resources/Prototypes/Entities/Construction.yml +++ b/Resources/Prototypes/Entities/Construction.yml @@ -2,7 +2,6 @@ name: spooky ghost id: constructionghost components: - - type: Transform - type: Sprite color: '#3F38' - type: ConstructionGhost @@ -15,7 +14,6 @@ name: somebody-messed-up frame id: structureconstructionframe components: - - type: Transform - type: Sprite - type: Construction - type: BoundingBox diff --git a/Resources/Prototypes/Entities/Door.yml b/Resources/Prototypes/Entities/Door.yml index 111eff539c..1f1b3cf038 100644 --- a/Resources/Prototypes/Entities/Door.yml +++ b/Resources/Prototypes/Entities/Door.yml @@ -3,7 +3,6 @@ name: Actual door description: It opens, it closes! components: - - type: Transform - type: Clickable - type: Sprite drawdepth: Mobs # They're on the same layer as mobs, perspective. diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml index fd2366d16f..bf8b861033 100644 --- a/Resources/Prototypes/Entities/Items.yml +++ b/Resources/Prototypes/Entities/Items.yml @@ -2,7 +2,6 @@ name: "Item" id: BaseItem components: - - type: Transform - type: Item Size: 5 - type: Clickable diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml index 5d32cd4323..2d8efa40d2 100644 --- a/Resources/Prototypes/Entities/Mobs.yml +++ b/Resources/Prototypes/Entities/Mobs.yml @@ -18,7 +18,6 @@ save: false description: Boo! components: - - type: Transform - type: Sprite sprite: Mob/observer.png scale: 2, 2 diff --git a/Resources/Prototypes/Entities/Power.yml b/Resources/Prototypes/Entities/Power.yml index 826e61d104..cc91c136b4 100644 --- a/Resources/Prototypes/Entities/Power.yml +++ b/Resources/Prototypes/Entities/Power.yml @@ -3,7 +3,6 @@ name: Wire description: Transfers power, avoid letting things come down it components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -31,7 +30,6 @@ name: Generator description: A portal to hell which summons power from the nether components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -45,7 +43,6 @@ name: WPPnobattery description: Supplies power directly to nearby objects components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -90,7 +87,6 @@ name: Smes description: Stores power in its super-magnetic cells components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -126,7 +122,6 @@ name: WiredMachine description: A monstrosity that does nothing but suck up power from the nearby wires components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -143,7 +138,6 @@ name: WirelessMachine description: A terrifying monstrosity that sucks up power from the wireless transmitters, Tesla would be proud components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite diff --git a/Resources/Prototypes/Entities/PoweredLighting.yml b/Resources/Prototypes/Entities/PoweredLighting.yml index 67351c3ed4..5093dca3be 100644 --- a/Resources/Prototypes/Entities/PoweredLighting.yml +++ b/Resources/Prototypes/Entities/PoweredLighting.yml @@ -2,7 +2,6 @@ name: Light id: poweredlight components: - - type: Transform - type: Clickable # So we can click on it for deletion. - type: BoundingBox diff --git a/Resources/Prototypes/Entities/Projectiles.yml b/Resources/Prototypes/Entities/Projectiles.yml index b3321a9270..ee83937150 100644 --- a/Resources/Prototypes/Entities/Projectiles.yml +++ b/Resources/Prototypes/Entities/Projectiles.yml @@ -3,7 +3,6 @@ name: ProjectileBullet description: If you can see this you're dead! components: - - type: Transform - type: Sprite directional: false texture: Objects/projectilebullet.png diff --git a/Resources/Prototypes/Entities/Turret.yml b/Resources/Prototypes/Entities/Turret.yml index 577c583274..a0927b3aa9 100644 --- a/Resources/Prototypes/Entities/Turret.yml +++ b/Resources/Prototypes/Entities/Turret.yml @@ -2,7 +2,6 @@ id: TurretBase name: Turret Base components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -12,7 +11,6 @@ id: TurretTopGun name: Turret (Gun) components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite @@ -26,7 +24,6 @@ id: TurretTopLight name: Turret (Light) components: - - type: Transform - type: Clickable - type: BoundingBox - type: Sprite diff --git a/Resources/Prototypes/Entities/prototype_test.yml b/Resources/Prototypes/Entities/prototype_test.yml index cb6747c55d..11481768ed 100644 --- a/Resources/Prototypes/Entities/prototype_test.yml +++ b/Resources/Prototypes/Entities/prototype_test.yml @@ -2,7 +2,6 @@ id: medkit_r name: Medkit components: - - type: Transform - type: Clickable - type: Sprite texture: Items/medkit_r.png diff --git a/engine b/engine index c019e24a3a..830ff0f5b1 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit c019e24a3a4a28b4a8a85ea75e5de6912b88fc86 +Subproject commit 830ff0f5b18fbc998d123a36b5e59784b92efb18