kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes, loadsky in edit menu...

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7404 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
RandumKiwi
2013-03-24 03:14:31 +00:00
parent 3e416db563
commit e4e345f8ae
12 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/convert_mapconfig.sh
+1 -1
View File
@@ -277,7 +277,7 @@ for file in $*; do
echo "Converting skymap..."
sed -i '/^loadsky/s/\<textures\/skymaps\/humus\/pow\>/skymaps\/humus\/powerlines/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/kothic\/atsea\>/skymaps\/kellmcdonald\/atsea/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/ladynighthawk\/inhcanyons\>/skymaps\/ladynighthawk\/canyons1/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/ladynighthawk\/inhcanyons1\>/skymaps\/ladynighthawk\/canyons1/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/makke\/mountain\>/skymaps\/makke\/mountain/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/makke\/rocky\>/skymaps\/makke\/rocky/1' $file
sed -i '/^loadsky/s/\<textures\/skymaps\/makke\/sand\>/skymaps\/makke\/sand/1' $file
config/default_map_settings.cfg
+6 -6
View File
@@ -281,17 +281,17 @@ mapmodel 0 0 0 0 "cleaner/shovels/shovel3" // 190
loadsky "skymaps/steini/steini4" // Comment this if you want to use a different skymap.
// loadsky "skymaps/steini/steini2"
// loadsky "skymaps/steini/steini3"
// loadsky "skymaps/makke/rocky"
// 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 "textures/skymaps/ladynighthawk/inhcanyons1"
// loadsky "skymaps/simonoc/nightball"
// loadsky "skymaps/simonoc/graveyard"
// loadsky "skymaps/kellmcdonald/atsea"
// loadsky "skymaps/humus/powerlines"
// loadsky "skymaps/steini/steini2"
// loadsky "skymaps/steini/steini3"
// Alternative texture. See "docs/mapediting5.html" for more information.
config/menus_edit.cfg
+15 -11
View File
@@ -106,19 +106,23 @@ 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 [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" ]
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" ]
_closestenttypestatus = 0
//Map operations
@@ -493,4 +497,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
packages/maps/new_content.cfg
+1 -1
View File
@@ -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 "textures/skymaps/steini/steini4"
loadsky "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!
packages/maps/official/ac_arabian.cfg
+1 -1
View File
@@ -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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
fog 400
loadnotexture
texturereset
packages/maps/official/ac_arid.cfg
+1 -1
View File
@@ -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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
loadnotexture
texturereset
texture 0 "kurt/klite1.jpg"
packages/maps/official/ac_cavern.cfg
+1 -1
View File
@@ -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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
loadnotexture
texturereset
texture 0 "kurt/klite1.jpg"
packages/maps/official/ac_edifice.cfg
+1 -1
View File
@@ -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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
loadnotexture
texturereset
texture 0 "kurt/klite1.jpg"
packages/maps/official/ac_lainio.cfg
+1 -1
View File
@@ -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 "snoosnoo/map2.jpg"
texture 0 "jamz/new_bricks_3.jpg"
texture 0 "jamz/new_bricks_3.jpg"
texture 0 "nieb/bricksmall0060.jpg"
texture 0 "nieb/bricksmall0067.jpg"
packages/maps/official/ac_snow.cfg
+1 -1
View File
@@ -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 "skymaps/steini/steini2"
texturereset
texture 0 "kurt/klite1.jpg"
texture 0 "makke/black.jpg"
packages/maps/official/ac_sunset.cfg
+1 -1
View File
@@ -63,7 +63,7 @@ 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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
texturereset
texture 0 "kurt/klite1.jpg"
texture 0 "makke/black.jpg"
packages/maps/official/ac_venison.cfg
+1 -1
View File
@@ -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 "textures/skymaps/ladynighthawk/inhcanyons1"
loadsky "skymaps/ladynighthawk/canyons1"
loadnotexture
texturereset
texture 0 "kurt/klite1.jpg"