diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 24ea0c02..9b3f3547 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -180,7 +180,7 @@ mapmodel 0 8 0 0 "toca/pipes/industrialpipes/vert" // 149 mapmodel 0 0 0 0 "toca/electric/switch" // 150 mapmodel 0 0 0 0 "toca/electric/outlet" // 151 mapmodel 0 1 0 0 "toca/carbattery" // 152 -mapmodel 0 30 0 0 "toca/antenna" // 153 +mapmodel 0 31 0 0 "toca/antenna" // 153 mapmodel 0 0 0 0 "toca/pinboard" // 154 mapmodel 0 1 0 0 "toca/ledge/1_4cbs" // 155 - Clip this properly! mapmodel 0 1 0 0 "toca/ledge/2_8cbs" // 156 - Clip this properly! @@ -283,18 +283,28 @@ mapmodel 4 1 0 0 "cleaner/cactus/cactus2" //201 // mapmodel 0 0 0 0 "makke/signs/no_camping" // No-camping sign. // mapmodel 1 1 0 0 "misterfloppy/valve_hor" // Valve, horizontal. // mapmodel 0 15 0 0 "makke/ladder_15x_offset" // Special ladder model for ac_desert. -// mapmodel 0 0 0 0 "cleaner/monalisa // The Monalisa for ac_lainio +// mapmodel 0 0 0 0 "cleaner/monalisa" // The Monalisa for ac_lainio // mapmodel 0 0 0 0 "cleaner/grate_aqueous" // Special water-based grate. -// mapmodel 0 0 0 0 "cleaner/anti_tank" // Hard to clip. -// mapmodel 0 0 0 0 "cleaner/at_blocks/at_block_up" // nice for taking cover. -// mapmodel 0 0 0 0 "cleaner/at_blocks/at_block_down" // nice for taking cover. +// mapmodel 1 3 0 0 "cleaner/anti_tank" // Hard to clip. +// mapmodel 1 3 0 0 "cleaner/at_blocks/at_block_up" // nice for taking cover. +// mapmodel 1 3 0 0 "cleaner/at_blocks/at_block_down" // nice for taking cover. // mapmodel 0 0 0 0 "cleaner/doors/door001" // place a door anywhere (vertical) -// mapmodel 0 0 0 0 "cleaner/doors/door001" // place a door anywhere (horizontal) +// mapmodel 0 0 0 0 "cleaner/doors/door001b" // place a door anywhere (horizontal) // mapmodel 0 0 0 0 "cleaner/oldclock" // Special model for ac_lainio -// mapmodel 0 0 0 0 "cleaner/dumpster_tag" // Alternative modern dumpster -// mapmodel 0 0 0 0 "cleaner/oi_drums/up" // Alternative standing oil drum -// mapmodel 0 0 0 0 "cleaner/oi_drums/down" // Alternative fallen oil drum -// mapmodel 0 0 0 0 "cleaner/oi_drums/spill" // Oil drum spilling oil +// mapmodel 2 4 0 0 "cleaner/dumpster_tag" // Alternative modern dumpster +// mapmodel 1 3 0 0 "cleaner/oil_drums/up" // Alternative standing oil drum +// mapmodel 1 2 0 0 "cleaner/oil_drums/down" // Alternative fallen oil drum +// mapmodel 1 2 0 0 "cleaner/oil_drums/spill" // Oil drum spilling oil +// mapmodel 0 1 0 0 "toca/paintbucket/1" // Paint bucket 1 +// mapmodel 0 1 0 0 "toca/paintbucket/2" // Paint bucket 2 +// mapmodel 0 5 0 0 "toca/wooden/boarded1" // Boarded structure 1 +// mapmodel 0 6 0 0 "toca/wooden/boarded2" // Boarded structure 2 +// mapmodel 0 5 0 0 "toca/wooden/boarded3" // Boarded structure 3 +// mapmodel 0 8 0 0 "toca/wooden/planks_vert" // Planks, vertical +// mapmodel 0 11 0 0 "toca/wooden/beamssupport" // Support beams +// mapmodel 0 9 0 0 "toca/wooden/beam_L" // Beam, L +// mapmodel 0 9 0 0 "toca/wooden/beam_T" // Beam, T +// mapmodel 0 9 0 0 "toca/wooden/beam_X" // Beam, X diff --git a/packages/maps/new_content.cfg b/packages/maps/new_content.cfg index 9deae64c..b3fa8f24 100644 --- a/packages/maps/new_content.cfg +++ b/packages/maps/new_content.cfg @@ -12,7 +12,7 @@ mapmodel 0 0 0 0 "toca/pipes/industrialpipes/lup" // 6 mapmodel 0 0 0 0 "toca/electric/switch" // 7 mapmodel 0 0 0 0 "toca/electric/outlet" // 8 mapmodel 0 1 0 0 "toca/carbattery" // 9 -mapmodel 0 32 0 0 "toca/antenna" // 10 +mapmodel 0 31 0 0 "toca/antenna" // 10 mapmodel 0 0 0 0 "toca/pinboard" // 11 mapmodel 0 0 0 0 "toca/ledge/1_4cbs" // 12 mapmodel 0 0 0 0 "toca/ledge/2_8cbs" // 13 @@ -75,9 +75,9 @@ mapmodel 1 3 0 0 "cleaner/at_blocks/at_block_up" //69 mapmodel 1 3 0 0 "cleaner/at_blocks/at_block_down" //70 mapmodel 0 0 0 0 "cleaner/doors/door001" //71 mapmodel 0 0 0 0 "cleaner/doors/door001b" //72 -mapmodel 0 3 0 0 "cleaner/oil_drums/up" //73 -mapmodel 0 2 0 0 "cleaner/oil_drums/down" //74 -mapmodel 0 2 0 0 "cleaner/oil_drums/spill" //75 +mapmodel 1 3 0 0 "cleaner/oil_drums/up" //73 +mapmodel 1 2 0 0 "cleaner/oil_drums/down" //74 +mapmodel 1 2 0 0 "cleaner/oil_drums/spill" //75 mapmodel 2 4 0 0 "cleaner/dumpster_tag" //76 mapmodel 1 2 0 0 "cleaner/fire_hydrant" //77 not yet finished mapmodel 0 0 0 0 "cleaner/laundry" //78 @@ -99,7 +99,7 @@ mapmodel 0 0 0 0 "toca/decals/stripes" //92 mapmodel 0 0 0 0 "toca/wooden/beamframe10x11" //93 mapmodel 0 0 0 0 "toca/wooden/beampiece" //94 mapmodel 0 0 0 0 "toca/wooden/beamframe8x10" //95 -mapmodel 0 10 0 0 "toca/wooden/beamssupport" //96 +mapmodel 0 9 0 0 "toca/wooden/beamssupport" //96 mapmodel 0 0 0 0 "toca/wooden/beamframe6x8" //97 mapmodel 0 9 0 0 "toca/wooden/beam_L" //98 @@ -132,7 +132,7 @@ texture 0 "toca/sand1.jpg" texture 0 "toca/ice1.jpg" texture 0 "toca/oldwall.jpg" texture 0 "toca/droppedceiling.jpg" -texture 0 "makke/bricks_3.jpg" +texture 0 "makke/bricks_2.jpg" texture 0 "makke/bricks_3.jpg" texture 0 "makke/brickwall.jpg" texture 0 "noctua/wall/brick02.jpg" diff --git a/packages/models/mapmodels/cleaner/anti_tank/md3.cfg b/packages/models/mapmodels/cleaner/anti_tank/md3.cfg index 5d034022..f7f0cccb 100644 --- a/packages/models/mapmodels/cleaner/anti_tank/md3.cfg +++ b/packages/models/mapmodels/cleaner/anti_tank/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "military" mdlattribute desc "Anti-tank Czech hedgehog" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 3 0 0" diff --git a/packages/models/mapmodels/cleaner/at_blocks/at_block_down/md3.cfg b/packages/models/mapmodels/cleaner/at_blocks/at_block_down/md3.cfg index a7a2786b..442ba747 100644 --- a/packages/models/mapmodels/cleaner/at_blocks/at_block_down/md3.cfg +++ b/packages/models/mapmodels/cleaner/at_blocks/at_block_down/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "military" mdlattribute desc "Anti-tank dragon's tooth, knocked over" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 3 0 0" diff --git a/packages/models/mapmodels/cleaner/at_blocks/at_block_up/md3.cfg b/packages/models/mapmodels/cleaner/at_blocks/at_block_up/md3.cfg index c03ef538..17f2868f 100644 --- a/packages/models/mapmodels/cleaner/at_blocks/at_block_up/md3.cfg +++ b/packages/models/mapmodels/cleaner/at_blocks/at_block_up/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "military" mdlattribute desc "Anti-tank dragon's tooth" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 3 0 0" diff --git a/packages/models/mapmodels/cleaner/dumpster_tag/md3.cfg b/packages/models/mapmodels/cleaner/dumpster_tag/md3.cfg index 2330396b..03f79586 100644 --- a/packages/models/mapmodels/cleaner/dumpster_tag/md3.cfg +++ b/packages/models/mapmodels/cleaner/dumpster_tag/md3.cfg @@ -5,4 +5,5 @@ mdlattribute keywords "street" mdlattribute desc "Dumpster, modern" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "2 4 0 0" diff --git a/packages/models/mapmodels/cleaner/oil_drums/down/md3.cfg b/packages/models/mapmodels/cleaner/oil_drums/down/md3.cfg index a2dc12e3..0130f723 100644 --- a/packages/models/mapmodels/cleaner/oil_drums/down/md3.cfg +++ b/packages/models/mapmodels/cleaner/oil_drums/down/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Oil drum, horizontal" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 2 0 0" diff --git a/packages/models/mapmodels/cleaner/oil_drums/spill/md3.cfg b/packages/models/mapmodels/cleaner/oil_drums/spill/md3.cfg index 9e80a431..660ea486 100644 --- a/packages/models/mapmodels/cleaner/oil_drums/spill/md3.cfg +++ b/packages/models/mapmodels/cleaner/oil_drums/spill/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Oil drum, spilled" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 2 0 0" diff --git a/packages/models/mapmodels/cleaner/oil_drums/up/md3.cfg b/packages/models/mapmodels/cleaner/oil_drums/up/md3.cfg index 3908c6f8..b0a11111 100644 --- a/packages/models/mapmodels/cleaner/oil_drums/up/md3.cfg +++ b/packages/models/mapmodels/cleaner/oil_drums/up/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Oil drum, vertical" mdlattribute author cleaner mdlattribute distribution official +mdlattribute defaults "1 3 0 0" diff --git a/packages/models/mapmodels/toca/antenna/md3.cfg b/packages/models/mapmodels/toca/antenna/md3.cfg index 8c70688b..12fe45a6 100644 --- a/packages/models/mapmodels/toca/antenna/md3.cfg +++ b/packages/models/mapmodels/toca/antenna/md3.cfg @@ -2,5 +2,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Antenna mast" mdlattribute author toca mdlattribute distribution official -mdlattribute defaults "0 32 0 0" +mdlattribute defaults "0 31 0 0" diff --git a/packages/models/mapmodels/toca/paintbucket/1/md3.cfg b/packages/models/mapmodels/toca/paintbucket/1/md3.cfg index f41e08e9..dbba39f7 100644 --- a/packages/models/mapmodels/toca/paintbucket/1/md3.cfg +++ b/packages/models/mapmodels/toca/paintbucket/1/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "litter" mdlattribute desc "Paintbucket 1" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 1 0 0" diff --git a/packages/models/mapmodels/toca/paintbucket/2/md3.cfg b/packages/models/mapmodels/toca/paintbucket/2/md3.cfg index f395ad10..7f710d83 100644 --- a/packages/models/mapmodels/toca/paintbucket/2/md3.cfg +++ b/packages/models/mapmodels/toca/paintbucket/2/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "litter" mdlattribute desc "Paintbucket 2" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 1 0 0" diff --git a/packages/models/mapmodels/toca/wooden/beam_L/md3.cfg b/packages/models/mapmodels/toca/wooden/beam_L/md3.cfg index 5e167b60..0b0e858e 100644 --- a/packages/models/mapmodels/toca/wooden/beam_L/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/beam_L/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Beam, L" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 9 0 0" diff --git a/packages/models/mapmodels/toca/wooden/beam_T/md3.cfg b/packages/models/mapmodels/toca/wooden/beam_T/md3.cfg index 80c73249..e4c55650 100644 --- a/packages/models/mapmodels/toca/wooden/beam_T/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/beam_T/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Beam, T" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 9 0 0" diff --git a/packages/models/mapmodels/toca/wooden/beam_X/md3.cfg b/packages/models/mapmodels/toca/wooden/beam_X/md3.cfg index f44287ef..cf18a4a3 100644 --- a/packages/models/mapmodels/toca/wooden/beam_X/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/beam_X/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Beam, X" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 9 0 0" diff --git a/packages/models/mapmodels/toca/wooden/beamssupport/md3.cfg b/packages/models/mapmodels/toca/wooden/beamssupport/md3.cfg index 4321fd84..9aa558b8 100644 --- a/packages/models/mapmodels/toca/wooden/beamssupport/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/beamssupport/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Beams support" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 11 0 0" diff --git a/packages/models/mapmodels/toca/wooden/boarded1/md3.cfg b/packages/models/mapmodels/toca/wooden/boarded1/md3.cfg index 7a75fc5c..4b43b979 100644 --- a/packages/models/mapmodels/toca/wooden/boarded1/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/boarded1/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Boarded structure 1" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 5 0 0" diff --git a/packages/models/mapmodels/toca/wooden/boarded2/md3.cfg b/packages/models/mapmodels/toca/wooden/boarded2/md3.cfg index 032f2644..c06fbdc8 100644 --- a/packages/models/mapmodels/toca/wooden/boarded2/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/boarded2/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Boarded structure 2" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 6 0 0" diff --git a/packages/models/mapmodels/toca/wooden/boarded3/md3.cfg b/packages/models/mapmodels/toca/wooden/boarded3/md3.cfg index 622bcf71..beb9bfa3 100644 --- a/packages/models/mapmodels/toca/wooden/boarded3/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/boarded3/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Boarded structure 3" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 5 0 0" diff --git a/packages/models/mapmodels/toca/wooden/planks_vert/md3.cfg b/packages/models/mapmodels/toca/wooden/planks_vert/md3.cfg index 0d2eed7b..d0d1717a 100644 --- a/packages/models/mapmodels/toca/wooden/planks_vert/md3.cfg +++ b/packages/models/mapmodels/toca/wooden/planks_vert/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "industrial" mdlattribute desc "Planks, vertical" mdlattribute author toca mdlattribute distribution official +mdlattribute defaults "0 8 0 0"