From: Dmitry D. Chernov Date: Thu, 9 Nov 2023 13:25:52 +0000 (+1000) Subject: Standart: Make D2DTEXTURES more compatible with the original Doom2D X-Git-Url: http://deadsoftware.ru/gitweb?p=DF-Res.git;a=commitdiff_plain;h=ae7c793b5bd01a2a54636121b7b15f046b2647ae Standart: Make D2DTEXTURES more compatible with the original Doom2D In Doom2D, if the texture of a tile is not the first frame of an animated sequence, then such a tile will not be animated. This was seen as something that could be fixed, so in D2DTEXTURES all similar textures were made into animations. However, several things were not taken into account: - all these animations did not start from the frame that would correspond to the original texture, but always from the first; - some of these textures were opaque and "seamless", which means they could be intentionally used as static ones. This commit fixes these shortcomings. In addition, shifted animations now allow you to create a less discrete and repeating design (which is especially noticeable when such textures are located several next to each other). --- diff --git a/StandartWAD/D2DTEXTURES/COL5A0.lst b/StandartWAD/D2DTEXTURES/COL5A0.lst index 57d8f88..6a8b4cc 100644 --- a/StandartWAD/D2DTEXTURES/COL5A0.lst +++ b/StandartWAD/D2DTEXTURES/COL5A0.lst @@ -1,4 +1,4 @@ :TEXT COL5A0\TEXT\ANIM.txt|ANIM :TEXTURES -COL5A0\TEXTURES\COL5.tga|COL5 +COL5A0\TEXTURES\COL5A.tga|COL5A diff --git a/StandartWAD/D2DTEXTURES/COL5A0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/COL5A0/TEXT/ANIM.txt index e8a0a82..7c87c50 100644 --- a/StandartWAD/D2DTEXTURES/COL5A0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/COL5A0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=COL5 +resource=COL5A framecount=2 framewidth=64 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/COL5A0/TEXTURES/COL5.tga b/StandartWAD/D2DTEXTURES/COL5A0/TEXTURES/COL5A.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/COL5A0/TEXTURES/COL5.tga rename to StandartWAD/D2DTEXTURES/COL5A0/TEXTURES/COL5A.tga diff --git a/StandartWAD/D2DTEXTURES/COL5B0.lst b/StandartWAD/D2DTEXTURES/COL5B0.lst index 6372679..956a97b 100644 --- a/StandartWAD/D2DTEXTURES/COL5B0.lst +++ b/StandartWAD/D2DTEXTURES/COL5B0.lst @@ -1,4 +1,4 @@ :TEXT COL5B0\TEXT\ANIM.txt|ANIM :TEXTURES -COL5B0\TEXTURES\COL5.tga|COL5 +COL5B0\TEXTURES\COL5B.tga|COL5B diff --git a/StandartWAD/D2DTEXTURES/COL5B0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/COL5B0/TEXT/ANIM.txt index e8a0a82..da97387 100644 --- a/StandartWAD/D2DTEXTURES/COL5B0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/COL5B0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=COL5 +resource=COL5B framecount=2 framewidth=64 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5.tga b/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5.tga deleted file mode 100644 index 9b8703b..0000000 Binary files a/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5B.tga b/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5B.tga new file mode 100644 index 0000000..10c65f6 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/COL5B0/TEXTURES/COL5B.tga differ diff --git a/StandartWAD/D2DTEXTURES/FCANA0.lst b/StandartWAD/D2DTEXTURES/FCANA0.lst index ad92102..58a82ae 100644 --- a/StandartWAD/D2DTEXTURES/FCANA0.lst +++ b/StandartWAD/D2DTEXTURES/FCANA0.lst @@ -1,4 +1,4 @@ :TEXT FCANA0\TEXT\ANIM.txt|ANIM :TEXTURES -FCANA0\TEXTURES\FCAN.tga|FCAN +FCANA0\TEXTURES\FCANA.tga|FCANA diff --git a/StandartWAD/D2DTEXTURES/FCANA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/FCANA0/TEXT/ANIM.txt index ac31933..71aa53e 100644 --- a/StandartWAD/D2DTEXTURES/FCANA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/FCANA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=FCAN +resource=FCANA framecount=3 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/FCANA0/TEXTURES/FCAN.tga b/StandartWAD/D2DTEXTURES/FCANA0/TEXTURES/FCANA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/FCANA0/TEXTURES/FCAN.tga rename to StandartWAD/D2DTEXTURES/FCANA0/TEXTURES/FCANA.tga diff --git a/StandartWAD/D2DTEXTURES/FCANB0.lst b/StandartWAD/D2DTEXTURES/FCANB0.lst index 644e9ef..fc5f617 100644 --- a/StandartWAD/D2DTEXTURES/FCANB0.lst +++ b/StandartWAD/D2DTEXTURES/FCANB0.lst @@ -1,4 +1,4 @@ :TEXT FCANB0\TEXT\ANIM.txt|ANIM :TEXTURES -FCANB0\TEXTURES\FCAN.tga|FCAN +FCANB0\TEXTURES\FCANB.tga|FCANB diff --git a/StandartWAD/D2DTEXTURES/FCANB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/FCANB0/TEXT/ANIM.txt index ac31933..b499355 100644 --- a/StandartWAD/D2DTEXTURES/FCANB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/FCANB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=FCAN +resource=FCANB framecount=3 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCAN.tga b/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCAN.tga deleted file mode 100644 index 3ed0748..0000000 Binary files a/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCAN.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCANB.tga b/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCANB.tga new file mode 100644 index 0000000..8675a40 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/FCANB0/TEXTURES/FCANB.tga differ diff --git a/StandartWAD/D2DTEXTURES/FCANC0.lst b/StandartWAD/D2DTEXTURES/FCANC0.lst index b92afd2..8a22c92 100644 --- a/StandartWAD/D2DTEXTURES/FCANC0.lst +++ b/StandartWAD/D2DTEXTURES/FCANC0.lst @@ -1,4 +1,4 @@ :TEXT FCANC0\TEXT\ANIM.txt|ANIM :TEXTURES -FCANC0\TEXTURES\FCAN.tga|FCAN +FCANC0\TEXTURES\FCANC.tga|FCANC diff --git a/StandartWAD/D2DTEXTURES/FCANC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/FCANC0/TEXT/ANIM.txt index ac31933..43d2df9 100644 --- a/StandartWAD/D2DTEXTURES/FCANC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/FCANC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=FCAN +resource=FCANC framecount=3 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCAN.tga b/StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCANC.tga similarity index 50% rename from StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCAN.tga rename to StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCANC.tga index 3ed0748..1ee2a31 100644 Binary files a/StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCAN.tga and b/StandartWAD/D2DTEXTURES/FCANC0/TEXTURES/FCANC.tga differ diff --git a/StandartWAD/D2DTEXTURES/GOR1A0.lst b/StandartWAD/D2DTEXTURES/GOR1A0.lst index d3890db..bb335cc 100644 --- a/StandartWAD/D2DTEXTURES/GOR1A0.lst +++ b/StandartWAD/D2DTEXTURES/GOR1A0.lst @@ -1,4 +1,4 @@ :TEXT GOR1A0\TEXT\ANIM.txt|ANIM :TEXTURES -GOR1A0\TEXTURES\GOR1.tga|GOR1 +GOR1A0\TEXTURES\GOR1A.tga|GOR1A diff --git a/StandartWAD/D2DTEXTURES/GOR1A0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/GOR1A0/TEXT/ANIM.txt index 11d39b8..4fb654d 100644 --- a/StandartWAD/D2DTEXTURES/GOR1A0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/GOR1A0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=GOR1 +resource=GOR1A framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/GOR1A0/TEXTURES/GOR1.tga b/StandartWAD/D2DTEXTURES/GOR1A0/TEXTURES/GOR1A.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/GOR1A0/TEXTURES/GOR1.tga rename to StandartWAD/D2DTEXTURES/GOR1A0/TEXTURES/GOR1A.tga diff --git a/StandartWAD/D2DTEXTURES/GOR1B0.lst b/StandartWAD/D2DTEXTURES/GOR1B0.lst index d83997e..058c842 100644 --- a/StandartWAD/D2DTEXTURES/GOR1B0.lst +++ b/StandartWAD/D2DTEXTURES/GOR1B0.lst @@ -1,4 +1,4 @@ :TEXT GOR1B0\TEXT\ANIM.txt|ANIM :TEXTURES -GOR1B0\TEXTURES\GOR1.tga|GOR1 +GOR1B0\TEXTURES\GOR1B.tga|GOR1B diff --git a/StandartWAD/D2DTEXTURES/GOR1B0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/GOR1B0/TEXT/ANIM.txt index 11d39b8..e68a4ab 100644 --- a/StandartWAD/D2DTEXTURES/GOR1B0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/GOR1B0/TEXT/ANIM.txt @@ -1,6 +1,6 @@ -resource=GOR1 -framecount=4 +resource=GOR1B +framecount=3 framewidth=32 frameheight=64 waitcount=8 -backanimation=0 \ No newline at end of file +backanimation=1 \ No newline at end of file diff --git a/StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1.tga b/StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1B.tga similarity index 62% rename from StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1.tga rename to StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1B.tga index 25f4f96..aa2a2b4 100644 Binary files a/StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1.tga and b/StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1B.tga differ diff --git a/StandartWAD/D2DTEXTURES/GOR1C0.lst b/StandartWAD/D2DTEXTURES/GOR1C0.lst index 2dabd7d..6aea74f 100644 --- a/StandartWAD/D2DTEXTURES/GOR1C0.lst +++ b/StandartWAD/D2DTEXTURES/GOR1C0.lst @@ -1,4 +1,4 @@ :TEXT GOR1C0\TEXT\ANIM.txt|ANIM :TEXTURES -GOR1C0\TEXTURES\GOR1.tga|GOR1 +GOR1C0\TEXTURES\GOR1C.tga|GOR1C diff --git a/StandartWAD/D2DTEXTURES/GOR1C0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/GOR1C0/TEXT/ANIM.txt index 11d39b8..9283690 100644 --- a/StandartWAD/D2DTEXTURES/GOR1C0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/GOR1C0/TEXT/ANIM.txt @@ -1,6 +1,6 @@ -resource=GOR1 -framecount=4 +resource=GOR1C +framecount=3 framewidth=32 frameheight=64 waitcount=8 -backanimation=0 \ No newline at end of file +backanimation=1 \ No newline at end of file diff --git a/StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1.tga b/StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1C.tga similarity index 59% rename from StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1.tga rename to StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1C.tga index 25f4f96..62ff232 100644 Binary files a/StandartWAD/D2DTEXTURES/GOR1B0/TEXTURES/GOR1.tga and b/StandartWAD/D2DTEXTURES/GOR1C0/TEXTURES/GOR1C.tga differ diff --git a/StandartWAD/D2DTEXTURES/POL3A0.lst b/StandartWAD/D2DTEXTURES/POL3A0.lst index af4cad2..8906d48 100644 --- a/StandartWAD/D2DTEXTURES/POL3A0.lst +++ b/StandartWAD/D2DTEXTURES/POL3A0.lst @@ -1,4 +1,4 @@ :TEXT POL3A0\TEXT\ANIM.txt|ANIM :TEXTURES -POL3A0\TEXTURES\POL3.tga|POL3 +POL3A0\TEXTURES\POL3A.tga|POL3A diff --git a/StandartWAD/D2DTEXTURES/POL3A0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/POL3A0/TEXT/ANIM.txt index 81cd1c1..0a4fdb6 100644 --- a/StandartWAD/D2DTEXTURES/POL3A0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/POL3A0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=POL3 +resource=POL3A framecount=2 framewidth=64 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/POL3A0/TEXTURES/POL3.tga b/StandartWAD/D2DTEXTURES/POL3A0/TEXTURES/POL3A.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/POL3A0/TEXTURES/POL3.tga rename to StandartWAD/D2DTEXTURES/POL3A0/TEXTURES/POL3A.tga diff --git a/StandartWAD/D2DTEXTURES/POL3B0.lst b/StandartWAD/D2DTEXTURES/POL3B0.lst index cab6f40..a78e1de 100644 --- a/StandartWAD/D2DTEXTURES/POL3B0.lst +++ b/StandartWAD/D2DTEXTURES/POL3B0.lst @@ -1,4 +1,4 @@ :TEXT POL3B0\TEXT\ANIM.txt|ANIM :TEXTURES -POL3B0\TEXTURES\POL3.tga|POL3 +POL3B0\TEXTURES\POL3B.tga|POL3B diff --git a/StandartWAD/D2DTEXTURES/POL3B0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/POL3B0/TEXT/ANIM.txt index 81cd1c1..88aa740 100644 --- a/StandartWAD/D2DTEXTURES/POL3B0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/POL3B0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=POL3 +resource=POL3B framecount=2 framewidth=64 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3.tga b/StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3B.tga similarity index 99% rename from StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3.tga rename to StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3B.tga index 78847c7..8967431 100644 Binary files a/StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3.tga and b/StandartWAD/D2DTEXTURES/POL3B0/TEXTURES/POL3B.tga differ diff --git a/StandartWAD/D2DTEXTURES/POL6A0.lst b/StandartWAD/D2DTEXTURES/POL6A0.lst index c6accf4..358816a 100644 --- a/StandartWAD/D2DTEXTURES/POL6A0.lst +++ b/StandartWAD/D2DTEXTURES/POL6A0.lst @@ -1,4 +1,4 @@ :TEXT POL6A0\TEXT\ANIM.txt|ANIM :TEXTURES -POL6A0\TEXTURES\POL6.tga|POL6 +POL6A0\TEXTURES\POL6A.tga|POL6A diff --git a/StandartWAD/D2DTEXTURES/POL6A0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/POL6A0/TEXT/ANIM.txt index 185351c..7b404eb 100644 --- a/StandartWAD/D2DTEXTURES/POL6A0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/POL6A0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=POL6 +resource=POL6A framecount=2 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/POL6A0/TEXTURES/POL6.tga b/StandartWAD/D2DTEXTURES/POL6A0/TEXTURES/POL6A.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/POL6A0/TEXTURES/POL6.tga rename to StandartWAD/D2DTEXTURES/POL6A0/TEXTURES/POL6A.tga diff --git a/StandartWAD/D2DTEXTURES/POL6B0.lst b/StandartWAD/D2DTEXTURES/POL6B0.lst index 7f16819..2060bd9 100644 --- a/StandartWAD/D2DTEXTURES/POL6B0.lst +++ b/StandartWAD/D2DTEXTURES/POL6B0.lst @@ -1,4 +1,4 @@ :TEXT POL6B0\TEXT\ANIM.txt|ANIM :TEXTURES -POL6B0\TEXTURES\POL6.tga|POL6 +POL6B0\TEXTURES\POL6B.tga|POL6B diff --git a/StandartWAD/D2DTEXTURES/POL6B0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/POL6B0/TEXT/ANIM.txt index 185351c..d515fdf 100644 --- a/StandartWAD/D2DTEXTURES/POL6B0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/POL6B0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=POL6 +resource=POL6B framecount=2 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6.tga b/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6.tga deleted file mode 100644 index 02f8807..0000000 Binary files a/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6B.tga b/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6B.tga new file mode 100644 index 0000000..15254ea Binary files /dev/null and b/StandartWAD/D2DTEXTURES/POL6B0/TEXTURES/POL6B.tga differ diff --git a/StandartWAD/D2DTEXTURES/RP2_1.lst b/StandartWAD/D2DTEXTURES/RP2_1.lst index 1df5f1e..32ec8bd 100644 --- a/StandartWAD/D2DTEXTURES/RP2_1.lst +++ b/StandartWAD/D2DTEXTURES/RP2_1.lst @@ -1,4 +1,4 @@ :TEXT RP2_1\TEXT\ANIM.txt|ANIM :TEXTURES -RP2_1\TEXTURES\RP2_.tga|RP2_ +RP2_1\TEXTURES\RP2_1.tga|RP2_1 diff --git a/StandartWAD/D2DTEXTURES/RP2_1/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/RP2_1/TEXT/ANIM.txt index 7e60617..ac6f667 100644 --- a/StandartWAD/D2DTEXTURES/RP2_1/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/RP2_1/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=RP2_ +resource=RP2_1 framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/RP2_1/TEXTURES/RP2_.tga b/StandartWAD/D2DTEXTURES/RP2_1/TEXTURES/RP2_1.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/RP2_1/TEXTURES/RP2_.tga rename to StandartWAD/D2DTEXTURES/RP2_1/TEXTURES/RP2_1.tga diff --git a/StandartWAD/D2DTEXTURES/RP2_2.lst b/StandartWAD/D2DTEXTURES/RP2_2.lst index 5276461..09b7fd4 100644 --- a/StandartWAD/D2DTEXTURES/RP2_2.lst +++ b/StandartWAD/D2DTEXTURES/RP2_2.lst @@ -1,4 +1,4 @@ :TEXT RP2_2\TEXT\ANIM.txt|ANIM :TEXTURES -RP2_2\TEXTURES\RP2_.tga|RP2_ +RP2_2\TEXTURES\RP2_2.tga|RP2_2 diff --git a/StandartWAD/D2DTEXTURES/RP2_2/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/RP2_2/TEXT/ANIM.txt index 7e60617..c7555c5 100644 --- a/StandartWAD/D2DTEXTURES/RP2_2/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/RP2_2/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=RP2_ +resource=RP2_2 framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_.tga b/StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_2.tga similarity index 72% rename from StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_.tga rename to StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_2.tga index 2fff258..0afe8b6 100644 Binary files a/StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_.tga and b/StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_2.tga differ diff --git a/StandartWAD/D2DTEXTURES/RP2_3.lst b/StandartWAD/D2DTEXTURES/RP2_3.lst index 14e2e1d..c73669f 100644 --- a/StandartWAD/D2DTEXTURES/RP2_3.lst +++ b/StandartWAD/D2DTEXTURES/RP2_3.lst @@ -1,4 +1,4 @@ :TEXT RP2_3\TEXT\ANIM.txt|ANIM :TEXTURES -RP2_3\TEXTURES\RP2_.tga|RP2_ +RP2_3\TEXTURES\RP2_3.tga|RP2_3 diff --git a/StandartWAD/D2DTEXTURES/RP2_3/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/RP2_3/TEXT/ANIM.txt index 7e60617..9a6a71b 100644 --- a/StandartWAD/D2DTEXTURES/RP2_3/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/RP2_3/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=RP2_ +resource=RP2_3 framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_.tga b/StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_3.tga similarity index 95% rename from StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_.tga rename to StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_3.tga index 2fff258..217d8da 100644 Binary files a/StandartWAD/D2DTEXTURES/RP2_2/TEXTURES/RP2_.tga and b/StandartWAD/D2DTEXTURES/RP2_3/TEXTURES/RP2_3.tga differ diff --git a/StandartWAD/D2DTEXTURES/RP2_4.lst b/StandartWAD/D2DTEXTURES/RP2_4.lst index 91dc4fa..6072970 100644 --- a/StandartWAD/D2DTEXTURES/RP2_4.lst +++ b/StandartWAD/D2DTEXTURES/RP2_4.lst @@ -1,4 +1,4 @@ :TEXT RP2_4\TEXT\ANIM.txt|ANIM :TEXTURES -RP2_4\TEXTURES\RP2_.tga|RP2_ +RP2_4\TEXTURES\RP2_4.tga|RP2_4 diff --git a/StandartWAD/D2DTEXTURES/RP2_4/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/RP2_4/TEXT/ANIM.txt index 7e60617..ad78c56 100644 --- a/StandartWAD/D2DTEXTURES/RP2_4/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/RP2_4/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=RP2_ +resource=RP2_4 framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_.tga b/StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_4.tga similarity index 71% rename from StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_.tga rename to StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_4.tga index 2fff258..28f4bc8 100644 Binary files a/StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_.tga and b/StandartWAD/D2DTEXTURES/RP2_4/TEXTURES/RP2_4.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMBTA0.lst b/StandartWAD/D2DTEXTURES/SMBTA0.lst index 7f1fde3..292a779 100644 --- a/StandartWAD/D2DTEXTURES/SMBTA0.lst +++ b/StandartWAD/D2DTEXTURES/SMBTA0.lst @@ -1,4 +1,4 @@ :TEXT SMBTA0\TEXT\ANIM.txt|ANIM :TEXTURES -SMBTA0\TEXTURES\SMBT.tga|SMBT +SMBTA0\TEXTURES\SMBTA.tga|SMBTA diff --git a/StandartWAD/D2DTEXTURES/SMBTA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMBTA0/TEXT/ANIM.txt index 8a77bfb..aa05155 100644 --- a/StandartWAD/D2DTEXTURES/SMBTA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMBTA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMBT +resource=SMBTA framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMBTA0/TEXTURES/SMBT.tga b/StandartWAD/D2DTEXTURES/SMBTA0/TEXTURES/SMBTA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/SMBTA0/TEXTURES/SMBT.tga rename to StandartWAD/D2DTEXTURES/SMBTA0/TEXTURES/SMBTA.tga diff --git a/StandartWAD/D2DTEXTURES/SMBTB0.lst b/StandartWAD/D2DTEXTURES/SMBTB0.lst index f9b0b4c..c557e34 100644 --- a/StandartWAD/D2DTEXTURES/SMBTB0.lst +++ b/StandartWAD/D2DTEXTURES/SMBTB0.lst @@ -1,4 +1,4 @@ :TEXT SMBTB0\TEXT\ANIM.txt|ANIM :TEXTURES -SMBTB0\TEXTURES\SMBT.tga|SMBT +SMBTB0\TEXTURES\SMBTB.tga|SMBTB diff --git a/StandartWAD/D2DTEXTURES/SMBTB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMBTB0/TEXT/ANIM.txt index 8a77bfb..5eef0eb 100644 --- a/StandartWAD/D2DTEXTURES/SMBTB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMBTB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMBT +resource=SMBTB framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBT.tga b/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBT.tga deleted file mode 100644 index 0dbd973..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBTB.tga b/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBTB.tga new file mode 100644 index 0000000..b0dff02 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMBTB0/TEXTURES/SMBTB.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMBTC0.lst b/StandartWAD/D2DTEXTURES/SMBTC0.lst index a5b0dd6..7f732d2 100644 --- a/StandartWAD/D2DTEXTURES/SMBTC0.lst +++ b/StandartWAD/D2DTEXTURES/SMBTC0.lst @@ -1,4 +1,4 @@ :TEXT SMBTC0\TEXT\ANIM.txt|ANIM :TEXTURES -SMBTC0\TEXTURES\SMBT.tga|SMBT +SMBTC0\TEXTURES\SMBTC.tga|SMBTC diff --git a/StandartWAD/D2DTEXTURES/SMBTC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMBTC0/TEXT/ANIM.txt index 8a77bfb..2fe6b61 100644 --- a/StandartWAD/D2DTEXTURES/SMBTC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMBTC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMBT +resource=SMBTC framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBT.tga b/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBT.tga deleted file mode 100644 index 0dbd973..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBTC.tga b/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBTC.tga new file mode 100644 index 0000000..34ff8ac Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMBTC0/TEXTURES/SMBTC.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMBTD0.lst b/StandartWAD/D2DTEXTURES/SMBTD0.lst index a54379d..451efb2 100644 --- a/StandartWAD/D2DTEXTURES/SMBTD0.lst +++ b/StandartWAD/D2DTEXTURES/SMBTD0.lst @@ -1,4 +1,4 @@ :TEXT SMBTD0\TEXT\ANIM.txt|ANIM :TEXTURES -SMBTD0\TEXTURES\SMBT.tga|SMBT +SMBTD0\TEXTURES\SMBTD.tga|SMBTD diff --git a/StandartWAD/D2DTEXTURES/SMBTD0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMBTD0/TEXT/ANIM.txt index 8a77bfb..f51182a 100644 --- a/StandartWAD/D2DTEXTURES/SMBTD0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMBTD0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMBT +resource=SMBTD framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBT.tga b/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBT.tga deleted file mode 100644 index 0dbd973..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBTD.tga b/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBTD.tga new file mode 100644 index 0000000..fd6ed79 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMBTD0/TEXTURES/SMBTD.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMGTA0.lst b/StandartWAD/D2DTEXTURES/SMGTA0.lst index 52915dc..f555d7f 100644 --- a/StandartWAD/D2DTEXTURES/SMGTA0.lst +++ b/StandartWAD/D2DTEXTURES/SMGTA0.lst @@ -1,4 +1,4 @@ :TEXT SMGTA0\TEXT\ANIM.txt|ANIM :TEXTURES -SMGTA0\TEXTURES\SMGT.tga|SMGT +SMGTA0\TEXTURES\SMGTA.tga|SMGTA diff --git a/StandartWAD/D2DTEXTURES/SMGTA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMGTA0/TEXT/ANIM.txt index f7a137e..9c2014a 100644 --- a/StandartWAD/D2DTEXTURES/SMGTA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMGTA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMGT +resource=SMGTA framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMGTA0/TEXTURES/SMGT.tga b/StandartWAD/D2DTEXTURES/SMGTA0/TEXTURES/SMGTA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/SMGTA0/TEXTURES/SMGT.tga rename to StandartWAD/D2DTEXTURES/SMGTA0/TEXTURES/SMGTA.tga diff --git a/StandartWAD/D2DTEXTURES/SMGTB0.lst b/StandartWAD/D2DTEXTURES/SMGTB0.lst index 806ae1d..2c3be7d 100644 --- a/StandartWAD/D2DTEXTURES/SMGTB0.lst +++ b/StandartWAD/D2DTEXTURES/SMGTB0.lst @@ -1,4 +1,4 @@ :TEXT SMGTB0\TEXT\ANIM.txt|ANIM :TEXTURES -SMGTB0\TEXTURES\SMGT.tga|SMGT +SMGTB0\TEXTURES\SMGTB.tga|SMGTB diff --git a/StandartWAD/D2DTEXTURES/SMGTB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMGTB0/TEXT/ANIM.txt index f7a137e..8bf88ca 100644 --- a/StandartWAD/D2DTEXTURES/SMGTB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMGTB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMGT +resource=SMGTB framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGT.tga b/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGT.tga deleted file mode 100644 index 00013bb..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGTB.tga b/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGTB.tga new file mode 100644 index 0000000..8778f51 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMGTB0/TEXTURES/SMGTB.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMGTC0.lst b/StandartWAD/D2DTEXTURES/SMGTC0.lst index bbc2046..719275d 100644 --- a/StandartWAD/D2DTEXTURES/SMGTC0.lst +++ b/StandartWAD/D2DTEXTURES/SMGTC0.lst @@ -1,4 +1,4 @@ :TEXT SMGTC0\TEXT\ANIM.txt|ANIM :TEXTURES -SMGTC0\TEXTURES\SMGT.tga|SMGT +SMGTC0\TEXTURES\SMGTC.tga|SMGTC diff --git a/StandartWAD/D2DTEXTURES/SMGTC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMGTC0/TEXT/ANIM.txt index f7a137e..b7f1037 100644 --- a/StandartWAD/D2DTEXTURES/SMGTC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMGTC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMGT +resource=SMGTC framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGT.tga b/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGT.tga deleted file mode 100644 index 00013bb..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGTC.tga b/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGTC.tga new file mode 100644 index 0000000..4444b03 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMGTC0/TEXTURES/SMGTC.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMGTD0.lst b/StandartWAD/D2DTEXTURES/SMGTD0.lst index ce6ebbd..47b90a1 100644 --- a/StandartWAD/D2DTEXTURES/SMGTD0.lst +++ b/StandartWAD/D2DTEXTURES/SMGTD0.lst @@ -1,4 +1,4 @@ :TEXT SMGTD0\TEXT\ANIM.txt|ANIM :TEXTURES -SMGTD0\TEXTURES\SMGT.tga|SMGT +SMGTD0\TEXTURES\SMGTD.tga|SMGTD diff --git a/StandartWAD/D2DTEXTURES/SMGTD0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMGTD0/TEXT/ANIM.txt index f7a137e..9a6d150 100644 --- a/StandartWAD/D2DTEXTURES/SMGTD0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMGTD0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMGT +resource=SMGTD framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGT.tga b/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGT.tga deleted file mode 100644 index 00013bb..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGTD.tga b/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGTD.tga new file mode 100644 index 0000000..8631b0f Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMGTD0/TEXTURES/SMGTD.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMRTA0.lst b/StandartWAD/D2DTEXTURES/SMRTA0.lst index c53c269..e51815b 100644 --- a/StandartWAD/D2DTEXTURES/SMRTA0.lst +++ b/StandartWAD/D2DTEXTURES/SMRTA0.lst @@ -1,4 +1,4 @@ :TEXT SMRTA0\TEXT\ANIM.txt|ANIM :TEXTURES -SMRTA0\TEXTURES\SMRT.tga|SMRT +SMRTA0\TEXTURES\SMRTA.tga|SMRTA diff --git a/StandartWAD/D2DTEXTURES/SMRTA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMRTA0/TEXT/ANIM.txt index 3d39d3f..a19a86e 100644 --- a/StandartWAD/D2DTEXTURES/SMRTA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMRTA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMRT +resource=SMRTA framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMRTA0/TEXTURES/SMRT.tga b/StandartWAD/D2DTEXTURES/SMRTA0/TEXTURES/SMRTA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/SMRTA0/TEXTURES/SMRT.tga rename to StandartWAD/D2DTEXTURES/SMRTA0/TEXTURES/SMRTA.tga diff --git a/StandartWAD/D2DTEXTURES/SMRTB0.lst b/StandartWAD/D2DTEXTURES/SMRTB0.lst index 712a2ba..3d684a8 100644 --- a/StandartWAD/D2DTEXTURES/SMRTB0.lst +++ b/StandartWAD/D2DTEXTURES/SMRTB0.lst @@ -1,4 +1,4 @@ :TEXT SMRTB0\TEXT\ANIM.txt|ANIM :TEXTURES -SMRTB0\TEXTURES\SMRT.tga|SMRT +SMRTB0\TEXTURES\SMRTB.tga|SMRTB diff --git a/StandartWAD/D2DTEXTURES/SMRTB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMRTB0/TEXT/ANIM.txt index 3d39d3f..d39b661 100644 --- a/StandartWAD/D2DTEXTURES/SMRTB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMRTB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMRT +resource=SMRTB framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRT.tga b/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRT.tga deleted file mode 100644 index 89d3621..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRTB.tga b/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRTB.tga new file mode 100644 index 0000000..8bfab38 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMRTB0/TEXTURES/SMRTB.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMRTC0.lst b/StandartWAD/D2DTEXTURES/SMRTC0.lst index 8b9da8d..212d253 100644 --- a/StandartWAD/D2DTEXTURES/SMRTC0.lst +++ b/StandartWAD/D2DTEXTURES/SMRTC0.lst @@ -1,4 +1,4 @@ :TEXT SMRTC0\TEXT\ANIM.txt|ANIM :TEXTURES -SMRTC0\TEXTURES\SMRT.tga|SMRT +SMRTC0\TEXTURES\SMRTC.tga|SMRTC diff --git a/StandartWAD/D2DTEXTURES/SMRTC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMRTC0/TEXT/ANIM.txt index 3d39d3f..37f6f33 100644 --- a/StandartWAD/D2DTEXTURES/SMRTC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMRTC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMRT +resource=SMRTC framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRT.tga b/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRT.tga deleted file mode 100644 index 89d3621..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRTC.tga b/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRTC.tga new file mode 100644 index 0000000..377f48f Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMRTC0/TEXTURES/SMRTC.tga differ diff --git a/StandartWAD/D2DTEXTURES/SMRTD0.lst b/StandartWAD/D2DTEXTURES/SMRTD0.lst index 7fb8680..0378e9a 100644 --- a/StandartWAD/D2DTEXTURES/SMRTD0.lst +++ b/StandartWAD/D2DTEXTURES/SMRTD0.lst @@ -1,4 +1,4 @@ :TEXT SMRTD0\TEXT\ANIM.txt|ANIM :TEXTURES -SMRTD0\TEXTURES\SMRT.tga|SMRT +SMRTD0\TEXTURES\SMRTD.tga|SMRTD diff --git a/StandartWAD/D2DTEXTURES/SMRTD0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/SMRTD0/TEXT/ANIM.txt index 3d39d3f..5c262e3 100644 --- a/StandartWAD/D2DTEXTURES/SMRTD0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/SMRTD0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=SMRT +resource=SMRTD framecount=4 framewidth=32 frameheight=64 diff --git a/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRT.tga b/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRT.tga deleted file mode 100644 index 89d3621..0000000 Binary files a/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRT.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRTD.tga b/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRTD.tga new file mode 100644 index 0000000..325ab7a Binary files /dev/null and b/StandartWAD/D2DTEXTURES/SMRTD0/TEXTURES/SMRTD.tga differ diff --git a/StandartWAD/D2DTEXTURES/TBLUA0.lst b/StandartWAD/D2DTEXTURES/TBLUA0.lst index d0a4dcc..7b4aad0 100644 --- a/StandartWAD/D2DTEXTURES/TBLUA0.lst +++ b/StandartWAD/D2DTEXTURES/TBLUA0.lst @@ -1,4 +1,4 @@ :TEXT TBLUA0\TEXT\ANIM.txt|ANIM :TEXTURES -TBLUA0\TEXTURES\TBLU.tga|TBLU +TBLUA0\TEXTURES\TBLUA.tga|TBLUA diff --git a/StandartWAD/D2DTEXTURES/TBLUA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TBLUA0/TEXT/ANIM.txt index de7d175..b2fc714 100644 --- a/StandartWAD/D2DTEXTURES/TBLUA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TBLUA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TBLU +resource=TBLUA framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TBLUA0/TEXTURES/TBLU.tga b/StandartWAD/D2DTEXTURES/TBLUA0/TEXTURES/TBLUA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/TBLUA0/TEXTURES/TBLU.tga rename to StandartWAD/D2DTEXTURES/TBLUA0/TEXTURES/TBLUA.tga diff --git a/StandartWAD/D2DTEXTURES/TBLUB0.lst b/StandartWAD/D2DTEXTURES/TBLUB0.lst index 61d20a4..e6337e2 100644 --- a/StandartWAD/D2DTEXTURES/TBLUB0.lst +++ b/StandartWAD/D2DTEXTURES/TBLUB0.lst @@ -1,4 +1,4 @@ :TEXT TBLUB0\TEXT\ANIM.txt|ANIM :TEXTURES -TBLUB0\TEXTURES\TBLU.tga|TBLU +TBLUB0\TEXTURES\TBLUB.tga|TBLUB diff --git a/StandartWAD/D2DTEXTURES/TBLUB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TBLUB0/TEXT/ANIM.txt index de7d175..71527c7 100644 --- a/StandartWAD/D2DTEXTURES/TBLUB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TBLUB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TBLU +resource=TBLUB framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLU.tga b/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLU.tga deleted file mode 100644 index 8f8e145..0000000 Binary files a/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLU.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLUB.tga b/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLUB.tga new file mode 100644 index 0000000..89a16a0 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TBLUB0/TEXTURES/TBLUB.tga differ diff --git a/StandartWAD/D2DTEXTURES/TBLUC0.lst b/StandartWAD/D2DTEXTURES/TBLUC0.lst index b878e72..44d5b74 100644 --- a/StandartWAD/D2DTEXTURES/TBLUC0.lst +++ b/StandartWAD/D2DTEXTURES/TBLUC0.lst @@ -1,4 +1,4 @@ :TEXT TBLUC0\TEXT\ANIM.txt|ANIM :TEXTURES -TBLUC0\TEXTURES\TBLU.tga|TBLU +TBLUC0\TEXTURES\TBLUC.tga|TBLUC diff --git a/StandartWAD/D2DTEXTURES/TBLUC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TBLUC0/TEXT/ANIM.txt index de7d175..cef7e4e 100644 --- a/StandartWAD/D2DTEXTURES/TBLUC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TBLUC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TBLU +resource=TBLUC framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLU.tga b/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLU.tga deleted file mode 100644 index 8f8e145..0000000 Binary files a/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLU.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLUC.tga b/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLUC.tga new file mode 100644 index 0000000..36ed50d Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TBLUC0/TEXTURES/TBLUC.tga differ diff --git a/StandartWAD/D2DTEXTURES/TBLUD0.lst b/StandartWAD/D2DTEXTURES/TBLUD0.lst index addc4dd..8941c98 100644 --- a/StandartWAD/D2DTEXTURES/TBLUD0.lst +++ b/StandartWAD/D2DTEXTURES/TBLUD0.lst @@ -1,4 +1,4 @@ :TEXT TBLUD0\TEXT\ANIM.txt|ANIM :TEXTURES -TBLUD0\TEXTURES\TBLU.tga|TBLU +TBLUD0\TEXTURES\TBLUD.tga|TBLUD diff --git a/StandartWAD/D2DTEXTURES/TBLUD0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TBLUD0/TEXT/ANIM.txt index de7d175..1414057 100644 --- a/StandartWAD/D2DTEXTURES/TBLUD0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TBLUD0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TBLU +resource=TBLUD framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLU.tga b/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLU.tga deleted file mode 100644 index 8f8e145..0000000 Binary files a/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLU.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLUD.tga b/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLUD.tga new file mode 100644 index 0000000..70f8132 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TBLUD0/TEXTURES/TBLUD.tga differ diff --git a/StandartWAD/D2DTEXTURES/TGRNA0.lst b/StandartWAD/D2DTEXTURES/TGRNA0.lst index 99aead7..e23aec2 100644 --- a/StandartWAD/D2DTEXTURES/TGRNA0.lst +++ b/StandartWAD/D2DTEXTURES/TGRNA0.lst @@ -1,4 +1,4 @@ :TEXT TGRNA0\TEXT\ANIM.txt|ANIM :TEXTURES -TGRNA0\TEXTURES\TGRN.tga|TGRN +TGRNA0\TEXTURES\TGRNA.tga|TGRNA diff --git a/StandartWAD/D2DTEXTURES/TGRNA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TGRNA0/TEXT/ANIM.txt index 57288da..0b36a5e 100644 --- a/StandartWAD/D2DTEXTURES/TGRNA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TGRNA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TGRN +resource=TGRNA framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TGRNA0/TEXTURES/TGRN.tga b/StandartWAD/D2DTEXTURES/TGRNA0/TEXTURES/TGRNA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/TGRNA0/TEXTURES/TGRN.tga rename to StandartWAD/D2DTEXTURES/TGRNA0/TEXTURES/TGRNA.tga diff --git a/StandartWAD/D2DTEXTURES/TGRNB0.lst b/StandartWAD/D2DTEXTURES/TGRNB0.lst index 1bdef90..fabf366 100644 --- a/StandartWAD/D2DTEXTURES/TGRNB0.lst +++ b/StandartWAD/D2DTEXTURES/TGRNB0.lst @@ -1,4 +1,4 @@ :TEXT TGRNB0\TEXT\ANIM.txt|ANIM :TEXTURES -TGRNB0\TEXTURES\TGRN.tga|TGRN +TGRNB0\TEXTURES\TGRNB.tga|TGRNB diff --git a/StandartWAD/D2DTEXTURES/TGRNB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TGRNB0/TEXT/ANIM.txt index 57288da..4c10777 100644 --- a/StandartWAD/D2DTEXTURES/TGRNB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TGRNB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TGRN +resource=TGRNB framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRN.tga b/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRN.tga deleted file mode 100644 index 95b880c..0000000 Binary files a/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRN.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRNB.tga b/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRNB.tga new file mode 100644 index 0000000..0234ff0 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TGRNB0/TEXTURES/TGRNB.tga differ diff --git a/StandartWAD/D2DTEXTURES/TGRNC0.lst b/StandartWAD/D2DTEXTURES/TGRNC0.lst index 5aee827..cc7e622 100644 --- a/StandartWAD/D2DTEXTURES/TGRNC0.lst +++ b/StandartWAD/D2DTEXTURES/TGRNC0.lst @@ -1,4 +1,4 @@ :TEXT TGRNC0\TEXT\ANIM.txt|ANIM :TEXTURES -TGRNC0\TEXTURES\TGRN.tga|TGRN +TGRNC0\TEXTURES\TGRNC.tga|TGRNC diff --git a/StandartWAD/D2DTEXTURES/TGRNC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TGRNC0/TEXT/ANIM.txt index 57288da..2c6983f 100644 --- a/StandartWAD/D2DTEXTURES/TGRNC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TGRNC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TGRN +resource=TGRNC framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRN.tga b/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRN.tga deleted file mode 100644 index 95b880c..0000000 Binary files a/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRN.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRNC.tga b/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRNC.tga new file mode 100644 index 0000000..7ecd8b1 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TGRNC0/TEXTURES/TGRNC.tga differ diff --git a/StandartWAD/D2DTEXTURES/TGRND0.lst b/StandartWAD/D2DTEXTURES/TGRND0.lst index 452a40d..878fa53 100644 --- a/StandartWAD/D2DTEXTURES/TGRND0.lst +++ b/StandartWAD/D2DTEXTURES/TGRND0.lst @@ -1,4 +1,4 @@ :TEXT TGRND0\TEXT\ANIM.txt|ANIM :TEXTURES -TGRND0\TEXTURES\TGRN.tga|TGRN +TGRND0\TEXTURES\TGRND.tga|TGRND diff --git a/StandartWAD/D2DTEXTURES/TGRND0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TGRND0/TEXT/ANIM.txt index 57288da..fbdcc25 100644 --- a/StandartWAD/D2DTEXTURES/TGRND0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TGRND0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TGRN +resource=TGRND framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRN.tga b/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRN.tga deleted file mode 100644 index 95b880c..0000000 Binary files a/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRN.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRND.tga b/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRND.tga new file mode 100644 index 0000000..c640ff9 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TGRND0/TEXTURES/TGRND.tga differ diff --git a/StandartWAD/D2DTEXTURES/TREDA0.lst b/StandartWAD/D2DTEXTURES/TREDA0.lst index 977812f..9a2dd6a 100644 --- a/StandartWAD/D2DTEXTURES/TREDA0.lst +++ b/StandartWAD/D2DTEXTURES/TREDA0.lst @@ -1,4 +1,4 @@ :TEXT TREDA0\TEXT\ANIM.txt|ANIM :TEXTURES -TREDA0\TEXTURES\TRED.tga|TRED +TREDA0\TEXTURES\TREDA.tga|TREDA diff --git a/StandartWAD/D2DTEXTURES/TREDA0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TREDA0/TEXT/ANIM.txt index 9d5cfcd..726f837 100644 --- a/StandartWAD/D2DTEXTURES/TREDA0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TREDA0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TRED +resource=TREDA framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TREDA0/TEXTURES/TRED.tga b/StandartWAD/D2DTEXTURES/TREDA0/TEXTURES/TREDA.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/TREDA0/TEXTURES/TRED.tga rename to StandartWAD/D2DTEXTURES/TREDA0/TEXTURES/TREDA.tga diff --git a/StandartWAD/D2DTEXTURES/TREDB0.lst b/StandartWAD/D2DTEXTURES/TREDB0.lst index 8149a60..6cf5e80 100644 --- a/StandartWAD/D2DTEXTURES/TREDB0.lst +++ b/StandartWAD/D2DTEXTURES/TREDB0.lst @@ -1,4 +1,4 @@ :TEXT TREDB0\TEXT\ANIM.txt|ANIM :TEXTURES -TREDB0\TEXTURES\TRED.tga|TRED +TREDB0\TEXTURES\TREDB.tga|TREDB diff --git a/StandartWAD/D2DTEXTURES/TREDB0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TREDB0/TEXT/ANIM.txt index 9d5cfcd..12049c6 100644 --- a/StandartWAD/D2DTEXTURES/TREDB0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TREDB0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TRED +resource=TREDB framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TRED.tga b/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TRED.tga deleted file mode 100644 index b96300b..0000000 Binary files a/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TRED.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TREDB.tga b/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TREDB.tga new file mode 100644 index 0000000..d60db94 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TREDB0/TEXTURES/TREDB.tga differ diff --git a/StandartWAD/D2DTEXTURES/TREDC0.lst b/StandartWAD/D2DTEXTURES/TREDC0.lst index dfdcdec..d6e6945 100644 --- a/StandartWAD/D2DTEXTURES/TREDC0.lst +++ b/StandartWAD/D2DTEXTURES/TREDC0.lst @@ -1,4 +1,4 @@ :TEXT TREDC0\TEXT\ANIM.txt|ANIM :TEXTURES -TREDC0\TEXTURES\TRED.tga|TRED +TREDC0\TEXTURES\TREDC.tga|TREDC diff --git a/StandartWAD/D2DTEXTURES/TREDC0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TREDC0/TEXT/ANIM.txt index 9d5cfcd..cb764aa 100644 --- a/StandartWAD/D2DTEXTURES/TREDC0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TREDC0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TRED +resource=TREDC framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TRED.tga b/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TRED.tga deleted file mode 100644 index b96300b..0000000 Binary files a/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TRED.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TREDC.tga b/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TREDC.tga new file mode 100644 index 0000000..17d35ed Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TREDC0/TEXTURES/TREDC.tga differ diff --git a/StandartWAD/D2DTEXTURES/TREDD0.lst b/StandartWAD/D2DTEXTURES/TREDD0.lst index 2501a67..f0a055f 100644 --- a/StandartWAD/D2DTEXTURES/TREDD0.lst +++ b/StandartWAD/D2DTEXTURES/TREDD0.lst @@ -1,4 +1,4 @@ :TEXT TREDD0\TEXT\ANIM.txt|ANIM :TEXTURES -TREDD0\TEXTURES\TRED.tga|TRED +TREDD0\TEXTURES\TREDD.tga|TREDD diff --git a/StandartWAD/D2DTEXTURES/TREDD0/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/TREDD0/TEXT/ANIM.txt index 9d5cfcd..0e64964 100644 --- a/StandartWAD/D2DTEXTURES/TREDD0/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/TREDD0/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=TRED +resource=TREDD framecount=4 framewidth=32 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TRED.tga b/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TRED.tga deleted file mode 100644 index b96300b..0000000 Binary files a/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TRED.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TREDD.tga b/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TREDD.tga new file mode 100644 index 0000000..6448bad Binary files /dev/null and b/StandartWAD/D2DTEXTURES/TREDD0/TEXTURES/TREDD.tga differ diff --git a/StandartWAD/D2DTEXTURES/W73A_1.lst b/StandartWAD/D2DTEXTURES/W73A_1.lst index 5d47e68..4b9b626 100644 --- a/StandartWAD/D2DTEXTURES/W73A_1.lst +++ b/StandartWAD/D2DTEXTURES/W73A_1.lst @@ -1,4 +1,4 @@ :TEXT W73A_1\TEXT\ANIM.txt|ANIM :TEXTURES -W73A_1\TEXTURES\W73A.tga|W73A +W73A_1\TEXTURES\W73A_1.tga|W73A_1 diff --git a/StandartWAD/D2DTEXTURES/W73A_1/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/W73A_1/TEXT/ANIM.txt index d4bce3d..fc7703a 100644 --- a/StandartWAD/D2DTEXTURES/W73A_1/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/W73A_1/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=W73A +resource=W73A_1 framecount=3 framewidth=128 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/W73A_1/TEXTURES/W73A.tga b/StandartWAD/D2DTEXTURES/W73A_1/TEXTURES/W73A_1.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/W73A_1/TEXTURES/W73A.tga rename to StandartWAD/D2DTEXTURES/W73A_1/TEXTURES/W73A_1.tga diff --git a/StandartWAD/D2DTEXTURES/W73A_2.lst b/StandartWAD/D2DTEXTURES/W73A_2.lst deleted file mode 100644 index 09e9ae0..0000000 --- a/StandartWAD/D2DTEXTURES/W73A_2.lst +++ /dev/null @@ -1,4 +0,0 @@ -:TEXT -W73A_2\TEXT\ANIM.txt|ANIM -:TEXTURES -W73A_2\TEXTURES\W73A.tga|W73A diff --git a/StandartWAD/D2DTEXTURES/W73A_2.tga b/StandartWAD/D2DTEXTURES/W73A_2.tga new file mode 100644 index 0000000..c26be1f Binary files /dev/null and b/StandartWAD/D2DTEXTURES/W73A_2.tga differ diff --git a/StandartWAD/D2DTEXTURES/W73A_2/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/W73A_2/TEXT/ANIM.txt deleted file mode 100644 index d4bce3d..0000000 --- a/StandartWAD/D2DTEXTURES/W73A_2/TEXT/ANIM.txt +++ /dev/null @@ -1,6 +0,0 @@ -resource=W73A -framecount=3 -framewidth=128 -frameheight=128 -waitcount=6 -backanimation=0 \ No newline at end of file diff --git a/StandartWAD/D2DTEXTURES/W73A_2/TEXTURES/W73A.tga b/StandartWAD/D2DTEXTURES/W73A_2/TEXTURES/W73A.tga deleted file mode 100644 index 12853df..0000000 Binary files a/StandartWAD/D2DTEXTURES/W73A_2/TEXTURES/W73A.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/WALL22_1.lst b/StandartWAD/D2DTEXTURES/WALL22_1.lst index 15c5720..1dca176 100644 --- a/StandartWAD/D2DTEXTURES/WALL22_1.lst +++ b/StandartWAD/D2DTEXTURES/WALL22_1.lst @@ -1,4 +1,4 @@ :TEXT WALL22_1\TEXT\ANIM.txt|ANIM :TEXTURES -WALL22_1\TEXTURES\WALL22.tga|WALL22 +WALL22_1\TEXTURES\WALL22_1.tga|WALL22_1 diff --git a/StandartWAD/D2DTEXTURES/WALL22_1/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL22_1/TEXT/ANIM.txt index fe1e5d9..5c7d76d 100644 --- a/StandartWAD/D2DTEXTURES/WALL22_1/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/WALL22_1/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=WALL22 +resource=WALL22_1 framecount=3 framewidth=128 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/WALL22_1/TEXTURES/WALL22.tga b/StandartWAD/D2DTEXTURES/WALL22_1/TEXTURES/WALL22_1.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/WALL22_1/TEXTURES/WALL22.tga rename to StandartWAD/D2DTEXTURES/WALL22_1/TEXTURES/WALL22_1.tga diff --git a/StandartWAD/D2DTEXTURES/WALL23_1.lst b/StandartWAD/D2DTEXTURES/WALL23_1.lst deleted file mode 100644 index eb026a5..0000000 --- a/StandartWAD/D2DTEXTURES/WALL23_1.lst +++ /dev/null @@ -1,4 +0,0 @@ -:TEXT -WALL23_1\TEXT\ANIM.txt|ANIM -:TEXTURES -WALL23_1\TEXTURES\WALL22.tga|WALL22 diff --git a/StandartWAD/D2DTEXTURES/WALL23_1.tga b/StandartWAD/D2DTEXTURES/WALL23_1.tga new file mode 100644 index 0000000..3ea02a1 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/WALL23_1.tga differ diff --git a/StandartWAD/D2DTEXTURES/WALL23_1/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL23_1/TEXT/ANIM.txt deleted file mode 100644 index fe1e5d9..0000000 --- a/StandartWAD/D2DTEXTURES/WALL23_1/TEXT/ANIM.txt +++ /dev/null @@ -1,6 +0,0 @@ -resource=WALL22 -framecount=3 -framewidth=128 -frameheight=128 -waitcount=6 -backanimation=0 \ No newline at end of file diff --git a/StandartWAD/D2DTEXTURES/WALL23_1/TEXTURES/WALL22.tga b/StandartWAD/D2DTEXTURES/WALL23_1/TEXTURES/WALL22.tga deleted file mode 100644 index 718cf92..0000000 Binary files a/StandartWAD/D2DTEXTURES/WALL23_1/TEXTURES/WALL22.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/WALL23_2.lst b/StandartWAD/D2DTEXTURES/WALL23_2.lst deleted file mode 100644 index 15cc210..0000000 --- a/StandartWAD/D2DTEXTURES/WALL23_2.lst +++ /dev/null @@ -1,4 +0,0 @@ -:TEXT -WALL23_2\TEXT\ANIM.txt|ANIM -:TEXTURES -WALL23_2\TEXTURES\WALL22.tga|WALL22 diff --git a/StandartWAD/D2DTEXTURES/WALL23_2.tga b/StandartWAD/D2DTEXTURES/WALL23_2.tga new file mode 100644 index 0000000..901c2d9 Binary files /dev/null and b/StandartWAD/D2DTEXTURES/WALL23_2.tga differ diff --git a/StandartWAD/D2DTEXTURES/WALL23_2/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL23_2/TEXT/ANIM.txt deleted file mode 100644 index fe1e5d9..0000000 --- a/StandartWAD/D2DTEXTURES/WALL23_2/TEXT/ANIM.txt +++ /dev/null @@ -1,6 +0,0 @@ -resource=WALL22 -framecount=3 -framewidth=128 -frameheight=128 -waitcount=6 -backanimation=0 \ No newline at end of file diff --git a/StandartWAD/D2DTEXTURES/WALL23_2/TEXTURES/WALL22.tga b/StandartWAD/D2DTEXTURES/WALL23_2/TEXTURES/WALL22.tga deleted file mode 100644 index 718cf92..0000000 Binary files a/StandartWAD/D2DTEXTURES/WALL23_2/TEXTURES/WALL22.tga and /dev/null differ diff --git a/StandartWAD/D2DTEXTURES/WALL58_1.lst b/StandartWAD/D2DTEXTURES/WALL58_1.lst index c1590c3..0167ae2 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_1.lst +++ b/StandartWAD/D2DTEXTURES/WALL58_1.lst @@ -1,4 +1,4 @@ :TEXT WALL58_1\TEXT\ANIM.txt|ANIM :TEXTURES -WALL58_1\TEXTURES\WALL58.tga|WALL58 +WALL58_1\TEXTURES\WALL58_1.tga|WALL58_1 diff --git a/StandartWAD/D2DTEXTURES/WALL58_1/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL58_1/TEXT/ANIM.txt index 6a025ad..c2ac76d 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_1/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/WALL58_1/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=WALL58 +resource=WALL58_1 framecount=3 framewidth=64 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/WALL58_1/TEXTURES/WALL58.tga b/StandartWAD/D2DTEXTURES/WALL58_1/TEXTURES/WALL58_1.tga similarity index 100% rename from StandartWAD/D2DTEXTURES/WALL58_1/TEXTURES/WALL58.tga rename to StandartWAD/D2DTEXTURES/WALL58_1/TEXTURES/WALL58_1.tga diff --git a/StandartWAD/D2DTEXTURES/WALL58_2.lst b/StandartWAD/D2DTEXTURES/WALL58_2.lst index d73cf9c..a6f4a14 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_2.lst +++ b/StandartWAD/D2DTEXTURES/WALL58_2.lst @@ -1,4 +1,4 @@ :TEXT WALL58_2\TEXT\ANIM.txt|ANIM :TEXTURES -WALL58_2\TEXTURES\WALL58.tga|WALL58 +WALL58_2\TEXTURES\WALL58_2.tga|WALL58_2 diff --git a/StandartWAD/D2DTEXTURES/WALL58_2/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL58_2/TEXT/ANIM.txt index 6a025ad..1332cf1 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_2/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/WALL58_2/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=WALL58 +resource=WALL58_2 framecount=3 framewidth=64 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58.tga b/StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58_2.tga similarity index 99% rename from StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58.tga rename to StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58_2.tga index 822410a..7bb65fa 100644 Binary files a/StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58.tga and b/StandartWAD/D2DTEXTURES/WALL58_2/TEXTURES/WALL58_2.tga differ diff --git a/StandartWAD/D2DTEXTURES/WALL58_3.lst b/StandartWAD/D2DTEXTURES/WALL58_3.lst index 68ebfd8..fd9d0ad 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_3.lst +++ b/StandartWAD/D2DTEXTURES/WALL58_3.lst @@ -1,4 +1,4 @@ :TEXT WALL58_3\TEXT\ANIM.txt|ANIM :TEXTURES -WALL58_3\TEXTURES\WALL58.tga|WALL58 +WALL58_3\TEXTURES\WALL58_3.tga|WALL58_3 diff --git a/StandartWAD/D2DTEXTURES/WALL58_3/TEXT/ANIM.txt b/StandartWAD/D2DTEXTURES/WALL58_3/TEXT/ANIM.txt index 6a025ad..190112b 100644 --- a/StandartWAD/D2DTEXTURES/WALL58_3/TEXT/ANIM.txt +++ b/StandartWAD/D2DTEXTURES/WALL58_3/TEXT/ANIM.txt @@ -1,4 +1,4 @@ -resource=WALL58 +resource=WALL58_3 framecount=3 framewidth=64 frameheight=128 diff --git a/StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58.tga b/StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58_3.tga similarity index 99% rename from StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58.tga rename to StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58_3.tga index 822410a..bbafa53 100644 Binary files a/StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58.tga and b/StandartWAD/D2DTEXTURES/WALL58_3/TEXTURES/WALL58_3.tga differ diff --git a/standart.lst b/standart.lst index b12ca8e..9ff1440 100644 --- a/standart.lst +++ b/standart.lst @@ -440,13 +440,13 @@ StandartWAD\D2DTEXTURES\WALL30_4.tga|WALL30_4 StandartWAD\D2DTEXTURES\WALL30_3.tga|WALL30_3 StandartWAD\D2DTEXTURES\WALL30_2.tga|WALL30_2 StandartWAD\D2DTEXTURES\WALL25_1.tga|WALL25_1 -StandartWAD\D2DTEXTURES\WALL23_2.wad|WALL23_2 -StandartWAD\D2DTEXTURES\WALL23_1.wad|WALL23_1 +StandartWAD\D2DTEXTURES\WALL23_2.tga|WALL23_2 +StandartWAD\D2DTEXTURES\WALL23_1.tga|WALL23_1 StandartWAD\D2DTEXTURES\WALL22_1.wad|WALL22_1 StandartWAD\D2DTEXTURES\WALL03_4.tga|WALL03_4 StandartWAD\D2DTEXTURES\WALL03_1.tga|WALL03_1 StandartWAD\D2DTEXTURES\W94_1.tga|W94_1 -StandartWAD\D2DTEXTURES\W73A_2.wad|W73A_2 +StandartWAD\D2DTEXTURES\W73A_2.tga|W73A_2 StandartWAD\D2DTEXTURES\W73A_1.wad|W73A_1 StandartWAD\D2DTEXTURES\W33_7.tga|W33_7 StandartWAD\D2DTEXTURES\W33_5.tga|W33_5