diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh index 01a52c65..886e3d06 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/\/cleaner\/grates\/grate_hor/1' $file - sed -i '/^mapmodel/s/\/cleaner\/grates\/grate_vert/1' $file + sed -i '/^mapmodel/s/\/makke\/grate_hor/1' $file + sed -i '/^mapmodel/s/\/makke\/grate_vert/1' $file 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 @@ -274,20 +274,6 @@ for file in $*; do sed -i '/^texture/s/\/mayang\/rb_bricks_03.jpg/1' $file sed -i '/^texture/s/\/noctua\/wood\/planks02_trim_vert.jpg/1' $file - echo "Converting skymap..." - sed -i '/^loadsky/s/\/skymaps\/humus\/powerlines/1' $file - sed -i '/^loadsky/s/\/skymaps\/kellmcdonald\/atsea/1' $file - sed -i '/^loadsky/s/\/skymaps\/ladynighthawk\/canyons1/1' $file - sed -i '/^loadsky/s/\/skymaps\/makke\/mountain/1' $file - sed -i '/^loadsky/s/\/skymaps\/makke\/rocky/1' $file - sed -i '/^loadsky/s/\/skymaps\/makke\/sand/1' $file - sed -i '/^loadsky/s/\/skymaps\/simonoc\/graveyard/1' $file - sed -i '/^loadsky/s/\/skymaps\/simonoc\/icestation/1' $file - sed -i '/^loadsky/s/\/skymaps\/simonoc\/nightball/1' $file - sed -i '/^loadsky/s/\/skymaps\/steini\/steini2/1' $file - sed -i '/^loadsky/s/\/skymaps\/steini\/steini3/1' $file - sed -i '/^loadsky/s/\/skymaps\/steini\/steini4/1' $file - echo -e "Successfully finished converting: "$file"\n" else echo -e "\a\E[31m\033[1mERROR:\E[0m "$file" is an incorrect filename, path or option. Or it is not a \".cfg\" file, or it may be non-readable and/or non-writeable.\n" diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 53e084e5..f878e27d 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 "makke/grate_hor" // 39 +mapmodel 1 2 0 0 "makke/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,8 +259,6 @@ 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,19 +277,17 @@ mapmodel 0 0 0 0 "cleaner/shovels/shovel3" // 190 // The skymap for this map. You can change this by commenting the one below, and then uncommenting one of your choosing // Alternatively, you can add your own into "packages/textures/skymaps" and use it as below. -loadsky "skymaps/steini/steini4" // Comment this if you want to use a different skymap. +loadsky "textures/skymaps/steini/steini4" // Comment this if you want to use a different skymap. -// loadsky "skymaps/humus/powerlines" -// loadsky "skymaps/kellmcdonald/atsea" -// loadsky "skymaps/ladynighthawk/canyons1" -// loadsky "skymaps/makke/mountain" -// loadsky "skymaps/makke/rocky" -// loadsky "skymaps/makke/sand" -// loadsky "skymaps/simonoc/icestation" -// loadsky "skymaps/simonoc/nightball" -// loadsky "skymaps/simonoc/graveyard" -// loadsky "skymaps/steini/steini2" -// loadsky "skymaps/steini/steini3" +// 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/socksky/grave" +// loadsky "textures/skymaps/kothic/atsea" // Alternative texture. See "docs/mapediting5.html" for more information. diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 661a5f62..db4d0462 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -106,23 +106,19 @@ menuitem [Slope decrease 1 top-bottom] [ heightfield 0; slope 0 -1 ] menuitem [] -1 menuitem [Fix heightfielding] [ solid 0; slope 0 0 ] - newmenu skymaps menuinit [ echo Please read: (red)/docs/mapediting5.html to find out how to PERMANENTLY add a custom skymap to your map... ] -menuitem [At Sea skymap] [ loadsky "skymaps/kellmcdonald/atsea" ] -menuitem [Canyons1 skymap] [ loadsky "skymaps/ladynighthawk/canyons1" ] -menuitem [Graveyard skymap] [ loadsky "skymaps/simonoc/graveyard" ] -menuitem [Ice Station skymap] [ loadsky "skymaps/simonoc/icestation" ] -menuitem [Mountain skymap] [ loadsky "skymaps/makke/mountain" ] -menuitem [Nightball skymap] [ loadsky "skymaps/simonoc/nightball" ] -menuitem [Powerlines skymap] [ loadsky "skymaps/humus/powerlines" ] -menuitem [Rocky skymap] [ loadsky "skymaps/makke/rocky" ] -menuitem [Sand skymap] [ loadsky "skymaps/makke/sand" ] -menuitem [Steini 2 skymap] [ loadsky "skymaps/steini/steini2" ] -menuitem [Steini 3 skymap] [ loadsky "skymaps/steini/steini3" ] -menuitem [Steini 4 skymap] [ loadsky "skymaps/steini/steini4" ] - +menuitem [Steini2 skymap] [ loadsky "textures/skymaps/steini/steini2" ] +menuitem [Steini3 skymap] [ loadsky "textures/skymaps/steini/steini3" ] +menuitem [Steini4 skymap] [ loadsky "textures/skymaps/steini/steini4" ] +menuitem [Rocky skymap] [ loadsky "textures/skymaps/makke/rocky" ] +menuitem [Mountain skymap] [ loadsky "textures/skymaps/makke/mountain" ] +menuitem [Iceflow skymap] [ loadsky "textures/skymaps/iceflow/iceflow" ] +menuitem [Inhcanyons1 skymap] [ loadsky "textures/skymaps/ladynighthawk/inhcanyons1" ] +menuitem [Nightball skymap] [ loadsky "textures/skymaps/socksky/nightball" ] +menuitem [Grave skymap] [ loadsky "textures/skymaps/socksky/grave" ] +menuitem [At sea skymap] [ loadsky "textures/skymaps/kothic/atsea" ] _closestenttypestatus = 0 //Map operations @@ -497,4 +493,4 @@ menuitemcheckbox [Enable auto save map: ] "$autosavemap" [ autosavemap = $arg1 ] menuitemslider [Time between auto saves (in minutes): ] 2 60 "(div $timeBetAutoSaves 60000)" 1 [] [ timeBetAutoSaves = (* $arg1 60000) ] menuitemtextinput [Make a map backup (.BAK) every: ] "$numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [ if (! $showedBAKinfo) [ echo This setting effects the number of autosavemaps between making a map backup file. "(.BAK)"; showedBAKinfo = 1 ] ] 4 -persistidents 1 +persistidents 1 \ No newline at end of file diff --git a/config/releasefiles.cfg b/config/releasefiles.cfg new file mode 100644 index 00000000..db9f7de1 --- /dev/null +++ b/config/releasefiles.cfg @@ -0,0 +1,630 @@ +packages/audio/ambience/t_vent01.ogg +packages/audio/ambience/t_waterpipe02.ogg +packages/audio/ambience/t_water_owl.ogg +packages/audio/ambience/warningalarm01.ogg +packages/audio/ambience/hum02.ogg +packages/audio/ambience/t_helicopter.ogg +packages/audio/ambience/t_waterdrip.ogg +packages/audio/ambience/t_hum04.ogg +packages/audio/ambience/hum01.ogg +packages/audio/ambience/deserthawk.ogg +packages/audio/ambience/t_waterpipe01.ogg +packages/audio/ambience/t_waterfront.ogg +packages/audio/ambience/t_alarm01.ogg +packages/audio/ambience/t_compressor.ogg +packages/audio/ambience/t_night01.ogg +packages/audio/ambience/t_gastank.ogg +packages/audio/ambience/t_vents.ogg +packages/audio/ambience/t_dogs01.ogg +packages/audio/ambience/t_satcoms.ogg +packages/audio/ambience/t_hum03.ogg +packages/audio/ambience/cavedrip.ogg +packages/audio/ambience/t_crow.ogg +packages/audio/ambience/t_wind.ogg +packages/audio/ambience/t_aircond.ogg +packages/audio/ambience/wind.ogg +packages/audio/ambience/t_static01.ogg +packages/audio/ambience/t_radio_static.ogg +packages/audio/ambience/t_static02.ogg +packages/audio/ambience/t_hum01.ogg +packages/audio/ambience/t_night_dog.ogg +packages/audio/ambience/citynoisebirds.ogg +packages/audio/ambience/owl.ogg +packages/audio/ambience/t_night02.ogg +packages/audio/ambience/t_hum02.ogg +packages/audio/ambience/t_electricbuzz.ogg +packages/audio/ambience/flies.ogg +packages/audio/ambience/t_generator.ogg +packages/audio/ambience/t_keyboard.ogg +packages/audio/ambience/night_crickets.ogg +packages/audio/ambience/t_water01.ogg +packages/audio/ambience/t_sludge.ogg +packages/audio/ambience/t_radio_comms.ogg +packages/audio/ambience/distant_cars.ogg +packages/audio/ambience/water.ogg +packages/audio/ambience/t_vent02.ogg +packages/audio/ambience/t_factory01.ogg +packages/textures/DigitalFlux/reddish_brown_dirt_01.jpg +packages/textures/DigitalFlux/gray_bricks_02.jpg +packages/textures/DigitalFlux/dirty_asphalt_02.jpg +packages/textures/DigitalFlux/reddish_brown_dirt_02.jpg +packages/textures/DigitalFlux/gray_bricks_01.jpg +packages/textures/DigitalFlux/light_brown_dirt_02.jpg +packages/textures/DigitalFlux/dirt_pebbles_01.jpg +packages/textures/DigitalFlux/light_brown_dirt_01.jpg +packages/textures/DigitalFlux/dirty_asphalt_03.jpg +packages/textures/mitaman/various/063bois.jpg +packages/textures/mitaman/various/027metal.jpg +packages/textures/mitaman/various/sub_doors256nf_01.jpg +packages/textures/mitaman/various/metal_trim_4_v.jpg +packages/textures/mitaman/various/063bois_b.jpg +packages/textures/mitaman/various/metal020.jpg +packages/textures/mitaman/various/5sqtunnelroad.jpg +packages/textures/mitaman/various/metal026.jpg +packages/textures/mitaman/various/large_plate.jpg +packages/textures/mitaman/various/rgrates0006.jpg +packages/textures/mitaman/various/036metal.jpg +packages/textures/mitaman/various/sub_window38.jpg +packages/textures/mitaman/various/006metal.jpg +packages/textures/mitaman/various/metal_trim_4_h.jpg +packages/textures/mitaman/various/sub_window23.jpg +packages/textures/mitaman/various/vent_cap.jpg +packages/textures/mitaman/zastrow/sub_doors512A16.jpg +packages/textures/mitaman/zastrow/sub_doors512B05.jpg +packages/textures/mitaman/zastrow/sub_window31.jpg +packages/textures/mitaman/zastrow/metal_overlaps.jpg +packages/textures/mitaman/zastrow/metal_plate_fill.jpg +packages/textures/mitaman/zastrow/metal_siding_kinks.jpg +packages/textures/mitaman/zastrow/metal_siding_kinksb.jpg +packages/textures/mitaman/zastrow/sub_window33.jpg +packages/textures/mitaman/zastrow/sub_doors512A10.jpg +packages/textures/mitaman/grsites/wood060.jpg +packages/textures/mitaman/grsites/brick065.jpg +packages/textures/mitaman/grsites/brick051.jpg +packages/textures/mitaman/3dcafe/door07.jpg +packages/textures/mitaman/3dcafe/objects09_a.jpg +packages/textures/mitaman/3dcafe/door15.jpg +packages/textures/mitaman/3dcafe/door10_a.jpg +packages/textures/mitaman/3dcafe/stone18.jpg +packages/textures/mitaman/3dcafe/door12.jpg +packages/textures/mitaman/3dcafe/objects08.jpg +packages/textures/mitaman/3dcafe/door10.jpg +packages/textures/mitaman/3dcafe/door07_a.jpg +packages/textures/mitaman/golgotha/metal_bumps2.jpg +packages/textures/mitaman/golgotha/tunnel_ceiling_b.jpg +packages/textures/mitaman/golgotha/tunnel_ceiling.jpg +packages/textures/mitaman/golgotha/elecpanelstwo.jpg +packages/textures/mitaman/golgotha/metal_bumps3.jpg +packages/textures/mitaman/golgotha/hhroofgray.jpg +packages/textures/drunkenM/rock_wall1.jpg +packages/textures/openfootage/stonewall_4.jpg +packages/textures/arcitool/sichtbeton1.jpg +packages/textures/arcitool/archibrick01.jpg +packages/textures/arcitool/gittersteine2.jpg +packages/textures/arcitool/Wellblech1-1.jpg +packages/textures/arcitool/Wiese3.jpg +packages/textures/arcitool/Wiese6.jpg +packages/textures/arcitool/archibrick06.jpg +packages/textures/arcitool/Cotta1-graubraunhell.jpg +packages/textures/arcitool/Rundholz.jpg +packages/textures/arcitool/Cotta2-satt.jpg +packages/textures/arcitool/Zaun.jpg +packages/textures/arcitool/archibrick04.jpg +packages/textures/arcitool/archibrick03.jpg +packages/textures/arcitool/sisal21.jpg +packages/textures/arcitool/Cotta1-grau.jpg +packages/textures/arcitool/Cotta2-dunkel.jpg +packages/textures/arcitool/schotter2.jpg +packages/textures/arcitool/Blockbohlen-natur.jpg +packages/textures/arcitool/Glasbausteine.jpg +packages/textures/arcitool/Cotta1-hell.jpg +packages/textures/arcitool/Cotta1-graubraun.jpg +packages/textures/arcitool/archibrick02.jpg +packages/textures/arcitool/sichtbeton2.jpg +packages/textures/arcitool/rohbaubims.jpg +packages/textures/arcitool/schotter1.jpg +packages/textures/arcitool/pflaster2.jpg +packages/textures/arcitool/Cotta2-grau.jpg +packages/textures/arcitool/archibrick05.jpg +packages/textures/arcitool/db_pf8104t1.jpg +packages/textures/arcitool/Cotta2-beige.jpg +packages/textures/arcitool/n_f-natur2.jpg +packages/textures/arcitool/archibrick07.jpg +packages/textures/boeck/stone_013.jpg +packages/textures/boeck/metal_019.jpg +packages/textures/boeck/rolltor.jpg +packages/textures/boeck/wood_010.jpg +packages/textures/boeck/stone_022.jpg +packages/textures/boeck/wood_017.jpg +packages/textures/boeck/metal_019_b.jpg +packages/textures/boeck/gully.jpg +packages/textures/boeck/stone_014.jpg +packages/textures/boeck/wood_009.jpg +packages/textures/boeck/aircon2.jpg +packages/textures/sub/brick_wall_09.jpg +packages/textures/sub/brick_wall_08.jpg +packages/textures/sub/sub_sand.jpg +packages/textures/zastrow/3wood_crate_03.jpg +packages/textures/zastrow/3wood_crate_12.jpg +packages/textures/zastrow/3wood_crate_10.jpg +packages/textures/zastrow/2wood_crate_02.jpg +packages/textures/zastrow/wood_crate_10.jpg +packages/textures/zastrow/2wood_crate_12.jpg +packages/textures/zastrow/wood_crate_12.jpg +packages/textures/zastrow/2wood_crate_03.jpg +packages/textures/zastrow/2wood_crate_10.jpg +packages/textures/zastrow/wood_crate_03.jpg +packages/textures/zastrow/3wood_crate_02.jpg +packages/textures/zastrow/wood_crate_02.jpg +packages/textures/craig_fortune/terrain/Mud_thick.jpg +packages/textures/craig_fortune/terrain/rubble.jpg +packages/textures/craig_fortune/terrain/grass_lush1.jpg +packages/textures/craig_fortune/terrain/Rock_cracked.jpg +packages/textures/craig_fortune/terrain/Grass_parched.jpg +packages/textures/craig_fortune/terrain/sand_bleached.jpg +packages/textures/craig_fortune/terrain/Grass_mossy.jpg +packages/textures/craig_fortune/terrain/Rock_rubble.jpg +packages/textures/craig_fortune/terrain/Grass_lush.jpg +packages/textures/craig_fortune/terrain/mud.jpg +packages/textures/craig_fortune/crates/light_weathered_desert3.jpg +packages/textures/craig_fortune/crates/light_weathered.jpg +packages/textures/craig_fortune/crates/light.jpg +packages/textures/kurt/klite1.jpg +packages/textures/kurt/klite2.jpg +packages/textures/rattrap/rb_box_02.jpg +packages/textures/rattrap/rb_window2.jpg +packages/textures/rattrap/rb_trim_03.jpg +packages/textures/rattrap/rb_concrete.jpg +packages/textures/rattrap/rb_box_04.jpg +packages/textures/rattrap/rb_box_03.jpg +packages/textures/rattrap/rb_window.jpg +packages/textures/rattrap/rb_planks02_trim.jpg +packages/textures/rattrap/rb_box_07.jpg +packages/textures/rattrap/rb_bricks_01.jpg +packages/textures/rattrap/rb_bricks_03.jpg +packages/textures/rattrap/rb_box_06.jpg +packages/textures/rattrap/rb_bricks_02.jpg +packages/textures/rattrap/rb_trim_02.jpg +packages/textures/rattrap/rb_box_05.jpg +packages/textures/rattrap/rb_box_01.jpg +packages/textures/rattrap/rb_trim_01.jpg +packages/textures/noctua/wall/wall01.jpg +packages/textures/noctua/wall/brick02.jpg +packages/textures/noctua/wall/d_wall01.jpg +packages/textures/noctua/wall/conc04.jpg +packages/textures/noctua/wall/plast02.jpg +packages/textures/noctua/wall/conc03.jpg +packages/textures/noctua/wall/conc01.jpg +packages/textures/noctua/wall/plast03.jpg +packages/textures/noctua/wall/plast01.jpg +packages/textures/noctua/wall/plast04.jpg +packages/textures/noctua/wall/wall02.jpg +packages/textures/noctua/wall/conc05.jpg +packages/textures/noctua/wall/conc02.jpg +packages/textures/noctua/textile/carpet02.jpg +packages/textures/noctua/textile/carpet05.jpg +packages/textures/noctua/textile/burlap01.jpg +packages/textures/noctua/textile/carpet04.jpg +packages/textures/noctua/textile/carpet01.jpg +packages/textures/noctua/textile/carpet03.jpg +packages/textures/noctua/tiles/16tile10.jpg +packages/textures/noctua/tiles/16tile09.jpg +packages/textures/noctua/tiles/16tile11.jpg +packages/textures/noctua/tiles/16tile12.jpg +packages/textures/noctua/tiles/16tile07.jpg +packages/textures/noctua/wood/planks02_trim_vert.jpg +packages/textures/noctua/wood/planks02.jpg +packages/textures/noctua/wood/planks01_b.jpg +packages/textures/noctua/wood/bark01.jpg +packages/textures/noctua/wood/planks02_hor.jpg +packages/textures/noctua/wood/planks02_trim.jpg +packages/textures/noctua/wood/wood03.jpg +packages/textures/noctua/wood/blinds01.jpg +packages/textures/noctua/wood/planks01.jpg +packages/textures/noctua/wood/wood02.jpg +packages/textures/noctua/wood/wood04.jpg +packages/textures/noctua/wood/fb_board.jpg +packages/textures/noctua/stone/stone08.jpg +packages/textures/noctua/stone/stone05.jpg +packages/textures/noctua/stone/stone19.jpg +packages/textures/noctua/stone/marmor01.jpg +packages/textures/noctua/stone/stone17.jpg +packages/textures/noctua/stone/stone06.jpg +packages/textures/noctua/stone/stone18.jpg +packages/textures/noctua/stone/stone09.jpg +packages/textures/noctua/stone/stone16.jpg +packages/textures/noctua/stone/stone03.jpg +packages/textures/noctua/stone/stone04.jpg +packages/textures/noctua/stone/stone07.jpg +packages/textures/noctua/stone/stone15.jpg +packages/textures/noctua/stone/stone13.jpg +packages/textures/noctua/stone/stone02.jpg +packages/textures/noctua/stone/stone12.jpg +packages/textures/noctua/ground/snowy05.jpg +packages/textures/noctua/ground/snowy02.jpg +packages/textures/noctua/ground/pebble01.jpg +packages/textures/noctua/ground/snowy04.jpg +packages/textures/noctua/ground/asph02.jpg +packages/textures/noctua/ground/snowy03.jpg +packages/textures/noctua/ground/cobbles01.jpg +packages/textures/noctua/ground/snowy01.jpg +packages/textures/noctua/ground/asph01.jpg +packages/textures/noctua/ground/mud01.jpg +packages/textures/noctua/ground/ground06.jpg +packages/textures/noctua/ground/asph03.jpg +packages/textures/noctua/ground/ground02.jpg +packages/textures/noctua/metal/metbgr04.jpg +packages/textures/noctua/metal/copper02.jpg +packages/textures/noctua/metal/zinc03.jpg +packages/textures/noctua/metal/brass01.jpg +packages/textures/noctua/metal/iron02.jpg +packages/textures/noctua/metal/zinc02.jpg +packages/textures/noctua/metal/verdig01.jpg +packages/textures/noctua/metal/metbgr02.jpg +packages/textures/noctua/metal/copper01.jpg +packages/textures/noctua/metal/iron04.jpg +packages/textures/noctua/metal/iron03.jpg +packages/textures/noctua/metal/metbgr03.jpg +packages/textures/noctua/metal/iron05_b.jpg +packages/textures/noctua/metal/iron01.jpg +packages/textures/noctua/metal/metbgr01.jpg +packages/textures/noctua/metal/zinc01.jpg +packages/textures/noctua/metal/iron05.jpg +packages/textures/misterfloppy/keller/aircon.jpg +packages/textures/misterfloppy/keller/door_panel.jpg +packages/textures/misterfloppy/keller/door_01.jpg +packages/textures/misterfloppy/keller/exit_sign.jpg +packages/textures/misterfloppy/keller/light.jpg +packages/textures/misterfloppy/keller/door_03.jpg +packages/textures/misterfloppy/keller/gully.jpg +packages/textures/misterfloppy/keller/door_02.jpg +packages/textures/misterfloppy/keller/light2.jpg +packages/textures/dog/texture08.jpg +packages/textures/jamz/double_door_r.jpg +packages/textures/jamz/old_door3.jpg +packages/textures/wotwot/urban/cableshelf1_s_hor.jpg +packages/textures/wotwot/urban/electric1.jpg +packages/textures/wotwot/urban/airvent1.jpg +packages/textures/wotwot/urban/hatch1.jpg +packages/textures/wotwot/urban/electric1_bla.jpg +packages/textures/wotwot/urban/asphalt1_l.jpg +packages/textures/wotwot/urban/cableshelf1_l_ver.jpg +packages/textures/wotwot/urban/manhole1.jpg +packages/textures/wotwot/urban/electric2.jpg +packages/textures/wotwot/urban/door3.jpg +packages/textures/wotwot/urban/electric2_plain.jpg +packages/textures/wotwot/urban/grill2_s.jpg +packages/textures/wotwot/urban/cableshelf1_m_hor.jpg +packages/textures/wotwot/urban/metaltrim1_hor.jpg +packages/textures/wotwot/urban/electric4.jpg +packages/textures/wotwot/urban/cableshelf1_s_ver.jpg +packages/textures/wotwot/urban/cableshelf1_l_hor.jpg +packages/textures/wotwot/urban/electric4_plain.jpg +packages/textures/wotwot/urban/ventilation1.jpg +packages/textures/wotwot/urban/cableshelf1_m_ver.jpg +packages/textures/wotwot/urban/electric3_plain.jpg +packages/textures/wotwot/urban/electric3.jpg +packages/textures/wotwot/urban/electric3_bla.jpg +packages/textures/wotwot/urban/electric4_bla.jpg +packages/textures/wotwot/urban/electric2_bla.jpg +packages/textures/wotwot/urban/electric1_plain.jpg +packages/textures/wotwot/urban/metaltrim1_ver.jpg +packages/textures/wotwot/skin/monitor.jpg +packages/textures/wotwot/skin/guardrail2.jpg +packages/textures/wotwot/skin/milkcarton.jpg +packages/textures/wotwot/skin/drainpipe.jpg +packages/textures/wotwot/skin/commrack.jpg +packages/textures/makke/bricks_2.jpg +packages/textures/makke/metalstair2.jpg +packages/textures/makke/stairtrim.jpg +packages/textures/makke/tiles.jpg +packages/textures/makke/aircon_sm.jpg +packages/textures/makke/aircon.jpg +packages/textures/makke/wood_01.jpg +packages/textures/makke/lampe_tile2.jpg +packages/textures/makke/klappe3.jpg +packages/textures/makke/door_rust.jpg +packages/textures/makke/rock.jpg +packages/textures/makke/d_brick.jpg +packages/textures/makke/klappe.jpg +packages/textures/makke/panel.jpg +packages/textures/makke/concrete.jpg +packages/textures/makke/box_2.jpg +packages/textures/makke/mauer2.jpg +packages/textures/makke/pebbles_01.jpg +packages/textures/makke/stuck1.jpg +packages/textures/makke/platten.jpg +packages/textures/makke/c_tile.jpg +packages/textures/makke/bricks_3.jpg +packages/textures/makke/box_3.jpg +packages/textures/makke/metalstair1.jpg +packages/textures/makke/concrete_trim_small.jpg +packages/textures/makke/wood_01_b.jpg +packages/textures/makke/lampe_tile2_a.jpg +packages/textures/makke/stein.jpg +packages/textures/makke/lampe_tile_a.jpg +packages/textures/makke/br_tiles.jpg +packages/textures/makke/klappe2.jpg +packages/textures/makke/lampe.jpg +packages/textures/makke/snow.jpg +packages/textures/makke/door_metal.jpg +packages/textures/makke/concrete_trim.jpg +packages/textures/makke/douze.jpg +packages/textures/makke/windows.jpg +packages/textures/makke/concrete_trim_vert.jpg +packages/textures/makke/window.jpg +packages/textures/makke/bricky.jpg +packages/textures/makke/mauer1.jpg +packages/textures/makke/01-CMU.jpg +packages/textures/makke/cracked_mud.jpg +packages/textures/makke/special_stone15.jpg +packages/textures/makke/11-Brick.jpg +packages/textures/makke/clayceiling.jpg +packages/textures/makke/black.jpg +packages/textures/makke/box_4.jpg +packages/textures/makke/neuklappe.jpg +packages/textures/makke/brickwall.jpg +packages/textures/makke/menu.jpg +packages/textures/makke/lampe_tile.jpg +packages/textures/makke/smallsteelbox.jpg +packages/textures/makke/asph_01.jpg +packages/textures/makke/dirt_01.jpg +packages/textures/makke/door.jpg +packages/textures/toca/greybricks.jpg +packages/textures/nieb/b3_walls154.jpg +packages/textures/nieb/brickolddirty0015.jpg +packages/textures/nieb/b19walls261.jpg +packages/textures/nieb/dsc20041018_154255_48.jpg +packages/textures/nieb/various0353.jpg +packages/textures/nieb/asphaltdamaged0043_1_l.jpg +packages/textures/nieb/vents0076.jpg +packages/textures/nieb/brickolddirty0009.jpg +packages/textures/nieb/planksold0002.jpg +packages/textures/nieb/b15walls031b.jpg +packages/textures/nieb/metalcontainers0010.jpg +packages/textures/nieb/tt7020275.jpg +packages/textures/nieb/rooftilesceramicold0080.jpg +packages/textures/nieb/rooftilesceramicold0031.jpg +packages/textures/nieb/bricksmall0201.jpg +packages/textures/nieb/img_0060.jpg +packages/textures/nieb/bricksmall0007.jpg +packages/textures/nieb/grass-dirt_2.jpg +packages/textures/nieb/grass-dirt_1.jpg +packages/textures/nieb/hedges0049_m.jpg +packages/textures/nieb/metalcontainers0099.jpg +packages/textures/nieb/planksold0290.jpg +packages/textures/nieb/b8walls007b.jpg +packages/textures/nieb/bricksmall0067.jpg +packages/textures/nieb/img_0576.jpg +packages/textures/nieb/concretebare0154_3.jpg +packages/textures/nieb/metalcontainers0010-rotate.jpg +packages/textures/nieb/tt7020275_2.jpg +packages/textures/nieb/bricksmall0077.jpg +packages/textures/nieb/tt7040134.jpg +packages/textures/nieb/planksold0001.jpg +packages/textures/nieb/dscf1764.jpg +packages/textures/nieb/bricksmall0247.jpg +packages/textures/nieb/img_0579.jpg +packages/textures/nieb/bricksmalldirty0136.jpg +packages/textures/nieb/plastercoloured0158.jpg +packages/textures/nieb/rooftilesceramicold0093_2.jpg +packages/textures/nieb/b2walls094.jpg +packages/textures/nieb/brickround0047_6.jpg +packages/textures/nieb/doorsgarage0195.jpg +packages/textures/nieb/stone_rock_texture.jpg +packages/textures/nieb/b2metals0052.jpg +packages/textures/nieb/img_0053.jpg +packages/textures/nieb/tt7020275_in.jpg +packages/textures/nieb/b3_walls149.jpg +packages/textures/nieb/b10woods003.jpg +packages/textures/nieb/rooftilesceramicold0093.jpg +packages/textures/nieb/rock_02.jpg +packages/textures/nieb/b3_walls155.jpg +packages/textures/nieb/doorsindustrial0183.jpg +packages/textures/nieb/pd-texture-bigstone-wall-2.jpg +packages/textures/nieb/bricksmall0060.jpg +packages/textures/nieb/rooftilesceramicold0080_2.jpg +packages/textures/nieb/bricksmall0073.jpg +packages/textures/nieb/tt7040146.jpg +packages/textures/johnsolo/bluewoody2.jpg +packages/textures/johnsolo/bluewoody1.jpg +packages/textures/johnsolo/shutters.jpg +packages/models/mapmodels/aard +packages/models/mapmodels/barrel +packages/models/mapmodels/barrel2 +packages/models/mapmodels/barrel-toxic +packages/models/mapmodels/bench +packages/models/mapmodels/bridge +packages/models/mapmodels/bridge_shine +packages/models/mapmodels/bulb +packages/models/mapmodels/can +packages/models/mapmodels/can2 +packages/models/mapmodels/chair1 +packages/models/mapmodels/cleaner +packages/models/mapmodels/cleaner/rails +packages/models/mapmodels/cleaner/rails/bent +packages/models/mapmodels/cleaner/rails/straight +packages/models/mapmodels/cleaner/minecart +packages/models/mapmodels/cleaner/minecart/down +packages/models/mapmodels/cleaner/minecart/up +packages/models/mapmodels/cleaner/platform +packages/models/mapmodels/cleaner/platform/16x16 +packages/models/mapmodels/cleaner/platform/8x8 +packages/models/mapmodels/coffeemug +packages/models/mapmodels/comp_bridge +packages/models/mapmodels/drainpipe +packages/models/mapmodels/dumpster +packages/models/mapmodels/elektro +packages/models/mapmodels/europalette +packages/models/mapmodels/fag +packages/models/mapmodels/fence +packages/models/mapmodels/fencegate_closed +packages/models/mapmodels/fencegate_open +packages/models/mapmodels/fencepost +packages/models/mapmodels/flyer +packages/models/mapmodels/gastank +packages/models/mapmodels/grass01 +packages/models/mapmodels/grass01_d +packages/models/mapmodels/grass01_s +packages/models/mapmodels/grass02 +packages/models/mapmodels/grass02_d +packages/models/mapmodels/grass02_s +packages/models/mapmodels/gutter_h +packages/models/mapmodels/gutter_v +packages/models/mapmodels/hook +packages/models/mapmodels/icicle +packages/models/mapmodels/ladder_10x +packages/models/mapmodels/ladder_11x +packages/models/mapmodels/ladder_15x +packages/models/mapmodels/ladder_7x +packages/models/mapmodels/ladder_8x +packages/models/mapmodels/ladder_rung +packages/models/mapmodels/ladderx15_center3 +packages/models/mapmodels/laptop1 +packages/models/mapmodels/light01 +packages/models/mapmodels/locker +packages/models/mapmodels/minelift +packages/models/mapmodels/misterfloppy +packages/models/mapmodels/misterfloppy/streetlamp +packages/models/mapmodels/misterfloppy/platelamp +packages/models/mapmodels/misterfloppy/hanging_ladder +packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_top +packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_up +packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_6 +packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_low +packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_2 +packages/models/mapmodels/misterfloppy/valve_hor +packages/models/mapmodels/misterfloppy/alarmlamp +packages/models/mapmodels/nocamp +packages/models/mapmodels/nothing +packages/models/mapmodels/picture1 +packages/models/mapmodels/plant01 +packages/models/mapmodels/plant01_d +packages/models/mapmodels/plant01_s +packages/models/mapmodels/poster +packages/models/mapmodels/rattrap +packages/models/mapmodels/rattrap/hanginlamp +packages/models/mapmodels/rattrap/cbbox +packages/models/mapmodels/rattrap/ventflap +packages/models/mapmodels/rattrap/rbbox +packages/models/mapmodels/rattrap/milkcrate1 +packages/models/mapmodels/rattrap/milkcrate2 +packages/models/mapmodels/rattrapbarrel +packages/models/mapmodels/rattrapbarrel2 +packages/models/mapmodels/roadblock01 +packages/models/mapmodels/roadblock02 +packages/models/mapmodels/sail +packages/models/mapmodels/screw +packages/models/mapmodels/signs +packages/models/mapmodels/signs/flammable +packages/models/mapmodels/signs/caution +packages/models/mapmodels/signs/biohazard +packages/models/mapmodels/signs/speed +packages/models/mapmodels/signs/maint +packages/models/mapmodels/signs/arab +packages/models/mapmodels/snowsail +packages/models/mapmodels/strahler +packages/models/mapmodels/streetlamp +packages/models/mapmodels/toca +packages/models/mapmodels/toca/monitor +packages/models/mapmodels/toca/stairs2 +packages/models/mapmodels/toca/computer +packages/models/mapmodels/toca/computer/monkeymou +packages/models/mapmodels/toca/computer/pc +packages/models/mapmodels/toca/bullet +packages/models/mapmodels/toca/tree1 +packages/models/mapmodels/toca/trashbag +packages/models/mapmodels/toca/tyre +packages/models/mapmodels/toca/pipes +packages/models/mapmodels/toca/pipes/metalpipe2 +packages/models/mapmodels/toca/pipes/metalpipe +packages/models/mapmodels/toca/pipes/concretepipe +packages/models/mapmodels/toca/signs +packages/models/mapmodels/toca/signs/restricted +packages/models/mapmodels/toca/signs/confined +packages/models/mapmodels/toca/signs/chemical +packages/models/mapmodels/toca/signs/donotenter +packages/models/mapmodels/toca/signs/target +packages/models/mapmodels/toca/signs/noentry +packages/models/mapmodels/toca/signs/nosmoking +packages/models/mapmodels/toca/signs/biohazard +packages/models/mapmodels/toca/signs/firstaid +packages/models/mapmodels/toca/signs/toxic +packages/models/mapmodels/toca/signs/explosives +packages/models/mapmodels/toca/signs/radioactive +packages/models/mapmodels/toca/servercluster +packages/models/mapmodels/toca/servercluster/U3_1 +packages/models/mapmodels/toca/servercluster/U3_3 +packages/models/mapmodels/toca/servercluster/U6_1 +packages/models/mapmodels/toca/servercluster/rack +packages/models/mapmodels/toca/servercluster/U3_2 +packages/models/mapmodels/toca/servercluster/U6_3 +packages/models/mapmodels/toca/servercluster/U6_2 +packages/models/mapmodels/toca/utilitytable +packages/models/mapmodels/toca/guardtower +packages/models/mapmodels/toca/pine +packages/models/mapmodels/toca/commrack2 +packages/models/mapmodels/toca/tv +packages/models/mapmodels/toca/stairs_aqueous +packages/models/mapmodels/toca/stairs_aqueous/stairs2 +packages/models/mapmodels/toca/stairs_aqueous/stairsacc +packages/models/mapmodels/toca/stairs_aqueous/stairsacc/beam +packages/models/mapmodels/toca/stairs_aqueous/stairsacc/handrail +packages/models/mapmodels/toca/stairs_aqueous/stairs1 +packages/models/mapmodels/toca/securitycam +packages/models/mapmodels/toca/securitycam/vertmount +packages/models/mapmodels/toca/securitycam/wallmount +packages/models/mapmodels/toca/securitycam/secucam +packages/models/mapmodels/toca/milkcarton +packages/models/mapmodels/toca/officedesk +packages/models/mapmodels/toca/shelf +packages/models/mapmodels/toca/airconditioner +packages/models/mapmodels/toca/airconditioner/interior +packages/models/mapmodels/toca/treetrunk1 +packages/models/mapmodels/toca/window1 +packages/models/mapmodels/toca/rack +packages/models/mapmodels/toca/plasmatv +packages/models/mapmodels/toca/guardrail2 +packages/models/mapmodels/toca/guardrail2/gr2pole +packages/models/mapmodels/toca/wheel +packages/models/mapmodels/toca/grid6x8 +packages/models/mapmodels/toca/guardrail +packages/models/mapmodels/toca/sgshell +packages/models/mapmodels/toca/radioactivedrum2 +packages/models/mapmodels/toca/tree2 +packages/models/mapmodels/toca/cinderblock +packages/models/mapmodels/toca/commrack +packages/models/mapmodels/toca/milkcrate +packages/models/mapmodels/toca/corrugated +packages/models/mapmodels/toca/corrugated/beam +packages/models/mapmodels/toca/corrugated/fence1 +packages/models/mapmodels/toca/corrugated/fence2 +packages/models/mapmodels/toca/powermeter +packages/models/mapmodels/toca/barbwire +packages/models/mapmodels/toca/radarconsole +packages/models/mapmodels/toca/stairs1 +packages/models/mapmodels/toca/razorwire +packages/models/mapmodels/toca/palmtree1 +packages/models/mapmodels/toca/platformmet +packages/models/mapmodels/toca/trashcan +packages/models/mapmodels/toca/radioactivedrum +packages/models/mapmodels/toca/ceilingfan +packages/models/mapmodels/tree01 +packages/models/mapmodels/wires +packages/models/mapmodels/wires/4x8 +packages/models/mapmodels/wires/2x8 +packages/models/mapmodels/wires/3x8 +packages/models/mapmodels/wires/4x8a +packages/models/mapmodels/wood01 +packages/models/mapmodels/wrench +packages/textures/skymaps/iceflow/iceflow +packages/textures/skymaps/kothic/atsea +packages/textures/skymaps/ladynighthawk/inhcanyons1 +packages/textures/skymaps/makke/mountain +packages/textures/skymaps/makke/rocky +packages/textures/skymaps/makke/sand +packages/textures/skymaps/socksky/grave +packages/textures/skymaps/socksky/nightball +packages/textures/skymaps/steini/steini2 +packages/textures/skymaps/steini/steini3 +packages/textures/skymaps/steini/steini4 diff --git a/packages/maps/new_content.cfg b/packages/maps/new_content.cfg index 58581125..b31075f9 100644 --- a/packages/maps/new_content.cfg +++ b/packages/maps/new_content.cfg @@ -62,7 +62,7 @@ mapmodel 0 0 0 0 "cleaner/rails_rusty/straight" // 56 mapmodel 0 0 0 0 "cleaner/rails_rusty/bent" // 57 -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" loadnotexture texturereset // Leave this command here, or else your map will look messed up! texture 0 "kurt/klite1.jpg" // Dummy texture - Also leave this here, or else your map will look messed up! diff --git a/packages/maps/official/ac_aqueous.cfg b/packages/maps/official/ac_aqueous.cfg index 0610944b..cad75a54 100644 --- a/packages/maps/official/ac_aqueous.cfg +++ b/packages/maps/official/ac_aqueous.cfg @@ -21,7 +21,7 @@ watercolour 40 56 18 fog 1024 -loadsky "skymaps/simonoc/graveyard" +loadsky "textures/skymaps/socksky/grave" mapmodelreset mapmodel 2 2 0 0 "makke/nothing_clip" mapmodel 4 1 0 0 "makke/platform_bridge" @@ -62,8 +62,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/maps/official/ac_arabian.cfg b/packages/maps/official/ac_arabian.cfg index 27192188..0cd7dbb6 100644 --- a/packages/maps/official/ac_arabian.cfg +++ b/packages/maps/official/ac_arabian.cfg @@ -59,8 +59,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -134,7 +134,7 @@ mapmodel 0 1 0 0 "toca/pipes/metalpipe2" mapmodel 0 0 0 0 "makke/signs/arab" mapmodel 1 1 0 0 "toca/milkcrate" mapmodel 0 0 0 0 "toca/ceilingfan" -loadsky "skymaps/ladynighthawk/canyons1" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" fog 400 loadnotexture texturereset diff --git a/packages/maps/official/ac_arctic.cfg b/packages/maps/official/ac_arctic.cfg index 38aaa6df..351c364a 100644 --- a/packages/maps/official/ac_arctic.cfg +++ b/packages/maps/official/ac_arctic.cfg @@ -20,7 +20,7 @@ // * Notice: For any reuse or distribution, you must make clear to others the license terms of this work. fog 1024 -loadsky "skymaps/simonoc/icestation" +loadsky "textures/skymaps/iceflow/iceflow" mapmodelreset mapmodel 0 0 0 0 "makke/nothing_clip" mapmodel 3 1 0 0 "makke/platform_bridge" @@ -61,8 +61,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/maps/official/ac_arid.cfg b/packages/maps/official/ac_arid.cfg index 1812adc5..fd3d8e00 100644 --- a/packages/maps/official/ac_arid.cfg +++ b/packages/maps/official/ac_arid.cfg @@ -61,8 +61,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -154,7 +154,7 @@ mapmodel 1 1 0 0 "toca/shelf" mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" mapmodel 0 0 0 0 "makke/sail" -loadsky "skymaps/ladynighthawk/canyons1" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_avenue.cfg b/packages/maps/official/ac_avenue.cfg index bb7cc192..1b14d0aa 100644 --- a/packages/maps/official/ac_avenue.cfg +++ b/packages/maps/official/ac_avenue.cfg @@ -59,8 +59,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -166,7 +166,7 @@ mapmodel 0 0 1 0 "misterfloppy/platelamp" mapmodel 0 10 0 0 "misterfloppy/streetlamp" mapmodel 0 0 0 0 "toca/guardrail2/gr2pole" mapmodel 0 0 0 0 "toca/guardrail2" -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_cavern.cfg b/packages/maps/official/ac_cavern.cfg index d7667156..90fa6ad3 100644 --- a/packages/maps/official/ac_cavern.cfg +++ b/packages/maps/official/ac_cavern.cfg @@ -59,8 +59,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 0 0 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 0 0 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -178,7 +178,7 @@ mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/beam" mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs1" mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs2" -loadsky "skymaps/ladynighthawk/canyons1" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_complex.cfg b/packages/maps/official/ac_complex.cfg index 81a0f069..8a29ceef 100644 --- a/packages/maps/official/ac_complex.cfg +++ b/packages/maps/official/ac_complex.cfg @@ -3,7 +3,7 @@ // © Copyright 2004 // Email: makk_e@web.de -loadsky "skymaps/makke/mountain" +loadsky "textures/skymaps/makke/mountain" fog 500 fogcolour 0x968070 shadowyaw 120 diff --git a/packages/maps/official/ac_depot.cfg b/packages/maps/official/ac_depot.cfg index c5a9fdaa..bac7b3aa 100644 --- a/packages/maps/official/ac_depot.cfg +++ b/packages/maps/official/ac_depot.cfg @@ -46,8 +46,8 @@ mapmodel 0 0 0 0 "makke/grass_short" mapmodel 0 0 0 0 "makke/grass_long" mapmodel 0 0 0 0 "makke/flyer_environmental" mapmodel 0 0 0 0 "makke/plant_leafy" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/lightbulb" @@ -55,7 +55,7 @@ mapmodel 0 7 0 0 "makke/ladder_7x" mapmodel 0 8 0 0 "makke/ladder_8x" mapmodel 0 0 0 0 "makke/fence_chainlink_closed_gate" mapmodel 0 0 0 0 "makke/fence_chainlink_no_gate" -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_desert.cfg b/packages/maps/official/ac_desert.cfg index e656ce17..e1e57e33 100644 --- a/packages/maps/official/ac_desert.cfg +++ b/packages/maps/official/ac_desert.cfg @@ -43,8 +43,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/sail" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -58,7 +58,7 @@ mapmodel 0 0 0 0 "makke/coke_can_fallen" mapmodel 0 0 0 0 "makke/broken_wood" mapmodel 0 0 0 0 "makke/hook" mapmodel 0 0 0 0 "makke/coffee_mug" -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_desert2.cfg b/packages/maps/official/ac_desert2.cfg index 8fc9783e..f05d56bb 100644 --- a/packages/maps/official/ac_desert2.cfg +++ b/packages/maps/official/ac_desert2.cfg @@ -1,4 +1,4 @@ -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" fogcolour 0x9F8255 fog 300 shadowyaw 90 @@ -42,8 +42,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/maps/official/ac_desert3.cfg b/packages/maps/official/ac_desert3.cfg index 612b6baa..4db86c07 100644 --- a/packages/maps/official/ac_desert3.cfg +++ b/packages/maps/official/ac_desert3.cfg @@ -1,4 +1,4 @@ -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" fogcolour 0x9F8255 fog 300 mapmodelreset @@ -41,8 +41,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/maps/official/ac_douze.cfg b/packages/maps/official/ac_douze.cfg index 46f22e16..f6f5ad56 100644 --- a/packages/maps/official/ac_douze.cfg +++ b/packages/maps/official/ac_douze.cfg @@ -45,8 +45,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -138,7 +138,7 @@ mapmodel 1 1 0 0 "toca/shelf" mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" mapmodel 0 0 0 0 "makke/signs/no_camping" -loadsky "skymaps/makke/mountain" +loadsky "textures/skymaps/makke/mountain" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_edifice.cfg b/packages/maps/official/ac_edifice.cfg index 96e8621e..797c58c6 100644 --- a/packages/maps/official/ac_edifice.cfg +++ b/packages/maps/official/ac_edifice.cfg @@ -60,8 +60,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -154,7 +154,7 @@ mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs1" -loadsky "skymaps/ladynighthawk/canyons1" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_elevation.cfg b/packages/maps/official/ac_elevation.cfg index 5b0cf23d..c92d65a6 100644 --- a/packages/maps/official/ac_elevation.cfg +++ b/packages/maps/official/ac_elevation.cfg @@ -39,8 +39,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -59,7 +59,7 @@ mapmodel 0 0 0 0 "makke/signs/wanted" mapmodel 1 1 0 0 "makke/aardapple_enginebox" mapmodel 0 8 0 0 "makke/nothing_clip" mapmodel 0 1 0 0 "makke/ladder_1x" -loadsky "skymaps/makke/rocky" +loadsky "textures/skymaps/makke/rocky" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_gothic.cfg b/packages/maps/official/ac_gothic.cfg index 436ea1a5..06500ab6 100644 --- a/packages/maps/official/ac_gothic.cfg +++ b/packages/maps/official/ac_gothic.cfg @@ -40,8 +40,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -109,7 +109,7 @@ mapmodel 0 0 0 0 "toca/securitycam/vertmount" mapmodel 0 0 0 0 "toca/securitycam/wallmount" mapmodel 1 4 0 0 "toca/guardrail2/gr2pole" mapmodel 0 0 0 0 "toca/airconditioner/interior" -loadsky "skymaps/simonoc/nightball" +loadsky "textures/skymaps/socksky/nightball" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_iceroad.cfg b/packages/maps/official/ac_iceroad.cfg index 570e7ed3..19932730 100644 --- a/packages/maps/official/ac_iceroad.cfg +++ b/packages/maps/official/ac_iceroad.cfg @@ -60,8 +60,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -154,7 +154,7 @@ mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" mapmodel 0 0 0 0 "makke/icicle" mapmodel 0 0 0 0 "makke/fence_chainlink_post" -loadsky "skymaps/steini/steini2" +loadsky "textures/skymaps/steini/steini2" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_industrial.cfg b/packages/maps/official/ac_industrial.cfg index c96aaf5e..baa6edf7 100644 --- a/packages/maps/official/ac_industrial.cfg +++ b/packages/maps/official/ac_industrial.cfg @@ -60,8 +60,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -161,7 +161,7 @@ mapmodel 1 2 8 0 "toca/barbwire" mapmodel 1 1 0 0 "toca/shelf" mapmodel 4 1 15 0 "toca/guardtower" mapmodel 1 2 0 0 "toca/treetrunk1" -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_industrial.cgz b/packages/maps/official/ac_industrial.cgz index e4b91011..dfbea816 100644 Binary files a/packages/maps/official/ac_industrial.cgz and b/packages/maps/official/ac_industrial.cgz differ diff --git a/packages/maps/official/ac_ingress.cfg b/packages/maps/official/ac_ingress.cfg index 0567a55a..6b574aa8 100644 --- a/packages/maps/official/ac_ingress.cfg +++ b/packages/maps/official/ac_ingress.cfg @@ -68,8 +68,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -167,7 +167,7 @@ mapmodel 0 0 0 0 "makke/wires/2x8" mapmodel 0 0 0 0 "makke/wires/4x8a" mapmodel 0 0 0 0 "makke/wires/4x8" fog 800 -loadsky "skymaps/simonoc/graveyard" +loadsky "textures/skymaps/socksky/grave" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_keller.cfg b/packages/maps/official/ac_keller.cfg index 70d875f0..93a339d2 100644 --- a/packages/maps/official/ac_keller.cfg +++ b/packages/maps/official/ac_keller.cfg @@ -63,8 +63,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -82,7 +82,7 @@ mapmodel 0 0 0 0 "makke/flyer_propaganda" mapmodel 0 0 0 0 "makke/signs/wanted" mapmodel 1 1 0 0 "makke/aardapple_enginebox" mapmodel 0 8 0 0 "makke/drainpipe" -loadsky "skymaps/makke/mountain" +loadsky "textures/skymaps/makke/mountain" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_lainio.cfg b/packages/maps/official/ac_lainio.cfg index 835ab4a9..5f22865e 100644 --- a/packages/maps/official/ac_lainio.cfg +++ b/packages/maps/official/ac_lainio.cfg @@ -64,8 +64,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -166,7 +166,7 @@ mapmodel 0 0 0 0 "makke/icicle" mapmodel 0 0 0 0 "cleaner/oldclock" mapmodel 0 0 0 0 "cleaner/monalisa" mapmodel 0 0 0 0 "cleaner/worldmap" -loadsky "skymaps/simonoc/icestation" +loadsky "textures/skymaps/iceflow/iceflow" loadnotexture texturereset texture 0 "kurt/klite1.jpg" @@ -407,7 +407,7 @@ texture 0 "golgotha/smallsteelbox.jpg" texture 0 "nieb/asphaltdamaged0043_1_l.jpg" texture 0 "nieb/doorsindustrial0183.jpg" texture 0 "nieb/concretebare0154_3.jpg" -texture 0 "jamz/new_bricks_3.jpg" +texture 0 "snoosnoo/map2.jpg" texture 0 "jamz/new_bricks_3.jpg" texture 0 "nieb/bricksmall0060.jpg" texture 0 "nieb/bricksmall0067.jpg" diff --git a/packages/maps/official/ac_mines.cfg b/packages/maps/official/ac_mines.cfg index 40c012ec..a7460dae 100644 --- a/packages/maps/official/ac_mines.cfg +++ b/packages/maps/official/ac_mines.cfg @@ -44,15 +44,15 @@ mapmodel 0 0 0 0 "makke/grass_short" mapmodel 0 0 0 0 "makke/grass_long" mapmodel 0 0 0 0 "makke/flyer_environmental" mapmodel 0 0 0 0 "makke/plant_leafy" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 3 8 0 0 "makke/mine-shaft_elevator" mapmodel 0 11 0 0 "makke/ladder_11x" mapmodel 0 15 0 0 "makke/ladder_15x" mapmodel 0 0 0 0 "makke/lightbulb" -loadsky "skymaps/makke/rocky" +loadsky "textures/skymaps/makke/rocky" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_outpost.cfg b/packages/maps/official/ac_outpost.cfg index 1cc0bf04..998acbba 100644 --- a/packages/maps/official/ac_outpost.cfg +++ b/packages/maps/official/ac_outpost.cfg @@ -20,7 +20,7 @@ shadowyaw 280 fog 250 fogcolour 10453569 -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" loadnotexture "noctua/wood/planks02.jpg" mapmodelreset mapmodel 2 2 0 0 "makke/nothing_clip" @@ -62,8 +62,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/maps/official/ac_power.cfg b/packages/maps/official/ac_power.cfg index 9cd9d1e3..448881b8 100644 --- a/packages/maps/official/ac_power.cfg +++ b/packages/maps/official/ac_power.cfg @@ -43,8 +43,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -76,7 +76,7 @@ mapmodel 1 7 0 0 "toca/commrack" mapmodel 1 4 0 0 "toca/guardrail2" mapmodel 1 4 0 0 "toca/guardrail2/gr2pole" mapmodel 1 4 0 0 "makke/nothing_clip" -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_rattrap.cfg b/packages/maps/official/ac_rattrap.cfg index 6ef0d447..106bbcb9 100644 --- a/packages/maps/official/ac_rattrap.cfg +++ b/packages/maps/official/ac_rattrap.cfg @@ -39,7 +39,7 @@ shadowyaw 275 fog 700 -loadsky "skymaps/kellmcdonald/atsea" +loadsky "textures/skymaps/kothic/atsea" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_scaffold.cfg b/packages/maps/official/ac_scaffold.cfg index badb5ecb..7471549c 100644 --- a/packages/maps/official/ac_scaffold.cfg +++ b/packages/maps/official/ac_scaffold.cfg @@ -40,8 +40,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -115,7 +115,7 @@ mapmodel 2 2 0 0 "toca/airconditioner" mapmodel 2 2 0 0 "toca/airconditioner/interior" mapmodel 1 1 0 0 "toca/ceilingfan" mapmodel 0 1 0 0 "makke/ladder_1x" -loadsky "skymaps/simonoc/nightball" +loadsky "textures/skymaps/socksky/nightball" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_shine.cfg b/packages/maps/official/ac_shine.cfg index ca449aa2..09e1c224 100644 --- a/packages/maps/official/ac_shine.cfg +++ b/packages/maps/official/ac_shine.cfg @@ -38,8 +38,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -118,7 +118,7 @@ mapmodel 1 24 0 0 "makke/fence_chainlink_post" mapmodel 1 24 0 0 "makke/fence_chainlink_closed_gate" mapmodel 0 0 0 0 "makke/signs/arab" mapmodel 2 3 0 0 "makke/nothing_clip" -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_snow.cfg b/packages/maps/official/ac_snow.cfg index 4a627059..000da121 100644 --- a/packages/maps/official/ac_snow.cfg +++ b/packages/maps/official/ac_snow.cfg @@ -39,8 +39,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -58,7 +58,7 @@ mapmodel 0 0 0 0 "makke/flyer_propaganda" mapmodel 0 0 0 0 "makke/signs/wanted" mapmodel 1 1 0 0 "makke/aardapple_enginebox" fog 150 -loadsky "skymaps/steini/steini2" +loadsky "/textures/skymaps/steini/steini2" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_stellar.cfg b/packages/maps/official/ac_stellar.cfg index 6b011409..4aa98547 100644 --- a/packages/maps/official/ac_stellar.cfg +++ b/packages/maps/official/ac_stellar.cfg @@ -60,8 +60,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -166,7 +166,7 @@ mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_top" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_2" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_low" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_up" -loadsky "skymaps/simonoc/graveyard" +loadsky "textures/skymaps/socksky/grave" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_sunset.cfg b/packages/maps/official/ac_sunset.cfg index fb3041b1..89d87cfd 100644 --- a/packages/maps/official/ac_sunset.cfg +++ b/packages/maps/official/ac_sunset.cfg @@ -41,8 +41,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -62,8 +62,8 @@ mapmodel 0 0 0 0 "makke/aardapple_enginebox" mapmodel 2 10 0 0 "makke/nothing_clip" mapmodel 0 1 0 0 "makke/ladder_1x" mapmodel 0 10 0 0 "makke/nothing_clip" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" -loadsky "skymaps/ladynighthawk/canyons1" +mapmodel 0 0 0 0 "makke/grate_vert" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_swamp.cfg b/packages/maps/official/ac_swamp.cfg index 45a1df29..c59f07aa 100644 --- a/packages/maps/official/ac_swamp.cfg +++ b/packages/maps/official/ac_swamp.cfg @@ -72,8 +72,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 0 0 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 0 0 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -192,7 +192,7 @@ mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs1" mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs2" mapmodel 0 0 0 0 "makke/fence_chainlink_post" -loadsky "skymaps/simonoc/nightball" +loadsky "textures/skymaps/socksky/nightball" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_terros.cfg b/packages/maps/official/ac_terros.cfg index e5ec5570..4d4e2920 100644 --- a/packages/maps/official/ac_terros.cfg +++ b/packages/maps/official/ac_terros.cfg @@ -60,8 +60,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -181,7 +181,7 @@ mapmodel 1 1 0 0 "misterfloppy/valve_hor" mapmodel 0 0 0 0 "makke/fence_chainlink" mapmodel 0 0 0 0 "makke/fence_chainlink_post" mapmodel 0 0 0 0 "makke/fence_chainlink_closed_gate" -loadsky "skymaps/makke/sand" +loadsky "textures/skymaps/makke/sand" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_terros.cgz b/packages/maps/official/ac_terros.cgz index 63cf2860..b5cb4b93 100644 Binary files a/packages/maps/official/ac_terros.cgz and b/packages/maps/official/ac_terros.cgz differ diff --git a/packages/maps/official/ac_toxic.cfg b/packages/maps/official/ac_toxic.cfg index b0a0dc31..404786c4 100644 --- a/packages/maps/official/ac_toxic.cfg +++ b/packages/maps/official/ac_toxic.cfg @@ -63,8 +63,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 0 0 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 0 0 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -96,7 +96,7 @@ mapmodel 0 6 0 0 "misterfloppy/hanging_ladder/ladder_6" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_top" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_up" mapmodel 0 0 0 0 "misterfloppy/hanging_ladder/ladder_low" -loadsky "skymaps/steini/steini4" +loadsky "textures/skymaps/steini/steini4" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_urban.cfg b/packages/maps/official/ac_urban.cfg index 21b81deb..aff76bd3 100644 --- a/packages/maps/official/ac_urban.cfg +++ b/packages/maps/official/ac_urban.cfg @@ -40,8 +40,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 0 0 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 0 0 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -71,7 +71,7 @@ mapmodel 1 3 0 0 "toca/wheel" mapmodel 0 0 0 0 "toca/securitycam/vertmount" mapmodel 0 0 0 0 "toca/securitycam/wallmount" mapmodel 0 0 0 0 "toca/securitycam/secucam" -loadsky "skymaps/steini/steini3" +loadsky "textures/skymaps/steini/steini3" texturereset texture 0 "kurt/klite1.jpg" texture 0 "makke/black.jpg" diff --git a/packages/maps/official/ac_venison.cfg b/packages/maps/official/ac_venison.cfg index d509107f..8eb99177 100644 --- a/packages/maps/official/ac_venison.cfg +++ b/packages/maps/official/ac_venison.cfg @@ -59,8 +59,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -178,7 +178,7 @@ mapmodel 1 3 0 0 "makke/barrel_newsteel" mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" mapmodel 1 1 0 0 "misterfloppy/valve_hor" mapmodel 0 0 0 0 "toca/newspaper/1" -loadsky "skymaps/ladynighthawk/canyons1" +loadsky "textures/skymaps/ladynighthawk/inhcanyons1" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_wasteland.cfg b/packages/maps/official/ac_wasteland.cfg index 861aed8d..c12c9ab6 100644 --- a/packages/maps/official/ac_wasteland.cfg +++ b/packages/maps/official/ac_wasteland.cfg @@ -59,8 +59,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" @@ -212,7 +212,7 @@ mapmodel 3 1 0 0 "toca/grid6x8" mapmodel 0 0 0 0 "cleaner/shovels/shovel1" mapmodel 0 0 0 0 "cleaner/shovels/shovel2" mapmodel 0 0 0 0 "cleaner/shovels/shovel3" -loadsky "skymaps/simonoc/graveyard" +loadsky "textures/skymaps/socksky/grave" loadnotexture texturereset texture 0 "kurt/klite1.jpg" diff --git a/packages/maps/official/ac_werk.cfg b/packages/maps/official/ac_werk.cfg index 00898cd6..9746b026 100644 --- a/packages/maps/official/ac_werk.cfg +++ b/packages/maps/official/ac_werk.cfg @@ -21,7 +21,7 @@ fog 150 fogcolour 0x8099B3 -loadsky "skymaps/steini/steini2" +loadsky "textures/skymaps/steini/steini2" loadnotexture mapmodelreset mapmodel 2 2 0 0 "makke/nothing_clip" @@ -63,8 +63,8 @@ mapmodel 1 2 0 0 "makke/barrel_fallen" mapmodel 0 0 0 0 "makke/electric_meter" mapmodel 3 1 0 0 "makke/pallet" mapmodel 0 0 0 0 "makke/fuel_tank" -mapmodel 2 1 0 0 "cleaner/grates/grate_hor" -mapmodel 1 2 0 0 "cleaner/grates/grate_vert" +mapmodel 2 1 0 0 "makke/grate_hor" +mapmodel 1 2 0 0 "makke/grate_vert" mapmodel 0 0 0 0 "makke/wrench" mapmodel 0 0 0 0 "makke/bolt_nut" mapmodel 0 0 0 0 "makke/signs/flammable" diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor/grate.jpg b/packages/models/mapmodels/cleaner/grates/grate_hor/grate.jpg deleted file mode 100644 index 85edc3f9..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_hor/grate.jpg and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor/grate_hor.md3 b/packages/models/mapmodels/cleaner/grates/grate_hor/grate_hor.md3 deleted file mode 100644 index 7ab50258..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_hor/grate_hor.md3 and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor/md3.cfg b/packages/models/mapmodels/cleaner/grates/grate_hor/md3.cfg deleted file mode 100644 index 9ec74989..00000000 --- a/packages/models/mapmodels/cleaner/grates/grate_hor/md3.cfg +++ /dev/null @@ -1,3 +0,0 @@ -md3load grate_hor.md3 -md3skin grate_hor grate.jpg -mdlcullface 0 \ No newline at end of file diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_hor.md3 b/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_hor.md3 deleted file mode 100644 index 7ab50258..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_hor.md3 and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_rust.jpg b/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_rust.jpg deleted file mode 100644 index c5c3e1ba..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/grate_rust.jpg and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/md3.cfg b/packages/models/mapmodels/cleaner/grates/grate_hor_rust/md3.cfg deleted file mode 100644 index 4b75d57b..00000000 --- a/packages/models/mapmodels/cleaner/grates/grate_hor_rust/md3.cfg +++ /dev/null @@ -1,3 +0,0 @@ -md3load grate_hor.md3 -md3skin grate_hor grate_rust.jpg -mdlcullface 0 \ No newline at end of file diff --git a/packages/models/mapmodels/cleaner/grates/grate_vert/grate_vert.md3 b/packages/models/mapmodels/cleaner/grates/grate_vert/grate_vert.md3 deleted file mode 100644 index 88257164..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_vert/grate_vert.md3 and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_vert/md3.cfg b/packages/models/mapmodels/cleaner/grates/grate_vert/md3.cfg deleted file mode 100644 index 7c23a45f..00000000 --- a/packages/models/mapmodels/cleaner/grates/grate_vert/md3.cfg +++ /dev/null @@ -1,3 +0,0 @@ -md3load grate_vert.md3 -md3skin grate_vert ../grate_hor/grate.jpg -mdlcullface 0 \ No newline at end of file diff --git a/packages/models/mapmodels/cleaner/grates/grate_vert_rust/grate_vert.md3 b/packages/models/mapmodels/cleaner/grates/grate_vert_rust/grate_vert.md3 deleted file mode 100644 index 88257164..00000000 Binary files a/packages/models/mapmodels/cleaner/grates/grate_vert_rust/grate_vert.md3 and /dev/null differ diff --git a/packages/models/mapmodels/cleaner/grates/grate_vert_rust/md3.cfg b/packages/models/mapmodels/cleaner/grates/grate_vert_rust/md3.cfg deleted file mode 100644 index bb37ff3f..00000000 --- a/packages/models/mapmodels/cleaner/grates/grate_vert_rust/md3.cfg +++ /dev/null @@ -1,3 +0,0 @@ -md3load grate_vert.md3 -md3skin grate_vert ../grate_hor_rust/grate_rust.jpg -mdlcullface 0 \ No newline at end of file diff --git a/packages/models/mapmodels/makke/grate_hor/skin.jpg b/packages/models/mapmodels/makke/grate_hor/skin.jpg new file mode 100644 index 00000000..89204552 Binary files /dev/null and b/packages/models/mapmodels/makke/grate_hor/skin.jpg differ diff --git a/packages/models/mapmodels/makke/grate_hor/tris.md3 b/packages/models/mapmodels/makke/grate_hor/tris.md3 new file mode 100644 index 00000000..ceec1634 Binary files /dev/null and b/packages/models/mapmodels/makke/grate_hor/tris.md3 differ diff --git a/packages/models/mapmodels/makke/grate_vert/md3.cfg b/packages/models/mapmodels/makke/grate_vert/md3.cfg new file mode 100644 index 00000000..cdef76dc --- /dev/null +++ b/packages/models/mapmodels/makke/grate_vert/md3.cfg @@ -0,0 +1,3 @@ +md3load ./tris.md3 +md3skin * ../grate_hor/skin.jpg + diff --git a/packages/models/mapmodels/makke/grate_vert/tris.md3 b/packages/models/mapmodels/makke/grate_vert/tris.md3 new file mode 100644 index 00000000..df4ecac8 Binary files /dev/null and b/packages/models/mapmodels/makke/grate_vert/tris.md3 differ diff --git a/packages/skymaps/humus/license.txt b/packages/skymaps/humus/license.txt deleted file mode 100644 index 5cafcd88..00000000 --- a/packages/skymaps/humus/license.txt +++ /dev/null @@ -1,44 +0,0 @@ -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/skymaps/humus/powerlines_bk.jpg b/packages/skymaps/humus/powerlines_bk.jpg deleted file mode 100644 index b83fc5fc..00000000 Binary files a/packages/skymaps/humus/powerlines_bk.jpg and /dev/null differ diff --git a/packages/skymaps/humus/powerlines_dn.jpg b/packages/skymaps/humus/powerlines_dn.jpg deleted file mode 100644 index a09318c1..00000000 Binary files a/packages/skymaps/humus/powerlines_dn.jpg and /dev/null differ diff --git a/packages/skymaps/humus/powerlines_ft.jpg b/packages/skymaps/humus/powerlines_ft.jpg deleted file mode 100644 index 4a8c9f71..00000000 Binary files a/packages/skymaps/humus/powerlines_ft.jpg and /dev/null differ diff --git a/packages/skymaps/humus/powerlines_lf.jpg b/packages/skymaps/humus/powerlines_lf.jpg deleted file mode 100644 index f5c084ab..00000000 Binary files a/packages/skymaps/humus/powerlines_lf.jpg and /dev/null differ diff --git a/packages/skymaps/humus/powerlines_rt.jpg b/packages/skymaps/humus/powerlines_rt.jpg deleted file mode 100644 index be130d4c..00000000 Binary files a/packages/skymaps/humus/powerlines_rt.jpg and /dev/null differ diff --git a/packages/skymaps/humus/powerlines_up.jpg b/packages/skymaps/humus/powerlines_up.jpg deleted file mode 100644 index f319fe4d..00000000 Binary files a/packages/skymaps/humus/powerlines_up.jpg and /dev/null differ diff --git a/packages/skymaps/simonoc/icestation_bk.jpg b/packages/textures/skymaps/iceflow/iceflow_bk.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_bk.jpg rename to packages/textures/skymaps/iceflow/iceflow_bk.jpg diff --git a/packages/skymaps/simonoc/icestation_dn.jpg b/packages/textures/skymaps/iceflow/iceflow_dn.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_dn.jpg rename to packages/textures/skymaps/iceflow/iceflow_dn.jpg diff --git a/packages/skymaps/simonoc/icestation_ft.jpg b/packages/textures/skymaps/iceflow/iceflow_ft.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_ft.jpg rename to packages/textures/skymaps/iceflow/iceflow_ft.jpg diff --git a/packages/skymaps/simonoc/icestation_lf.jpg b/packages/textures/skymaps/iceflow/iceflow_lf.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_lf.jpg rename to packages/textures/skymaps/iceflow/iceflow_lf.jpg diff --git a/packages/skymaps/simonoc/icestation_rt.jpg b/packages/textures/skymaps/iceflow/iceflow_rt.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_rt.jpg rename to packages/textures/skymaps/iceflow/iceflow_rt.jpg diff --git a/packages/skymaps/simonoc/icestation_up.jpg b/packages/textures/skymaps/iceflow/iceflow_up.jpg similarity index 100% rename from packages/skymaps/simonoc/icestation_up.jpg rename to packages/textures/skymaps/iceflow/iceflow_up.jpg diff --git a/packages/skymaps/simonoc/license.txt b/packages/textures/skymaps/iceflow/license.txt similarity index 99% rename from packages/skymaps/simonoc/license.txt rename to packages/textures/skymaps/iceflow/license.txt index f717c62b..dfd14175 100644 --- a/packages/skymaps/simonoc/license.txt +++ b/packages/textures/skymaps/iceflow/license.txt @@ -1,6 +1,5 @@ Skymaps within this folder were originally by: Simon "sock" O'Callaghan (mememe@simonoc.com) - (AKA: Socksky) The files were obtained from here: http://www.simonoc.com/pages/materials.htm diff --git a/packages/skymaps/kellmcdonald/atsea_bk.jpg b/packages/textures/skymaps/kothic/atsea_bk.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_bk.jpg rename to packages/textures/skymaps/kothic/atsea_bk.jpg diff --git a/packages/skymaps/kellmcdonald/atsea_dn.jpg b/packages/textures/skymaps/kothic/atsea_dn.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_dn.jpg rename to packages/textures/skymaps/kothic/atsea_dn.jpg diff --git a/packages/skymaps/kellmcdonald/atsea_ft.jpg b/packages/textures/skymaps/kothic/atsea_ft.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_ft.jpg rename to packages/textures/skymaps/kothic/atsea_ft.jpg diff --git a/packages/skymaps/kellmcdonald/atsea_lf.jpg b/packages/textures/skymaps/kothic/atsea_lf.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_lf.jpg rename to packages/textures/skymaps/kothic/atsea_lf.jpg diff --git a/packages/skymaps/kellmcdonald/atsea_rt.jpg b/packages/textures/skymaps/kothic/atsea_rt.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_rt.jpg rename to packages/textures/skymaps/kothic/atsea_rt.jpg diff --git a/packages/skymaps/kellmcdonald/atsea_up.jpg b/packages/textures/skymaps/kothic/atsea_up.jpg similarity index 100% rename from packages/skymaps/kellmcdonald/atsea_up.jpg rename to packages/textures/skymaps/kothic/atsea_up.jpg diff --git a/packages/skymaps/kellmcdonald/license.html b/packages/textures/skymaps/kothic/skies-kothic.html similarity index 100% rename from packages/skymaps/kellmcdonald/license.html rename to packages/textures/skymaps/kothic/skies-kothic.html diff --git a/packages/skymaps/ladynighthawk/canyons1_bk.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_bk.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_bk.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_bk.jpg diff --git a/packages/skymaps/ladynighthawk/canyons1_dn.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_dn.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_dn.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_dn.jpg diff --git a/packages/skymaps/ladynighthawk/canyons1_ft.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_ft.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_ft.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_ft.jpg diff --git a/packages/skymaps/ladynighthawk/canyons1_lf.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_lf.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_lf.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_lf.jpg diff --git a/packages/skymaps/ladynighthawk/canyons1_rt.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_rt.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_rt.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_rt.jpg diff --git a/packages/skymaps/ladynighthawk/canyons1_up.jpg b/packages/textures/skymaps/ladynighthawk/inhcanyons1_up.jpg similarity index 100% rename from packages/skymaps/ladynighthawk/canyons1_up.jpg rename to packages/textures/skymaps/ladynighthawk/inhcanyons1_up.jpg diff --git a/packages/skymaps/ladynighthawk/license.txt b/packages/textures/skymaps/ladynighthawk/license.txt similarity index 100% rename from packages/skymaps/ladynighthawk/license.txt rename to packages/textures/skymaps/ladynighthawk/license.txt diff --git a/packages/skymaps/makke/license.txt b/packages/textures/skymaps/makke/license.txt similarity index 100% rename from packages/skymaps/makke/license.txt rename to packages/textures/skymaps/makke/license.txt diff --git a/packages/skymaps/makke/mountain_bk.jpg b/packages/textures/skymaps/makke/mountain_bk.jpg similarity index 100% rename from packages/skymaps/makke/mountain_bk.jpg rename to packages/textures/skymaps/makke/mountain_bk.jpg diff --git a/packages/skymaps/makke/mountain_dn.jpg b/packages/textures/skymaps/makke/mountain_dn.jpg similarity index 100% rename from packages/skymaps/makke/mountain_dn.jpg rename to packages/textures/skymaps/makke/mountain_dn.jpg diff --git a/packages/skymaps/makke/mountain_ft.jpg b/packages/textures/skymaps/makke/mountain_ft.jpg similarity index 100% rename from packages/skymaps/makke/mountain_ft.jpg rename to packages/textures/skymaps/makke/mountain_ft.jpg diff --git a/packages/skymaps/makke/mountain_lf.jpg b/packages/textures/skymaps/makke/mountain_lf.jpg similarity index 100% rename from packages/skymaps/makke/mountain_lf.jpg rename to packages/textures/skymaps/makke/mountain_lf.jpg diff --git a/packages/skymaps/makke/mountain_rt.jpg b/packages/textures/skymaps/makke/mountain_rt.jpg similarity index 100% rename from packages/skymaps/makke/mountain_rt.jpg rename to packages/textures/skymaps/makke/mountain_rt.jpg diff --git a/packages/skymaps/makke/mountain_up.jpg b/packages/textures/skymaps/makke/mountain_up.jpg similarity index 100% rename from packages/skymaps/makke/mountain_up.jpg rename to packages/textures/skymaps/makke/mountain_up.jpg diff --git a/packages/skymaps/makke/rocky_bk.jpg b/packages/textures/skymaps/makke/rocky_bk.jpg similarity index 100% rename from packages/skymaps/makke/rocky_bk.jpg rename to packages/textures/skymaps/makke/rocky_bk.jpg diff --git a/packages/skymaps/makke/rocky_dn.jpg b/packages/textures/skymaps/makke/rocky_dn.jpg similarity index 100% rename from packages/skymaps/makke/rocky_dn.jpg rename to packages/textures/skymaps/makke/rocky_dn.jpg diff --git a/packages/skymaps/makke/rocky_ft.jpg b/packages/textures/skymaps/makke/rocky_ft.jpg similarity index 100% rename from packages/skymaps/makke/rocky_ft.jpg rename to packages/textures/skymaps/makke/rocky_ft.jpg diff --git a/packages/skymaps/makke/rocky_lf.jpg b/packages/textures/skymaps/makke/rocky_lf.jpg similarity index 100% rename from packages/skymaps/makke/rocky_lf.jpg rename to packages/textures/skymaps/makke/rocky_lf.jpg diff --git a/packages/skymaps/makke/rocky_rt.jpg b/packages/textures/skymaps/makke/rocky_rt.jpg similarity index 100% rename from packages/skymaps/makke/rocky_rt.jpg rename to packages/textures/skymaps/makke/rocky_rt.jpg diff --git a/packages/skymaps/makke/rocky_up.jpg b/packages/textures/skymaps/makke/rocky_up.jpg similarity index 100% rename from packages/skymaps/makke/rocky_up.jpg rename to packages/textures/skymaps/makke/rocky_up.jpg diff --git a/packages/skymaps/makke/sand_bk.jpg b/packages/textures/skymaps/makke/sand_bk.jpg similarity index 100% rename from packages/skymaps/makke/sand_bk.jpg rename to packages/textures/skymaps/makke/sand_bk.jpg diff --git a/packages/skymaps/makke/sand_dn.jpg b/packages/textures/skymaps/makke/sand_dn.jpg similarity index 100% rename from packages/skymaps/makke/sand_dn.jpg rename to packages/textures/skymaps/makke/sand_dn.jpg diff --git a/packages/skymaps/makke/sand_ft.jpg b/packages/textures/skymaps/makke/sand_ft.jpg similarity index 100% rename from packages/skymaps/makke/sand_ft.jpg rename to packages/textures/skymaps/makke/sand_ft.jpg diff --git a/packages/skymaps/makke/sand_lf.jpg b/packages/textures/skymaps/makke/sand_lf.jpg similarity index 100% rename from packages/skymaps/makke/sand_lf.jpg rename to packages/textures/skymaps/makke/sand_lf.jpg diff --git a/packages/skymaps/makke/sand_rt.jpg b/packages/textures/skymaps/makke/sand_rt.jpg similarity index 100% rename from packages/skymaps/makke/sand_rt.jpg rename to packages/textures/skymaps/makke/sand_rt.jpg diff --git a/packages/skymaps/makke/sand_up.jpg b/packages/textures/skymaps/makke/sand_up.jpg similarity index 100% rename from packages/skymaps/makke/sand_up.jpg rename to packages/textures/skymaps/makke/sand_up.jpg diff --git a/packages/skymaps/simonoc/graveyard_bk.jpg b/packages/textures/skymaps/socksky/grave_bk.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_bk.jpg rename to packages/textures/skymaps/socksky/grave_bk.jpg diff --git a/packages/skymaps/simonoc/graveyard_dn.jpg b/packages/textures/skymaps/socksky/grave_dn.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_dn.jpg rename to packages/textures/skymaps/socksky/grave_dn.jpg diff --git a/packages/skymaps/simonoc/graveyard_ft.jpg b/packages/textures/skymaps/socksky/grave_ft.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_ft.jpg rename to packages/textures/skymaps/socksky/grave_ft.jpg diff --git a/packages/skymaps/simonoc/graveyard_lf.jpg b/packages/textures/skymaps/socksky/grave_lf.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_lf.jpg rename to packages/textures/skymaps/socksky/grave_lf.jpg diff --git a/packages/skymaps/simonoc/graveyard_rt.jpg b/packages/textures/skymaps/socksky/grave_rt.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_rt.jpg rename to packages/textures/skymaps/socksky/grave_rt.jpg diff --git a/packages/skymaps/simonoc/graveyard_up.jpg b/packages/textures/skymaps/socksky/grave_up.jpg similarity index 100% rename from packages/skymaps/simonoc/graveyard_up.jpg rename to packages/textures/skymaps/socksky/grave_up.jpg diff --git a/packages/textures/skymaps/socksky/license.txt b/packages/textures/skymaps/socksky/license.txt new file mode 100644 index 00000000..dfd14175 --- /dev/null +++ b/packages/textures/skymaps/socksky/license.txt @@ -0,0 +1,47 @@ +Skymaps within this folder were originally by: + Simon "sock" O'Callaghan (mememe@simonoc.com) + +The files were obtained from here: + http://www.simonoc.com/pages/materials.htm + +The website allowed usage under the following terms: + All use of my digital work is covered by this Creative Commons + Deed: http://creativecommons.org/licenses/by-nc-sa/3.0/ Please + do not use any of my work for commercial purposes, thank you. + +The following is a copy of the Creative Commons license link above: + +=========================================================================== +Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) + +You are free: + * to Share — to copy, distribute and transmit the work + * to Remix — to adapt 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). + + * Noncommercial — You may not use this work for commercial purposes. + * Share Alike — If you alter, transform, or build upon this work, + you may distribute the resulting work only under the same or similar + license to this one. + +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: + o Your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + o The author's moral rights; + o 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/skymaps/simonoc/nightball_bk.jpg b/packages/textures/skymaps/socksky/nightball_bk.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_bk.jpg rename to packages/textures/skymaps/socksky/nightball_bk.jpg diff --git a/packages/skymaps/simonoc/nightball_dn.jpg b/packages/textures/skymaps/socksky/nightball_dn.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_dn.jpg rename to packages/textures/skymaps/socksky/nightball_dn.jpg diff --git a/packages/skymaps/simonoc/nightball_ft.jpg b/packages/textures/skymaps/socksky/nightball_ft.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_ft.jpg rename to packages/textures/skymaps/socksky/nightball_ft.jpg diff --git a/packages/skymaps/simonoc/nightball_lf.jpg b/packages/textures/skymaps/socksky/nightball_lf.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_lf.jpg rename to packages/textures/skymaps/socksky/nightball_lf.jpg diff --git a/packages/skymaps/simonoc/nightball_rt.jpg b/packages/textures/skymaps/socksky/nightball_rt.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_rt.jpg rename to packages/textures/skymaps/socksky/nightball_rt.jpg diff --git a/packages/skymaps/simonoc/nightball_up.jpg b/packages/textures/skymaps/socksky/nightball_up.jpg similarity index 100% rename from packages/skymaps/simonoc/nightball_up.jpg rename to packages/textures/skymaps/socksky/nightball_up.jpg diff --git a/packages/skymaps/steini/license.txt b/packages/textures/skymaps/steini/license.txt similarity index 100% rename from packages/skymaps/steini/license.txt rename to packages/textures/skymaps/steini/license.txt diff --git a/packages/skymaps/steini/steini2_bk.jpg b/packages/textures/skymaps/steini/steini2_bk.jpg similarity index 100% rename from packages/skymaps/steini/steini2_bk.jpg rename to packages/textures/skymaps/steini/steini2_bk.jpg diff --git a/packages/skymaps/steini/steini2_dn.jpg b/packages/textures/skymaps/steini/steini2_dn.jpg similarity index 100% rename from packages/skymaps/steini/steini2_dn.jpg rename to packages/textures/skymaps/steini/steini2_dn.jpg diff --git a/packages/skymaps/steini/steini2_ft.jpg b/packages/textures/skymaps/steini/steini2_ft.jpg similarity index 100% rename from packages/skymaps/steini/steini2_ft.jpg rename to packages/textures/skymaps/steini/steini2_ft.jpg diff --git a/packages/skymaps/steini/steini2_lf.jpg b/packages/textures/skymaps/steini/steini2_lf.jpg similarity index 100% rename from packages/skymaps/steini/steini2_lf.jpg rename to packages/textures/skymaps/steini/steini2_lf.jpg diff --git a/packages/skymaps/steini/steini2_rt.jpg b/packages/textures/skymaps/steini/steini2_rt.jpg similarity index 100% rename from packages/skymaps/steini/steini2_rt.jpg rename to packages/textures/skymaps/steini/steini2_rt.jpg diff --git a/packages/skymaps/steini/steini2_up.jpg b/packages/textures/skymaps/steini/steini2_up.jpg similarity index 100% rename from packages/skymaps/steini/steini2_up.jpg rename to packages/textures/skymaps/steini/steini2_up.jpg diff --git a/packages/skymaps/steini/steini3_bk.jpg b/packages/textures/skymaps/steini/steini3_bk.jpg similarity index 100% rename from packages/skymaps/steini/steini3_bk.jpg rename to packages/textures/skymaps/steini/steini3_bk.jpg diff --git a/packages/skymaps/steini/steini3_dn.jpg b/packages/textures/skymaps/steini/steini3_dn.jpg similarity index 100% rename from packages/skymaps/steini/steini3_dn.jpg rename to packages/textures/skymaps/steini/steini3_dn.jpg diff --git a/packages/skymaps/steini/steini3_ft.jpg b/packages/textures/skymaps/steini/steini3_ft.jpg similarity index 100% rename from packages/skymaps/steini/steini3_ft.jpg rename to packages/textures/skymaps/steini/steini3_ft.jpg diff --git a/packages/skymaps/steini/steini3_lf.jpg b/packages/textures/skymaps/steini/steini3_lf.jpg similarity index 100% rename from packages/skymaps/steini/steini3_lf.jpg rename to packages/textures/skymaps/steini/steini3_lf.jpg diff --git a/packages/skymaps/steini/steini3_rt.jpg b/packages/textures/skymaps/steini/steini3_rt.jpg similarity index 100% rename from packages/skymaps/steini/steini3_rt.jpg rename to packages/textures/skymaps/steini/steini3_rt.jpg diff --git a/packages/skymaps/steini/steini3_up.jpg b/packages/textures/skymaps/steini/steini3_up.jpg similarity index 100% rename from packages/skymaps/steini/steini3_up.jpg rename to packages/textures/skymaps/steini/steini3_up.jpg diff --git a/packages/skymaps/steini/steini4_bk.jpg b/packages/textures/skymaps/steini/steini4_bk.jpg similarity index 100% rename from packages/skymaps/steini/steini4_bk.jpg rename to packages/textures/skymaps/steini/steini4_bk.jpg diff --git a/packages/skymaps/steini/steini4_dn.jpg b/packages/textures/skymaps/steini/steini4_dn.jpg similarity index 100% rename from packages/skymaps/steini/steini4_dn.jpg rename to packages/textures/skymaps/steini/steini4_dn.jpg diff --git a/packages/skymaps/steini/steini4_ft.jpg b/packages/textures/skymaps/steini/steini4_ft.jpg similarity index 100% rename from packages/skymaps/steini/steini4_ft.jpg rename to packages/textures/skymaps/steini/steini4_ft.jpg diff --git a/packages/skymaps/steini/steini4_lf.jpg b/packages/textures/skymaps/steini/steini4_lf.jpg similarity index 100% rename from packages/skymaps/steini/steini4_lf.jpg rename to packages/textures/skymaps/steini/steini4_lf.jpg diff --git a/packages/skymaps/steini/steini4_rt.jpg b/packages/textures/skymaps/steini/steini4_rt.jpg similarity index 100% rename from packages/skymaps/steini/steini4_rt.jpg rename to packages/textures/skymaps/steini/steini4_rt.jpg diff --git a/packages/skymaps/steini/steini4_up.jpg b/packages/textures/skymaps/steini/steini4_up.jpg similarity index 100% rename from packages/skymaps/steini/steini4_up.jpg rename to packages/textures/skymaps/steini/steini4_up.jpg diff --git a/source/package_assaultcube.sh b/source/package_assaultcube.sh index c49f50a8..a6d250de 100644 --- a/source/package_assaultcube.sh +++ b/source/package_assaultcube.sh @@ -173,12 +173,12 @@ find ./packages/audio/ambience ./packages/textures -type f \ -name "*.jpg" \ -o -name "*.png" \ -o -name "*.ogg" | \ - grep -v ".svn" | \ + grep -vE '(.svn|\/textures\/skymaps\/)' | \ gawk -F'\\./' '{print $2}' > ./config/releasefiles.cfg find ./packages/models/mapmodels/* -type d | \ grep -v ".svn" | \ gawk -F'\\./' '{print $2}' >> ./config/releasefiles.cfg -find ./packages/skymaps/* -type f -name "*.jpg" | \ +find ./packages/textures/skymaps/* -type f -name "*.jpg" | \ grep -v ".svn" | \ gawk -F'_' '{print $1}' | \ sort -u | \