Fixing some prototypes modifying components on init (#12385)

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",

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"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml

@@ -31,3 +31,4 @@
   - type: BasicEntityAmmoProvider
     proto: BulletKinetic
     capacity: 1
+    count: 1

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

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

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"
     }
   ]
 }