From 6fd52c8619b4da9081d230aa37f844aa900b4bab Mon Sep 17 00:00:00 2001
From: phobos2077 <phobos2077@gmail.com>
Date: Mon, 10 Jul 2023 23:03:34 +0200
Subject: [PATCH] Cleanup trap proto and scenery files (now use 1 file per trap
 type)

---
 root/data/art/scenery/MINTRAP0.FRM                | Bin 474 -> 0 bytes
 root/data/art/scenery/MINTRAP1.FRM                | Bin 474 -> 0 bytes
 root/data/art/scenery/SCENERY.LST                 |   4 ++--
 root/data/art/scenery/SPIKTRP0.FRM                | Bin 492 -> 0 bytes
 root/data/art/scenery/SPIKTRP1.FRM                | Bin 662 -> 0 bytes
 root/data/art/scenery/sensmin0.FRM                | Bin 416 -> 0 bytes
 root/data/art/scenery/sensmin1.FRM                | Bin 416 -> 0 bytes
 .../proto/scenery/{_trap_s1.pro => _trap_br.pro}  | Bin
 root/data/proto/scenery/_trap_m1.pro              | Bin 45 -> 0 bytes
 .../proto/scenery/{_trap_m0.pro => _trap_mi.pro}  | Bin
 root/data/proto/scenery/_trap_p1.pro              | Bin 45 -> 0 bytes
 .../proto/scenery/{_trap_p0.pro => _trap_sn.pro}  | Bin
 .../proto/scenery/{_trap_s0.pro => _trap_sp.pro}  | Bin
 root/data/proto/scenery/scenery.lst               |  12 ++++++------
 14 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 root/data/art/scenery/MINTRAP0.FRM
 delete mode 100644 root/data/art/scenery/MINTRAP1.FRM
 delete mode 100644 root/data/art/scenery/SPIKTRP0.FRM
 delete mode 100644 root/data/art/scenery/SPIKTRP1.FRM
 delete mode 100644 root/data/art/scenery/sensmin0.FRM
 delete mode 100644 root/data/art/scenery/sensmin1.FRM
 rename root/data/proto/scenery/{_trap_s1.pro => _trap_br.pro} (100%)
 delete mode 100644 root/data/proto/scenery/_trap_m1.pro
 rename root/data/proto/scenery/{_trap_m0.pro => _trap_mi.pro} (100%)
 delete mode 100644 root/data/proto/scenery/_trap_p1.pro
 rename root/data/proto/scenery/{_trap_p0.pro => _trap_sn.pro} (100%)
 rename root/data/proto/scenery/{_trap_s0.pro => _trap_sp.pro} (100%)

diff --git a/root/data/art/scenery/MINTRAP0.FRM b/root/data/art/scenery/MINTRAP0.FRM
deleted file mode 100644
index 8ec473196c59c27c05b7b0fbb94acc87416cdfb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcmaJ+%MHUY2*pyR9tybE=Fl~Iv@$@J=_DPX`!H7eFd<1VwyY4p4-bgwLWPLRy5gJX
znm?mjzVx6wte=r8ITghf&G%MSL|7PC<V-2B378YChYR}2)j{EvCS`|>7gRIR*TzH#
z19-F6*i>qCg8^J?RcbR>Fk3Jl4P~8WuAT7FJ*Lmvvps|P*hiNRV;4yMVAB{35rK5E
b3-*CkpAf>~=njMCcSrug&4y6sY%!`ozOx(8

diff --git a/root/data/art/scenery/MINTRAP1.FRM b/root/data/art/scenery/MINTRAP1.FRM
deleted file mode 100644
index ba91f15b1f0a64c3e7618de72bac9ddc4c608538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcma)%(G9{d3`89X2`N4se!COXWD*8oCRQrvq%IL35mz-y-}zEoL@rW9r0hG_)HM&Q
zy}V?TJEPB4)n6V$_FJlr(B18Z*$PMmRi360JmA)<)~b^O*Gk+1Klu8QAy+!_5L4;E
z2CZh^je102Bf<X<&Whd{jNOEKFs{nRnnflZ;&T+>Jwh@17xTVmK`5NXIX|3G^J}$#
E02Ue$1poj5

diff --git a/root/data/art/scenery/SCENERY.LST b/root/data/art/scenery/SCENERY.LST
index d56bd37..ab0d1eb 100644
--- 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
\ No newline at end of file
+sensmine.frm
\ No newline at end of file
diff --git a/root/data/art/scenery/SPIKTRP0.FRM b/root/data/art/scenery/SPIKTRP0.FRM
deleted file mode 100644
index 292618d9a4a31cf531458372c0d7107d46d6b7d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmaKoF;2uV5JhJt8rWo9AklJ)RSps9H$K4J4Y}qLTiLQkJ`wPfbs})V6dC9F`CDTV
zd6E|qxqN@|d(`u>_^)3+<xO6B^kc9941~Y%IS-uP>Xvo>rNiE{!|ZDC6E9X{R#t-L
zsbfNK*XB8->Ur(<f~KBY%q10P2yIl<C3;JnUbg<gB8;ULQ*)4dzYzv43{joAyCv)e
z3snj3s-;a>`-oU9pwPWf(9X8TK>`Bic!-ZZjz+$oqxBQSHZr;KfzErnD0SC{mlV16
L_`e~w)4lxw@CRF%

diff --git a/root/data/art/scenery/SPIKTRP1.FRM b/root/data/art/scenery/SPIKTRP1.FRM
deleted file mode 100644
index 02f96018dc409290bbc2d7b6df808a1fb4495fd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmdsyF>b>!3`N<XOCy?@y2Z^Y3LhfHU$k`daRUg#2M>{RG^K4Bush@c)gVewpI@IM
z@+wCWd3pTAzOJ|R@T?xb<z3Dqhp%U<fAI$X9YZtoc)_^gN}5?V<m*a@q-sn&b+|Gw
zbVzi%((cDQ4VY<3WZc!XQcr*hD$1qvj1Ze<X9t6Xx}+O(e4qMgxB>HL7^sthS4CuK
zaZA{m(cx$7Yz;M*K6y5C)w0Q7dW~SgmPAcGhD9nLJ0=p*_Oeia0@(UZ26gUhGd9Oi
LE~h=N4Nm13_vKD_

diff --git a/root/data/art/scenery/sensmin0.FRM b/root/data/art/scenery/sensmin0.FRM
deleted file mode 100644
index 5e5c833a8e36417296c9f122312929795c1601e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmbV_Q4WGI42DbMgCHA;#z*lcaDpx&CLX|WSCU589YLW7aUBxgc<_5@m#_Uh0N8<&
zrMi^;^4RLx1CDTt(fiice>0m{v))<~v0(^dmPCso5>;WKBJC7Zmb1aA6v9zv^F|5^
zp%YFihe!&dBQ;%j^M3UHg0<`WDGCT&b2Tvw_uP*z8e^DkMW%93JMnA=^!Yh|4W+wA
i(*mG59Gu7`@eX{T(eIQt&LSPG3fiV=lK!={q2&u0Xjcya

diff --git a/root/data/art/scenery/sensmin1.FRM b/root/data/art/scenery/sensmin1.FRM
deleted file mode 100644
index a3e7876102986a16122db6f64073ed5c1f079e13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmbV{O=`nH4254HgogPsv~&}Ka}%E+8kjD6fa06vMD7uqg}}5{$O$rX4pP|=vJ13t
z@gzP;NCL3Lq{Zwvd%7i$;^G6(c(Kv<M_vD`@#eGJ#{2Bx`Rj1#m`iT5;hal3*Ijp9
zmBK(l1NK&;ODWlVnTRLWQ#2{57-<kLL^=aXwLpy|G7XcZ-bjW<@0=rcdlz;+6mKfE
uRHMjMT4_gBAOw+E^`T1NaRx@1hV|?Ehke?~d^ZK>Y|D5}ZF_&@kJ&E;Jx{&>

diff --git a/root/data/proto/scenery/_trap_s1.pro b/root/data/proto/scenery/_trap_br.pro
similarity index 100%
rename from root/data/proto/scenery/_trap_s1.pro
rename to 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
deleted file mode 100644
index e6768a5154281ecd5b83dae4dc728adb74453528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45
pcmZQ#;8bE@EUsZ<;0$7bf&~l>5)2HQ4F7=uD8vfH>;`9m005s|3Pb<^

diff --git a/root/data/proto/scenery/_trap_m0.pro b/root/data/proto/scenery/_trap_mi.pro
similarity index 100%
rename from root/data/proto/scenery/_trap_m0.pro
rename to 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
deleted file mode 100644
index 509086989c526c8a7e240fa0fd6fc8a1939e9d17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45
pcmZQ#;8bB?EUsZ<;0$4af&~l>5)2HQ4F7=uD8vfH>;`9m005u$3P=C|

diff --git a/root/data/proto/scenery/_trap_p0.pro b/root/data/proto/scenery/_trap_sn.pro
similarity index 100%
rename from root/data/proto/scenery/_trap_p0.pro
rename to root/data/proto/scenery/_trap_sn.pro
diff --git a/root/data/proto/scenery/_trap_s0.pro b/root/data/proto/scenery/_trap_sp.pro
similarity index 100%
rename from root/data/proto/scenery/_trap_s0.pro
rename to root/data/proto/scenery/_trap_sp.pro
diff --git a/root/data/proto/scenery/scenery.lst b/root/data/proto/scenery/scenery.lst
index 3af59b4..670b138 100644
--- 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
\ No newline at end of file
+_trap_sp.pro
+_trap_br.pro
+_trap_mi.pro
+_trap_mi.pro
+_trap_sn.pro
+_trap_sn.pro
\ No newline at end of file