From 4119f666d7f084bbc993a67a07c45c0e955013bc Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sun, 11 Oct 2020 18:08:47 -0400 Subject: [PATCH] Update tanks to use the same system as warships. Add some new tanks --- media/vehicles/Tanks/Churchill I-front.svg | 50 ++ media/vehicles/Tanks/Churchill I-side.svg | 116 +++++ media/vehicles/Tanks/Churchill I-top.svg | 68 +++ media/vehicles/Tanks/Leopard 1-front.svg | 50 ++ media/vehicles/Tanks/Leopard 1-side.svg | 59 +++ media/vehicles/Tanks/Leopard 1-top.svg | 68 +++ media/vehicles/Tanks/Panther II-front.svg | 65 +++ media/vehicles/Tanks/Panther II-side.svg | 71 +++ media/vehicles/Tanks/Panther II-top.svg | 53 ++ .../vehicles/Tanks/Pz.Kpfw. III_IV-front.svg | 50 ++ media/vehicles/Tanks/Pz.Kpfw. III_IV-side.svg | 56 +++ media/vehicles/Tanks/Pz.Kpfw. III_IV-top.svg | 95 ++++ media/vehicles/Tanks/Super Hellcat-front.svg | 74 +++ media/vehicles/Tanks/Super Hellcat-side.svg | 104 ++++ media/vehicles/Tanks/Super Hellcat-top.svg | 59 +++ media/vehicles/Tanks/T-34-front.svg | 50 ++ media/vehicles/Tanks/T-34-side.svg | 53 ++ media/vehicles/Tanks/T-34-top.svg | 77 +++ media/vehicles/Tanks/T28-front.svg | 59 +++ media/vehicles/Tanks/T28-side.svg | 74 +++ media/vehicles/Tanks/T28-top.svg | 83 ++++ media/vehicles/tanks/leopard-i-front.svg | 280 ----------- media/vehicles/tanks/leopard-i-side.svg | 461 ------------------ media/vehicles/tanks/leopard-i-top.svg | 347 ------------- .../tanks/t95-super-heavy-tank-front.svg | 181 ------- .../tanks/t95-super-heavy-tank-side.svg | 374 -------------- .../tanks/t95-super-heavy-tank-top.svg | 182 ------- presets/vehicles.js | 81 ++- 28 files changed, 1495 insertions(+), 1845 deletions(-) create mode 100644 media/vehicles/Tanks/Churchill I-front.svg create mode 100644 media/vehicles/Tanks/Churchill I-side.svg create mode 100644 media/vehicles/Tanks/Churchill I-top.svg create mode 100644 media/vehicles/Tanks/Leopard 1-front.svg create mode 100644 media/vehicles/Tanks/Leopard 1-side.svg create mode 100644 media/vehicles/Tanks/Leopard 1-top.svg create mode 100644 media/vehicles/Tanks/Panther II-front.svg create mode 100644 media/vehicles/Tanks/Panther II-side.svg create mode 100644 media/vehicles/Tanks/Panther II-top.svg create mode 100644 media/vehicles/Tanks/Pz.Kpfw. III_IV-front.svg create mode 100644 media/vehicles/Tanks/Pz.Kpfw. III_IV-side.svg create mode 100644 media/vehicles/Tanks/Pz.Kpfw. III_IV-top.svg create mode 100644 media/vehicles/Tanks/Super Hellcat-front.svg create mode 100644 media/vehicles/Tanks/Super Hellcat-side.svg create mode 100644 media/vehicles/Tanks/Super Hellcat-top.svg create mode 100644 media/vehicles/Tanks/T-34-front.svg create mode 100644 media/vehicles/Tanks/T-34-side.svg create mode 100644 media/vehicles/Tanks/T-34-top.svg create mode 100644 media/vehicles/Tanks/T28-front.svg create mode 100644 media/vehicles/Tanks/T28-side.svg create mode 100644 media/vehicles/Tanks/T28-top.svg delete mode 100644 media/vehicles/tanks/leopard-i-front.svg delete mode 100644 media/vehicles/tanks/leopard-i-side.svg delete mode 100644 media/vehicles/tanks/leopard-i-top.svg delete mode 100644 media/vehicles/tanks/t95-super-heavy-tank-front.svg delete mode 100644 media/vehicles/tanks/t95-super-heavy-tank-side.svg delete mode 100644 media/vehicles/tanks/t95-super-heavy-tank-top.svg diff --git a/media/vehicles/Tanks/Churchill I-front.svg b/media/vehicles/Tanks/Churchill I-front.svg new file mode 100644 index 00000000..563d86e2 --- /dev/null +++ b/media/vehicles/Tanks/Churchill I-front.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Churchill I-side.svg b/media/vehicles/Tanks/Churchill I-side.svg new file mode 100644 index 00000000..9e385f59 --- /dev/null +++ b/media/vehicles/Tanks/Churchill I-side.svg @@ -0,0 +1,116 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Churchill I-top.svg b/media/vehicles/Tanks/Churchill I-top.svg new file mode 100644 index 00000000..92d8acc3 --- /dev/null +++ b/media/vehicles/Tanks/Churchill I-top.svg @@ -0,0 +1,68 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Leopard 1-front.svg b/media/vehicles/Tanks/Leopard 1-front.svg new file mode 100644 index 00000000..947c690d --- /dev/null +++ b/media/vehicles/Tanks/Leopard 1-front.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Leopard 1-side.svg b/media/vehicles/Tanks/Leopard 1-side.svg new file mode 100644 index 00000000..240f876a --- /dev/null +++ b/media/vehicles/Tanks/Leopard 1-side.svg @@ -0,0 +1,59 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Leopard 1-top.svg b/media/vehicles/Tanks/Leopard 1-top.svg new file mode 100644 index 00000000..908949e1 --- /dev/null +++ b/media/vehicles/Tanks/Leopard 1-top.svg @@ -0,0 +1,68 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Panther II-front.svg b/media/vehicles/Tanks/Panther II-front.svg new file mode 100644 index 00000000..bd2d18dc --- /dev/null +++ b/media/vehicles/Tanks/Panther II-front.svg @@ -0,0 +1,65 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Panther II-side.svg b/media/vehicles/Tanks/Panther II-side.svg new file mode 100644 index 00000000..5e5525b1 --- /dev/null +++ b/media/vehicles/Tanks/Panther II-side.svg @@ -0,0 +1,71 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Panther II-top.svg b/media/vehicles/Tanks/Panther II-top.svg new file mode 100644 index 00000000..aebe2f7e --- /dev/null +++ b/media/vehicles/Tanks/Panther II-top.svg @@ -0,0 +1,53 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Pz.Kpfw. III_IV-front.svg b/media/vehicles/Tanks/Pz.Kpfw. III_IV-front.svg new file mode 100644 index 00000000..22839f69 --- /dev/null +++ b/media/vehicles/Tanks/Pz.Kpfw. III_IV-front.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Pz.Kpfw. III_IV-side.svg b/media/vehicles/Tanks/Pz.Kpfw. III_IV-side.svg new file mode 100644 index 00000000..72eddc50 --- /dev/null +++ b/media/vehicles/Tanks/Pz.Kpfw. III_IV-side.svg @@ -0,0 +1,56 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Pz.Kpfw. III_IV-top.svg b/media/vehicles/Tanks/Pz.Kpfw. III_IV-top.svg new file mode 100644 index 00000000..217ad134 --- /dev/null +++ b/media/vehicles/Tanks/Pz.Kpfw. III_IV-top.svg @@ -0,0 +1,95 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Super Hellcat-front.svg b/media/vehicles/Tanks/Super Hellcat-front.svg new file mode 100644 index 00000000..9fc896dd --- /dev/null +++ b/media/vehicles/Tanks/Super Hellcat-front.svg @@ -0,0 +1,74 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Super Hellcat-side.svg b/media/vehicles/Tanks/Super Hellcat-side.svg new file mode 100644 index 00000000..224e74a5 --- /dev/null +++ b/media/vehicles/Tanks/Super Hellcat-side.svg @@ -0,0 +1,104 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/Super Hellcat-top.svg b/media/vehicles/Tanks/Super Hellcat-top.svg new file mode 100644 index 00000000..0ba882ff --- /dev/null +++ b/media/vehicles/Tanks/Super Hellcat-top.svg @@ -0,0 +1,59 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T-34-front.svg b/media/vehicles/Tanks/T-34-front.svg new file mode 100644 index 00000000..05262097 --- /dev/null +++ b/media/vehicles/Tanks/T-34-front.svg @@ -0,0 +1,50 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T-34-side.svg b/media/vehicles/Tanks/T-34-side.svg new file mode 100644 index 00000000..56c6ed8f --- /dev/null +++ b/media/vehicles/Tanks/T-34-side.svg @@ -0,0 +1,53 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T-34-top.svg b/media/vehicles/Tanks/T-34-top.svg new file mode 100644 index 00000000..5e26f66f --- /dev/null +++ b/media/vehicles/Tanks/T-34-top.svg @@ -0,0 +1,77 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T28-front.svg b/media/vehicles/Tanks/T28-front.svg new file mode 100644 index 00000000..b8e15f11 --- /dev/null +++ b/media/vehicles/Tanks/T28-front.svg @@ -0,0 +1,59 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T28-side.svg b/media/vehicles/Tanks/T28-side.svg new file mode 100644 index 00000000..89622118 --- /dev/null +++ b/media/vehicles/Tanks/T28-side.svg @@ -0,0 +1,74 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/Tanks/T28-top.svg b/media/vehicles/Tanks/T28-top.svg new file mode 100644 index 00000000..0fe5e062 --- /dev/null +++ b/media/vehicles/Tanks/T28-top.svg @@ -0,0 +1,83 @@ + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/vehicles/tanks/leopard-i-front.svg b/media/vehicles/tanks/leopard-i-front.svg deleted file mode 100644 index a76f7f6c..00000000 --- a/media/vehicles/tanks/leopard-i-front.svg +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/media/vehicles/tanks/leopard-i-side.svg b/media/vehicles/tanks/leopard-i-side.svg deleted file mode 100644 index 32b7a3c2..00000000 --- a/media/vehicles/tanks/leopard-i-side.svg +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/media/vehicles/tanks/leopard-i-top.svg b/media/vehicles/tanks/leopard-i-top.svg deleted file mode 100644 index 0fad369c..00000000 --- a/media/vehicles/tanks/leopard-i-top.svg +++ /dev/null @@ -1,347 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/vehicles/tanks/t95-super-heavy-tank-front.svg b/media/vehicles/tanks/t95-super-heavy-tank-front.svg deleted file mode 100644 index 75bbeebf..00000000 --- a/media/vehicles/tanks/t95-super-heavy-tank-front.svg +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - diff --git a/media/vehicles/tanks/t95-super-heavy-tank-side.svg b/media/vehicles/tanks/t95-super-heavy-tank-side.svg deleted file mode 100644 index c073a957..00000000 --- a/media/vehicles/tanks/t95-super-heavy-tank-side.svg +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/media/vehicles/tanks/t95-super-heavy-tank-top.svg b/media/vehicles/tanks/t95-super-heavy-tank-top.svg deleted file mode 100644 index 77919e87..00000000 --- a/media/vehicles/tanks/t95-super-heavy-tank-top.svg +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/presets/vehicles.js b/presets/vehicles.js index 85b8a842..79ce7eca 100644 --- a/presets/vehicles.js +++ b/presets/vehicles.js @@ -596,28 +596,69 @@ function makeVehicles() { "") }); + const dataTanks = [ + { + name: "Churchill I", + sides: { + "Side": { height: math.unit(3.106923773821576, "meters") }, + "Front": { height: math.unit(3.122615308032796, "meters") }, + "Top": { height: math.unit(7.2584553965615175, "meters") }, + } + }, + { + name: "Leopard 1", + sides: { + "Side": { height: math.unit(3.8225993116054964, "meters") }, + "Front": { height: math.unit(3.8225993116054964, "meters") }, + "Top": { height: math.unit(9.539980874580879, "meters") }, + } + }, + { + name: "Panther II", + sides: { + "Side": { height: math.unit(2.7322022370149734, "meters") }, + "Front": { height: math.unit(2.7322022370149734, "meters") }, + "Top": { height: math.unit(8.993913000210199, "meters") }, + } + }, + { + name: "Pz.Kpfw. III_IV", + sides: { + "Side": { height: math.unit(2.474235510305821, "meters") }, + "Front": { height: math.unit(2.474235510305821, "meters") }, + "Top": { height: math.unit(6.593240824273646, "meters") }, + } + }, + { + name: "Super Hellcat", + sides: { + "Side": { height: math.unit(2.584518696915076, "meters") }, + "Front": { height: math.unit(2.584518696915076, "meters") }, + "Top": { height: math.unit(7.096077076387668, "meters") }, + } + }, + { + name: "T-34", + sides: { + "Side": { height: math.unit(2.11028214292723, "meters") }, + "Front": { height: math.unit(2.11028214292723, "meters") }, + "Top": { height: math.unit(6.203998868277867, "meters") }, + } + }, + { + name: "T28", + sides: { + "Side": { height: math.unit(3.5677593574984616, "meters") }, + "Front": { height: math.unit(3.5677593574984616, "meters") }, + "Top": { height: math.unit(11.550384956980801, "meters") }, + } + } + ]; + results.push({ name: "Tanks", - constructor: () => makeVehicleGroup([ - { - name: "T95 Super Heavy Tank", - mass: math.unit(95, "tons"), - sides: { - "Side": { height: math.unit(18.83, "feet") }, - "Front": { height: math.unit(18.83, "feet") }, - "Top": { height: math.unit(2608/1659*36.5, "feet") }, - } - }, - { - name: "Leopard I", - mass: math.unit(42.2, "tonnes"), - sides: { - "Side": { height: math.unit(2.80, "meters") }, - "Front": { height: math.unit(2.80, "meters") }, - "Top": { height: math.unit(9.54, "meters") }, - } - }, - ], + constructor: () => makeAutoVehicleGroup( + dataTanks, "Tanks", "") });