Cleanup trap proto and scenery files (now use 1 file per trap type)

phobos2077 · Jul 10, 2023 · 6fd52c8 · 6fd52c8
1 parent 6314553
commit 6fd52c8
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 8 deletions.
diff --git a/root/data/art/scenery/MINTRAP0.FRM b/root/data/art/scenery/MINTRAP0.FRM
diff --git a/root/data/art/scenery/MINTRAP1.FRM b/root/data/art/scenery/MINTRAP1.FRM
diff --git a/root/data/art/scenery/SCENERY.LST b/root/data/art/scenery/SCENERY.LST
@@ -2384,6 +2384,6 @@ VLTVENT4.frm
 spiktrap.frm
 beartrap.frm
 minetrap.frm
-MINTRAP1.FRM
+minetrap.frm
 sensmine.frm
-sensmin1.FRM
+sensmine.frm
diff --git a/root/data/art/scenery/SPIKTRP0.FRM b/root/data/art/scenery/SPIKTRP0.FRM
diff --git a/root/data/art/scenery/SPIKTRP1.FRM b/root/data/art/scenery/SPIKTRP1.FRM
diff --git a/root/data/art/scenery/sensmin0.FRM b/root/data/art/scenery/sensmin0.FRM
diff --git a/root/data/art/scenery/sensmin1.FRM b/root/data/art/scenery/sensmin1.FRM
diff --git a/root/data/proto/scenery/_trap_s1.pro → root/data/proto/scenery/_trap_br.pro b/root/data/proto/scenery/_trap_s1.pro → root/data/proto/scenery/_trap_br.pro
diff --git a/root/data/proto/scenery/_trap_m1.pro b/root/data/proto/scenery/_trap_m1.pro
diff --git a/root/data/proto/scenery/_trap_m0.pro → root/data/proto/scenery/_trap_mi.pro b/root/data/proto/scenery/_trap_m0.pro → root/data/proto/scenery/_trap_mi.pro
diff --git a/root/data/proto/scenery/_trap_p1.pro b/root/data/proto/scenery/_trap_p1.pro
diff --git a/root/data/proto/scenery/_trap_p0.pro → root/data/proto/scenery/_trap_sn.pro b/root/data/proto/scenery/_trap_p0.pro → root/data/proto/scenery/_trap_sn.pro
diff --git a/root/data/proto/scenery/_trap_s0.pro → root/data/proto/scenery/_trap_sp.pro b/root/data/proto/scenery/_trap_s0.pro → root/data/proto/scenery/_trap_sp.pro
diff --git a/root/data/proto/scenery/scenery.lst b/root/data/proto/scenery/scenery.lst
@@ -2332,9 +2332,9 @@
 00002333.pro
 00002334.pro
 00002335.pro
-_trap_s0.pro
-_trap_s1.pro
-_trap_m0.pro
-_trap_m1.pro
-_trap_p0.pro
-_trap_p1.pro
+_trap_sp.pro
+_trap_br.pro
+_trap_mi.pro
+_trap_mi.pro
+_trap_sn.pro
+_trap_sn.pro