Rough changes...

3 files changed, 18 insertions, 26 deletions

diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg
index 706ee0a..589f650 100644
--- a/data/default_map_settings.cfg
+++ b/data/default_map_settings.cfg
@@ -10,15 +10,15 @@ if (strcmp $skybox "") [
 ]
 
 materialreset
-texture water "textures/water2.jpg"    // water surface
-texture 1 "textures/waterfall.jpg"     // waterfall
-texture 1 "textures/watern.jpg"        // water normals
-texture 1 "textures/waterdudv.jpg"     // water distortion
-texture 1 "textures/waterfalln.jpg"    // waterfall normals
-texture 1 "textures/waterfalldudv.jpg" // waterfall distortion
+texture water "textures/water2.png"    // water surface
+texture 1 "textures/waterfall.png"     // waterfall
+texture 1 "textures/watern.png"        // water normals
+texture 1 "textures/waterdudv.png"     // water distortion
+texture 1 "textures/waterfalln.png"    // waterfall normals
+texture 1 "textures/waterfalldudv.png" // waterfall distortion
 
-texture lava "textures/floor_lava2.jpg" 0 0 0 2 // lava surface
-texture 1 "textures/floor_lava2.jpg"    0 0 0 2 // falling lava
+texture lava "textures/floor_lava2.png" 0 0 0 2 // lava surface
+texture 1 "textures/floor_lava2.png"    0 0 0 2 // falling lava
 
 // texture definitions for the map:
 texturereset    // starts the texture slot/index at 0
diff --git a/data/game_fps.cfg b/data/game_fps.cfg
index 9f9a7f1..1720ccc 100644
--- a/data/game_fps.cfg
+++ b/data/game_fps.cfg
@@ -3,7 +3,7 @@
 togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
 sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
 
-mapcomplete = [ complete $arg1 packages/base ogz ]
+mapcomplete = [ complete $arg1 packages/maps ogz ]
 mapcomplete map
 
 modenames = "ffa coop teamplay insta instateam effic efficteam"
diff --git a/data/menus.cfg b/data/menus.cfg
index c9e3bc8..e3840e5 100644
--- a/data/menus.cfg
+++ b/data/menus.cfg
@@ -113,7 +113,7 @@ showmapshot = [
     guibar
     mname = (checkrolloveraction "map " [if (> $numargs 0) [result $arg1] [at $guirollovername 0]])
     guilist [
-        guiimage (concatword "packages/base/" $mname ".jpg") (checkrolloveraction "map ") 4 1 "data/cube.png" $mname
+        guiimage (concatword "packages/maps/" $mname ".png") (checkrolloveraction "map ") 4 1 "data/cube.png" $mname
     ]
 ]
 
@@ -268,7 +268,7 @@ newgui custommaps [
 ] "custom maps"
 showcustommaps = [
     custommaps = ""
-    loopfiles curmap "packages/base" "ogz" [
+    loopfiles curmap "packages/maps" "ogz" [
         if (< (indexof $allmaps $curmap) 0) [
             custommaps = (concat $custommaps (escape $curmap))
         ]
@@ -583,19 +583,13 @@ guitab "ents" //////////////////////////////////////////////////////////////////
         guilist [
             guibutton "light..^t^t^t^t^t"           "resetlight;showgui newlight"
             guibutton "playerstart"                 "newent playerstart"
-            guibutton "base"                        "newent base"
-            guibutton "trigger.."                   "showgui triggers"
         ]
         guilist [
             guibutton "mapmodel..^t^t^f2[F4]^t^t"   "showgui mapmodels"
             guibutton "playerstart team-1"          "newent playerstart 1"
-            guibutton "flag team-1"                 "newent flag 1"
-            guibutton "monster.."                   "showgui monsters"
         ]
         guilist [
             guibutton "teleport.."                  "showgui newteleport"
-            guibutton "playerstart team-2"          "newent playerstart 2"
-            guibutton "flag team-2"                 "newent flag 2"
         ]
     ]
     guitext "pickup entities:"
@@ -609,6 +603,8 @@ guitab "ents" //////////////////////////////////////////////////////////////////
             guibutton "cartridges"              "newent cartridges"
         ]
         guilist [
+            guibutton "tinyhealth"              "newent tinyhealth"
+            guibutton "tinyarmour"              "newent tinyarmour"
             guibutton "health"                  "newent health"
             guibutton "healthboost"             "newent healthboost"
             guibutton "greenarmour"             "newent greenarmour"
@@ -661,17 +657,13 @@ guitab "cloudlayer" ////////////////////////////////////////////////////////////
         guilist [
             guilist [
                 guitext "cloudlayer^t^t^t^t^t^t"
-                guibutton "skyboxes/clouds01.png"           [cloudlayer "skyboxes/clouds01.png"]
-                guibutton "skyboxes/clouds02.png"           [cloudlayer "skyboxes/clouds02.png"]
-                guibutton "skyboxes/clouds03.png"           [cloudlayer "skyboxes/clouds03.png"]
-                guibutton "skyboxes/white_bk.jpg"           [cloudlayer "skyboxes/white_bk.jpg"]
+                guibutton "clouds/clouds01.png"           [cloudlayer "clouds/clouds01.png"]
+                guibutton "clouds/clouds02.png"           [cloudlayer "clouds/clouds02.png"]
+                guibutton "clouds/clouds03.png"           [cloudlayer "clouds/clouds03.png"]
             ]
             guilist [
-                guibutton "*no clouds*"                     [cloudlayer ""]
-                guibutton "blindabuser/blindaclouds.png"    [cloudlayer "blindabuser/blindaclouds.png"]
-                guibutton "skyboxes/cloud_ring.png"         [cloudlayer "skyboxes/cloud_ring.png"]
-                guibutton "textures/razgriz/cloud03.png"    [cloudlayer "textures/razgriz/cloud03.png"]
-                guibutton "textures/razgriz/cloud04.png"    [cloudlayer "textures/razgriz/cloud04.png"]
+                guibutton "*no clouds*"                   [cloudlayer ""]
+                guibutton "clouds/cloud_ring.png"         [cloudlayer "clouds/cloud_ring.png"]
             ]
         ]
     ]