Makefile

@@ -1,14 +1,14 @@
 .PHONY: all clean
 
-SIZE = 32
-TEMPSIZE = $(shell echo $(SIZE) '*4' | bc)
-
 FIRE_ANIM = $(foreach angle, $(shell seq 0 6 359), build/fire$(angle).png)
 PEACH_DECAY_ANIM = $(foreach percent, $(shell seq 99 -1 0), build/peach-decay$(percent).png)
 PEACH_RAINBOW_ANIM = $(foreach percent, $(shell seq 100 2 299), build/peach-rainbow$(percent).png)
-PORTAL_ANIM = $(foreach angle, $(shell seq 0 6 359), build/portal-a$(angle).png)
+PORTAL_A_ANIM = $(foreach angle, $(shell seq 0 6 359), build/portal-a$(angle).png)
+PORTAL_B_ANIM = $(foreach angle, $(shell seq 0 6 359), build/portal-b$(angle).png)
+PORTAL_C_ANIM = $(foreach angle, $(shell seq 0 6 359), build/portal-c$(angle).png)
+PORTAL_D_ANIM = $(foreach angle, $(shell seq 0 6 359), build/portal-d$(angle).png)
 
-IMAGES = $(foreach name, apple wall oil key door, public/assets/$(name)$(SIZE).png)
+IMAGES = $(foreach name, apple wall oil key door, public/assets/$(name)32.png)
 TILESETS = $(foreach name, hole switch spikes, public/assets/$(name)-ts.png)
 ANIMATIONS = $(foreach name, fire peach-decay peach-rainbow portal-a portal-b portal-c portal-d, public/assets/$(name)-anim.png)
 JSON = $(foreach name, snake levelList config metaConfig, public/assets/$(name).json)
@@ -35,52 +35,58 @@ public/assets/%32.png: assets/%.png
 	convert $^ -resize 32x $@
 public/assets/%256.png: assets/%.png
 	convert $^ -resize 256x $@
-public/assets/%$(SIZE).png: assets/%.png
-	convert $^ -resize $(SIZE)x $@
 
 public/assets/%32.png: assets/%.jpg
 	convert $^ -resize 32x $@
 public/assets/%256.png: assets/%.jpg
 	convert $^ -resize 256x $@
-public/assets/%$(SIZE).png: assets/%.jpg
-	convert $^ -resize $(SIZE)x $@
-
-build/%-smol.png: assets/%.png
-	convert $^ -resize $(TEMPSIZE)x\> $@
 
 public/assets/%-ts.png: assets/%.png
-	convert $^ -scale $(SIZE)x $@
+	convert $^ -scale 32x $@
 
 public/assets/fire-anim.png: $(FIRE_ANIM)
 	convert $^ -append $@
 
-build/fire%.png: build/fire-smol.png
+build/fire%.png: assets/fire.png
-	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize $(SIZE)x $@
+	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
 
 public/assets/peach-decay-anim.png: $(PEACH_DECAY_ANIM)
 	convert $^ -append $@
 
-build/peach-decay%.png: build/peach-smol.png
+build/peach-decay%.png: assets/peach.png
-	convert $^ -modulate 100,$(shell echo $@ | sed 's/[^0-9]*//g') -resize $(SIZE)x $@
+	convert $^ -modulate 100,$(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
 
 public/assets/peach-rainbow-anim.png: $(PEACH_RAINBOW_ANIM)
 	convert $^ -append $@
 
-build/peach-rainbow%.png: build/peach-smol.png
+build/peach-rainbow%.png: assets/peach.png
-	convert $^ -modulate 100,100,$(shell echo $@ | sed 's/[^0-9]*//g') -resize $(SIZE)x $@
+	convert $^ -modulate 100,100,$(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
 
-build/portal-a%.png: build/portal-smol.png
+build/portal-b.png: assets/portal.png
-	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize $(SIZE)x $@
-
-public/assets/portal-a-anim.png: $(PORTAL_ANIM)
-	convert $^ -append $@
-public/assets/portal-b-anim.png: public/assets/portal-a-anim.png
 	convert $^ -modulate 100,100,200 $@
-public/assets/portal-c-anim.png: public/assets/portal-a-anim.png
+build/portal-c.png: assets/portal.png
 	convert $^ -modulate 100,100,150 $@
-public/assets/portal-d-anim.png: public/assets/portal-a-anim.png
+build/portal-d.png: assets/portal.png
 	convert $^ -modulate 100,100,50 $@
 
+build/portal-a%.png: assets/portal.png
+	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
+build/portal-b%.png: build/portal-b.png
+	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
+build/portal-c%.png: build/portal-c.png
+	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
+build/portal-d%.png: build/portal-d.png
+	convert $^ -distort ScaleRotateTranslate $(shell echo $@ | sed 's/[^0-9]*//g') -resize 32x $@
+
+public/assets/portal-a-anim.png: $(PORTAL_A_ANIM)
+	convert $^ -append $@
+public/assets/portal-b-anim.png: $(PORTAL_B_ANIM)
+	convert $^ -append $@
+public/assets/portal-c-anim.png: $(PORTAL_C_ANIM)
+	convert $^ -append $@
+public/assets/portal-d-anim.png: $(PORTAL_D_ANIM)
+	convert $^ -append $@
+
 public/assets/%.json: assets/%.json
 	cp $^ $@