diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index be614517..dbf96d2d 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -159,11 +159,11 @@ mapmodel 1 2 8 0 "toca/barbwire" // 127 mapmodel 1 1 0 0 "toca/shelf" // 128 mapmodel 4 1 15 0 "toca/guardtower" // 129 mapmodel 1 2 0 0 "toca/treetrunk1" // 130 -mapmodel 1 2 0 0 "rattrap/cbbox" // 131 -mapmodel 0 0 4 0 "rattrap/hanginlamp" // 132 -mapmodel 0 2 0 0 "rattrap/ventflap" // 133 -mapmodel 1 1 0 0 "rattrap/milkcrate1" // 134 -mapmodel 1 1 0 0 "rattrap/milkcrate2" // 135 +mapmodel 1 2 0 0 "jcdpc/cardboardbox" // 131 +mapmodel 0 0 4 0 "jcdpc/hanginglamp" // 132 +mapmodel 0 2 0 0 "jcdpc/ventflap" // 133 +mapmodel 1 1 0 0 "ratboy/toca_milkcrate_red" // 134 +mapmodel 1 1 0 0 "ratboy/toca_milkcrate_blue" // 135 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_2" // 136 mapmodel 0 3 3 0 "misterfloppy/hanging_ladder/ladder_6" // 137 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_top" // 138 diff --git a/packages/maps/official/ac_aqueous.cfg b/packages/maps/official/ac_aqueous.cfg index 57e9129f..8a703111 100755 --- a/packages/maps/official/ac_aqueous.cfg +++ b/packages/maps/official/ac_aqueous.cfg @@ -51,7 +51,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_arabian.cfg b/packages/maps/official/ac_arabian.cfg index 98f988ad..0e4e9c98 100644 --- a/packages/maps/official/ac_arabian.cfg +++ b/packages/maps/official/ac_arabian.cfg @@ -48,7 +48,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_arctic.cfg b/packages/maps/official/ac_arctic.cfg index 7ea26c41..44dba401 100644 --- a/packages/maps/official/ac_arctic.cfg +++ b/packages/maps/official/ac_arctic.cfg @@ -50,7 +50,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_arid.cfg b/packages/maps/official/ac_arid.cfg index b827811c..4d0c4977 100644 --- a/packages/maps/official/ac_arid.cfg +++ b/packages/maps/official/ac_arid.cfg @@ -50,7 +50,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_avenue.cfg b/packages/maps/official/ac_avenue.cfg index c1c478ae..c77d8134 100644 --- a/packages/maps/official/ac_avenue.cfg +++ b/packages/maps/official/ac_avenue.cfg @@ -48,7 +48,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" @@ -151,9 +151,9 @@ 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" -mapmodel 1 2 0 0 "rattrap/cbbox" -mapmodel 0 0 4 0 "rattrap/hanginlamp" -mapmodel 0 2 0 0 "rattrap/ventflap" +mapmodel 1 2 0 0 "jcdpc/cardboardbox" +mapmodel 0 0 4 0 "jcdpc/hanginglamp" +mapmodel 0 2 0 0 "jcdpc/ventflap" mapmodel 1 1 0 0 "rattrap/milkcrate1" mapmodel 1 1 0 0 "rattrap/milkcrate2" mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_2" @@ -464,12 +464,10 @@ mapsound "ambience/t_alarm01.ogg" -1 mapsound "ambience/flies.ogg" -1 mapsound "ambience/deserthawk.ogg" -1 mapsound "ambience/owl.ogg" -1 -mapsound "ambience/citynoisebirds.ogg" -1nce/t_gastank.ogg" -1 - +mapsound "ambience/citynoisebirds.ogg" -1 +mapsound "ambience/t_gastank.ogg" -1 mapsound "ambience/t_keyboard.ogg" 1 - mapsound "ambience/t_factory01.ogg" -1 - mapsound "ambience/t_vents.ogg" -1 +mapsound "ambience/t_waterfront.ogg" -1 -mapsound "ambience/t_waterfront.ogg \ No newline at end of file diff --git a/packages/maps/official/ac_depot.cfg b/packages/maps/official/ac_depot.cfg index 124bce80..05b7cd99 100644 --- a/packages/maps/official/ac_depot.cfg +++ b/packages/maps/official/ac_depot.cfg @@ -24,7 +24,7 @@ mapmodel 0 0 0 0 "signs/maint" mapmodel 0 0 0 0 "signs/caution" mapmodel 0 0 0 0 "signs/biohazard" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "light01" mapmodel 0 0 0 0 "picture1" mapmodel 0 0 0 0 "gastank" diff --git a/packages/maps/official/ac_depot_classic.cfg b/packages/maps/official/ac_depot_classic.cfg index 07f1c26c..dd478134 100644 --- a/packages/maps/official/ac_depot_classic.cfg +++ b/packages/maps/official/ac_depot_classic.cfg @@ -24,7 +24,7 @@ mapmodel 0 0 0 0 "signs/maint" mapmodel 0 0 0 0 "signs/caution" mapmodel 0 0 0 0 "signs/biohazard" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "light01" mapmodel 0 0 0 0 "picture1" mapmodel 0 0 0 0 "gastank" diff --git a/packages/maps/official/ac_desert.cfg b/packages/maps/official/ac_desert.cfg index 54c41046..effcffbb 100644 --- a/packages/maps/official/ac_desert.cfg +++ b/packages/maps/official/ac_desert.cfg @@ -32,7 +32,7 @@ mapmodel 0 0 0 0 "grass02_d" mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 3 0 "poster" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_desert2.cfg b/packages/maps/official/ac_desert2.cfg index f610ee28..c780b6a6 100644 --- a/packages/maps/official/ac_desert2.cfg +++ b/packages/maps/official/ac_desert2.cfg @@ -31,7 +31,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_desert3.cfg b/packages/maps/official/ac_desert3.cfg index 442e39ce..387d007e 100644 --- a/packages/maps/official/ac_desert3.cfg +++ b/packages/maps/official/ac_desert3.cfg @@ -30,7 +30,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_douze.cfg b/packages/maps/official/ac_douze.cfg index 99ba8c76..79529a22 100644 --- a/packages/maps/official/ac_douze.cfg +++ b/packages/maps/official/ac_douze.cfg @@ -34,7 +34,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_edifice.cfg b/packages/maps/official/ac_edifice.cfg index 84987046..33abd499 100644 --- a/packages/maps/official/ac_edifice.cfg +++ b/packages/maps/official/ac_edifice.cfg @@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_elevation.cfg b/packages/maps/official/ac_elevation.cfg index 9065967a..89f56003 100644 --- a/packages/maps/official/ac_elevation.cfg +++ b/packages/maps/official/ac_elevation.cfg @@ -28,7 +28,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_gothic.cfg b/packages/maps/official/ac_gothic.cfg index 57a5234b..431ab771 100644 --- a/packages/maps/official/ac_gothic.cfg +++ b/packages/maps/official/ac_gothic.cfg @@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_iceroad.cfg b/packages/maps/official/ac_iceroad.cfg index 13896720..0282d4aa 100644 --- a/packages/maps/official/ac_iceroad.cfg +++ b/packages/maps/official/ac_iceroad.cfg @@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_industrial.cfg b/packages/maps/official/ac_industrial.cfg index 80988c72..86e73570 100644 --- a/packages/maps/official/ac_industrial.cfg +++ b/packages/maps/official/ac_industrial.cfg @@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_ingress.cfg b/packages/maps/official/ac_ingress.cfg index 7cbc3a46..ea27082a 100644 --- a/packages/maps/official/ac_ingress.cfg +++ b/packages/maps/official/ac_ingress.cfg @@ -57,7 +57,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_keller.cfg b/packages/maps/official/ac_keller.cfg index fa2bfec8..ced653d0 100644 --- a/packages/maps/official/ac_keller.cfg +++ b/packages/maps/official/ac_keller.cfg @@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_mines.cfg b/packages/maps/official/ac_mines.cfg index c3f55152..c050ddf5 100644 --- a/packages/maps/official/ac_mines.cfg +++ b/packages/maps/official/ac_mines.cfg @@ -22,7 +22,7 @@ mapmodel 0 0 0 0 "signs/maint" mapmodel 0 0 0 0 "signs/caution" mapmodel 0 0 0 0 "signs/biohazard" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "light01" mapmodel 0 0 0 0 "picture1" mapmodel 0 0 0 0 "gastank" diff --git a/packages/maps/official/ac_outpost.cfg b/packages/maps/official/ac_outpost.cfg index 08e849d0..f3320ef0 100644 --- a/packages/maps/official/ac_outpost.cfg +++ b/packages/maps/official/ac_outpost.cfg @@ -55,7 +55,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_power.cfg b/packages/maps/official/ac_power.cfg index 582fc3c3..a20449a7 100644 --- a/packages/maps/official/ac_power.cfg +++ b/packages/maps/official/ac_power.cfg @@ -32,7 +32,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 1 7 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_rattrap.cfg b/packages/maps/official/ac_rattrap.cfg index 865120df..bfebc1e4 100644 --- a/packages/maps/official/ac_rattrap.cfg +++ b/packages/maps/official/ac_rattrap.cfg @@ -124,6 +124,7 @@ texture 0 "./rattrap/rb_trim_01.jpg" texture 0 "./rattrap/rb_trim_02.jpg" texture 0 "./rattrap/rb_window.jpg" texture 0 "./rattrap/rb_window2.jpg" +texture 0 "../models/mapmodels/ratboy/jcdpc_cardboardbox_reskin/skin.jpg" mapmodelreset mapmodel 1 3 0 0 "barrel" mapmodel 1 2 0 0 "barrel2" @@ -146,7 +147,7 @@ mapmodel 0 0 0 0 "flyer" mapmodel 0 0 0 0 "gastank" mapmodel 0 0 0 0 "grass01" mapmodel 0 0 0 0 "hook" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "light01" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "poster" @@ -159,10 +160,10 @@ mapmodel 0 0 0 0 "strahler" mapmodel 0 12 0 0 "streetlamp" mapmodel 0 0 0 0 "tree01" mapmodel 0 0 0 0 "wrench" -mapmodel 1 2 0 0 "rattrap/cbbox" -mapmodel 1 2 0 0 "rattrap/rbbox" -mapmodel 0 0 0 0 "rattrap/hanginlamp" -mapmodel 0 0 0 0 "rattrap/ventflap" +mapmodel 1 2 0 0 "jcdpc/cardboardbox" +mapmodel 0 0 0 0 "nothing" +mapmodel 0 0 0 0 "jcdpc/hanginglamp" +mapmodel 0 0 0 0 "jcdpc/ventflap" mapmodel 0 0 0 0 "toca/bullet" mapmodel 1 1 0 0 "toca/cinderblock" mapmodel 0 0 0 0 "toca/corrugated/beam" @@ -183,8 +184,8 @@ mapmodel 1 2 0 0 "toca/trashbag" mapmodel 1 3 0 0 "toca/trashcan" mapmodel 1 1 0 0 "toca/tyre" mapmodel 1 0 0 0 "toca/wheel" -mapmodel 1 1 0 0 "rattrap/milkcrate1" -mapmodel 1 1 0 0 "rattrap/milkcrate2" +mapmodel 1 1 0 0 "ratboy/toca_milkcrate_red" +mapmodel 1 1 0 0 "ratboy/toca_milkcrate_blue" mapmodel 1 3 0 0 "rattrapbarrel" mapmodel 1 2 0 0 "rattrapbarrel2" mapmodel 0 0 0 0 "toca/platformmet" diff --git a/packages/maps/official/ac_rattrap.cgz b/packages/maps/official/ac_rattrap.cgz index 0babe15d..c21a0092 100644 Binary files a/packages/maps/official/ac_rattrap.cgz and b/packages/maps/official/ac_rattrap.cgz differ diff --git a/packages/maps/official/ac_scaffold.cfg b/packages/maps/official/ac_scaffold.cfg index 209f9b94..3fc07df8 100644 --- a/packages/maps/official/ac_scaffold.cfg +++ b/packages/maps/official/ac_scaffold.cfg @@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 1 7 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_shine.cfg b/packages/maps/official/ac_shine.cfg index 19b518d7..f00656ac 100644 --- a/packages/maps/official/ac_shine.cfg +++ b/packages/maps/official/ac_shine.cfg @@ -27,7 +27,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_snow.cfg b/packages/maps/official/ac_snow.cfg index 6cd1ce50..d8ce6aba 100644 --- a/packages/maps/official/ac_snow.cfg +++ b/packages/maps/official/ac_snow.cfg @@ -28,7 +28,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_stellar.cfg b/packages/maps/official/ac_stellar.cfg index eb76888c..efe7da58 100644 --- a/packages/maps/official/ac_stellar.cfg +++ b/packages/maps/official/ac_stellar.cfg @@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_sunset.cfg b/packages/maps/official/ac_sunset.cfg index 866ae456..cdb23226 100644 --- a/packages/maps/official/ac_sunset.cfg +++ b/packages/maps/official/ac_sunset.cfg @@ -30,7 +30,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 1 7 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_toxic.cfg b/packages/maps/official/ac_toxic.cfg index b2e46704..c9d0e891 100644 --- a/packages/maps/official/ac_toxic.cfg +++ b/packages/maps/official/ac_toxic.cfg @@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 30 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_urban.cfg b/packages/maps/official/ac_urban.cfg index 6708f9e6..54d8ede7 100755 --- a/packages/maps/official/ac_urban.cfg +++ b/packages/maps/official/ac_urban.cfg @@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 0 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/maps/official/ac_werk.cfg b/packages/maps/official/ac_werk.cfg index f598730e..90d55828 100644 --- a/packages/maps/official/ac_werk.cfg +++ b/packages/maps/official/ac_werk.cfg @@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d" mapmodel 0 0 0 0 "plant01_s" mapmodel 0 0 0 0 "tree01" mapmodel 1 2 0 0 "chair1" -mapmodel 0 0 0 0 "laptop1" +mapmodel 0 0 0 0 "jcdpc/laptop" mapmodel 0 0 0 0 "picture1" mapmodel 1 6 0 0 "locker" mapmodel 0 0 0 0 "strahler" diff --git a/packages/models/mapmodels/ratboy/jcdpc_cardboardbox_skin.jpg b/packages/models/mapmodels/ratboy/jcdpc_cardboardbox_reskin/skin.jpg similarity index 100% rename from packages/models/mapmodels/ratboy/jcdpc_cardboardbox_skin.jpg rename to packages/models/mapmodels/ratboy/jcdpc_cardboardbox_reskin/skin.jpg diff --git a/packages/models/mapmodels/ratboy/license.txt b/packages/models/mapmodels/ratboy/license.txt index 85ea8f84..07654491 100644 --- a/packages/models/mapmodels/ratboy/license.txt +++ b/packages/models/mapmodels/ratboy/license.txt @@ -1,11 +1,16 @@ ================================================================================ -jcdpc_cardboardbox_skin.jpg is a modification of: + * ./jcdpc_cardboardbox_reskin/skin.jpg + +...is a modification of: ../../../textures/zastrow/wood_crate_10.jpg As such, it is licensed the same. Please read this file for its license: ../../../textures/zastrow/license.txt ================================================================================ -toca_milkcrate_skin.jpg & toca_milkcrate2_skin.jpg are modifications of: + * ./toca_milkcrate_blue/skin.jpg + * ./toca_milkcrate_blue/skin.jpg + +... are modifications of: ../toca/milkcrate/skin.png As such, it is licensed the same. Please read this file for its license: diff --git a/packages/models/mapmodels/ratboy/toca_milkcrate_blue/md3.cfg b/packages/models/mapmodels/ratboy/toca_milkcrate_blue/md3.cfg new file mode 100644 index 00000000..bd21e248 --- /dev/null +++ b/packages/models/mapmodels/ratboy/toca_milkcrate_blue/md3.cfg @@ -0,0 +1,5 @@ +md3load ../../toca/milkcrate/tris.md3 +md3skin mesh ./skin.jpg + +// needed so that thin lines don't get too blended +mdlalphatest 30 diff --git a/packages/models/mapmodels/ratboy/toca_milkcrate_skin.jpg b/packages/models/mapmodels/ratboy/toca_milkcrate_blue/skin.jpg similarity index 100% rename from packages/models/mapmodels/ratboy/toca_milkcrate_skin.jpg rename to packages/models/mapmodels/ratboy/toca_milkcrate_blue/skin.jpg diff --git a/packages/models/mapmodels/ratboy/toca_milkcrate_red/md3.cfg b/packages/models/mapmodels/ratboy/toca_milkcrate_red/md3.cfg new file mode 100644 index 00000000..bd21e248 --- /dev/null +++ b/packages/models/mapmodels/ratboy/toca_milkcrate_red/md3.cfg @@ -0,0 +1,5 @@ +md3load ../../toca/milkcrate/tris.md3 +md3skin mesh ./skin.jpg + +// needed so that thin lines don't get too blended +mdlalphatest 30 diff --git a/packages/models/mapmodels/ratboy/toca_milkcrate2_skin.jpg b/packages/models/mapmodels/ratboy/toca_milkcrate_red/skin.jpg similarity index 100% rename from packages/models/mapmodels/ratboy/toca_milkcrate2_skin.jpg rename to packages/models/mapmodels/ratboy/toca_milkcrate_red/skin.jpg