From c79dda69d6e603500a5681430172b5152041af0a Mon Sep 17 00:00:00 2001 From: xolatile Date: Thu, 17 Jul 2025 23:28:55 +0200 Subject: Big changed mentioned in IRC channel... --- data/default_map_models.cfg | 412 ------------------------------------------ data/default_map_settings.cfg | 113 +----------- data/defaults.cfg | 13 -- data/font.cfg | 3 - data/game_fps.cfg | 48 +---- data/menus.cfg | 188 ------------------- data/sounds.cfg | 2 + 7 files changed, 10 insertions(+), 769 deletions(-) delete mode 100644 data/default_map_models.cfg delete mode 100644 data/font.cfg (limited to 'data') diff --git a/data/default_map_models.cfg b/data/default_map_models.cfg deleted file mode 100644 index 20cd1eb..0000000 --- a/data/default_map_models.cfg +++ /dev/null @@ -1,412 +0,0 @@ -mapmodelreset // start counting from 0 again - -mmodel "tree1" // 0 - -mmodel "dcp/tree2" // 1 -mmodel "dcp/tree3" // 2 -mmodel "dcp/palmtree" // 3 -mmodel "dcp/thorns" // 4 -mmodel "dcp/plant1" // 5 -mmodel "dcp/grass" // 6 -mmodel "dcp/ivy" // 7 - -mmodel "dcp/barrel" // 8 -mmodel "dcp/streetlamp" // 9 -mmodel "dcp/bench" // 10 -mmodel "dcp/pillar" // 11 -mmodel "dcp/waterbowl" // 12 -mmodel "dcp/jumppad2" // 13 - -mmodel "dcp/leafs" // 14 -mmodel "dcp/valve" // 15 -mmodel "dcp/palette" // 16 - -mmodel "dcp/vent" // 17 -mmodel "dcp/mushroom" // 18 -mmodel "dcp/biotank" // 19 - -mmodel "dcp/groundlamp" // 20 -mmodel "dcp/console" // 21 -mmodel "dcp/turret" // 22 - -// for use as triggers: - -mmodel "carrot" // 23 -mmodel "switch1" // 24 -mmodel "switch2" // 25 - -mmodel "doors/door_01" // 26 -mmodel "doors/door_02" // 27 -mmodel "doors/door_03" // 28 - -// useful default triggers to use with these: - -level_trigger_1 = [ - if (= $triggerstate -1) [echo "This door is opened elsewhere."] -] - -mmodel "dcp/cask" // 29 -mmodel "dcp/cart" // 30 -mmodel "dcp/candle" // 31 -mmodel "dcp/vase" // 32 -mmodel "dcp/sack" // 33 -mmodel "dcp/chandelier" // 34 -mmodel "dcp/chest" // 35 -mmodel "dcp/firebowl" // 36 -mmodel "dcp/smplant" // 37 -mmodel "dcp/insect" // 38 -mmodel "dcp/reed" // 39 - -mmodel "makke/nocamp" // 40 -mmodel "makke/strahler" // 41 - -mmodel "tentus/food-drink/goblet" // 42 -mmodel "tentus/food-drink/apple" // 43 -mmodel "tentus/food-drink/pear" // 44 -mmodel "tentus/food-drink/appleslice" // 45 -mmodel "tentus/food-drink/meat" // 46 -mmodel "tentus/food-drink/bowl" // 47 -mmodel "tentus/food-drink/pieslice" // 48 -mmodel "tentus/food-drink/mug" // 49 -mmodel "tentus/food-drink/winebottle" // 50 -mmodel "tentus/food-drink/pie" // 51 - -mmodel "tentus/books/flat" // 52 -mmodel "tentus/books/multi" // 53 -mmodel "tentus/chains/chain" // 54 -mmodel "tentus/chains/curvechain" // 55 - -mmodel "tentus/barrel" // 56 -mmodel "tentus/sidebarrel" // 57 -mmodel "tentus/pot1" // 58 -mmodel "tentus/rope" // 59 -mmodel "tentus/ropelamp" // 60 -mmodel "tentus/ladder" // 61 - -mmodel "tentus/fattree" // 62 -mmodel "tentus/moneybag" // 63 -mmodel "tentus/woodbench" // 64 -mmodel "tentus/hammer" // 65 -mmodel "tentus/anvil" // 66 -mmodel "tentus/spear" // 67 -mmodel "tentus/key" // 68 -mmodel "tentus/redshield" // 69 -mmodel "tentus/greenshield" // 70 -mmodel "tentus/bombs" // 71 - -mmodel "objects/window01" // 72 -mmodel "objects/sign01" // 73 -mmodel "objects/lamp01" // 74 -mmodel "objects/chair01" // 75 -mmodel "objects/bed01" // 76 -mmodel "vegetation/tree00" // 77 -mmodel "vegetation/tree01" // 78 -mmodel "vegetation/bush01" // 79 -mmodel "vegetation/tree02" // 80 -mmodel "vegetation/tree04" // 81 -mmodel "vegetation/tree05" // 82 -mmodel "vegetation/tree06" // 83 -mmodel "vegetation/tree07" // 84 -mmodel "vegetation/tree03" // 85 -mmodel "objects/window02/window02_1" // 86 -mmodel "objects/window02/window02_2" // 87 -mmodel "objects/bench01" // 88 -mmodel "objects/lantern01" // 89 -mmodel "objects/lantern02" // 90 -mmodel "objects/woodchop" // 91 -mmodel "objects/table01" // 92 -mmodel "objects/torch" // 93 -mmodel "objects/torch_cold" // 94 -mmodel "objects/fire" // 95 -mmodel "objects/sail01" // 96 -mmodel "objects/well_base" // 97 -mmodel "objects/well_roof" // 98 -mmodel "objects/lamp02" // 99 -mmodel "objects/med_chand" // 100 - -mmodel "objects/axe" // 101 -mmodel "xeno/box1" // 102 -mmodel "xeno/box2" // 103 -mmodel "vegetation/tree08" // 104 -mmodel "vegetation/tree09" // 105 -mmodel "vegetation/tree10" // 106 -mmodel "vegetation/tree11" // 107 -mmodel "vegetation/tree12" // 108 -mmodel "vegetation/weeds" // 109 -mmodel "psionic/barrel2" // 110 -mmodel "psionic/crate4" // 111 -mmodel "aftas/machina/machina1" // 112 -mmodel "aftas/machina/machina2" // 113 -mmodel "mitaman/chainlinkfence" // 114 -mmodel "mitaman/floorgrate1" // 115 -mmodel "mitaman/floorgrate3" // 116 -mmodel "mitaman/locker1" // 117 -mmodel "mitaman/locker3" // 118 -mmodel "objects/minekart" // 119 -mmodel "objects/oillamp" // 120 -mmodel "objects/millblade" // 121 -mmodel "makke/mugs/mug01" // 122 -mmodel "makke/mugs/mug02" // 123 -mmodel "makke/mugs/mug03" // 124 -mmodel "aftas/caixa" // 125 -mmodel "aftas/lampada" // 126 -mmodel "aftas/arvores/arg" // 127 -mmodel "aftas/arvores/arp" // 128 -mmodel "makke/arch" // 129 -mmodel "makke/fork" // 130 -mmodel "makke/moon" // 131 -mmodel "makke/planet" // 132 -mmodel "makke/spoon" // 133 -mmodel "makke/tricky/sign1" // 134 -mmodel "makke/tricky/sign2" // 135 -mmodel "makke/tricky/sign3" // 136 -mmodel "makke/tricky/sign4" // 137 -mmodel "dcp/hanginlamp" // 138 -mmodel "tentus/magic" // 139 - -mmodel "dcp/bin" // 140 -mmodel "dcp/bulb" // 141 -mmodel "dcp/cbbox" // 142 -mmodel "dcp/grate" // 143 -mmodel "dcp/switch2a" // 144 -mmodel "dcp/ventflap" // 145 -mmodel "mitaman/door_06" // 146 -mmodel "mitaman/door_07" // 147 -mmodel "mitaman/door_08" // 148 -mmodel "mitaman/door_09" // 149 -mmodel "mitaman/door_10" // 150 -mmodel "mitaman/plat01" // 151 -mmodel "mitaman/wirefence" // 152 -mmodel "mitaman/woodboard" // 153 -mmodel "steve_e/doors/trapdoor" // 154 -mmodel "steve_e/doors/trapdoor/trapdoor_150" // 155 -mmodel "steve_e/doors/trapdoor/trapdoor_200" // 156 -mmodel "doors/door_04" // 157 -mmodel "dcp/blade_x" // 158 -mmodel "dcp/blade_y" // 159 - -//Justice -mmodel "mapmodels/justice/pad/jump" // 160 -mmodel "mapmodels/justice/pad/teleport" // 161 -mmodel "mapmodels/justice/pad/teledest" // 162 -mmodel "mapmodels/justice/block" // 163 -mmodel "mapmodels/justice/exit-sign" // 164 -mmodel "mapmodels/justice/vending" // 165 -mmodel "mapmodels/justice/railings/01" // 166 -mmodel "mapmodels/justice/railings/02" // 167 - -mmodel "angel" // 168 -mmodel "crow" // 169 - -mmodel "mapmodels/nieb/tree_dead" // 170 -mmodel "mapmodels/nieb/shark_sign" // 171 -mmodel "mapmodels/nieb/torso" // 172 -mmodel "mapmodels/nieb/sandcastle" // 173 -mmodel "mapmodels/nieb/plant01" // 174 -mmodel "mapmodels/nieb/plant02" // 175 -mmodel "mapmodels/nieb/sign_no-exit" // 176 - -mmodel "skull" // 177 - -mmodel "mapmodels/sitters/gothic/skelet1" // 178 -mmodel "mapmodels/sitters/gothic/skelet2" // 179 -mmodel "mapmodels/sitters/gothic/skelet3" // 180 - -mmodel "mapmodels/quakish/grim_reaper/adam" // 181 -mmodel "mapmodels/quakish/grim_reaper/grim" // 182 -mmodel "mapmodels/quakish/grim_reaper/vehementi" // 183 - -mmodel "mapmodels/yves_allaire/e6/e6fanblade/horizontal" // 184 -mmodel "mapmodels/yves_allaire/e6/e6fanblade/vertical" // 185 - -mmodel "mapmodels/nieb/bush_dead1" // 186 -mmodel "mapmodels/nieb/bush_dead2" // 187 - -mmodel "mapmodels/justice/cannon_copter" // 188 - -mmodel "mapmodels/ard/vegetation/bigtree" // 189 -mmodel "mapmodels/ard/vegetation/mediumtree1" // 190 -mmodel "mapmodels/ard/vegetation/mediumtree2" // 191 -mmodel "mapmodels/ard/vegetation/smalltree" // 192 - -mmodel "mapmodels/simonoc/effect/blue" // 193 -mmodel "mapmodels/simonoc/effect/cyan" // 194 -mmodel "mapmodels/simonoc/effect/green" // 195 -mmodel "mapmodels/simonoc/effect/red" // 196 -mmodel "mapmodels/simonoc/effect/violet" // 197 -mmodel "mapmodels/simonoc/effect/yellow" // 198 -mmodel "mapmodels/simonoc/effect/blue_v" // 199 -mmodel "mapmodels/simonoc/effect/cyan_v" // 200 -mmodel "mapmodels/simonoc/effect/green_v" // 201 -mmodel "mapmodels/simonoc/effect/red_v" // 202 -mmodel "mapmodels/simonoc/effect/violet_v" // 203 -mmodel "mapmodels/simonoc/effect/yellow_v" // 204 - -mmodel "ao1/e_station" // 205 -mmodel "ao1/e_station/horiz" // 206 -mmodel "ao1/e_station/small" // 207 -mmodel "ao1/metro/graffiti/aracari" // 208 -mmodel "ao1/metro/graffiti/ironmetro" // 209 -mmodel "ao1/metro/graffiti/necedemalis" // 210 -mmodel "ao1/metro/graffiti/see" // 211 -mmodel "ao1/metro/graffiti/warning" // 212 -mmodel "ao1/metro/sign/citymap" // 213 -mmodel "ao1/metro/sign/flyingcar" // 214 -mmodel "ao1/metro/sign/player" // 215 -mmodel "checkpoint" // 216 -mmodel "cleaner/gutter_45_big" // 217 -mmodel "dcp/blade_x/big" // 218 -mmodel "dcp/blade_x/fast" // 219 -mmodel "dcp/blade_x/mid" // 220 -mmodel "dcp/blade_y/big" // 221 -mmodel "dcp/blade_y/collide" // 222 -mmodel "dcp/blade_y/fast" // 223 -mmodel "dcp/blade_y/giant" // 224 -mmodel "dcp/firebowl_no_fire" // 225 -mmodel "mapmodels/a_slow_old_man/rat_sitting" // 226 -mmodel "mapmodels/gibc" // 227 -mmodel "mapmodels/gibh" // 228 -mmodel "mapmodels/justice/cabinet" // 229 -mmodel "mapmodels/justice/cc_screen" // 230 -mmodel "mapmodels/justice/cc_table" // 231 -mmodel "mapmodels/justice/console1/01" // 232 -mmodel "mapmodels/justice/console1/02" // 233 -mmodel "mapmodels/justice/decals/01" // 234 -mmodel "mapmodels/justice/decals/02" // 235 -mmodel "mapmodels/justice/poster/1" // 236 -mmodel "mapmodels/justice/poster/2" // 237 -mmodel "mapmodels/justice/poster/3" // 238 -mmodel "mapmodels/justice/switch" // 239 -mmodel "mapmodels/justice/vent" // 240 -mmodel "mapmodels/makke/gutter_h_big" // 241 -mmodel "mapmodels/makke/gutter_h_big/trak5" // 242 -mmodel "mapmodels/makke/gutter_v_big" // 243 -mmodel "mapmodels/memoria/decals" // 244 -mmodel "mapmodels/nieb/clockhand/long" // 245 -mmodel "mapmodels/nieb/clockhand/short" // 246 -mmodel "mapmodels/nieb/ladder45" // 247 -mmodel "mapmodels/nieb/tree_dead_nocollide" // 248 -mmodel "mapmodels/nieb/waterfall/1" // 249 -mmodel "mapmodels/nieb/waterfall/2" // 250 -mmodel "mapmodels/nieb/waterfall/3" // 251 -mmodel "mapmodels/nieb/waterfall/4" // 252 -mmodel "mapmodels/ow/flowerfield" // 253 -mmodel "mapmodels/ow/head/head_1" // 254 -mmodel "mapmodels/ow/head/head_2" // 255 -mmodel "mapmodels/ow/jump" // 256 -mmodel "mapmodels/ow/moss" // 257 -mmodel "mapmodels/ow/pad" // 258 -mmodel "mapmodels/ow/tarp" // 259 -mmodel "mapmodels/ow/tree" // 260 -mmodel "mapmodels/ow/tree2" // 261 -mmodel "mapmodels/ow/tree3" // 262 -mmodel "mapmodels/ow/tree4" // 263 -mmodel "mapmodels/quakish/tombstones/tombstone01" // 264 -mmodel "mapmodels/quakish/tombstones/tombstone02" // 265 -mmodel "mapmodels/quakish/tombstones/tombstone03" // 266 -mmodel "mapmodels/quakish/tombstones/tombstone04" // 267 -mmodel "mapmodels/quakish/tombstones/tombstone05" // 268 -mmodel "mapmodels/toca/industrialpipes/horz" // 269 -mmodel "mapmodels/toca/industrialpipes/ldwn" // 270 -mmodel "mapmodels/toca/industrialpipes/lleft" // 271 -mmodel "mapmodels/toca/industrialpipes/lright" // 272 -mmodel "mapmodels/toca/industrialpipes/lup" // 273 -mmodel "mapmodels/toca/industrialpipes/vert" // 274 -mmodel "mapmodels/toca/radioactivedrum" // 275 -mmodel "mapmodels/toca/radioactivedrum2" // 276 -mmodel "mapmodels/toca/signs/radioactive" // 277 -mmodel "mapmodels/toca/signs/restricted" // 278 -mmodel "mapmodels/tubes/ladder" // 279 -mmodel "mapmodels/yves_allaire/e7/e7wgrate/32x64_h" // 280 -mmodel "mapmodels/yves_allaire/e7/e7wgrate/32x64_v" // 281 -mmodel "mapmodels/yves_allaire/e7/e7wgrate/64x32_v" // 282 -mmodel "meister/coclea" // 283 -mmodel "meister/gear" // 284 -mmodel "meister/grinder" // 285 -mmodel "meister/puleggia" // 286 -mmodel "meister/silos" // 287 -mmodel "mitaman/floorgrate1/crnsp1" // 288 -mmodel "monster/bauul" // 289 -mmodel "monster/goblin" // 290 -mmodel "monster/hellpig" // 291 -mmodel "monster/knight" // 292 -mmodel "monster/rat" // 293 -mmodel "monster/rhino" // 294 -mmodel "monster/slith" // 295 -mmodel "monster/spider" // 296 -mmodel "pyccna/toxicity/tendril" // 297 -mmodel "pyccna/toxicity/testtube" // 298 -mmodel "pyccna/toxicity/testtube_mutated" // 299 -mmodel "pyccna/toxicity/testtube_severe" // 300 -mmodel "razgriz/effects/magic/blue_h" // 301 -mmodel "razgriz/effects/magic/blue_h_large" // 302 -mmodel "razgriz/effects/magic/blue_h_small" // 303 -mmodel "razgriz/effects/magic/blue_v" // 304 -mmodel "razgriz/effects/magic/blue_v_large" // 305 -mmodel "razgriz/effects/magic/blue_v_small" // 306 -mmodel "razgriz/effects/magic/red_h" // 307 -mmodel "razgriz/effects/magic/red_h_large" // 308 -mmodel "razgriz/effects/magic/red_h_small" // 309 -mmodel "razgriz/effects/magic/red_v" // 310 -mmodel "razgriz/effects/magic/red_v_large" // 311 -mmodel "razgriz/effects/magic/red_v_small" // 312 -mmodel "razgriz/flora/bushes/medium_bush1" // 313 -mmodel "razgriz/flora/bushes/medium_bush2" // 314 -mmodel "razgriz/flora/bushes/medium_bush3" // 315 -mmodel "razgriz/flora/bushes/medium_bush4" // 316 -mmodel "razgriz/flora/bushes/medium_bush5" // 317 -mmodel "razgriz/flora/bushes/tall_bush1" // 318 -mmodel "razgriz/flora/bushes/tall_bush2" // 319 -mmodel "razgriz/flora/bushes/tall_bush3" // 320 -mmodel "razgriz/flora/bushes/tall_bush4" // 321 -mmodel "razgriz/flora/log1" // 322 -mmodel "razgriz/flora/plant1" // 323 -mmodel "razgriz/flora/plant2" // 324 -mmodel "razgriz/flora/shroom1" // 325 -mmodel "razgriz/flora/shroom2" // 326 -mmodel "razgriz/flora/shroom3" // 327 -mmodel "razgriz/insects/butterfly/blue" // 328 -mmodel "razgriz/insects/butterfly/brown" // 329 -mmodel "razgriz/insects/butterfly/green" // 330 -mmodel "razgriz/insects/butterfly/orange" // 331 -mmodel "razgriz/insects/butterfly/pink" // 332 -mmodel "razgriz/insects/butterfly/red" // 333 -mmodel "razgriz/insects/butterfly/yellow" // 334 -mmodel "razgriz/insects/firefly" // 335 -mmodel "razgriz/objects/gem_cap/blue_h" // 336 -mmodel "razgriz/objects/gem_cap/blue_v" // 337 -mmodel "razgriz/objects/gem_cap/red_h" // 338 -mmodel "razgriz/objects/gem_cap/red_v" // 339 -mmodel "razgriz/objects/torch" // 340 -mmodel "razgriz/rocks/set1/1" // 341 -mmodel "razgriz/rocks/set1/2" // 342 -mmodel "razgriz/rocks/set1/3" // 343 -mmodel "razgriz/rocks/set1/4" // 344 -mmodel "razgriz/rocks/set1/5" // 345 -mmodel "razgriz/rocks/set1/6" // 346 -mmodel "razgriz/rocks/set1/7" // 347 -mmodel "razgriz/rocks/set1/8" // 348 -mmodel "razgriz/rocks/set1/9" // 349 -mmodel "razgriz/rocks/set2/1" // 350 -mmodel "razgriz/rocks/set2/2" // 351 -mmodel "razgriz/rocks/set2/3" // 352 -mmodel "razgriz/rocks/set2/4" // 353 -mmodel "razgriz/rocks/set2/5" // 354 -mmodel "rpg/characters/dragon" // 355 -mmodel "rpg/characters/grizzly" // 356 -mmodel "rpg/characters/horse" // 357 -mmodel "rpg/characters/mman" // 358 -mmodel "rpg/characters/npcman" // 359 -mmodel "rpg/characters/rat" // 360 -mmodel "rpg/characters/wolf" // 361 -mmodel "rpg/objects/coin" // 362 -mmodel "skull/blue" // 363 -mmodel "skull/red" // 364 -mmodel "vegetation/tree03_sprite" // 365 -mmodel "vurt/flora/aspen1" // 366 -mmodel "vurt/flora/aspen2" // 367 -mmodel "vurt/flora/pine1" // 368 -mmodel "vurt/flora/pine2" // 369 -mmodel "vurt/flora/pine3" // 370 -mmodel "vurt/flora/pine4" // 371 -mmodel "wohsiesta/tree" // 372 diff --git a/data/default_map_settings.cfg b/data/default_map_settings.cfg index ab077dd..706ee0a 100644 --- a/data/default_map_settings.cfg +++ b/data/default_map_settings.cfg @@ -4,23 +4,21 @@ // "package.cfg" in the package dir of the map, and ".cfg", // which you can use to override the settings in this file. -exec "data/default_map_models.cfg" - // the skybox for this map: if (strcmp $skybox "") [ - skybox "skyboxes/remus/sky01" + skybox "skyboxes/black" ] materialreset -texture water "golgotha/water2.jpg" // water surface +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 lava "dg/floor_lava2.jpg" 0 0 0 2 // lava surface -texture 1 "dg/floor_lava2.jpg" 0 0 0 2 // falling lava +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 definitions for the map: texturereset // starts the texture slot/index at 0 @@ -28,108 +26,7 @@ texturereset // starts the texture slot/index at 0 texture 0 "textures/sky.png" // dummy sky texture texture 0 "textures/default.png" // default geometry texture - texture 0 "aard/aardograss_1.jpg" - autograss "textures/grass_aard.png" - texture 0 "ik2k/ik_floor_brick128a.jpg" - texture 0 "ik2k/ik_floor_wood128b.jpg" - texture 0 "ik2k/ik_ground_cobbles128.jpg" - texture 0 "ik2k/ik_brick_3216d.jpg" - texture 0 "ik2k/ik_brick_6464c.jpg" - - exec "packages/dg/package.cfg" - exec "packages/tech1soc/package.cfg" - exec "packages/ik2k/package.cfg" - exec "packages/ikbase/package.cfg" - exec "packages/payne/package.cfg" - exec "packages/than_ind/package.cfg" - exec "packages/jf1/package.cfg" - - // misc textures (mine/schwenz/some tech1soc) - setshader stdworld - texture 0 "aard/aardfdry256_1.jpg" - texture 0 "tech1soc/spring3.jpg" - texture 0 "tech1soc/sqrlig02wb.jpg" - texture 0 "tech1soc/sqrlig03bc.jpg" - texture 0 "tech1soc/zdetlig01bb.jpg" - texture 0 "tech1soc/zdetlig02bb.jpg" - texture 0 "aard/aardmbr16_2.jpg" - texture 0 "tech1soc/zdetlig04bb.jpg" - texture 0 "tech1soc/zdet_trim2a.jpg" - texture 0 "aard/aardmmet32_1.jpg" - texture 0 "tech1soc/zdet_trim5b.jpg" - texture 0 "schwenz/dt_tile_check.01.jpg" - - exec "packages/egyptsoc/package.cfg" - exec "packages/rorschach/package2.cfg" - exec "packages/subverse/package.cfg" - exec "packages/g_pack/package.cfg" - - // missing jf & tech1soc textures - setshader stdworld - texture 0 "jf1/jfsquare.jpg" - texture 0 "jf1/jfyellow.jpg" - texture 0 "tech1soc/jp11a.jpg" - texture 0 "tech1soc/flr_tmtl_drk.jpg" - - exec "packages/lunaran/package.cfg" - exec "packages/gibbie/package.cfg" - exec "packages/philipk/package.cfg" - exec "packages/gor/package.cfg" - exec "packages/aftas/package.cfg" - exec "packages/mitaman/package.cfg" - exec "packages/noctua/package.cfg" - exec "packages/loopix/package.cfg" - exec "packages/g_pack/package2.cfg" - - // Misc textures - setshader stdworld - texture 0 "textures/nieb/rock01.jpg" - setshader bumpspecmapworld - setshaderparam "specscale" 0.25 0.25 0.25 - texture 0 "ikbase/specialbrick.jpg" - texture n "ikbase/specialbrick_normal.jpg" - - exec "packages/painkillah/package.cfg" - exec "packages/tomek/package.cfg" - exec "packages/textures/nieb/package.cfg" - exec "packages/trak5/package.cfg" - exec "packages/textures/nieb/garden/package.cfg" - exec "packages/textures/medieval_soc/package.cfg" - exec "packages/textures/terrain_soc/package.cfg" - exec "packages/textures/nieb/autumn/package.cfg" - exec "packages/textures/nieb/clone/package.cfg" - exec "packages/textures/nieb/suite/package.cfg" - - // Blikje bier - exec "packages/blikjebier/akaritori/package2.cfg" - exec "packages/blikjebier/concrete/package.cfg" - exec "packages/blikjebier/metal/package.cfg" - - setshader stdworld - texture 0 "blikjebier/ground/ground1.jpg" - texture 0 "blikjebier/ground/ground2.jpg" - texture 0 "blikjebier/ground/ground3.jpg" - texture 0 "blikjebier/ground/ground4.jpg" - texture 0 "blikjebier/ground/ground5.jpg" - texture 0 "blikjebier/ground/g1mm.jpg" - - texture 0 "blikjebier/snow/clear_snow.jpg" - texture 0 "blikjebier/snow/dirty_snow.jpg" - - exec "packages/egyptsoc/package2.cfg" - exec "packages/textures/fatum/package.cfg" - exec "packages/textures/philipk/pk02/package.cfg" - exec "packages/textures/yves_allaire/ex/package.cfg" - exec "packages/dg/package2.cfg" - - setshader stdworld - texture 0 "makke/dirt01.jpg" - texture 0 "makke/dirt02.jpg" - texture 0 "makke/platten.jpg" - texture 0 "makke/platten_var1.jpg" - texture 0 "textures/nieb/bonepile.jpg" - - exec "packages/textures/swatllama/package.cfg" + exec "packages/textures/ex/package.cfg" // for cfgs that don't set shaders... setshader stdworld diff --git a/data/defaults.cfg b/data/defaults.cfg index 41b978f..def87ff 100644 --- a/data/defaults.cfg +++ b/data/defaults.cfg @@ -36,15 +36,6 @@ bind DOWN "backward" bind RIGHT "right" bind LEFT "left" -// old style weapon binds -//bind 0 "weapon 0 1 2" -//bind 1 "weapon 1 2 4" -//bind 2 "weapon 2 1 4" -//bind 3 "weapon 3 4 2" -//bind 4 "weapon 4 3 2" -//bind 5 "weapon 5 3 1" -//bind 6 "weapon 6 2 4" - // new style weapon binds bind 0 "setweapon FI" bind 1 "setweapon SG" @@ -64,8 +55,6 @@ specbind MOUSE2 "nextfollow -1" specbind MOUSE3 "follow" specbind SPACE "follow" -bind R dropflag - bind TAB "showscores" bind T "saycommand" @@ -76,8 +65,6 @@ bind SLASH "saycommand /" bind I taunt bind E edittoggle -bind LCTRL "allowspedit" -bind RCTRL "allowspedit" bind KP_MINUS "conskip 5" bind KP_PLUS "conskip -1000" diff --git a/data/font.cfg b/data/font.cfg deleted file mode 100644 index 64723ea..0000000 --- a/data/font.cfg +++ /dev/null @@ -1,3 +0,0 @@ -exec "packages/fonts/default.cfg" -exec "packages/hud/digit_font.cfg" - diff --git a/data/game_fps.cfg b/data/game_fps.cfg index 87fdcd3..9f9a7f1 100644 --- a/data/game_fps.cfg +++ b/data/game_fps.cfg @@ -6,68 +6,26 @@ sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [ mapcomplete = [ complete $arg1 packages/base ogz ] mapcomplete map -modenames = "ffa coop teamplay insta instateam effic efficteam tac tacteam capture regencapture ctf instactf protect instaprotect hold instahold efficctf efficprotect effichold collect instacollect efficcollect" +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 ] -spmodenames = "sp dmsp" -loop i (listlen $spmodenames) [ - mname = (at $spmodenames $i) - alias $mname [ if (mode (- @i 3)) [if (> $numargs 0) [map $arg1] [map]] ] - mapcomplete $mname -] - -complete importcube packages/cube cgz - demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ] varcomplete demo demodir dmo -speditlock = 1 -allowspedit = [ speditlock = 0; onrelease [speditlock = 1] ] - -allowedittoggle = [ - if (&& (m_sp (getmode)) $speditlock) [ - error "you must hold" (prettylist (searchbinds "allowspedit") "or") "to toggle editing in single player modes" - result 0 - ] [ - result 1 - ] -] - -playermodelnum = 5 +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.] -playermodeldir1 = "snoutx10k" -playermodelicon1 = "snoutx10k" -playermodelname1 = "IronSnout X10K" -playermodelstory1 = [IronSnout X10K is a hybrid model of the IronSnout series. Bred in the bowels of a top secret underground facility, this walking fragging machine is for one purpose: to annihilate the opposition. Part pig, part machine, IronSnout X10K knows no fear and fears no fragger.] - -playermodeldir2 = "ogro2" -playermodelicon2 = "ogro" -playermodelname2 = "Ogro" -playermodelstory2 = [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.] - -playermodeldir3 = "inky" -playermodelicon3 = "inky" -playermodelname3 = "Inky" -playermodelstory3 = [Inky is the aspiring younger sibling of an infamous transdimensional celebrity. Often teased as being only the "Lesser Evil", Inky searches the battlefields for infamy of his own, claiming it one fragger at a time.] - -playermodeldir4 = "captaincannon" -playermodelicon4 = "captaincannon" -playermodelname4 = "Captain Cannon" -playermodelstory4 = [Cannon Jones dared to imbibe the old imported beer can that had languished at the bottom of his refrigerator. Unbeknownst to Cannon, it had been bombarded with stray gamma radiation. After some serious indigestion, the mild-mannered Cannon Jones became the mighty Captain Cannon! Captain Cannon now has only one known weakness: his overbearingly righteous sense of justice.] - 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 "fanatic/" (+ 1 (rnd 8)) ".ogg") playsong ] - +playsong = [ music (concatword "music/1.ogg") playsong ] diff --git a/data/menus.cfg b/data/menus.cfg index 7fbdf38..c9e3bc8 100644 --- a/data/menus.cfg +++ b/data/menus.cfg @@ -16,11 +16,8 @@ checkrolloveraction = [ ] ] -chooseplayermodel = [guirolloveraction = (playermodelbutton $playermodel); showgui playermodel] - newgui main [ guilist [ - guiimage (concatword "packages/icons/" (playermodelicon) ".jpg") [chooseplayermodel] 1.15 guistrut 0.25 guilist [ newname = (getname) @@ -41,8 +38,6 @@ newgui main [ guibutton "editing.." "showgui editing" ] guibutton "vote game mode / map.." "showgui gamemode" - // guibutton "lanconnect" - // guibutton "connect localhost" guibutton "switch team" [if (strcmp (getteam) "good") [team evil] [team good]] guibutton "toggle spectator" [spectator (! (isspectator (getclientnum)))] "spectator" guibutton "master.." [showgui master] @@ -51,7 +46,6 @@ newgui main [ guibutton "disconnect" "disconnect" "exit" ] [ guibutton "bot match.." "showgui botmatch" - guibutton "campaign.." "showgui campaign" guibar guibutton "options.." "showgui options" guibutton "about.." "showgui about" @@ -282,28 +276,6 @@ showcustommaps = [ custommaps = (sortlist $custommaps x y [naturalsort $x $y]) showgui custommaps ] -macro playermodelbutton [cleargui 1; playermodel %1] - -newgui playermodel [ - guilist [ - guilist [ - loop i $playermodelnum [ - guibutton (playermodelname $i) (playermodelbutton $i) (playermodelicon $i) - ] - ] - guibar - pmidx = (substr $guirolloveraction (strlen (playermodelbutton ""))) - pmidx = (max 0 (min (- $playermodelnum 1) $pmidx)) - guilist [ - guilist [ - guispring - guiplayerpreview $pmidx 0 6 (checkrolloveraction "playermodel ") 4 1 (playermodelname $pmidx) - guispring - ] - guitextbox (playermodelstory $pmidx) 40 9 - ] - ] -] crosshairs = [ "data/crosshair.png data/crosshair_hit.png" @@ -411,43 +383,6 @@ newgui botmatch [ guibutton "start match.." [guionclear [startbotmatch]; showgui gamemode] ] "bot match" -newgui campaign [ - guibutton "start Private Stan Sauer" "showgui privatestansauer" - guibutton "start An Army Of One" "showgui armyofone" - guibutton "start Lost" "sp lost" "cube" - guibutton "start Meltdown" "sp skrsp1" "cube" - guibutton "start Missile Pass" "sp crnsp1" "cube" - guibutton "start Level 9" "sp level9" "cube" - guibar - guibutton "start DMSP map.." "mode -2; showgui maps" - guicheckbox "slow motion" "slowmosp" - guitext "skill (default: 3)" - guislider skill -] - -newgui armyofone [ - guilist [ - guilist [ - guibutton "Part I" "sp mpsp6a" "cube" - guibutton "Part II" "sp mpsp6b" "cube" - guibutton "Part III" "sp mpsp6c" "cube" - ] - showmapshot (substr $guirolloveraction 3) - ] -] "An Army Of One" - -newgui privatestansauer [ - guilist [ - guilist [ - guibutton "Run N' Gun Part I" "sp mpsp9a" "cube" - guibutton "Run N' Gun Part II" "sp mpsp9b" "cube" - guibutton "Run N' Gun Part III" "sp mpsp9c" "cube" - guibutton "THE SERIOUSLY BIG VALLEY" "sp mpsp10" "cube" - ] - showmapshot (substr $guirolloveraction 3) - ] -] "Private Stan Sauer" - newgui servers [ guistayopen [ guiservers [ @@ -479,26 +414,8 @@ newgui gamemode [ guibutton "instagib team" "mode 4; showgui maps" guibutton "efficiency" "mode 5; showgui maps" guibutton "efficiency team" "mode 6; showgui maps" - guibutton "tactics" "mode 7; showgui maps" - guibutton "tactics team" "mode 8; showgui maps" - guibutton "capture" "mode 9; showgui capturemaps" - guibutton "regen capture" "mode 10; showgui capturemaps" ] guibar - guilist [ - guibutton "ctf" "mode 11; showgui ctfmaps" - guibutton "insta ctf" "mode 12; showgui ctfmaps" - guibutton "efficiency ctf" "mode 17; showgui ctfmaps" - guibutton "protect" "mode 13; showgui ctfmaps" - guibutton "insta protect" "mode 14; showgui ctfmaps" - guibutton "efficiency protect" "mode 18; showgui ctfmaps" - guibutton "hold" "mode 15; showgui capturemaps" - guibutton "insta hold" "mode 16; showgui capturemaps" - guibutton "efficiency hold" "mode 19; showgui capturemaps" - guibutton "collect" "mode 20; showgui ctfmaps" - guibutton "insta collect" "mode 21; showgui ctfmaps" - guibutton "efficiency collect" "mode 22; showgui ctfmaps" - ] ] ] @@ -949,60 +866,7 @@ guitab "cfg" /////////////////////////////////////////////////////////////////// ] skies1 = [ - aftas/sky/orbe - blindabuser/blindasky - blindabuser/blindasky2 - darc/forge - dash/moon - hazel/green - humus/meadow - ik2k/env/iklake - jon/prarie - mayhem/duomo - mayhem/eclipse - meister/uzze - penguins/arid - penguins/arid2 - penguins/cocoa - penguins/divine - penguins/harmony - penguins/mellow - penguins/mystic -] -skies2 = [ - penguins/violence - penguins/wrath - penguins/yonder - penguins/zeus - ratboy/skyboxes/coward - shmutzwurst/london skyboxes/black - skyboxes/bbk/d - skyboxes/bbk/dark2 - skyboxes/bbk/n1 - skyboxes/bbk/t - skyboxes/clearsky052 - skyboxes/darkness - skyboxes/evilsky - skyboxes/morning - skyboxes/remus/sky01 - skyboxes/turbulent - skyboxes/ulukai/corona - skyboxes/white -] -skies3 = [ - socksky/barren - socksky/desert - socksky/devpun - socksky/emerald - socksky/frozen - socksky/frozendusk - socksky/grave - socksky/mars - socksky/nightball - socksky/stratosphere - socksky/valley - staffy/staffy ] genskyitems = [ @@ -1125,44 +989,6 @@ newgui materials [ //guibutton "water waves off" "waterwaves 0" ] -newgui triggers [ - guibutton [invisible] [BTmm = -1; showgui trigger2] - guibutton [a carrot] [BTmm = 23; showgui trigger2] - guibutton [switch #1] [BTmm = 24; showgui trigger2] - guibutton [switch #2] [BTmm = 25; showgui trigger2] - guibutton [door #1] [BTmm = 26; showgui trigger2] - guibutton [door #2] [BTmm = 27; showgui trigger2] - guibutton [door #3] [BTmm = 28; showgui trigger2] -] - -newgui trigger2 [ - guibutton [animation loop] [BTtt = 0; showgui trigger3] - guibutton [trigger once (popback)] [BTtt = 1; showgui trigger3] - guibutton [trigger once (popback & rumble)] [BTtt = 2; showgui trigger3] - guibutton [trigger once] [BTtt = 3; showgui trigger3] - guibutton [trigger once (rumble)] [BTtt = 4; showgui trigger3] - guibutton [trigger multiple (popback)] [BTtt = 5; showgui trigger3] - guibutton [trigger multiple (popback & rumble)] [BTtt = 6; showgui trigger3] - guibutton [trigger multiple] [BTtt = 7; showgui trigger3] - guibutton [trigger multiple (rumble)] [BTtt = 8; showgui trigger3] - guibutton [door (open once)] [BTtt = 9; showgui trigger3] - guibutton [door (auto close)] [BTtt = 10; showgui trigger3] - guibutton [door (locked)] [BTtt = 11; showgui trigger3] - guibutton [vanishing trigger] [BTtt = 12; showgui trigger3] - guibutton [vanishing trigger (rumble)] [BTtt = 13; showgui trigger3] - guibutton [End Of Level Trigger] [BTtt = 29; showgui trigger3] -] - -build_trigger = [newent mapmodel $BTmm $BTtt $BTti] - -newgui trigger3 [ - loop i 9 [ - tjt = (concat tag (concatword # $i)) - tjc = (concat BTti "=" $i ";" "build_trigger") - guibutton $tjt $tjc - ] -] - resetlight = [ lightcolour = 0 lightbright = 1 @@ -1258,18 +1084,6 @@ newgui mapmodels [ ] ] -newgui monsters [ - guibutton "ogro / fireball" "newent monster 0" - guibutton "rhino / chaingun" "newent monster 1" - guibutton "ratamahatta / shotgun" "newent monster 2" - guibutton "slith / rifle" "newent monster 3" - guibutton "bauul / RL" "newent monster 4" - guibutton "hellpig / bite" "newent monster 5" - guibutton "knight / iceball" "newent monster 6" - guibutton "goblin / slimeball" "newent monster 7" - guibutton "spider / grenade" "newent monster 8" -] - newgui postfx [ guibutton "(effect OFF)" "clearpostfx" guibutton "bloom (subtle: 30%)" "bloom 0.3" @@ -1325,8 +1139,6 @@ newgui options [ /////////////////////////////////////////////////////////////// ] ] guilist [ - guicheckbox "force matching player models" forceplayermodels - guibar guicheckbox "always use team skins" teamskins ] guicheckbox "hit sound" hitsound diff --git a/data/sounds.cfg b/data/sounds.cfg index 620dd71..c3a076c 100644 --- a/data/sounds.cfg +++ b/data/sounds.cfg @@ -39,6 +39,8 @@ registersound "q009/glauncher" // "awesund/flaunch" registersound "q009/grenade" 200 altsound "q009/grenade2" 200 altsound "q009/grenade3" 200 +registersound "free/splash1" 200 +registersound "free/splash2" 200 registersound "nieb/jumppad" 255 registersound "q009/pistol" 80 // "free/pistol" altsound "q009/pistol2" 80 -- cgit v1.2.3