From 2be815b0d3a95d42b6d949375c5d975a684bfd70 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Sat, 12 Jan 2013 12:42:07 +0000 Subject: [PATCH] mapmodel cleanup git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7072 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- packages/convert_mapcfgs.sh | 16 ++++++++++++++++ .../{wood01 => makke/broken_wood}/skin.jpg | Bin .../{wood01 => makke/broken_wood}/tris.md2 | Bin .../mapmodels/{fag => makke/cigarette}/md2.cfg | 0 .../mapmodels/{fag => makke/cigarette}/skin.jpg | Bin .../mapmodels/{fag => makke/cigarette}/tris.md2 | Bin .../{fence => makke/fence_chainlink}/skin.jpg | Bin .../{fence => makke/fence_chainlink}/tris.md2 | Bin .../fence_chainlink_closed_gate}/skin.jpg | Bin .../fence_chainlink_closed_gate}/tris.md2 | Bin .../fence_chainlink_no_gate}/skin.jpg | Bin .../fence_chainlink_no_gate}/tris.md2 | Bin .../fence_chainlink_post}/skin.jpg | Bin .../fence_chainlink_post}/tris.md2 | Bin .../fluorescent_lamp}/skin.jpg | Bin .../fluorescent_lamp}/tris.md2 | Bin .../flyer_environmental}/skin.jpg | Bin .../flyer_environmental}/tris.md2 | Bin .../{flyer => makke/flyer_propaganda}/skin.jpg | Bin .../{tree01 => makke/flyer_propaganda}/tris.md2 | Bin .../{gastank => makke/fuel_tank}/skin.jpg | Bin .../{gastank => makke/fuel_tank}/tris.md2 | Bin .../models/mapmodels/{ => makke}/hook/skin.jpg | Bin .../models/mapmodels/{ => makke}/hook/tris.md2 | Bin .../mapmodels/{ => makke}/icicle/skin.jpg | Bin .../mapmodels/{ => makke}/icicle/tris.md3 | Bin .../mapmodels/{ => makke}/locker/skin.jpg | Bin .../mapmodels/{ => makke}/locker/tris.md3 | Bin .../{streetlamp => makke/street_light}/skin.jpg | Bin .../{streetlamp => makke/street_light}/tris.md2 | Bin .../{strahler => makke/wall_spotlight}/skin.jpg | Bin .../{strahler => makke/wall_spotlight}/tris.md2 | Bin .../models/mapmodels/{ => makke}/wrench/md2.cfg | 0 .../mapmodels/{ => makke}/wrench/skin.jpg | Bin .../mapmodels/{ => makke}/wrench/tris.md2 | Bin 35 files changed, 16 insertions(+) rename packages/models/mapmodels/{wood01 => makke/broken_wood}/skin.jpg (100%) rename packages/models/mapmodels/{wood01 => makke/broken_wood}/tris.md2 (100%) rename packages/models/mapmodels/{fag => makke/cigarette}/md2.cfg (100%) rename packages/models/mapmodels/{fag => makke/cigarette}/skin.jpg (100%) rename packages/models/mapmodels/{fag => makke/cigarette}/tris.md2 (100%) rename packages/models/mapmodels/{fence => makke/fence_chainlink}/skin.jpg (100%) rename packages/models/mapmodels/{fence => makke/fence_chainlink}/tris.md2 (100%) rename packages/models/mapmodels/{fencegate_closed => makke/fence_chainlink_closed_gate}/skin.jpg (100%) rename packages/models/mapmodels/{fencegate_closed => makke/fence_chainlink_closed_gate}/tris.md2 (100%) rename packages/models/mapmodels/{fencegate_open => makke/fence_chainlink_no_gate}/skin.jpg (100%) rename packages/models/mapmodels/{fencegate_open => makke/fence_chainlink_no_gate}/tris.md2 (100%) rename packages/models/mapmodels/{fencepost => makke/fence_chainlink_post}/skin.jpg (100%) rename packages/models/mapmodels/{fencepost => makke/fence_chainlink_post}/tris.md2 (100%) rename packages/models/mapmodels/{light01 => makke/fluorescent_lamp}/skin.jpg (100%) rename packages/models/mapmodels/{light01 => makke/fluorescent_lamp}/tris.md2 (100%) rename packages/models/mapmodels/{tree01 => makke/flyer_environmental}/skin.jpg (100%) rename packages/models/mapmodels/{flyer => makke/flyer_environmental}/tris.md2 (100%) rename packages/models/mapmodels/{flyer => makke/flyer_propaganda}/skin.jpg (100%) rename packages/models/mapmodels/{tree01 => makke/flyer_propaganda}/tris.md2 (100%) rename packages/models/mapmodels/{gastank => makke/fuel_tank}/skin.jpg (100%) rename packages/models/mapmodels/{gastank => makke/fuel_tank}/tris.md2 (100%) rename packages/models/mapmodels/{ => makke}/hook/skin.jpg (100%) rename packages/models/mapmodels/{ => makke}/hook/tris.md2 (100%) rename packages/models/mapmodels/{ => makke}/icicle/skin.jpg (100%) rename packages/models/mapmodels/{ => makke}/icicle/tris.md3 (100%) rename packages/models/mapmodels/{ => makke}/locker/skin.jpg (100%) rename packages/models/mapmodels/{ => makke}/locker/tris.md3 (100%) rename packages/models/mapmodels/{streetlamp => makke/street_light}/skin.jpg (100%) rename packages/models/mapmodels/{streetlamp => makke/street_light}/tris.md2 (100%) rename packages/models/mapmodels/{strahler => makke/wall_spotlight}/skin.jpg (100%) rename packages/models/mapmodels/{strahler => makke/wall_spotlight}/tris.md2 (100%) rename packages/models/mapmodels/{ => makke}/wrench/md2.cfg (100%) rename packages/models/mapmodels/{ => makke}/wrench/skin.jpg (100%) rename packages/models/mapmodels/{ => makke}/wrench/tris.md2 (100%) diff --git a/packages/convert_mapcfgs.sh b/packages/convert_mapcfgs.sh index d6873478..90974f4c 100644 --- a/packages/convert_mapcfgs.sh +++ b/packages/convert_mapcfgs.sh @@ -32,6 +32,22 @@ while getopts "c:" copt; do sed -i 's/dumpster/makke\/dumpster/g' $OPTARG sed -i 's/elektro/makke\/electric_meter/g' $OPTARG sed -i 's/europalette/makke\/pallet/g' $OPTARG + sed -i 's/fag/makke\/cigarette/g' $OPTARG + sed -i 's/fence/makke\/fence_chainlink/g' $OPTARG + sed -i 's/fencegate_closed/makke\/fence_chainlink_closed_gate/g' $OPTARG + sed -i 's/fencegate_open/makke\/fence_chainlink_no_gate/g' $OPTARG + sed -i 's/fencepost/makke\/fence_chainlink_post/g' $OPTARG + sed -i 's/flyer/makke\/flyer_propaganda/g' $OPTARG + sed -i 's/tree01/makke\/flyer_environmental/g' $OPTARG + sed -i 's/gastank/makke\/fuel_tank/g' $OPTARG + sed -i 's/icicle/makke\/icicle/g' $OPTARG + sed -i 's/hook/makke\/hook/g' $OPTARG + sed -i 's/locker/makke\/locker/g' $OPTARG + sed -i 's/light01/makke\/fluorescent_lamp/g' $OPTARG + sed -i 's/wood01/makke\/broken_wood/g' $OPTARG + sed -i 's/wrench/makke\/wrench/g' $OPTARG + sed -i 's/strahler/makke\/wall_spotlight/g' $OPTARG + sed -i 's/streetlamp/makke\/street_light/g' $OPTARG echo -e "\a\nConversion finished!" else echo -e "\a\E[31m\033[1mERROR:\E[0m The path you've stated to the map config file is invalid." diff --git a/packages/models/mapmodels/wood01/skin.jpg b/packages/models/mapmodels/makke/broken_wood/skin.jpg similarity index 100% rename from packages/models/mapmodels/wood01/skin.jpg rename to packages/models/mapmodels/makke/broken_wood/skin.jpg diff --git a/packages/models/mapmodels/wood01/tris.md2 b/packages/models/mapmodels/makke/broken_wood/tris.md2 similarity index 100% rename from packages/models/mapmodels/wood01/tris.md2 rename to packages/models/mapmodels/makke/broken_wood/tris.md2 diff --git a/packages/models/mapmodels/fag/md2.cfg b/packages/models/mapmodels/makke/cigarette/md2.cfg similarity index 100% rename from packages/models/mapmodels/fag/md2.cfg rename to packages/models/mapmodels/makke/cigarette/md2.cfg diff --git a/packages/models/mapmodels/fag/skin.jpg b/packages/models/mapmodels/makke/cigarette/skin.jpg similarity index 100% rename from packages/models/mapmodels/fag/skin.jpg rename to packages/models/mapmodels/makke/cigarette/skin.jpg diff --git a/packages/models/mapmodels/fag/tris.md2 b/packages/models/mapmodels/makke/cigarette/tris.md2 similarity index 100% rename from packages/models/mapmodels/fag/tris.md2 rename to packages/models/mapmodels/makke/cigarette/tris.md2 diff --git a/packages/models/mapmodels/fence/skin.jpg b/packages/models/mapmodels/makke/fence_chainlink/skin.jpg similarity index 100% rename from packages/models/mapmodels/fence/skin.jpg rename to packages/models/mapmodels/makke/fence_chainlink/skin.jpg diff --git a/packages/models/mapmodels/fence/tris.md2 b/packages/models/mapmodels/makke/fence_chainlink/tris.md2 similarity index 100% rename from packages/models/mapmodels/fence/tris.md2 rename to packages/models/mapmodels/makke/fence_chainlink/tris.md2 diff --git a/packages/models/mapmodels/fencegate_closed/skin.jpg b/packages/models/mapmodels/makke/fence_chainlink_closed_gate/skin.jpg similarity index 100% rename from packages/models/mapmodels/fencegate_closed/skin.jpg rename to packages/models/mapmodels/makke/fence_chainlink_closed_gate/skin.jpg diff --git a/packages/models/mapmodels/fencegate_closed/tris.md2 b/packages/models/mapmodels/makke/fence_chainlink_closed_gate/tris.md2 similarity index 100% rename from packages/models/mapmodels/fencegate_closed/tris.md2 rename to packages/models/mapmodels/makke/fence_chainlink_closed_gate/tris.md2 diff --git a/packages/models/mapmodels/fencegate_open/skin.jpg b/packages/models/mapmodels/makke/fence_chainlink_no_gate/skin.jpg similarity index 100% rename from packages/models/mapmodels/fencegate_open/skin.jpg rename to packages/models/mapmodels/makke/fence_chainlink_no_gate/skin.jpg diff --git a/packages/models/mapmodels/fencegate_open/tris.md2 b/packages/models/mapmodels/makke/fence_chainlink_no_gate/tris.md2 similarity index 100% rename from packages/models/mapmodels/fencegate_open/tris.md2 rename to packages/models/mapmodels/makke/fence_chainlink_no_gate/tris.md2 diff --git a/packages/models/mapmodels/fencepost/skin.jpg b/packages/models/mapmodels/makke/fence_chainlink_post/skin.jpg similarity index 100% rename from packages/models/mapmodels/fencepost/skin.jpg rename to packages/models/mapmodels/makke/fence_chainlink_post/skin.jpg diff --git a/packages/models/mapmodels/fencepost/tris.md2 b/packages/models/mapmodels/makke/fence_chainlink_post/tris.md2 similarity index 100% rename from packages/models/mapmodels/fencepost/tris.md2 rename to packages/models/mapmodels/makke/fence_chainlink_post/tris.md2 diff --git a/packages/models/mapmodels/light01/skin.jpg b/packages/models/mapmodels/makke/fluorescent_lamp/skin.jpg similarity index 100% rename from packages/models/mapmodels/light01/skin.jpg rename to packages/models/mapmodels/makke/fluorescent_lamp/skin.jpg diff --git a/packages/models/mapmodels/light01/tris.md2 b/packages/models/mapmodels/makke/fluorescent_lamp/tris.md2 similarity index 100% rename from packages/models/mapmodels/light01/tris.md2 rename to packages/models/mapmodels/makke/fluorescent_lamp/tris.md2 diff --git a/packages/models/mapmodels/tree01/skin.jpg b/packages/models/mapmodels/makke/flyer_environmental/skin.jpg similarity index 100% rename from packages/models/mapmodels/tree01/skin.jpg rename to packages/models/mapmodels/makke/flyer_environmental/skin.jpg diff --git a/packages/models/mapmodels/flyer/tris.md2 b/packages/models/mapmodels/makke/flyer_environmental/tris.md2 similarity index 100% rename from packages/models/mapmodels/flyer/tris.md2 rename to packages/models/mapmodels/makke/flyer_environmental/tris.md2 diff --git a/packages/models/mapmodels/flyer/skin.jpg b/packages/models/mapmodels/makke/flyer_propaganda/skin.jpg similarity index 100% rename from packages/models/mapmodels/flyer/skin.jpg rename to packages/models/mapmodels/makke/flyer_propaganda/skin.jpg diff --git a/packages/models/mapmodels/tree01/tris.md2 b/packages/models/mapmodels/makke/flyer_propaganda/tris.md2 similarity index 100% rename from packages/models/mapmodels/tree01/tris.md2 rename to packages/models/mapmodels/makke/flyer_propaganda/tris.md2 diff --git a/packages/models/mapmodels/gastank/skin.jpg b/packages/models/mapmodels/makke/fuel_tank/skin.jpg similarity index 100% rename from packages/models/mapmodels/gastank/skin.jpg rename to packages/models/mapmodels/makke/fuel_tank/skin.jpg diff --git a/packages/models/mapmodels/gastank/tris.md2 b/packages/models/mapmodels/makke/fuel_tank/tris.md2 similarity index 100% rename from packages/models/mapmodels/gastank/tris.md2 rename to packages/models/mapmodels/makke/fuel_tank/tris.md2 diff --git a/packages/models/mapmodels/hook/skin.jpg b/packages/models/mapmodels/makke/hook/skin.jpg similarity index 100% rename from packages/models/mapmodels/hook/skin.jpg rename to packages/models/mapmodels/makke/hook/skin.jpg diff --git a/packages/models/mapmodels/hook/tris.md2 b/packages/models/mapmodels/makke/hook/tris.md2 similarity index 100% rename from packages/models/mapmodels/hook/tris.md2 rename to packages/models/mapmodels/makke/hook/tris.md2 diff --git a/packages/models/mapmodels/icicle/skin.jpg b/packages/models/mapmodels/makke/icicle/skin.jpg similarity index 100% rename from packages/models/mapmodels/icicle/skin.jpg rename to packages/models/mapmodels/makke/icicle/skin.jpg diff --git a/packages/models/mapmodels/icicle/tris.md3 b/packages/models/mapmodels/makke/icicle/tris.md3 similarity index 100% rename from packages/models/mapmodels/icicle/tris.md3 rename to packages/models/mapmodels/makke/icicle/tris.md3 diff --git a/packages/models/mapmodels/locker/skin.jpg b/packages/models/mapmodels/makke/locker/skin.jpg similarity index 100% rename from packages/models/mapmodels/locker/skin.jpg rename to packages/models/mapmodels/makke/locker/skin.jpg diff --git a/packages/models/mapmodels/locker/tris.md3 b/packages/models/mapmodels/makke/locker/tris.md3 similarity index 100% rename from packages/models/mapmodels/locker/tris.md3 rename to packages/models/mapmodels/makke/locker/tris.md3 diff --git a/packages/models/mapmodels/streetlamp/skin.jpg b/packages/models/mapmodels/makke/street_light/skin.jpg similarity index 100% rename from packages/models/mapmodels/streetlamp/skin.jpg rename to packages/models/mapmodels/makke/street_light/skin.jpg diff --git a/packages/models/mapmodels/streetlamp/tris.md2 b/packages/models/mapmodels/makke/street_light/tris.md2 similarity index 100% rename from packages/models/mapmodels/streetlamp/tris.md2 rename to packages/models/mapmodels/makke/street_light/tris.md2 diff --git a/packages/models/mapmodels/strahler/skin.jpg b/packages/models/mapmodels/makke/wall_spotlight/skin.jpg similarity index 100% rename from packages/models/mapmodels/strahler/skin.jpg rename to packages/models/mapmodels/makke/wall_spotlight/skin.jpg diff --git a/packages/models/mapmodels/strahler/tris.md2 b/packages/models/mapmodels/makke/wall_spotlight/tris.md2 similarity index 100% rename from packages/models/mapmodels/strahler/tris.md2 rename to packages/models/mapmodels/makke/wall_spotlight/tris.md2 diff --git a/packages/models/mapmodels/wrench/md2.cfg b/packages/models/mapmodels/makke/wrench/md2.cfg similarity index 100% rename from packages/models/mapmodels/wrench/md2.cfg rename to packages/models/mapmodels/makke/wrench/md2.cfg diff --git a/packages/models/mapmodels/wrench/skin.jpg b/packages/models/mapmodels/makke/wrench/skin.jpg similarity index 100% rename from packages/models/mapmodels/wrench/skin.jpg rename to packages/models/mapmodels/makke/wrench/skin.jpg diff --git a/packages/models/mapmodels/wrench/tris.md2 b/packages/models/mapmodels/makke/wrench/tris.md2 similarity index 100% rename from packages/models/mapmodels/wrench/tris.md2 rename to packages/models/mapmodels/makke/wrench/tris.md2