Rename attribute to SpringCollab2020_ignoreLighting

Author: maddie480

Ahorn/entities/bubbleReturnBerry.jl

@@ -3,7 +3,7 @@
 using ..Ahorn, Maple
 
 @mapdef Entity "SpringCollab2020/returnBerry" ReturnBerry(x::Integer, y::Integer, order::Integer=-1, checkpointID::Integer=-1, winged::Bool=false,
-	nodes::Array{Tuple{Integer, Integer}, 1}=Tuple{Integer, Integer}[], ignoreLighting::Bool=false)
+	nodes::Array{Tuple{Integer, Integer}, 1}=Tuple{Integer, Integer}[], SpringCollab2020_ignoreLighting::Bool=false)
 
 const placements = Ahorn.PlacementDict(
 	"Strawberry (With Return) (Spring Collab 2020)" => Ahorn.EntityPlacement(

Ahorn/entities/multiRoomStrawberry.jl

@@ -3,7 +3,7 @@
 using ..Ahorn, Maple
 
 @mapdef Entity "SpringCollab2020/MultiRoomStrawberry" MultiRoomStrawberry(x::Integer, y::Integer,
-    name::String="multi_room_strawberry", winged::Bool=false, moon::Bool=false, checkpointID::Integer=-1, order::Integer=-1, ignoreLighting::Bool=false)
+    name::String="multi_room_strawberry", winged::Bool=false, moon::Bool=false, checkpointID::Integer=-1, order::Integer=-1, SpringCollab2020_ignoreLighting::Bool=false)
 
 const placements = Ahorn.PlacementDict(
     "Multi-Room Strawberry (Spring Collab 2020)" => Ahorn.EntityPlacement(

Ahorn/entities/strawberryIgnoringLighting.jl

@@ -7,7 +7,7 @@ const placements = Ahorn.PlacementDict(
         Maple.Strawberry,
         "point",
         Dict{String, Any}(
-            "ignoreLighting" => true
+            "SpringCollab2020_ignoreLighting" => true
         )
     )
 )

Ahorn/lang/en_gb.lang

@@ -6,7 +6,8 @@ placements.entities.SpringCollab2020/diagonalWingedStrawberry.tooltips.checkpoin
 placements.entities.SpringCollab2020/returnBerry.tooltips.winged=Flies away upon dashing.
 placements.entities.SpringCollab2020/returnBerry.tooltips.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default = -1)
 placements.entities.SpringCollab2020/returnBerry.tooltips.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default = -1)
-placements.entities.SpringCollab2020/returnBerry.tooltips.ignoreLighting=If checked, the berry will appear bright at all times, even if the room is dark.
+placements.entities.SpringCollab2020/returnBerry.names.SpringCollab2020_ignoreLighting=Ignore Lighting
+placements.entities.SpringCollab2020/returnBerry.tooltips.SpringCollab2020_ignoreLighting=(Spring Collab 2020 attribute) If checked, the berry will appear bright at all times, even if the room is dark.
 
 # Glass Berry
 placements.entities.SpringCollab2020/glassBerry.tooltips.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default = -1)
@@ -185,10 +186,12 @@ placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.winged=The str
 placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
 placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
 placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.moon=Makes the strawberry render as a space berry.\nDoes not work with wings or nodes in the base game.
-placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.ignoreLighting=If checked, the berry will appear bright at all times, even if the room is dark.
+placements.entities.SpringCollab2020/MultiRoomStrawberry.names.SpringCollab2020_ignoreLighting=Ignore Lighting
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.SpringCollab2020_ignoreLighting=(Spring Collab 2020 attribute) If checked, the berry will appear bright at all times, even if the room is dark.
 
 # Strawberry ignoring lighting
-placements.entities.strawberry.tooltips.ignoreLighting=If checked, the berry will appear bright at all times, even if the room is dark.
+placements.entities.strawberry.names.SpringCollab2020_ignoreLighting=Ignore Lighting
+placements.entities.strawberry.tooltips.SpringCollab2020_ignoreLighting=(Spring Collab 2020 attribute) If checked, the berry will appear bright at all times, even if the room is dark.
 
 # Madeline Silhouette Trigger
 placements.triggers.SpringCollab2020/MadelineSilhouetteTrigger.tooltips.enable=If checked, the trigger will turn Madeline into a silhouette. If unchecked, it will turn Madeline back to normal.

Entities/StrawberryIgnoringLighting.cs

@@ -32,8 +32,8 @@ public static void Unload() {
         private static void onStrawberryConstructor(On.Celeste.Strawberry.orig_ctor orig, Strawberry self, EntityData data, Vector2 offset, EntityID gid) {
             orig(self, data, offset, gid);
 
-            // save the value for ignoreLighting to the DynData for the strawberry.
-            new DynData<Strawberry>(self)["ignoreLighting"] = data.Bool("ignoreLighting");
+            // save the value for SpringCollab2020_ignoreLighting to the DynData for the strawberry.
+            new DynData<Strawberry>(self)["SpringCollab2020_ignoreLighting"] = data.Bool("SpringCollab2020_ignoreLighting");
         }
 
         private static void onLightingBeforeRender(On.Celeste.LightingRenderer.orig_BeforeRender orig, LightingRenderer self, Scene scene) {
@@ -44,7 +44,7 @@ private static void onLightingBeforeRender(On.Celeste.LightingRenderer.orig_Befo
             foreach (Entity entity in scene.Entities) {
                 if (entity is Strawberry berry) {
                     DynData<Strawberry> berryData = new DynData<Strawberry>(berry);
-                    if (berryData.Get<bool>("ignoreLighting")) {
+                    if (berryData.Get<bool>("SpringCollab2020_ignoreLighting")) {
                         Draw.SpriteBatch.Draw(strawberryCutoutTexture.Texture.Texture, berry.Position + berryData.Get<Sprite>("sprite").Position - (scene as Level).Camera.Position
                             - new Vector2(9, 8), Color.White);
                     }