From 9b385d7c33423bdd4c932fc760bd8eedecc175c6 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Fri, 18 Jan 2013 19:11:18 +0000 Subject: [PATCH] Fixed klappe/bricks_2! git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7112 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/convert_mapconfig.sh | 311 ++++++++++---------- config/default_map_settings.cfg | 117 ++++---- packages/maps/official/ac_aqueous.cfg | 4 +- packages/maps/official/ac_arabian.cfg | 4 +- packages/maps/official/ac_arctic.cfg | 4 +- packages/maps/official/ac_arid.cfg | 4 +- packages/maps/official/ac_avenue.cfg | 18 +- packages/maps/official/ac_complex.cfg | 4 +- packages/maps/official/ac_depot.cfg | 6 +- packages/maps/official/ac_depot_classic.cfg | 4 +- packages/maps/official/ac_desert.cfg | 4 +- packages/maps/official/ac_desert2.cfg | 4 +- packages/maps/official/ac_desert3.cfg | 4 +- packages/maps/official/ac_douze.cfg | 4 +- packages/maps/official/ac_edifice.cfg | 4 +- packages/maps/official/ac_elevation.cfg | 4 +- packages/maps/official/ac_gothic.cfg | 4 +- packages/maps/official/ac_iceroad.cfg | 4 +- packages/maps/official/ac_industrial.cfg | 4 +- packages/maps/official/ac_ingress.cfg | 4 +- packages/maps/official/ac_keller.cfg | 4 +- packages/maps/official/ac_mines.cfg | 6 +- packages/maps/official/ac_outpost.cfg | 4 +- packages/maps/official/ac_power.cfg | 14 +- packages/maps/official/ac_rattrap.cfg | 4 +- packages/maps/official/ac_scaffold.cfg | 4 +- packages/maps/official/ac_shine.cfg | 4 +- packages/maps/official/ac_snow.cfg | 4 +- packages/maps/official/ac_stellar.cfg | 4 +- packages/maps/official/ac_sunset.cfg | 4 +- packages/maps/official/ac_toxic.cfg | 4 +- packages/maps/official/ac_urban.cfg | 4 +- packages/maps/official/ac_werk.cfg | 4 +- 33 files changed, 291 insertions(+), 289 deletions(-) diff --git a/config/convert_mapconfig.sh b/config/convert_mapconfig.sh index 62266235..4098753a 100644 --- a/config/convert_mapconfig.sh +++ b/config/convert_mapconfig.sh @@ -50,163 +50,164 @@ for file in $*; do fi echo "Converting mapmodels..." - sed -i '/^mapmodel/s/\/jcdpc\/laptop/g' $file - sed -i '/^mapmodel/s/\/jcdpc\/cardboardbox/g' $file - sed -i '/^mapmodel/s/\/jcdpc\/hanginglamp/g' $file - sed -i '/^mapmodel/s/\/jcdpc\/ventflap/g' $file - sed -i '/^mapmodel/s/\/ratboy\/toca_milkcrate_blue/g' $file - sed -i '/^mapmodel/s/\/ratboy\/toca_milkcrate_red/g' $file - sed -i '/^mapmodel/s/\/makke\/aardapple_enginebox/g' $file - sed -i '/toxic/!s/\/makke\/barrel/g' $file - sed -i '/^mapmodel/s/\/makke\/barrel_fallen/g' $file - sed -i '/^mapmodel/s/\/makke\/barrel_toxic/g' $file - sed -i '/^mapmodel/s/\/makke\/barrel_newsteel/g' $file - sed -i '/^mapmodel/s/\/makke\/barrel_newsteel_fallen/g' $file - sed -i '/^mapmodel/s/\/makke\/bench_seat/g' $file - sed -i '/^mapmodel/s/\/makke\/platform/g' $file - sed -i '/^mapmodel/s/\/makke\/platform_shine/g' $file - sed -i '/^mapmodel/s/\/makke\/lightbulb/g' $file - sed -i '/^mapmodel/s/\/makke\/coke_can/g' $file - sed -i '/^mapmodel/s/\/makke\/coke_can_fallen/g' $file - sed -i '/^mapmodel/s/\/makke\/office_chair/g' $file - sed -i '/^mapmodel/s/\/makke\/coffee_mug/g' $file - sed -i '/^mapmodel/s/\/makke\/platform_bridge/g' $file - sed -i '/^mapmodel/s/\/makke\/drainpipe/g' $file - sed -i '/^mapmodel/s/\/makke\/dumpster/g' $file - sed -i '/^mapmodel/s/\/makke\/electric_meter/g' $file - sed -i '/^mapmodel/s/\/makke\/pallet/g' $file - sed -i '/^mapmodel/s/\/makke\/cigarette/g' $file - sed -i '/^mapmodel/s/\/makke\/fence_chainlink/g' $file - sed -i '/^mapmodel/s/\/makke\/fence_chainlink_closed_gate/g' $file - sed -i '/^mapmodel/s/\/makke\/fence_chainlink_no_gate/g' $file - sed -i '/^mapmodel/s/\/makke\/fence_chainlink_post/g' $file - sed -i '/^mapmodel/s/\/makke\/flyer_propaganda/g' $file - sed -i '/^mapmodel/s/\/makke\/flyer_environmental/g' $file - sed -i '/^mapmodel/s/\/makke\/fuel_tank/g' $file - sed -i '/^mapmodel/s/\/makke\/icicle/g' $file - sed -i '/^mapmodel/s/\/makke\/hook/g' $file - sed -i '/^mapmodel/s/\/makke\/locker/g' $file - sed -i '/^mapmodel/s/\/makke\/fluorescent_lamp/g' $file - sed -i '/^mapmodel/s/\/makke\/broken_wood/g' $file - sed -i '/^mapmodel/s/\/makke\/wrench/g' $file - sed -i '/^mapmodel/s/\/makke\/wall_spotlight/g' $file - sed -i '/floppy/!s/\/makke\/street_light/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_1x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_7x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_8x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_10x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_11x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_15x/g' $file - sed -i '/^mapmodel/s/\/makke\/ladder_15x_offset/g' $file - sed -i '/^mapmodel/s/\/makke\/grate_hor/g' $file - sed -i '/^mapmodel/s/\/makke\/grate_vert/g' $file - sed -i '/^mapmodel/s/\/makke\/mine-shaft_elevator/g' $file - sed -i '/^mapmodel/s/\/makke\/bolt_nut/g' $file - sed -i '/^mapmodel/s/\/makke\/sail/g' $file - sed -i '/^mapmodel/s/\/makke\/sail_snow/g' $file - sed -i '/^mapmodel/s/\/makke\/wires\/2x8/g' $file - sed -i '/^mapmodel/s/\/makke\/wires\/3x8/g' $file - sed -i '/^mapmodel/s/\/makke\/wires\/4x8/g' $file - sed -i '/^mapmodel/s/\/makke\/wires\/4x8a/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/wanted/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/arab/g' $file - sed -i '/toca/!s/\/makke\/signs\/biohazard/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/caution_voltage/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/caution_maintainence/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/flammable/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/speed/g' $file - sed -i '/^mapmodel/s/\/makke\/signs\/no_camping/g' $file - sed -i '/^mapmodel/s/\/makke\/roadblock/g' $file - sed -i '/^mapmodel/s/\/makke\/roadblock_graffiti/g' $file - sed -i '/^mapmodel/s/\/makke\/nothing_clip/g' $file - sed -i '/^mapmodel/s/\/makke\/picture/g' $file - sed -i '/^mapmodel/s/\/makke\/plant_leafy/g' $file - sed -i '/^mapmodel/s/\/makke\/plant_leafy_dry/g' $file - sed -i '/^mapmodel/s/\/makke\/plant_leafy_snow/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_short/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_short_dry/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_short_snow/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_long/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_long_dry/g' $file - sed -i '/^mapmodel/s/\/makke\/grass_long_snow/g' $file + sed -i '/^mapmodel/s/\/jcdpc\/laptop/1' $file + sed -i '/^mapmodel/s/\/jcdpc\/cardboardbox/1' $file + sed -i '/^mapmodel/s/\/jcdpc\/cardboardbox/1' $file + sed -i '/^mapmodel/s/\/jcdpc\/hanginglamp/1' $file + sed -i '/^mapmodel/s/\/jcdpc\/ventflap/1' $file + sed -i '/^mapmodel/s/\/ratboy\/toca_milkcrate_blue/1' $file + sed -i '/^mapmodel/s/\/ratboy\/toca_milkcrate_red/1' $file + sed -i '/^mapmodel/s/\/makke\/aardapple_enginebox/1' $file + sed -i '/toxic/!s/\/makke\/barrel/1' $file + sed -i '/^mapmodel/s/\/makke\/barrel_fallen/1' $file + sed -i '/^mapmodel/s/\/makke\/barrel_toxic/1' $file + sed -i '/^mapmodel/s/\/makke\/barrel_newsteel/1' $file + sed -i '/^mapmodel/s/\/makke\/barrel_newsteel_fallen/1' $file + sed -i '/^mapmodel/s/\/makke\/bench_seat/1' $file + sed -i '/^mapmodel/s/\/makke\/platform/1' $file + sed -i '/^mapmodel/s/\/makke\/platform_shine/1' $file + sed -i '/^mapmodel/s/\/makke\/lightbulb/1' $file + sed -i '/^mapmodel/s/\/makke\/coke_can/1' $file + sed -i '/^mapmodel/s/\/makke\/coke_can_fallen/1' $file + sed -i '/^mapmodel/s/\/makke\/office_chair/1' $file + sed -i '/^mapmodel/s/\/makke\/coffee_mug/1' $file + sed -i '/^mapmodel/s/\/makke\/platform_bridge/1' $file + sed -i '/^mapmodel/s/\/makke\/drainpipe/1' $file + sed -i '/^mapmodel/s/\/makke\/dumpster/1' $file + sed -i '/^mapmodel/s/\/makke\/electric_meter/1' $file + sed -i '/^mapmodel/s/\/makke\/pallet/1' $file + sed -i '/^mapmodel/s/\/makke\/cigarette/1' $file + sed -i '/^mapmodel/s/\/makke\/fence_chainlink/1' $file + sed -i '/^mapmodel/s/\/makke\/fence_chainlink_closed_gate/1' $file + sed -i '/^mapmodel/s/\/makke\/fence_chainlink_no_gate/1' $file + sed -i '/^mapmodel/s/\/makke\/fence_chainlink_post/1' $file + sed -i '/^mapmodel/s/\/makke\/flyer_propaganda/1' $file + sed -i '/^mapmodel/s/\/makke\/flyer_environmental/1' $file + sed -i '/^mapmodel/s/\/makke\/fuel_tank/1' $file + sed -i '/^mapmodel/s/\/makke\/icicle/1' $file + sed -i '/^mapmodel/s/\/makke\/hook/1' $file + sed -i '/^mapmodel/s/\/makke\/locker/1' $file + sed -i '/^mapmodel/s/\/makke\/fluorescent_lamp/1' $file + sed -i '/^mapmodel/s/\/makke\/broken_wood/1' $file + sed -i '/^mapmodel/s/\/makke\/wrench/1' $file + sed -i '/^mapmodel/s/\/makke\/wall_spotlight/1' $file + sed -i '/floppy/!s/\/makke\/street_light/1' $file + sed -i '/^mapmodel/s/\/makke\/ladder_1x/1' $file + sed -i '/^mapmodel/s/\/makke\/ladder_7x/1' $file + sed -i '/^mapmodel/s/\/makke\/ladder_8x/1' $file + sed -i '/^mapmodel/s/\/makke\/ladder_10x/1' $file + 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/\/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 + sed -i '/^mapmodel/s/\/makke\/sail_snow/1' $file + sed -i '/^mapmodel/s/\/makke\/wires\/2x8/1' $file + sed -i '/^mapmodel/s/\/makke\/wires\/3x8/1' $file + sed -i '/^mapmodel/s/\/makke\/wires\/4x8/1' $file + sed -i '/^mapmodel/s/\/makke\/wires\/4x8a/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/wanted/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/arab/1' $file + sed -i '/toca/!s/\/makke\/signs\/biohazard/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/caution_voltage/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/caution_maintainence/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/flammable/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/speed/1' $file + sed -i '/^mapmodel/s/\/makke\/signs\/no_camping/1' $file + sed -i '/^mapmodel/s/\/makke\/roadblock/1' $file + sed -i '/^mapmodel/s/\/makke\/roadblock_graffiti/1' $file + sed -i '/^mapmodel/s/\/makke\/nothing_clip/1' $file + sed -i '/^mapmodel/s/\/makke\/picture/1' $file + sed -i '/^mapmodel/s/\/makke\/plant_leafy/1' $file + sed -i '/^mapmodel/s/\/makke\/plant_leafy_dry/1' $file + sed -i '/^mapmodel/s/\/makke\/plant_leafy_snow/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_short/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_short_dry/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_short_snow/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_long/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_long_dry/1' $file + sed -i '/^mapmodel/s/\/makke\/grass_long_snow/1' $file echo "Converting textures..." - sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/makke_drainpipe_gritty\/skin.jpg/g' $file - sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_commrack_dull\/skin.jpg/g' $file - sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_monitor_dull\/skin.jpg/g' $file - sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_milkcarton_dull\/skin.jpg/g' $file - sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_guardrail2_dull\/skin.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/metal_overlaps.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/metal_plate_fill.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/metal_siding_kinksb.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/metal_siding_kinks.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_doors512A10.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_doors512A16.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_doors512B05.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_window31.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_window33.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_sand.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/brick_wall_08.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/brick_wall_09.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_window23.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/vent_cap.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_window38.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/sub_doors256nf_01.jpg/g' $file - sed -i '/^texture/s/\/zastrow\/rb_box_07.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/elecpanelstwo.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/metal_bumps2.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/tunnel_ceiling.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/hhroofgray.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/metal_bumps3.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/tunnel_ceiling_b.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/5sqtunnelroad.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door07_a.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door07.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door10_a.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door10.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door12.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/door15.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/objects08.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/objects09_a.jpg/g' $file - sed -i '/^texture/s/\/3dcafe\/stone18.jpg/g' $file - sed -i '/^texture/s/\/grsites\/brick051.jpg/g' $file - sed -i '/^texture/s/\/grsites\/brick065.jpg/g' $file - sed -i '/^texture/s/\/grsites\/wood060.jpg/g' $file - sed -i '/^texture/s/\/grsites\/metal020.jpg/g' $file - sed -i '/^texture/s/\/grsites\/metal026.jpg/g' $file - sed -i '/^texture/s/\/lemog\/036metal.jpg/g' $file - sed -i '/^texture/s/\/lemog\/006metal.jpg/g' $file - sed -i '/^texture/s/\/lemog\/063bois.jpg/g' $file - sed -i '/^texture/s/\/lemog\/063bois_b.jpg/g' $file - sed -i '/^texture/s/\/lemog\/027metal.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/windows.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/window.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/panel.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/door.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/smallsteelbox.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/klappe.jpg/g' $file - sed -i '/^texture/s/\/mayang\/bricks2.jpg/g' $file - sed -i '/^texture/s/\/mayang\/manhole1.jpg/g' $file - sed -i '/^texture/s/\/mayang\/hatch1.jpg/g' $file - sed -i '/^texture/s/\/mayang\/grill2_s.jpg/g' $file - sed -i '/^texture/s/\/mayang\/door3.jpg/g' $file - sed -i '/^texture/s/\/mayang\/airvent1.jpg/g' $file - sed -i '/^texture/s/\/golgotha\/rb_trim_03.jpg/g' $file - sed -i '/^texture/s/\/makke\/rb_window.jpg/g' $file - sed -i '/^texture/s/\/makke\/rb_window2.jpg/g' $file - sed -i '/^texture/s/\/noctua\/ground\/rb_trim_01.jpg/g' $file - sed -i '/^texture/s/\/makke\/rb_trim_02.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_01.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_02.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_03.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_04.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_05.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_box_06.jpg/g' $file - sed -i '/^texture/s/\/makke\/rattrap\/rb_concrete.jpg/g' $file - sed -i '/^texture/s/\/mayang\/rb_bricks_01.jpg/g' $file - sed -i '/^texture/s/\/mayang\/rb_bricks_02.jpg/g' $file - sed -i '/^texture/s/\/mayang\/rb_bricks_03.jpg/g' $file - sed -i '/^texture/s/\/noctua\/wood\/planks02_trim_vert.jpg/g' $file + sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/makke_drainpipe_gritty\/skin.jpg/1' $file + sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_commrack_dull\/skin.jpg/1' $file + sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_monitor_dull\/skin.jpg/1' $file + sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_milkcarton_dull\/skin.jpg/1' $file + sed -i '/^texture/s/\/..\/models\/mapmodels\/wotwot\/toca_guardrail2_dull\/skin.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/metal_overlaps.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/metal_plate_fill.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/metal_siding_kinksb.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/metal_siding_kinks.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_doors512A10.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_doors512A16.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_doors512B05.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_window31.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_window33.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_sand.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/brick_wall_08.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/brick_wall_09.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_window23.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/vent_cap.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_window38.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/sub_doors256nf_01.jpg/1' $file + sed -i '/^texture/s/\/zastrow\/rb_box_07.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/elecpanelstwo.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/metal_bumps2.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/tunnel_ceiling.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/hhroofgray.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/metal_bumps3.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/tunnel_ceiling_b.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/5sqtunnelroad.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door07_a.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door07.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door10_a.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door10.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door12.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/door15.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/objects08.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/objects09_a.jpg/1' $file + sed -i '/^texture/s/\/3dcafe\/stone18.jpg/1' $file + sed -i '/^texture/s/\/grsites\/brick051.jpg/1' $file + sed -i '/^texture/s/\/grsites\/brick065.jpg/1' $file + sed -i '/^texture/s/\/grsites\/wood060.jpg/1' $file + sed -i '/^texture/s/\/grsites\/metal020.jpg/1' $file + sed -i '/^texture/s/\/grsites\/metal026.jpg/1' $file + sed -i '/^texture/s/\/lemog\/036metal.jpg/1' $file + sed -i '/^texture/s/\/lemog\/006metal.jpg/1' $file + sed -i '/^texture/s/\/lemog\/063bois.jpg/1' $file + sed -i '/^texture/s/\/lemog\/063bois_b.jpg/1' $file + sed -i '/^texture/s/\/lemog\/027metal.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/windows.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/window.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/panel.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/door.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/smallsteelbox.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/klappe3.jpg/1' $file + sed -i '/^texture/s/\/mayang\/bricks_2.jpg/1' $file + sed -i '/^texture/s/\/mayang\/manhole1.jpg/1' $file + sed -i '/^texture/s/\/mayang\/hatch1.jpg/1' $file + sed -i '/^texture/s/\/mayang\/grill2_s.jpg/1' $file + sed -i '/^texture/s/\/mayang\/door3.jpg/1' $file + sed -i '/^texture/s/\/mayang\/airvent1.jpg/1' $file + sed -i '/^texture/s/\/golgotha\/rb_trim_03.jpg/1' $file + sed -i '/^texture/s/\/makke\/rb_window.jpg/1' $file + sed -i '/^texture/s/\/makke\/rb_window2.jpg/1' $file + sed -i '/^texture/s/\/noctua\/ground\/rb_trim_01.jpg/1' $file + sed -i '/^texture/s/\/makke\/rb_trim_02.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_01.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_02.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_03.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_04.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_05.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_box_06.jpg/1' $file + sed -i '/^texture/s/\/makke\/rattrap\/rb_concrete.jpg/1' $file + sed -i '/^texture/s/\/mayang\/rb_bricks_01.jpg/1' $file + sed -i '/^texture/s/\/mayang\/rb_bricks_02.jpg/1' $file + sed -i '/^texture/s/\/mayang\/rb_bricks_03.jpg/1' $file + sed -i '/^texture/s/\/noctua\/wood\/planks02_trim_vert.jpg/1' $file echo -e "Successfully finished converting: "$file"\n" else diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 0751d4f2..e148f7e4 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -37,11 +37,11 @@ mapmodel 0 12 0 0 "makke/street_light" // 7 mapmodel 0 12 0 0 "makke/street_light" // 8 mapmodel 3 2 0 0 "makke/bench_seat" // 9 mapmodel 2 4 0 0 "makke/dumpster" // 10 -mapmodel 0 0 0 0 "makke/roadblock" // 11 Clip this properly! -mapmodel 0 0 0 0 "makke/roadblock_graffiti" // 12 Clip this properly! +mapmodel 0 0 0 0 "makke/roadblock" // 11 - Clip this properly! +mapmodel 0 0 0 0 "makke/roadblock_graffiti" // 12 - Clip this properly! mapmodel 1 8 0 0 "makke/fence_chainlink" // 13 -mapmodel 1 8 0 0 "makke/fence_chainlink_post" // 14 -mapmodel 0 0 0 0 "makke/fence_chainlink_no_gate" // 15 +mapmodel 1 8 0 0 "makke/fence_chainlink_post" // 14 +mapmodel 0 0 0 0 "makke/fence_chainlink_no_gate"// 15 mapmodel 1 8 0 0 "makke/fence_chainlink_closed_gate" // 16 mapmodel 0 0 0 0 "makke/grass_short" // 17 mapmodel 0 0 0 0 "makke/grass_short_dry" // 18 @@ -55,7 +55,7 @@ mapmodel 0 0 0 0 "makke/plant_leafy_snow" // 25 mapmodel 0 0 0 0 "makke/flyer_environmental" // 26 mapmodel 1 2 0 0 "makke/office_chair" // 27 mapmodel 0 0 0 0 "jcdpc/laptop" // 28 -mapmodel 0 0 0 0 "makke/picture" // 29 +mapmodel 0 0 0 0 "makke/picture" // 29 - Want to use a customer picture in this frame? mapmodel 1 6 0 0 "makke/locker" // 30 mapmodel 0 0 0 0 "makke/wall_spotlight" // 31 mapmodel 0 0 0 0 "makke/fluorescent_lamp" // 32 @@ -64,7 +64,7 @@ mapmodel 1 3 0 0 "makke/barrel" // 34 mapmodel 1 2 0 0 "makke/barrel_fallen" // 35 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 +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 "makke/grate_hor" // 39 mapmodel 1 2 0 0 "makke/grate_vert" // 40 @@ -82,39 +82,39 @@ mapmodel 0 0 0 0 "makke/broken_wood" // 51 mapmodel 0 0 0 0 "makke/hook" // 52 mapmodel 0 0 0 0 "makke/coffee_mug" // 53 mapmodel 0 0 0 0 "makke/flyer_propaganda" // 54 -mapmodel 0 0 1 0 "makke/signs/wanted" // 55 Don't put this too close to a wall, or it will "z-fight". +mapmodel 0 0 1 0 "makke/signs/wanted" // 55 - Don't put the poster too close to a wall, or it will "z-fight". mapmodel 1 1 0 0 "makke/aardapple_enginebox" // 56 mapmodel 4 1 0 0 "makke/platform" // 57 mapmodel 0 1 0 0 "makke/ladder_1x" // 58 mapmodel 0 8 0 0 "makke/drainpipe" // 59 -mapmodel 2 2 0 0 "toca/airconditioner" // 60 Inner part of the airconditioner is Model 107 +mapmodel 2 2 0 0 "toca/airconditioner" // 60 - Inner part of the airconditioner is Model 107 mapmodel 0 0 0 0 "toca/bullet" // 61 mapmodel 0 1 0 0 "toca/cinderblock" // 62 mapmodel 1 7 0 0 "toca/commrack" // 63 mapmodel 1 4 0 0 "toca/commrack2" // 64 mapmodel 0 0 0 0 "toca/computer/monkeymou" // 65 -mapmodel 1 8 0 0 "toca/corrugated/beam" // 66 For use with corrugated iron fence (Model 102/103) -mapmodel 1 4 0 0 "toca/guardrail" // 67 Clip this properly! -mapmodel 1 4 0 0 "toca/guardrail2" // 68 Use guardrail2 with this (Model 106) +mapmodel 1 8 0 0 "toca/corrugated/beam" // 66 - For use with corrugated/fence (Model 102/103) +mapmodel 1 4 0 0 "toca/guardrail" // 67 - Clip this properly! +mapmodel 1 4 0 0 "toca/guardrail2" // 68 - Use guardrail2 with this (Model 106) mapmodel 0 0 0 0 "toca/milkcarton" // 69 mapmodel 1 1 0 0 "toca/monitor" // 70 -mapmodel 2 3 0 0 "toca/officedesk" // 71 Clip this properly! +mapmodel 2 3 0 0 "toca/officedesk" // 71 - Clip this properly! mapmodel 0 0 0 0 "toca/plasmatv" // 72 mapmodel 4 1 0 0 "toca/platformmet" // 73 mapmodel 0 6 0 0 "toca/powermeter" // 74 -mapmodel 1 6 0 0 "toca/rack" // 75 Clip this properly! -mapmodel 2 8 0 0 "toca/radarconsole" // 76 Clip this properly! -mapmodel 0 0 0 0 "toca/securitycam/secucam" // 77 Animated security camera. Use mounts with this (Model 104/105) +mapmodel 1 6 0 0 "toca/rack" // 75 - Clip this properly! +mapmodel 2 8 0 0 "toca/radarconsole" // 76 - Clip this properly! +mapmodel 0 0 0 0 "toca/securitycam/secucam" // 77 - Animated security camera. Use mounts with this (Model 104/105) mapmodel 0 0 0 0 "toca/sgshell" // 78 -mapmodel 4 1 7 0 "toca/stairs1" // 79 Clip this properly! -mapmodel 4 1 0 0 "toca/stairs2" // 80 Clip this properly! +mapmodel 4 1 7 0 "toca/stairs1" // 79 - Clip this properly! +mapmodel 4 1 0 0 "toca/stairs2" // 80 - Clip this properly! mapmodel 1 3 0 0 "toca/radioactivedrum" // 81 mapmodel 1 2 0 0 "toca/radioactivedrum2" // 82 mapmodel 2 1 0 0 "toca/tyre" // 83 mapmodel 1 2 0 0 "toca/trashbag" // 84 mapmodel 1 3 0 0 "toca/trashcan" // 85 mapmodel 1 2 0 0 "toca/tv" // 86 -mapmodel 2 3 0 0 "toca/utilitytable" // 87 Clip the sides of this properly! +mapmodel 2 3 0 0 "toca/utilitytable" // 87 - Clip the sides of this properly! mapmodel 1 3 0 0 "toca/wheel" // 88 mapmodel 0 0 0 0 "toca/signs/biohazard" // 89 mapmodel 0 0 0 0 "toca/signs/chemical" // 90 @@ -129,12 +129,12 @@ mapmodel 0 0 0 0 "toca/signs/radioactive" // 98 mapmodel 0 0 0 0 "toca/signs/restricted" // 99 mapmodel 1 6 0 0 "toca/signs/target" // 100 mapmodel 0 2 0 0 "toca/computer/pc" // 101 -mapmodel 1 8 0 0 "toca/corrugated/fence1" // 102 Use the beam with this (Model 66) -mapmodel 1 8 0 0 "toca/corrugated/fence2" // 103 Use the beam with this (Model 66) -mapmodel 0 0 0 0 "toca/securitycam/vertmount" // 104 Use the camera mapmodel with this (Model 77) -mapmodel 0 0 0 0 "toca/securitycam/wallmount" // 105 Use the camera mapmodel with this (Model 77) -mapmodel 1 4 0 0 "toca/guardrail2/gr2pole" // 106 Use guardrail2 with this (Model 68) -mapmodel 0 0 0 0 "toca/airconditioner/interior" // 107 Outer part of airconditioner is Model 60 +mapmodel 1 8 0 0 "toca/corrugated/fence1" // 102 - Use the beam with this (Model 66) +mapmodel 1 8 0 0 "toca/corrugated/fence2" // 103 - Use the beam with this (Model 66) +mapmodel 0 0 0 0 "toca/securitycam/vertmount" // 104 - Use the camera mapmodel with this (Model 77) +mapmodel 0 0 0 0 "toca/securitycam/wallmount" // 105 - Use the camera mapmodel with this (Model 77) +mapmodel 1 4 0 0 "toca/guardrail2/gr2pole" // 106 - Use guardrail2 with this (Model 68) +mapmodel 0 0 0 0 "toca/airconditioner/interior" // 107 - Outer part of airconditioner is Model 60 mapmodel 1 1 1 0 "toca/pipes/concretepipe" // 108 mapmodel 1 1 1 0 "toca/pipes/metalpipe" // 109 mapmodel 0 1 0 0 "toca/pipes/metalpipe2" // 110 @@ -168,9 +168,9 @@ mapmodel 0 3 3 0 "misterfloppy/hanging_ladder/ladder_6" // 137 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_top" // 138 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_up" // 139 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_low" // 140 -mapmodel 0 0 0 0 "misterfloppy/alarmlamp" // 141 -mapmodel 0 0 1 0 "misterfloppy/platelamp" // 142 -mapmodel 0 10 0 0 "misterfloppy/streetlamp" // 143 +mapmodel 0 0 0 0 "misterfloppy/alarmlamp" // 141 +mapmodel 0 0 1 0 "misterfloppy/platelamp" // 142 +mapmodel 0 10 0 0 "misterfloppy/streetlamp" // 143 mapmodel 1 1 0 0 "toca/pipes/industrialpipes/horz" // 144 mapmodel 0 2 0 0 "toca/pipes/industrialpipes/ldwn" // 145 mapmodel 1 1 0 0 "toca/pipes/industrialpipes/lleft" // 146 @@ -182,10 +182,10 @@ mapmodel 0 0 0 0 "toca/electric/outlet" // 151 mapmodel 0 1 0 0 "toca/carbattery" // 152 mapmodel 0 32 0 0 "toca/antenna" // 153 mapmodel 0 0 0 0 "toca/pinboard" // 154 -mapmodel 0 0 0 0 "toca/ledge/1_4cbs" // 155 Clip this properly! -mapmodel 0 0 0 0 "toca/ledge/2_8cbs" // 156 Clip this properly! -mapmodel 0 0 0 0 "toca/ledge/3_16cbs" // 157 Clip this properly! -mapmodel 0 0 0 0 "toca/ledge/4_corner" // 158 Clip this properly! +mapmodel 0 0 0 0 "toca/ledge/1_4cbs" // 155 - Clip this properly! +mapmodel 0 0 0 0 "toca/ledge/2_8cbs" // 156 - Clip this properly! +mapmodel 0 0 0 0 "toca/ledge/3_16cbs" // 157 - Clip this properly! +mapmodel 0 0 0 0 "toca/ledge/4_corner" // 158 - Clip this properly! mapmodel 0 0 0 0 "toca/takeoutbox" // 159 mapmodel 0 0 0 0 "toca/plasticbottles/1" // 160 mapmodel 0 0 0 0 "toca/plasticbottles/2" // 161 @@ -202,21 +202,25 @@ mapmodel 0 0 0 0 "toca/newspaper/2" // 167 // Or, they require specific changes to work properly, that a newbie might not know how to do yet. // But you can activate those mapmodels if you want, by using a config file and uncommenting the ones you need below. -// mapmodel 0 0 0 0 "makke/sail" // Sail cloth, specific to ac_desert. -// mapmodel 0 0 0 0 "makke/sail_snow" // Camouflaged sail cloth, specific to ac_arctic. -// mapmodel 3 8 0 0 "makke/mine-shaft_elevator" // Mine elevator, specific to ac_mines. -// mapmodel 0 0 0 0 "makke/wires/3x8" // Different sizes of power lines, specific to ac_power. -// mapmodel 0 0 0 0 "makke/wires/2x8" // Different sizes of power lines, specific to ac_power. -// mapmodel 0 0 0 0 "makke/wires/4x8a" // Different sizes of power lines, specific to ac_power. -// mapmodel 0 0 0 0 "makke/wires/4x8" // Different sizes of power lines, specific to ac_power. -// mapmodel 1 3 0 0 "makke/barrel_toxic" // Toxic barrel, specific to ac_toxic. -// mapmodel 0 0 0 0 "makke/icicle" // Icicle, specific to ac_arctic. -// mapmodel 4 1 0 0 "makke/platform_shine" // Platform for ac_shine, specifically textured for its surroundings. -// mapmodel 0 15 0 0 "makke/ladder_15x_offset" // Special ladder model for ac_desert. -// mapmodel 0 0 0 0 "makke/signs/no_camping" // No-camping sign, specific to ac_douze. -// mapmodel 1 3 0 0 "makke/barrel_newsteel" // Steel barrel mapmodel, specific to ac_rattrap. -// mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" // Steel barrel mapmodel, specific to ac_rattrap. -// mapmodel 3 1 0 0 "toca/grid6x8" // A metal mesh, specifically designed for ac_aqueous. +// mapmodel 0 0 0 0 "makke/sail" // Sail cloth, specific to ac_desert. +// mapmodel 0 0 0 0 "makke/sail_snow" // Camouflaged makke/sail cloth, specific to ac_arctic. +// mapmodel 0 0 0 0 "makke/wires/3x8" // Different sizes of power lines, specific to ac_power. +// mapmodel 0 0 0 0 "makke/wires/2x8" // Different sizes of power lines, specific to ac_power. +// mapmodel 0 0 0 0 "makke/wires/4x8a" // Different sizes of power lines, specific to ac_power. +// mapmodel 0 0 0 0 "makke/wires/4x8" // Different sizes of power lines, specific to ac_power. +// mapmodel 1 3 0 0 "makke/barrel_toxic" // Toxic barrel, specific to ac_toxic. +// mapmodel 1 3 0 0 "makke/barrel_newsteel" // Steel makke/barrel mapmodel, specific to ac_rattrap. +// mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" // Steel makke/barrel mapmodel, specific to ac_rattrap. +// mapmodel 3 8 0 0 "makke/mine-shaft_elevator" // Mine lift, specific to ac_mines. +// mapmodel 1 2 0 0 "cleaner/minecart/down" // Cleaner's mines. +// mapmodel 1 2 0 0 "cleaner/minecart/up" // Cleaner's mines. +// mapmodel 0 0 0 0 "cleaner/rails/bent" // Cleaner's mines. +// mapmodel 0 0 0 0 "cleaner/rails/straight" // Cleaner's mines. +// mapmodel 0 8 0 0 "wotwot/makke_drainpipe_gritty" // Gritty re-skin of makkE's drainpipe. +// mapmodel 0 0 0 0 "makke/icicle" // Icicle, specific to ac_arctic. +// mapmodel 0 0 0 0 "makke/signs/no_camping" // No-camping sign, specific to ac_douze. +// mapmodel 1 1 0 0 "misterfloppy/valve_hor" // Valve mapmodel, specific to ac_werk. +// mapmodel 0 15 0 0 "makke/ladder_15x_offset" // Special ladder model for ac_desert. // mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/beam" // Metal beam to support toca's stairs. This model can be difficult to place correctly. // mapmodel 0 0 0 0 "toca/stairs_aqueous/stairsacc/handrail" @@ -225,16 +229,11 @@ mapmodel 0 0 0 0 "toca/newspaper/2" // 167 // Special stairs platforms with handrails. This model requires careful clipping to be used. // mapmodel 3 1 7 0 "toca/stairs_aqueous/stairs2" // Special stairs platforms with handrails. This model requires careful clipping to be used. -// mapmodel 1 1 0 0 "misterfloppy/valve_hor" // Valve mapmodel, specific to ac_werk. -// mapmodel 1 2 0 0 "cleaner/minecart/down" // Cleaner's mines. -// mapmodel 1 2 0 0 "cleaner/minecart/up" // Cleaner's mines. -// mapmodel 8 1 0 0 "cleaner/platform/16x16" // Requires setting a texture. -// mapmodel 0 0 0 0 "cleaner/rails/bent" // Cleaner's mines. -// mapmodel 0 0 0 0 "cleaner/rails/straight" // Cleaner's mines. -// mapmodel 4 1 0 0 "cleaner/platform/8x8" - // Alternative platform that fits *most* textures better - requires setting a texture. -// mapmodel 0 8 0 0 "wotwot/makke_drainpipe_gritty" // Gritty re-skin of makkE's drainpipe. -// mapmodel 1 3 0 0 "makke/pallet_vert" // Requires proper clipping. +// mapmodel 8 1 0 0 "cleaner/platform/16x16" // Requires setting a texture. +// mapmodel 3 1 0 0 "toca/grid6x8" // A metal mesh, specifically designed for ac_aqueous. +// mapmodel 4 1 0 0 "makke/platform_shine" // Platform for ac_shine, specifically textured for its surroundings. +// mapmodel 4 1 0 0 "cleaner/platform/8x8" // Alternative platform that fits *most* textures better, + // requires setting a texture. // 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. @@ -265,7 +264,7 @@ loadnotexture // Reset to default alternative texture. Comment this if you w // Special note: // Texture slot 0 is hardcoded as the sky -// Texture slot 1 used to be hardcoded as the default liquid texture but is now makke/nothing_clip in particular. +// Texture slot 1 used to be hardcoded as the default liquid texture but is now unrequired and replaced with a dummy. // texture slot 2 is the default wall texture for new maps. // texture slot 3 is the default floor texture for new maps. // texture slot 4 is the default ceiling texture for new maps. @@ -294,7 +293,7 @@ texture 0 "grsites/brick065.jpg" texture 0 "boeck/stone_022.jpg" texture 0 "DigitalFlux/gray_bricks_02.jpg" texture 0 "DigitalFlux/gray_bricks_01.jpg" -texture 0 "makke/bricks_2.jpg" +texture 0 "mayang/bricks_2.jpg" texture 0 "makke/bricks_3.jpg" texture 0 "makke/brickwall.jpg" texture 0 "noctua/wall/brick02.jpg" @@ -494,7 +493,7 @@ texture 0 "makke/aircon_sm.jpg" texture 0 "golgotha/door.jpg" texture 0 "makke/klappe.jpg" texture 0 "makke/klappe2.jpg" -texture 0 "golgotha/klappe.jpg" +texture 0 "golgotha/klappe3.jpg" texture 0 "makke/neuklappe.jpg" texture 0 "golgotha/panel.jpg" texture 0 "3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_aqueous.cfg b/packages/maps/official/ac_aqueous.cfg index 171eefb2..2e54f450 100644 --- a/packages/maps/official/ac_aqueous.cfg +++ b/packages/maps/official/ac_aqueous.cfg @@ -158,7 +158,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -338,7 +338,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_arabian.cfg b/packages/maps/official/ac_arabian.cfg index 22db3ef4..fe0f73ce 100644 --- a/packages/maps/official/ac_arabian.cfg +++ b/packages/maps/official/ac_arabian.cfg @@ -153,7 +153,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -333,7 +333,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_arctic.cfg b/packages/maps/official/ac_arctic.cfg index bf545678..3481cd53 100644 --- a/packages/maps/official/ac_arctic.cfg +++ b/packages/maps/official/ac_arctic.cfg @@ -147,7 +147,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -327,7 +327,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_arid.cfg b/packages/maps/official/ac_arid.cfg index 35d7f206..9ea89585 100644 --- a/packages/maps/official/ac_arid.cfg +++ b/packages/maps/official/ac_arid.cfg @@ -172,7 +172,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -352,7 +352,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_avenue.cfg b/packages/maps/official/ac_avenue.cfg index cca56c1f..59247a32 100644 --- a/packages/maps/official/ac_avenue.cfg +++ b/packages/maps/official/ac_avenue.cfg @@ -182,7 +182,7 @@ texture 0 "grsites/brick065.jpg" texture 0 "boeck/stone_022.jpg" texture 0 "DigitalFlux/gray_bricks_02.jpg" texture 0 "DigitalFlux/gray_bricks_01.jpg" -texture 0 "makke/bricks_2.jpg" +texture 0 "mayang/bricks_2.jpg" texture 0 "makke/bricks_3.jpg" texture 0 "makke/brickwall.jpg" texture 0 "noctua/wall/brick02.jpg" @@ -362,7 +362,7 @@ texture 0 "makke/aircon_sm.jpg" texture 0 "golgotha/door.jpg" texture 0 "makke/klappe.jpg" texture 0 "makke/klappe2.jpg" -texture 0 "golgotha/klappe.jpg" +texture 0 "golgotha/klappe3.jpg" texture 0 "makke/neuklappe.jpg" texture 0 "golgotha/panel.jpg" texture 0 "3dcafe/objects09_a.jpg" @@ -464,10 +464,12 @@ 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" -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/citynoisebirds.ogg" -1nce/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 \ No newline at end of file diff --git a/packages/maps/official/ac_complex.cfg b/packages/maps/official/ac_complex.cfg index 6c899429..471fc94a 100644 --- a/packages/maps/official/ac_complex.cfg +++ b/packages/maps/official/ac_complex.cfg @@ -269,7 +269,7 @@ texture 0 "./DigitalFlux/dirt_pebbles_01.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/stuck1.jpg" texture 0 "./makke/rock.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/stairtrim.jpg" @@ -285,7 +285,7 @@ texture 0 "./makke/aircon.jpg" texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./golgotha/window.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/metalstair1.jpg" texture 0 "./makke/metalstair2.jpg" texture 0 "./makke/lampe.jpg" diff --git a/packages/maps/official/ac_depot.cfg b/packages/maps/official/ac_depot.cfg index ec32a363..b85e8039 100644 --- a/packages/maps/official/ac_depot.cfg +++ b/packages/maps/official/ac_depot.cfg @@ -159,7 +159,7 @@ texture 0 "./noctua/wood/planks02_trim.jpg" texture 0 "./noctua/wood/bark01.jpg" texture 0 "./zastrow/sub_doors512B05.jpg" texture 0 "./makke/bricky.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/rock.jpg" texture 0 "./boeck/stone_022.jpg" @@ -242,7 +242,7 @@ texture 0 "./makke/rock.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./boeck/rolltor.jpg" @@ -304,7 +304,7 @@ texture 0 "./zastrow/wood_crate_12.jpg" texture 0 "./zastrow/2wood_crate_10.jpg" texture 0 "./zastrow/3wood_crate_10.jpg" texture 0 "./zastrow/wood_crate_10.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./golgotha/smallsteelbox.jpg" mapsoundreset diff --git a/packages/maps/official/ac_depot_classic.cfg b/packages/maps/official/ac_depot_classic.cfg index f7156960..46406d41 100644 --- a/packages/maps/official/ac_depot_classic.cfg +++ b/packages/maps/official/ac_depot_classic.cfg @@ -159,7 +159,7 @@ texture 0 "./noctua/wood/planks02_trim.jpg" texture 0 "./noctua/wood/bark01.jpg" texture 0 "./zastrow/sub_doors512B05.jpg" texture 0 "./makke/bricky.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/rock.jpg" texture 0 "./boeck/stone_022.jpg" @@ -242,7 +242,7 @@ texture 0 "./makke/rock.jpg" texture 0 "./makke/rock.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./boeck/rolltor.jpg" diff --git a/packages/maps/official/ac_desert.cfg b/packages/maps/official/ac_desert.cfg index 8cf75d2a..0db3b8cd 100644 --- a/packages/maps/official/ac_desert.cfg +++ b/packages/maps/official/ac_desert.cfg @@ -75,7 +75,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/d_brick.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -253,7 +253,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_desert2.cfg b/packages/maps/official/ac_desert2.cfg index 8e7c339d..405e4ff6 100644 --- a/packages/maps/official/ac_desert2.cfg +++ b/packages/maps/official/ac_desert2.cfg @@ -80,7 +80,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/d_brick.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -258,7 +258,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_desert3.cfg b/packages/maps/official/ac_desert3.cfg index e46f2128..0fa84661 100644 --- a/packages/maps/official/ac_desert3.cfg +++ b/packages/maps/official/ac_desert3.cfg @@ -80,7 +80,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/d_brick.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -258,7 +258,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_douze.cfg b/packages/maps/official/ac_douze.cfg index 620730c5..866b3b43 100644 --- a/packages/maps/official/ac_douze.cfg +++ b/packages/maps/official/ac_douze.cfg @@ -156,7 +156,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -336,7 +336,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_edifice.cfg b/packages/maps/official/ac_edifice.cfg index 5fefa654..2d2eadce 100644 --- a/packages/maps/official/ac_edifice.cfg +++ b/packages/maps/official/ac_edifice.cfg @@ -172,7 +172,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -352,7 +352,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_elevation.cfg b/packages/maps/official/ac_elevation.cfg index 71e7af88..24e7c502 100644 --- a/packages/maps/official/ac_elevation.cfg +++ b/packages/maps/official/ac_elevation.cfg @@ -76,7 +76,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -256,7 +256,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_gothic.cfg b/packages/maps/official/ac_gothic.cfg index ca81aedb..4f0377a1 100644 --- a/packages/maps/official/ac_gothic.cfg +++ b/packages/maps/official/ac_gothic.cfg @@ -126,7 +126,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -306,7 +306,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_iceroad.cfg b/packages/maps/official/ac_iceroad.cfg index 670105d3..eb3368c8 100644 --- a/packages/maps/official/ac_iceroad.cfg +++ b/packages/maps/official/ac_iceroad.cfg @@ -172,7 +172,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -352,7 +352,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_industrial.cfg b/packages/maps/official/ac_industrial.cfg index 9eb96131..d5724134 100644 --- a/packages/maps/official/ac_industrial.cfg +++ b/packages/maps/official/ac_industrial.cfg @@ -180,7 +180,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -361,7 +361,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_ingress.cfg b/packages/maps/official/ac_ingress.cfg index 486af93a..cf61529a 100644 --- a/packages/maps/official/ac_ingress.cfg +++ b/packages/maps/official/ac_ingress.cfg @@ -185,7 +185,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -365,7 +365,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_keller.cfg b/packages/maps/official/ac_keller.cfg index 6191eafa..f33bdd5a 100644 --- a/packages/maps/official/ac_keller.cfg +++ b/packages/maps/official/ac_keller.cfg @@ -99,7 +99,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -279,7 +279,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_mines.cfg b/packages/maps/official/ac_mines.cfg index 69f15e32..ccb5c3fb 100644 --- a/packages/maps/official/ac_mines.cfg +++ b/packages/maps/official/ac_mines.cfg @@ -156,7 +156,7 @@ texture 0 "./noctua/wood/planks02_trim.jpg" texture 0 "./noctua/wood/bark01.jpg" texture 0 "./noctua/wood/fb_board.jpg" texture 0 "./makke/bricky.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricky.jpg" texture 0 "./makke/bricky.jpg" texture 0 "./boeck/stone_022.jpg" @@ -239,7 +239,7 @@ texture 0 "./noctua/textile/carpet05.jpg" texture 0 "./makke/bricky.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./noctua/textile/burlap01.jpg" @@ -301,7 +301,7 @@ texture 0 "./makke/rock.jpg" texture 0 "./zastrow/2wood_crate_10.jpg" texture 0 "./zastrow/3wood_crate_10.jpg" texture 0 "./zastrow/wood_crate_10.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/metalstair1.jpg" texture 0 "./makke/metalstair2.jpg" texture 0 "./makke/lampe.jpg" diff --git a/packages/maps/official/ac_outpost.cfg b/packages/maps/official/ac_outpost.cfg index 0e8958f7..962a1f88 100644 --- a/packages/maps/official/ac_outpost.cfg +++ b/packages/maps/official/ac_outpost.cfg @@ -184,7 +184,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -364,7 +364,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_power.cfg b/packages/maps/official/ac_power.cfg index 642fad50..a7234dd3 100644 --- a/packages/maps/official/ac_power.cfg +++ b/packages/maps/official/ac_power.cfg @@ -93,7 +93,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -224,7 +224,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" @@ -289,11 +289,11 @@ texture 0 "./wotwot/urban/electric3.jpg" texture 0 "./wotwot/urban/electric3_bla.jpg" texture 0 "./wotwot/urban/electric1.jpg" texture 0 "./wotwot/urban/electric1_bla.jpg" -texture 0 "../models/mapmodels/wotwot/makke_drainpipe_gritty/skin.jpg" -texture 0 "../models/mapmodels/wotwot/toca_milkcarton_dull/skin.jpg" -texture 0 "../models/mapmodels/wotwot/toca_guardrail2_dull/skin.jpg" -texture 0 "../models/mapmodels/wotwot/toca_monitor_dull/skin.jpg" -texture 0 "../models/mapmodels/wotwot/toca_commrack_dull/skin.jpg" +texture 0 "./../models/mapmodels/wotwot/makke_drainpipe_gritty/skin.jpg" +texture 0 "./../models/mapmodels/wotwot/toca_milkcarton_dull/skin.jpg" +texture 0 "./../models/mapmodels/wotwot/toca_guardrail2_dull/skin.jpg" +texture 0 "./../models/mapmodels/wotwot/toca_monitor_dull/skin.jpg" +texture 0 "./../models/mapmodels/wotwot/toca_commrack_dull/skin.jpg" mapsoundreset mapsound "./ambience/cavedrip.ogg" -1 mapsound "./ambience/distant_cars.ogg" -1 diff --git a/packages/maps/official/ac_rattrap.cfg b/packages/maps/official/ac_rattrap.cfg index 5f38ebe1..988253c7 100644 --- a/packages/maps/official/ac_rattrap.cfg +++ b/packages/maps/official/ac_rattrap.cfg @@ -61,7 +61,7 @@ texture 0 "./boeck/rolltor.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./makke/aircon_sm.jpg" texture 0 "./makke/asph_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricky.jpg" texture 0 "./makke/concrete.jpg" texture 0 "./makke/concrete_trim.jpg" @@ -161,7 +161,7 @@ mapmodel 0 12 0 0 "makke/street_light" mapmodel 0 0 0 0 "makke/flyer_environmental" mapmodel 0 0 0 0 "makke/wrench" mapmodel 1 2 0 0 "jcdpc/cardboardbox" -mapmodel 0 0 0 0 "makke/nothing_clip" +mapmodel 1 2 0 0 "jcdpc/cardboardbox" mapmodel 0 0 0 0 "jcdpc/hanginglamp" mapmodel 0 0 0 0 "jcdpc/ventflap" mapmodel 0 0 0 0 "toca/bullet" diff --git a/packages/maps/official/ac_scaffold.cfg b/packages/maps/official/ac_scaffold.cfg index ac803af8..b7dbdb99 100644 --- a/packages/maps/official/ac_scaffold.cfg +++ b/packages/maps/official/ac_scaffold.cfg @@ -132,7 +132,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -312,7 +312,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_shine.cfg b/packages/maps/official/ac_shine.cfg index b5acf71b..2adcf34a 100644 --- a/packages/maps/official/ac_shine.cfg +++ b/packages/maps/official/ac_shine.cfg @@ -135,7 +135,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -315,7 +315,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_snow.cfg b/packages/maps/official/ac_snow.cfg index bc99a6f1..df7141e2 100644 --- a/packages/maps/official/ac_snow.cfg +++ b/packages/maps/official/ac_snow.cfg @@ -66,7 +66,7 @@ texture 0 "./arcitool/rohbaubims.jpg" texture 0 "./grsites/brick051.jpg" texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./noctua/wall/brick02.jpg" texture 0 "./makke/mauer1.jpg" texture 0 "./makke/mauer2.jpg" @@ -133,7 +133,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./3dcafe/objects09_a.jpg" texture 0 "./golgotha/elecpanelstwo.jpg" texture 0 "./mitaman/various/rgrates0006.jpg" diff --git a/packages/maps/official/ac_stellar.cfg b/packages/maps/official/ac_stellar.cfg index c7f81398..cd40034a 100644 --- a/packages/maps/official/ac_stellar.cfg +++ b/packages/maps/official/ac_stellar.cfg @@ -184,7 +184,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -364,7 +364,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_sunset.cfg b/packages/maps/official/ac_sunset.cfg index 6fa03800..6fb3f13d 100644 --- a/packages/maps/official/ac_sunset.cfg +++ b/packages/maps/official/ac_sunset.cfg @@ -80,7 +80,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -260,7 +260,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_toxic.cfg b/packages/maps/official/ac_toxic.cfg index de055097..992f3b1c 100644 --- a/packages/maps/official/ac_toxic.cfg +++ b/packages/maps/official/ac_toxic.cfg @@ -113,7 +113,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -293,7 +293,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_urban.cfg b/packages/maps/official/ac_urban.cfg index 11aeaf3a..adbb84f2 100644 --- a/packages/maps/official/ac_urban.cfg +++ b/packages/maps/official/ac_urban.cfg @@ -88,7 +88,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -268,7 +268,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg" diff --git a/packages/maps/official/ac_werk.cfg b/packages/maps/official/ac_werk.cfg index 53e61a94..a3b66e69 100644 --- a/packages/maps/official/ac_werk.cfg +++ b/packages/maps/official/ac_werk.cfg @@ -179,7 +179,7 @@ texture 0 "./grsites/brick065.jpg" texture 0 "./boeck/stone_022.jpg" texture 0 "./DigitalFlux/gray_bricks_02.jpg" texture 0 "./DigitalFlux/gray_bricks_01.jpg" -texture 0 "./makke/bricks_2.jpg" +texture 0 "./mayang/bricks_2.jpg" texture 0 "./makke/bricks_3.jpg" texture 0 "./makke/brickwall.jpg" texture 0 "./noctua/wall/brick02.jpg" @@ -359,7 +359,7 @@ texture 0 "./makke/aircon_sm.jpg" texture 0 "./golgotha/door.jpg" texture 0 "./makke/klappe.jpg" texture 0 "./makke/klappe2.jpg" -texture 0 "./golgotha/klappe.jpg" +texture 0 "./golgotha/klappe3.jpg" texture 0 "./makke/neuklappe.jpg" texture 0 "./golgotha/panel.jpg" texture 0 "./3dcafe/objects09_a.jpg"