From 164501a79bbed1eb6d09c60e0af3a3595421a4e2 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sun, 31 May 2020 19:31:05 -0400 Subject: [PATCH] Rename Ashtrek to Asche; add more views --- .vscode/snippets.code-snippets | 2 +- media/attribution.js | 7 +- media/characters/{ashtrek => asche}/back.svg | 0 media/characters/asche/front-armored.svg | 973 +++++++++++++++++++ media/characters/asche/front-dressed.svg | 550 +++++++++++ media/characters/asche/front-underwear.svg | 496 ++++++++++ media/characters/asche/front.svg | 460 +++++++++ media/characters/asche/h&k-mp724.svg | 80 ++ media/characters/{ashtrek => asche}/side.svg | 0 media/characters/ashtrek/front-armor.svg | 71 -- media/characters/ashtrek/front.svg | 56 -- presets/characters.js | 64 +- 12 files changed, 2611 insertions(+), 148 deletions(-) rename media/characters/{ashtrek => asche}/back.svg (100%) create mode 100644 media/characters/asche/front-armored.svg create mode 100644 media/characters/asche/front-dressed.svg create mode 100644 media/characters/asche/front-underwear.svg create mode 100644 media/characters/asche/front.svg create mode 100644 media/characters/asche/h&k-mp724.svg rename media/characters/{ashtrek => asche}/side.svg (100%) delete mode 100644 media/characters/ashtrek/front-armor.svg delete mode 100644 media/characters/ashtrek/front.svg diff --git a/.vscode/snippets.code-snippets b/.vscode/snippets.code-snippets index 79848a4b..cb68e837 100644 --- a/.vscode/snippets.code-snippets +++ b/.vscode/snippets.code-snippets @@ -62,7 +62,7 @@ "View": { "prefix": "view", "body": [ - "${1/-//g}: {", + "${1/(-([a-z]))/${2:/upcase}/g}: {", " height: math.unit(6, \"feet\"),", " weight: math.unit(150, \"lb\"),", " name: \"${1/(.*)/${1:/capitalize}/}\",", diff --git a/media/attribution.js b/media/attribution.js index 2bfa15c8..1da80261 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -1535,10 +1535,13 @@ const attributionData = { ] }, { - prefix: "./media/characters/ashtrek/", + prefix: "./media/characters/asche/", files: [ { name: "front.svg", source: null }, - { name: "front-armor.svg", source: null }, + { name: "front-underwear.svg", source: null }, + { name: "front-dressed.svg", source: null }, + { name: "front-armored.svg", source: null }, + { name: "h&k-mp724.svg", source: null }, { name: "side.svg", source: null }, { name: "back.svg", source: null } ], diff --git a/media/characters/ashtrek/back.svg b/media/characters/asche/back.svg similarity index 100% rename from media/characters/ashtrek/back.svg rename to media/characters/asche/back.svg diff --git a/media/characters/asche/front-armored.svg b/media/characters/asche/front-armored.svg new file mode 100644 index 00000000..2155fad5 --- /dev/null +++ b/media/characters/asche/front-armored.svg @@ -0,0 +1,973 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/asche/front-dressed.svg b/media/characters/asche/front-dressed.svg new file mode 100644 index 00000000..c16f8a43 --- /dev/null +++ b/media/characters/asche/front-dressed.svg @@ -0,0 +1,550 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/asche/front-underwear.svg b/media/characters/asche/front-underwear.svg new file mode 100644 index 00000000..c2e6630d --- /dev/null +++ b/media/characters/asche/front-underwear.svg @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/asche/front.svg b/media/characters/asche/front.svg new file mode 100644 index 00000000..effab1f5 --- /dev/null +++ b/media/characters/asche/front.svg @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/characters/asche/h&k-mp724.svg b/media/characters/asche/h&k-mp724.svg new file mode 100644 index 00000000..5f8b525b --- /dev/null +++ b/media/characters/asche/h&k-mp724.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + diff --git a/media/characters/ashtrek/side.svg b/media/characters/asche/side.svg similarity index 100% rename from media/characters/ashtrek/side.svg rename to media/characters/asche/side.svg diff --git a/media/characters/ashtrek/front-armor.svg b/media/characters/ashtrek/front-armor.svg deleted file mode 100644 index b46b64d1..00000000 --- a/media/characters/ashtrek/front-armor.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - diff --git a/media/characters/ashtrek/front.svg b/media/characters/ashtrek/front.svg deleted file mode 100644 index af8f8a6c..00000000 --- a/media/characters/ashtrek/front.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - diff --git a/presets/characters.js b/presets/characters.js index 98365145..9525923e 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -3743,44 +3743,72 @@ characterMakers.push(() => makeCharacter( )) characterMakers.push(() => makeCharacter( - { name: "Ashtrek", species: ["fox", "dragon", "lion"], tags: ["anthro"] }, + { name: "Asche", species: ["fox", "dragon", "lion"], tags: ["anthro"] }, { front: { - height: math.unit(2, "meters"), - weight: math.unit(70, "kg"), + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), name: "Front", image: { - source: "./media/characters/ashtrek/front.svg", - extra: 560 / 524, - bottom: 0.01 + source: "./media/characters/asche/front.svg", + extra: 1258/1190, + bottom: 47/1305 + } + }, + frontUnderwear: { + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), + name: "Front (Underwear)", + image: { + source: "./media/characters/asche/front-underwear.svg", + extra: 1258/1190, + bottom: 47/1305 + } + }, + frontDressed: { + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), + name: "Front (Dressed)", + image: { + source: "./media/characters/asche/front-dressed.svg", + extra: 1258/1190, + bottom: 47/1305 } }, frontArmor: { - height: math.unit(2, "meters"), - weight: math.unit(76, "kg"), - name: "Front (Armor)", + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), + name: "Front (Armored)", image: { - source: "./media/characters/ashtrek/front-armor.svg", - extra: 561 / 527, - bottom: 0.01 + source: "./media/characters/asche/front-armored.svg", + extra: 1374 / 1308, + bottom: 23/1397 + } + }, + mp724: { + height: math.unit(0.96, "meters"), + weight: math.unit(38, "kg"), + name: "H&K MP724", + image: { + source: "./media/characters/asche/h&k-mp724.svg" } }, side: { - height: math.unit(2, "meters"), - weight: math.unit(70, "kg"), + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), name: "Side", image: { - source: "./media/characters/ashtrek/side.svg", + source: "./media/characters/asche/side.svg", extra: 1717 / 1609, bottom: 0.005 } }, back: { - height: math.unit(2, "meters"), - weight: math.unit(70, "kg"), + height: math.unit(5, "meters"), + weight: math.unit(1000, "kg"), name: "Back", image: { - source: "./media/characters/ashtrek/back.svg", + source: "./media/characters/asche/back.svg", extra: 1570 / 1501 } },