From 7035943fc433293ce01cb6202c49f0040a913607 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 2 Jul 2022 15:53:10 +0200 Subject: [PATCH] Rename files to match naming convention --- README.txt | 14 +++++++------- init.lua | 18 +++++++++--------- ...t_lower.obj => pride_flags_mast_lower.obj} | 0 ...t_upper.obj => pride_flags_mast_upper.obj} | 0 ...ingflag.b3d => pride_flags_wavingflag.b3d} | Bin ...lagwave1.ogg => pride_flags_flagwave1.ogg} | Bin ...lagwave2.ogg => pride_flags_flagwave2.ogg} | Bin ...lagwave3.ogg => pride_flags_flagwave3.ogg} | Bin ...aremetal.png => pride_flags_baremetal.png} | Bin 9 files changed, 16 insertions(+), 16 deletions(-) rename models/{mast_lower.obj => pride_flags_mast_lower.obj} (100%) rename models/{mast_upper.obj => pride_flags_mast_upper.obj} (100%) rename models/{wavingflag.b3d => pride_flags_wavingflag.b3d} (100%) rename sounds/{flagwave1.ogg => pride_flags_flagwave1.ogg} (100%) rename sounds/{flagwave2.ogg => pride_flags_flagwave2.ogg} (100%) rename sounds/{flagwave3.ogg => pride_flags_flagwave3.ogg} (100%) rename textures/{default_baremetal.png => pride_flags_baremetal.png} (100%) diff --git a/README.txt b/README.txt index 114b084..a3915c7 100644 --- a/README.txt +++ b/README.txt @@ -57,16 +57,16 @@ Multimedia License (textures, sounds, and models) Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) - /models/mast_lower.obj + /models/pride_flags_mast_lower.obj by sorcerykid - /models/mast_upper.obj + /models/pride_flags_mast_upper.obj by sorcerykid - /models/wavingflag.b3d + /models/pride_flags_wavingflag.b3d by sorcerykid - /textures/default_baremetal.png + /textures/pride_flags_baremetal.png by sorcerykid /textures/prideflag_asexual.png @@ -102,17 +102,17 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) /textures/prideflag_transgender.png by sorcerykid - /sounds/flagwave1.ogg + /sounds/pride_flags_flagwave1.ogg by Chelly01 obtained from https://freesound.org/people/Chelly01/sounds/541088/ modified by sorcerykid - /sounds/flagwave2.ogg + /sounds/pride_flags_flagwave2.ogg by Chelly01 obtained from https://freesound.org/people/Chelly01/sounds/541088/ modified by sorcerykid - /sounds/flagwave3.ogg + /sounds/pride_flags_flagwave3.ogg by Chelly01 obtained from https://freesound.org/people/Chelly01/sounds/541088/ modified by sorcerykid diff --git a/init.lua b/init.lua index e7078ac..fe94e8a 100644 --- a/init.lua +++ b/init.lua @@ -22,7 +22,7 @@ minetest.register_entity( "pride_flags:wavingflag", { collisionbox = { -0.1, -0.85, -0.1, 0.1, 0.85, 0.1 }, backface_culling = false, pointable = false, - mesh = "wavingflag.b3d", + mesh = "pride_flags_wavingflag.b3d", textures = { "prideflag_rainbow.png" }, use_texture_alpha = false, }, @@ -71,16 +71,16 @@ minetest.register_entity( "pride_flags:wavingflag", { if cur_wind < 10 then anim_speed = 10 -- 2 cycle - wave_sound = "flagwave1" + wave_sound = "pride_flags_flagwave1" elseif cur_wind < 20 then anim_speed = 20 -- 4 cycles - wave_sound = "flagwave1" + wave_sound = "pride_flags_flagwave1" elseif cur_wind < 40 then anim_speed = 40 -- 8 cycles - wave_sound = "flagwave2" + wave_sound = "pride_flags_flagwave2" else anim_speed = 80 -- 16 cycles - wave_sound = "flagwave3" + wave_sound = "pride_flags_flagwave3" end if self.object then @@ -114,10 +114,10 @@ minetest.register_node( "pride_flags:lower_mast", { description = "Flag Pole", drawtype = "mesh", paramtype = "light", - mesh = "mast_lower.obj", + mesh = "pride_flags_mast_lower.obj", paramtype2 = "facedir", groups = { cracky = 2, post = 1 }, - tiles = { "default_baremetal.png", "default_baremetal.png" }, + tiles = { "pride_flags_baremetal.png", "pride_flags_baremetal.png" }, groups = { cracky = 1, level = 2 }, --sounds = default.node_sound_metal_defaults( ), @@ -135,10 +135,10 @@ minetest.register_node( "pride_flags:upper_mast", { description = "Flag Pole", drawtype = "mesh", paramtype = "light", - mesh = "mast_upper.obj", + mesh = "pride_flags_mast_upper.obj", paramtype2 = "facedir", groups = { cracky = 2 }, - tiles = { "default_baremetal.png", "default_baremetal.png" }, + tiles = { "pride_flags_baremetal.png", "pride_flags_baremetal.png" }, groups = { cracky = 1, level = 2 }, --sounds = default.node_sound_metal_defaults( ), diff --git a/models/mast_lower.obj b/models/pride_flags_mast_lower.obj similarity index 100% rename from models/mast_lower.obj rename to models/pride_flags_mast_lower.obj diff --git a/models/mast_upper.obj b/models/pride_flags_mast_upper.obj similarity index 100% rename from models/mast_upper.obj rename to models/pride_flags_mast_upper.obj diff --git a/models/wavingflag.b3d b/models/pride_flags_wavingflag.b3d similarity index 100% rename from models/wavingflag.b3d rename to models/pride_flags_wavingflag.b3d diff --git a/sounds/flagwave1.ogg b/sounds/pride_flags_flagwave1.ogg similarity index 100% rename from sounds/flagwave1.ogg rename to sounds/pride_flags_flagwave1.ogg diff --git a/sounds/flagwave2.ogg b/sounds/pride_flags_flagwave2.ogg similarity index 100% rename from sounds/flagwave2.ogg rename to sounds/pride_flags_flagwave2.ogg diff --git a/sounds/flagwave3.ogg b/sounds/pride_flags_flagwave3.ogg similarity index 100% rename from sounds/flagwave3.ogg rename to sounds/pride_flags_flagwave3.ogg diff --git a/textures/default_baremetal.png b/textures/pride_flags_baremetal.png similarity index 100% rename from textures/default_baremetal.png rename to textures/pride_flags_baremetal.png