diff --git a/README.md b/README.md index aab06e974..89beb37f3 100644 --- a/README.md +++ b/README.md @@ -419,7 +419,7 @@ Don't rely too much on this thing, the ammo tends to be scarce, and it might pot ### Mortal Bullets ~ Replaces Cells, Runes ![](docimg/mrbullet.png) -These 4.44x44.4mm, square-shaped telescoped rounds have a lot of *"fours"* in them for sure. You can find 'em as-is or rarely in full mags. +These 4.44x44.4mm, square-shaped telescoped rounds have a lot of *"fours"* in them for sure. You can find 'em as-is in bundless or rarely in full 20-round mags. ### Mortal Grenades ~ Replaces Cells, Runes ![](docimg/mrgrenade.png) diff --git a/docimg/mortalrifle.png b/docimg/mortalrifle.png index 4d83513f1..ea9ad3362 100644 Binary files a/docimg/mortalrifle.png and b/docimg/mortalrifle.png differ diff --git a/docimg/mrbullet.png b/docimg/mrbullet.png new file mode 100644 index 000000000..89e506fdf Binary files /dev/null and b/docimg/mrbullet.png differ diff --git a/docimg/mrgrenade.png b/docimg/mrgrenade.png new file mode 100644 index 000000000..449ef8dcf Binary files /dev/null and b/docimg/mrgrenade.png differ diff --git a/fonts/MortalFont20/0021.png b/fonts/MortalFont20/0021.png new file mode 100644 index 000000000..e428c70e9 Binary files /dev/null and b/fonts/MortalFont20/0021.png differ diff --git a/fonts/MortalFont20/0022.png b/fonts/MortalFont20/0022.png new file mode 100644 index 000000000..a80f4fbdb Binary files /dev/null and b/fonts/MortalFont20/0022.png differ diff --git a/fonts/MortalFont20/0023.png b/fonts/MortalFont20/0023.png new file mode 100644 index 000000000..5329f5fb5 Binary files /dev/null and b/fonts/MortalFont20/0023.png differ diff --git a/fonts/MortalFont20/0024.png b/fonts/MortalFont20/0024.png new file mode 100644 index 000000000..fa96d09a3 Binary files /dev/null and b/fonts/MortalFont20/0024.png differ diff --git a/fonts/MortalFont20/0025.png b/fonts/MortalFont20/0025.png new file mode 100644 index 000000000..db1c83e04 Binary files /dev/null and b/fonts/MortalFont20/0025.png differ diff --git a/fonts/MortalFont20/0026.png b/fonts/MortalFont20/0026.png new file mode 100644 index 000000000..f3cec61f0 Binary files /dev/null and b/fonts/MortalFont20/0026.png differ diff --git a/fonts/MortalFont20/0027.png b/fonts/MortalFont20/0027.png new file mode 100644 index 000000000..7662db434 Binary files /dev/null and b/fonts/MortalFont20/0027.png differ diff --git a/fonts/MortalFont20/0028.png b/fonts/MortalFont20/0028.png new file mode 100644 index 000000000..b1242f99a Binary files /dev/null and b/fonts/MortalFont20/0028.png differ diff --git a/fonts/MortalFont20/0029.png b/fonts/MortalFont20/0029.png new file mode 100644 index 000000000..f3644a16e Binary files /dev/null and b/fonts/MortalFont20/0029.png differ diff --git a/fonts/MortalFont20/002A.png b/fonts/MortalFont20/002A.png new file mode 100644 index 000000000..a0097a952 Binary files /dev/null and b/fonts/MortalFont20/002A.png differ diff --git a/fonts/MortalFont20/002B.png b/fonts/MortalFont20/002B.png new file mode 100644 index 000000000..fa5c2df9b Binary files /dev/null and b/fonts/MortalFont20/002B.png differ diff --git a/fonts/MortalFont20/002C.png b/fonts/MortalFont20/002C.png new file mode 100644 index 000000000..62b74528b Binary files /dev/null and b/fonts/MortalFont20/002C.png differ diff --git a/fonts/MortalFont20/002D.png b/fonts/MortalFont20/002D.png new file mode 100644 index 000000000..b4a2ad48c Binary files /dev/null and b/fonts/MortalFont20/002D.png differ diff --git a/fonts/MortalFont20/002E.png b/fonts/MortalFont20/002E.png new file mode 100644 index 000000000..6cee68a6b Binary files /dev/null and b/fonts/MortalFont20/002E.png differ diff --git a/fonts/MortalFont20/002F.png b/fonts/MortalFont20/002F.png new file mode 100644 index 000000000..a2b22d160 Binary files /dev/null and b/fonts/MortalFont20/002F.png differ diff --git a/fonts/MortalFont20/0030.png b/fonts/MortalFont20/0030.png new file mode 100644 index 000000000..447e06950 Binary files /dev/null and b/fonts/MortalFont20/0030.png differ diff --git a/fonts/MortalFont20/0031.png b/fonts/MortalFont20/0031.png new file mode 100644 index 000000000..b8b3479d4 Binary files /dev/null and b/fonts/MortalFont20/0031.png differ diff --git a/fonts/MortalFont20/0032.png b/fonts/MortalFont20/0032.png new file mode 100644 index 000000000..fb6242b2b Binary files /dev/null and b/fonts/MortalFont20/0032.png differ diff --git a/fonts/MortalFont20/0033.png b/fonts/MortalFont20/0033.png new file mode 100644 index 000000000..d49118cf2 Binary files /dev/null and b/fonts/MortalFont20/0033.png differ diff --git a/fonts/MortalFont20/0034.png b/fonts/MortalFont20/0034.png new file mode 100644 index 000000000..0e1e89d4a Binary files /dev/null and b/fonts/MortalFont20/0034.png differ diff --git a/fonts/MortalFont20/0035.png b/fonts/MortalFont20/0035.png new file mode 100644 index 000000000..4ea76bad9 Binary files /dev/null and b/fonts/MortalFont20/0035.png differ diff --git a/fonts/MortalFont20/0036.png b/fonts/MortalFont20/0036.png new file mode 100644 index 000000000..43643802d Binary files /dev/null and b/fonts/MortalFont20/0036.png differ diff --git a/fonts/MortalFont20/0037.png b/fonts/MortalFont20/0037.png new file mode 100644 index 000000000..6a2727bff Binary files /dev/null and b/fonts/MortalFont20/0037.png differ diff --git a/fonts/MortalFont20/0038.png b/fonts/MortalFont20/0038.png new file mode 100644 index 000000000..af975945a Binary files /dev/null and b/fonts/MortalFont20/0038.png differ diff --git a/fonts/MortalFont20/0039.png b/fonts/MortalFont20/0039.png new file mode 100644 index 000000000..3186b4f86 Binary files /dev/null and b/fonts/MortalFont20/0039.png differ diff --git a/fonts/MortalFont20/003A.png b/fonts/MortalFont20/003A.png new file mode 100644 index 000000000..2d3088f9a Binary files /dev/null and b/fonts/MortalFont20/003A.png differ diff --git a/fonts/MortalFont20/003B.png b/fonts/MortalFont20/003B.png new file mode 100644 index 000000000..0df60c900 Binary files /dev/null and b/fonts/MortalFont20/003B.png differ diff --git a/fonts/MortalFont20/003C.png b/fonts/MortalFont20/003C.png new file mode 100644 index 000000000..166cd1c26 Binary files /dev/null and b/fonts/MortalFont20/003C.png differ diff --git a/fonts/MortalFont20/003D.png b/fonts/MortalFont20/003D.png new file mode 100644 index 000000000..1fa4e74c4 Binary files /dev/null and b/fonts/MortalFont20/003D.png differ diff --git a/fonts/MortalFont20/003E.png b/fonts/MortalFont20/003E.png new file mode 100644 index 000000000..d7032f67d Binary files /dev/null and b/fonts/MortalFont20/003E.png differ diff --git a/fonts/MortalFont20/003F.png b/fonts/MortalFont20/003F.png new file mode 100644 index 000000000..e69673ab2 Binary files /dev/null and b/fonts/MortalFont20/003F.png differ diff --git a/fonts/MortalFont20/0040.png b/fonts/MortalFont20/0040.png new file mode 100644 index 000000000..95c016a8e Binary files /dev/null and b/fonts/MortalFont20/0040.png differ diff --git a/fonts/MortalFont20/0041.png b/fonts/MortalFont20/0041.png new file mode 100644 index 000000000..68ae2b853 Binary files /dev/null and b/fonts/MortalFont20/0041.png differ diff --git a/fonts/MortalFont20/0042.png b/fonts/MortalFont20/0042.png new file mode 100644 index 000000000..627dc3b89 Binary files /dev/null and b/fonts/MortalFont20/0042.png differ diff --git a/fonts/MortalFont20/0043.png b/fonts/MortalFont20/0043.png new file mode 100644 index 000000000..e526db9e9 Binary files /dev/null and b/fonts/MortalFont20/0043.png differ diff --git a/fonts/MortalFont20/0044.png b/fonts/MortalFont20/0044.png new file mode 100644 index 000000000..46842b56c Binary files /dev/null and b/fonts/MortalFont20/0044.png differ diff --git a/fonts/MortalFont20/0045.png b/fonts/MortalFont20/0045.png new file mode 100644 index 000000000..3f4d67a0b Binary files /dev/null and b/fonts/MortalFont20/0045.png differ diff --git a/fonts/MortalFont20/0046.png b/fonts/MortalFont20/0046.png new file mode 100644 index 000000000..5ed3e3bec Binary files /dev/null and b/fonts/MortalFont20/0046.png differ diff --git a/fonts/MortalFont20/0047.png b/fonts/MortalFont20/0047.png new file mode 100644 index 000000000..faa5d2544 Binary files /dev/null and b/fonts/MortalFont20/0047.png differ diff --git a/fonts/MortalFont20/0048.png b/fonts/MortalFont20/0048.png new file mode 100644 index 000000000..51197de32 Binary files /dev/null and b/fonts/MortalFont20/0048.png differ diff --git a/fonts/MortalFont20/0049.png b/fonts/MortalFont20/0049.png new file mode 100644 index 000000000..eb2d87c38 Binary files /dev/null and b/fonts/MortalFont20/0049.png differ diff --git a/fonts/MortalFont20/004A.png b/fonts/MortalFont20/004A.png new file mode 100644 index 000000000..e337af936 Binary files /dev/null and b/fonts/MortalFont20/004A.png differ diff --git a/fonts/MortalFont20/004B.png b/fonts/MortalFont20/004B.png new file mode 100644 index 000000000..a248926d0 Binary files /dev/null and b/fonts/MortalFont20/004B.png differ diff --git a/fonts/MortalFont20/004C.png b/fonts/MortalFont20/004C.png new file mode 100644 index 000000000..8ba931d1f Binary files /dev/null and b/fonts/MortalFont20/004C.png differ diff --git a/fonts/MortalFont20/004D.png b/fonts/MortalFont20/004D.png new file mode 100644 index 000000000..a704e1128 Binary files /dev/null and b/fonts/MortalFont20/004D.png differ diff --git a/fonts/MortalFont20/004E.png b/fonts/MortalFont20/004E.png new file mode 100644 index 000000000..5e48e9ca2 Binary files /dev/null and b/fonts/MortalFont20/004E.png differ diff --git a/fonts/MortalFont20/004F.png b/fonts/MortalFont20/004F.png new file mode 100644 index 000000000..f94c0a28e Binary files /dev/null and b/fonts/MortalFont20/004F.png differ diff --git a/fonts/MortalFont20/0050.png b/fonts/MortalFont20/0050.png new file mode 100644 index 000000000..c25b049c9 Binary files /dev/null and b/fonts/MortalFont20/0050.png differ diff --git a/fonts/MortalFont20/0051.png b/fonts/MortalFont20/0051.png new file mode 100644 index 000000000..a60efea2e Binary files /dev/null and b/fonts/MortalFont20/0051.png differ diff --git a/fonts/MortalFont20/0052.png b/fonts/MortalFont20/0052.png new file mode 100644 index 000000000..9db3b190e Binary files /dev/null and b/fonts/MortalFont20/0052.png differ diff --git a/fonts/MortalFont20/0053.png b/fonts/MortalFont20/0053.png new file mode 100644 index 000000000..32cb9956e Binary files /dev/null and b/fonts/MortalFont20/0053.png differ diff --git a/fonts/MortalFont20/0054.png b/fonts/MortalFont20/0054.png new file mode 100644 index 000000000..386928a98 Binary files /dev/null and b/fonts/MortalFont20/0054.png differ diff --git a/fonts/MortalFont20/0055.png b/fonts/MortalFont20/0055.png new file mode 100644 index 000000000..21a97fb61 Binary files /dev/null and b/fonts/MortalFont20/0055.png differ diff --git a/fonts/MortalFont20/0056.png b/fonts/MortalFont20/0056.png new file mode 100644 index 000000000..0e02b4477 Binary files /dev/null and b/fonts/MortalFont20/0056.png differ diff --git a/fonts/MortalFont20/0057.png b/fonts/MortalFont20/0057.png new file mode 100644 index 000000000..a946a386b Binary files /dev/null and b/fonts/MortalFont20/0057.png differ diff --git a/fonts/MortalFont20/0058.png b/fonts/MortalFont20/0058.png new file mode 100644 index 000000000..a71f619bc Binary files /dev/null and b/fonts/MortalFont20/0058.png differ diff --git a/fonts/MortalFont20/0059.png b/fonts/MortalFont20/0059.png new file mode 100644 index 000000000..2bae440fa Binary files /dev/null and b/fonts/MortalFont20/0059.png differ diff --git a/fonts/MortalFont20/005A.png b/fonts/MortalFont20/005A.png new file mode 100644 index 000000000..4419aceaf Binary files /dev/null and b/fonts/MortalFont20/005A.png differ diff --git a/fonts/MortalFont20/005B.png b/fonts/MortalFont20/005B.png new file mode 100644 index 000000000..b5294e0ba Binary files /dev/null and b/fonts/MortalFont20/005B.png differ diff --git a/fonts/MortalFont20/005C.png b/fonts/MortalFont20/005C.png new file mode 100644 index 000000000..2e2889156 Binary files /dev/null and b/fonts/MortalFont20/005C.png differ diff --git a/fonts/MortalFont20/005D.png b/fonts/MortalFont20/005D.png new file mode 100644 index 000000000..25f4e81c1 Binary files /dev/null and b/fonts/MortalFont20/005D.png differ diff --git a/fonts/MortalFont20/005E.png b/fonts/MortalFont20/005E.png new file mode 100644 index 000000000..1254f6f0d Binary files /dev/null and b/fonts/MortalFont20/005E.png differ diff --git a/fonts/MortalFont20/0060.png b/fonts/MortalFont20/0060.png new file mode 100644 index 000000000..72f0d0861 Binary files /dev/null and b/fonts/MortalFont20/0060.png differ diff --git a/fonts/MortalFont20/0061.png b/fonts/MortalFont20/0061.png new file mode 100644 index 000000000..c651038c6 Binary files /dev/null and b/fonts/MortalFont20/0061.png differ diff --git a/fonts/MortalFont20/0062.png b/fonts/MortalFont20/0062.png new file mode 100644 index 000000000..bf380c1fa Binary files /dev/null and b/fonts/MortalFont20/0062.png differ diff --git a/fonts/MortalFont20/0063.png b/fonts/MortalFont20/0063.png new file mode 100644 index 000000000..0f1a77109 Binary files /dev/null and b/fonts/MortalFont20/0063.png differ diff --git a/fonts/MortalFont20/0064.png b/fonts/MortalFont20/0064.png new file mode 100644 index 000000000..d44b457c4 Binary files /dev/null and b/fonts/MortalFont20/0064.png differ diff --git a/fonts/MortalFont20/0065.png b/fonts/MortalFont20/0065.png new file mode 100644 index 000000000..9d7b89dc6 Binary files /dev/null and b/fonts/MortalFont20/0065.png differ diff --git a/fonts/MortalFont20/0066.png b/fonts/MortalFont20/0066.png new file mode 100644 index 000000000..1142df6a7 Binary files /dev/null and b/fonts/MortalFont20/0066.png differ diff --git a/fonts/MortalFont20/0067.png b/fonts/MortalFont20/0067.png new file mode 100644 index 000000000..b59dbd481 Binary files /dev/null and b/fonts/MortalFont20/0067.png differ diff --git a/fonts/MortalFont20/0068.png b/fonts/MortalFont20/0068.png new file mode 100644 index 000000000..aca91fb50 Binary files /dev/null and b/fonts/MortalFont20/0068.png differ diff --git a/fonts/MortalFont20/0069.png b/fonts/MortalFont20/0069.png new file mode 100644 index 000000000..06bb86bb9 Binary files /dev/null and b/fonts/MortalFont20/0069.png differ diff --git a/fonts/MortalFont20/006A.png b/fonts/MortalFont20/006A.png new file mode 100644 index 000000000..e104ae7f6 Binary files /dev/null and b/fonts/MortalFont20/006A.png differ diff --git a/fonts/MortalFont20/006B.png b/fonts/MortalFont20/006B.png new file mode 100644 index 000000000..f73729f03 Binary files /dev/null and b/fonts/MortalFont20/006B.png differ diff --git a/fonts/MortalFont20/006C.png b/fonts/MortalFont20/006C.png new file mode 100644 index 000000000..475a902cd Binary files /dev/null and b/fonts/MortalFont20/006C.png differ diff --git a/fonts/MortalFont20/006D.png b/fonts/MortalFont20/006D.png new file mode 100644 index 000000000..3c1320e4d Binary files /dev/null and b/fonts/MortalFont20/006D.png differ diff --git a/fonts/MortalFont20/006E.png b/fonts/MortalFont20/006E.png new file mode 100644 index 000000000..af6683160 Binary files /dev/null and b/fonts/MortalFont20/006E.png differ diff --git a/fonts/MortalFont20/006F.png b/fonts/MortalFont20/006F.png new file mode 100644 index 000000000..84b259b33 Binary files /dev/null and b/fonts/MortalFont20/006F.png differ diff --git a/fonts/MortalFont20/0070.png b/fonts/MortalFont20/0070.png new file mode 100644 index 000000000..4c576bc3b Binary files /dev/null and b/fonts/MortalFont20/0070.png differ diff --git a/fonts/MortalFont20/0071.png b/fonts/MortalFont20/0071.png new file mode 100644 index 000000000..7ef4e4215 Binary files /dev/null and b/fonts/MortalFont20/0071.png differ diff --git a/fonts/MortalFont20/0072.png b/fonts/MortalFont20/0072.png new file mode 100644 index 000000000..af967a78b Binary files /dev/null and b/fonts/MortalFont20/0072.png differ diff --git a/fonts/MortalFont20/0073.png b/fonts/MortalFont20/0073.png new file mode 100644 index 000000000..e5f707b6e Binary files /dev/null and b/fonts/MortalFont20/0073.png differ diff --git a/fonts/MortalFont20/0074.png b/fonts/MortalFont20/0074.png new file mode 100644 index 000000000..d73a68eec Binary files /dev/null and b/fonts/MortalFont20/0074.png differ diff --git a/fonts/MortalFont20/0075.png b/fonts/MortalFont20/0075.png new file mode 100644 index 000000000..9970813de Binary files /dev/null and b/fonts/MortalFont20/0075.png differ diff --git a/fonts/MortalFont20/0076.png b/fonts/MortalFont20/0076.png new file mode 100644 index 000000000..5ab5f7d60 Binary files /dev/null and b/fonts/MortalFont20/0076.png differ diff --git a/fonts/MortalFont20/0077.png b/fonts/MortalFont20/0077.png new file mode 100644 index 000000000..ca9657616 Binary files /dev/null and b/fonts/MortalFont20/0077.png differ diff --git a/fonts/MortalFont20/0078.png b/fonts/MortalFont20/0078.png new file mode 100644 index 000000000..4decb9438 Binary files /dev/null and b/fonts/MortalFont20/0078.png differ diff --git a/fonts/MortalFont20/0079.png b/fonts/MortalFont20/0079.png new file mode 100644 index 000000000..917299b22 Binary files /dev/null and b/fonts/MortalFont20/0079.png differ diff --git a/fonts/MortalFont20/007A.png b/fonts/MortalFont20/007A.png new file mode 100644 index 000000000..eb9ef309c Binary files /dev/null and b/fonts/MortalFont20/007A.png differ diff --git a/fonts/MortalFont20/007B.png b/fonts/MortalFont20/007B.png new file mode 100644 index 000000000..2939cf9e2 Binary files /dev/null and b/fonts/MortalFont20/007B.png differ diff --git a/fonts/MortalFont20/007C.png b/fonts/MortalFont20/007C.png new file mode 100644 index 000000000..66e67d749 Binary files /dev/null and b/fonts/MortalFont20/007C.png differ diff --git a/fonts/MortalFont20/007D.png b/fonts/MortalFont20/007D.png new file mode 100644 index 000000000..d398bfddc Binary files /dev/null and b/fonts/MortalFont20/007D.png differ diff --git a/fonts/MortalFont20/007E.png b/fonts/MortalFont20/007E.png new file mode 100644 index 000000000..64495b7ef Binary files /dev/null and b/fonts/MortalFont20/007E.png differ diff --git a/fonts/MortalFont20/font.inf b/fonts/MortalFont20/font.inf new file mode 100644 index 000000000..fa5a2459f --- /dev/null +++ b/fonts/MortalFont20/font.inf @@ -0,0 +1,4 @@ +TranslationType Standard +SpaceWidth 12 +FontHeight 21 +Kerning -1 diff --git a/fonts/MortalFont40/0021.png b/fonts/MortalFont40/0021.png new file mode 100644 index 000000000..997f96403 Binary files /dev/null and b/fonts/MortalFont40/0021.png differ diff --git a/fonts/MortalFont40/0022.png b/fonts/MortalFont40/0022.png new file mode 100644 index 000000000..504f8727c Binary files /dev/null and b/fonts/MortalFont40/0022.png differ diff --git a/fonts/MortalFont40/0023.png b/fonts/MortalFont40/0023.png new file mode 100644 index 000000000..a45391493 Binary files /dev/null and b/fonts/MortalFont40/0023.png differ diff --git a/fonts/MortalFont40/0024.png b/fonts/MortalFont40/0024.png new file mode 100644 index 000000000..020ead730 Binary files /dev/null and b/fonts/MortalFont40/0024.png differ diff --git a/fonts/MortalFont40/0025.png b/fonts/MortalFont40/0025.png new file mode 100644 index 000000000..e36f8f66a Binary files /dev/null and b/fonts/MortalFont40/0025.png differ diff --git a/fonts/MortalFont40/0026.png b/fonts/MortalFont40/0026.png new file mode 100644 index 000000000..740b1718b Binary files /dev/null and b/fonts/MortalFont40/0026.png differ diff --git a/fonts/MortalFont40/0027.png b/fonts/MortalFont40/0027.png new file mode 100644 index 000000000..1ac44348a Binary files /dev/null and b/fonts/MortalFont40/0027.png differ diff --git a/fonts/MortalFont40/0028.png b/fonts/MortalFont40/0028.png new file mode 100644 index 000000000..b26bfb8f1 Binary files /dev/null and b/fonts/MortalFont40/0028.png differ diff --git a/fonts/MortalFont40/0029.png b/fonts/MortalFont40/0029.png new file mode 100644 index 000000000..70f8c077b Binary files /dev/null and b/fonts/MortalFont40/0029.png differ diff --git a/fonts/MortalFont40/002A.png b/fonts/MortalFont40/002A.png new file mode 100644 index 000000000..2aec4f585 Binary files /dev/null and b/fonts/MortalFont40/002A.png differ diff --git a/fonts/MortalFont40/002B.png b/fonts/MortalFont40/002B.png new file mode 100644 index 000000000..5d862de46 Binary files /dev/null and b/fonts/MortalFont40/002B.png differ diff --git a/fonts/MortalFont40/002C.png b/fonts/MortalFont40/002C.png new file mode 100644 index 000000000..ee401dc55 Binary files /dev/null and b/fonts/MortalFont40/002C.png differ diff --git a/fonts/MortalFont40/002D.png b/fonts/MortalFont40/002D.png new file mode 100644 index 000000000..64ec2bdfc Binary files /dev/null and b/fonts/MortalFont40/002D.png differ diff --git a/fonts/MortalFont40/002E.png b/fonts/MortalFont40/002E.png new file mode 100644 index 000000000..787bef92c Binary files /dev/null and b/fonts/MortalFont40/002E.png differ diff --git a/fonts/MortalFont40/002F.png b/fonts/MortalFont40/002F.png new file mode 100644 index 000000000..3d57316e4 Binary files /dev/null and b/fonts/MortalFont40/002F.png differ diff --git a/fonts/MortalFont40/0030.png b/fonts/MortalFont40/0030.png new file mode 100644 index 000000000..1e23a7821 Binary files /dev/null and b/fonts/MortalFont40/0030.png differ diff --git a/fonts/MortalFont40/0031.png b/fonts/MortalFont40/0031.png new file mode 100644 index 000000000..092e7663f Binary files /dev/null and b/fonts/MortalFont40/0031.png differ diff --git a/fonts/MortalFont40/0032.png b/fonts/MortalFont40/0032.png new file mode 100644 index 000000000..a57b4ba09 Binary files /dev/null and b/fonts/MortalFont40/0032.png differ diff --git a/fonts/MortalFont40/0033.png b/fonts/MortalFont40/0033.png new file mode 100644 index 000000000..cac9b6464 Binary files /dev/null and b/fonts/MortalFont40/0033.png differ diff --git a/fonts/MortalFont40/0034.png b/fonts/MortalFont40/0034.png new file mode 100644 index 000000000..a9cca70d6 Binary files /dev/null and b/fonts/MortalFont40/0034.png differ diff --git a/fonts/MortalFont40/0035.png b/fonts/MortalFont40/0035.png new file mode 100644 index 000000000..a5eef054e Binary files /dev/null and b/fonts/MortalFont40/0035.png differ diff --git a/fonts/MortalFont40/0036.png b/fonts/MortalFont40/0036.png new file mode 100644 index 000000000..b04d153f4 Binary files /dev/null and b/fonts/MortalFont40/0036.png differ diff --git a/fonts/MortalFont40/0037.png b/fonts/MortalFont40/0037.png new file mode 100644 index 000000000..58894289c Binary files /dev/null and b/fonts/MortalFont40/0037.png differ diff --git a/fonts/MortalFont40/0038.png b/fonts/MortalFont40/0038.png new file mode 100644 index 000000000..394c8f810 Binary files /dev/null and b/fonts/MortalFont40/0038.png differ diff --git a/fonts/MortalFont40/0039.png b/fonts/MortalFont40/0039.png new file mode 100644 index 000000000..0de0db23e Binary files /dev/null and b/fonts/MortalFont40/0039.png differ diff --git a/fonts/MortalFont40/003A.png b/fonts/MortalFont40/003A.png new file mode 100644 index 000000000..d52b40793 Binary files /dev/null and b/fonts/MortalFont40/003A.png differ diff --git a/fonts/MortalFont40/003B.png b/fonts/MortalFont40/003B.png new file mode 100644 index 000000000..759ce1dec Binary files /dev/null and b/fonts/MortalFont40/003B.png differ diff --git a/fonts/MortalFont40/003C.png b/fonts/MortalFont40/003C.png new file mode 100644 index 000000000..62b8d5cde Binary files /dev/null and b/fonts/MortalFont40/003C.png differ diff --git a/fonts/MortalFont40/003D.png b/fonts/MortalFont40/003D.png new file mode 100644 index 000000000..5bb5305c1 Binary files /dev/null and b/fonts/MortalFont40/003D.png differ diff --git a/fonts/MortalFont40/003E.png b/fonts/MortalFont40/003E.png new file mode 100644 index 000000000..8d473644a Binary files /dev/null and b/fonts/MortalFont40/003E.png differ diff --git a/fonts/MortalFont40/003F.png b/fonts/MortalFont40/003F.png new file mode 100644 index 000000000..68412ca7b Binary files /dev/null and b/fonts/MortalFont40/003F.png differ diff --git a/fonts/MortalFont40/0040.png b/fonts/MortalFont40/0040.png new file mode 100644 index 000000000..5eeb0d1c3 Binary files /dev/null and b/fonts/MortalFont40/0040.png differ diff --git a/fonts/MortalFont40/0041.png b/fonts/MortalFont40/0041.png new file mode 100644 index 000000000..c51b258a1 Binary files /dev/null and b/fonts/MortalFont40/0041.png differ diff --git a/fonts/MortalFont40/0042.png b/fonts/MortalFont40/0042.png new file mode 100644 index 000000000..765a35639 Binary files /dev/null and b/fonts/MortalFont40/0042.png differ diff --git a/fonts/MortalFont40/0043.png b/fonts/MortalFont40/0043.png new file mode 100644 index 000000000..a1b4377f4 Binary files /dev/null and b/fonts/MortalFont40/0043.png differ diff --git a/fonts/MortalFont40/0044.png b/fonts/MortalFont40/0044.png new file mode 100644 index 000000000..004743f27 Binary files /dev/null and b/fonts/MortalFont40/0044.png differ diff --git a/fonts/MortalFont40/0045.png b/fonts/MortalFont40/0045.png new file mode 100644 index 000000000..6fe003a76 Binary files /dev/null and b/fonts/MortalFont40/0045.png differ diff --git a/fonts/MortalFont40/0046.png b/fonts/MortalFont40/0046.png new file mode 100644 index 000000000..158cefae7 Binary files /dev/null and b/fonts/MortalFont40/0046.png differ diff --git a/fonts/MortalFont40/0047.png b/fonts/MortalFont40/0047.png new file mode 100644 index 000000000..eca77dd93 Binary files /dev/null and b/fonts/MortalFont40/0047.png differ diff --git a/fonts/MortalFont40/0048.png b/fonts/MortalFont40/0048.png new file mode 100644 index 000000000..d4a264201 Binary files /dev/null and b/fonts/MortalFont40/0048.png differ diff --git a/fonts/MortalFont40/0049.png b/fonts/MortalFont40/0049.png new file mode 100644 index 000000000..9b8d6d011 Binary files /dev/null and b/fonts/MortalFont40/0049.png differ diff --git a/fonts/MortalFont40/004A.png b/fonts/MortalFont40/004A.png new file mode 100644 index 000000000..1e280c4c7 Binary files /dev/null and b/fonts/MortalFont40/004A.png differ diff --git a/fonts/MortalFont40/004B.png b/fonts/MortalFont40/004B.png new file mode 100644 index 000000000..5f25f9ba2 Binary files /dev/null and b/fonts/MortalFont40/004B.png differ diff --git a/fonts/MortalFont40/004C.png b/fonts/MortalFont40/004C.png new file mode 100644 index 000000000..f522e5973 Binary files /dev/null and b/fonts/MortalFont40/004C.png differ diff --git a/fonts/MortalFont40/004D.png b/fonts/MortalFont40/004D.png new file mode 100644 index 000000000..409bb9d22 Binary files /dev/null and b/fonts/MortalFont40/004D.png differ diff --git a/fonts/MortalFont40/004E.png b/fonts/MortalFont40/004E.png new file mode 100644 index 000000000..80503a7c2 Binary files /dev/null and b/fonts/MortalFont40/004E.png differ diff --git a/fonts/MortalFont40/004F.png b/fonts/MortalFont40/004F.png new file mode 100644 index 000000000..726d1af1c Binary files /dev/null and b/fonts/MortalFont40/004F.png differ diff --git a/fonts/MortalFont40/0050.png b/fonts/MortalFont40/0050.png new file mode 100644 index 000000000..69c41f282 Binary files /dev/null and b/fonts/MortalFont40/0050.png differ diff --git a/fonts/MortalFont40/0051.png b/fonts/MortalFont40/0051.png new file mode 100644 index 000000000..8d1baa0ca Binary files /dev/null and b/fonts/MortalFont40/0051.png differ diff --git a/fonts/MortalFont40/0052.png b/fonts/MortalFont40/0052.png new file mode 100644 index 000000000..03f80315a Binary files /dev/null and b/fonts/MortalFont40/0052.png differ diff --git a/fonts/MortalFont40/0053.png b/fonts/MortalFont40/0053.png new file mode 100644 index 000000000..5315c47ef Binary files /dev/null and b/fonts/MortalFont40/0053.png differ diff --git a/fonts/MortalFont40/0054.png b/fonts/MortalFont40/0054.png new file mode 100644 index 000000000..415ee84da Binary files /dev/null and b/fonts/MortalFont40/0054.png differ diff --git a/fonts/MortalFont40/0055.png b/fonts/MortalFont40/0055.png new file mode 100644 index 000000000..3f581e125 Binary files /dev/null and b/fonts/MortalFont40/0055.png differ diff --git a/fonts/MortalFont40/0056.png b/fonts/MortalFont40/0056.png new file mode 100644 index 000000000..958ba9afd Binary files /dev/null and b/fonts/MortalFont40/0056.png differ diff --git a/fonts/MortalFont40/0057.png b/fonts/MortalFont40/0057.png new file mode 100644 index 000000000..8e58fa767 Binary files /dev/null and b/fonts/MortalFont40/0057.png differ diff --git a/fonts/MortalFont40/0058.png b/fonts/MortalFont40/0058.png new file mode 100644 index 000000000..4930568ae Binary files /dev/null and b/fonts/MortalFont40/0058.png differ diff --git a/fonts/MortalFont40/0059.png b/fonts/MortalFont40/0059.png new file mode 100644 index 000000000..5d1b6d3cf Binary files /dev/null and b/fonts/MortalFont40/0059.png differ diff --git a/fonts/MortalFont40/005A.png b/fonts/MortalFont40/005A.png new file mode 100644 index 000000000..e142079fa Binary files /dev/null and b/fonts/MortalFont40/005A.png differ diff --git a/fonts/MortalFont40/005B.png b/fonts/MortalFont40/005B.png new file mode 100644 index 000000000..4c316e062 Binary files /dev/null and b/fonts/MortalFont40/005B.png differ diff --git a/fonts/MortalFont40/005C.png b/fonts/MortalFont40/005C.png new file mode 100644 index 000000000..55b2598d8 Binary files /dev/null and b/fonts/MortalFont40/005C.png differ diff --git a/fonts/MortalFont40/005D.png b/fonts/MortalFont40/005D.png new file mode 100644 index 000000000..48cca8280 Binary files /dev/null and b/fonts/MortalFont40/005D.png differ diff --git a/fonts/MortalFont40/005E.png b/fonts/MortalFont40/005E.png new file mode 100644 index 000000000..dc13bc542 Binary files /dev/null and b/fonts/MortalFont40/005E.png differ diff --git a/fonts/MortalFont40/005F.png b/fonts/MortalFont40/005F.png new file mode 100644 index 000000000..22d2da8f0 Binary files /dev/null and b/fonts/MortalFont40/005F.png differ diff --git a/fonts/MortalFont40/0060.png b/fonts/MortalFont40/0060.png new file mode 100644 index 000000000..1578073c4 Binary files /dev/null and b/fonts/MortalFont40/0060.png differ diff --git a/fonts/MortalFont40/0061.png b/fonts/MortalFont40/0061.png new file mode 100644 index 000000000..6172fc4ad Binary files /dev/null and b/fonts/MortalFont40/0061.png differ diff --git a/fonts/MortalFont40/0062.png b/fonts/MortalFont40/0062.png new file mode 100644 index 000000000..801180d59 Binary files /dev/null and b/fonts/MortalFont40/0062.png differ diff --git a/fonts/MortalFont40/0063.png b/fonts/MortalFont40/0063.png new file mode 100644 index 000000000..8721c58a4 Binary files /dev/null and b/fonts/MortalFont40/0063.png differ diff --git a/fonts/MortalFont40/0064.png b/fonts/MortalFont40/0064.png new file mode 100644 index 000000000..d0698ad33 Binary files /dev/null and b/fonts/MortalFont40/0064.png differ diff --git a/fonts/MortalFont40/0065.png b/fonts/MortalFont40/0065.png new file mode 100644 index 000000000..5c40f60f3 Binary files /dev/null and b/fonts/MortalFont40/0065.png differ diff --git a/fonts/MortalFont40/0066.png b/fonts/MortalFont40/0066.png new file mode 100644 index 000000000..a621bbf5d Binary files /dev/null and b/fonts/MortalFont40/0066.png differ diff --git a/fonts/MortalFont40/0067.png b/fonts/MortalFont40/0067.png new file mode 100644 index 000000000..1a9fc768e Binary files /dev/null and b/fonts/MortalFont40/0067.png differ diff --git a/fonts/MortalFont40/0068.png b/fonts/MortalFont40/0068.png new file mode 100644 index 000000000..7c2b57eed Binary files /dev/null and b/fonts/MortalFont40/0068.png differ diff --git a/fonts/MortalFont40/0069.png b/fonts/MortalFont40/0069.png new file mode 100644 index 000000000..e971e0847 Binary files /dev/null and b/fonts/MortalFont40/0069.png differ diff --git a/fonts/MortalFont40/006A.png b/fonts/MortalFont40/006A.png new file mode 100644 index 000000000..41714fe65 Binary files /dev/null and b/fonts/MortalFont40/006A.png differ diff --git a/fonts/MortalFont40/006B.png b/fonts/MortalFont40/006B.png new file mode 100644 index 000000000..95357dbd3 Binary files /dev/null and b/fonts/MortalFont40/006B.png differ diff --git a/fonts/MortalFont40/006C.png b/fonts/MortalFont40/006C.png new file mode 100644 index 000000000..c3d9eac6a Binary files /dev/null and b/fonts/MortalFont40/006C.png differ diff --git a/fonts/MortalFont40/006D.png b/fonts/MortalFont40/006D.png new file mode 100644 index 000000000..e5b07f31f Binary files /dev/null and b/fonts/MortalFont40/006D.png differ diff --git a/fonts/MortalFont40/006E.png b/fonts/MortalFont40/006E.png new file mode 100644 index 000000000..46d6478aa Binary files /dev/null and b/fonts/MortalFont40/006E.png differ diff --git a/fonts/MortalFont40/006F.png b/fonts/MortalFont40/006F.png new file mode 100644 index 000000000..afe0c26ec Binary files /dev/null and b/fonts/MortalFont40/006F.png differ diff --git a/fonts/MortalFont40/0070.png b/fonts/MortalFont40/0070.png new file mode 100644 index 000000000..702c6e116 Binary files /dev/null and b/fonts/MortalFont40/0070.png differ diff --git a/fonts/MortalFont40/0071.png b/fonts/MortalFont40/0071.png new file mode 100644 index 000000000..c5463b4a6 Binary files /dev/null and b/fonts/MortalFont40/0071.png differ diff --git a/fonts/MortalFont40/0072.png b/fonts/MortalFont40/0072.png new file mode 100644 index 000000000..59c4b5893 Binary files /dev/null and b/fonts/MortalFont40/0072.png differ diff --git a/fonts/MortalFont40/0073.png b/fonts/MortalFont40/0073.png new file mode 100644 index 000000000..21a8c57e6 Binary files /dev/null and b/fonts/MortalFont40/0073.png differ diff --git a/fonts/MortalFont40/0074.png b/fonts/MortalFont40/0074.png new file mode 100644 index 000000000..55b7eb130 Binary files /dev/null and b/fonts/MortalFont40/0074.png differ diff --git a/fonts/MortalFont40/0075.png b/fonts/MortalFont40/0075.png new file mode 100644 index 000000000..aee9ec9d8 Binary files /dev/null and b/fonts/MortalFont40/0075.png differ diff --git a/fonts/MortalFont40/0076.png b/fonts/MortalFont40/0076.png new file mode 100644 index 000000000..c7ce2679c Binary files /dev/null and b/fonts/MortalFont40/0076.png differ diff --git a/fonts/MortalFont40/0077.png b/fonts/MortalFont40/0077.png new file mode 100644 index 000000000..1b7292586 Binary files /dev/null and b/fonts/MortalFont40/0077.png differ diff --git a/fonts/MortalFont40/0078.png b/fonts/MortalFont40/0078.png new file mode 100644 index 000000000..404dd261e Binary files /dev/null and b/fonts/MortalFont40/0078.png differ diff --git a/fonts/MortalFont40/0079.png b/fonts/MortalFont40/0079.png new file mode 100644 index 000000000..01c458be0 Binary files /dev/null and b/fonts/MortalFont40/0079.png differ diff --git a/fonts/MortalFont40/007A.png b/fonts/MortalFont40/007A.png new file mode 100644 index 000000000..fbe2c6a32 Binary files /dev/null and b/fonts/MortalFont40/007A.png differ diff --git a/fonts/MortalFont40/007B.png b/fonts/MortalFont40/007B.png new file mode 100644 index 000000000..448e1a25c Binary files /dev/null and b/fonts/MortalFont40/007B.png differ diff --git a/fonts/MortalFont40/007C.png b/fonts/MortalFont40/007C.png new file mode 100644 index 000000000..3a96b255a Binary files /dev/null and b/fonts/MortalFont40/007C.png differ diff --git a/fonts/MortalFont40/007D.png b/fonts/MortalFont40/007D.png new file mode 100644 index 000000000..043b892dd Binary files /dev/null and b/fonts/MortalFont40/007D.png differ diff --git a/fonts/MortalFont40/007E.png b/fonts/MortalFont40/007E.png new file mode 100644 index 000000000..5a5a6771a Binary files /dev/null and b/fonts/MortalFont40/007E.png differ diff --git a/fonts/MortalFont40/font.inf b/fonts/MortalFont40/font.inf new file mode 100644 index 000000000..c9335bb49 --- /dev/null +++ b/fonts/MortalFont40/font.inf @@ -0,0 +1,4 @@ +TranslationType Standard +SpaceWidth 22 +FontHeight 41 +Kerning -1 diff --git a/fonts/MortalFont80/0021.png b/fonts/MortalFont80/0021.png new file mode 100644 index 000000000..2d925aa17 Binary files /dev/null and b/fonts/MortalFont80/0021.png differ diff --git a/fonts/MortalFont80/0022.png b/fonts/MortalFont80/0022.png new file mode 100644 index 000000000..b1708ca8b Binary files /dev/null and b/fonts/MortalFont80/0022.png differ diff --git a/fonts/MortalFont80/0023.png b/fonts/MortalFont80/0023.png new file mode 100644 index 000000000..c53d19d79 Binary files /dev/null and b/fonts/MortalFont80/0023.png differ diff --git a/fonts/MortalFont80/0024.png b/fonts/MortalFont80/0024.png new file mode 100644 index 000000000..283f9aada Binary files /dev/null and b/fonts/MortalFont80/0024.png differ diff --git a/fonts/MortalFont80/0025.png b/fonts/MortalFont80/0025.png new file mode 100644 index 000000000..76f2d0d0e Binary files /dev/null and b/fonts/MortalFont80/0025.png differ diff --git a/fonts/MortalFont80/0026.png b/fonts/MortalFont80/0026.png new file mode 100644 index 000000000..e715f52c3 Binary files /dev/null and b/fonts/MortalFont80/0026.png differ diff --git a/fonts/MortalFont80/0027.png b/fonts/MortalFont80/0027.png new file mode 100644 index 000000000..ef778edb0 Binary files /dev/null and b/fonts/MortalFont80/0027.png differ diff --git a/fonts/MortalFont80/0028.png b/fonts/MortalFont80/0028.png new file mode 100644 index 000000000..e2ed0912b Binary files /dev/null and b/fonts/MortalFont80/0028.png differ diff --git a/fonts/MortalFont80/0029.png b/fonts/MortalFont80/0029.png new file mode 100644 index 000000000..af1939717 Binary files /dev/null and b/fonts/MortalFont80/0029.png differ diff --git a/fonts/MortalFont80/002A.png b/fonts/MortalFont80/002A.png new file mode 100644 index 000000000..1e41b8f4f Binary files /dev/null and b/fonts/MortalFont80/002A.png differ diff --git a/fonts/MortalFont80/002B.png b/fonts/MortalFont80/002B.png new file mode 100644 index 000000000..0d3ca32f7 Binary files /dev/null and b/fonts/MortalFont80/002B.png differ diff --git a/fonts/MortalFont80/002C.png b/fonts/MortalFont80/002C.png new file mode 100644 index 000000000..894b98cf5 Binary files /dev/null and b/fonts/MortalFont80/002C.png differ diff --git a/fonts/MortalFont80/002D.png b/fonts/MortalFont80/002D.png new file mode 100644 index 000000000..a734571ca Binary files /dev/null and b/fonts/MortalFont80/002D.png differ diff --git a/fonts/MortalFont80/002E.png b/fonts/MortalFont80/002E.png new file mode 100644 index 000000000..304397463 Binary files /dev/null and b/fonts/MortalFont80/002E.png differ diff --git a/fonts/MortalFont80/002F.png b/fonts/MortalFont80/002F.png new file mode 100644 index 000000000..ce6e50751 Binary files /dev/null and b/fonts/MortalFont80/002F.png differ diff --git a/fonts/MortalFont80/0030.png b/fonts/MortalFont80/0030.png new file mode 100644 index 000000000..641105bda Binary files /dev/null and b/fonts/MortalFont80/0030.png differ diff --git a/fonts/MortalFont80/0031.png b/fonts/MortalFont80/0031.png new file mode 100644 index 000000000..cc764b5eb Binary files /dev/null and b/fonts/MortalFont80/0031.png differ diff --git a/fonts/MortalFont80/0032.png b/fonts/MortalFont80/0032.png new file mode 100644 index 000000000..5608eb945 Binary files /dev/null and b/fonts/MortalFont80/0032.png differ diff --git a/fonts/MortalFont80/0033.png b/fonts/MortalFont80/0033.png new file mode 100644 index 000000000..a4219cfed Binary files /dev/null and b/fonts/MortalFont80/0033.png differ diff --git a/fonts/MortalFont80/0034.png b/fonts/MortalFont80/0034.png new file mode 100644 index 000000000..f80ea4cb9 Binary files /dev/null and b/fonts/MortalFont80/0034.png differ diff --git a/fonts/MortalFont80/0035.png b/fonts/MortalFont80/0035.png new file mode 100644 index 000000000..81e84ffd0 Binary files /dev/null and b/fonts/MortalFont80/0035.png differ diff --git a/fonts/MortalFont80/0036.png b/fonts/MortalFont80/0036.png new file mode 100644 index 000000000..6f81ccc77 Binary files /dev/null and b/fonts/MortalFont80/0036.png differ diff --git a/fonts/MortalFont80/0037.png b/fonts/MortalFont80/0037.png new file mode 100644 index 000000000..5f4867e94 Binary files /dev/null and b/fonts/MortalFont80/0037.png differ diff --git a/fonts/MortalFont80/0038.png b/fonts/MortalFont80/0038.png new file mode 100644 index 000000000..0162f126f Binary files /dev/null and b/fonts/MortalFont80/0038.png differ diff --git a/fonts/MortalFont80/0039.png b/fonts/MortalFont80/0039.png new file mode 100644 index 000000000..71f2368af Binary files /dev/null and b/fonts/MortalFont80/0039.png differ diff --git a/fonts/MortalFont80/003A.png b/fonts/MortalFont80/003A.png new file mode 100644 index 000000000..5358207d9 Binary files /dev/null and b/fonts/MortalFont80/003A.png differ diff --git a/fonts/MortalFont80/003B.png b/fonts/MortalFont80/003B.png new file mode 100644 index 000000000..90dd5dcdf Binary files /dev/null and b/fonts/MortalFont80/003B.png differ diff --git a/fonts/MortalFont80/003C.png b/fonts/MortalFont80/003C.png new file mode 100644 index 000000000..30628842d Binary files /dev/null and b/fonts/MortalFont80/003C.png differ diff --git a/fonts/MortalFont80/003D.png b/fonts/MortalFont80/003D.png new file mode 100644 index 000000000..caf318796 Binary files /dev/null and b/fonts/MortalFont80/003D.png differ diff --git a/fonts/MortalFont80/003E.png b/fonts/MortalFont80/003E.png new file mode 100644 index 000000000..dab1da49e Binary files /dev/null and b/fonts/MortalFont80/003E.png differ diff --git a/fonts/MortalFont80/003F.png b/fonts/MortalFont80/003F.png new file mode 100644 index 000000000..eb7f3411e Binary files /dev/null and b/fonts/MortalFont80/003F.png differ diff --git a/fonts/MortalFont80/0040.png b/fonts/MortalFont80/0040.png new file mode 100644 index 000000000..faf7df314 Binary files /dev/null and b/fonts/MortalFont80/0040.png differ diff --git a/fonts/MortalFont80/0041.png b/fonts/MortalFont80/0041.png new file mode 100644 index 000000000..b1af7f5b6 Binary files /dev/null and b/fonts/MortalFont80/0041.png differ diff --git a/fonts/MortalFont80/0042.png b/fonts/MortalFont80/0042.png new file mode 100644 index 000000000..ad7b98adf Binary files /dev/null and b/fonts/MortalFont80/0042.png differ diff --git a/fonts/MortalFont80/0043.png b/fonts/MortalFont80/0043.png new file mode 100644 index 000000000..b24c972bb Binary files /dev/null and b/fonts/MortalFont80/0043.png differ diff --git a/fonts/MortalFont80/0044.png b/fonts/MortalFont80/0044.png new file mode 100644 index 000000000..d0923b179 Binary files /dev/null and b/fonts/MortalFont80/0044.png differ diff --git a/fonts/MortalFont80/0045.png b/fonts/MortalFont80/0045.png new file mode 100644 index 000000000..647bd9567 Binary files /dev/null and b/fonts/MortalFont80/0045.png differ diff --git a/fonts/MortalFont80/0046.png b/fonts/MortalFont80/0046.png new file mode 100644 index 000000000..b1de8cc8d Binary files /dev/null and b/fonts/MortalFont80/0046.png differ diff --git a/fonts/MortalFont80/0047.png b/fonts/MortalFont80/0047.png new file mode 100644 index 000000000..8b2ceebf2 Binary files /dev/null and b/fonts/MortalFont80/0047.png differ diff --git a/fonts/MortalFont80/0048.png b/fonts/MortalFont80/0048.png new file mode 100644 index 000000000..d419fd7ba Binary files /dev/null and b/fonts/MortalFont80/0048.png differ diff --git a/fonts/MortalFont80/0049.png b/fonts/MortalFont80/0049.png new file mode 100644 index 000000000..e2b5d3cf0 Binary files /dev/null and b/fonts/MortalFont80/0049.png differ diff --git a/fonts/MortalFont80/004A.png b/fonts/MortalFont80/004A.png new file mode 100644 index 000000000..68f068b7e Binary files /dev/null and b/fonts/MortalFont80/004A.png differ diff --git a/fonts/MortalFont80/004B.png b/fonts/MortalFont80/004B.png new file mode 100644 index 000000000..342e0dea1 Binary files /dev/null and b/fonts/MortalFont80/004B.png differ diff --git a/fonts/MortalFont80/004C.png b/fonts/MortalFont80/004C.png new file mode 100644 index 000000000..21062d378 Binary files /dev/null and b/fonts/MortalFont80/004C.png differ diff --git a/fonts/MortalFont80/004D.png b/fonts/MortalFont80/004D.png new file mode 100644 index 000000000..799fcb0ec Binary files /dev/null and b/fonts/MortalFont80/004D.png differ diff --git a/fonts/MortalFont80/004E.png b/fonts/MortalFont80/004E.png new file mode 100644 index 000000000..3d7df0ef2 Binary files /dev/null and b/fonts/MortalFont80/004E.png differ diff --git a/fonts/MortalFont80/004F.png b/fonts/MortalFont80/004F.png new file mode 100644 index 000000000..8d0275e71 Binary files /dev/null and b/fonts/MortalFont80/004F.png differ diff --git a/fonts/MortalFont80/0050.png b/fonts/MortalFont80/0050.png new file mode 100644 index 000000000..9b3c2d680 Binary files /dev/null and b/fonts/MortalFont80/0050.png differ diff --git a/fonts/MortalFont80/0051.png b/fonts/MortalFont80/0051.png new file mode 100644 index 000000000..0675a7592 Binary files /dev/null and b/fonts/MortalFont80/0051.png differ diff --git a/fonts/MortalFont80/0052.png b/fonts/MortalFont80/0052.png new file mode 100644 index 000000000..1d0433120 Binary files /dev/null and b/fonts/MortalFont80/0052.png differ diff --git a/fonts/MortalFont80/0053.png b/fonts/MortalFont80/0053.png new file mode 100644 index 000000000..3f6352e08 Binary files /dev/null and b/fonts/MortalFont80/0053.png differ diff --git a/fonts/MortalFont80/0054.png b/fonts/MortalFont80/0054.png new file mode 100644 index 000000000..cd592a404 Binary files /dev/null and b/fonts/MortalFont80/0054.png differ diff --git a/fonts/MortalFont80/0055.png b/fonts/MortalFont80/0055.png new file mode 100644 index 000000000..259d5fd21 Binary files /dev/null and b/fonts/MortalFont80/0055.png differ diff --git a/fonts/MortalFont80/0056.png b/fonts/MortalFont80/0056.png new file mode 100644 index 000000000..3eba9129c Binary files /dev/null and b/fonts/MortalFont80/0056.png differ diff --git a/fonts/MortalFont80/0057.png b/fonts/MortalFont80/0057.png new file mode 100644 index 000000000..ae4f5f887 Binary files /dev/null and b/fonts/MortalFont80/0057.png differ diff --git a/fonts/MortalFont80/0058.png b/fonts/MortalFont80/0058.png new file mode 100644 index 000000000..a4be088b6 Binary files /dev/null and b/fonts/MortalFont80/0058.png differ diff --git a/fonts/MortalFont80/0059.png b/fonts/MortalFont80/0059.png new file mode 100644 index 000000000..ba210ec86 Binary files /dev/null and b/fonts/MortalFont80/0059.png differ diff --git a/fonts/MortalFont80/005A.png b/fonts/MortalFont80/005A.png new file mode 100644 index 000000000..0af5c4ce4 Binary files /dev/null and b/fonts/MortalFont80/005A.png differ diff --git a/fonts/MortalFont80/005B.png b/fonts/MortalFont80/005B.png new file mode 100644 index 000000000..a0f1f7505 Binary files /dev/null and b/fonts/MortalFont80/005B.png differ diff --git a/fonts/MortalFont80/005C.png b/fonts/MortalFont80/005C.png new file mode 100644 index 000000000..159e61014 Binary files /dev/null and b/fonts/MortalFont80/005C.png differ diff --git a/fonts/MortalFont80/005D.png b/fonts/MortalFont80/005D.png new file mode 100644 index 000000000..4dcde860f Binary files /dev/null and b/fonts/MortalFont80/005D.png differ diff --git a/fonts/MortalFont80/005E.png b/fonts/MortalFont80/005E.png new file mode 100644 index 000000000..6f9cb5954 Binary files /dev/null and b/fonts/MortalFont80/005E.png differ diff --git a/fonts/MortalFont80/005F.png b/fonts/MortalFont80/005F.png new file mode 100644 index 000000000..4b82bd23b Binary files /dev/null and b/fonts/MortalFont80/005F.png differ diff --git a/fonts/MortalFont80/0060.png b/fonts/MortalFont80/0060.png new file mode 100644 index 000000000..f884d8040 Binary files /dev/null and b/fonts/MortalFont80/0060.png differ diff --git a/fonts/MortalFont80/0061.png b/fonts/MortalFont80/0061.png new file mode 100644 index 000000000..5d58ebd3c Binary files /dev/null and b/fonts/MortalFont80/0061.png differ diff --git a/fonts/MortalFont80/0062.png b/fonts/MortalFont80/0062.png new file mode 100644 index 000000000..4e9efc920 Binary files /dev/null and b/fonts/MortalFont80/0062.png differ diff --git a/fonts/MortalFont80/0063.png b/fonts/MortalFont80/0063.png new file mode 100644 index 000000000..efb039ba9 Binary files /dev/null and b/fonts/MortalFont80/0063.png differ diff --git a/fonts/MortalFont80/0064.png b/fonts/MortalFont80/0064.png new file mode 100644 index 000000000..3060c256a Binary files /dev/null and b/fonts/MortalFont80/0064.png differ diff --git a/fonts/MortalFont80/0065.png b/fonts/MortalFont80/0065.png new file mode 100644 index 000000000..d77e501a4 Binary files /dev/null and b/fonts/MortalFont80/0065.png differ diff --git a/fonts/MortalFont80/0066.png b/fonts/MortalFont80/0066.png new file mode 100644 index 000000000..1c43feaca Binary files /dev/null and b/fonts/MortalFont80/0066.png differ diff --git a/fonts/MortalFont80/0067.png b/fonts/MortalFont80/0067.png new file mode 100644 index 000000000..f2603b5f8 Binary files /dev/null and b/fonts/MortalFont80/0067.png differ diff --git a/fonts/MortalFont80/0068.png b/fonts/MortalFont80/0068.png new file mode 100644 index 000000000..becba7746 Binary files /dev/null and b/fonts/MortalFont80/0068.png differ diff --git a/fonts/MortalFont80/0069.png b/fonts/MortalFont80/0069.png new file mode 100644 index 000000000..7e88b6c0c Binary files /dev/null and b/fonts/MortalFont80/0069.png differ diff --git a/fonts/MortalFont80/006A.png b/fonts/MortalFont80/006A.png new file mode 100644 index 000000000..87aa67b57 Binary files /dev/null and b/fonts/MortalFont80/006A.png differ diff --git a/fonts/MortalFont80/006B.png b/fonts/MortalFont80/006B.png new file mode 100644 index 000000000..ca440a9b9 Binary files /dev/null and b/fonts/MortalFont80/006B.png differ diff --git a/fonts/MortalFont80/006C.png b/fonts/MortalFont80/006C.png new file mode 100644 index 000000000..44aa41828 Binary files /dev/null and b/fonts/MortalFont80/006C.png differ diff --git a/fonts/MortalFont80/006D.png b/fonts/MortalFont80/006D.png new file mode 100644 index 000000000..b3a438375 Binary files /dev/null and b/fonts/MortalFont80/006D.png differ diff --git a/fonts/MortalFont80/006E.png b/fonts/MortalFont80/006E.png new file mode 100644 index 000000000..048f02209 Binary files /dev/null and b/fonts/MortalFont80/006E.png differ diff --git a/fonts/MortalFont80/006F.png b/fonts/MortalFont80/006F.png new file mode 100644 index 000000000..6fbddc94e Binary files /dev/null and b/fonts/MortalFont80/006F.png differ diff --git a/fonts/MortalFont80/0070.png b/fonts/MortalFont80/0070.png new file mode 100644 index 000000000..8d92d892e Binary files /dev/null and b/fonts/MortalFont80/0070.png differ diff --git a/fonts/MortalFont80/0071.png b/fonts/MortalFont80/0071.png new file mode 100644 index 000000000..8ab18c5a3 Binary files /dev/null and b/fonts/MortalFont80/0071.png differ diff --git a/fonts/MortalFont80/0072.png b/fonts/MortalFont80/0072.png new file mode 100644 index 000000000..2670c10ab Binary files /dev/null and b/fonts/MortalFont80/0072.png differ diff --git a/fonts/MortalFont80/0073.png b/fonts/MortalFont80/0073.png new file mode 100644 index 000000000..2ba2e5090 Binary files /dev/null and b/fonts/MortalFont80/0073.png differ diff --git a/fonts/MortalFont80/0074.png b/fonts/MortalFont80/0074.png new file mode 100644 index 000000000..7e9799864 Binary files /dev/null and b/fonts/MortalFont80/0074.png differ diff --git a/fonts/MortalFont80/0075.png b/fonts/MortalFont80/0075.png new file mode 100644 index 000000000..a1f44ac55 Binary files /dev/null and b/fonts/MortalFont80/0075.png differ diff --git a/fonts/MortalFont80/0076.png b/fonts/MortalFont80/0076.png new file mode 100644 index 000000000..4fb7b1df9 Binary files /dev/null and b/fonts/MortalFont80/0076.png differ diff --git a/fonts/MortalFont80/0077.png b/fonts/MortalFont80/0077.png new file mode 100644 index 000000000..2e5e40340 Binary files /dev/null and b/fonts/MortalFont80/0077.png differ diff --git a/fonts/MortalFont80/0078.png b/fonts/MortalFont80/0078.png new file mode 100644 index 000000000..e6b602bab Binary files /dev/null and b/fonts/MortalFont80/0078.png differ diff --git a/fonts/MortalFont80/0079.png b/fonts/MortalFont80/0079.png new file mode 100644 index 000000000..ed4e8cb7c Binary files /dev/null and b/fonts/MortalFont80/0079.png differ diff --git a/fonts/MortalFont80/007A.png b/fonts/MortalFont80/007A.png new file mode 100644 index 000000000..2613e8bcc Binary files /dev/null and b/fonts/MortalFont80/007A.png differ diff --git a/fonts/MortalFont80/007B.png b/fonts/MortalFont80/007B.png new file mode 100644 index 000000000..740515b75 Binary files /dev/null and b/fonts/MortalFont80/007B.png differ diff --git a/fonts/MortalFont80/007C.png b/fonts/MortalFont80/007C.png new file mode 100644 index 000000000..53725117f Binary files /dev/null and b/fonts/MortalFont80/007C.png differ diff --git a/fonts/MortalFont80/007D.png b/fonts/MortalFont80/007D.png new file mode 100644 index 000000000..7e8df816c Binary files /dev/null and b/fonts/MortalFont80/007D.png differ diff --git a/fonts/MortalFont80/007E.png b/fonts/MortalFont80/007E.png new file mode 100644 index 000000000..fe0943d24 Binary files /dev/null and b/fonts/MortalFont80/007E.png differ diff --git a/fonts/MortalFont80/font.inf b/fonts/MortalFont80/font.inf new file mode 100644 index 000000000..1f4740726 --- /dev/null +++ b/fonts/MortalFont80/font.inf @@ -0,0 +1,4 @@ +TranslationType Standard +SpaceWidth 42 +FontHeight 81 +Kerning -1 diff --git a/gldefs.mortalrifle b/gldefs.mortalrifle index 2772e85e1..745b8ee1d 100644 --- a/gldefs.mortalrifle +++ b/gldefs.mortalrifle @@ -1,3 +1,12 @@ +Brightmap Texture "models/MortalSight.png" +{ + Map "brightmaps/fullbright.png" +} +HardwareShader Texture "models/MortalSight.png" +{ + Shader "shaders/glsl/Overbright.fp" + Define "OVERFACT" = "4." +} HardwareShader Texture "models/MortalRifle.png" { Shader "shaders/glsl/Envmask.fp" @@ -9,5 +18,85 @@ HardwareShader Texture "models/MortalRifle.png" Define "RIMFACT" = "1.2" Define "RIMSTEP" = ".2" } - - +Brightmap Texture "models/MortalMag.png" +{ + Map "models/MortalMag_bright.png" +} +Brightmap Texture "models/MortalMag_Empty.png" +{ + Map "models/MortalMag_bright.png" +} +HardwareShader Texture "models/MortalMag.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalMag_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} +HardwareShader Texture "models/MortalMag_Empty.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalMag_Empty_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} +HardwareShader Texture "models/MortalRound.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalRound_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} +HardwareShader Texture "models/MortalRound_Used.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalRound_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} +Brightmap Texture "models/MortalGrenade.png" +{ + Map "models/MortalGrenade_bright.png" +} +Brightmap Texture "models/MortalGrenade_Used.png" +{ + Map "models/MortalGrenade_bright.png" +} +HardwareShader Texture "models/MortalGrenade.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalGrenade_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} +HardwareShader Texture "models/MortalGrenade_Used.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/MortalGrenade_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1.5" + Define "RIMFACT" = "1.2" + Define "RIMSTEP" = ".2" +} diff --git a/graphics/HUD/MisterDisplay.png b/graphics/HUD/MisterDisplay.png index 5ccde389f..c7e19755d 100644 Binary files a/graphics/HUD/MisterDisplay.png and b/graphics/HUD/MisterDisplay.png differ diff --git a/graphics/HUD/MisterRound.png b/graphics/HUD/MisterRound.png index 283c0ff87..b8d0045ee 100644 Binary files a/graphics/HUD/MisterRound.png and b/graphics/HUD/MisterRound.png differ diff --git a/language.version b/language.version index c7f6a1580..4f10f5307 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r410 \cu(Tue 6 Sep 21:44:57 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r410 \cu(2022-09-06 21:44:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r411 \cu(Wed 7 Sep 19:46:56 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r411 \cu(2022-09-07 19:46:56)\c-"; diff --git a/modeldef.dlcammo b/modeldef.dlcammo index a02bb496d..f64c0d8f7 100644 --- a/modeldef.dlcammo +++ b/modeldef.dlcammo @@ -302,75 +302,70 @@ Model "RayAmmo" Model "MisterRound" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalRound1_d.3d" + Skin 0 "MortalRound.png" + Scale 0.03 0.03 0.03 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterRound2" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalRound2_d.3d" + Skin 0 "MortalRound.png" + Scale 0.03 0.03 0.03 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterRound3" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalRound3_d.3d" + Skin 0 "MortalRound.png" + Scale 0.03 0.03 0.03 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterRound5" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalRound5_d.3d" + Skin 0 "MortalRound.png" + Scale 0.03 0.03 0.03 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterRound10" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalRound10_d.3d" + Skin 0 "MortalRound.png" + Scale 0.03 0.03 0.03 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterAmmo" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" + Model 0 "MortalMag_d.3d" + Skin 0 "MortalMag.png" Scale 0.03 0.03 0.03 ZOffset 16 PitchOffset 30 @@ -380,39 +375,26 @@ Model "MisterAmmo" } Model "MisterGAmmo" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.02 0.02 0.02 + Model 0 "MortalGrenadeAmmo1_d.3d" + Skin 0 "MortalGrenade.png" + Scale 0.06 0.06 0.06 ZOffset 16 - PitchOffset 30 + AngleOffset -90 + RollOffset 30 ROTATING FrameIndex XZW1 A 0 0 } Model "MisterGAmmo2" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.025 0.025 0.025 + Model 0 "MortalGrenadeAmmo2_d.3d" + Skin 0 "MortalGrenade.png" + Scale 0.06 0.06 0.06 ZOffset 16 - PitchOffset 30 - ROTATING - - FrameIndex XZW1 A 0 0 -} -Model "MisterGAmmo3" -{ - Path "models/extra" - - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILY" - Scale 0.03 0.03 0.03 - ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 diff --git a/modeldef.mortalrifle b/modeldef.mortalrifle index 8ed3af756..6f35e5f6d 100644 --- a/modeldef.mortalrifle +++ b/modeldef.mortalrifle @@ -5,10 +5,12 @@ Model "MisterRifle" Model 0 "MortalRiflePickup_d.3d" SurfaceSkin 0 0 "MortalRifle.png" SurfaceSkin 0 1 "NoLED.png" + SurfaceSkin 0 4 "MortalMag.png" Scale 0.25 0.25 0.25 ZOffset 20 AngleOffset 90 ROTATING + DONTCULLBACKFACES FrameIndex XZW1 A 0 0 } @@ -17,7 +19,7 @@ Model "MisterRifleX" Path "models" Model 0 "MortalRiflePickup_d.3d" - SurfaceSkin 0 3 "MisterSight.png" + SurfaceSkin 0 3 "MortalSight.png" Scale 0.25 0.25 0.25 ZOffset 20 AngleOffset 90 diff --git a/models/MisterSight.png b/models/MisterSight.png deleted file mode 100644 index a7c7329da..000000000 Binary files a/models/MisterSight.png and /dev/null differ diff --git a/models/MortalCasing_a.3d b/models/MortalCasing_a.3d new file mode 100644 index 000000000..cf74498af Binary files /dev/null and b/models/MortalCasing_a.3d differ diff --git a/models/MortalCasing_d.3d b/models/MortalCasing_d.3d new file mode 100644 index 000000000..75eed0697 Binary files /dev/null and b/models/MortalCasing_d.3d differ diff --git a/models/MortalGrenade.png b/models/MortalGrenade.png new file mode 100644 index 000000000..b11449f84 Binary files /dev/null and b/models/MortalGrenade.png differ diff --git a/models/MortalGrenadeAmmo1_a.3d b/models/MortalGrenadeAmmo1_a.3d new file mode 100644 index 000000000..e312f085b Binary files /dev/null and b/models/MortalGrenadeAmmo1_a.3d differ diff --git a/models/MortalGrenadeAmmo1_d.3d b/models/MortalGrenadeAmmo1_d.3d new file mode 100644 index 000000000..657ffc890 Binary files /dev/null and b/models/MortalGrenadeAmmo1_d.3d differ diff --git a/models/MortalGrenadeAmmo2_a.3d b/models/MortalGrenadeAmmo2_a.3d new file mode 100644 index 000000000..fff91ead6 Binary files /dev/null and b/models/MortalGrenadeAmmo2_a.3d differ diff --git a/models/MortalGrenadeAmmo2_d.3d b/models/MortalGrenadeAmmo2_d.3d new file mode 100644 index 000000000..c2f5ae9e4 Binary files /dev/null and b/models/MortalGrenadeAmmo2_d.3d differ diff --git a/models/MortalGrenadeCasing_a.3d b/models/MortalGrenadeCasing_a.3d new file mode 100644 index 000000000..390feadc0 Binary files /dev/null and b/models/MortalGrenadeCasing_a.3d differ diff --git a/models/MortalGrenadeCasing_d.3d b/models/MortalGrenadeCasing_d.3d new file mode 100644 index 000000000..789c53197 Binary files /dev/null and b/models/MortalGrenadeCasing_d.3d differ diff --git a/models/MortalGrenade_Used.png b/models/MortalGrenade_Used.png new file mode 100644 index 000000000..176593251 Binary files /dev/null and b/models/MortalGrenade_Used.png differ diff --git a/models/MortalGrenade_a.3d b/models/MortalGrenade_a.3d new file mode 100644 index 000000000..98617b183 Binary files /dev/null and b/models/MortalGrenade_a.3d differ diff --git a/models/MortalGrenade_bright.png b/models/MortalGrenade_bright.png new file mode 100644 index 000000000..944645eea Binary files /dev/null and b/models/MortalGrenade_bright.png differ diff --git a/models/MortalGrenade_d.3d b/models/MortalGrenade_d.3d new file mode 100644 index 000000000..0fc9fcd54 Binary files /dev/null and b/models/MortalGrenade_d.3d differ diff --git a/models/MortalGrenade_mask.png b/models/MortalGrenade_mask.png new file mode 100644 index 000000000..8f77b0283 Binary files /dev/null and b/models/MortalGrenade_mask.png differ diff --git a/models/MisterLED.png b/models/MortalLED.png similarity index 100% rename from models/MisterLED.png rename to models/MortalLED.png diff --git a/models/MisterLED2.png b/models/MortalLED2.png similarity index 100% rename from models/MisterLED2.png rename to models/MortalLED2.png diff --git a/models/MortalMag.png b/models/MortalMag.png new file mode 100644 index 000000000..d24232398 Binary files /dev/null and b/models/MortalMag.png differ diff --git a/models/MortalMag_Empty.png b/models/MortalMag_Empty.png new file mode 100644 index 000000000..79ca083eb Binary files /dev/null and b/models/MortalMag_Empty.png differ diff --git a/models/MortalMag_Empty_mask.png b/models/MortalMag_Empty_mask.png new file mode 100644 index 000000000..02db43754 Binary files /dev/null and b/models/MortalMag_Empty_mask.png differ diff --git a/models/MortalMag_a.3d b/models/MortalMag_a.3d new file mode 100644 index 000000000..40d5f1843 Binary files /dev/null and b/models/MortalMag_a.3d differ diff --git a/models/MortalMag_bright.png b/models/MortalMag_bright.png new file mode 100644 index 000000000..73b2b7eca Binary files /dev/null and b/models/MortalMag_bright.png differ diff --git a/models/MortalMag_d.3d b/models/MortalMag_d.3d new file mode 100644 index 000000000..71912b94b Binary files /dev/null and b/models/MortalMag_d.3d differ diff --git a/models/MortalMag_mask.png b/models/MortalMag_mask.png new file mode 100644 index 000000000..e3f3dc10e Binary files /dev/null and b/models/MortalMag_mask.png differ diff --git a/models/MortalRifle.blend b/models/MortalRifle.blend index 28c82faeb..d1bdad4be 100644 Binary files a/models/MortalRifle.blend and b/models/MortalRifle.blend differ diff --git a/models/MortalRifle.png b/models/MortalRifle.png index ca8cba6f5..0a71806c4 100644 Binary files a/models/MortalRifle.png and b/models/MortalRifle.png differ diff --git a/models/MortalRiflePickup_a.3d b/models/MortalRiflePickup_a.3d index a3b976779..3ffdb40fa 100644 Binary files a/models/MortalRiflePickup_a.3d and b/models/MortalRiflePickup_a.3d differ diff --git a/models/MortalRiflePickup_d.3d b/models/MortalRiflePickup_d.3d index a50c7db4c..bc3609c5e 100644 Binary files a/models/MortalRiflePickup_d.3d and b/models/MortalRiflePickup_d.3d differ diff --git a/models/MortalRound.png b/models/MortalRound.png new file mode 100644 index 000000000..6e559d892 Binary files /dev/null and b/models/MortalRound.png differ diff --git a/models/MortalRound10_a.3d b/models/MortalRound10_a.3d new file mode 100644 index 000000000..537436569 Binary files /dev/null and b/models/MortalRound10_a.3d differ diff --git a/models/MortalRound10_d.3d b/models/MortalRound10_d.3d new file mode 100644 index 000000000..a3c79ef80 Binary files /dev/null and b/models/MortalRound10_d.3d differ diff --git a/models/MortalRound1_a.3d b/models/MortalRound1_a.3d new file mode 100644 index 000000000..2f9e5109f Binary files /dev/null and b/models/MortalRound1_a.3d differ diff --git a/models/MortalRound1_d.3d b/models/MortalRound1_d.3d new file mode 100644 index 000000000..d36442023 Binary files /dev/null and b/models/MortalRound1_d.3d differ diff --git a/models/MortalRound2_a.3d b/models/MortalRound2_a.3d new file mode 100644 index 000000000..ae5e6cd94 Binary files /dev/null and b/models/MortalRound2_a.3d differ diff --git a/models/MortalRound2_d.3d b/models/MortalRound2_d.3d new file mode 100644 index 000000000..e54f40e1e Binary files /dev/null and b/models/MortalRound2_d.3d differ diff --git a/models/MortalRound3_a.3d b/models/MortalRound3_a.3d new file mode 100644 index 000000000..3decfda5b Binary files /dev/null and b/models/MortalRound3_a.3d differ diff --git a/models/MortalRound3_d.3d b/models/MortalRound3_d.3d new file mode 100644 index 000000000..20046c1f4 Binary files /dev/null and b/models/MortalRound3_d.3d differ diff --git a/models/MortalRound5_a.3d b/models/MortalRound5_a.3d new file mode 100644 index 000000000..cc2794664 Binary files /dev/null and b/models/MortalRound5_a.3d differ diff --git a/models/MortalRound5_d.3d b/models/MortalRound5_d.3d new file mode 100644 index 000000000..0101095b4 Binary files /dev/null and b/models/MortalRound5_d.3d differ diff --git a/models/MortalRound_Used.png b/models/MortalRound_Used.png new file mode 100644 index 000000000..979e5dec7 Binary files /dev/null and b/models/MortalRound_Used.png differ diff --git a/models/MortalRound_mask.png b/models/MortalRound_mask.png new file mode 100644 index 000000000..52c47744f Binary files /dev/null and b/models/MortalRound_mask.png differ diff --git a/models/MortalSight.png b/models/MortalSight.png new file mode 100644 index 000000000..294d75ea3 Binary files /dev/null and b/models/MortalSight.png differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 8d5daa938..00bfe74da 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -26,10 +26,10 @@ Ammo models: - Sparkster Ammo - Kinylum Round - Nokron Round - - Mortal Rifle Ammo - - Round - - Mag - - Grenade + x Mortal Rifle Ammo + x Round + x Mag + x Grenade - Ray-Khom Ammo - Single - Mag diff --git a/shaders/glsl/Overbright.fp b/shaders/glsl/Overbright.fp new file mode 100644 index 000000000..a86d1cf65 --- /dev/null +++ b/shaders/glsl/Overbright.fp @@ -0,0 +1,13 @@ +// multiplies rgb and brightmap intensity + +void SetupMaterial( inout Material mat ) +{ + mat.Base = getTexel(vTexCoord.st); + mat.Base.rgb *= OVERFACT; + mat.Normal = ApplyNormalMap(vTexCoord.st); + if ( (uTextureMode&TEXF_Brightmap) != 0 ) + { + mat.Bright = texture(brighttexture,vTexCoord.st); + mat.Bright.rgb *= OVERFACT; + } +} diff --git a/sndinfo.dlcweapons b/sndinfo.dlcweapons index ae45a9395..bc225c8c9 100644 --- a/sndinfo.dlcweapons +++ b/sndinfo.dlcweapons @@ -120,6 +120,8 @@ mister/meleeend sounds/dlc1/mister/mr_meleeend.ogg mister/boltback sounds/dlc1/mister/mr_boltback.ogg mister/boltforward sounds/dlc1/mister/mr_boltforward.ogg mister/fireselect sounds/dlc1/mister/mr_firesel.ogg +mister/lowammo sounds/dlc1/mister/mr_lowammo.ogg +mister/noammo sounds/dlc1/mister/mr_noammo.ogg mister/firesemi sounds/dlc1/mister/mr_fire_semi.ogg mister/firescatter sounds/dlc1/mister/mr_fire_scatter.ogg mister/firestream sounds/dlc1/mister/mr_fire_stream.ogg diff --git a/sounds/dlc1/mister/mr_firesel.ogg b/sounds/dlc1/mister/mr_firesel.ogg index d0ade4092..8bf9b6055 100644 Binary files a/sounds/dlc1/mister/mr_firesel.ogg and b/sounds/dlc1/mister/mr_firesel.ogg differ diff --git a/sounds/dlc1/mister/mr_lowammo.ogg b/sounds/dlc1/mister/mr_lowammo.ogg new file mode 100644 index 000000000..0ad978fe1 Binary files /dev/null and b/sounds/dlc1/mister/mr_lowammo.ogg differ diff --git a/sounds/dlc1/mister/mr_noammo.ogg b/sounds/dlc1/mister/mr_noammo.ogg new file mode 100644 index 000000000..d27d9ca53 Binary files /dev/null and b/sounds/dlc1/mister/mr_noammo.ogg differ diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 3d940b7be..8b6ce852e 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -302,6 +302,8 @@ Class MisterRound : MagAmmo Inventory.MaxAmount 20; +FLOATBOB; FloatBobStrength 0.25; + Radius .5; + Height 20; } States { @@ -315,6 +317,7 @@ Class MisterRound2 : MisterRound Default { Inventory.Amount 2; + Radius .75; } } Class MisterRound3 : MisterRound @@ -322,6 +325,7 @@ Class MisterRound3 : MisterRound Default { Inventory.Amount 3; + Radius 1; } } Class MisterRound5 : MisterRound @@ -329,6 +333,7 @@ Class MisterRound5 : MisterRound Default { Inventory.Amount 5; + Radius 1.25; } } Class MisterRound10 : MisterRound @@ -336,6 +341,7 @@ Class MisterRound10 : MisterRound Default { Inventory.Amount 10; + Radius 1.5; } } @@ -355,6 +361,8 @@ Class MisterAmmo : SWWMAmmo +FLOATBOB; FloatBobStrength 0.25; Accuracy 90; + Radius 4; + Height 23; } States { @@ -379,6 +387,8 @@ Class MisterGAmmo : SWWMAmmo +FLOATBOB; FloatBobStrength 0.25; Accuracy 90; + Radius 4; + Height 21; } States { @@ -392,13 +402,7 @@ Class MisterGAmmo2 : MisterGAmmo Default { Inventory.Amount 2; - } -} -Class MisterGAmmo3 : MisterGAmmo -{ - Default - { - Inventory.Amount 3; + Radius 5; } } diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index 39a978c8c..68f29950f 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -273,7 +273,7 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner { bool aex = SWWMUtility.ItemExists('CandyGun',ownedonly:enemydrop), bex = SWWMUtility.ItemExists('MisterRifle',ownedonly:enemydrop); - if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo'; + if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return !Random[Replacements](0,2)?'MisterGAmmo2':Random[Replacements](0,2)?'MisterRound10':'MisterAmmo'; if ( aex ) return Random[Replacements](0,3)?'CandyGunBullets3':'CandyGunAmmo'; } bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop),