From 27e8d15971a07e30efa7219093f7ef5a4fb11ca7 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Sun, 3 Apr 2011 16:45:10 +0000 Subject: [PATCH] Reorganized scripts, fixed 'memory' not working with subdirectories git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1765 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- .../brush/ApplyColor.lua} | 3 +-- .../brush/Fisheye.lua} | 0 .../brush/GrayscaleAvg.lua} | 0 .../brush/GrayscaleDesat.lua} | 0 .../brush/Halfsmooth.lua} | 0 .../brush/Waves.lua} | 0 .../demo/3DPalette.lua} | 2 +- .../demo/Ellipse.lua} | 13 +------------ .../demo/FlipPicture.lua} | 0 .../demo/SierpinskyCarpet.lua} | 0 .../demo/SierpinskyTriangle.lua} | 0 .../demo/Spritesheet.lua} | 5 ++--- .../demo/brush/Amigaball.lua} | 8 ++++++++ .../demo/brush/ColorSphere.lua} | 0 .../demo/brush/FindAA.lua} | 0 .../demo/brush/Mandelbrot.lua} | 3 +++ .../{ => samples_2.3}/libs/dawnbringer_lib.lua | 0 .../scripts/{ => samples_2.3}/libs/memory.lua | 18 ++++++++++++------ .../palette/Desaturate.lua} | 0 .../palette/ExpandColors.lua} | 0 .../palette/FillColorCube.lua} | 0 .../palette/InvertedRGB.lua} | 0 .../palette/Set3bit.lua} | 0 .../palette/Set6bit.lua} | 0 .../palette/SetC64Palette.lua} | 0 .../palette/ShiftHue.lua} | 0 .../picture/CellColourReducer.lua} | 0 .../picture/DrawGridIsometric.lua} | 0 .../picture/DrawGridOrthogonal_RGB.lua} | 0 .../picture/DrawgridOrthogonal_Index.lua} | 0 .../picture/GlassGridFilter.lua} | 0 .../picture/PaletteToPicture.lua} | 0 .../picture/Pic2isometric.lua} | 0 .../picture/Rainbow-Dark2Bright.lua} | 0 .../picture/RemapImage2RGB.lua} | 0 .../picture/RemapImage2RGB_ed.lua} | 0 .../picture/RemapImageTo3bitPal.lua} | 0 .../picture/XBitColourXpaceFromPalette.lua} | 0 38 files changed, 28 insertions(+), 24 deletions(-) rename share/grafx2/scripts/{bru_db_ApplyColor.lua => samples_2.3/brush/ApplyColor.lua} (98%) rename share/grafx2/scripts/{bru_db_Fisheye.lua => samples_2.3/brush/Fisheye.lua} (100%) rename share/grafx2/scripts/{bru_db_GrayscaleAvg.lua => samples_2.3/brush/GrayscaleAvg.lua} (100%) rename share/grafx2/scripts/{bru_db_GrayscaleDesat.lua => samples_2.3/brush/GrayscaleDesat.lua} (100%) rename share/grafx2/scripts/{bru_db_Halfsmooth.lua => samples_2.3/brush/Halfsmooth.lua} (100%) rename share/grafx2/scripts/{bru_db_Waves.lua => samples_2.3/brush/Waves.lua} (100%) rename share/grafx2/scripts/{ani_db_3DPalette.lua => samples_2.3/demo/3DPalette.lua} (99%) rename share/grafx2/scripts/{ani_db_ellipse.lua => samples_2.3/demo/Ellipse.lua} (84%) rename share/grafx2/scripts/{pic_ni_flippicture.lua => samples_2.3/demo/FlipPicture.lua} (100%) rename share/grafx2/scripts/{pic_db_SierpinskyCarpet.lua => samples_2.3/demo/SierpinskyCarpet.lua} (100%) rename share/grafx2/scripts/{pic_db_SierpinskyTriangle.lua => samples_2.3/demo/SierpinskyTriangle.lua} (100%) rename share/grafx2/scripts/{ani_db_spritesheet.lua => samples_2.3/demo/Spritesheet.lua} (91%) rename share/grafx2/scripts/{bru_db_Amigaball.lua => samples_2.3/demo/brush/Amigaball.lua} (92%) rename share/grafx2/scripts/{bru_db_ColorSphere.lua => samples_2.3/demo/brush/ColorSphere.lua} (100%) rename share/grafx2/scripts/{bru_db_FindAA.lua => samples_2.3/demo/brush/FindAA.lua} (100%) rename share/grafx2/scripts/{bru_db_Mandelbrot.lua => samples_2.3/demo/brush/Mandelbrot.lua} (95%) rename share/grafx2/scripts/{ => samples_2.3}/libs/dawnbringer_lib.lua (100%) rename share/grafx2/scripts/{ => samples_2.3}/libs/memory.lua (84%) rename share/grafx2/scripts/{pal_db_Desaturate.lua => samples_2.3/palette/Desaturate.lua} (100%) rename share/grafx2/scripts/{pal_db_ExpandColors.lua => samples_2.3/palette/ExpandColors.lua} (100%) rename share/grafx2/scripts/{pal_db_FillColorCube.lua => samples_2.3/palette/FillColorCube.lua} (100%) rename share/grafx2/scripts/{pal_db_InvertedRGB.lua => samples_2.3/palette/InvertedRGB.lua} (100%) rename share/grafx2/scripts/{pal_db_Set3bit.lua => samples_2.3/palette/Set3bit.lua} (100%) rename share/grafx2/scripts/{pal_db_Set6bit.lua => samples_2.3/palette/Set6bit.lua} (100%) rename share/grafx2/scripts/{pal_db_SetC64Palette.lua => samples_2.3/palette/SetC64Palette.lua} (100%) rename share/grafx2/scripts/{pal_db_ShiftHue.lua => samples_2.3/palette/ShiftHue.lua} (100%) rename share/grafx2/scripts/{pic_ni_cellcolourreducer.lua => samples_2.3/picture/CellColourReducer.lua} (100%) rename share/grafx2/scripts/{pic_ni_drawgridisometric.lua => samples_2.3/picture/DrawGridIsometric.lua} (100%) rename share/grafx2/scripts/{pic_ni_drawgridorthogonal_rgbmatchcolor.lua => samples_2.3/picture/DrawGridOrthogonal_RGB.lua} (100%) rename share/grafx2/scripts/{pic_ni_drawgridorthogonal_indexedcolour.lua => samples_2.3/picture/DrawgridOrthogonal_Index.lua} (100%) rename share/grafx2/scripts/{pic_ni_GlassGridFilter.lua => samples_2.3/picture/GlassGridFilter.lua} (100%) rename share/grafx2/scripts/{pic_ni_palettetopicture.lua => samples_2.3/picture/PaletteToPicture.lua} (100%) rename share/grafx2/scripts/{pic_db_Pic2isometric.lua => samples_2.3/picture/Pic2isometric.lua} (100%) rename share/grafx2/scripts/{pic_db_Rainbow-Dark2Bright.lua => samples_2.3/picture/Rainbow-Dark2Bright.lua} (100%) rename share/grafx2/scripts/{scn_db_RemapImage2RGB.lua => samples_2.3/picture/RemapImage2RGB.lua} (100%) rename share/grafx2/scripts/{scn_db_RemapImage2RGB_ed.lua => samples_2.3/picture/RemapImage2RGB_ed.lua} (100%) rename share/grafx2/scripts/{scn_db_RemapImageTo3bitPal.lua => samples_2.3/picture/RemapImageTo3bitPal.lua} (100%) rename share/grafx2/scripts/{pic_ni_xbitcolourspacefrompalette.lua => samples_2.3/picture/XBitColourXpaceFromPalette.lua} (100%) diff --git a/share/grafx2/scripts/bru_db_ApplyColor.lua b/share/grafx2/scripts/samples_2.3/brush/ApplyColor.lua similarity index 98% rename from share/grafx2/scripts/bru_db_ApplyColor.lua rename to share/grafx2/scripts/samples_2.3/brush/ApplyColor.lua index 94db376e..3da26c1d 100644 --- a/share/grafx2/scripts/bru_db_ApplyColor.lua +++ b/share/grafx2/scripts/samples_2.3/brush/ApplyColor.lua @@ -9,8 +9,7 @@ -- as published by the Free Software Foundation; version 2 -- of the License. See ---dofile("dawnbringer_lib.lua") -require("dawnbringer_lib") +dofile("../libs/dawnbringer_lib.lua") OK,tin,clz,fade,amt,brikeep,falloff,nobg,briweight = inputbox("Apply PenColor 2 Brush", diff --git a/share/grafx2/scripts/bru_db_Fisheye.lua b/share/grafx2/scripts/samples_2.3/brush/Fisheye.lua similarity index 100% rename from share/grafx2/scripts/bru_db_Fisheye.lua rename to share/grafx2/scripts/samples_2.3/brush/Fisheye.lua diff --git a/share/grafx2/scripts/bru_db_GrayscaleAvg.lua b/share/grafx2/scripts/samples_2.3/brush/GrayscaleAvg.lua similarity index 100% rename from share/grafx2/scripts/bru_db_GrayscaleAvg.lua rename to share/grafx2/scripts/samples_2.3/brush/GrayscaleAvg.lua diff --git a/share/grafx2/scripts/bru_db_GrayscaleDesat.lua b/share/grafx2/scripts/samples_2.3/brush/GrayscaleDesat.lua similarity index 100% rename from share/grafx2/scripts/bru_db_GrayscaleDesat.lua rename to share/grafx2/scripts/samples_2.3/brush/GrayscaleDesat.lua diff --git a/share/grafx2/scripts/bru_db_Halfsmooth.lua b/share/grafx2/scripts/samples_2.3/brush/Halfsmooth.lua similarity index 100% rename from share/grafx2/scripts/bru_db_Halfsmooth.lua rename to share/grafx2/scripts/samples_2.3/brush/Halfsmooth.lua diff --git a/share/grafx2/scripts/bru_db_Waves.lua b/share/grafx2/scripts/samples_2.3/brush/Waves.lua similarity index 100% rename from share/grafx2/scripts/bru_db_Waves.lua rename to share/grafx2/scripts/samples_2.3/brush/Waves.lua diff --git a/share/grafx2/scripts/ani_db_3DPalette.lua b/share/grafx2/scripts/samples_2.3/demo/3DPalette.lua similarity index 99% rename from share/grafx2/scripts/ani_db_3DPalette.lua rename to share/grafx2/scripts/samples_2.3/demo/3DPalette.lua index bf119e65..b496240d 100644 --- a/share/grafx2/scripts/ani_db_3DPalette.lua +++ b/share/grafx2/scripts/samples_2.3/demo/3DPalette.lua @@ -15,7 +15,7 @@ -- "-" (Num): Zoom Out -- Esc: Exit script -require("dawnbringer_lib") +dofile("../libs/dawnbringer_lib.lua") BRIDIAG_SHOW = 1 -- Show brightness/Grayscale diagonal (1 = on, 0 = off) diff --git a/share/grafx2/scripts/ani_db_ellipse.lua b/share/grafx2/scripts/samples_2.3/demo/Ellipse.lua similarity index 84% rename from share/grafx2/scripts/ani_db_ellipse.lua rename to share/grafx2/scripts/samples_2.3/demo/Ellipse.lua index fe8da2f2..f24df21c 100644 --- a/share/grafx2/scripts/ani_db_ellipse.lua +++ b/share/grafx2/scripts/samples_2.3/demo/Ellipse.lua @@ -23,18 +23,7 @@ function ellipse2(x,y,a,b,stp,rot,col) sa = m.sin(ast*n) * b; ca = m.cos(ast*n) * a x1 = x + ca * cb - sa * sb y1 = y + ca * sb + sa * cb - if (n > 0) then line(ox,oy,x1,y1,col); end - end -end --- - --- -function line(x1,y1,x2,y2,c) - local n,st,m; m = math - st = m.max(1,m.abs(x2-x1),m.abs(y2-y1)); - for n = 0, st, 1 do - putpicturepixel(m.floor(x1+n*(x2-x1)/st), m.floor(y1+n*(y2-y1)/st), -c ); + if (n > 0) then drawline(ox,oy,x1,y1,col); end end end -- diff --git a/share/grafx2/scripts/pic_ni_flippicture.lua b/share/grafx2/scripts/samples_2.3/demo/FlipPicture.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_flippicture.lua rename to share/grafx2/scripts/samples_2.3/demo/FlipPicture.lua diff --git a/share/grafx2/scripts/pic_db_SierpinskyCarpet.lua b/share/grafx2/scripts/samples_2.3/demo/SierpinskyCarpet.lua similarity index 100% rename from share/grafx2/scripts/pic_db_SierpinskyCarpet.lua rename to share/grafx2/scripts/samples_2.3/demo/SierpinskyCarpet.lua diff --git a/share/grafx2/scripts/pic_db_SierpinskyTriangle.lua b/share/grafx2/scripts/samples_2.3/demo/SierpinskyTriangle.lua similarity index 100% rename from share/grafx2/scripts/pic_db_SierpinskyTriangle.lua rename to share/grafx2/scripts/samples_2.3/demo/SierpinskyTriangle.lua diff --git a/share/grafx2/scripts/ani_db_spritesheet.lua b/share/grafx2/scripts/samples_2.3/demo/Spritesheet.lua similarity index 91% rename from share/grafx2/scripts/ani_db_spritesheet.lua rename to share/grafx2/scripts/samples_2.3/demo/Spritesheet.lua index 9c964047..171dcfaa 100644 --- a/share/grafx2/scripts/ani_db_spritesheet.lua +++ b/share/grafx2/scripts/samples_2.3/demo/Spritesheet.lua @@ -2,12 +2,11 @@ --Spare page holds data - Plays on current --by Richard Fhager -require("memory") +dofile("../libs/memory.lua") arg=memory.load({XS=16,YS=16,SPACE=1,FRAMES=8,XOFF=0,YOFF=0,FPS=10}) -OK, XS, YS, SPACE, FRAMES, XOFF, YOFF, FPS = inputbox("Sprite-Sheet -Animator", +OK, XS, YS, SPACE, FRAMES, XOFF, YOFF, FPS = inputbox("Sprite-Sheet Animator", "Sprite X-size", arg.XS, 1, 256,0, "Sprite Y-size", arg.YS, 1, 256,0, "Spacing", arg.SPACE, 0, 32,0, diff --git a/share/grafx2/scripts/bru_db_Amigaball.lua b/share/grafx2/scripts/samples_2.3/demo/brush/Amigaball.lua similarity index 92% rename from share/grafx2/scripts/bru_db_Amigaball.lua rename to share/grafx2/scripts/samples_2.3/demo/brush/Amigaball.lua index 0ed613ad..115a34a9 100644 --- a/share/grafx2/scripts/bru_db_Amigaball.lua +++ b/share/grafx2/scripts/samples_2.3/demo/brush/Amigaball.lua @@ -1,4 +1,7 @@ --BRUSH Scene: Amigaball 1.0 +-- +--Draws the famous 'Amiga ball' in the brush. +-- --by Richard Fhager --http://hem.fyristorg.com/dawnbringer/ @@ -15,6 +18,11 @@ w, h = getbrushsize() +if (w<64 or h<64) then + setbrushsize(64,64) + w=64 + h=64 +end for y = 0, h - 1, 1 do for x = 0, w - 1, 1 do diff --git a/share/grafx2/scripts/bru_db_ColorSphere.lua b/share/grafx2/scripts/samples_2.3/demo/brush/ColorSphere.lua similarity index 100% rename from share/grafx2/scripts/bru_db_ColorSphere.lua rename to share/grafx2/scripts/samples_2.3/demo/brush/ColorSphere.lua diff --git a/share/grafx2/scripts/bru_db_FindAA.lua b/share/grafx2/scripts/samples_2.3/demo/brush/FindAA.lua similarity index 100% rename from share/grafx2/scripts/bru_db_FindAA.lua rename to share/grafx2/scripts/samples_2.3/demo/brush/FindAA.lua diff --git a/share/grafx2/scripts/bru_db_Mandelbrot.lua b/share/grafx2/scripts/samples_2.3/demo/brush/Mandelbrot.lua similarity index 95% rename from share/grafx2/scripts/bru_db_Mandelbrot.lua rename to share/grafx2/scripts/samples_2.3/demo/brush/Mandelbrot.lua index 6fc12433..d93b8f6b 100644 --- a/share/grafx2/scripts/bru_db_Mandelbrot.lua +++ b/share/grafx2/scripts/samples_2.3/demo/brush/Mandelbrot.lua @@ -1,4 +1,7 @@ --BRUSH Scene: Mandelbrot fractal v0.5 +-- +--Draws a Mandelbrot fractal in the current brush. +-- --by Richard Fhager --http://hem.fyristorg.com/dawnbringer/ diff --git a/share/grafx2/scripts/libs/dawnbringer_lib.lua b/share/grafx2/scripts/samples_2.3/libs/dawnbringer_lib.lua similarity index 100% rename from share/grafx2/scripts/libs/dawnbringer_lib.lua rename to share/grafx2/scripts/samples_2.3/libs/dawnbringer_lib.lua diff --git a/share/grafx2/scripts/libs/memory.lua b/share/grafx2/scripts/samples_2.3/libs/memory.lua similarity index 84% rename from share/grafx2/scripts/libs/memory.lua rename to share/grafx2/scripts/samples_2.3/libs/memory.lua index 22d1ea24..f650e873 100644 --- a/share/grafx2/scripts/libs/memory.lua +++ b/share/grafx2/scripts/samples_2.3/libs/memory.lua @@ -3,7 +3,7 @@ -- memory.save(tab) and tab=memory.load() -- -- The data will be stored in file called --- ZZZ.dat +-- .dat -- in the lua directory -- -- Example 1: @@ -74,12 +74,18 @@ memory = -- Get part after directory name last_slash=0 while true do - local pos = string.find(info.short_src, "/", last_slash+1) + local pos = string.find(info.source, "/", last_slash+1) if (pos==nil) then break end last_slash=pos end - caller=string.sub(info.short_src, last_slash+1) - + while true do + local pos = string.find(info.source, "\\", last_slash+1) + if (pos==nil) then break end + last_slash=pos + end + + caller=string.sub(info.source, last_slash+1) + -- Remove file extension if (string.sub(caller,-4, -1)==".lua") then caller=string.sub(caller, 1, -5) @@ -94,7 +100,7 @@ memory = -- messagebox(tostring(k)) -- messagebox(tostring(v)) --end - local f, e = io.open("ZZZ"..caller..".dat", "w"); + local f, e = io.open(caller..".dat", "w"); if (f ~= nil) then f:write("Entry {\n") for k, v in pairs(o) do @@ -119,7 +125,7 @@ memory = o[k]=v end end - local f = (loadfile("ZZZ"..caller..".dat")) + local f = (loadfile(caller..".dat")) if (f ~= nil) then f() end diff --git a/share/grafx2/scripts/pal_db_Desaturate.lua b/share/grafx2/scripts/samples_2.3/palette/Desaturate.lua similarity index 100% rename from share/grafx2/scripts/pal_db_Desaturate.lua rename to share/grafx2/scripts/samples_2.3/palette/Desaturate.lua diff --git a/share/grafx2/scripts/pal_db_ExpandColors.lua b/share/grafx2/scripts/samples_2.3/palette/ExpandColors.lua similarity index 100% rename from share/grafx2/scripts/pal_db_ExpandColors.lua rename to share/grafx2/scripts/samples_2.3/palette/ExpandColors.lua diff --git a/share/grafx2/scripts/pal_db_FillColorCube.lua b/share/grafx2/scripts/samples_2.3/palette/FillColorCube.lua similarity index 100% rename from share/grafx2/scripts/pal_db_FillColorCube.lua rename to share/grafx2/scripts/samples_2.3/palette/FillColorCube.lua diff --git a/share/grafx2/scripts/pal_db_InvertedRGB.lua b/share/grafx2/scripts/samples_2.3/palette/InvertedRGB.lua similarity index 100% rename from share/grafx2/scripts/pal_db_InvertedRGB.lua rename to share/grafx2/scripts/samples_2.3/palette/InvertedRGB.lua diff --git a/share/grafx2/scripts/pal_db_Set3bit.lua b/share/grafx2/scripts/samples_2.3/palette/Set3bit.lua similarity index 100% rename from share/grafx2/scripts/pal_db_Set3bit.lua rename to share/grafx2/scripts/samples_2.3/palette/Set3bit.lua diff --git a/share/grafx2/scripts/pal_db_Set6bit.lua b/share/grafx2/scripts/samples_2.3/palette/Set6bit.lua similarity index 100% rename from share/grafx2/scripts/pal_db_Set6bit.lua rename to share/grafx2/scripts/samples_2.3/palette/Set6bit.lua diff --git a/share/grafx2/scripts/pal_db_SetC64Palette.lua b/share/grafx2/scripts/samples_2.3/palette/SetC64Palette.lua similarity index 100% rename from share/grafx2/scripts/pal_db_SetC64Palette.lua rename to share/grafx2/scripts/samples_2.3/palette/SetC64Palette.lua diff --git a/share/grafx2/scripts/pal_db_ShiftHue.lua b/share/grafx2/scripts/samples_2.3/palette/ShiftHue.lua similarity index 100% rename from share/grafx2/scripts/pal_db_ShiftHue.lua rename to share/grafx2/scripts/samples_2.3/palette/ShiftHue.lua diff --git a/share/grafx2/scripts/pic_ni_cellcolourreducer.lua b/share/grafx2/scripts/samples_2.3/picture/CellColourReducer.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_cellcolourreducer.lua rename to share/grafx2/scripts/samples_2.3/picture/CellColourReducer.lua diff --git a/share/grafx2/scripts/pic_ni_drawgridisometric.lua b/share/grafx2/scripts/samples_2.3/picture/DrawGridIsometric.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_drawgridisometric.lua rename to share/grafx2/scripts/samples_2.3/picture/DrawGridIsometric.lua diff --git a/share/grafx2/scripts/pic_ni_drawgridorthogonal_rgbmatchcolor.lua b/share/grafx2/scripts/samples_2.3/picture/DrawGridOrthogonal_RGB.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_drawgridorthogonal_rgbmatchcolor.lua rename to share/grafx2/scripts/samples_2.3/picture/DrawGridOrthogonal_RGB.lua diff --git a/share/grafx2/scripts/pic_ni_drawgridorthogonal_indexedcolour.lua b/share/grafx2/scripts/samples_2.3/picture/DrawgridOrthogonal_Index.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_drawgridorthogonal_indexedcolour.lua rename to share/grafx2/scripts/samples_2.3/picture/DrawgridOrthogonal_Index.lua diff --git a/share/grafx2/scripts/pic_ni_GlassGridFilter.lua b/share/grafx2/scripts/samples_2.3/picture/GlassGridFilter.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_GlassGridFilter.lua rename to share/grafx2/scripts/samples_2.3/picture/GlassGridFilter.lua diff --git a/share/grafx2/scripts/pic_ni_palettetopicture.lua b/share/grafx2/scripts/samples_2.3/picture/PaletteToPicture.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_palettetopicture.lua rename to share/grafx2/scripts/samples_2.3/picture/PaletteToPicture.lua diff --git a/share/grafx2/scripts/pic_db_Pic2isometric.lua b/share/grafx2/scripts/samples_2.3/picture/Pic2isometric.lua similarity index 100% rename from share/grafx2/scripts/pic_db_Pic2isometric.lua rename to share/grafx2/scripts/samples_2.3/picture/Pic2isometric.lua diff --git a/share/grafx2/scripts/pic_db_Rainbow-Dark2Bright.lua b/share/grafx2/scripts/samples_2.3/picture/Rainbow-Dark2Bright.lua similarity index 100% rename from share/grafx2/scripts/pic_db_Rainbow-Dark2Bright.lua rename to share/grafx2/scripts/samples_2.3/picture/Rainbow-Dark2Bright.lua diff --git a/share/grafx2/scripts/scn_db_RemapImage2RGB.lua b/share/grafx2/scripts/samples_2.3/picture/RemapImage2RGB.lua similarity index 100% rename from share/grafx2/scripts/scn_db_RemapImage2RGB.lua rename to share/grafx2/scripts/samples_2.3/picture/RemapImage2RGB.lua diff --git a/share/grafx2/scripts/scn_db_RemapImage2RGB_ed.lua b/share/grafx2/scripts/samples_2.3/picture/RemapImage2RGB_ed.lua similarity index 100% rename from share/grafx2/scripts/scn_db_RemapImage2RGB_ed.lua rename to share/grafx2/scripts/samples_2.3/picture/RemapImage2RGB_ed.lua diff --git a/share/grafx2/scripts/scn_db_RemapImageTo3bitPal.lua b/share/grafx2/scripts/samples_2.3/picture/RemapImageTo3bitPal.lua similarity index 100% rename from share/grafx2/scripts/scn_db_RemapImageTo3bitPal.lua rename to share/grafx2/scripts/samples_2.3/picture/RemapImageTo3bitPal.lua diff --git a/share/grafx2/scripts/pic_ni_xbitcolourspacefrompalette.lua b/share/grafx2/scripts/samples_2.3/picture/XBitColourXpaceFromPalette.lua similarity index 100% rename from share/grafx2/scripts/pic_ni_xbitcolourspacefrompalette.lua rename to share/grafx2/scripts/samples_2.3/picture/XBitColourXpaceFromPalette.lua