+ fixed some lights

UOAccess · May 20, 2020 · 3c1643b · 3c1643b
1 parent ca3e9b3
commit 3c1643b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/Game/Data/LightColors.cs b/src/Game/Data/LightColors.cs
@@ -95,7 +95,7 @@ public static ushort GetHue(ushort id)
                                                         color = 62;
                                                 }
                                                 else
-                                                    color = 60;
+                                                    color = 50;
                                             }
                                             else
                                                 color = 60;
@@ -110,19 +110,19 @@ public static ushort GetHue(ushort id)
                                     color = 31;
                             }
                             else
-                                color = 666;
+                                color = 0;
                         }
                         else
-                            color = 666;
+                            color = 0;
                     }
                     else
-                        color = 666;
+                        color = 0;
                 }
                 else
-                    color = 666;
+                    color = 0;
             }
             else
-                color = 30;
+                color = 47;
 
             if (id == 0x1FD4 || id == 0x0F6C) color = 2;
 

diff --git a/src/Game/Scenes/GameScene.cs b/src/Game/Scenes/GameScene.cs
@@ -392,8 +392,8 @@ public void AddLight(GameObject obj, GameObject lightObject, int x, int y)
 
                 ushort graphic = lightObject.Graphic;
 
-                if (graphic >= 0x3E02 && graphic <= 0x3E0B ||
-                    graphic >= 0x3914 && graphic <= 0x3929 ||
+                if ((graphic >= 0x3E02 && graphic <= 0x3E0B) ||
+                    (graphic >= 0x3914 && graphic <= 0x3929) ||
                     graphic == 0x0B1D)
                     light.ID = 2;
                 else
@@ -414,7 +414,11 @@ public void AddLight(GameObject obj, GameObject lightObject, int x, int y)
                 if (light.ID >= Constants.MAX_LIGHTS_DATA_INDEX_COUNT)
                     return;
 
-                light.Color = ProfileManager.Current.UseColoredLights ? LightColors.GetHue(graphic) : (ushort) 0;
+                light.Color = (ushort) (ProfileManager.Current.UseColoredLights ? LightColors.GetHue(graphic) : (ushort) 0);
+
+                if (light.Color != 0)
+                    light.Color++;
+
                 light.DrawX = x;
                 light.DrawY = y;
                 _lightCount++;