From 61e04952e030e88a29d4661188d38e55b3387c80 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Tue, 27 Jun 2023 20:16:04 +0100 Subject: [PATCH] move pos marker textures. will this help #90? --- .../core/entities/pos_marker.lua | 20 +++++++++--------- .../textures/worldeditadditions_core_bg.png | Bin .../textures/worldeditadditions_core_l0.png | Bin .../textures/worldeditadditions_core_l1.png | Bin .../textures/worldeditadditions_core_l2.png | Bin .../textures/worldeditadditions_core_l3.png | Bin .../textures/worldeditadditions_core_l4.png | Bin .../textures/worldeditadditions_core_l5.png | Bin .../textures/worldeditadditions_core_l6.png | Bin .../textures/worldeditadditions_core_l7.png | Bin .../textures/worldeditadditions_core_l8.png | Bin .../textures/worldeditadditions_core_l9.png | Bin .../textures/worldeditadditions_core_r0.png | Bin .../textures/worldeditadditions_core_r1.png | Bin .../textures/worldeditadditions_core_r2.png | Bin .../textures/worldeditadditions_core_r3.png | Bin .../textures/worldeditadditions_core_r4.png | Bin .../textures/worldeditadditions_core_r5.png | Bin .../textures/worldeditadditions_core_r6.png | Bin .../textures/worldeditadditions_core_r7.png | Bin .../textures/worldeditadditions_core_r8.png | Bin .../textures/worldeditadditions_core_r9.png | Bin 22 files changed, 10 insertions(+), 10 deletions(-) rename worldeditadditions_farwand/textures/worldeditadditions_bg.png => worldeditadditions_core/textures/worldeditadditions_core_bg.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l0.png => worldeditadditions_core/textures/worldeditadditions_core_l0.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l1.png => worldeditadditions_core/textures/worldeditadditions_core_l1.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l2.png => worldeditadditions_core/textures/worldeditadditions_core_l2.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l3.png => worldeditadditions_core/textures/worldeditadditions_core_l3.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l4.png => worldeditadditions_core/textures/worldeditadditions_core_l4.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l5.png => worldeditadditions_core/textures/worldeditadditions_core_l5.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l6.png => worldeditadditions_core/textures/worldeditadditions_core_l6.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l7.png => worldeditadditions_core/textures/worldeditadditions_core_l7.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l8.png => worldeditadditions_core/textures/worldeditadditions_core_l8.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_l9.png => worldeditadditions_core/textures/worldeditadditions_core_l9.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r0.png => worldeditadditions_core/textures/worldeditadditions_core_r0.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r1.png => worldeditadditions_core/textures/worldeditadditions_core_r1.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r2.png => worldeditadditions_core/textures/worldeditadditions_core_r2.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r3.png => worldeditadditions_core/textures/worldeditadditions_core_r3.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r4.png => worldeditadditions_core/textures/worldeditadditions_core_r4.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r5.png => worldeditadditions_core/textures/worldeditadditions_core_r5.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r6.png => worldeditadditions_core/textures/worldeditadditions_core_r6.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r7.png => worldeditadditions_core/textures/worldeditadditions_core_r7.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r8.png => worldeditadditions_core/textures/worldeditadditions_core_r8.png (100%) rename worldeditadditions_farwand/textures/worldeditadditions_r9.png => worldeditadditions_core/textures/worldeditadditions_core_r9.png (100%) diff --git a/worldeditadditions_core/core/entities/pos_marker.lua b/worldeditadditions_core/core/entities/pos_marker.lua index 26d2d19..c12b129 100644 --- a/worldeditadditions_core/core/entities/pos_marker.lua +++ b/worldeditadditions_core/core/entities/pos_marker.lua @@ -14,12 +14,12 @@ local WEAPositionMarker = { static_save = false, textures = { - "worldeditadditions_bg.png", - "worldeditadditions_bg.png", - "worldeditadditions_bg.png", - "worldeditadditions_bg.png", - "worldeditadditions_bg.png", - "worldeditadditions_bg.png", + "worldeditadditions_core_bg.png", + "worldeditadditions_core_bg.png", + "worldeditadditions_core_bg.png", + "worldeditadditions_core_bg.png", + "worldeditadditions_core_bg.png", + "worldeditadditions_core_bg.png", } }, @@ -89,17 +89,17 @@ local function set_number(entity, display_number) if display_number < 100 then local number_right = display_number % 10 local number_left = (display_number - number_right) / 10 - texture_name = texture_name.."worldeditadditions_l"..number_left..".png" - texture_name = texture_name.."^worldeditadditions_r"..number_right..".png" + texture_name = texture_name .. "worldeditadditions_core_l" .. number_left .. ".png" + texture_name = texture_name .. "^worldeditadditions_core_r" .. number_right .. ".png" -- print("DEBUG:set_number number_left", number_left, "number_right", number_right) local colour_id = ((display_number - 1) % 12) + 1 -- Lua starts from 1, not 0 :-/ texture_name = "("..texture_name..")^[colorize:"..number_colours[colour_id]..":255" end if #texture_name > 0 then - texture_name = "worldeditadditions_bg.png^("..texture_name..")" + texture_name = "worldeditadditions_core_bg.png^(" .. texture_name .. ")" else - texture_name = "worldeditadditions_bg.png" + texture_name = "worldeditadditions_core_bg.png" end -- print("DEBUG:set_number texture_name", texture_name) diff --git a/worldeditadditions_farwand/textures/worldeditadditions_bg.png b/worldeditadditions_core/textures/worldeditadditions_core_bg.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_bg.png rename to worldeditadditions_core/textures/worldeditadditions_core_bg.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l0.png b/worldeditadditions_core/textures/worldeditadditions_core_l0.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l0.png rename to worldeditadditions_core/textures/worldeditadditions_core_l0.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l1.png b/worldeditadditions_core/textures/worldeditadditions_core_l1.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l1.png rename to worldeditadditions_core/textures/worldeditadditions_core_l1.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l2.png b/worldeditadditions_core/textures/worldeditadditions_core_l2.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l2.png rename to worldeditadditions_core/textures/worldeditadditions_core_l2.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l3.png b/worldeditadditions_core/textures/worldeditadditions_core_l3.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l3.png rename to worldeditadditions_core/textures/worldeditadditions_core_l3.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l4.png b/worldeditadditions_core/textures/worldeditadditions_core_l4.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l4.png rename to worldeditadditions_core/textures/worldeditadditions_core_l4.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l5.png b/worldeditadditions_core/textures/worldeditadditions_core_l5.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l5.png rename to worldeditadditions_core/textures/worldeditadditions_core_l5.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l6.png b/worldeditadditions_core/textures/worldeditadditions_core_l6.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l6.png rename to worldeditadditions_core/textures/worldeditadditions_core_l6.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l7.png b/worldeditadditions_core/textures/worldeditadditions_core_l7.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l7.png rename to worldeditadditions_core/textures/worldeditadditions_core_l7.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l8.png b/worldeditadditions_core/textures/worldeditadditions_core_l8.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l8.png rename to worldeditadditions_core/textures/worldeditadditions_core_l8.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_l9.png b/worldeditadditions_core/textures/worldeditadditions_core_l9.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_l9.png rename to worldeditadditions_core/textures/worldeditadditions_core_l9.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r0.png b/worldeditadditions_core/textures/worldeditadditions_core_r0.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r0.png rename to worldeditadditions_core/textures/worldeditadditions_core_r0.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r1.png b/worldeditadditions_core/textures/worldeditadditions_core_r1.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r1.png rename to worldeditadditions_core/textures/worldeditadditions_core_r1.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r2.png b/worldeditadditions_core/textures/worldeditadditions_core_r2.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r2.png rename to worldeditadditions_core/textures/worldeditadditions_core_r2.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r3.png b/worldeditadditions_core/textures/worldeditadditions_core_r3.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r3.png rename to worldeditadditions_core/textures/worldeditadditions_core_r3.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r4.png b/worldeditadditions_core/textures/worldeditadditions_core_r4.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r4.png rename to worldeditadditions_core/textures/worldeditadditions_core_r4.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r5.png b/worldeditadditions_core/textures/worldeditadditions_core_r5.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r5.png rename to worldeditadditions_core/textures/worldeditadditions_core_r5.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r6.png b/worldeditadditions_core/textures/worldeditadditions_core_r6.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r6.png rename to worldeditadditions_core/textures/worldeditadditions_core_r6.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r7.png b/worldeditadditions_core/textures/worldeditadditions_core_r7.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r7.png rename to worldeditadditions_core/textures/worldeditadditions_core_r7.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r8.png b/worldeditadditions_core/textures/worldeditadditions_core_r8.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r8.png rename to worldeditadditions_core/textures/worldeditadditions_core_r8.png diff --git a/worldeditadditions_farwand/textures/worldeditadditions_r9.png b/worldeditadditions_core/textures/worldeditadditions_core_r9.png similarity index 100% rename from worldeditadditions_farwand/textures/worldeditadditions_r9.png rename to worldeditadditions_core/textures/worldeditadditions_core_r9.png