From 6de153293f0ba70aed1f7714f626bc5652a9bd32 Mon Sep 17 00:00:00 2001
From: xolatile
Date: Mon, 21 Jul 2025 12:59:59 +0200
Subject: Removed steep fur, changed script names, grass textures...

---
 data/blendbrush.cfg           | 31 -------------------
 data/brushes.cfg              | 31 +++++++++++++++++++
 data/custom_maps_menu.cfg     | 71 +++++++++++++++++++++++++++++++++++++++++++
 data/default_map.cfg          | 27 ++++++++++++++++
 data/default_map_settings.cfg | 32 -------------------
 data/game.cfg                 | 31 +++++++++++++++++++
 data/game_fps.cfg             | 31 -------------------
 7 files changed, 160 insertions(+), 94 deletions(-)
 delete mode 100644 data/blendbrush.cfg
 create mode 100644 data/brushes.cfg
 create mode 100755 data/custom_maps_menu.cfg
 create mode 100644 data/default_map.cfg
 delete mode 100644 data/default_map_settings.cfg
 create mode 100644 data/game.cfg
 delete mode 100644 data/game_fps.cfg

(limited to 'data')

diff --git a/data/blendbrush.cfg b/data/blendbrush.cfg
deleted file mode 100644
index 506193c..0000000
--- a/data/blendbrush.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-//////////////////////////////////////////////////////////////////
-//Texture blending
-
-addblendbrush "Circle 8px soft" "packages/blendbrush/circle_8_soft.png"
-addblendbrush "Circle 8px hard" "packages/blendbrush/circle_8_hard.png"
-addblendbrush "Circle 8px solid" "packages/blendbrush/circle_8_solid.png"
-addblendbrush "Circle 16px soft" "packages/blendbrush/circle_16_soft.png"
-addblendbrush "Circle 16px hard" "packages/blendbrush/circle_16_hard.png"
-addblendbrush "Circle 16px solid" "packages/blendbrush/circle_16_solid.png"
-addblendbrush "Circle 32px soft" "packages/blendbrush/circle_32_soft.png"
-addblendbrush "Circle 32px hard" "packages/blendbrush/circle_32_hard.png"
-addblendbrush "Circle 32px solid" "packages/blendbrush/circle_32_solid.png"
-addblendbrush "Circle 64px soft" "packages/blendbrush/circle_64_soft.png"
-addblendbrush "Circle 64px hard" "packages/blendbrush/circle_64_hard.png"
-addblendbrush "Circle 64px solid" "packages/blendbrush/circle_64_solid.png"
-addblendbrush "Circle 128px soft" "packages/blendbrush/circle_128_soft.png"
-addblendbrush "Circle 128px hard" "packages/blendbrush/circle_128_hard.png"
-addblendbrush "Circle 128px solid" "packages/blendbrush/circle_128_solid.png"
-addblendbrush "Noise 64px" "packages/blendbrush/noise_64.png"
-addblendbrush "Noise 128px" "packages/blendbrush/noise_128.png"
-addblendbrush "Square 16px hard" "packages/blendbrush/square_16_hard.png"
-addblendbrush "Square 16px solid" "packages/blendbrush/square_16_solid.png"
-addblendbrush "Square 32px hard" "packages/blendbrush/square_32_hard.png"
-addblendbrush "Square 32px solid" "packages/blendbrush/square_32_solid.png"
-addblendbrush "Square 64px hard" "packages/blendbrush/square_64_hard.png"
-addblendbrush "Square 64px solid" "packages/blendbrush/square_64_solid.png"
-addblendbrush "Gradient 16px" "packages/blendbrush/gradient_16.png"
-addblendbrush "Gradient 32px" "packages/blendbrush/gradient_32.png"
-addblendbrush "Gradient 64px" "packages/blendbrush/gradient_64.png"
-addblendbrush "Gradient 128px" "packages/blendbrush/gradient_128.png"
-
diff --git a/data/brushes.cfg b/data/brushes.cfg
new file mode 100644
index 0000000..506193c
--- /dev/null
+++ b/data/brushes.cfg
@@ -0,0 +1,31 @@
+//////////////////////////////////////////////////////////////////
+//Texture blending
+
+addblendbrush "Circle 8px soft" "packages/blendbrush/circle_8_soft.png"
+addblendbrush "Circle 8px hard" "packages/blendbrush/circle_8_hard.png"
+addblendbrush "Circle 8px solid" "packages/blendbrush/circle_8_solid.png"
+addblendbrush "Circle 16px soft" "packages/blendbrush/circle_16_soft.png"
+addblendbrush "Circle 16px hard" "packages/blendbrush/circle_16_hard.png"
+addblendbrush "Circle 16px solid" "packages/blendbrush/circle_16_solid.png"
+addblendbrush "Circle 32px soft" "packages/blendbrush/circle_32_soft.png"
+addblendbrush "Circle 32px hard" "packages/blendbrush/circle_32_hard.png"
+addblendbrush "Circle 32px solid" "packages/blendbrush/circle_32_solid.png"
+addblendbrush "Circle 64px soft" "packages/blendbrush/circle_64_soft.png"
+addblendbrush "Circle 64px hard" "packages/blendbrush/circle_64_hard.png"
+addblendbrush "Circle 64px solid" "packages/blendbrush/circle_64_solid.png"
+addblendbrush "Circle 128px soft" "packages/blendbrush/circle_128_soft.png"
+addblendbrush "Circle 128px hard" "packages/blendbrush/circle_128_hard.png"
+addblendbrush "Circle 128px solid" "packages/blendbrush/circle_128_solid.png"
+addblendbrush "Noise 64px" "packages/blendbrush/noise_64.png"
+addblendbrush "Noise 128px" "packages/blendbrush/noise_128.png"
+addblendbrush "Square 16px hard" "packages/blendbrush/square_16_hard.png"
+addblendbrush "Square 16px solid" "packages/blendbrush/square_16_solid.png"
+addblendbrush "Square 32px hard" "packages/blendbrush/square_32_hard.png"
+addblendbrush "Square 32px solid" "packages/blendbrush/square_32_solid.png"
+addblendbrush "Square 64px hard" "packages/blendbrush/square_64_hard.png"
+addblendbrush "Square 64px solid" "packages/blendbrush/square_64_solid.png"
+addblendbrush "Gradient 16px" "packages/blendbrush/gradient_16.png"
+addblendbrush "Gradient 32px" "packages/blendbrush/gradient_32.png"
+addblendbrush "Gradient 64px" "packages/blendbrush/gradient_64.png"
+addblendbrush "Gradient 128px" "packages/blendbrush/gradient_128.png"
+
diff --git a/data/custom_maps_menu.cfg b/data/custom_maps_menu.cfg
new file mode 100755
index 0000000..cac660a
--- /dev/null
+++ b/data/custom_maps_menu.cfg
@@ -0,0 +1,71 @@
+// Custom map menu, ported from Sauerbraten, 7Year aka Xolatile.
+
+octabase = "^f7"
+octamain = "^f1"
+unmapsx  = 4
+unmapsy  = 24
+
+custommaps = ""
+
+loopfiles curmap "packages/maps" "ogz" [
+	if (< (indexof $allmaps $curmap) 0) [
+		custommaps = (concat $custommaps $curmap)
+	]
+]
+
+sy_nume = (listlen $custommaps)
+
+showcustommaps = [sy_remaps; showgui sy_unmaps]
+
+sy_remaps = [
+	custommaps = ""
+	loopfiles curmap "packages/maps" "ogz" [
+		if (< (indexof $allmaps $curmap) 0) [
+			custommaps = (concat $custommaps $curmap)
+		]
+	]
+	custommaps = (sortlist $custommaps x y [<=s $x $y])
+	amountxy = (+ (div (listlen $custommaps) $unmapsy) 1)
+	loop syxy $amountxy [
+		(concatword "custommaps" $syxy) = ""
+	]; syxy = 0
+	loop syxy $amountxy [
+		(concatword "custommaps" $syxy)
+		loop unto $unmapsy [
+			(concatword "custommaps" $syxy) = (concat $(concatword "custommaps" $syxy) (at $custommaps (+ (* $unmapsy $syxy) $unto)))
+		]
+	]; syxy = 0; unto = 0
+	sy_nume = (listlen $custommaps)
+]
+
+newgui sy_unmaps [
+	if (mod $amountxy $unmapsx) [
+		sy_unpage = (+ (div $amountxy $unmapsx) 1)
+	] [
+		sy_unpage = (div $amountxy $unmapsx)
+	]
+	loop syi $sy_unpage [
+		guilist [
+			loop syj $unmapsx [
+				if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
+					guistrut $unmapsy 1
+					guilist [
+						guistrut 27 1
+						looplist unto $(concatword "custommaps" (+ (* $syi $unmapsx) $syj )) [
+							guibutton (concatword $octabase $unto) (concat map $unto) "cube"
+						]
+					]
+				]
+			]
+			guibar
+			if (< (+ (* $syi $unmapsx) $syj) $amountxy) [
+				guiimage (concatword "packages/maps/" (strreplace $guirolloveraction "map " "") ".jpg") $guirolloveraction 6 1 "data/cube.png"
+			]
+		]
+		if (= (+ $syi 1) $sy_unpage) [
+
+		] [
+			guitab (concatword $octamain (+ $syi 2))
+		]
+	]
+] (concatword $octamain "Custom Maps (" $sy_nume ")")
diff --git a/data/default_map.cfg b/data/default_map.cfg
new file mode 100644
index 0000000..50c7039
--- /dev/null
+++ b/data/default_map.cfg
@@ -0,0 +1,27 @@
+// Default settings for maps, executed each time the map is loaded.
+
+if (strcmp $skybox "") [
+    skybox "skyboxes/black"
+]
+
+materialreset
+
+texture water "materials/water.png"
+texture 1     "materials/waterfall.png"
+texture 1     "materials/water_n.png"
+texture 1     "materials/water_dudv.png"
+texture 1     "materials/waterfall_n.png"
+texture 1     "materials/waterfall_dudv.png"
+
+texture lava "materials/lava.png" 0 0 0 0.5
+texture 1    "materials/lava.png" 0 0 0 0.5
+
+texturereset
+
+    setshader "stdworld"
+        texture 0 "textures/sky.png"
+        texture 0 "textures/default.png"
+
+    exec "packages/textures/ex/package.cfg"
+
+    setshader "stdworld"
diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg
deleted file mode 100644
index 589f650..0000000
--- a/data/default_map_settings.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-// default settings for maps
-
-// on every map load, this file will be executed, followed by
-// "package.cfg" in the package dir of the map, and "<mapname>.cfg",
-// which you can use to override the settings in this file.
-
-// the skybox for this map:
-if (strcmp $skybox "") [
-    skybox "skyboxes/black"
-]
-
-materialreset
-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.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
-    setshader stdworld   // use default world shader unless specified otherwise
-        texture 0 "textures/sky.png"     // dummy sky texture
-        texture 0 "textures/default.png" // default geometry texture
-
-    exec "packages/textures/ex/package.cfg"
-
-    // for cfgs that don't set shaders...
-    setshader stdworld
diff --git a/data/game.cfg b/data/game.cfg
new file mode 100644
index 0000000..1720ccc
--- /dev/null
+++ b/data/game.cfg
@@ -0,0 +1,31 @@
+// fps specific cfg stuff goes here
+
+togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
+sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
+
+mapcomplete = [ complete $arg1 packages/maps ogz ]
+mapcomplete map
+
+modenames = "ffa coop teamplay insta instateam effic efficteam"
+loop i (listlen $modenames) [
+    mname = (at $modenames $i)
+    alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
+    mapcomplete $mname
+]
+
+demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
+varcomplete demo demodir dmo
+
+playermodelnum = 1
+
+playermodeldir0 = "mrfixit"
+playermodelicon0 = "mrfixit"
+playermodelname0 = "Mr. Fixit"
+playermodelstory0 = [Which orc do you choose when the mission calls for an all-purpose wrecking machine? Who do you call when the odds are stacked against you? Mr. Fixit, that's who. Gifted with the ability to perform deconstructive surgery with any weapon, this orc gets the job done fast and with extreme prejudice.]
+
+playermodeldir = [getalias (concatword "playermodeldir" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelicon = [getalias (concatword "playermodelicon" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelname = [getalias (concatword "playermodelname" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelstory = [getalias (concatword "playermodelstory" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+
+playsong = [ music (concatword "music/1.ogg") playsong ]
diff --git a/data/game_fps.cfg b/data/game_fps.cfg
deleted file mode 100644
index 1720ccc..0000000
--- a/data/game_fps.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-// fps specific cfg stuff goes here
-
-togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
-sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
-
-mapcomplete = [ complete $arg1 packages/maps ogz ]
-mapcomplete map
-
-modenames = "ffa coop teamplay insta instateam effic efficteam"
-loop i (listlen $modenames) [
-    mname = (at $modenames $i)
-    alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
-    mapcomplete $mname
-]
-
-demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
-varcomplete demo demodir dmo
-
-playermodelnum = 1
-
-playermodeldir0 = "mrfixit"
-playermodelicon0 = "mrfixit"
-playermodelname0 = "Mr. Fixit"
-playermodelstory0 = [Which orc do you choose when the mission calls for an all-purpose wrecking machine? Who do you call when the odds are stacked against you? Mr. Fixit, that's who. Gifted with the ability to perform deconstructive surgery with any weapon, this orc gets the job done fast and with extreme prejudice.]
-
-playermodeldir = [getalias (concatword "playermodeldir" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelicon = [getalias (concatword "playermodelicon" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelname = [getalias (concatword "playermodelname" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelstory = [getalias (concatword "playermodelstory" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-
-playsong = [ music (concatword "music/1.ogg") playsong ]
-- 
cgit v1.2.3