upload and add to iso m2view, grafx2, fix fNav

git-svn-id: svn://kolibrios.org@6581 a494cfbc-eb01-0410-851d-a64ba20cac60
2016-10-07 15:11:52 +00:00 · 2016-10-07 15:11:52 +00:00 · e401a92cbf
commit e401a92cbf
parent 3820a8d290
94 changed files with 7067 additions and 2 deletions
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@ -138,6 +138,7 @@ extra_files = {
 {"kolibrios/3D/info3ds/TL_SYS_16.PNG", PROGS .. "/develop/info3ds/tl_sys_16.png"},
 {"kolibrios/3D/info3ds/TOOLBAR.PNG", PROGS .. "/develop/info3ds/toolbar.png"},
 {"kolibrios/3D/info3ds/FONT8X9.BMP", PROGS .. "/fs/kfar/trunk/font8x9.bmp"},
+ {"kolibrios/3D/m2view/", "common/3d/md2view/*"},
 {"kolibrios/3D/voxel_editor/VOXEL_EDITOR", PROGS .. "/media/voxel_editor/trunk/voxel_editor"},
 {"kolibrios/3D/voxel_editor/CURSORS.PNG", PROGS .. "/media/voxel_editor/trunk/cursors.png"},
 {"kolibrios/3D/voxel_editor/CURSORS_GR.PNG", PROGS .. "/media/voxel_editor/trunk/cursors_gr.png"},
@ -194,6 +195,7 @@ extra_files = {
 {"kolibrios/games/phenix", PROGS .. "/games/phenix/trunk/phenix"},
 {"kolibrios/games/soko/soko", PROGS .. "/games/soko/trunk/SOKO"},
 {"kolibrios/games/soko/", "common/games/soko/*"},
+ {"kolibrios/ggrafx2/", "common/media/grafx2/*"},
 {"kolibrios/drivers/ahci/", "common/drivers/ahci/*"},
 {"kolibrios/drivers/atikms/", "common/drivers/atikms/*"},
 {"kolibrios/drivers/i915/", "common/drivers/i915/*"},
@ -225,7 +227,7 @@ extra_files = {
 {"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"},
 {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
 {"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
- {"kolibrios/utils/fNav/", "common/File Managers/fNav*"},
+ {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
 }
 if build_type == "rus" then tup.append_table(extra_files, {
 {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},
--- a/data/common/3d/md2view/md2.cfg
+++ b/data/common/3d/md2view/md2.cfg
@ -0,0 +1,15 @@
+# ‘¨â ªá¨á:
+# [/path/]file_mod_1.md2 [[/path/]file_text_1.pcx]
+# ‚ ª ç¥áâ¢¥ ¯ãâ¨ ¯®¤¤¥à¦¨¢ îâáï ¯®¤ª â «®£¨ â¥ªãé¥£® ª â «®£  à á¯®«®¦¥¨ï ¢ìî¢¥à .
+# <20>à¥¤¯®« £ ¥âáï, çâ® ¥á«¨ ¤«ï ä ©«  â¥ªáâãàë ¥ ãª §  
+# ¯ãâì â® ® à á¯®«®¦¥ ¢ â®¬ ¦¥ ª â «®£¥ çâ® ¨ ä ©« ¬®¤¥«¨.
+# <20>à¥¤¯®« £ ¥âáï â ª ¦¥ çâ®, ¥á«¨ ¤«ï ä ©«  ¬®¤¥«¨ ¥ ãª §  ¯ãâì â® ®  å®¤¨âáï ¢ â®¬ ¦¥  
+# ª â «®£¥ çâ® ¨ ¢ìî¢¥à. 
+
+ /md2_model/Ogros.md2  #¬®¤¥«ì ®àª  
+ md2_model/Weapon.md2  #¬®¤¥«ì ®àã¦¨ï
+
+ #md2_model/TRIS.MD2 DRFREAK.PCX
+
+ #/hd2/1/TEMP/quake_2/QUAKE2/BASEQ2/players/female/tris.md2 athena.pcx
+ #/hd2/1/TEMP/quake_2/QUAKE2/BASEQ2/players/female/w_disrupt.md2 /athena.pcx
--- a/data/common/3d/md2view/md2View
+++ b/data/common/3d/md2view/md2View
--- a/data/common/3d/md2view/md2_model/Ogro.txt
+++ b/data/common/3d/md2view/md2_model/Ogro.txt
@ -0,0 +1,132 @@
+
+
+10/11/98
+================================================================
+Model Name              : Ogro
+installation directory  : quake2/baseq2/players/ogro
+
+Model Author		: Magarnigal
+			  email		:mellor@netgazer.net.au
+			  homepage 	:http://magarn.3dpalette.com
+
+
+Skins Author            : Ogro_Fix 
+			  email		: ogro_fix@yahoo.com
+			  homepage	: http://www.fondation.com/pandemonium
+			
+
+Additional info		: Fix has included a cloth and ogrobase skin that people may use as a base for skinning ogro.  The
+			  mapping can be a bit confusing, 2d skinners beware.
+
+
+
+Additional skin by	: Deranged - (Sharokh)
+			  email		: deranged@deathsdoor.com
+			  homepage 	: http://www.gibbed.com/thebin
+
+
+
+Ogrific law:
+
+An Ogro is similar to an ogre, but why the O?? In French ogre is pronounced ogrr, not oger, also 'gros' means to be fat/big...so ogre - gros makes Ogro!  After all, it's cuter than just ogre :).
+
+The Ogro is smaller than a normal ogre, but just as fat and only slightly less stupid. As opposed to common belief, he is not an evil creature, only killing as is absolutely necessary.  
+
+Imagine, if you will, an Ogro in the subway.  As he enters the carriage, people become plastered to the walls due to Ogro's size.  He's too big!  Ahh well, maybe Ogro should just sit on one of these tiny seats...a strange sound can be heard (sproottch).  Imagine now, the look of an astonished ogro...huh?!?  Standing up, he looks at the seat.  OMFO! (oh my fucking ogrod!)! Where a little old grandma had been sitting, now looks more like a pizza!  But, I swear, it was a grandma!
+
+This sort of occurrence is common to an Ogro...its in their nature.  when you want to talk to an ogro, stay at good distance (better if you call him from behind), as his movements are rather "uncontrolled", and you might cop a smash in the face!
+
+A special diet is required for Ogros.  When they're babies (ogrillons), their mum's (ogresses) give them copious amounts of chili con carne, canned beans and the like. The result of this carefully structured diet produces an Ogro capable of immense farting achievements.  
+
+The ogro is just full of bad smells. That's not to say he's not clean.  An ogro will wash himself often (doesn't fear water as opposed to trolls).  The problem lies in his intestinal flora (and fauna). all his orifices (ogrifices?) are used for ogrific spells. (green clouds, etc..). Nothing can be done against this kind of onslaught, except to run or stop breathing.
+
+It's a useful trait to have in the subway. people will often leave the carriage, trying to find the culprit. (Although all that is need it to look at the face of the ogro: he's 
+happy, he farted well, and it smells really bad).
+
+
+Ogro's existed long before humans. In fact, one school of thought holds to the theory that humans are a degenerated version of Ogro, more intelligent, but evil.
+
+
+Hidden Ogro's of today include:  Obelix, fat boy slim, any Sumo, Amish (braveheart movie), slamfist (small soldiers movie), bud spencer, etc...			  
+
+
+  
+
+
+Additional Credits to   : id software, Howzer, Rod, 
+
+
+
+================================================================
+* Play Information *
+
+New Sounds              : Yes,  original sounds from Eric vonRothkirch of 'The Coven', email him
+ 			  at redchurch@uswest.net
+
+CTF Skins               : yes
+VWEP Support            : yes, standard Id weapons with modified, ogrific skins.  
+
+
+* Construction *
+Poly Counts
+Tris.md2		: 670
+weapon.md2		: 122
+
+Vert Counts
+tris.md2		: 358  - anyone actually need this number?
+weapon.md2		: 74
+
+Skin Wastage
+tris.md2		: 1%
+weapon.md2		: 2%
+
+Skin Count              : 14
+
+Base                    : none
+
+
+A background to some of the skins:
+
+Grok: the standard cyberpunk ogro
+
+freedom: this one is dedicated to braveheart.
+
+gib: this one didn't know how to use the ogrific mixer (used to make mammoth steaks), and jumped into it..the mixer did all the work.
+
+slaanesh: this one is an evil ogro, serving the god of lust.
+
+Khorne: this one is even more evil than slaanesh, serving the god of blood and violence.
+
+Nabogro: it's a dwarf (yeah, well, it was), he's a trollslayer. In french nabot means small/dwarfy, so, nabogro went logically.
+
+darkam: hoo, this one is a troll! (yes, he's green, and ogros hate green), but even if he's green it's the best friend of the original, the true ogro.
+
+Igdosh: played with a nuclear missile, thinking it was a cigar...
+
+Gorash: he's evil too, has been created by the doctor ogrenstein. but this is the prototype, the real ogrenstein is under construction for now.
+
+Arboshak: He felt in love with 3CPO and tried to cyborgize himself. but finally preferred R2D2, but too late
+
+
+
+Editors used:-
+
+Modelling/animation	: Lightwave 5.5 
+
+Converting/clean-up	: QME, Q2modeler
+
+Skinning/mapping	: NST, Paint shop Pro
+
+
+
+Build/Animation time    : longer than expected.  5-10 hours per skin.  
+
+
+* How to use this model *
+
+extract to quake2\baseq2\players\ogro  run quake2, send us money, frag other players.    
+
+
+* Copyright / Permissions *
+
+QUAKE(R) and QUAKE II(R) are registered trademarks of id Software, Inc.
--- a/data/common/3d/md2view/md2_model/Ogros.md2
+++ b/data/common/3d/md2view/md2_model/Ogros.md2
--- a/data/common/3d/md2view/md2_model/Weapon.md2
+++ b/data/common/3d/md2view/md2_model/Weapon.md2
--- a/data/common/3d/md2view/md2_model/Weapon.pcx
+++ b/data/common/3d/md2view/md2_model/Weapon.pcx
--- a/data/common/3d/md2view/md2_model/igdosh.pcx
+++ b/data/common/3d/md2view/md2_model/igdosh.pcx
--- a/data/common/3d/md2view/readme.txt
+++ b/data/common/3d/md2view/readme.txt
@ -0,0 +1,7 @@
+md2View v0.01 - Вьювер md2 файлов моделей игры Quake2.
+Файлы моделей и текстур задаются в конфигурационном файле md2.cfg.
+Поддерживаются текстуры только в формате pcx c 8 бит глубиной цвета.
+
+iadn
+http://www.iadn.narod.ru
+iadn@bk.ru
--- a/data/common/media/grafx2/fonts/5pxtinyfont.png
+++ b/data/common/media/grafx2/fonts/5pxtinyfont.png
--- a/data/common/media/grafx2/fonts/8pxfont.png
+++ b/data/common/media/grafx2/fonts/8pxfont.png
--- a/data/common/media/grafx2/fonts/GrafX2_Black.gif
+++ b/data/common/media/grafx2/fonts/GrafX2_Black.gif
--- a/data/common/media/grafx2/fonts/GrafX2_Dark.gif
+++ b/data/common/media/grafx2/fonts/GrafX2_Dark.gif
--- a/data/common/media/grafx2/fonts/PF_Arma_5__.png
+++ b/data/common/media/grafx2/fonts/PF_Arma_5__.png
--- a/data/common/media/grafx2/fonts/PF_Easta_7_.png
+++ b/data/common/media/grafx2/fonts/PF_Easta_7_.png
--- a/data/common/media/grafx2/fonts/PF_Easta_7__.png
+++ b/data/common/media/grafx2/fonts/PF_Easta_7__.png
--- a/data/common/media/grafx2/fonts/PF_Ronda_7__.png
+++ b/data/common/media/grafx2/fonts/PF_Ronda_7__.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_5.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_5.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_5_.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_5_.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_5__.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_5__.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_5___.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_5___.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_7.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_7.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_7_.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_7_.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_7__.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_7__.png
--- a/data/common/media/grafx2/fonts/PF_Tempesta_7___.png
+++ b/data/common/media/grafx2/fonts/PF_Tempesta_7___.png
--- a/data/common/media/grafx2/fonts/PF_Westa_7_.png
+++ b/data/common/media/grafx2/fonts/PF_Westa_7_.png
--- a/data/common/media/grafx2/fonts/PF_Westa_7__.png
+++ b/data/common/media/grafx2/fonts/PF_Westa_7__.png
--- a/data/common/media/grafx2/fonts/Tuffy.ttf
+++ b/data/common/media/grafx2/fonts/Tuffy.ttf
--- a/data/common/media/grafx2/fonts/colorfont.pcx
+++ b/data/common/media/grafx2/fonts/colorfont.pcx
--- a/data/common/media/grafx2/gfx2.gif
+++ b/data/common/media/grafx2/gfx2.gif
--- a/data/common/media/grafx2/gfx2.png
+++ b/data/common/media/grafx2/gfx2.png
--- a/data/common/media/grafx2/gfx2def.ini
+++ b/data/common/media/grafx2/gfx2def.ini
@ -0,0 +1,420 @@
+###### GrafX2 initialization file ###### Fichier d'initialisation de GrafX2 ##
+#                                     #                                      #                                                                          #
+# You may modify this file with any   # Vous pouvez modifier ce fichier avec #
+# standard ASCII text editor.         # n'importe quel éditeur de texte      #
+#                                     # ASCII standard.                      #
+#                                     #                                      #
+# Comments are preceded by ';' or     # Les commentaires sont précédés par   #
+# '#'.                                # ';' ou '#'.                          #
+#                                     #                                      #
+# Options are not case sensitive and  # Les options ne sont pas sensibles à  #
+# spaces are ignored.                 # la casse et les espaces sont ignorés.#
+#                                     #                                      #
+# You must not change the order of    # Vous ne devez pas changer l'ordre    #
+# the sections and their options.     # des sections et de leurs options.    #
+# You must not delete or put into     # Vous ne devez pas effacer ou mettre  #
+# comment any section nor option.     # en commentaire une section ou option.#
+#                                     #                                      #
+# Each option is preceded by a        # Chaque option est précédée par un    #
+# comment which explains its meaning. # commentaire qui explique sa fonction.#
+#                                     #                                      #
+##############################################################################
+
+
+
+[MOUSE]                               # [SOURIS]
+
+  ; The sensitivity of the mouse can  | La sensibilité de la souris peut
+  ; take values from 1 to 4. The      | prendre des valeurs de 1 à 4. Plus
+  ; smaller values, the faster.       | les valeurs sont petites, plus c'est
+  ; This only takes effect in         | rapide. Ce paramétrage n'est utilisé
+  ; fullscreen modes.                 | que dans les modes "plein écran".
+  ;                                   | 
+  X_sensitivity = 1	; (default 1)
+  Y_sensitivity = 1	; (default 1)
+
+  ; Unused setting, only kept for compatibility.
+  X_correction_factor = 0	; (default 0)
+  Y_correction_factor = 0	; (default 0)
+
+  ; Aspect of the main cursor (cross) | Aspect du curseur principal (croix)
+  ; 1: Solid                          | 1: Solide
+  ; 2: Transparent                    | 2: Transparent
+  ; 3: Thin (solid)                   | 3: Fin (solide)
+  Cursor_aspect = 1	; (default 1)
+
+[MENU]                                # [MENU]
+
+  ; Colors of the menus (the black    | Couleurs des menus (la couleur noire
+  ; and the white colors cannot be    | et la couleur blanche ne peuvent pas
+  ; modified).                        | être modifiées).
+  ; Values are in {Red,Green,Blue}    | Les valeurs sont dans l'ordre {Rouge,
+  ; order and are between 0 and 63.   | Vert,Bleu} et vont de 0 à 63.
+  Light_color = 42,42,42	; (default 42,42,42)
+  Dark_color  = 27,27,27	; (default 27,27,27)
+  ;
+  ;  Light_color = 24,25,30	; \_ Nightmare
+  ;  Dark_color  = 13,14,19	; /
+  ;
+  ;  Light_color = 10,45,28	; \_ Forest
+  ;  Dark_color  =  5,27,12	; /
+  ;
+  ;  Light_color = 48,41,26	; \_ Gold
+  ;  Dark_color  = 26,22,15	; /
+  ;
+  ;  Light_color = 10,40,55	; \_ Oceanic
+  ;  Dark_color  = 10,20,32	; /
+
+  ; Aspect ratio and size of the      | Proportion des menus et de la barre
+  ; menus and the tool-bar.           | d'outils.
+  ; Possible values:                  | Valeurs possibles:
+  ; 0: Do not adapt (pixels are not   | 0: Ne pas adapter (les pixels ne sont
+  ;    stretched)                     |    pas étirés)
+  ; 1: Adapt the menus and the tool-  | 1: Adapter les menus et la barre
+  ;    bar according to the resolution|    d'outils suivant la résolution
+  ; 2: Slightly adapt the ratio of    | 2: Adapter légèrement les proportions
+  ;    the menus and tool-bar         |    des menus et de la barre d'outils
+  ; -1:Do not adapt (like 0)          | -1:Ne pas adapter (comme 0)
+  ; -2:Stretch by x2 maximum          | -2:Etire au double de taille si possible
+  ; -3:Stretch by x3 maximum          | -3:Etire au triple de taille si possible  
+  ; -4:Stretch by x4 maximum          | -3:Etire au quadruple de taille si
+  ;                                   |    possible.
+  Menu_ratio = -2	; (default -2)
+
+[FILE_SELECTOR]                       # [SELECTEUR_DE_FICHIERS]
+
+  ; Show hidden files and             | Afficher les fichiers et répertoires
+  ; directories (values are 'yes' or  | cachés (les valeurs sont 'yes' ou
+  ; 'no').                            | 'no').
+  Show_hidden_files       = no	; (default 'no')
+  Show_hidden_directories = no	; (default 'no')
+
+  ; Delay before displaying a preview | Délai avant d'afficher une preview
+  ; in file-selectors (in 18.2th of   | dans les sélecteurs de fichiers (en
+  ; second). Possible values range    | 18.2èmes de seconde) Les valeurs
+  ; from 1 to 256.                    | possibles vont de 1 à 256.
+  Preview_delay = 8	; (default 8)
+
+  ; Maximize the preview of the       | Maximiser la preview des images pour
+  ; pictures so that it is as big as  | qu'elle soit aussi grande que
+  ; possible. If you're not in the    | possible.
+  ; same resolution as the picture's  | Si vous n'êtes pas dans la même réso-
+  ; one, it can try to correct the    | lution que celle de l'image, cela peut
+  ; aspect ratio, but if the picture  | essayer de corriger les proportions,
+  ; does not fill the whole screen,   | mais si l'image ne prend pas tout
+  ; it can be worse.                  | l'écran, cela peut être pire.
+  Maximize_preview = no	; (default 'no')
+
+  ; This option is used to place the  | Cette option est utilisée pour placer
+  ; selection bar on a filename by    | la barre de sélection sur un nom de
+  ; typing its first letters.         | fichier en tapant ses 1ères lettres.
+  ; For example, if you want to find  | Par exemple, si vous voulez trouver le
+  ; the "PICTURE.PKM" in a directory  | fichier "PICTURE.PKM" dans un réper-
+  ; that also contains "PALETTE.PAL", | toire contenant également le fichier
+  ; you'll just have to type P and I. | "PALETTE.PAL", vous n'aurez qu'à taper
+  ; The different values of "FFF"     | P puis I.
+  ; indicate if you want to find the  | Les different valeurs de "FFF"
+  ; name in both files and directories| indiquent si vous voulez trouvez le nom
+  ; or just in only one of these:     | dans les fichiers ET les répertoires ou
+  ; 0: files and directories          | simplement dans l'un OU l'autre.
+  ; 1: files only                     | 0: fichiers et répertoires
+  ; 2: directories only               | 1: fichiers seulement
+  ;                                   | 2: répertoires seulement
+  Find_file_fast = 0	; (default 0)
+
+
+[LOADING]                             # [CHARGEMENT]
+
+  ; Automatically set the resolution  | Passer automatiquement dans la bonne
+  ; when loading a picture.           | résolution lors du chargement d'une
+  ; You should set this value to      | image.
+  ; 'yes' after disabling the video   | Vous devriez définir cette option à
+  ; modes that are not supported by   | 'yes' après avoir inhibé les modes
+  ; your video card or monitor.       | vidéo qui ne sont pas supportés par
+  ;                                   | votre matériel.
+  Auto_set_resolution = no	; (default 'no')
+
+  ; If the variable above is set to   | Si la variable ci-dessus est à 'yes',
+  ; 'yes', this one tells if you want | celle-ci indique si vous voulez
+  ; to set the resolution according   | définir la résolution suivant:
+  ; to:                               | 1: les dimensions de "l'écran
+  ; 1: the internal "original screen" |    d'origine" internes à l'image
+  ;    dimensions of the picture      | 2: les véritables dimensions de
+  ; 2: the actual dimensions of the   |    l'image
+  ;    picture                        |
+  Set_resolution_according_to = 1	; (default 1)
+
+  ; If you load a picture with a      | Si vous chargez une image ayant une
+  ; palette of less than 256 colors,  | palette de moins de 256 couleurs,
+  ; this option defines if you want   | cette option indique si vous souhaitez
+  ; to clear the palette or to keep   | effacer la palette ou bien conserver
+  ; the colors of the previous        | les couleurs de l'image précédente qui
+  ; picture that are over the number  | se situent au-delà du nombre de la
+  ; of colors of the new picture.     | nouvelle image.
+  ; For example, if you load a        | Par exemple, si vous chargez une image
+  ; 32-color picture, the colors 32   | de 32 couleurs, les couleurs 32 à 255
+  ; to 255 will be set to black if    | seront passées en noir si cette option
+  ; this option is set to 'yes', or   | est à 'yes', ou bien elles resteront
+  ; they will be kept unchanged if    | inchangées si elle est à 'no'.
+  ; this option is set to 'no'.       |
+  Clear_palette = yes	; (default 'yes')
+
+
+[MISCELLANEOUS]                       # [DIVERS]
+
+  ; Draw the limits of the picture.   | Afficher les limites de l'image
+  Draw_limits = yes	; (default 'yes')
+
+  ; Adjust the brush grabbing in      | Ajuster la capture de brosse en mode
+  ; "grid" mode.                      | "grille".
+  Adjust_brush_pick = yes	; (default 'yes')
+
+  ; Coordinates:                      | Coordonnées:
+  ; 1: Relative                       | 1: Relatives
+  ; 2: Absolute                       | 2: Absolues
+  Coordinates = 1	; (default 1)
+
+  ; Create a backup file when saving. | Créer un fichier backup lors des
+  ;                                   | sauvegardes.
+  Backup = no	; (default 'no')
+
+  ; Number of pages stored in memory  | Nombre de pages stockées en mémoire
+  ; for "undoing".                    | destinées à annuler les dernières
+  ; Values are between 1 and 99.      | modifications. Valeurs entre 1 et 99.
+  Undo_pages = 20	; (default 20)
+
+  ; Speed of the scroll-bars (in VBLs | Vitesse des barre de défilement (en
+  ; waited) while clicking with the   | VBLs attendus) lorsque l'un des
+  ; left or right button of the mouse.| boutons de la souris est enfoncé.
+  ; Values can be between 1 and 255.  | Les valeurs sont comprises entre 1 et
+  ; The bigger values, the slower.    | 255. Plus elles sont grandes, plus
+  ;                                   | c'est lent.
+  Gauges_scrolling_speed_Left  = 10	; (default 10)
+  Gauges_scrolling_speed_Right = 3	; (default 3)
+
+  ; Automatically save the configu-   | Enregistre automatiquement la configu-
+  ; ration when exiting the program.  | ration lorsqu'on quitte le programme.
+  Auto_save = yes	; (default 'yes')
+
+  ; Maximum number of vertices used   | Nombre maximum de vertex utilisés dans
+  ; in filled polygons and polyforms, | les polygônes et polyformes pleins, et
+  ; and lasso. Possible values range  | le lasso. Les valeurs possibles vont
+  ; from 2 to 16384.                  | de 2 à 16384.
+  ; Each vertex takes 4 bytes.        | Chaque vertex prend 4 octets.
+  Vertices_per_polygon = 1024	; (default 1024)
+
+  ; Automatically zoom into the       | Zoomer automatiquement la zone pointée
+  ; pointed area when you press the   | par la souris lorsque vous appuyez sur
+  ; short-key of the Magnifier button | la touche de raccourci de la loupe.
+  ; while being above the picture.    |
+  Fast_zoom = yes	; (default 'yes')
+
+  ; Separate the colors in the tool-  | Séparer les couleurs dans la barre
+  ; bar by a black squaring.          | d'outils par un quadrillage noir.
+  Separate_colors = no	; (default 'no')
+
+  ; Initial value of the feedback for | Valeur initiale du "feedback" pour les
+  ; the drawing modes (cf. docs).     | modes de dessin (cf. docs).
+  FX_feedback = yes	; (default 'yes')
+
+  ; When you reduce the palette or    | Si vous réduisez la palette ou "zappez"
+  ; "zap" some colors out of it, it is| quelques couleurs, il est possible
+  ; possible that there are not enough| qu'il ne reste pas assez de couleurs
+  ; colors left to draw the menus.    | pour afficher les menus. Mettre cette
+  ; Switching the following variable  | variable à 'yes' ramènera automatiquent
+  ; on will bring back the colors of  | les couleurs du menu s'il reste moins
+  ; the menu if there are less than 4 | de 4 couleurs après une "réduction" ou
+  ; colors left after "reducing" or   | un "zapping".
+  ; "zapping".                        |
+  Safety_colors = yes	; (default 'yes')
+
+  ; Display a message at startup      | Afficher un message au démarrage
+  ; telling the version number of the | indiquant le numéro de version du
+  ; program.                          | programme.
+  Opening_message = yes	; (default 'yes')
+
+  ; Take the Stencil into account when| Prendre le Stencil en compte lorsqu'on
+  ; clearing the image.               | efface l'image.
+  Clear_with_stencil = yes	; (default 'yes')
+
+  ; Directly set the discontinuous    | Passer automatiquement en mode de
+  ; freehand drawing mode after brush | dessin discontinu après la prise d'une
+  ; grabbing.                         | brosse.
+  Auto_discontinuous = no	; (default 'no')
+
+  ; Save the screen dimensions in GIF | Sauver les dimensions de l'écran dans
+  ; files. If you want to read these  | les fichiers GIF. Si vous voulez lire
+  ; files with Photoshop or Alchemy,  | ces fichiers avec Photoshop ou Alchemy,
+  ; and maybe some other programs, you| et peut-être d'autres programmes, vous
+  ; must set this option to 'no'.     | devez mettre cette option à 'no'.
+  Save_screen_size_in_GIF = no	; (default 'no')
+
+  ; Automaticaly count the number of  | Compter automatiquement le nombre de
+  ; different colors used when opening| couleurs différentes utilisées lors de
+  ; the palette editor window. (Set it| d'ouverture de la fenêtre d'édition de
+  ; to 'no' if you have a slow PC or  | la palette. (Mettez-le à 'no' si vous
+  ; if you edit huge pictures)        | avez un PC lent ou bien si vous éditez
+  ;                                   | d'énormes images).
+  Auto_nb_colors_used = yes     ; (default 'yes')
+
+  ; Default video mode at startup     | Mode vidéo par défaut au
+  ; (see the list by running the      | démarrage (voir la liste en lançant
+  ; program with argument "/?".       | le programme avec l'option "/?".
+  Default_video_mode = window	; (default 'window')
+
+  ; Window dimensions. The program    | Dimensions de la fenêtre en mode 
+  ; remembers the last window size.   | fenêtré.
+  Default_window_size = 640,480 ; (default '640,480')
+
+  ; This setting allows you merge successive mouse movements into a single
+  ; mouse movement. You should only use it if you are using a mouse which
+  ; reports at 200Hz or more, and you experience lag when using discontinuous
+  ; hand-drawing with large brushes (this tool tries to paste the brush and
+  ; update the screen on each new mouse position) In this case, set this to 2
+  ; or more, to ignore some intermediate mouse reports when a more recent one
+  ; is present.
+  ; Note that with a value superior to 1, you lose precision with continuous
+  ; hand-drawing, as intermediate mouse positions are skipped.
+  Merge_movement = 0 ; (default 0)
+
+  ; Number of columns in the palette of the menu bar. Can be any number from
+  ; 1 to 256. If there is not enough room, the program will display less
+  ; columns. But your preference will be kept, and as soon as there is more
+  ; space in the screen, more columns will be shown.
+  ; 
+  Palette_Cells_X = 16; (Default 16)
+  
+  ; Number of lines in the palette of the menu. Can be any number from
+  ; 1 to 16. The menu can always display the number of lines you request.
+  ; 
+  Palette_Cells_Y = 4; (Default 4)
+
+  ; Bookmarked directories. Leave the directory blank for unused ones.
+  ;
+  Bookmark_label = 
+  Bookmark_directory = 
+
+  Bookmark_label = 
+  Bookmark_directory = 
+
+  Bookmark_label =
+  Bookmark_directory = 
+
+  Bookmark_label = 
+  Bookmark_directory = 
+
+  ; In the classic layout, the palette in the menu has colors from left to
+  ; right. If you prefer the colors ordered top to bottom, set this option
+  ; to YES.
+  ; 
+  Palette_vertical = YES; (Default YES)
+
+  ; The program remembers the last window position, if the
+  ; OS isn't able to do it by itself. (ie: Windows)
+  Window_position = 9999,9999; (Default 9999,9999 which means: NA)
+
+  ; This is the time (in milliseconds) between two clicks for Grafx2 to
+  ; recognize a double-click. Double-click is used mostly in the palette
+  ; area of the menu: double-click a color to open the palette.
+  Double_click_speed = 500; (Default 500)
+
+  ; When you press two digit keys in rapid succession (ex: 3 8), Grafx2
+  ; sets transparency to 38% (instead of 30% then 80%). This setting
+  ; allows you to set the maximum delay between two keypresses for
+  ; GrafX2 to recognize them as a combo.
+  Double_key_speed = 500; (Default 500)
+
+  ; Name of the skinfile you want to  | Nom du fichier skin que vous voulez
+  ; use.                              | utiliser.
+  ; Default : (empty to let the program choose)
+  Skin_file = 
+
+  ; Name of the font file (8x8) you   | Nom du fichier police de caractère
+  ; want to use.                      | 8x8 utilisée dans les menus.
+  ; Default : (empty to let the program choose)
+  Font_file = 
+
+  ; This determines the color value for the grid. Each pixel of 
+  ; the grid will be displayed by XOR-ing the original color with
+  ; the value of this setting.
+  ; For example, if you always paint 16-color images, you can set it
+  ; to 16 so the color of the grid are 16 for 0, 17 for 1, etc.
+  ; Then you can set colors 16-31 as lighter/darker variants
+  ; of your original palette, resulting in a pretty grid !
+  ;
+  ; Valid values are 1 to 255. 
+  Grid_XOR_color = 255; (Default 255)
+
+  ; This records the last pixel ratio used, to restore it on start.
+  ; Valid values are from 0 to 7 for: Simple, Wide, Tall, Double,
+  ; Triple, Wide2, Tall2, Quadruple.
+  ;
+  Pixel_ratio = 0; (Default 0)
+
+  ; This records the visibility of toolbars, to restore them on start.
+  ; It's a bitfield, where 1=Status, 2=Layers/Animation, 4=Tools
+  ;
+  Menubars_visible = 255; (Default 255)
+  
+  ; This enables a mode where right mouse buttons acts as
+  ; a color picker, with most tools.
+  ; 
+  Right_click_colorpick = NO; (Default NO)
+
+  ; When this mode is active, scrolling the view (and the magnifier view)
+  ; affects both the main image and the spare page - as long as they have
+  ; the same dimensions.
+  ;
+  Sync_views = YES; (Default YES)
+    
+  ; This setting determines which key inverts the mouse buttons
+  ; when it's held : A left click is then interpreted as a right-click.
+  ; It's especially useful for one-button controllers,
+  ; such as touchscreens and tablets.
+  ; Possible values are 0 (none), 1 (control), 2 (alt)
+  ;
+  Swap_buttons = 1; (Default 1)
+  
+  ; Last directory browsed with the script selector.
+  ; Leave blank to initially start in (data directory)/scripts
+  ;
+  Scripts_directory = 
+  
+  ; When this setting is disabled, and you create a shortcut with a key that
+  ; is already associated to another shortcut, Grafx2 will unset the latter.
+  ; If you enable this mode, Grafx2 will not make such check, so you can design
+  ; shortcuts that trigger several actions at once.
+  ;
+  Allow_multi_shortcuts = no; (Default no)
+  
+  ; Determines if the Tilemap tool should identify tiles that are mirrored
+  ; version of other tiles, on the X axis.
+  ;
+  Tilemap_detect_mirrored_x = no; (Default no)
+
+  ; Determines if the Tilemap tool should identify tiles that are mirrored
+  ; version of other tiles, on the Y axis.
+  ;
+  Tilemap_detect_mirrored_y = no; (Default no)
+  
+  ; Determines if the Tilemap tool should identify tiles that are reversed
+  ; versions of other tiles (180°).
+  ;
+  Tilemap_detect_mirrored_xy = no; (Default no)
+
+  ; Determines if the Tilemap tool should show the number of distinct tiles
+  ; at the end of analysis.
+  ;
+  Tilemap_count = no; (Default no)
+
+  ; Enables the virtual keyboard when the user enters a textbox.
+  ;
+  ; 0=Auto (guess), 1=ON, 2=OFF
+  Use_virtual_keyboard = 0; (Default 0)
+  
+  ; Indicates if new images should by default use layers. The alternative
+  ; is animation frames.
+  ;
+  Default_mode_layers = no; (Default no) 
+  
+  ; end of configuration
--- a/data/common/media/grafx2/grafx2
+++ b/data/common/media/grafx2/grafx2
--- a/data/common/media/grafx2/scripts/_tst_AAFilter.lua
+++ b/data/common/media/grafx2/scripts/_tst_AAFilter.lua
@ -0,0 +1,30 @@
+-- Apply a kind of AA filter on picture
+
+-- Get the picture size
+w, h = getpicturesize();
+
+-- Here is the filtering matrix
+ matrix = {
+	 {  0, -1,  0 },
+	 { -1,  5, -1 },
+	 {  0, -1,  0 }};
+
+-- Loop trough all the pixels
+-- To make this script simpler we don't handle the picture borders
+-- (the matrix would get pixels outside the picture space)
+-- for var = start_value, end_value, step do ...
+for y = 1, h - 2, 1 do
+	for x = 1, w - 2, 1 do
+		filtered =
+			matrix[1][1] * getbackuppixel(x - 1, y - 1) +
+			matrix[1][2] * getbackuppixel(x    , y - 1) +
+			matrix[1][3] * getbackuppixel(x + 1, y - 1) +
+			matrix[2][1] * getbackuppixel(x - 1, y    ) +
+			matrix[2][2] * getbackuppixel(x    , y    ) +
+			matrix[2][3] * getbackuppixel(x + 1, y    ) +
+			matrix[3][1] * getbackuppixel(x - 1, y + 1) +
+			matrix[3][2] * getbackuppixel(x    , y + 1) +
+			matrix[3][3] * getbackuppixel(x + 1, y + 1);
+		putpicturepixel(x,y,filtered);
+	end
+end
--- a/data/common/media/grafx2/scripts/_tst_GradientBrush.lua
+++ b/data/common/media/grafx2/scripts/_tst_GradientBrush.lua
@ -0,0 +1,7 @@
+w, h = getbrushsize()
+
+for x = 0, w - 1, 1 do
+	for y = 0, h - 1, 1 do
+		putbrushpixel(x, y, (x+y)%256);
+	end
+end
--- a/data/common/media/grafx2/scripts/_tst_Settings.lua
+++ b/data/common/media/grafx2/scripts/_tst_Settings.lua
@ -0,0 +1,33 @@
+-- Test LUA inputbox
+--  this script tests the inputbox
+
+w, h = getbrushsize()
+--[[
+messagebox(
+  "Forecolor: " .. getforecolor() .. "\n" ..
+  "Backcolor: " .. getbackcolor() .. "\n" ..
+  "Transparent color: " .. gettranscolor() .. "\n" ..
+  "Brush dimensions: " .. w .. "x" .. h
+)
+]]
+
+
+ok, w, h = inputbox("Modify brush",
+  "RGB",    1, 0, 1,  -1,
+  "HSV",    0, 0, 1,  -1,
+  "HSL",    0, 0, 1,  -1,
+  "Width",  w, -900.0,900.0, 3,
+  "Height", h, -900.0,900.0, 4,
+  "X Flip", 0, 0, 1,  0,
+  "Y Flip", 0, 0, 1,  0,
+  "Degrees",1, 0, 1,  -2,
+  "Radians",0, 0, 1,  -2  
+);
+if ok == true then
+  messagebox(
+    "w: " .. w .. "\n" ..
+    "h: " .. h .. "\n"
+  )
+end
+
+
--- a/data/common/media/grafx2/scripts/_tst_dialog.lua
+++ b/data/common/media/grafx2/scripts/_tst_dialog.lua
@ -0,0 +1,66 @@
+local counter=0;
+local printcounter = function ()
+  windowprint(10,54, string.format("% .3d", counter));
+end;
+
+windowopen(100,150, "Dialogtest");
+windowbutton(6, 18, 54, 14, "Close", 27); -- 1, shortcut=ESC
+windowrepeatbutton(6, 38, 14, 14, "+");   -- 2
+windowrepeatbutton(26, 38, 14, 14, "-");  -- 3
+windowbutton(6, 70, 54, 14, "Help");      -- 4
+windowinput(6, 88, 10);
+printcounter();
+
+repeat
+ local button, button2, key = windowdodialog();
+
+  if button == 2 then -- "+"
+    counter=counter+1;
+    printcounter();
+  end
+  if button == 3 then -- "-"
+    counter=counter-1;
+    printcounter();
+  end
+  if button == 4 then -- "Help"
+    messagebox("Help screen");
+  end
+until key == 27 or button == 1;
+windowclose();
+
+
+-- messagebox(tostring(button) .. " " .. tostring(button2));
+
+
+---- Open_window(149,118,"Grid");
+-- Display_cursor();
+-- Hide_cursor();
+---- Close_window();
+---- Update_window_area(0,0,Window_width, Window_height);
+---- clicked_button=Window_clicked_button();
+-- 
+-- -- standard button
+---- Window_set_normal_button(12,92,51,14,"Cancel",0,1,KEY_ESC);  -- 1
+-- -- repeatable button (while held)
+---- Window_set_repeatable_button(202,43,13,11,"-",0,1,SDLK_LAST); -- 8
+-- -- text input
+-- Window_set_input_button(29,24,3); -- 3
+-- Window_input_content(input_x_button,str);
+-- Readline(31,26,str,3,INPUT_TYPE_INTEGER);
+-- 
+-- -- dropdown
+-- Window_set_dropdown_button(216, 158, 84,14,84,"Preset...", 0,0,1,RIGHT_SIDE|LEFT_SIDE,1);
+-- Window_dropdown_clear_items(Button);
+-- Window_dropdown_add_item(Button,0,"Set");
+-- 
+-- -- vertical scroller
+-- mix_scroller = Window_set_scroller_button(31,20,84,256,1,Main_backups->Pages->Gradients->Range[Current_gradient].Mix);
+-- Window_draw_slider(mix_scroller);
+-- 
+-- -- display
+---- Print_in_window(11,26, "X:",MC_Dark,MC_Light);
+---- Print_in_window_limited(Button->Pos_X+3+10,Button->Pos_Y+2,Config.Bookmark_label[bookmark_number],8,MC_Black,MC_Light);
+-- Window_display_frame_in( 6, 21,110, 52);
+-- Window_display_frame(6,17,130,37);
+-- Window_rectangle(panel->Pos_X, panel->Pos_Y, panel->Width, panel->Height+1, MC_Light);
+
--- a/data/common/media/grafx2/scripts/_tst_dialog2.lua
+++ b/data/common/media/grafx2/scripts/_tst_dialog2.lua
@ -0,0 +1,33 @@
+--
+-- test of GUI library
+--
+run("libs/gui.lua")
+
+local counter = gui.label{x=10, y=54, value=0, format="% .3d"}
+local form = gui.dialog{
+    title="Dialogtest",
+    w=100,
+    h=150,
+    counter,
+    gui.button{ label="+",
+      x=6, y=38, w=14, h=14, repeatable=true, click=function() 
+      counter.value=counter.value+1;
+      counter:render();
+    end},
+    gui.button{ label="-",
+      x=26, y=38, w=14, h=14, repeatable=true, click=function()
+      counter.value=counter.value-1;
+      counter:render();
+    end},
+    gui.button{ label="Help",
+      x=6, y=70, w=54, h=14, click=function()
+      messagebox("Help screen");
+    end},
+    gui.button{ label="Close",
+      x=6, y=18, w=54, h=14, key=27, click=function()
+      return true; -- causes closing
+    end},
+}
+
+form:run()
+
--- a/data/common/media/grafx2/scripts/libs/gui.lua
+++ b/data/common/media/grafx2/scripts/libs/gui.lua
@ -0,0 +1,111 @@
+--
+-- Event-driven GUI library
+--
+--
+
+gui = {
+
+--
+-- dialog() --
+--
+dialog = function(args)
+  local dia = {
+    title = args.title,
+    w = args.w,
+    h = args.h,
+    -- 
+    widgets = {},
+    -- an indexed array, starting at 1. Used for calling the relevant
+    -- callback when a numbered control is clicked.  
+    callbacks = {},
+    
+    --
+    -- dialog.run() --
+    --
+    run = function(this)
+      windowopen(this.w,this.h, this.title or "");
+      -- examine all elements
+      for _,widget in ipairs(this.widgets) do
+        widget:render()
+      end
+      
+      repeat
+       local button, button2, key = windowdodialog();
+      
+        if button > 0 then
+          local c = this.callbacks[button]
+          -- run the callback and stop the form if it returns true
+          if c ~= nil and c(this) then
+              break;
+          end
+        end
+      until key == 27;
+      windowclose();
+    end
+  }
+  local id = 1;
+  -- examine all elements
+  for _,value in ipairs(args) do
+    -- all arguments that are tables are assumed to be widgets
+    if type(value)=="table" then
+      table.insert(dia.widgets, value)
+      -- clickable widgets take up an auto-numbered id
+      if (value.click) then
+        dia.callbacks[id] = value.click
+        id=id+1
+      end
+    end
+  end
+  return dia;
+end,
+
+--
+-- button() --
+--
+button = function(args)
+  local but = {
+    x = args.x,
+    y = args.y,
+    w = args.w,
+    h = args.h,
+    key = args.key,
+    label = args.label,
+    click = args.click or donothing,
+    render = args.repeatable and function(this)
+      windowrepeatbutton(this.x, this.y, this.w, this.h, this.label, this.key or -1);
+    end
+    or function(this)
+      windowbutton(this.x, this.y, this.w, this.h, this.label, this.key or -1);
+    end
+  }
+  return but;
+end,
+
+--
+-- label() --
+--
+label = function(args)
+  local fld = {
+    x = args.x,
+    y = args.y,
+    value = args.value,
+    format = args.format,
+    fg = args.fg or 0,
+    bg = args.bg or 2,
+    render = function(this)
+      if type(this.format) then
+        windowprint(this.x, this.y, string.format(this.format, this.value), this.fg, this.bg);
+      else
+        windowprint(this.x, this.y, this.value, this.fg, this.bg);
+      end
+    end
+  }
+  return fld;
+end,
+
+
+-- "do nothing" function. Used as default callback
+donothing = function(this)
+end
+
+}
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/ApplyColor.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/ApplyColor.lua
@ -0,0 +1,129 @@
+--BRUSH Remap: Apply PenColor
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+run("../libs/dawnbringer_lib.lua")
+
+OK,tin,clz,fade,amt,brikeep,falloff,nobg,nopen,briweight   = inputbox("Apply PenColor 2 Brush",
+                        
+                           "1. Tint",               1,  0,1,-1,
+                           "2. Colorize",           0,  0,1,-1,
+                           "BG->FG color Fade", 0,  0,1,0, 
+                           "AMOUNT % (0-100)", 100,  0,100,0,  
+                           "Preserve Brightness", 1,  0,1,0,
+                           "Bri/Dark FallOff", 1,  0,1,0,
+                           "Exclude Background",     1,0,1,0,
+                           "Exclude PenColor",       0,0,1,0,
+                           "ColMatch Bri-Weight %", 25,  0,100,0                                                     
+);
+
+
+if OK == true then
+
+ function cap(v) return math.min(255,math.max(v,0)); end
+
+ w, h = getbrushsize()
+
+
+ fg = getforecolor()
+ bg = getbackcolor()
+ fR,fG,fB = getcolor(fg)
+ bR,bG,bB = getcolor(bg)
+
+ pal = db.fixPalette(db.makePalList(256))
+ if nobg == 1 then
+  pal = db.stripIndexFromPalList(pal,bg) -- Remove background color from pallist
+ end
+ if nopen == 1 then
+  pal = db.stripIndexFromPalList(pal,fg) -- Remove  Pencolor from pallist
+ end
+
+
+ amtA = amt / 100
+ amtR = 1 - amtA
+
+  -- Normalize Pen Color
+  lev = (fR+fG+fB)/3
+  fR = fR - lev
+  fG = fG - lev
+  fB = fB - lev
+
+ ---------------------------------------------------
+ -- Colorize (Colourant) (just apply colorbalance)
+ -- Tint (make grayscale and apply colorbalance)
+ --
+ -- I think it should be the other way around since colorize is the process of adding color to B&W film...
+ -- But this is the what Brilliance and others call it 
+ --
+ if clz == 1 or tin == 1 then
+  cols = {}
+  for n = 0, 255, 1 do
+
+  r,g,b = getcolor(n)
+  a = db.getBrightness(r,g,b)
+
+    
+  mR,mG,mB = fR,fG,fB
+
+  -- Fade between bg & fg pencolor across dark-bright
+  if fade == 1 then
+    lf = a / 255
+    lr = 1 - lf
+    mR = bR*lr + fR*lf
+    mG = bG*lr + fG*lf
+    mB = bB*lr + fB*lf
+    lev = (mR+mG+mB)/3
+    mR = mR - lev
+    mG = mG - lev
+    mB = mB - lev
+  end   
+
+  fr,fg,fb = mR,mG,mB
+  
+
+     if brikeep == 1 then
+       -- Loose Brightness preservation (ex: applying full red to dark colors)
+       brin = db.getBrightness(cap(r+mR),cap(g+mG),cap(b+mB))
+       itot = brin - a
+       fr = mR - itot 
+       fg = mG - itot
+       fb = mB - itot
+     end 
+
+     -- Falloff (Effect weakens at dark and bright colors)
+     if falloff == 1 then
+      fo =  1 - math.abs((a - 127.5)/127.5)^2
+      fr = fr * fo
+      fg = fg * fo
+      fb = fb * fo
+     end
+
+     if tin == 1 then
+      --cols[n+1] = matchcolor((a+fr)*amtA + r*amtR, (a+fg)*amtA + g*amtR, (a+fb)*amtA + b*amtR)
+      cols[n+1] = db.getBestPalMatchHYBRID({(a+fr)*amtA+r*amtR, (a+fg)*amtA + g*amtR, (a+fb)*amtA + b*amtR},pal,briweight / 100,true)
+     end
+     if clz == 1 then
+      --cols[n+1] = matchcolor((r+fr)*amtA + r*amtR, (g+fg)*amtA + g*amtR, (b+fb)*amtA + b*amtR)
+      cols[n+1] = db.getBestPalMatchHYBRID({(r+fr)*amtA+r*amtR, (g+fg)*amtA + g*amtR, (b+fb)*amtA + b*amtR},pal,briweight / 100,true)
+     end
+  end
+
+  if nobg == 1 then cols[getbackcolor()+1] = getbackcolor(); end
+
+  for x = 0, w - 1, 1 do
+   for y = 0, h - 1, 1 do
+    putbrushpixel(x, y, cols[getbrushpixel(x,y) + 1]);
+  end
+ end
+end; 
+-- eof Colorize & Tint
+--------------------------------------------------------
+
+end -- OK
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/Fisheye.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/Fisheye.lua
@ -0,0 +1,31 @@
+--BRUSH Distortion: FishEye
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+--http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+w, h = getbrushsize()
+
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+         ox = x / w;
+         oy = y / h;
+         v = (math.cos((ox-0.5)*math.pi)*math.cos((oy-0.5)*math.pi))*0.85;
+         ox = (1 + ox - (ox-0.5)*v) % 1; 
+         oy = (1 + oy - (oy-0.5)*v) % 1;
+     
+         c = getbrushbackuppixel(math.floor(ox*w),math.floor(oy*h));
+         putbrushpixel(x, y, c);
+  end
+end
+
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua
@ -0,0 +1,24 @@
+--BRUSH Remap: Grayscale (average)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+w, h = getbrushsize()
+
+for x = 0, w - 1, 1 do
+ for y = 0, h - 1, 1 do
+   
+   r, g, b = getcolor(getbrushpixel(x,y))
+
+   a = (r+g+b)/3
+
+   putbrushpixel(x, y, matchcolor(a,a,a));
+
+ end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua
@ -0,0 +1,36 @@
+--BRUSH Remap: Grayscale (desaturate)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+--http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+percent = 100
+
+--
+function desaturate(percent,r,g,b) -- V1.0 by Richard Fhager
+ p = percent / 100
+ a = (math.min(math.max(r,g,b),255) + math.max(math.min(r,g,b),0)) * 0.5 * p
+ r = r + (a-r*p)
+ g = g + (a-g*p)
+ b = b + (a-b*p)
+ return r,g,b
+end
+--
+
+
+w, h = getbrushsize()
+
+for x = 0, w - 1, 1 do
+ for y = 0, h - 1, 1 do
+   putbrushpixel(x, y, matchcolor(desaturate(percent,getcolor(getbrushpixel(x,y)))));
+ end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua
@ -0,0 +1,34 @@
+--BRUSH: Halfsize with smoothscaling
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+w, h = getbrushsize()
+
+setbrushsize(math.floor(w/2),math.floor(h/2))
+
+for x = 0, w - 1, 2 do
+ for y = 0, h - 1, 2 do
+   r1,g1,b1 = getcolor(getbrushbackuppixel(x,y));
+   r2,g2,b2 = getcolor(getbrushbackuppixel(x+1,y));
+   r3,g3,b3 = getcolor(getbrushbackuppixel(x,y+1));
+   r4,g4,b4 = getcolor(getbrushbackuppixel(x+1,y+1));
+ 
+   r = (r1 + r2 + r3 + r4 ) / 4;
+   g = (g1 + g2 + g3 + g4 ) / 4;
+   b = (b1 + b2 + b3 + b4 ) / 4;
+      
+   c = matchcolor(r,g,b);
+
+   putbrushpixel(x/2, y/2, c);
+
+ end
+end
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/brush/Waves.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/brush/Waves.lua
@ -0,0 +1,42 @@
+--BRUSH Distortion: Waves v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+--frq = 2
+--amp = 0.3
+
+-- Adjust power of frequency & amplitude
+frq_adj = 2
+amp_adj = 0.02
+
+ok,frq,amp = inputbox("Settings",
+                      "Frequency 1-10", 3, 1,10,0,
+                      "Amplitude 1-10", 3, 1,10,0
+);
+
+w, h = getbrushsize()
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+    ox = x / w;
+    oy = y / h;
+    ox = (1 + ox + math.sin(oy*math.pi*frq*frq_adj)*amp*amp_adj) % 1;
+   
+    c = getbrushbackuppixel(math.floor(ox*w),y);
+    putbrushpixel(x, y, c);
+
+  end
+end
+
--- a/data/common/media/grafx2/scripts/samples_2.4/codenetsend.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/codenetsend.lua
@ -0,0 +1,17 @@
+-- Codenet send for grafx2 2.4 and up, by Michael Ilsaas.
+-- Sends the latest saved picture. Set the IP address of the C64 in the line below.
+ip = "192.168.0.64"; -- <-- IP address of the C64.
+fn, fp = getfilename();
+picfile = assert(io.open(fp .. '/' .. fn ,"r"));
+picsize = picfile:seek("end") 
+picfile:close();
+if picsize ==  9000 or picsize == 9002 then -- check for hires
+	os.execute("echo AQgLCAoAnjIwNjIAAAAArQDdKfwJAo0A3ak4jRjQqQiNFtCpO40R0KkAjSDQogC9DA6dAGC9DA+dAGG9DBCdAGK9DBGdAGO9DBKdAGS9DBOdAGW9DBSdAGa9DBWdAGe9DBadAGi9DBedAGm9DBidAGq9DBmdAGu9DBqdAGy9DBudAG29DBydAG69DB2dAG/o4ADQm6IAvQwenQBwvQwfnQBxvQwgnQByvQwhnQBzvQwinQB0vQwjnQB1vQwknQB2vQwlnQB3vQwmnQB4vQwnnQB5vQwonQB6vQwpnQB7vQwqnQB8vQwrnQB9vQwsnQB+vQwtnQB/6OAA0JuiAL1MLZ0ATL1MLp0ATb1ML50ATr1MMJ0AT+jgANDjvUUJnQDAvUUKnQDBvUULnQDCvUUMnQDDvUUNnQDEvUUOnQDF6OAA0NdMAMCpwI00A6mojTUDqQCNNgOpQI03A60B3gkBjQHeor+gxCBbwxAJqQagwqkITLnESKkYoMJoqQ14IP7DEPtYIOH/0ANMucR4IP7DMPGtRAPJCNDqrUUD8ArJBtDhIA/DTDzArUYDyUXQ1K1MAym/DU0D0MqtTwPJEfA2yQHwCKkCIKzCTDzArVoDyQjQIKkAjVoDGK1cA2kIjVwDkAruXQPQBe5cA/D2IDjCIJnCTDzArVwDyRnQB61dA8k+8AipAyCswkw8wK1iA8nK0OCtYwPJH9DZrWUDSKkBjWUDqQCNSAONXgONYAOF+oX7qSCNSQOpGI1fA6kRjWEDrVoDrlwDjloDjVwDrVsDrl0DjlsDjV0DGKISpft9UwOF+6X6fVIDhfrKyhDukAjm+9AE5vrw+KX6Sf+NYAOl+0n/jWEDTl8DIDjCIJnCrWYDhf2tZwOF/K5oA6xpA2jJBPAPyQXwPskG8GvJB/B6TDzAziDQpQFIKfgJA4UBrmkDoAC5agOR/MjK0PdohQHuINAYmGX8ha6FLaX9aQCFr4UuTDzAqTOFAZhIivASrWoDoACR/MiR/MjQ+Ob9ytDzaKrwC61qA6AAkfzIytD6qTeFAUw8wKX80ALG/cb8pf1IpfxIqQhMucSiCL35wZ1AA8oQ96kDSKk/SKkITLnEIFmmIDOlTK6nQkNERk5PIFJSLU5FVCBGT1VORC4NAFJSLU5FVCBGT1VORC4gQ1M4OTAwQSBSRVZJU0lPTiAAogO9UgOdVgO9NAOdUgPKEPGpgI1OA6kAjVADjVEDhfqF+xiiEqX7fUcDhful+n1GA4X6ysoQ7pAI5vvQBOb68Pil+kn/jVADpftJ/41RA6IFvT4DnTgDvb/EnT4DyhDxYBitSQNpDqqtSANpANAEikxpxGBIohy9RgOdXgPKEPeiB6kAnVoDytD6hfqF+41IA6k0jUkDqQGNTwOpA41aA2iNWwMYoh6l+31bA4X7pfp9WgOF+srKEO6QCOb70ATm+vD4pfpJ/41cA6X7Sf+NXQMgOMJMmcKiB71Tw91GA9A5yhD1ogO9NAPdXgPQLMoQ9akCjU0Dogm9TgOdWAO9v8SdTgPKEPGiA700A51UA8oQ9yCHwqk8TGnEYAABCAAGBAABhvyE/SC5wxABYEip/4X6oACYSBhprCDtw4ol+oX6mCX6hfpoqMjAA9DnpfrJ/9AaoACx/KrImEix/KhoSEoJrCDcw2ioyMAG0OipgqIFoA8g3MOpiaLToAAg3MNoYKkAIO3D4A7QF8Bj0BOpASDtw4rQC8ALsAeYOOkHkAFgqf9gCo0C3qkAKo0D3o4E3owF3mAKjQLeqQAqjQPergTerAXeYKmSIO3DmCl/0AOp/2CtCd6tCN6sCd6uCN6Y0CngyLAlikoIqvAToACtCN6ZOAPIrQnemTgDyMrQ7yiQBq0I3pk4A6kAYIpImPAOogCtCN6tCd7o0PeI0PRoqvAMrQjeyvAGrQneytD0qf9gosmODN6iAI4N3o0O3o4P3kipkiDtw5gpf/ASrQnerQjerAnergjeIEPETHrEqZwg7cOYKQHw2mhKaQCqoAC5OAONCN7IuTgDjQneyMrQ72CpAI0g0GAAgBCxMhg= | base64 -d > /tmp/picview.prg");
+else 
+	os.execute("echo AQgLCAoAnjIwNjIAAAAArQDdKfwJAo0A3ak4jRjQqRiNFtCpO40R0K0/NY0h0KkAjSDQogC9Lw6dAGC9Lw+dAGG9LxCdAGK9LxGdAGO9LxKdAGS9LxOdAGW9LxSdAGa9LxWdAGe9LxadAGi9LxedAGm9LxidAGq9LxmdAGu9LxqdAGy9LxudAG29LxydAG69Lx2dAG/o4ADQm6IAvS8enQBwvS8fnQBxvS8gnQByvS8hnQBzvS8inQB0vS8jnQB1vS8knQB2vS8lnQB3vS8mnQB4vS8nnQB5vS8onQB6vS8pnQB7vS8qnQB8vS8rnQB9vS8snQB+vS8tnQB/6OAA0JuiAL1vLZ0ATL1vLp0ATb1vL50ATr1vMJ0AT+jgANDjvVcxnQDYvVcynQDZvVcznQDavVc0nQDb6OAA0OO9aAmdAMC9aAqdAMG9aAudAMK9aAydAMO9aA2dAMS9aA6dAMXo4ADQ10wAwKnAjTQDqaiNNQOpAI02A6lAjTcDrQHeCQGNAd6iv6DEIFvDEAmpBqDCqQhMucRIqRigwmipDXgg/sMQ+1gg4f/QA0y5xHgg/sMw8a1EA8kI0OqtRQPwCskG0OEgD8NMPMCtRgPJRdDUrUwDKb8NTQPQyq1PA8kR8DbJAfAIqQIgrMJMPMCtWgPJCNAgqQCNWgMYrVwDaQiNXAOQCu5dA9AF7lwD8PYgOMIgmcJMPMCtXAPJGdAHrV0DyT7wCKkDIKzCTDzArWIDycrQ4K1jA8kf0NmtZQNIqQGNZQOpAI1IA41eA41gA4X6hfupII1JA6kYjV8DqRGNYQOtWgOuXAOOWgONXAOtWwOuXQOOWwONXQMYohKl+31TA4X7pfp9UgOF+srKEO6QCOb70ATm+vD4pfpJ/41gA6X7Sf+NYQNOXwMgOMIgmcKtZgOF/a1nA4X8rmgDrGkDaMkE8A/JBfA+yQbwa8kH8HpMPMDOINClAUgp+AkDhQGuaQOgALlqA5H8yMrQ92iFAe4g0BiYZfyFroUtpf1pAIWvhS5MPMCpM4UBmEiK8BKtagOgAJH8yJH8yND45v3K0PNoqvALrWoDoACR/MjK0PqpN4UBTDzApfzQAsb9xvyl/Uil/EipCEy5xKIIvfnBnUADyhD3qQNIqT9IqQhMucQgWaYgM6VMrqdCQ0RGTk8gUlItTkVUIEZPVU5ELg0AUlItTkVUIEZPVU5ELiBDUzg5MDBBIFJFVklTSU9OIACiA71SA51WA700A51SA8oQ8amAjU4DqQCNUAONUQOF+oX7GKISpft9RwOF+6X6fUYDhfrKyhDukAjm+9AE5vrw+KX6Sf+NUAOl+0n/jVEDogW9PgOdOAO9v8SdPgPKEPFgGK1JA2kOqq1IA2kA0ASKTGnEYEiiHL1GA51eA8oQ96IHqQCdWgPK0PqF+oX7jUgDqTSNSQOpAY1PA6kDjVoDaI1bAxiiHqX7fVsDhful+n1aA4X6ysoQ7pAI5vvQBOb68Pil+kn/jVwDpftJ/41dAyA4wkyZwqIHvVPD3UYD0DnKEPWiA700A91eA9AsyhD1qQKNTQOiCb1OA51YA72/xJ1OA8oQ8aIDvTQDnVQDyhD3IIfCqTxMacRgAAEIAAYEAAGG/IT9ILnDEAFgSKn/hfqgAJhIGGmsIO3DiiX6hfqYJfqF+mioyMAD0Oel+sn/0BqgALH8qsiYSLH8qGhISgmsINzDaKjIwAbQ6KmCogWgDyDcw6mJotOgACDcw2hgqQAg7cPgDtAXwGPQE6kBIO3DitALwAuwB5g46QeQAWCp/2AKjQLeqQAqjQPejgTejAXeYAqNAt6pACqNA96uBN6sBd5gqZIg7cOYKX/QA6n/YK0J3q0I3qwJ3q4I3pjQKeDIsCWKSgiq8BOgAK0I3pk4A8itCd6ZOAPIytDvKJAGrQjemTgDqQBgikiY8A6iAK0I3q0J3ujQ94jQ9Giq8AytCN7K8AatCd7K0PSp/2CiyY4M3qIAjg3ejQ7ejg/eSKmSIO3DmCl/8BKtCd6tCN6sCd6uCN4gQ8RMesSpnCDtw5gpAfDaaEppAKqgALk4A40I3si5OAONCd7IytDvYKkAjSDQYACAELEyGA== | base64 -d > /tmp/picview.prg");
+end
+if picsize ==  9000 or picsize == 10001 then -- check for loadaddress, add two bytes if not found
+	os.execute('echo a >> /tmp/picview.prg');
+end
+os.execute('cat '.. fp .. '/' .. fn .. ' >> /tmp/picview.prg'); -- append pic to c64 binary
+os.execute("codenet -x /tmp/picview.prg -n "..ip); -- send file to c64
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/3DPalette.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/3DPalette.lua
@ -0,0 +1,460 @@
+--3D-Palette viewer V0.72 (HSL-models added, 3D-World added, Pen-color only cycles thru unique colors, InputBox)
+--by Richard 'Dawnbringer' Fhager
+
+-- Mouse:	Rotate Cube (Stops animation)
+-- Arrow-keys:	Move Cube (in 3D world)
+-- F1:		Start/Stop animation 
+-- F2:		Reset
+-- F3:		Increase Color-Size
+-- F4:		Decrease Color-Size
+-- F5:		(Wip) Cycle thru selected PenColor (Note that only unique colors are displayed)
+-- F9:		RGB-space model
+--F10:		HSL-space model
+--F11:		HSLcubic-space model
+-- "+" (Num):	Zoom In
+-- "-" (Num):   Zoom Out
+-- Esc:		Exit script
+
+-- Drawing updated, rectangle missing, Sep11
+
+run("../libs/dawnbringer_lib.lua")
+
+
+BRIDIAG_SHOW = 1     -- Show brightness/Grayscale diagonal (1 = on, 0 = off)
+ANIM         = 1     -- Animation (1 = on, 0 = off)
+BOX_DRK      = 8     -- Darkest   color used for box (0-255)
+BOX_BRI      = 112   -- Brightest color used for box (0-255)
+COLSIZE_BASE = 26    -- Colors base size (value to adjusted by palette-size, with 2 cols maxsize is v / 1.23)
+
+--
+OK,RGB,HSL,HSLC,BOX_BRI,COLSIZE_BASE,SET800x600 = inputbox("3D-Palette Viewer Settings",
+                        
+                           "1. RGB space [F9]",       1,  0,1,-1,
+                           "2. HSL space [F10]",      0,  0,1,-1,
+                           "3. HSL-cubic space [F11]",0,  0,1,-1,
+                           "Box Brightness (16-255)", BOX_BRI,   16,255,0,  
+                           "Col Size (1-100) [F3/F4]", COLSIZE_BASE,   1,100,0,                     
+                           "Set Screen to 800x600",      1,0,1,0
+                                                                        
+);
+--
+
+if OK then
+
+ if SET800x600 == 1 then setpicturesize(800,600); end
+
+ SPACE = "rgb"
+ FORM  = "cube"
+ if HSL == 1 then
+  SPACE = "hsl"
+  FORM  = "cylinder"
+ end
+ if HSLC == 1 then
+  SPACE = "hsl_cubic"
+  FORM  = "cube"
+ end
+
+
+pal = db.fixPalette(db.makePalList(256))
+
+FG = getforecolor() 
+BG = getbackcolor()
+
+palcol = FG
+
+--
+function initColors(space)
+  for n = 1, #pal, 1 do 
+   c = pal[n]; 
+   if space == "rgb" then
+   cols[n] = {c[1]/128-1,c[2]/128-1,c[3]/128-1,c[4]};
+  end
+  if space == "hsl_cubic" then
+   cols[n] = {}
+   cols[n][1] = (db.getHUE(c[1],c[2],c[3],0) / 6.0 * 255) / 128 - 1
+   cols[n][2] = (db.getSaturation(c[1],c[2],c[3])) / 128 - 1
+   cols[n][3] = (db.getLightness(c[1],c[2],c[3])) / 128 - 1
+   cols[n][4] = c[4]
+  end
+  if space == "hsl" then
+   cols[n] = {}
+   hue = db.getHUE(c[1],c[2],c[3],0) / 6.0 * math.pi*2
+   rad = db.getSaturation(c[1],c[2],c[3]) / 256
+   cols[n][1] = math.cos(hue) * rad
+   cols[n][2] = math.sin(hue) * rad
+   cols[n][3] = (db.getLightness(c[1],c[2],c[3])) / 128 - 1
+   cols[n][4] = c[4]
+  end
+ end
+end
+--
+
+cols = {} -- Make points of palette colors
+colz = {} -- To hold calculated points
+initColors(SPACE)
+
+
+function initPointsAndLines(form,bridiag)
+ if form == "cube" then 
+  pts = {{-1,1,-1},{1,1,-1},{1,-1,-1},{-1,-1,-1}, -- The box
+        {-1,1, 1},{1,1, 1},{1,-1, 1},{-1,-1, 1}}
+  lin = {{1,2},{2,3},{3,4},{4,1},{5,6},{6,7},{7,8},{8,5},{1,5},{2,6},{3,7},{4,8}} -- Box Lines
+  if bridiag == 1 then lin[13] = {4,6}; end
+ end
+ if form == "cylinder" then
+  p = 28
+  pts = {}
+  lin = {}
+  for n = 1, p, 1 do
+   x = math.cos(math.pi*2 / p * (n-1))
+   y = math.sin(math.pi*2 / p * (n-1))
+   pts[n] = {x,y,-1}
+   lin[n] = {n,1 + (n%p)}
+   pts[n + p] = {x,y,1}
+   lin[n + p] = {n+p,p + 1 + (n%p)}
+  end
+  lin[p*2+1] = {1,p+1} -- Red (0 degrees)
+  lin[p*2+2] = {p+1,p+1+math.ceil(p/2)} -- Lightness end (needs an even # of points to work)
+ end
+end
+
+boxp = {} -- To hold the calculated points
+initPointsAndLines(FORM,BRIDIAG_SHOW)
+
+w,h = getpicturesize()
+CX,CY = w/2, h/2
+
+
+
+function initAndReset()
+ XANG, YANG, ZANG, ZOOM, COLSIZE_ADJ, XD, YD, WORLD_X, WORLD_Y, ZSELECT = 0,0,0,0,0,0,0,0,0,0
+end
+
+initAndReset()
+
+SIZE = math.min(w,h)/4
+DIST = 5 -- Distance perspective modifier, ~5 is nominal, more means "less 3D" 
+
+CMAXSIZE = math.floor(COLSIZE_BASE / ((#pal)^0.3))
+--CMAXSIZE = 8
+CMINSIZE = 1 -- Negative values are ok. Color are never smaller than 1 pix
+
+BOX_LINE_DIV = 20 -- Number of colors/segments that a box-line can be divided into (depth)
+BOX_DIV_MULT = BOX_LINE_DIV / (math.sqrt(3)*2)
+
+-- Box depth colors
+box_div = {}
+for n = 0, BOX_LINE_DIV-1, 1 do
+ c = BOX_DRK + (BOX_BRI / (BOX_LINE_DIV - 1)) * n 
+ --box_div[BOX_LINE_DIV - n] = matchcolor(c,c,c)
+ box_div[BOX_LINE_DIV - n] = db.getBestPalMatchHYBRID({c,c,c},pal,0.5,true)
+end
+
+--BOX_COL = matchcolor(80,80,80)
+BKG_COL = matchcolor(0,0,0)
+--CUR_COL = matchcolor(112,112,112)
+
+
+ function rotate3D(x,y,z,Xsin,Ysin,Zsin,Xcos,Ycos,Zcos) -- PrecCalced cos&sin for speed
+
+   local x1,x2,x3,y1,y2,y3,f,xp,yp
+
+    x1 = x
+    y1 = y * Xcos + z * Xsin
+    z1 = z * Xcos - y * Xsin
+
+    x2 = x1 * Ycos - z1 * Ysin
+    y2 = y1
+    z2 = x1 * Ysin + z1 * Ycos
+
+    x3 = x2 * Zcos - y2 * Zsin
+    y3 = x2 * Zsin + y2 * Zcos
+    z3 = z2
+
+    return x3,y3,z3
+  end
+
+ function do3D(x,y,z,zoom,dist,Xsin,Ysin,Zsin,Xcos,Ycos,Zcos) -- PrecCalced cos&sin for speed
+
+   local x1,x2,x3,y1,y2,y3,f,xp,yp
+
+    x1 = x
+    y1 = y * Xcos + z * Xsin
+    z1 = z * Xcos - y * Xsin
+
+    x2 = x1 * Ycos - z1 * Ysin
+    y2 = y1
+    z2 = x1 * Ysin + z1 * Ycos
+
+    x3 = x2 * Zcos - y2 * Zsin
+    y3 = x2 * Zsin + y2 * Zcos
+    z3 = z2
+
+    f = dist/(z3 + dist + zoom) 
+    xp = x3 * f
+    yp = y3 * f
+
+    return xp,yp,z3
+  end
+
+
+function draw3Dline(x1,y1,z1,x2,y2,z2,div,mult,depthlist)
+   local s,xt,yt,xd,yd,zd,xf,yf
+   xd = (x2 - x1) / div
+   yd = (y2 - y1) / div
+   zd = (z2 - z1) / div
+   xf,yf = x1,y1
+
+  for s = 1, div, 1 do
+    -- Depth assumes a 1-Box (z ranges from -sq(3) to sq(3))
+    depth = math.floor(1 + (z1+zd*s + 1.732) * mult) 
+    xt = x1 + xd*s -- + math.random()*8
+    yt = y1 + yd*s -- + math.random()*8
+    c = depthlist[depth]
+    if c == null then c = 1; end -- Something isn't perfect, error is super rare but this controls it
+    --db.line(xf,yf,xt,yt,c)
+    drawline(xf,yf,xt,yt,c)
+    xf = xt
+    yf = yt
+  end
+end
+
+function killinertia()
+ XD = 0
+ YD = 0
+end
+
+ -- If using 1-box, z is -sq(3) to sq(3)
+ minz = math.sqrt(3)
+ totz = minz * 2
+ maxrad = CMAXSIZE - CMINSIZE
+
+--q = 0
+--delay = 4
+--move = 0.03
+
+while 1 < 2 do
+
+ -- Time-for-space-wiggle...or somekindof attempt
+ --WORLD_X = -move
+ --q = (q + 1) % delay
+ --if q < delay/2 then WORLD_X = move; end
+
+ clearpicture(BKG_COL)
+
+ Xsin = math.sin(XANG); Xcos = math.cos(XANG)
+ Ysin = math.sin(YANG); Ycos = math.cos(YANG)
+ Zsin = math.sin(ZANG); Zcos = math.cos(ZANG) 
+
+ -- Rotate Box points
+ for n = 1, #pts, 1 do
+  p = pts[n]
+  x,y,z = p[1],p[2],p[3]
+  XP,YP,zp = rotate3D(x,y,z,Xsin,Ysin,Zsin,Xcos,Ycos,Zcos)
+  boxp[n] = {XP,YP,zp}
+ end
+
+ -- Rotate Colors in palette
+ for n = 1, #cols, 1 do
+  p = cols[n]
+  x,y,z,c = p[1],p[2],p[3],p[4]
+  XP,YP,zp = rotate3D(x,y,z,Xsin,Ysin,Zsin,Xcos,Ycos,Zcos)
+  colz[n] = {XP,YP,zp,c} 
+ end
+
+ ------------------------------------
+ -- Control world
+ ------------------------------------
+
+  -- Calculate points anew
+
+ -- Worldize Box points
+ for n = 1, #boxp, 1 do
+  s = SIZE
+  v = boxp[n]
+  x = v[1] + WORLD_X
+  y = v[2] + WORLD_Y
+  z = v[3]
+  f = DIST/(z + DIST + ZOOM)
+  XP = CX + x * f * s 
+  YP = CY + y * f * s
+  boxp[n] = {XP,YP,z}
+ end
+
+ -- Worldize Colors in palette
+ for n = 1, #colz, 1 do
+  s = SIZE
+  v = colz[n]
+  x = v[1] + WORLD_X
+  y = v[2] + WORLD_Y
+  z = v[3]
+  c = v[4]
+  f = DIST/(z + DIST + ZOOM)
+  XP = CX + x * f * s 
+  YP = CY + y * f * s
+  colz[n] = {XP,YP,z,c} 
+ end
+
+
+-------------------------------------
+-------------------------------------
+
+ -- Brightness Diagonal
+ --if BRIDIAG_SHOW == 1 then
+ -- p1 = boxp[4]
+ -- p2 = boxp[6]
+ -- x1,y1,z1 = p1[1],p1[2],p1[3]
+ -- x2,y2,z2 = p2[1],p2[2],p2[3]
+ -- draw3Dline(x1,y1,z1,x2,y2,z2,BOX_LINE_DIV,BOX_DIV_MULT,box_div)
+ --end
+
+  --c1 = math.min(FG,BG)
+  --c2 = math.max(FG,BG)
+  --p = colz[26]
+  --XP1,YP1,zp1,c1 = p[1],p[2],p[3],p[4]
+  --for n = #colz, 1, -1 do
+  -- p = colz[27]
+  -- XP2,YP2,zp2,c2 = p[1],p[2],p[3],p[4]
+  -- drawline(XP1,YP1,XP2,YP2,c1)
+  --end
+
+ -- sort on z
+ db.sorti(colz,3) 
+
+ -- Draw colors
+ for n = #colz, 1, -1 do
+  p = colz[n]
+  XP,YP,zp,c = p[1],p[2],p[3],p[4]
+
+  radius = CMINSIZE + maxrad - (zp+minz) / totz * maxrad
+  dorad = math.floor(radius - ZOOM*2 +  COLSIZE_ADJ) 
+
+  if dorad >= 1 then
+   --db.drawCircle(XP,YP,dorad,c) 
+   drawdisk(XP,YP,dorad,c) 
+   --db.drawRectangle(XP,YP,dorad,dorad,c)
+   else putpicturepixel(XP,YP,c)
+  end
+
+  if c == FG or c == BG then
+   sz = math.max(3,dorad + 3)
+   if c == BKG_COL then v = (c+128) % 255; c = matchcolor(v,v,v); end
+   db.drawRectangleLine(XP-sz,YP-sz,sz*2,sz*2,c)
+  end
+
+ end -- colz
+
+
+
+ -- Draw box
+ for n = 1, #lin, 1 do
+  
+  l = lin[n]
+  p1 = boxp[l[1]]
+  p2 = boxp[l[2]]
+  x1,y1,z1 = p1[1],p1[2],p1[3]
+  x2,y2,z2 = p2[1],p2[2],p2[3]
+  draw3Dline(x1,y1,z1,x2,y2,z2,BOX_LINE_DIV,BOX_DIV_MULT,box_div)
+
+ end -- eof box
+
+ --updatescreen(); if (waitbreak(0.00)==1) then return; end
+
+ repeat
+
+    old_key = key;
+    old_mouse_x = mouse_x;
+    old_mouse_y = mouse_y;
+    old_mouse_b = mouse_b;
+    
+    updatescreen()
+  
+    moved, key, mouse_x, mouse_y, mouse_b = waitinput(0)
+    
+    if mouse_b == 1 then ANIM = 0; end
+
+    if (key==27) then
+       return;
+    end
+
+    if (key==282) then  ANIM = (ANIM+1) % 2;  end -- F1: Stop/Start Animation
+    if (key==283) then  initAndReset();       end -- F2: Reset all values
+    if (key==284) then  COLSIZE_ADJ = COLSIZE_ADJ + 0.5;       end -- F3
+    if (key==285) then  COLSIZE_ADJ = COLSIZE_ADJ - 0.5;       end -- F4
+
+   --messagebox(key)
+
+    if (key==286) then  
+      --FG = (FG + 1) % 255; 
+      palcol = (palcol + 1) % #pal 
+      FG = pal[palcol+1][4]
+      setforecolor(FG);
+      setcolor(0,getcolor(0))  -- Force update of palette until setforecolor() is fixed
+     end -- F5
+
+    if (key==290) then -- F9
+     initColors("rgb")
+     initPointsAndLines("cube",BRIDIAG_SHOW)
+    end
+    if (key==291) then -- F10
+     initColors("hsl")
+     initPointsAndLines("cylinder", 0) -- Bridiag won't show even if turned on, it's only for cube
+    end
+    if (key==292) then -- F11
+     initColors("hsl_cubic")
+     initPointsAndLines("cube",BRIDIAG_SHOW)
+    end
+
+    if (key==269) then  ZOOM = ZOOM + 0.1;  end
+    if (key==270) then  ZOOM = ZOOM - 0.1;  end
+
+    if (key==32) then  
+       ZSELECT = (ZSELECT + math.pi/2) % (2*math.pi);  
+       --YANG = ((YANG - math.pi/2) % (math.pi*2));
+       --XANG = ((XANG + math.pi/2) % (math.pi*2));
+    
+
+      YANG = ((YANG + math.pi/2) % (math.pi*2));
+      XANG = ((XANG + math.pi/2) % (math.pi*2));
+      YANG = ((YANG - math.pi/2) % (math.pi*2));
+    end -- Rotate Z 90 Degrees
+
+    SPEED = math.pi / 100
+ 
+
+    if (key==273) then WORLD_Y = WORLD_Y - 0.05; killinertia();  end
+    if (key==274) then WORLD_Y = WORLD_Y + 0.05; killinertia();  end
+
+    if (key==276) then WORLD_X = WORLD_X - 0.05; killinertia();  end
+    if (key==275) then WORLD_X = WORLD_X + 0.05; killinertia();  end
+   
+  until ((mouse_b == 1 and (old_mouse_x~=mouse_x or old_mouse_y~=mouse_y)) or key~=0 or ANIM==1 or math.abs(XD)>0.01 or math.abs(YD)>0.01);
+
+ if ANIM == 0 then
+  if (mouse_b==1 and (old_mouse_x~=mouse_x or old_mouse_y~=mouse_y)) then -- Inertia
+   XD = (mouse_y - old_mouse_y)*0.005
+   YD = (mouse_x - old_mouse_x)*0.005
+    else
+     XD = XD*0.92
+     YD = YD*0.92
+  end
+  XANG = ((XANG - XD) % (math.pi*2));
+  YANG = ((YANG + YD) % (math.pi*2));
+  ZANG = ZSELECT
+ end 
+
+ if ANIM == 1 then
+    XANG = (XANG + math.pi/300) % (math.pi*2)
+    YANG = (YANG + math.pi/500) % (math.pi*2)
+    ZANG = (ZANG + math.pi/1000) % (math.pi*2)
+ end
+
+ --XANG = ((CY-mouse_y) / 200  % (math.pi*2));
+  --YANG = ((mouse_x - CX) / 200  % (math.pi*2));
+  --ZANG = 0
+
+ statusmessage("x"..math.floor(XANG*57.3).."° y"..math.floor(YANG*57.3).."° z"..math.floor(ZANG*57.3).."° Zm: "..math.floor(-ZOOM*10).."   ")
+
+end
+
+end -- OK
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/Ellipse.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/Ellipse.lua
@ -0,0 +1,68 @@
+--PICTURE scene: Ellipse update-demo (anim)
+--Demonstrates 'interactive' features.
+--by Richard Fhager
+
+-- Copyright 2011 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+--
+-- rot: Rotation in degrees
+-- stp: Step is # of line segments (more is "better")
+-- a & b are axis-radius
+function ellipse2(x,y,a,b,stp,rot,col)
+ local n,m=math,rad,al,sa,ca,sb,cb,ox,oy,x1,y1,ast
+ m = math; rad = m.pi/180; ast = rad * 360/stp;
+ sb = m.sin(-rot * rad); cb = m.cos(-rot * rad)
+ for n = 0, stp, 1 do
+  ox = x1; oy = y1;
+  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 drawline(ox,oy,x1,y1,col); end
+ end
+end
+--
+
+setpicturesize(300,300)
+setcolor(0,96,96,96)
+setcolor(1,255,255,128)
+
+r1 = 100
+r2 = 50
+rt = 0
+
+frames = 100
+
+
+while (1 < 2) do
+
+ r1t = 10 + math.random() * 140
+ r2t = 10 + math.random() * 140
+ rtt = math.random() * 360
+
+for n = 0, frames-1, 1 do
+ clearpicture(0)
+
+ f2 = n / frames
+ f1 = 1 - f2
+
+ r1a = r1*f1 + r1t*f2
+ r2a = r2*f1 + r2t*f2
+ rta = rt*f1 + rtt*f2
+
+ --       x,   y,   r1,  r2,  stp, rot, col
+ ellipse2(150, 150, r1a, r2a, 50,  rta, 1)
+
+  statusmessage('press ESC to stop')
+  updatescreen();if (waitbreak(0)==1) then return end
+
+end
+
+ r1,r2,rt = r1a,r2a,rta
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/FlipPicture.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/FlipPicture.lua
@ -0,0 +1,17 @@
+-- flip picture - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize();
+ok,flipx,flipy=inputbox("flip picture","flip x",1,0,1,-1,"flip y",0,0,1,-1);
+if ok==true then
+  if flipx==1 then
+    for y=0,h-1,1 do 
+      for x=0,w/2,1 do 
+        c1=getpicturepixel(x,y);c2=getpicturepixel(w-x-1,y) 
+        putpicturepixel(x,y,c2);putpicturepixel(w-x-1,y,c1) 
+        end;end 
+  else
+    for y=0,h/2,1 do 
+      for x=0,w-1,1 do 
+        c1=getpicturepixel(x,y);c2=getpicturepixel(x,h-y-1) 
+        putpicturepixel(x,y,c2);putpicturepixel(x,h-y-1,c1) 
+        end;end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua
@ -0,0 +1,59 @@
+--PICTURE: Pattern - Sierpinsky carpet v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+--
+
+frac = {{1,1,1},{1,0,1},{1,1,1}}
+
+iter = 6
+
+
+--
+function pattern(x,y,p,n,i) -- Fractal Pattern V1.0 by Richard Fhager (mod allows for wrapping)
+ py = #p
+ px = #p[1]
+ while ((p[1+math.abs(math.floor(y*py))%py][1+math.abs(math.floor(x*px))%px]) == 1 and n<i) do
+  x=x*px-math.floor(x*px); 
+  y=y*py-math.floor(y*py);
+  n = n+1
+ end
+ return 1 - n/i;
+end
+--
+
+w, h = getpicturesize()
+
+rp,gp,bp = getcolor(getforecolor())
+
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+    ox = x / w;
+    oy = y / h;
+
+    f = pattern(ox,oy,frac,0,iter);
+
+    c = matchcolor(rp*f,gp*f,bp*f)
+
+    putpicturepixel(x, y, c);
+  end
+  updatescreen()
+  if (waitbreak(0)==1) then
+    return
+  end
+
+end
+
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua
@ -0,0 +1,57 @@
+--PICTURE: Pattern - Sierpinsky triangle v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+--
+
+frac = {{1,1},{1,0}}
+
+iter = 15
+
+--
+function pattern(x,y,p,n,i) -- Fractal Pattern V1.0 by Richard Fhager (mod allows for wrapping)
+ py = #p
+ px = #p[1]
+ while ((p[1+math.abs(math.floor(y*py))%py][1+math.abs(math.floor(x*px))%px]) == 1 and n<i) do
+  x=x*px-math.floor(x*px); 
+  y=y*py-math.floor(y*py);
+  n = n+1
+ end
+ return 1 - n/i;
+end
+--
+
+w, h = getpicturesize()
+
+rp,gp,bp = getcolor(getforecolor())
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+    ox = x / w;
+    oy = y / h;
+
+    f = pattern(ox,oy,frac,0,iter);
+
+    c = matchcolor(rp*f,gp*f,bp*f)
+
+    putpicturepixel(x, y, c);
+
+  end
+  updatescreen()
+  if (waitbreak(0)==1) then
+    return
+  end
+end
+
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/Spritesheet.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/Spritesheet.lua
@ -0,0 +1,46 @@
+--ANIM: Sprite Animator v0.15
+--Spare page holds data - Plays on current
+--by Richard Fhager
+
+run("../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",
+ "Sprite X-size",   arg.XS,    1, 256,0,
+ "Sprite Y-size",   arg.YS,    1, 256,0,
+ "Spacing",         arg.SPACE, 0,  32,0,
+ "# of Frames",     arg.FRAMES,2, 100,0,
+  "X-offset",        arg.XOFF,  0, 800,0,
+  "Y-offset",        arg.YOFF,  0, 800,0,
+ "Play Speed (FPS)",arg.FPS,   1,  60,0
+);
+
+
+if OK == true then
+
+memory.save({XS=XS,YS=YS,SPACE=SPACE,FRAMES=FRAMES,XOFF=XOFF,YOFF=YOFF,FPS=FPS})
+
+ MAXPLAYS = 100
+
+ w,h = getpicturesize()
+ OX = w / 2 - XS/2
+ OY = h / 2 - YS/2
+
+ for play = 1, MAXPLAYS, 1 do
+
+ for f = 0, FRAMES-1, 1 do
+  for y = 0, YS-1, 1 do
+   for x = 0, XS-1, 1 do
+    sx = x + XOFF + f * (XS + SPACE)
+    sy = y + YOFF
+    putpicturepixel(OX+x, OY+y, getsparepicturepixel(sx, sy))
+   end
+  end
+  updatescreen(); if (waitbreak(1/FPS)==1) then return; end
+ end
+
+ end -- plays
+
+end --OK
+
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua
@ -0,0 +1,57 @@
+--BRUSH Scene: Amigaball 1.0
+--
+--Draws the famous 'Amiga ball' in the brush.
+--
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+--http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+
+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
+
+   -- Fractionalize image dimensions
+   ox = x / w;
+   oy = y / h;
+
+   -- Ball
+   Xr = ox-0.5; Yr = oy-0.5; 
+   W = (1 - 2*math.sqrt(Xr*Xr + Yr*Yr)); 
+
+   -- 'FishEye' distortion / Fake 3D
+   F = (math.cos((ox-0.5)*math.pi)*math.cos((oy-0.5)*math.pi))*0.65;
+   ox = ox - (ox-0.5)*F; 
+   oy = oy - (oy-0.5)*F; 
+
+   -- Checkers
+   V = ((math.floor(0.25+ox*10)+math.floor(1+oy*10)) % 2) * 255 * W;
+
+   -- Specularities
+   SPEC1 = math.max(0,(1-5*math.sqrt((ox-0.45)*(ox-0.45)+(oy-0.45)*(oy-0.45)))*112);
+   SPEC2 = math.max(0,(1-15*math.sqrt((ox-0.49)*(ox-0.49)+(oy-0.48)*(oy-0.48)))*255);
+
+   r = W * 255 + SPEC1 + SPEC2
+   g = V + SPEC1 + SPEC2
+   b = V + SPEC1 + SPEC2
+
+   putbrushpixel(x, y, matchcolor(r,g,b));
+
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua
@ -0,0 +1,38 @@
+--BRUSH Scene: Sphere of pencolor v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+--http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+w, h = getbrushsize()
+
+rp,gp,bp = getcolor(getforecolor())
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+   -- Fractionalize image dimensions
+   ox = x / w;
+   oy = y / h;
+
+   -- Sphere
+   X = 0.5; Y = 0.5; Rd = 0.5 
+   a = math.sqrt(math.max(0,Rd*Rd - ((X-ox)*(X-ox)+(Y-oy)*(Y-oy)))) * 1/Rd
+  
+   r = rp * a
+   g = gp * a
+   b = bp * a
+
+   putbrushpixel(x, y, matchcolor(r,g,b));
+
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua
@ -0,0 +1,100 @@
+--BRUSH: Find AA-colors from pencolors
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+cellw = 8
+cellh = 4
+colors = 256
+
+setbrushsize(cellw * 3, cellh * 3)
+
+
+--
+function makePalList(cols)
+ pal = {}
+ for n = 0, cols-1, 1 do
+   r,g,b = getcolor(n)
+   pal[n+1] = {r,g,b}
+ end
+ return pal
+end
+--
+
+--
+function getBestPalMatchHYBRID(rgb,pal,briweight)
+ local diff,diffC,diffB,best,bestcol,cols,n,c,r,g,b,p,obri,pbri
+ cols = #pal
+ bestcol = 0
+ best = 9e99
+
+ r = rgb[1]
+ g = rgb[2] 
+ b = rgb[3]
+
+ obri = math.pow(r*9,2)+math.pow(g*16,2)+math.pow(b*8,2)
+
+ for n=0, cols-1, 1 do
+  p = pal[n+1]
+  pbri = math.pow(p[1]*9,2)+math.pow(p[2]*16,2)+math.pow(p[3]*8,2)
+  diffB = math.abs(obri - pbri)
+
+
+  diffC = (math.pow(r-p[1],2)+math.pow(g-p[2],2)+math.pow(b-p[3],2)) * 400
+  --diff  = diffB + diffC
+  diff = briweight * (diffB - diffC) + diffC
+  if diff <= best then bestcol = n; best = diff; end
+ end 
+
+ return bestcol
+end
+--
+
+--
+function drawRectangle(x1,y1,w,h,c)
+   for y = y1, y1+h, 1 do
+    for x = x1, x1+w, 1 do
+       putbrushpixel(x,y,c);
+    end
+   end
+end
+--
+
+
+
+palList = makePalList(colors)
+
+cf = getforecolor()
+cb = getbackcolor()
+rf,gf,bf = getcolor(cf)
+rb,gb,bb = getcolor(cb)
+
+ra = (rf + rb) / 2
+ga = (gf + gb) / 2
+ba = (bf + bb) / 2
+
+rgb1 = {ra,ga,ba}
+c1 = getBestPalMatchHYBRID(rgb1,palList,0.0)
+c2 = getBestPalMatchHYBRID(rgb1,palList,0.75)
+c3 = getBestPalMatchHYBRID(rgb1,palList,0.99)
+
+q = {{cf,c1,cb},
+     {cf,c2,cb},
+     {cf,c3,cb}}
+
+
+for y = 0, #q-1, 1 do
+ for x = 0, #q[1]-1, 1 do
+ 
+  drawRectangle(x*cellw,y*cellh,cellw,cellh,q[y+1][x+1])
+
+ end
+end
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua
@ -0,0 +1,64 @@
+--BRUSH Scene: Mandelbrot fractal v0.5
+--
+--Draws a Mandelbrot fractal in the current brush.
+--
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+--http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+colors = 64
+
+x0   = -1.7
+x1   =  0.7
+ym   =  0
+iter =  64
+
+
+ok, x0, x1, ym, iter = inputbox("Fractal data",
+  "X0",   x0,   -2, 2,4,
+  "X1",   x1,   -2, 2,4,
+  "midY", ym,   -2, 2,4,
+  "Iter", iter, 1, 2048,0
+);
+
+-- -0.831116819,-0.831116815,0.2292112435,192
+
+
+function mandel(x,y,l,r,o,i) -- pos. as fraction of 1, left coord, right coord, y coord, iterations 
+
+  local w,s,a,p,q,n,v,w
+
+  s=math.abs(r-l);
+
+  a = l + s*x;
+  p = a;
+  b = o - s*(y-0.5);
+  q = b;
+  n = 1;
+  v = 0;
+  w = 0; 
+
+  while (v+w<4 and n<i) do n=n+1; v=p*p; w=q*q; q=2*p*q+b; p=v-w+a; end;
+
+  return n
+end
+
+
+w, h = getbrushsize()
+
+for x = 0, w - 1, 1 do
+  for y = 0, h - 1, 1 do
+    q = mandel(x/w,y/h,x0,x1,ym,iter) % colors;
+    putbrushpixel(x, y, q);
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua
--- a/data/common/media/grafx2/scripts/samples_2.4/libs/memory.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/libs/memory.lua
@ -0,0 +1,138 @@
+-- Persistence library:
+--   Memorize data for current function
+--   memory.save(tab) and tab=memory.load()
+--
+--   The data will be stored in file called
+--     <calling_function_name>.dat
+--   in the lua directory 
+-- 
+-- Example 1:
+--
+--  -- Load initial values or set defaults
+--  arg = memory.load({picX=320,picY=200,scale=0})
+--  -- Run an inputbox
+--  OK,arg.picX,arg.picY,arg.scale = inputbox("Image Size")",
+--    "Width",    arg.picX,  1,2048,0,
+--    "Height",   arg.picY,  1,2048,0,
+--    "Scale",    arg.scale, 0,1,0);
+--  if OK == true then
+--    -- Save the selected values
+--    memory.save(arg)
+--  end
+
+-- Example 2:
+--
+--  -- Load initial values or set defaults
+--  arg = memory.load({x=320,y=200,scale=0})
+--  picX=arg.x
+--  picY=arg.y
+--  scale=arg.scale
+--  -- Run an inputbox
+--  OK,picX,picY,scale = inputbox("Image Size")",
+--    "Width",    picX,  1,2048,0,
+--    "Height",   picY,  1,2048,0,
+--    "Scale",    scale, 0,1,0);
+--  if OK == true then
+--    -- Save the selected values
+--    memory.save({x=picX,y=picY,scale=scale})
+--  end
+
+  
+memory =
+{
+  serialize = function(o)
+    if type(o) == "number" then
+      return tostring(o)
+    elseif type(o) == "string" then
+      return string.format("%q", o)
+    --elseif type(o) == "table" then
+    --  io.write("{\n")
+    --  for k,v in pairs(o) do
+    --    io.write("  ", k, " = ")
+    --    memory.serialize(v)
+    --    io.write(",\n")
+    --  end
+    --  io.write("}\n")
+    else
+      error("cannot serialize a " .. type(o))
+    end
+  end;
+  
+  -- Return a string identifying the calling function.
+  -- Pass 1 for parent, 2 for grandparent etc.
+  callername = function(level)
+    local w
+    local last_slash
+    local info = debug.getinfo(level+1,"Sn")
+    local caller=tostring(info.name)
+    -- Function name if possible
+    if (caller~="nil") then
+      return caller
+    end
+    -- Otherwise, get file name, without extension
+   
+    -- Get part after directory name
+    last_slash=0
+    while true do
+      local pos = string.find(info.source, "/", last_slash+1)
+      if (pos==nil) then break end
+      last_slash=pos
+    end
+    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)
+    end
+    return caller
+  end;
+  
+  -- Memorize some parameters.
+  save = function(o)
+    local caller=memory.callername(2)
+    --for k, v in pairs(o) do
+    --    messagebox(tostring(k))
+    --    messagebox(tostring(v))
+    --end
+    local f, e = io.open(caller..".dat", "w");
+    if (f ~= nil) then
+      f:write("Entry {\n")
+      for k, v in pairs(o) do
+        if (type(v)=="number") then
+          f:write("  "..k.."="..memory["serialize"](v)..",\n")
+        end
+      end
+      f:write("}\n")
+      f:close()
+    end  
+  end;
+  
+  
+  -- Recover some saved parameters.
+  load = function(o)
+    local caller=memory.callername(2)
+    local i
+
+    function Entry (b)
+      -- Adds (or replaces) values in arg with those from b
+      for k, v in pairs(b) do
+        o[k]=v
+      end
+    end
+    local f = (loadfile(caller..".dat"))
+    if (f ~= nil) then
+      f()
+    end
+
+    return o
+  end;
+
+}
+
+return memory
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/Desaturate.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/Desaturate.lua
@ -0,0 +1,40 @@
+--PALETTE Adjust: Desaturate v1.1
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+-- Note: Negative values will work as INCREASED saturation, but I'm not sure if this function is 100% correct
+
+
+--percent = 25
+
+OK,percent = inputbox("Desaturate Palette","Percent %", 25, 0,100,0);
+
+--
+function desaturate(percent,r,g,b) -- V1.0 by Richard Fhager
+ p = percent / 100
+ a = (math.min(math.max(r,g,b),255) + math.max(math.min(r,g,b),0)) * 0.5 * p
+ r = r + (a-r*p)
+ g = g + (a-g*p)
+ b = b + (a-b*p)
+ return r,g,b
+end
+--
+
+if OK == true then
+
+  for c = 0, 255, 1 do
+    setcolor(c, desaturate(percent,getcolor(c)))
+  end
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/ExpandColors.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/ExpandColors.lua
@ -0,0 +1,171 @@
+--PALETTE: Expand Colors v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+-- Continously fill the greatest void in the area of the color-cube enclosed by (or along ramps of) initial colors
+-- This algorithm will create lines of allowed colors (all ranges) in 3d colorspace and the pick
+-- new colors from the most void areas (on any line). Almost like a Median-cut in reverse.
+--
+-- Rather than filling the colorcube symmetrically it adds intermediate colors to the existing ones.
+--
+-- Running this script on the C64 16-color palette might be educational
+--
+--
+--   Source cols#, Expand to #, 
+--   Ex: 15-31 means that palette colors 0-15 is expanded to 16 new colors placed at slots 16-31
+--
+--    Spread mode: OFF - New colors will conform to the contrast & saturation of original colors 
+--                       (new colors will stay on the ramps possible from the original colors)
+--
+--                 ON - New colors will expand their variance by each new addition (mostly notable when adding many new colors)
+--                      Will add range lines/ramps to all new colors from old ones, but keep within max/min values of the
+--                      original colors. 15-bit mode will dampen the spread towards extreme colors (if starting with low contrast)
+--
+--  15-bit colors: Higher color-resolution, 32768 possible colors rather than the 4096 of 12bit. Slower but perhaps better. 
+--
+
+SHADES = 16 -- Going 24bit will probably be too slow and steal too much memory, so start with 12bit (4096 colors) for now
+
+ini = 0
+exp = 255
+
+OK,ini,exp,linemode,fbit = inputbox("Expand Colors (0-255):",
+                           "Source Cols #: 1-254",    15,  1,254,0,
+                           "Expand to #: 2-255",       31,  2,255,0,
+                           "Spread mode",       0,  0,1,0,
+                           "15-bit colors (slow)", 0,  0,1,0   
+);
+
+if (fbit == 1) then SHADES = 32; end
+
+
+
+function initColorCube(sha)
+  ary = {}
+  for z = 0, sha-1, 1 do
+   ary[z+1] = {}
+   for y = 0, sha-1, 1 do
+    ary[z+1][y+1] = {}
+      for x = 0, sha-1, 1 do
+        ary[z+1][y+1][x+1] = {false,0}
+      end
+   end
+  end
+  return ary
+end
+
+-- Gravity model (think of colors as stars of equal mass/brightness in a 3d space)
+function addColor2Cube(cube,sha,r,g,b) 
+  star = 1000000
+  fade = 1000
+
+  cube[r+1][g+1][b+1] = {false,star}
+
+  for z = 0, sha-1, 1 do
+   for y = 0, sha-1, 1 do
+    for x = 0, sha-1, 1 do
+
+      d = fade / ( (x-b)^2 + (y-g)^2 + (z-r)^2 )
+
+      cube[z+1][y+1][x+1][2] = cube[z+1][y+1][x+1][2] + d
+
+  end;end;end
+end
+
+
+-- Create new allowed colorlines in colorspace (ramps from which colors can be picked)
+function enableRangeColorsInCube(cube,sha,r1,g1,b1,r2,g2,b2) 
+
+    local div,r,g,b
+    div = 256 / sha
+    rs = (r2 - r1) / sha / div 
+    gs = (g2 - g1) / sha / div
+    bs = (b2 - b1) / sha / div
+
+    for n = 0, sha-1, 1 do
+
+     r = math.floor(r1/div + rs * n)
+     g = math.floor(g1/div + gs * n)
+     b = math.floor(b1/div + bs * n)
+
+     cube[r+1][g+1][b+1][1] = true
+
+    end
+end
+
+
+function findVoid(cube,sha)
+  weakest = 999999999999
+   weak_i = {-1,-1,-1}
+  for z = 0, sha-1, 1 do
+   for y = 0, sha-1, 1 do
+    for x = 0, sha-1, 1 do
+ 
+      c = cube[z+1][y+1][x+1]
+      if c[1] == true then
+        w = c[2]
+        if w <= weakest then weakest = w; weak_i = {z,y,x}; end
+      end 
+    
+  end;end;end
+  return weak_i[1],weak_i[2],weak_i[3]
+end
+
+--
+
+if OK == true then
+
+  cube = initColorCube(SHADES)
+
+  -- Define allowed colorspace
+  for y = 0, ini-1, 1 do
+    r1,g1,b1 = getcolor(y)
+    for x = y+1, ini, 1 do
+      r2,g2,b2 = getcolor(x)
+      enableRangeColorsInCube(cube,SHADES,r1,g1,b1,r2,g2,b2)
+    end
+  end
+
+  div = 256 / SHADES
+
+  -- Fill cube with initial colors
+  for n = 0, ini, 1 do
+    r,g,b = getcolor(n)
+    addColor2Cube(cube,SHADES,math.floor(r/div),math.floor(g/div),math.floor(b/div))
+  end
+
+
+  for n = ini+1, exp, 1 do
+    r,g,b = findVoid(cube,SHADES)
+
+    if (r == -1) then messagebox("Report:","No more colors can be found, exit at "..n); break; end
+
+    mult = 255 / (SHADES - 1)
+    setcolor(n, r*mult,g*mult,b*mult)  
+
+    if linemode == 1 then
+       -- Add lines from new color to all old  
+       for x = 0, n-1, 1 do
+          r2,g2,b2 = getcolor(x)
+          enableRangeColorsInCube(cube,SHADES,r*mult,g*mult,b*mult,r2,g2,b2) -- uses 24bit values rgb
+       end
+    end
+    
+    addColor2Cube(cube,SHADES,r,g,b) -- rgb is in 'shade' format here 
+   
+  end
+
+end
+
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/FillColorCube.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/FillColorCube.lua
@ -0,0 +1,105 @@
+--PALETTE: Fill ColorCube voids v1.0
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+--
+-- Create a palette by continously filling the greatest void in the RGB color-cube
+--
+
+
+SHADES = 16 -- Going 24bit will probably be too slow and steal too much memory, so we're 12bit (4096 colors) for now
+
+ini = 0
+exp = 255
+
+OK,ini,exp = inputbox("Fill Palette Color voids",
+                       "From/Keep #: 0-254",    0,  0,254,0,
+                       "Replace to #: 1-255",  31,  1,255,0
+);
+
+
+function initColorCube(sha)
+  ary = {}
+  for z = 0, sha-1, 1 do
+   ary[z+1] = {}
+   for y = 0, sha-1, 1 do
+    ary[z+1][y+1] = {}
+   end
+  end
+  return ary
+end
+
+
+function addColor2Cube(cube,sha,r,g,b) -- Gravity model
+  star = 1000000
+  fade = 1000
+
+  cube[r+1][g+1][b+1] = star
+  for z = 0, sha-1, 1 do
+   for y = 0, sha-1, 1 do
+    for x = 0, sha-1, 1 do
+
+      d = fade / ( (x-b)^2 + (y-g)^2 + (z-r)^2 )
+
+      if cube[z+1][y+1][x+1] ~= nil then
+         cube[z+1][y+1][x+1] = cube[z+1][y+1][x+1] + d
+         else
+         cube[z+1][y+1][x+1] = d
+      end
+
+  end;end;end
+end
+
+
+function findVoid(cube,sha)
+  weakest = 999999999999
+   weak_i = {-1,-1,-1}
+  for z = 0, sha-1, 1 do
+   for y = 0, sha-1, 1 do
+    for x = 0, sha-1, 1 do
+ 
+      w = cube[z+1][y+1][x+1]
+      if w <= weakest then weakest = w; weak_i = {z,y,x}; end
+     
+  end;end;end
+  return weak_i[1],weak_i[2],weak_i[3]
+end
+
+--
+
+if OK == true then
+
+  cube = initColorCube(SHADES)
+  -- Fill cube with initial colors
+  for n = 0, ini-1, 1 do
+    r,g,b = getcolor(n)
+    div = SHADES
+    addColor2Cube(cube,SHADES,math.floor(r/div),math.floor(g/div),math.floor(b/div))
+  end
+
+  if ini == 0 then -- With no inital color, some inital data must be added to the colorcube. 
+    addColor2Cube(cube,SHADES,0,0,0)
+    setcolor(0, 0,0,0) 
+    ini = ini + 1
+  end
+
+  for n = ini, exp, 1 do
+    r,g,b = findVoid(cube,SHADES)
+    mult = 255 / (SHADES - 1)
+    setcolor(n, r*mult,g*mult,b*mult)  
+    addColor2Cube(cube,SHADES,r,g,b)
+  end
+
+end
+
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua
@ -0,0 +1,27 @@
+--PALETTE Modify: Inverted RGB 
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+
+for c = 0, 255, 1 do
+
+  r,g,b = getcolor(c)
+  
+  r2 = (g+b)/2
+  g2 = (r+b)/2
+  b2 = (r+g)/2
+
+  setcolor(c, r2,g2,b2)
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/Set3bit.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/Set3bit.lua
@ -0,0 +1,39 @@
+--PALETTE Set: 3 Bit (8 Primaries)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+-- Generate palette of all colors possible with a given number of shades for each channel
+-- 2 shades = 1 bit / channel = 3 bit palette = 2^3 colors =  8 colors
+-- 4 shades = 2 bit / channel = 6 bit palette = 2^6 colors = 64 colors
+
+-- Channel shades (shades = 2 ^ bit-depth)
+shades = 2
+
+mult = 255 / (shades-1)
+
+
+colors = {}
+col = 0
+for r = 0, shades-1, 1 do
+  for g = 0, shades-1, 1 do
+    for b = 0, shades-1, 1 do
+       col = col + 1
+       colors[col] = { r*mult, g*mult, b*mult } 
+    end
+  end
+end
+
+
+for c = 1, #colors, 1 do
+
+  setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/Set6bit.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/Set6bit.lua
@ -0,0 +1,39 @@
+--PALETTE Set: Full 6 Bit (64 colors)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+-- Generate palette of all colors possible with a given number of shades for each channel
+-- 2 shades = 1 bit / channel = 3 bit palette = 2^3 colors =  8 colors
+-- 4 shades = 2 bit / channel = 6 bit palette = 2^6 colors = 64 colors
+
+-- Channel shades (shades = 2 ^ bit-depth)
+shades = 4
+
+mult = 255 / (shades-1)
+
+
+colors = {}
+col = 0
+for r = 0, shades-1, 1 do
+  for g = 0, shades-1, 1 do
+    for b = 0, shades-1, 1 do
+       col = col + 1
+       colors[col] = { r*mult, g*mult, b*mult } 
+    end
+  end
+end
+
+
+for c = 1, #colors, 1 do
+
+  setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua
@ -0,0 +1,50 @@
+--PALETTE Set: C64 Palette (16 colors)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+OK,clean = inputbox("C64 Palette:", "Remove old palette", 0,  0,1,0 
+);
+
+
+
+ colors =  {{0,    0,  0}, -- 0  Black
+            {62,  49,162}, -- 1  D.Blue
+            {87,  66,  0}, -- 2  Brown
+            {140, 62, 52}, -- 3  D.Red
+            {84,  84, 84}, -- 4  D.Grey
+            {141, 72,179}, -- 5  Purple
+            {144, 95, 37}, -- 6  Orange
+            {124,112,218}, -- 7  B.Blue
+            {128,128,128}, -- 8  Grey
+            {104,169, 65}, -- 9  Green
+            {187,119,109}, -- 10 B.Red
+            {122,191,199}, -- 11 Cyan
+            {171,171,171}, -- 12 B.Grey 
+            {208,220,113}, -- 13 Yellow
+            {172,234,136}, -- 14 B.Green
+            {255,255,255}  -- 15 White
+           } 
+
+
+if OK == true then
+
+ for c = 1, #colors, 1 do
+   setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+ end
+
+
+ if clean == 1 then
+   for c = #colors+1, 256, 1 do 
+     setcolor(c-1,0,0,0)  
+   end
+ end
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/palette/ShiftHue.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/palette/ShiftHue.lua
@ -0,0 +1,55 @@
+--PALETTE Adjust: Shift Hue v0.9
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- This script was adopted from Evalion, a Javascript codecrafting/imageprocessing project
+-- http://goto.glocalnet.net/richard_fhager/evalion/evalion.html 
+
+
+--Shift_degrees = 45
+
+OK,Shift_degrees = inputbox("Shift Hue v0.9","Degrees", 45, 0,360,3);
+
+
+--
+function shiftHUE(r,g,b,deg) -- V1.3 R.Fhager 2007, adopted from Evalion
+ local c,h,mi,mx,d,s,p,i,f,q,t
+ c = {g,b,r}
+ mi = math.min(r,g,b)
+ mx = math.max(r,g,b); v = mx;
+ d = mx - mi;
+ s = 0; if mx ~= 0 then s = d/mx; end
+ p = 1; if g ~= mx then p = 2; if b ~= mx then p = 0; end; end
+ 
+ if s~=0 then
+  h=(deg/60+(6+p*2+(c[1+p]-c[1+(p+1)%3])/d))%6; 
+  i=math.floor(h);
+  f=h-i;
+  p=v*(1-s);
+  q=v*(1-s*f);
+  t=v*(1-s*(1-f));
+  c={v,q,p,p,t,v}
+  r = c[1+i]
+  g = c[1+(i+4)%6]
+  b = c[1+(i+2)%6]
+ end
+
+ return r,g,b
+end
+--
+
+if OK == true then
+
+  for c = 0, 255, 1 do
+    r,g,b = getcolor(c)
+    setcolor(c, shiftHUE(r,g,b,Shift_degrees))
+  end
+
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua
@ -0,0 +1,37 @@
+-- cell colour reducer - jan'11, from Paulo Silva, with help from people from GrafX2 google group (DawnBringer, Adrien Destugues (PulkoMandy), and Yves Rizoud)
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize()
+ok,xcell,ycell=inputbox("Modify cell pixel size","xcell",8,1,16,4,"ycell",8,1,16,4);
+if ok==true then
+  function grayscaleindexed(c)
+    r,g,b=getcolor(c);return math.floor((b*11+r*30+g*59)/100);end
+  celcnt={};for n=0,255,1 do celcnt[n+1]=0;end -- Arraycounter must have initial value
+  for y1=0,h-1,ycell do
+    for x1=0,w-1,xcell do
+      for i=0,255,1 do
+        celcnt[i+1]=0;end
+      for y2=0,ycell-1,1 do
+        for x2=0,xcell-1,1 do
+           x=x1+x2;y=y1+y2;u=getpicturepixel(x,y)
+           celcnt[u+1]=celcnt[u+1]+(1000*xcell*ycell)+math.random(0,950);end;end
+      ikattr=0;paattr=0;ikcnt=0;pacnt=0
+      for i=0,255,1 do
+        if ikcnt<celcnt[i+1] then ikcnt=celcnt[i+1];ikattr=i;end;end
+      celcnt[ikattr+1]=0
+      for i=0,255,1 do
+        if pacnt<celcnt[i+1] then pacnt=celcnt[i+1];paattr=i;end;end
+      if grayscaleindexed(ikattr)>grayscaleindexed(paattr) then tmpr=ikattr;ikattr=paattr;paattr=tmpr;end
+      wmid=math.floor((grayscaleindexed(paattr)+grayscaleindexed(ikattr))/2)
+      for y2=0,ycell-1,1 do
+        for x2=0,xcell-1,1 do
+          x=x1+x2;y=y1+y2;u=getpicturepixel(x,y)
+          if u==ikattr then
+            idou=ikattr
+          elseif u==paattr then
+            idou=paattr
+          else
+            idou=ikattr
+            if grayscaleindexed(u)>wmid then idou=paattr;end
+            end
+          putpicturepixel(x,y,idou)
+          end;end;end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua
@ -0,0 +1,13 @@
+-- Draw isometric grid - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize();
+ok,gsiz,ik=inputbox("draw isometric grid","size",16,0,128,5,"colour",1,0,255,6);
+if ok==true then
+  for y=0,h-1,gsiz do
+    for x=0,w-1,1 do
+      putpicturepixel(x,y+(x/2)%gsiz,ik);
+      end;end
+  for y=0,h-1,gsiz do
+    for x=0,w-1,1 do
+      putpicturepixel(x+((gsiz/2)-1),y+(gsiz-1)-((x/2)%gsiz),ik);
+      end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
@ -0,0 +1,14 @@
+-- draw grid - rgb (matchcolor) - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize()
+ok,xsiz,ysiz,r,g,b=inputbox("draw grid - rgb (matchcolor)","x size",8,1,64,5,"y size",8,1,64,6,"r",128,0,255,6,"g",128,0,255,6,"b",128,0,255,6);
+if ok==true then
+  c=matchcolor(r,g,b) 
+  for y=0,h-1,1 do 
+    for x=0,w-1,xsiz do 
+      putpicturepixel(x,y,c); 
+      end;end 
+  for y=0,h-1,ysiz do 
+    for x=0,w-1,1 do 
+      putpicturepixel(x,y,c); 
+      end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
@ -0,0 +1,11 @@
+-- draw grid - indexed colour - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize();
+ok,xsiz,ysiz,c=inputbox("draw grid - indexed colour)","x size",8,1,64,5,"y size",8,1,64,6,"colour id",0,0,255,6);
+if ok==true then
+  for y=0,h-1,1 do
+    for x=0,w-1,xsiz do
+      putpicturepixel(x,y,c);end;end 
+  for y=0,h-1,ysiz do 
+    for x=0,w-1,1 do 
+      putpicturepixel(x,y,c);end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua
@ -0,0 +1,12 @@
+-- Glass grid filter - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize();
+ok,xsiz,ysiz=inputbox("message","xsize",8,0,64,5,"ysize",8,0,64,6);
+if ok==true then
+  for y1=0,h-1,xsiz do
+    for x1=0,w-1,ysiz do
+      for y2=0,(ysiz/2)-1,1 do
+        for x2=0,xsiz-1,1 do
+          c1=getpicturepixel(x1+x2,y1+y2);c2=getpicturepixel(x1+(xsiz-1)-x2,y1+(ysiz-1)-y2)
+          putpicturepixel(x1+x2,y1+y2,c2);putpicturepixel(x1+(xsiz-1)-x2,y1+(ysiz-1)-y2,c1)
+          end;end;end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua
@ -0,0 +1,11 @@
+-- palette to picture - Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize(); 
+ok,xsiz,ysiz=inputbox("palette to picture","x size",8,1,16,5,"y size",8,1,16,6);
+if ok==true then
+  for y1=0,7,1 do 
+    for x1=0,31,1 do 
+      for y2=0,ysiz-1,1 do 
+        for x2=0,xsiz-1,1 do 
+          putpicturepixel(x1*xsiz+x2,y1*ysiz+y2,y1+x1*8) 
+          end;end;end;end;end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua
@ -0,0 +1,87 @@
+--PICTURE (part of): 2 Isometric v0.1b
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+-- Color 0 is assumed to be the background
+--
+
+iso = {{0, 0, 1, 1, 1, 1, 0, 0},
+       {1, 1, 1, 1, 1, 1, 1, 1},
+       {2, 2, 1, 1, 1, 1, 3, 3},
+       {2, 2, 2, 2, 3, 3, 3, 3},
+       {2, 2, 2, 2, 3, 3, 3, 3},
+       {2, 2, 2, 2, 3, 3, 3, 3},
+       {0, 0, 2, 2, 3, 3, 0, 0}}
+
+isowidth  = 8
+isoheight = 7
+
+xoff = 0.5
+yoff = 0
+
+xstep = 4
+ystep = 2
+zstep = 4
+
+-- Part of screen from top-left (4 = 1/4)
+xsize = 5
+ysize = 4
+
+
+w, h = getpicturesize()
+
+xo = math.floor(w * xoff)
+
+-- just don't render more than can be fittted right now
+w = math.floor(w / xsize)
+h = math.floor(h / ysize)
+
+
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+    isox = x * xstep - y * xstep
+    isoy = y * ystep + x * ystep
+    
+    cb = getbackuppixel(x,y)
+
+    --
+    if cb ~= 0 then
+
+      r,g,b = getbackupcolor(cb);
+      c1 = matchcolor(r,g,b);
+      c2 = matchcolor(r+64, g+64, b+64);
+      c3 = matchcolor(r-64, g-64, b-64);
+      
+      cols = {0,c1,c2,c3}
+
+      for iy = 1, isoheight, 1 do
+       for ix = 1, isowidth, 1 do
+ 
+         i = iso[iy][ix]
+         c = cols[i+1]   
+         if i ~= 0 then putpicturepixel(xo + isox+ix-1, isoy+iy-1, c); end
+         
+       end
+      end
+
+    end
+    --
+
+  end
+end
+
+
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
@ -0,0 +1,36 @@
+--PICTURE: Rainbow - Dark to Bright v1.1
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+-- Email: dawnbringer@hem.utfors.se
+-- MSN:   annassar@hotmail.com
+--
+
+
+--dofile("dawnbringer_lib.lua") 
+run("../libs/dawnbringer_lib.lua")
+--> db.shiftHUE(r,g,b, deg)
+
+w, h = getpicturesize()
+
+for y = 0, h - 1, 1 do
+  for x = 0, w - 1, 1 do
+
+   -- Fractionalize image dimensions
+   ox = x / w;
+   oy = y / h;
+
+   r = 255 * math.sin(oy * 2) 
+   g = (oy-0.5)*512 * oy
+   b = (oy-0.5)*512 * oy
+
+   r, g, b = db.shiftHUE(r,g,b,ox * 360); 
+ 
+   c = matchcolor(r,g,b)
+ 
+   putpicturepixel(x, y, c);
+
+  end
+  updatescreen(); if (waitbreak(0)==1) then return; end
+end
+
+
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua
@ -0,0 +1,50 @@
+--SCENE: Remap pic to RGB, diag.dith
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- Set Palette (to a predefined one)
+
+colors = {{  0,  0,  0},
+          {255,  0,  0},
+          {  0,255,  0},
+          {  0,  0,255}
+         }
+
+
+chm = {1,0,0} 
+
+for c = 1, #colors, 1 do
+  setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+end
+
+for c = #colors, 255, 1 do
+  setcolor(c,0,0,0) 
+end
+
+
+
+w, h = getpicturesize()
+
+for y = 0, h - 1, 1 do
+
+  for x = 0, w - 1, 1 do
+    
+    r,g,b = getbackupcolor(getbackuppixel(x,y));
+
+      rn = r * chm[1+(y+0+x)%3]
+      gn = g * chm[1+(y+1+x)%3]
+      bn = b * chm[1+(y+2+x)%3]
+
+      n = matchcolor(rn,gn,bn);
+
+      putpicturepixel(x, y, n);
+
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
@ -0,0 +1,69 @@
+--SCENE: Remap pic 2 RGB, 1lineED-dith. (Same line simple error-diffusion dither)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+
+power = 0.615
+
+c1 = 0.8 -- Error weight (white is green)
+c2 = 0.2 -- RGB weight (white is r+g+b)
+
+-- Set Palette (to a predefined one)
+
+colors = {{  0,  0,  0},
+          {255,  0,  0},
+          {  0,255,  0},
+          {  0,  0,255}
+         }
+
+
+chm = {1,0,0} 
+
+for c = 1, #colors, 1 do
+  setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+end
+
+for c = #colors, 255, 1 do
+  setcolor(c,0,0,0) 
+end
+
+
+
+w, h = getpicturesize()
+
+for y = 0, h - 1, 1 do
+
+  re = 0
+  ge = 0
+  be = 0
+
+  for x = (y%2), w - 1, 1 do
+    
+    r,g,b = getbackupcolor(getbackuppixel(x,y));
+
+      rn = re * c1 + r * chm[1+(y+0+x)%3] * c2
+      gn = ge * c1 + g * chm[1+(y+1+x)%3] * c2
+      bn = be * c1 + b * chm[1+(y+2+x)%3] * c2
+
+      n = matchcolor(rn,gn,bn);
+
+    putpicturepixel(x, y, n);
+
+    
+    rn,gn,bn =  getcolor(getpicturepixel(x,y));
+   
+    re = (re + (r - rn)) * power
+    ge = (ge + (g - gn)) * power
+    be = (be + (b - bn)) * power
+
+    
+
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
@ -0,0 +1,80 @@
+--SCENE: Remap pic to 3bit, LineEDdith. (Same line simple error-diffusion dither)
+--by Richard Fhager 
+--http://hem.fyristorg.com/dawnbringer/
+
+-- Copyright 2010 Richard Fhager
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+--
+-- Just a demonstration.
+--
+
+
+
+power = 0.6
+
+-- Channel shades (shades = 2 ^ bit-depth)
+shades = 2
+
+mult = 255 / (shades-1)
+
+
+colors = {}
+col = 0
+for r = 0, shades-1, 1 do
+  for g = 0, shades-1, 1 do
+    for b = 0, shades-1, 1 do
+       col = col + 1
+       colors[col] = { r*mult, g*mult, b*mult } 
+    end
+  end
+end
+
+
+for c = 1, #colors, 1 do
+
+  setcolor(c-1,colors[c][1],colors[c][2],colors[c][3]) 
+
+end
+
+
+for c = #colors, 255, 1 do
+  setcolor(c,0,0,0) 
+end
+
+
+
+w, h = getpicturesize()
+
+for y = 0, h - 1, 1 do
+
+  re = 0
+  ge = 0
+  be = 0
+
+  for x = (y%2), w - 1, 1 do
+    
+    r,g,b = getbackupcolor(getbackuppixel(x,y));
+
+      rn = re + r
+      gn = ge + g
+      bn = be + b
+
+      n = matchcolor(rn,gn,bn);
+
+    putpicturepixel(x, y, n);
+
+    
+    rn,gn,bn = getcolor(getpicturepixel(x,y));
+   
+    re = (re + (r - rn)) * power
+    ge = (ge + (g - gn)) * power
+    be = (be + (b - bn)) * power
+
+   
+  end
+end
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/Tiler.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/Tiler.lua
@ -0,0 +1,112 @@
+--Picture Tiler by Adrien Destugues
+--Extract unique tiles from the spare page
+--to the main one. Main page is erased.
+--
+-- Copyright 2011 Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; version 2
+-- of the License. See <http://www.gnu.org/licenses/>
+
+-- Copy palette from spare to main
+-- TODO
+
+-- Grid size
+-- TODO : get it from GrafX2
+xgrid = 16;
+ygrid = 16;
+
+-- picture size
+w, h = getpicturesize();
+
+-- We may need less if there are duplicates
+setsparepicturesize(xgrid, w*h/xgrid);
+
+tileid = 0;
+
+-- blit part of the spare to picture
+function blitpicturetospare(srcx, srcy, dstx, dsty, width, height)
+	local x,y;
+	for y = 0, height - 1, 1 do
+		for x = 0, width - 1, 1 do
+			putsparepicturepixel(dstx+x, dsty+y, getpicturepixel(srcx + x, srcy + y));
+		end
+	end
+end
+
+function comparesparewithpicture(srcx, srcy, dstx, dsty, width, height)
+	local x,y,color
+	for y = 0, height - 1, 1 do
+		for x = 0, width - 1, 1 do
+			color = getsparepicturepixel(srcx + x, srcy + y);
+			if color ~= getpicturepixel(dstx+x, dsty+y) then
+				-- they are different
+				return false;
+			end
+		end
+	end
+	-- they are identical
+	return true;
+end
+
+-- compute checksum of a picture area
+-- it may not be unique, we use it as a key for an hashmap
+function checksum(srcx, srcy, width, height)
+	local sum,x,y
+	sum = 0;
+	for y = 0, height - 1, 1 do
+		for x = 0, width - 1, 1 do
+			sum = sum + getpicturepixel(srcx+x, srcy+y);
+		end
+	end
+
+	return sum;
+end
+
+tilemap = {}
+
+-- foreach tile
+for y = 0, h-1, ygrid do
+	for x = 0, w - 1, xgrid do
+		-- existing one ?
+		csum = checksum(x,y,xgrid,ygrid);
+		if tilemap[csum] ~= nil then
+			-- potential match
+			-- Find matching tileid
+			found = false;
+			for id in pairs(tilemap[csum]) do
+				-- is it a match ?
+				if comparesparewithpicture(x,y,0,id*ygrid, xgrid, ygrid) then
+					-- found it !
+					tilemap[csum][id] = tilemap[csum][id] + 1;
+					found = true;
+					break;
+				end
+			end
+			-- Add tile anyway if needed
+			if not found then
+				desty = tileid * ygrid;
+				blitpicturetospare(x, y, 0, desty, xgrid, ygrid);
+
+				-- add it to the tilemap
+				tilemap[csum][tileid] = 1;
+				-- give it a tile id
+				tileid = tileid + 1;
+			end
+		else
+			-- Copy to spare
+			desty = tileid * ygrid;
+			blitpicturetospare(x, y, 0, desty, xgrid, ygrid);
+
+			-- add it to the tilemap
+			tilemap[csum] = {}
+			tilemap[csum][tileid] = 1;
+			-- give it a tile id
+			tileid = tileid + 1;
+		end
+	end
+end
+
+setsparepicturesize(xgrid, (tileid-1)*ygrid)
+--updatescreen();
--- a/data/common/media/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
+++ b/data/common/media/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
@ -0,0 +1,12 @@
+-- Copyright 2010 Paulo Silva
+-- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. See <http://www.gnu.org/licenses/>
+w,h=getpicturesize();
+ok,bitd=inputbox("colourspace from palette","bitdepth:",4,1,8,5);
+if ok==true then
+  bitd3=(2^bitd);bitd8=(2^(math.floor(bitd/2)));bitd9=(2^((math.floor((bitd-1)/2))+1))
+  for y1=0,(bitd8-1),1 do 
+    for x1=0,(bitd9-1),1 do 
+      for y2=0,(bitd3-1),1 do 
+        for x2=0,(bitd3-1),1 do 
+          putpicturepixel(x1*bitd3+x2,y1*bitd3+y2,matchcolor((y2*255)/(bitd3-1),((y1*8+x1)*255)/(bitd3-1),(x2*255)/(bitd3-1))) 
+          end;end;end;end;end
--- a/data/common/media/grafx2/skins/font_Classic.png
+++ b/data/common/media/grafx2/skins/font_Classic.png
--- a/data/common/media/grafx2/skins/font_DPaint.png
+++ b/data/common/media/grafx2/skins/font_DPaint.png
--- a/data/common/media/grafx2/skins/font_Fairlight.png
+++ b/data/common/media/grafx2/skins/font_Fairlight.png
--- a/data/common/media/grafx2/skins/font_Fun.png
+++ b/data/common/media/grafx2/skins/font_Fun.png
--- a/data/common/media/grafx2/skins/font_Melon.png
+++ b/data/common/media/grafx2/skins/font_Melon.png
--- a/data/common/media/grafx2/skins/font_Seen.png
+++ b/data/common/media/grafx2/skins/font_Seen.png
--- a/data/common/media/grafx2/skins/skin_Aurora.png
+++ b/data/common/media/grafx2/skins/skin_Aurora.png
--- a/data/common/media/grafx2/skins/skin_Clax2.gif
+++ b/data/common/media/grafx2/skins/skin_Clax2.gif
--- a/data/common/media/grafx2/skins/skin_Clax3.gif
+++ b/data/common/media/grafx2/skins/skin_Clax3.gif
--- a/data/common/media/grafx2/skins/skin_Clax4.gif
+++ b/data/common/media/grafx2/skins/skin_Clax4.gif
--- a/data/common/media/grafx2/skins/skin_DPaint.png
+++ b/data/common/media/grafx2/skins/skin_DPaint.png
--- a/data/common/media/grafx2/skins/skin_classic.png
+++ b/data/common/media/grafx2/skins/skin_classic.png
--- a/data/common/media/grafx2/skins/skin_modern.png
+++ b/data/common/media/grafx2/skins/skin_modern.png
--- a/data/common/media/grafx2/skins/skin_scenish.png
+++ b/data/common/media/grafx2/skins/skin_scenish.png
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@ -7,6 +7,7 @@ window_title=KolibriOS Additional Software
 [Media]
 zSea=/kolibrios/media/zsea/zsea,46
 FPlay=/kolibrios/media/fplay,40
+GrafX2=/kolibrios/grafx2/grafx2,48

 [3D Tools]
 Info3DsPro=/kolibrios/3d/info3ds/info3ds,75
@ -15,8 +16,9 @@ VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor,30

 [3D Demos]
 3dsHeart=/kolibrios/3d/3dsheart,78
+M2View=/kolibrios/3d/m2view/m2view,78

 [Other]
 Calc+=/kolibrios/utils/calcplus,4
 Life=/kolibrios/demos/life2,13
-fNav=/kolibrios/unils/fNav.kex,45
+fNav=/kolibrios/utils/fNav.kex,45