aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile24
-rw-r--r--heartbandaid.pngbin0 -> 7025 bytes
-rw-r--r--heartbreak.pngbin0 -> 18279 bytes
-rw-r--r--kiss.pngbin0 -> 29232 bytes
-rwxr-xr-xmkheart2
-rwxr-xr-xmkheartbandaid3
-rwxr-xr-xmkkiss3
-rwxr-xr-xmkskibidi3
-rw-r--r--plain/ada.pngbin107073 -> 481732 bytes
-rw-r--r--plain/fiore.pngbin1170 -> 0 bytes
-rw-r--r--plain/itzzen.pngbin0 -> 2922 bytes
-rw-r--r--plain/june4.pngbin0 -> 317298 bytes
-rw-r--r--plain/lua.pngbin0 -> 200727 bytes
-rw-r--r--plain/riley.pngbin0 -> 79170 bytes
-rw-r--r--plain/swagpuppy420.pngbin397844 -> 0 bytes
-rw-r--r--plain/xyla.pngbin267060 -> 0 bytes
-rw-r--r--plain/zelda.pngbin0 -> 143085 bytes
-rw-r--r--skibidi.pngbin0 -> 9454 bytes
-rw-r--r--thoughts/colors.txt1
19 files changed, 30 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 548ef8e9..3a22174b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
USERS != ls plain | xargs basename -s .png
-all: plain cube thoughts pets ball heart disco
+all: plain cube thoughts pets ball heart heartbreak heartbandaid kiss disco skibidi
out/plain/%.png: plain/%.png | out/plain/
cp $< $@
@@ -17,12 +17,24 @@ out/thoughts/%thoughts.png: plain/%.png mkthoughts thoughts/ | out/thoughts/
out/ball/%ball.png: plain/%.png tools/spherize | out/ball/
./tools/spherize -a 1.2 -b none $< $@
-out/heart/%heart.png: plain/%.png ./mkheart | out/heart/
- ./mkheart $< $@
+out/heart/%heart.png: plain/%.png ./mkheart heart.png | out/heart/
+ ./mkheart $< $@ heart.png
+
+out/heartbreak/%heartbreak.png: plain/%.png ./mkheart heartbreak.png | out/heartbreak/
+ ./mkheart $< $@ heartbreak.png
+
+out/heartbandaid/%heartbandaid.png: plain/%.png ./mkheartbandaid heartbandaid.png | out/heartbandaid/
+ ./mkheartbandaid $< $@
+
+out/kiss/%kiss.png: plain/%.png ./mkkiss kiss.png | out/kiss/
+ ./mkkiss $< $@
out/disco/%disco.gif: plain/%.png ./mkdisco discooverlay.mkv | out/disco/
./mkdisco $< $@
+out/skibidi/%skibidi.png: plain/%.png ./mkskibidi skibidi.png | out/skibidi/
+ ./mkskibidi $< $@
+
out/%/:
mkdir -p $@
@@ -35,12 +47,16 @@ pets: $(patsubst %, out/pets/%pets.gif, $(USERS))
thoughts: $(patsubst %, out/thoughts/%thoughts.png, $(USERS))
ball: $(patsubst %, out/ball/%ball.png, $(USERS))
heart: $(patsubst %, out/heart/%heart.png, $(USERS))
+heartbreak: $(patsubst %, out/heartbreak/%heartbreak.png, $(USERS))
+heartbandaid: $(patsubst %, out/heartbandaid/%heartbandaid.png, $(USERS))
+kiss: $(patsubst %, out/kiss/%kiss.png, $(USERS))
disco: $(patsubst %, out/disco/%disco.gif, $(USERS))
+skibidi: $(patsubst %, out/skibidi/%skibidi.png, $(USERS))
clean:
rm -rf out
-.PHONY: all plain cube thoughts pets ball heart disco
+.PHONY: all clean plain cube thoughts pets ball heart heartbreak heartbandaid kiss disco skibidi
out/ball/lilithball.png:
.PHONY: out/ball/lilithball.png
diff --git a/heartbandaid.png b/heartbandaid.png
new file mode 100644
index 00000000..7e0322ea
--- /dev/null
+++ b/heartbandaid.png
Binary files differ
diff --git a/heartbreak.png b/heartbreak.png
new file mode 100644
index 00000000..f2df7d7d
--- /dev/null
+++ b/heartbreak.png
Binary files differ
diff --git a/kiss.png b/kiss.png
new file mode 100644
index 00000000..9fb6046a
--- /dev/null
+++ b/kiss.png
Binary files differ
diff --git a/mkheart b/mkheart
index 80bf8663..80292f5d 100755
--- a/mkheart
+++ b/mkheart
@@ -1,3 +1,3 @@
#!/bin/sh
. ./find_magick.sh
-magick "$1" \( heart.png -resize $(magick identify -ping -format '%wx%h' "$1") \) -compose copy-opacity -composite "$2"
+magick "$1" \( "$3" -resize $(magick identify -ping -format '%wx%h' "$1") \) -compose copy-opacity -composite "$2"
diff --git a/mkheartbandaid b/mkheartbandaid
new file mode 100755
index 00000000..5d66ff85
--- /dev/null
+++ b/mkheartbandaid
@@ -0,0 +1,3 @@
+#!/bin/sh
+. ./find_magick.sh
+./mkheart "$1" - heart.png | magick - \( heartbandaid.png -resize $(magick identify -ping -format '%wx%h' "$1") \) -composite "$2"
diff --git a/mkkiss b/mkkiss
new file mode 100755
index 00000000..3a56d560
--- /dev/null
+++ b/mkkiss
@@ -0,0 +1,3 @@
+#!/bin/sh
+. ./find_magick.sh
+magick "$1" \( kiss.png -resize $(magick identify -ping -format '%wx%h' "$1") \) -composite "$2"
diff --git a/mkskibidi b/mkskibidi
new file mode 100755
index 00000000..dc41037b
--- /dev/null
+++ b/mkskibidi
@@ -0,0 +1,3 @@
+#!/bin/sh
+. ./find_magick.sh
+magick skibidi.png \( "$1" -resize 205x205^ \) -composite "$2"
diff --git a/plain/ada.png b/plain/ada.png
index 390dc00d..7f084017 100644
--- a/plain/ada.png
+++ b/plain/ada.png
Binary files differ
diff --git a/plain/fiore.png b/plain/fiore.png
deleted file mode 100644
index 9eb30414..00000000
--- a/plain/fiore.png
+++ /dev/null
Binary files differ
diff --git a/plain/itzzen.png b/plain/itzzen.png
new file mode 100644
index 00000000..96e23c37
--- /dev/null
+++ b/plain/itzzen.png
Binary files differ
diff --git a/plain/june4.png b/plain/june4.png
new file mode 100644
index 00000000..3ec3788b
--- /dev/null
+++ b/plain/june4.png
Binary files differ
diff --git a/plain/lua.png b/plain/lua.png
new file mode 100644
index 00000000..7fdc2fe1
--- /dev/null
+++ b/plain/lua.png
Binary files differ
diff --git a/plain/riley.png b/plain/riley.png
new file mode 100644
index 00000000..bd127f21
--- /dev/null
+++ b/plain/riley.png
Binary files differ
diff --git a/plain/swagpuppy420.png b/plain/swagpuppy420.png
deleted file mode 100644
index 070fdf48..00000000
--- a/plain/swagpuppy420.png
+++ /dev/null
Binary files differ
diff --git a/plain/xyla.png b/plain/xyla.png
deleted file mode 100644
index a4d3b630..00000000
--- a/plain/xyla.png
+++ /dev/null
Binary files differ
diff --git a/plain/zelda.png b/plain/zelda.png
new file mode 100644
index 00000000..fdbea9af
--- /dev/null
+++ b/plain/zelda.png
Binary files differ
diff --git a/skibidi.png b/skibidi.png
new file mode 100644
index 00000000..6ee3cb11
--- /dev/null
+++ b/skibidi.png
Binary files differ
diff --git a/thoughts/colors.txt b/thoughts/colors.txt
index 03a08fff..3fa15135 100644
--- a/thoughts/colors.txt
+++ b/thoughts/colors.txt
@@ -1,4 +1,3 @@
-ada #848484
vern #282C34
kimapr #613563
lilith #000000