From 80972d21b8a92213969a0e78b9dcb8da496eac9a Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Mon, 20 Apr 2020 11:48:14 -0400 Subject: [PATCH] Add the USS Texas and the U-2501. Add 'USS' to American ship names --- media/vehicles/warships/u-2501-front.svg | 110 + media/vehicles/warships/u-2501-side.svg | 151 + media/vehicles/warships/u-2501-top.svg | 109 + ...nt.svg => uss-enterprise-(cv-6)-front.svg} | 0 ...ide.svg => uss-enterprise-(cv-6)-side.svg} | 0 ...-top.svg => uss-enterprise-(cv-6)-top.svg} | 0 .../{hill-front.svg => uss-hill-front.svg} | 0 .../{hill-side.svg => uss-hill-side.svg} | 0 .../{hill-top.svg => uss-hill-top.svg} | 0 media/vehicles/warships/uss-texas-front.svg | 2076 +++++++++++ media/vehicles/warships/uss-texas-side.svg | 3238 +++++++++++++++++ media/vehicles/warships/uss-texas-top.svg | 2205 +++++++++++ presets/vehicles.js | 22 +- 13 files changed, 7909 insertions(+), 2 deletions(-) create mode 100644 media/vehicles/warships/u-2501-front.svg create mode 100644 media/vehicles/warships/u-2501-side.svg create mode 100644 media/vehicles/warships/u-2501-top.svg rename media/vehicles/warships/{enterprise-cv-6-front.svg => uss-enterprise-(cv-6)-front.svg} (100%) rename media/vehicles/warships/{enterprise-cv-6-side.svg => uss-enterprise-(cv-6)-side.svg} (100%) rename media/vehicles/warships/{enterprise-cv-6-top.svg => uss-enterprise-(cv-6)-top.svg} (100%) rename media/vehicles/warships/{hill-front.svg => uss-hill-front.svg} (100%) rename media/vehicles/warships/{hill-side.svg => uss-hill-side.svg} (100%) rename media/vehicles/warships/{hill-top.svg => uss-hill-top.svg} (100%) create mode 100644 media/vehicles/warships/uss-texas-front.svg create mode 100644 media/vehicles/warships/uss-texas-side.svg create mode 100644 media/vehicles/warships/uss-texas-top.svg diff --git a/media/vehicles/warships/u-2501-front.svg b/media/vehicles/warships/u-2501-front.svg new file mode 100644 index 00000000..7b7bef0f --- /dev/null +++ b/media/vehicles/warships/u-2501-front.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/warships/u-2501-side.svg b/media/vehicles/warships/u-2501-side.svg new file mode 100644 index 00000000..81bb77c3 --- /dev/null +++ b/media/vehicles/warships/u-2501-side.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + diff --git a/media/vehicles/warships/u-2501-top.svg b/media/vehicles/warships/u-2501-top.svg new file mode 100644 index 00000000..1f739e6f --- /dev/null +++ b/media/vehicles/warships/u-2501-top.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + diff --git a/media/vehicles/warships/enterprise-cv-6-front.svg b/media/vehicles/warships/uss-enterprise-(cv-6)-front.svg similarity index 100% rename from media/vehicles/warships/enterprise-cv-6-front.svg rename to media/vehicles/warships/uss-enterprise-(cv-6)-front.svg diff --git a/media/vehicles/warships/enterprise-cv-6-side.svg b/media/vehicles/warships/uss-enterprise-(cv-6)-side.svg similarity index 100% rename from media/vehicles/warships/enterprise-cv-6-side.svg rename to media/vehicles/warships/uss-enterprise-(cv-6)-side.svg diff --git a/media/vehicles/warships/enterprise-cv-6-top.svg b/media/vehicles/warships/uss-enterprise-(cv-6)-top.svg similarity index 100% rename from media/vehicles/warships/enterprise-cv-6-top.svg rename to media/vehicles/warships/uss-enterprise-(cv-6)-top.svg diff --git a/media/vehicles/warships/hill-front.svg b/media/vehicles/warships/uss-hill-front.svg similarity index 100% rename from media/vehicles/warships/hill-front.svg rename to media/vehicles/warships/uss-hill-front.svg diff --git a/media/vehicles/warships/hill-side.svg b/media/vehicles/warships/uss-hill-side.svg similarity index 100% rename from media/vehicles/warships/hill-side.svg rename to media/vehicles/warships/uss-hill-side.svg diff --git a/media/vehicles/warships/hill-top.svg b/media/vehicles/warships/uss-hill-top.svg similarity index 100% rename from media/vehicles/warships/hill-top.svg rename to media/vehicles/warships/uss-hill-top.svg diff --git a/media/vehicles/warships/uss-texas-front.svg b/media/vehicles/warships/uss-texas-front.svg new file mode 100644 index 00000000..143db293 --- /dev/null +++ b/media/vehicles/warships/uss-texas-front.svg @@ -0,0 +1,2076 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/warships/uss-texas-side.svg b/media/vehicles/warships/uss-texas-side.svg new file mode 100644 index 00000000..3bf5386d --- /dev/null +++ b/media/vehicles/warships/uss-texas-side.svg @@ -0,0 +1,3238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/warships/uss-texas-top.svg b/media/vehicles/warships/uss-texas-top.svg new file mode 100644 index 00000000..dd40bfff --- /dev/null +++ b/media/vehicles/warships/uss-texas-top.svg @@ -0,0 +1,2205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presets/vehicles.js b/presets/vehicles.js index ebd99e86..2614fa5c 100644 --- a/presets/vehicles.js +++ b/presets/vehicles.js @@ -467,7 +467,7 @@ function makeVehicles() { } }, { - name: "Enterprise CV-6", + name: "USS Enterprise (CV-6)", mass: math.unit(32060, "tons"), sides: { "Side": { height: math.unit(164.5, "feet") }, @@ -476,7 +476,7 @@ function makeVehicles() { } }, { - name: "Hill", + name: "USS Hill", mass: math.unit(1590, "tons"), sides: { "Side": { height: math.unit(100.2, "feet") }, @@ -484,6 +484,24 @@ function makeVehicles() { "Top": { height: math.unit(306, "feet") }, } }, + { + name: "USS Texas", + mass: math.unit(32060, "tons"), + sides: { + "Side": { height: math.unit(215.2, "feet") }, + "Front": { height: math.unit(215.2, "feet") }, + "Top": { height: math.unit(827.5, "feet") }, + } + }, + { + name: "U-2501", + mass: math.unit(1621, "tonnes"), + sides: { + "Side": { height: math.unit(13, "meters") }, + "Front": { height: math.unit(13, "meters") }, + "Top": { height: math.unit(76.7, "meters") }, + } + }, ], "Warships", "")