From 2ef33e11b65238c28f24726cbed75a72bc650f05 Mon Sep 17 00:00:00 2001 From: rolfero <45628623+rolfero@users.noreply.github.com> Date: Sat, 5 Nov 2022 16:28:44 +0100 Subject: [PATCH] Fixing some prototypes modifying components on init (#12385) --- .../Tests/PrototypeSaveTest.cs | 13 ----------- .../Entities/Objects/Tools/glowstick.yml | 22 +++++++++--------- .../Objects/Weapons/Guns/Basic/base_pka.yml | 1 + .../Objects/Weapons/Guns/Basic/staves.yml | 2 ++ .../Objects/Weapons/Guns/Basic/wands.yml | 5 ++++ ...on-inhand-left.png => lit-inhand-left.png} | Bin ...-inhand-right.png => lit-inhand-right.png} | Bin .../Objects/Misc/glowstick.rsi/meta.json | 16 ++++++------- ...-inhand-left.png => unlit-inhand-left.png} | Bin ...nhand-right.png => unlit-inhand-right.png} | Bin 10 files changed, 27 insertions(+), 32 deletions(-) rename Resources/Textures/Objects/Misc/glowstick.rsi/{on-inhand-left.png => lit-inhand-left.png} (100%) rename Resources/Textures/Objects/Misc/glowstick.rsi/{on-inhand-right.png => lit-inhand-right.png} (100%) rename Resources/Textures/Objects/Misc/glowstick.rsi/{off-inhand-left.png => unlit-inhand-left.png} (100%) rename Resources/Textures/Objects/Misc/glowstick.rsi/{off-inhand-right.png => unlit-inhand-right.png} (100%) diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs index 97a222ef6a..e56e618ea0 100644 --- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs +++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs @@ -38,19 +38,6 @@ public sealed class PrototypeSaveTest // TODO fix more prototypes // The rest of these prototypes (probably) shouldn't be getting ignored. // There should be an issue up tracking all of these prototypes, indicating that still need to get fixed. - "WeaponProtoKineticAccelerator", - "WeaponStaffHealing", - "WeaponStaffPolymorphDoor", - "WeaponWandPolymorphCarp", - "WeaponWandPolymorphMonkey", - "WeaponWandFireball", - "WeaponWandDeath", - "WeaponWandPolymorphDoor", - "GlowstickBase", - "GlowstickRed", - "GlowstickPurple", - "GlowstickYellow", - "GlowstickBlue", "Thruster", "Gyroscope", "JawsOfLife", diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index adadd3e4c2..7f6b80a01f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -29,7 +29,7 @@ color: "#00FF00" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: Appearance visuals: - type: ExpendableLightVisualizer @@ -91,7 +91,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF0000" @@ -126,7 +126,7 @@ color: "#FF00FF" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF00FF" @@ -161,7 +161,7 @@ color: "#FFFF00" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FFFF00" @@ -196,7 +196,7 @@ color: "#0000FF" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#0000FF" @@ -220,7 +220,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: true color: "#FF0000" @@ -250,7 +250,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: true color: "#FF0000" @@ -281,7 +281,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF0000" @@ -320,7 +320,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF0000" @@ -350,7 +350,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF0000" @@ -381,7 +381,7 @@ color: "#FF0000" - type: Item sprite: Objects/Misc/glowstick.rsi - heldPrefix: off + heldPrefix: unlit - type: PointLight enabled: false color: "#FF0000" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index a9228d7923..3c753b4c82 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -31,3 +31,4 @@ - type: BasicEntityAmmoProvider proto: BulletKinetic capacity: 1 + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml index 835247f96b..9e4e77fdfd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml @@ -17,6 +17,7 @@ - type: BasicEntityAmmoProvider proto: ProjectileHealingBolt capacity: 10 + count: 10 - type: entity name: staff of entrance @@ -35,3 +36,4 @@ - type: BasicEntityAmmoProvider proto: ProjectilePolyboltDoor capacity: 10 + count: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml index 7b023a0511..3a29ef44f1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml @@ -24,6 +24,7 @@ - type: BasicEntityAmmoProvider proto: ProjectilePolyboltCarp capacity: 5 + count: 5 - type: entity name: wand of monkey polymorph @@ -34,6 +35,7 @@ - type: BasicEntityAmmoProvider proto: ProjectilePolyboltMonkey capacity: 5 + count: 5 - type: entity name: wand of fireball @@ -53,6 +55,7 @@ - type: BasicEntityAmmoProvider proto: ProjectileFireball capacity: 5 + count: 5 - type: entity name: magical wand of instant death @@ -71,6 +74,7 @@ - type: BasicEntityAmmoProvider proto: BulletInstakillMagic capacity: 3 + count: 3 - type: entity name: wand of entrance @@ -89,3 +93,4 @@ - type: BasicEntityAmmoProvider proto: ProjectilePolyboltDoor capacity: 10 + count: 10 diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/glowstick.rsi/lit-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Misc/glowstick.rsi/on-inhand-left.png rename to Resources/Textures/Objects/Misc/glowstick.rsi/lit-inhand-left.png diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/glowstick.rsi/lit-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Misc/glowstick.rsi/on-inhand-right.png rename to Resources/Textures/Objects/Misc/glowstick.rsi/lit-inhand-right.png diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json b/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json index decdb6606f..93b59bba3d 100644 --- a/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json @@ -8,32 +8,32 @@ }, "states": [ { - "name": "off-inhand-left", + "name": "unlit-inhand-left", "directions": 4 }, { - "name": "off-inhand-right", + "name": "unlit-inhand-right", "directions": 4 }, { - "name": "on-inhand-left", + "name": "lit-inhand-left", "directions": 4 }, { - "name": "on-inhand-right", + "name": "lit-inhand-right", "directions": 4 }, { - "name": "glowstick_base", + "name": "glowstick_base" }, { - "name": "glowstick_lit", + "name": "glowstick_lit" }, { - "name": "glowstick_glow", + "name": "glowstick_glow" }, { - "name": "glowstick_unlit", + "name": "glowstick_unlit" } ] } diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/glowstick.rsi/unlit-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Misc/glowstick.rsi/off-inhand-left.png rename to Resources/Textures/Objects/Misc/glowstick.rsi/unlit-inhand-left.png diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/glowstick.rsi/unlit-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Misc/glowstick.rsi/off-inhand-right.png rename to Resources/Textures/Objects/Misc/glowstick.rsi/unlit-inhand-right.png