diff --git a/common/media/clothing/clothingItems/Amputation_Hand_L.xml b/common/media/clothing/clothingItems/Amputation_Hand_L.xml
index 72adc09..c12e5cc 100644
--- a/common/media/clothing/clothingItems/Amputation_Hand_L.xml
+++ b/common/media/clothing/clothingItems/Amputation_Hand_L.xml
@@ -10,15 +10,30 @@
none
- Amputations\Human\Forearm\skin01_b
- Amputations\Human\Forearm\skin02_b
- Amputations\Human\Forearm\skin03_b
- Amputations\Human\Forearm\skin04_b
- Amputations\Human\Forearm\skin05_b
+ Amputations\Human\Hand\skin01_b
+ Amputations\Human\Hand\skin02_b
+ Amputations\Human\Hand\skin03_b
+ Amputations\Human\Hand\skin04_b
+ Amputations\Human\Hand\skin05_b
- Amputations\Human\Forearm\skin01_hairy_b
- Amputations\Human\Forearm\skin02_hairy_b
- Amputations\Human\Forearm\skin03_hairy_b
- Amputations\Human\Forearm\skin04_hairy_b
- Amputations\Human\Forearm\skin05_hairy_b
+ Amputations\Human\Hand\skin01_hairy_b
+ Amputations\Human\Hand\skin02_hairy_b
+ Amputations\Human\Hand\skin03_hairy_b
+ Amputations\Human\Hand\skin04_hairy_b
+ Amputations\Human\Hand\skin05_hairy_b
+
+
+
+ Body\MaleBody01
+ Body\MaleBody02
+ Body\MaleBody03
+ Body\MaleBody04
+ Body\MaleBody05
+
+ Body\MaleBody01a
+ Body\MaleBody02a
+ Body\MaleBody03a
+ Body\MaleBody04
+ Body\MaleBody05a
+
\ No newline at end of file
diff --git a/common/media/clothing/clothingItems/Amputation_Hand_R.xml b/common/media/clothing/clothingItems/Amputation_Hand_R.xml
index 3d1fb11..2c6fe7f 100644
--- a/common/media/clothing/clothingItems/Amputation_Hand_R.xml
+++ b/common/media/clothing/clothingItems/Amputation_Hand_R.xml
@@ -9,15 +9,29 @@
none
- Amputations\Human\Forearm\skin01_b
- Amputations\Human\Forearm\skin02_b
- Amputations\Human\Forearm\skin03_b
- Amputations\Human\Forearm\skin04_b
- Amputations\Human\Forearm\skin05_b
+ Amputations\Human\Hand\skin01_b
+ Amputations\Human\Hand\skin02_b
+ Amputations\Human\Hand\skin03_b
+ Amputations\Human\Hand\skin04_b
+ Amputations\Human\Hand\skin05_b
- Amputations\Human\Forearm\skin01_hairy_b
- Amputations\Human\Forearm\skin02_hairy_b
- Amputations\Human\Forearm\skin03_hairy_b
- Amputations\Human\Forearm\skin04_hairy_b
- Amputations\Human\Forearm\skin05_hairy_b
+ Amputations\Human\Hand\skin01_hairy_b
+ Amputations\Human\Hand\skin02_hairy_b
+ Amputations\Human\Hand\skin03_hairy_b
+ Amputations\Human\Hand\skin04_hairy_b
+ Amputations\Human\Hand\skin05_hairy_b
+
+
+
+ Body\MaleBody01
+ Body\MaleBody02
+ Body\MaleBody03
+ Body\MaleBody04
+ Body\MaleBody05
+
+ Body\MaleBody01a
+ Body\MaleBody02a
+ Body\MaleBody03a
+ Body\MaleBody04
+ Body\MaleBody05a
\ No newline at end of file
diff --git a/common/media/textures/Amputations/Human/Forearm/skin01_b.png b/common/media/textures/Amputations/Human/Forearm/skin01_b.png
index e6bf563..f894b6b 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin01_b.png and b/common/media/textures/Amputations/Human/Forearm/skin01_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png
index 3d6236d..1809bb4 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png and b/common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin02_b.png b/common/media/textures/Amputations/Human/Forearm/skin02_b.png
index 55326a8..604809f 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin02_b.png and b/common/media/textures/Amputations/Human/Forearm/skin02_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png
index de9c4cf..7387621 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png and b/common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin03_b.png b/common/media/textures/Amputations/Human/Forearm/skin03_b.png
index f29ee93..216a23a 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin03_b.png and b/common/media/textures/Amputations/Human/Forearm/skin03_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png
index 49eb61a..701b151 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png and b/common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin04_b.png b/common/media/textures/Amputations/Human/Forearm/skin04_b.png
index 3c8f622..be45ab0 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin04_b.png and b/common/media/textures/Amputations/Human/Forearm/skin04_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png
index b0d0d4f..864ca3f 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png and b/common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin05_b.png b/common/media/textures/Amputations/Human/Forearm/skin05_b.png
index 668d653..390ba63 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin05_b.png and b/common/media/textures/Amputations/Human/Forearm/skin05_b.png differ
diff --git a/common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png
index 394c9bb..425305d 100644
Binary files a/common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png and b/common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin01_b.png b/common/media/textures/Amputations/Human/Hand/skin01_b.png
new file mode 100644
index 0000000..6886a79
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin01_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin01_hairy_b.png b/common/media/textures/Amputations/Human/Hand/skin01_hairy_b.png
new file mode 100644
index 0000000..563de15
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin01_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin02_b.png b/common/media/textures/Amputations/Human/Hand/skin02_b.png
new file mode 100644
index 0000000..88311e7
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin02_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin02_hairy_b.png b/common/media/textures/Amputations/Human/Hand/skin02_hairy_b.png
new file mode 100644
index 0000000..9deaf29
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin02_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin03_b.png b/common/media/textures/Amputations/Human/Hand/skin03_b.png
new file mode 100644
index 0000000..2c6fba1
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin03_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin03_hairy_b.png b/common/media/textures/Amputations/Human/Hand/skin03_hairy_b.png
new file mode 100644
index 0000000..0de2f5b
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin03_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin04_b.png b/common/media/textures/Amputations/Human/Hand/skin04_b.png
new file mode 100644
index 0000000..14fa7ae
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin04_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin04_hairy_b.png b/common/media/textures/Amputations/Human/Hand/skin04_hairy_b.png
new file mode 100644
index 0000000..b9d0050
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin04_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin05_b.png b/common/media/textures/Amputations/Human/Hand/skin05_b.png
new file mode 100644
index 0000000..4a708a0
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin05_b.png differ
diff --git a/common/media/textures/Amputations/Human/Hand/skin05_hairy_b.png b/common/media/textures/Amputations/Human/Hand/skin05_hairy_b.png
new file mode 100644
index 0000000..3a9b075
Binary files /dev/null and b/common/media/textures/Amputations/Human/Hand/skin05_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin01_b.png b/common/media/textures/Amputations/Human/Upperarm/skin01_b.png
index ed01382..d842158 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin01_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin01_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png
index 05c0972..6f43846 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin02_b.png b/common/media/textures/Amputations/Human/Upperarm/skin02_b.png
index f844751..16d4167 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin02_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin02_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png
index a796be5..c906fe0 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin03_b.png b/common/media/textures/Amputations/Human/Upperarm/skin03_b.png
index f31fef6..bc669ab 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin03_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin03_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png
index 650d142..77aeeae 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin04_b.png b/common/media/textures/Amputations/Human/Upperarm/skin04_b.png
index 7dce8ac..dada041 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin04_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin04_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png
index be3afb2..ec3a25f 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin05_b.png b/common/media/textures/Amputations/Human/Upperarm/skin05_b.png
index 0db3df9..35be197 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin05_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin05_b.png differ
diff --git a/common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png
index 51b9fb5..a5bbdf9 100644
Binary files a/common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png and b/common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png differ
diff --git a/dev_stuff/gen_amp_textures/input/wound.png b/dev_stuff/gen_amp_textures/input/wound.png
index 1b0bd79..5c7ce22 100644
Binary files a/dev_stuff/gen_amp_textures/input/wound.png and b/dev_stuff/gen_amp_textures/input/wound.png differ
diff --git a/dev_stuff/gen_amp_textures/main.py b/dev_stuff/gen_amp_textures/main.py
index d63cd86..076f1d6 100644
--- a/dev_stuff/gen_amp_textures/main.py
+++ b/dev_stuff/gen_amp_textures/main.py
@@ -1,46 +1,65 @@
from pathlib import Path
from PIL import Image
+import os
input_bodies_path = Path('input/body')
input_wound_texture = Path('input/wound.png')
-# 48, 33 TEXTURE
+# 45, 33 TEXTURE
# 256,256
IMG_WIDTH = 256
-
COORDS_L = {
- #"H": (0, 115),
- "F": (0, 59),
- "U": (0,21),
+ "H": (2, 100),
+ "F": (2, 59),
+ "U": (2,21),
}
COORDS_R = {
- #"H": (IMG_WIDTH - 50- COORDS_L['H'][0], COORDS_L['H'][1]),
- "F": (IMG_WIDTH - 48 - COORDS_L['F'][0], COORDS_L['F'][1]),
- "U": (IMG_WIDTH - 48 - COORDS_L['U'][0], COORDS_L['U'][1]),
+ "H": (IMG_WIDTH - 43- COORDS_L['H'][0], COORDS_L['H'][1]),
+ "F": (IMG_WIDTH - 43 - COORDS_L['F'][0], COORDS_L['F'][1]),
+ "U": (IMG_WIDTH - 43 - COORDS_L['U'][0], COORDS_L['U'][1]),
}
-STATES = ["BOTH"]
-
+FULL_COORDS = {key: (COORDS_L[key], COORDS_R[key]) for key in COORDS_L}
+print(FULL_COORDS)
overlay = Image.open(input_wound_texture)
for filepath in input_bodies_path.glob('*.png'): # Only PNG files
+ print(f'Processing {filepath.name}...')
base = Image.open(filepath)
- body_name = filepath.stem
- for key_L, value_L in COORDS_L.items():
- for key_R, value_R in COORDS_R.items():
- for state in STATES:
- result = base.copy()
+ body_name = filepath.stem.replace('MaleBody', 'skin')
+ if body_name.endswith('a'):
+ body_name = body_name[:-1] + '_hairy_b'
+ else:
+ body_name = body_name + '_b'
+
+ for key, (value_L, value_R) in FULL_COORDS.items():
+ print(key)
+ result = base.copy()
+
+ result.paste(overlay, value_L, mask=overlay)
+ result.paste(overlay, value_R, mask=overlay)
+
+ output_path = 'output/'
+
+ if key == "H":
+ os.makedirs('output/Hand', exist_ok=True)
+ output_path = 'output/Hand'
+
+ if key == "F":
+ os.makedirs('output/Forearm', exist_ok=True)
+ output_path = 'output/Forearm'
+
+ if key == "U":
+ os.makedirs('output/UpperArm', exist_ok=True)
+ output_path = 'output/UpperArm'
+
+ result.save(f'{output_path}/{body_name}.png')
- if state == "BOTH" or state == "ONLY_LEFT":
- result.paste(overlay, value_L, mask=overlay)
- if state == "BOTH" or state == "ONLY_RIGHT":
- result.paste(overlay, value_R, mask=overlay)
- result.save(f'output/{body_name}_{key_L}_{key_R}_{state}.png')
\ No newline at end of file