diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh index 886e3d06..b860c97e 100644 --- a/config/convert_mapconfig.sh +++ b/config/convert_mapconfig.sh @@ -164,8 +164,8 @@ for file in $*; do sed -i '/^mapmodel/s/\/makke\/ladder_11x/1' $file sed -i '/^mapmodel/s/\/makke\/ladder_15x/1' $file sed -i '/^mapmodel/s/\/makke\/ladder_15x_offset/1' $file - sed -i '/^mapmodel/s/\/makke\/grate_hor/1' $file - sed -i '/^mapmodel/s/\/makke\/grate_vert/1' $file + sed -i '/^mapmodel/s/\/cleaner\/grates\/grate_hor/1' $file + sed -i '/^mapmodel/s/\/cleaner\/grates\/grate_vert/1' $filee sed -i '/^mapmodel/s/\/makke\/mine-shaft_elevator/1' $file sed -i '/^mapmodel/s/\/makke\/bolt_nut/1' $file sed -i '/^mapmodel/s/\/makke\/sail/1' $file diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 7b04f835..482399f4 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -66,8 +66,8 @@ mapmodel 0 0 0 0 "makke/electric_meter" // 36 mapmodel 3 1 0 0 "makke/pallet" // 37 mapmodel 0 0 0 0 "makke/fuel_tank" // 38 - Ensure you clip this mapmodel fully using the command // "newent clip 0 3 7 5" in the middle of the model. -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" // 39 -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" // 40 +mapmodel 2 1 0 0 "cleaner/grates/grate_hor" // 39 +mapmodel 1 2 0 0 "cleaner/grates/grate_vert" // 40 mapmodel 0 0 0 0 "makke/wrench" // 41 mapmodel 0 0 0 0 "makke/bolt_nut" // 42 mapmodel 0 0 0 0 "makke/signs/flammable" // 43 @@ -259,6 +259,8 @@ mapmodel 0 0 0 0 "cleaner/shovels/shovel3" // 190 // mapmodel 1 3 0 0 "makke/barrel_toxic" // Toxic barrel. // mapmodel 1 3 0 0 "makke/barrel_newsteel" // Steel barrel. // mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" // Steel barrel fallen. +// mapmodel 2 1 0 0 "cleaner/grates/grate_hor" // Grate, rusty (hor). +// mapmodel 1 2 0 0 "cleaner/grates/grate_vert" // Grate, rusty (vert). // mapmodel 3 8 0 0 "makke/mine-shaft_elevator" // Mine lift. // mapmodel 1 2 0 0 "cleaner/minecart/up" // Mine cart. // mapmodel 1 2 0 0 "cleaner/minecart/down" // Fallen mine cart. @@ -279,15 +281,17 @@ mapmodel 0 0 0 0 "cleaner/shovels/shovel3" // 190 loadsky "textures/skymaps/steini/steini4" // Comment this if you want to use a different skymap. +// loadsky "textures/skymaps/humus/powerlines" +// loadsky "textures/skymaps/kothic/atsea" +// loadsky "textures/skymaps/ladynighthawk/inhcanyons1" // loadsky "textures/skymaps/steini/steini2" // loadsky "textures/skymaps/steini/steini3" -// loadsky "textures/skymaps/makke/rocky" // loadsky "textures/skymaps/makke/mountain" -// loadsky "textures/skymaps/iceflow/iceflow" -// loadsky "textures/skymaps/ladynighthawk/inhcanyons1" -// loadsky "textures/skymaps/socksky/nightball" +// loadsky "textures/skymaps/makke/rocky" +// loadsky "textures/skymaps/makke/sand" // loadsky "textures/skymaps/socksky/grave" -// loadsky "textures/skymaps/kothic/atsea" +// loadsky "textures/skymaps/iceflow/iceflow" +// loadsky "textures/skymaps/socksky/nightball" // Alternative texture. See "docs/mapediting5.html" for more information. diff --git a/packages/textures/skymaps/humus/license.txt b/packages/textures/skymaps/humus/license.txt new file mode 100644 index 00000000..5cafcd88 --- /dev/null +++ b/packages/textures/skymaps/humus/license.txt @@ -0,0 +1,44 @@ +My name is Emil Persson, but I'm mostly known as "Humus", which has been my +nickname for as long as I've had one. I'm currently working as a graphics +programmer at Avalanche Studios in Stockholm. Previously I've been working in +ISV relations at ATI / AMD. My main interests are graphics and photography. + + http://www.humus.name + humus@comhem.se + +The particular files named "powerlines" + http://www.humus.name/index.php?page=Textures&ID=8 + +... are from under some powerlines south of the 407 expressway. You can see +the AMD building (formerly ATI) on the powerlines_lf face, left of the trees. + + +These skymaps are licensed under the: + Creative Commons Attribution 3.0 Unported License. + + http://creativecommons.org/licenses/by/3.0/ + http://creativecommons.org/licenses/by/3.0/legalcode + +This mean, you are free: + to Share — to copy, distribute and transmit the work + to Remix — to adapt the work + to make commercial use of the work + +Under the following conditions: + Attribution — You must attribute the work in the manner specified by the + author or licensor (but not in any way that suggests that they endorse + you or your use of the work). + +With the understanding that: + Waiver — Any of the above conditions can be waived if you get permission + from the copyright holder. + Public Domain — Where the work or any of its elements is in the public + domain under applicable law, that status is in no way affected by the license. + Other Rights — In no way are any of the following rights affected by the license: + Your fair dealing or fair use rights, or other applicable copyright + exceptions and limitations; + The author's moral rights; + Rights other persons may have either in the work itself or in how the work + is used, such as publicity or privacy rights. + Notice — For any reuse or distribution, you must make clear to others the license + terms of this work. The best way to do this is with a link to this web page. diff --git a/packages/textures/skymaps/humus/powerlines_bk.jpg b/packages/textures/skymaps/humus/powerlines_bk.jpg new file mode 100644 index 00000000..b83fc5fc Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_bk.jpg differ diff --git a/packages/textures/skymaps/humus/powerlines_dn.jpg b/packages/textures/skymaps/humus/powerlines_dn.jpg new file mode 100644 index 00000000..a09318c1 Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_dn.jpg differ diff --git a/packages/textures/skymaps/humus/powerlines_ft.jpg b/packages/textures/skymaps/humus/powerlines_ft.jpg new file mode 100644 index 00000000..4a8c9f71 Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_ft.jpg differ diff --git a/packages/textures/skymaps/humus/powerlines_lf.jpg b/packages/textures/skymaps/humus/powerlines_lf.jpg new file mode 100644 index 00000000..f5c084ab Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_lf.jpg differ diff --git a/packages/textures/skymaps/humus/powerlines_rt.jpg b/packages/textures/skymaps/humus/powerlines_rt.jpg new file mode 100644 index 00000000..be130d4c Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_rt.jpg differ diff --git a/packages/textures/skymaps/humus/powerlines_up.jpg b/packages/textures/skymaps/humus/powerlines_up.jpg new file mode 100644 index 00000000..f319fe4d Binary files /dev/null and b/packages/textures/skymaps/humus/powerlines_up.jpg differ