Add lizard tail normals

space-wizards · Feb 6, 2025 · c0c468c · c0c468c
1 parent 09ba36c
commit c0c468c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -9,79 +9,98 @@
   "states": [
     {
       "name": "tail_smooth_front",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_large_front",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_large"
     },
     {
       "name": "tail_spikes_front",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_spikes"
     },
     {
       "name": "tail_dtiger_front",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_ltiger_front",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_behind_primary",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_behind_secondary",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_behind",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_large_behind",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_large"
     },
     {
       "name": "tail_spikes_behind",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_spikes"
     },
     {
       "name": "tail_dtiger_behind",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_ltiger_behind",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_primary",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_secondary",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_large",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_large"
     },
     {
       "name": "tail_spikes",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_spikes"
     },
     {
       "name": "tail_dtiger",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_ltiger",
-      "directions": 4
+      "directions": 4,
+      "bump": "tail_bump_regular"
     },
     {
       "name": "tail_smooth_wagging_primary",

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_large.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_large.png
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_regular.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_regular.png
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_spikes.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_bump_spikes.png
diff --git a/RobustToolbox b/RobustToolbox
+5 −0		Resources/EnginePrototypes/Shaders/stockshaders.yml
+5 −0		Resources/Shaders/Internal/color.swsl
+36 −1		Resources/Shaders/Internal/light_shared.swsl
+12 −0		Resources/Shaders/Internal/normal-rotator.swsl
+26 −14		Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs
+2 −2		Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs
+7 −1		Robust.Client/Graphics/AtlasTexture.cs
+15 −3		Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs
+28 −2		Robust.Client/Graphics/Clyde/Clyde.HLR.cs
+10 −0		Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs
+18 −9		Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs
+6 −1		Robust.Client/Graphics/Clyde/Clyde.Shaders.cs
+2 −2		Robust.Client/Graphics/Drawing/DrawingHandleWorld.cs
+3 −0		Robust.Client/ResourceManagement/BaseResource.cs
+1 −0		Robust.Client/ResourceManagement/IResourceCache.cs
+3 −1		Robust.Client/ResourceManagement/ResourceCache.Preload.cs
+9 −2		Robust.Client/ResourceManagement/ResourceCache.cs
+151 −13		Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs
+5 −1		Robust.Server/GameStates/PvsData.cs
+7 −3		Robust.Server/GameStates/PvsSystem.cs
+0 −1		Robust.Shared.Maths/Angle.cs
+6 −0		Robust.Shared/CVars.cs
+11 −3		Robust.Shared/Resources/RsiLoading.cs