diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index 12a3acb..290330f 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -77,5 +77,5 @@ jobs: build-args: | GIT_COMMIT=${{ env.BUILD_HASH }} DEBUG=False - tags: ${{ env.CUSTOM_TAG }} + tags: ${{ env.CUSTOM_TAG }},ghcr.io/snowsune/size-diff:latest labels: ${{ steps.meta.outputs.labels }} diff --git a/.gitignore b/.gitignore index 0de5fc4..269d87a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ cache *.*~ .env *.sqlite3 +art/dist/ diff --git a/Dockerfile b/Dockerfile index 73cb0e5..523e732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,9 @@ RUN pip install --upgrade pip && pip install -r requirements.txt # Copy the app code to the container COPY . . +# Run the art trimming script +RUN python3 scripts/trim_art.py + # Expose port 5000 for the Flask app EXPOSE 5000 diff --git a/app/__init__.py b/app/__init__.py index 26089b6..e2d203a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -170,7 +170,7 @@ def index(): # Load presets for the dropdown presets = load_preset_characters() preset_map = { - f"{p['name']} ({p['species'].replace('_', ' ').title()}, {p['gender']}, {p['height']}in)": f"{p['species']},{p['gender']},{p['height']},{p['name']}" + f"{p['name'].replace('_', ' ').title()} --- {p['species'].replace('_', ' ').title()}, {p['gender']}, {p.get('description', '')}": f"{p['species']},{p['gender']},{p['height']},{p['name']}" for p in presets } @@ -300,6 +300,15 @@ def add_preset(): return redirect(f"/?characters={characters_query}{settings_query}") +@app.route("/taur") +def taur(): + """ + Base route for volnar's sub-page! + """ + + return render_template("taur.html") + + # For WSGI def create_app(): return app diff --git a/app/species_data/Hieght_Ref_Ky-Li_for_Vixi.png b/app/species_data/Hieght_Ref_Ky-Li_for_Vixi.png deleted file mode 100644 index 6d9a511..0000000 Binary files a/app/species_data/Hieght_Ref_Ky-Li_for_Vixi.png and /dev/null differ diff --git a/app/species_data/Hieght_Ref_Maxene_for_Vixi.png b/app/species_data/Hieght_Ref_Maxene_for_Vixi.png deleted file mode 100644 index 415d50a..0000000 Binary files a/app/species_data/Hieght_Ref_Maxene_for_Vixi.png and /dev/null differ diff --git a/app/species_data/african_buffalo.yaml b/app/species_data/african_buffalo.yaml index 47f802c..e9dccc2 100644 --- a/app/species_data/african_buffalo.yaml +++ b/app/species_data/african_buffalo.yaml @@ -1,5 +1,5 @@ male: - image: "missing.png" + image: "Chrissy/missing.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 50 female: - image: "missing.png" + image: "Chrissy/missing.png" ears_offset: 0 data: - anthro_size: 74 # 6'2" diff --git a/app/species_data/arctic_fox.yaml b/app/species_data/arctic_fox.yaml index b6e7ab1..b2cdbc7 100644 --- a/app/species_data/arctic_fox.yaml +++ b/app/species_data/arctic_fox.yaml @@ -1,5 +1,5 @@ male: - image: "randal.png" + image: "Chrissy/randal.png" ears_offset: 4 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 15 # 15" female: - image: "vixi.png" + image: "Chrissy/vixi.png" ears_offset: 4 data: - anthro_size: 74 # 6'2" diff --git a/app/species_data/canine.yaml b/app/species_data/canine.yaml index 293f6eb..0b8e618 100644 --- a/app/species_data/canine.yaml +++ b/app/species_data/canine.yaml @@ -1,5 +1,5 @@ male: - image: "Hieght_Ref_Maxene_for_Vixi.png" + image: "Hunner/Hieght_Ref_Maxene_for_Vixi.png" ears_offset: 3 color: "870716" data: @@ -9,7 +9,7 @@ male: height: 24 female: - image: "Hieght_Ref_Ky-Li_for_Vixi.png" + image: "Hunner/Hieght_Ref_Ky-Li_for_Vixi.png" ears_offset: 9 color: "add6ed" data: diff --git a/app/species_data/equine.yaml b/app/species_data/equine.yaml index 9818375..6883e3a 100644 --- a/app/species_data/equine.yaml +++ b/app/species_data/equine.yaml @@ -1,5 +1,5 @@ male: - image: "f_equine.png" + image: "Placeholder/f_equine.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 56 female: - image: "f_equine.png" + image: "Placeholder/f_equine.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" diff --git a/app/species_data/f_mouse_hunner.png b/app/species_data/f_mouse_hunner.png deleted file mode 100644 index abc7032..0000000 Binary files a/app/species_data/f_mouse_hunner.png and /dev/null differ diff --git a/app/species_data/feline.yaml b/app/species_data/feline.yaml index d21536b..238de43 100644 --- a/app/species_data/feline.yaml +++ b/app/species_data/feline.yaml @@ -1,5 +1,5 @@ male: - image: "Felid_Sketch_Male.png" + image: "Rhainbowmetall/Felid_Sketch_Male.png" ears_offset: 9 color: "282b1d" data: @@ -9,7 +9,7 @@ male: height: 10 female: - image: "Felid_Sketch_Female.png" + image: "Rhainbowmetall/Felid_Sketch_Female.png" ears_offset: 9 color: "1d751d" data: diff --git a/app/species_data/fennec_fox.yaml b/app/species_data/fennec_fox.yaml index af8b0e7..0acb5e0 100644 --- a/app/species_data/fennec_fox.yaml +++ b/app/species_data/fennec_fox.yaml @@ -1,5 +1,5 @@ male: - image: "m_fennec.png" + image: "Chrissy/m_fennec.png" ears_offset: 10 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 7 female: - image: "missing.png" + image: "Chrissy/missing.png" ears_offset: 0 data: - anthro_size: 74 # 6'2" diff --git a/app/species_data/giraffe.yaml b/app/species_data/giraffe.yaml index 508cb7d..ff95520 100644 --- a/app/species_data/giraffe.yaml +++ b/app/species_data/giraffe.yaml @@ -1,5 +1,5 @@ male: - image: "m_giraffe.png" + image: "Placeholder/m_giraffe.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 190 female: - image: "m_giraffe.png" + image: "Placeholder/m_giraffe.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" diff --git a/app/species_data/m_mouse_hunner.png b/app/species_data/m_mouse_hunner.png deleted file mode 100644 index c8f115b..0000000 Binary files a/app/species_data/m_mouse_hunner.png and /dev/null differ diff --git a/app/species_data/mouse.yaml b/app/species_data/mouse.yaml index b5dde08..bc8f116 100644 --- a/app/species_data/mouse.yaml +++ b/app/species_data/mouse.yaml @@ -1,7 +1,7 @@ male: - image: "m_mouse_hunner.png" + image: "Hunner/Size_Refs_Mouse_for_Vixi (male).png" ears_offset: 6 - color: "8B8000" + color: "007516" data: - anthro_size: 76 # 6'4" height: 3 @@ -9,9 +9,9 @@ male: height: 4.5 female: - image: "f_mouse_hunner.png" + image: "Hunner/Size_Refs_Mouse_for_Vixi (female).png" ears_offset: 7 - color: "049904" + color: "7900ad" data: - anthro_size: 74 # 6'2" height: 2.5 diff --git a/app/species_data/preset_species.yaml b/app/species_data/preset_species.yaml index 2ac0869..2c9baca 100644 --- a/app/species_data/preset_species.yaml +++ b/app/species_data/preset_species.yaml @@ -37,7 +37,17 @@ presets: height: 66 description: All things foxy vixen! With 100% bonus wings! - name: Tirga - species: feline + species: saber-toothed_tiger gender: androgynous - height: 72 + height: 84 description: She's got more limbs than she knows what to do with. + - name: Alice + species: canine + gender: female + height: 141 + description: Big ol' dog~ + - name: Maxene + species: canine + gender: male + height: 120 + description: Cute demon doggo! diff --git a/app/species_data/red_fox.yaml b/app/species_data/red_fox.yaml index a114d72..afe5cec 100644 --- a/app/species_data/red_fox.yaml +++ b/app/species_data/red_fox.yaml @@ -1,5 +1,5 @@ male: - image: "randal.png" + image: "Chrissy/randal.png" ears_offset: 4 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 15 female: - image: "sinopa.png" + image: "Chrissy/sinopa.png" ears_offset: 1.5 data: - anthro_size: 76 # 6'4" diff --git a/app/species_data/rexouium.yaml b/app/species_data/rexouium.yaml index c8f499c..36cfbda 100644 --- a/app/species_data/rexouium.yaml +++ b/app/species_data/rexouium.yaml @@ -1,5 +1,5 @@ male: - image: "m_rexo.png" + image: "Chrissy/m_rexo.png" ears_offset: 7.5 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 60 # From chrissy female: - image: "chrissy.png" + image: "Chrissy/chrissy.png" ears_offset: 6 data: - anthro_size: 76 # 6'4" diff --git a/app/species_data/saber-toothed_tiger.yaml b/app/species_data/saber-toothed_tiger.yaml new file mode 100644 index 0000000..62dc89c --- /dev/null +++ b/app/species_data/saber-toothed_tiger.yaml @@ -0,0 +1,19 @@ +male: + image: "Hunner/Hieght_Ref_NO_BAK_Tirga_for_Tirga.png" + ears_offset: 3 + color: "00730b" + data: + - anthro_size: 76 # 6'4" + height: 44 + - anthro_size: 60 # 5' + height: 38 + +female: + image: "Hunner/Hieght_Ref_NO_BAK_Tirga_for_Tirga.png" + ears_offset: 3 + color: "b216f0" + data: + - anthro_size: 74 # 6'2" + height: 46 + - anthro_size: 60 # 5' + height: 34 diff --git a/app/species_data/shark.yaml b/app/species_data/shark.yaml index 583bf05..0d2f8b7 100644 --- a/app/species_data/shark.yaml +++ b/app/species_data/shark.yaml @@ -1,6 +1,6 @@ # Kamryn supplied an image and its, a little different but we can always change it later <3 male: - image: "m_shark.png" + image: "Mori/m_shark.png" ears_offset: 3 # color: "311b9e" data: @@ -10,7 +10,7 @@ male: height: 74 female: - image: "f_shark.png" + image: "Mori/f_shark.png" ears_offset: 3 # color: "664ce6" data: diff --git a/app/species_data/taur_(generic).yaml b/app/species_data/taur_(generic).yaml new file mode 100644 index 0000000..f9d73d8 --- /dev/null +++ b/app/species_data/taur_(generic).yaml @@ -0,0 +1,19 @@ +male: + image: "Volnar/TaurReference.png" + ears_offset: 1 + color: "590a1b" + data: + - anthro_size: 76 # 6'4" + height: 76 # + - anthro_size: 60 # 5' + height: 60 # + +female: + image: "Volnar/TaurReference.png" + ears_offset: 1 + color: "2c4b9e" + data: + - anthro_size: 76 # 6'4" + height: 76 # + - anthro_size: 60 # 5' + height: 60 # diff --git a/app/species_data/wolf.yaml b/app/species_data/wolf.yaml index fe84064..3dcb731 100644 --- a/app/species_data/wolf.yaml +++ b/app/species_data/wolf.yaml @@ -1,5 +1,5 @@ male: - image: "m_wolf.png" + image: "Placeholder/m_wolf.png" ears_offset: 0 data: - anthro_size: 76 # 6'4" @@ -8,7 +8,7 @@ male: height: 32 female: - image: "Hieght_Ref_Ky-Li_for_Vixi.png" + image: "Hunner/Hieght_Ref_Ky-Li_for_Vixi.png" ears_offset: 10 data: - anthro_size: 76 # 6'4" diff --git a/app/templates/index.html b/app/templates/index.html index e563cb8..73dce61 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -36,6 +36,18 @@

Vixi's Anthro Size Diff Calculator!

+ +
+ + Check out the Taur Calculator! + → + + A new way to size up your + taur-self! +
+ {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} @@ -316,8 +328,8 @@

Vixi's Anthro Size Diff Calculator!