diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 10cf476b..dfe4fe2a 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -206,6 +206,12 @@ mapmodel 0 0 0 0 "toca/plants/grass" // 175 mapmodel 0 0 0 0 "cleaner/traffic_cones/up" // 176 mapmodel 0 0 0 0 "cleaner/traffic_cones/down" // 177 mapmodel 0 0 0 0 "cleaner/extinguisher" //178 +mapmodel 0 1 0 0 "toca/paintcan" //179 +mapmodel 0 0 0 0 "toca/droppedceiling/frame" //180 +mapmodel 0 0 0 0 "toca/droppedceiling/tiles" //181 +mapmodel 0 0 0 0 "toca/droppedceiling/single" //182 +mapmodel 0 0 0 0 "toca/droppedceiling/light1" //183 +mapmodel 0 0 0 0 "toca/droppedceiling/light2" //184 // NOTE: There is a hard-limit maximum of 256 "mapmodel" commands. @@ -702,6 +708,7 @@ texture 0 "makke/rb_window.jpg" // texture 0 "toca/sand1.jpg" // texture 0 "toca/ice1.jpg" // texture 0 "toca/oldwall.jpg" +// texture 0 "toca/droppedceiling.jpg" mapsoundreset // Ambient sounds. Leave this command here, or else your sounds will mess up! diff --git a/packages/maps/new.cfg b/packages/maps/new.cfg index b04c4ab2..e5f1f1bd 100644 --- a/packages/maps/new.cfg +++ b/packages/maps/new.cfg @@ -42,7 +42,14 @@ mapmodel 0 0 0 0 "toca/doors/2" // 36 mapmodel 0 0 0 0 "toca/doors/1" // 37 mapmodel 0 0 0 0 "toca/decals/windows/1" // 38 mapmodel 0 0 0 0 "toca/decals/manhole/2" // 39 -mapmodel 0 0 0 0 "cleaner/extinguisher" // 400 +mapmodel 0 0 0 0 "cleaner/extinguisher" // 40 +mapmodel 0 0 0 0 "toca/droppedceiling/frame" //41 +mapmodel 0 0 0 0 "toca/droppedceiling/tiles" //42 +mapmodel 0 1 0 0 "toca/paintcan" //43 +mapmodel 0 0 0 0 "toca/droppedceiling/single" //44 +mapmodel 0 0 0 0 "toca/droppedceiling/light1" //45 +mapmodel 0 0 0 0 "toca/droppedceiling/light2" //46 + loadsky "textures/skymaps/steini/steini4" @@ -64,7 +71,7 @@ texture 0 "toca/dirt1.jpg" texture 0 "toca/sand1.jpg" texture 0 "toca/ice1.jpg" texture 0 "toca/oldwall.jpg" -texture 0 "DigitalFlux/gray_bricks_01.jpg" +texture 0 "toca/droppedceiling.jpg" texture 0 "makke/bricks_2.jpg" texture 0 "makke/bricks_3.jpg" texture 0 "makke/brickwall.jpg" diff --git a/packages/maps/new.cgz b/packages/maps/new.cgz index e8deaceb..5de4b30a 100644 Binary files a/packages/maps/new.cgz and b/packages/maps/new.cgz differ diff --git a/packages/models/mapmodels/toca/droppedceiling/frame/md3.cfg b/packages/models/mapmodels/toca/droppedceiling/frame/md3.cfg new file mode 100644 index 00000000..9d085599 --- /dev/null +++ b/packages/models/mapmodels/toca/droppedceiling/frame/md3.cfg @@ -0,0 +1,4 @@ +md3load tris.md3 +md3skin mesh ../skin.jpg +mdlcullface 0 +mdlvertexlight 1 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/droppedceiling/frame/tris.md3 b/packages/models/mapmodels/toca/droppedceiling/frame/tris.md3 new file mode 100644 index 00000000..a246b44c Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/frame/tris.md3 differ diff --git a/packages/models/mapmodels/toca/droppedceiling/light1/md3.cfg b/packages/models/mapmodels/toca/droppedceiling/light1/md3.cfg new file mode 100644 index 00000000..e63aacf4 --- /dev/null +++ b/packages/models/mapmodels/toca/droppedceiling/light1/md3.cfg @@ -0,0 +1,5 @@ +md3load tris.md3 +md3skin mesh ../skin.jpg +md3skin light ../lights.jpg +mdlcullface 0 +mdlvertexlight 1 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/droppedceiling/light1/tris.md3 b/packages/models/mapmodels/toca/droppedceiling/light1/tris.md3 new file mode 100644 index 00000000..f05917bb Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/light1/tris.md3 differ diff --git a/packages/models/mapmodels/toca/droppedceiling/light2/md3.cfg b/packages/models/mapmodels/toca/droppedceiling/light2/md3.cfg new file mode 100644 index 00000000..e63aacf4 --- /dev/null +++ b/packages/models/mapmodels/toca/droppedceiling/light2/md3.cfg @@ -0,0 +1,5 @@ +md3load tris.md3 +md3skin mesh ../skin.jpg +md3skin light ../lights.jpg +mdlcullface 0 +mdlvertexlight 1 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/droppedceiling/light2/tris.md3 b/packages/models/mapmodels/toca/droppedceiling/light2/tris.md3 new file mode 100644 index 00000000..5851781a Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/light2/tris.md3 differ diff --git a/packages/models/mapmodels/toca/droppedceiling/lights.jpg b/packages/models/mapmodels/toca/droppedceiling/lights.jpg new file mode 100644 index 00000000..6da7bbb1 Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/lights.jpg differ diff --git a/packages/models/mapmodels/toca/droppedceiling/single/md3.cfg b/packages/models/mapmodels/toca/droppedceiling/single/md3.cfg new file mode 100644 index 00000000..9d085599 --- /dev/null +++ b/packages/models/mapmodels/toca/droppedceiling/single/md3.cfg @@ -0,0 +1,4 @@ +md3load tris.md3 +md3skin mesh ../skin.jpg +mdlcullface 0 +mdlvertexlight 1 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/droppedceiling/single/tris.md3 b/packages/models/mapmodels/toca/droppedceiling/single/tris.md3 new file mode 100644 index 00000000..2ac000c3 Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/single/tris.md3 differ diff --git a/packages/models/mapmodels/toca/droppedceiling/skin.jpg b/packages/models/mapmodels/toca/droppedceiling/skin.jpg new file mode 100644 index 00000000..c4f63c71 Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/skin.jpg differ diff --git a/packages/models/mapmodels/toca/droppedceiling/tiles/md3.cfg b/packages/models/mapmodels/toca/droppedceiling/tiles/md3.cfg new file mode 100644 index 00000000..9d085599 --- /dev/null +++ b/packages/models/mapmodels/toca/droppedceiling/tiles/md3.cfg @@ -0,0 +1,4 @@ +md3load tris.md3 +md3skin mesh ../skin.jpg +mdlcullface 0 +mdlvertexlight 1 \ No newline at end of file diff --git a/packages/models/mapmodels/toca/droppedceiling/tiles/tris.md3 b/packages/models/mapmodels/toca/droppedceiling/tiles/tris.md3 new file mode 100644 index 00000000..f9a8b1ca Binary files /dev/null and b/packages/models/mapmodels/toca/droppedceiling/tiles/tris.md3 differ diff --git a/packages/models/mapmodels/toca/paintcan/skin.jpg b/packages/models/mapmodels/toca/paintcan/skin.jpg new file mode 100644 index 00000000..ba250028 Binary files /dev/null and b/packages/models/mapmodels/toca/paintcan/skin.jpg differ diff --git a/packages/models/mapmodels/toca/paintcan/tris.md3 b/packages/models/mapmodels/toca/paintcan/tris.md3 new file mode 100644 index 00000000..99e1055c Binary files /dev/null and b/packages/models/mapmodels/toca/paintcan/tris.md3 differ