From cc4bf024b66562213d53bfa76e8bf84a28a459e0 Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Tue, 30 Jun 2020 13:27:32 -0700 Subject: [PATCH] notifications, mana symbols --- data/images/manaSymbols/{28.png => 2b.png} | Bin data/images/manaSymbols/{30.png => 2g.png} | Bin data/images/manaSymbols/{29.png => 2r.png} | Bin data/images/manaSymbols/{27.png => 2u.png} | Bin data/images/manaSymbols/{26.png => 2w.png} | Bin .../manaSymbols/{62.png => artistbrush.png} | Bin data/images/manaSymbols/{23.png => b.png} | Bin data/images/manaSymbols/{63.png => bar.png} | Bin data/images/manaSymbols/{41.png => bg.png} | Bin .../manaSymbols/{65.png => blackBrush.png} | Bin data/images/manaSymbols/{40.png => br.png} | Bin data/images/manaSymbols/{48.png => c.png} | Bin data/images/manaSymbols/{56.png => chaos.png} | Bin data/images/manaSymbols/{51.png => e.png} | Bin .../manaSymbols/future/{0.png => f0.png} | Bin .../manaSymbols/future/{1.png => f1.png} | Bin .../manaSymbols/future/{10.png => f10.png} | Bin .../manaSymbols/future/{11.png => f11.png} | Bin .../manaSymbols/future/{12.png => f12.png} | Bin .../manaSymbols/future/{13.png => f13.png} | Bin .../manaSymbols/future/{14.png => f14.png} | Bin .../manaSymbols/future/{15.png => f15.png} | Bin .../manaSymbols/future/{16.png => f16.png} | Bin .../manaSymbols/future/{17.png => f17.png} | Bin .../manaSymbols/future/{18.png => f18.png} | Bin .../manaSymbols/future/{19.png => f19.png} | Bin .../manaSymbols/future/{2.png => f2.png} | Bin .../manaSymbols/future/{20.png => f20.png} | Bin .../manaSymbols/future/{3.png => f3.png} | Bin .../manaSymbols/future/{4.png => f4.png} | Bin .../manaSymbols/future/{5.png => f5.png} | Bin .../manaSymbols/future/{6.png => f6.png} | Bin .../manaSymbols/future/{7.png => f7.png} | Bin .../manaSymbols/future/{8.png => f8.png} | Bin .../manaSymbols/future/{9.png => f9.png} | Bin .../manaSymbols/future/{23.png => fb.png} | Bin .../manaSymbols/future/{31.png => fbg.png} | Bin .../manaSymbols/future/{30.png => fbr.png} | Bin .../manaSymbols/future/{25.png => fg.png} | Bin .../manaSymbols/future/{35.png => fgu.png} | Bin .../manaSymbols/future/{34.png => fgw.png} | Bin .../manaSymbols/future/{24.png => fr.png} | Bin .../manaSymbols/future/{32.png => frg.png} | Bin .../manaSymbols/future/{33.png => frw.png} | Bin .../manaSymbols/future/{22.png => fu.png} | Bin .../manaSymbols/future/{28.png => fub.png} | Bin .../manaSymbols/future/{29.png => fur.png} | Bin .../manaSymbols/future/{21.png => fw.png} | Bin .../manaSymbols/future/{27.png => fwb.png} | Bin .../manaSymbols/future/{26.png => fwu.png} | Bin .../manaSymbols/future/{36.png => fx.png} | Bin data/images/manaSymbols/{25.png => g.png} | Bin data/images/manaSymbols/{45.png => gu.png} | Bin data/images/manaSymbols/{44.png => gw.png} | Bin data/images/manaSymbols/{54.png => half.png} | Bin data/images/manaSymbols/{55.png => inf.png} | Bin data/images/manaSymbols/{59.png => l+.png} | Bin data/images/manaSymbols/{58.png => l-.png} | Bin data/images/manaSymbols/{60.png => l0.png} | Bin .../images/manaSymbols/{61.png => oldtap.png} | Bin data/images/manaSymbols/{33.png => pb.png} | Bin data/images/manaSymbols/{35.png => pg.png} | Bin data/images/manaSymbols/{57.png => plane.png} | Bin data/images/manaSymbols/{34.png => pr.png} | Bin data/images/manaSymbols/{32.png => pu.png} | Bin data/images/manaSymbols/{31.png => pw.png} | Bin data/images/manaSymbols/{24.png => r.png} | Bin data/images/manaSymbols/{42.png => rg.png} | Bin data/images/manaSymbols/{43.png => rw.png} | Bin data/images/manaSymbols/{47.png => s.png} | Bin data/images/manaSymbols/{49.png => t.png} | Bin data/images/manaSymbols/{22.png => u.png} | Bin data/images/manaSymbols/{38.png => ub.png} | Bin data/images/manaSymbols/{50.png => untap.png} | Bin data/images/manaSymbols/{39.png => ur.png} | Bin data/images/manaSymbols/{21.png => w.png} | Bin data/images/manaSymbols/{37.png => wb.png} | Bin .../manaSymbols/{64.png => whiteBrush.png} | Bin data/images/manaSymbols/{36.png => wu.png} | Bin data/images/manaSymbols/{46.png => x.png} | Bin data/images/manaSymbols/{52.png => y.png} | Bin data/images/manaSymbols/{53.png => z.png} | Bin data/scripts/main.js | 21 +++++++++++++----- data/scripts/versions/future/version.js | 2 ++ data/scripts/versions/m15/m21.js | 2 ++ 85 files changed, 19 insertions(+), 6 deletions(-) rename data/images/manaSymbols/{28.png => 2b.png} (100%) rename data/images/manaSymbols/{30.png => 2g.png} (100%) rename data/images/manaSymbols/{29.png => 2r.png} (100%) rename data/images/manaSymbols/{27.png => 2u.png} (100%) rename data/images/manaSymbols/{26.png => 2w.png} (100%) rename data/images/manaSymbols/{62.png => artistbrush.png} (100%) rename data/images/manaSymbols/{23.png => b.png} (100%) rename data/images/manaSymbols/{63.png => bar.png} (100%) rename data/images/manaSymbols/{41.png => bg.png} (100%) rename data/images/manaSymbols/{65.png => blackBrush.png} (100%) rename data/images/manaSymbols/{40.png => br.png} (100%) rename data/images/manaSymbols/{48.png => c.png} (100%) rename data/images/manaSymbols/{56.png => chaos.png} (100%) rename data/images/manaSymbols/{51.png => e.png} (100%) rename data/images/manaSymbols/future/{0.png => f0.png} (100%) rename data/images/manaSymbols/future/{1.png => f1.png} (100%) rename data/images/manaSymbols/future/{10.png => f10.png} (100%) rename data/images/manaSymbols/future/{11.png => f11.png} (100%) rename data/images/manaSymbols/future/{12.png => f12.png} (100%) rename data/images/manaSymbols/future/{13.png => f13.png} (100%) rename data/images/manaSymbols/future/{14.png => f14.png} (100%) rename data/images/manaSymbols/future/{15.png => f15.png} (100%) rename data/images/manaSymbols/future/{16.png => f16.png} (100%) rename data/images/manaSymbols/future/{17.png => f17.png} (100%) rename data/images/manaSymbols/future/{18.png => f18.png} (100%) rename data/images/manaSymbols/future/{19.png => f19.png} (100%) rename data/images/manaSymbols/future/{2.png => f2.png} (100%) rename data/images/manaSymbols/future/{20.png => f20.png} (100%) rename data/images/manaSymbols/future/{3.png => f3.png} (100%) rename data/images/manaSymbols/future/{4.png => f4.png} (100%) rename data/images/manaSymbols/future/{5.png => f5.png} (100%) rename data/images/manaSymbols/future/{6.png => f6.png} (100%) rename data/images/manaSymbols/future/{7.png => f7.png} (100%) rename data/images/manaSymbols/future/{8.png => f8.png} (100%) rename data/images/manaSymbols/future/{9.png => f9.png} (100%) rename data/images/manaSymbols/future/{23.png => fb.png} (100%) rename data/images/manaSymbols/future/{31.png => fbg.png} (100%) rename data/images/manaSymbols/future/{30.png => fbr.png} (100%) rename data/images/manaSymbols/future/{25.png => fg.png} (100%) rename data/images/manaSymbols/future/{35.png => fgu.png} (100%) rename data/images/manaSymbols/future/{34.png => fgw.png} (100%) rename data/images/manaSymbols/future/{24.png => fr.png} (100%) rename data/images/manaSymbols/future/{32.png => frg.png} (100%) rename data/images/manaSymbols/future/{33.png => frw.png} (100%) rename data/images/manaSymbols/future/{22.png => fu.png} (100%) rename data/images/manaSymbols/future/{28.png => fub.png} (100%) rename data/images/manaSymbols/future/{29.png => fur.png} (100%) rename data/images/manaSymbols/future/{21.png => fw.png} (100%) rename data/images/manaSymbols/future/{27.png => fwb.png} (100%) rename data/images/manaSymbols/future/{26.png => fwu.png} (100%) rename data/images/manaSymbols/future/{36.png => fx.png} (100%) rename data/images/manaSymbols/{25.png => g.png} (100%) rename data/images/manaSymbols/{45.png => gu.png} (100%) rename data/images/manaSymbols/{44.png => gw.png} (100%) rename data/images/manaSymbols/{54.png => half.png} (100%) rename data/images/manaSymbols/{55.png => inf.png} (100%) rename data/images/manaSymbols/{59.png => l+.png} (100%) rename data/images/manaSymbols/{58.png => l-.png} (100%) rename data/images/manaSymbols/{60.png => l0.png} (100%) rename data/images/manaSymbols/{61.png => oldtap.png} (100%) rename data/images/manaSymbols/{33.png => pb.png} (100%) rename data/images/manaSymbols/{35.png => pg.png} (100%) rename data/images/manaSymbols/{57.png => plane.png} (100%) rename data/images/manaSymbols/{34.png => pr.png} (100%) rename data/images/manaSymbols/{32.png => pu.png} (100%) rename data/images/manaSymbols/{31.png => pw.png} (100%) rename data/images/manaSymbols/{24.png => r.png} (100%) rename data/images/manaSymbols/{42.png => rg.png} (100%) rename data/images/manaSymbols/{43.png => rw.png} (100%) rename data/images/manaSymbols/{47.png => s.png} (100%) rename data/images/manaSymbols/{49.png => t.png} (100%) rename data/images/manaSymbols/{22.png => u.png} (100%) rename data/images/manaSymbols/{38.png => ub.png} (100%) rename data/images/manaSymbols/{50.png => untap.png} (100%) rename data/images/manaSymbols/{39.png => ur.png} (100%) rename data/images/manaSymbols/{21.png => w.png} (100%) rename data/images/manaSymbols/{37.png => wb.png} (100%) rename data/images/manaSymbols/{64.png => whiteBrush.png} (100%) rename data/images/manaSymbols/{36.png => wu.png} (100%) rename data/images/manaSymbols/{46.png => x.png} (100%) rename data/images/manaSymbols/{52.png => y.png} (100%) rename data/images/manaSymbols/{53.png => z.png} (100%) diff --git a/data/images/manaSymbols/28.png b/data/images/manaSymbols/2b.png similarity index 100% rename from data/images/manaSymbols/28.png rename to data/images/manaSymbols/2b.png diff --git a/data/images/manaSymbols/30.png b/data/images/manaSymbols/2g.png similarity index 100% rename from data/images/manaSymbols/30.png rename to data/images/manaSymbols/2g.png diff --git a/data/images/manaSymbols/29.png b/data/images/manaSymbols/2r.png similarity index 100% rename from data/images/manaSymbols/29.png rename to data/images/manaSymbols/2r.png diff --git a/data/images/manaSymbols/27.png b/data/images/manaSymbols/2u.png similarity index 100% rename from data/images/manaSymbols/27.png rename to data/images/manaSymbols/2u.png diff --git a/data/images/manaSymbols/26.png b/data/images/manaSymbols/2w.png similarity index 100% rename from data/images/manaSymbols/26.png rename to data/images/manaSymbols/2w.png diff --git a/data/images/manaSymbols/62.png b/data/images/manaSymbols/artistbrush.png similarity index 100% rename from data/images/manaSymbols/62.png rename to data/images/manaSymbols/artistbrush.png diff --git a/data/images/manaSymbols/23.png b/data/images/manaSymbols/b.png similarity index 100% rename from data/images/manaSymbols/23.png rename to data/images/manaSymbols/b.png diff --git a/data/images/manaSymbols/63.png b/data/images/manaSymbols/bar.png similarity index 100% rename from data/images/manaSymbols/63.png rename to data/images/manaSymbols/bar.png diff --git a/data/images/manaSymbols/41.png b/data/images/manaSymbols/bg.png similarity index 100% rename from data/images/manaSymbols/41.png rename to data/images/manaSymbols/bg.png diff --git a/data/images/manaSymbols/65.png b/data/images/manaSymbols/blackBrush.png similarity index 100% rename from data/images/manaSymbols/65.png rename to data/images/manaSymbols/blackBrush.png diff --git a/data/images/manaSymbols/40.png b/data/images/manaSymbols/br.png similarity index 100% rename from data/images/manaSymbols/40.png rename to data/images/manaSymbols/br.png diff --git a/data/images/manaSymbols/48.png b/data/images/manaSymbols/c.png similarity index 100% rename from data/images/manaSymbols/48.png rename to data/images/manaSymbols/c.png diff --git a/data/images/manaSymbols/56.png b/data/images/manaSymbols/chaos.png similarity index 100% rename from data/images/manaSymbols/56.png rename to data/images/manaSymbols/chaos.png diff --git a/data/images/manaSymbols/51.png b/data/images/manaSymbols/e.png similarity index 100% rename from data/images/manaSymbols/51.png rename to data/images/manaSymbols/e.png diff --git a/data/images/manaSymbols/future/0.png b/data/images/manaSymbols/future/f0.png similarity index 100% rename from data/images/manaSymbols/future/0.png rename to data/images/manaSymbols/future/f0.png diff --git a/data/images/manaSymbols/future/1.png b/data/images/manaSymbols/future/f1.png similarity index 100% rename from data/images/manaSymbols/future/1.png rename to data/images/manaSymbols/future/f1.png diff --git a/data/images/manaSymbols/future/10.png b/data/images/manaSymbols/future/f10.png similarity index 100% rename from data/images/manaSymbols/future/10.png rename to data/images/manaSymbols/future/f10.png diff --git a/data/images/manaSymbols/future/11.png b/data/images/manaSymbols/future/f11.png similarity index 100% rename from data/images/manaSymbols/future/11.png rename to data/images/manaSymbols/future/f11.png diff --git a/data/images/manaSymbols/future/12.png b/data/images/manaSymbols/future/f12.png similarity index 100% rename from data/images/manaSymbols/future/12.png rename to data/images/manaSymbols/future/f12.png diff --git a/data/images/manaSymbols/future/13.png b/data/images/manaSymbols/future/f13.png similarity index 100% rename from data/images/manaSymbols/future/13.png rename to data/images/manaSymbols/future/f13.png diff --git a/data/images/manaSymbols/future/14.png b/data/images/manaSymbols/future/f14.png similarity index 100% rename from data/images/manaSymbols/future/14.png rename to data/images/manaSymbols/future/f14.png diff --git a/data/images/manaSymbols/future/15.png b/data/images/manaSymbols/future/f15.png similarity index 100% rename from data/images/manaSymbols/future/15.png rename to data/images/manaSymbols/future/f15.png diff --git a/data/images/manaSymbols/future/16.png b/data/images/manaSymbols/future/f16.png similarity index 100% rename from data/images/manaSymbols/future/16.png rename to data/images/manaSymbols/future/f16.png diff --git a/data/images/manaSymbols/future/17.png b/data/images/manaSymbols/future/f17.png similarity index 100% rename from data/images/manaSymbols/future/17.png rename to data/images/manaSymbols/future/f17.png diff --git a/data/images/manaSymbols/future/18.png b/data/images/manaSymbols/future/f18.png similarity index 100% rename from data/images/manaSymbols/future/18.png rename to data/images/manaSymbols/future/f18.png diff --git a/data/images/manaSymbols/future/19.png b/data/images/manaSymbols/future/f19.png similarity index 100% rename from data/images/manaSymbols/future/19.png rename to data/images/manaSymbols/future/f19.png diff --git a/data/images/manaSymbols/future/2.png b/data/images/manaSymbols/future/f2.png similarity index 100% rename from data/images/manaSymbols/future/2.png rename to data/images/manaSymbols/future/f2.png diff --git a/data/images/manaSymbols/future/20.png b/data/images/manaSymbols/future/f20.png similarity index 100% rename from data/images/manaSymbols/future/20.png rename to data/images/manaSymbols/future/f20.png diff --git a/data/images/manaSymbols/future/3.png b/data/images/manaSymbols/future/f3.png similarity index 100% rename from data/images/manaSymbols/future/3.png rename to data/images/manaSymbols/future/f3.png diff --git a/data/images/manaSymbols/future/4.png b/data/images/manaSymbols/future/f4.png similarity index 100% rename from data/images/manaSymbols/future/4.png rename to data/images/manaSymbols/future/f4.png diff --git a/data/images/manaSymbols/future/5.png b/data/images/manaSymbols/future/f5.png similarity index 100% rename from data/images/manaSymbols/future/5.png rename to data/images/manaSymbols/future/f5.png diff --git a/data/images/manaSymbols/future/6.png b/data/images/manaSymbols/future/f6.png similarity index 100% rename from data/images/manaSymbols/future/6.png rename to data/images/manaSymbols/future/f6.png diff --git a/data/images/manaSymbols/future/7.png b/data/images/manaSymbols/future/f7.png similarity index 100% rename from data/images/manaSymbols/future/7.png rename to data/images/manaSymbols/future/f7.png diff --git a/data/images/manaSymbols/future/8.png b/data/images/manaSymbols/future/f8.png similarity index 100% rename from data/images/manaSymbols/future/8.png rename to data/images/manaSymbols/future/f8.png diff --git a/data/images/manaSymbols/future/9.png b/data/images/manaSymbols/future/f9.png similarity index 100% rename from data/images/manaSymbols/future/9.png rename to data/images/manaSymbols/future/f9.png diff --git a/data/images/manaSymbols/future/23.png b/data/images/manaSymbols/future/fb.png similarity index 100% rename from data/images/manaSymbols/future/23.png rename to data/images/manaSymbols/future/fb.png diff --git a/data/images/manaSymbols/future/31.png b/data/images/manaSymbols/future/fbg.png similarity index 100% rename from data/images/manaSymbols/future/31.png rename to data/images/manaSymbols/future/fbg.png diff --git a/data/images/manaSymbols/future/30.png b/data/images/manaSymbols/future/fbr.png similarity index 100% rename from data/images/manaSymbols/future/30.png rename to data/images/manaSymbols/future/fbr.png diff --git a/data/images/manaSymbols/future/25.png b/data/images/manaSymbols/future/fg.png similarity index 100% rename from data/images/manaSymbols/future/25.png rename to data/images/manaSymbols/future/fg.png diff --git a/data/images/manaSymbols/future/35.png b/data/images/manaSymbols/future/fgu.png similarity index 100% rename from data/images/manaSymbols/future/35.png rename to data/images/manaSymbols/future/fgu.png diff --git a/data/images/manaSymbols/future/34.png b/data/images/manaSymbols/future/fgw.png similarity index 100% rename from data/images/manaSymbols/future/34.png rename to data/images/manaSymbols/future/fgw.png diff --git a/data/images/manaSymbols/future/24.png b/data/images/manaSymbols/future/fr.png similarity index 100% rename from data/images/manaSymbols/future/24.png rename to data/images/manaSymbols/future/fr.png diff --git a/data/images/manaSymbols/future/32.png b/data/images/manaSymbols/future/frg.png similarity index 100% rename from data/images/manaSymbols/future/32.png rename to data/images/manaSymbols/future/frg.png diff --git a/data/images/manaSymbols/future/33.png b/data/images/manaSymbols/future/frw.png similarity index 100% rename from data/images/manaSymbols/future/33.png rename to data/images/manaSymbols/future/frw.png diff --git a/data/images/manaSymbols/future/22.png b/data/images/manaSymbols/future/fu.png similarity index 100% rename from data/images/manaSymbols/future/22.png rename to data/images/manaSymbols/future/fu.png diff --git a/data/images/manaSymbols/future/28.png b/data/images/manaSymbols/future/fub.png similarity index 100% rename from data/images/manaSymbols/future/28.png rename to data/images/manaSymbols/future/fub.png diff --git a/data/images/manaSymbols/future/29.png b/data/images/manaSymbols/future/fur.png similarity index 100% rename from data/images/manaSymbols/future/29.png rename to data/images/manaSymbols/future/fur.png diff --git a/data/images/manaSymbols/future/21.png b/data/images/manaSymbols/future/fw.png similarity index 100% rename from data/images/manaSymbols/future/21.png rename to data/images/manaSymbols/future/fw.png diff --git a/data/images/manaSymbols/future/27.png b/data/images/manaSymbols/future/fwb.png similarity index 100% rename from data/images/manaSymbols/future/27.png rename to data/images/manaSymbols/future/fwb.png diff --git a/data/images/manaSymbols/future/26.png b/data/images/manaSymbols/future/fwu.png similarity index 100% rename from data/images/manaSymbols/future/26.png rename to data/images/manaSymbols/future/fwu.png diff --git a/data/images/manaSymbols/future/36.png b/data/images/manaSymbols/future/fx.png similarity index 100% rename from data/images/manaSymbols/future/36.png rename to data/images/manaSymbols/future/fx.png diff --git a/data/images/manaSymbols/25.png b/data/images/manaSymbols/g.png similarity index 100% rename from data/images/manaSymbols/25.png rename to data/images/manaSymbols/g.png diff --git a/data/images/manaSymbols/45.png b/data/images/manaSymbols/gu.png similarity index 100% rename from data/images/manaSymbols/45.png rename to data/images/manaSymbols/gu.png diff --git a/data/images/manaSymbols/44.png b/data/images/manaSymbols/gw.png similarity index 100% rename from data/images/manaSymbols/44.png rename to data/images/manaSymbols/gw.png diff --git a/data/images/manaSymbols/54.png b/data/images/manaSymbols/half.png similarity index 100% rename from data/images/manaSymbols/54.png rename to data/images/manaSymbols/half.png diff --git a/data/images/manaSymbols/55.png b/data/images/manaSymbols/inf.png similarity index 100% rename from data/images/manaSymbols/55.png rename to data/images/manaSymbols/inf.png diff --git a/data/images/manaSymbols/59.png b/data/images/manaSymbols/l+.png similarity index 100% rename from data/images/manaSymbols/59.png rename to data/images/manaSymbols/l+.png diff --git a/data/images/manaSymbols/58.png b/data/images/manaSymbols/l-.png similarity index 100% rename from data/images/manaSymbols/58.png rename to data/images/manaSymbols/l-.png diff --git a/data/images/manaSymbols/60.png b/data/images/manaSymbols/l0.png similarity index 100% rename from data/images/manaSymbols/60.png rename to data/images/manaSymbols/l0.png diff --git a/data/images/manaSymbols/61.png b/data/images/manaSymbols/oldtap.png similarity index 100% rename from data/images/manaSymbols/61.png rename to data/images/manaSymbols/oldtap.png diff --git a/data/images/manaSymbols/33.png b/data/images/manaSymbols/pb.png similarity index 100% rename from data/images/manaSymbols/33.png rename to data/images/manaSymbols/pb.png diff --git a/data/images/manaSymbols/35.png b/data/images/manaSymbols/pg.png similarity index 100% rename from data/images/manaSymbols/35.png rename to data/images/manaSymbols/pg.png diff --git a/data/images/manaSymbols/57.png b/data/images/manaSymbols/plane.png similarity index 100% rename from data/images/manaSymbols/57.png rename to data/images/manaSymbols/plane.png diff --git a/data/images/manaSymbols/34.png b/data/images/manaSymbols/pr.png similarity index 100% rename from data/images/manaSymbols/34.png rename to data/images/manaSymbols/pr.png diff --git a/data/images/manaSymbols/32.png b/data/images/manaSymbols/pu.png similarity index 100% rename from data/images/manaSymbols/32.png rename to data/images/manaSymbols/pu.png diff --git a/data/images/manaSymbols/31.png b/data/images/manaSymbols/pw.png similarity index 100% rename from data/images/manaSymbols/31.png rename to data/images/manaSymbols/pw.png diff --git a/data/images/manaSymbols/24.png b/data/images/manaSymbols/r.png similarity index 100% rename from data/images/manaSymbols/24.png rename to data/images/manaSymbols/r.png diff --git a/data/images/manaSymbols/42.png b/data/images/manaSymbols/rg.png similarity index 100% rename from data/images/manaSymbols/42.png rename to data/images/manaSymbols/rg.png diff --git a/data/images/manaSymbols/43.png b/data/images/manaSymbols/rw.png similarity index 100% rename from data/images/manaSymbols/43.png rename to data/images/manaSymbols/rw.png diff --git a/data/images/manaSymbols/47.png b/data/images/manaSymbols/s.png similarity index 100% rename from data/images/manaSymbols/47.png rename to data/images/manaSymbols/s.png diff --git a/data/images/manaSymbols/49.png b/data/images/manaSymbols/t.png similarity index 100% rename from data/images/manaSymbols/49.png rename to data/images/manaSymbols/t.png diff --git a/data/images/manaSymbols/22.png b/data/images/manaSymbols/u.png similarity index 100% rename from data/images/manaSymbols/22.png rename to data/images/manaSymbols/u.png diff --git a/data/images/manaSymbols/38.png b/data/images/manaSymbols/ub.png similarity index 100% rename from data/images/manaSymbols/38.png rename to data/images/manaSymbols/ub.png diff --git a/data/images/manaSymbols/50.png b/data/images/manaSymbols/untap.png similarity index 100% rename from data/images/manaSymbols/50.png rename to data/images/manaSymbols/untap.png diff --git a/data/images/manaSymbols/39.png b/data/images/manaSymbols/ur.png similarity index 100% rename from data/images/manaSymbols/39.png rename to data/images/manaSymbols/ur.png diff --git a/data/images/manaSymbols/21.png b/data/images/manaSymbols/w.png similarity index 100% rename from data/images/manaSymbols/21.png rename to data/images/manaSymbols/w.png diff --git a/data/images/manaSymbols/37.png b/data/images/manaSymbols/wb.png similarity index 100% rename from data/images/manaSymbols/37.png rename to data/images/manaSymbols/wb.png diff --git a/data/images/manaSymbols/64.png b/data/images/manaSymbols/whiteBrush.png similarity index 100% rename from data/images/manaSymbols/64.png rename to data/images/manaSymbols/whiteBrush.png diff --git a/data/images/manaSymbols/36.png b/data/images/manaSymbols/wu.png similarity index 100% rename from data/images/manaSymbols/36.png rename to data/images/manaSymbols/wu.png diff --git a/data/images/manaSymbols/46.png b/data/images/manaSymbols/x.png similarity index 100% rename from data/images/manaSymbols/46.png rename to data/images/manaSymbols/x.png diff --git a/data/images/manaSymbols/52.png b/data/images/manaSymbols/y.png similarity index 100% rename from data/images/manaSymbols/52.png rename to data/images/manaSymbols/y.png diff --git a/data/images/manaSymbols/53.png b/data/images/manaSymbols/z.png similarity index 100% rename from data/images/manaSymbols/53.png rename to data/images/manaSymbols/z.png diff --git a/data/scripts/main.js b/data/scripts/main.js index 32930f2e..507568b0 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -13,14 +13,23 @@ var selectedMaskImage = 0 var selectedCardMasterElement = -1 var selectedTextObject var cardTextList = new Array() -var manaSymbolCodeList = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "w", "u", "b", "r", "g", "2w", "2u", "2b", "2r", "2g", "pw", "pu", "pb", "pr", "pg", "wu", "wb", "ub", "ur", "br", "bg", "rg", "rw", "gw", "gu", "x", "s", "c", "t","untap", "e", "y", "z", "half", "inf", "chaos", "plane", "l+", "l-", "l0", "oldtap", "artistbrush", "bar", "whiteBrush", "blackBrush"] +var manaSymbolCodeList = [] var manaSymbolImageList = [] var deletingCardObject = false -manaSymbolCodeList.forEach((item, index) => {manaSymbolImageList[index] = new Image(); manaSymbolImageList[index].src = 'data/images/manaSymbols/' + index + '.png'}) date = new Date() var cornerCutout = new Image() cornerCutout.src = 'data/images/cornerCutout.png' +function addToManaSymbolList(folderPath, newManaSymbolList) { + for (var i = 0; i < newManaSymbolList.length; i ++) { + manaSymbolCodeList.push(newManaSymbolList[i]) + manaSymbolImageList.push(new Image()) + manaSymbolImageList[manaSymbolImageList.length - 1].src = folderPath + newManaSymbolList[i] + '.png' + } +} + +addToManaSymbolList('data/images/manaSymbols/', ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "w", "u", "b", "r", "g", "2w", "2u", "2b", "2r", "2g", "pw", "pu", "pb", "pr", "pg", "wu", "wb", "ub", "ur", "br", "bg", "rg", "rw", "gw", "gu", "x", "s", "c", "t","untap", "e", "y", "z", "half", "inf", "chaos", "plane", "l+", "l-", "l0", "oldtap", "artistbrush", "bar", "whiteBrush", "blackBrush"]) + function newCanvas(name) { window[name + 'Canvas'] = document.createElement('canvas') window[name + 'Canvas'].width = cardWidth @@ -626,7 +635,7 @@ function inputCardArtName(cardArtNameInput) { } inputCardArtNameNumber(1) } else if (this.readyState == 4 && this.status == 404) { - alert("Sorry, but we can't seem to find any art for " + cardArtNameInput) + notify("Sorry, but we can't seem to find any art for '" + cardArtNameInput + "'", '#ffffaae0') } } xhttp.open('GET', 'https://api.scryfall.com/cards/search?order=released&unique=art&q=name%3D' + cardArtNameInput.replace(/ /g, '_'), true) @@ -743,7 +752,7 @@ function inputCardNameTextImport(cardName) { document.getElementById('inputCardNameNumberTextImport').value = 1 } else if (this.readyState == 4 && this.status == 404) { savedImportResponse = '' - alert("Sorry, but we can't seem to find any card named '" + cardName + "'") + notify("Sorry, but we can't seem to find any card named '" + cardName + "'", '#ffffaae0') } } xhttp.open('GET', 'https://api.scryfall.com/cards/search?order=released&q=name%3D' + cardName.replace(/ /g, '+'), true) @@ -818,11 +827,11 @@ function downloadCardImage(linkElement) { } } else { event.preventDefault() - alert("You must properly credit an artist before downloading!") + notify("You must properly credit an artist before downloading!", '#ffaaaae0') } var cardImageData = mainCanvas.toDataURL() if (cardImageData == undefined) { - alert("Sorry, but it seems that you cannot download your card. Please try using a different browser/device.") + notify("Sorry, but it seems that you cannot download your card. Please try using a different browser/device.", '#ffffaae0') } linkElement.href = cardImageData } diff --git a/data/scripts/versions/future/version.js b/data/scripts/versions/future/version.js index f3adbf87..eb8a9aa7 100644 --- a/data/scripts/versions/future/version.js +++ b/data/scripts/versions/future/version.js @@ -1,6 +1,8 @@ if (!loadedVersions.includes('future')) { loadedVersions.push('future') loadMaskImages([['Border (future)', 'data/images/future/futureMaskBorder.png'], ['Artifact Icon (future)', 'data/images/future/futureMaskArtifact.png'], ['Creature Icon (future)', 'data/images/future/futureMaskCreature.png'], ['Enchantment Icon (future)', 'data/images/future/futureMaskEnchantment.png'], ['Instant Icon (future)', 'data/images/future/futureMaskInstant.png'], ['Land Icon (future)', 'data/images/future/futureMaskLand.png'], ['Multitype Icon (future)', 'data/images/future/futureMaskMulti.png'], ['Sorcery Icon (future)', 'data/images/future/futureMaskSorcery.png']]) + addToManaSymbolList('data/images/manaSymbols/future/', ["f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "fw", "fu", "fb", "fr", "fg", "fwu", "fwb", "fub", "fur", "fbr", "fbg", "frg", "frw", "fgw", "fgu", "fx"]) + notify('The Future Shifted frame uses special mana symbols for 1-20, WUBRG, all hybrid mana symbols, and X. If you would like to use these, just add an "f" at the beginning of each symbol. For example, "2 g g" would become "f2 fg fg".', '#aaffaae0') } if (currentVersion != 'future') { diff --git a/data/scripts/versions/m15/m21.js b/data/scripts/versions/m15/m21.js index 0479928f..0efdb78c 100644 --- a/data/scripts/versions/m15/m21.js +++ b/data/scripts/versions/m15/m21.js @@ -18,6 +18,8 @@ if (!loadedVersions.includes('m15M21Showcase')) { ['Green Power/Toughness', 'data/images/m15/m21/m15M21PTG.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], ['Holo Stamp', 'data/images/m15/m21/m15M21Stamp.png', 709/1500, 1873/2100, 82/1500, 82/2100, ['Full']] ], 'frameClassM15M21Showcase') + // addToManaSymbolList('data/images/manaSymbols/future/', ["f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "fw", "fu", "fb", "fr", "fg", "fwu", "fwb", "fub", "fur", "fbr", "fbg", "frg", "frw", "fgw", "fgu", "fx"]) + // notify('The Future Shifted frame uses special mana symbols for 1-20, WUBRG, all hybrid mana symbols, and X. If you would like to use these, just add an "f" at the beginning of each symbol. For example, "2 g g" would become "f2 fg fg".', '#aaffaae0') } if (currentVersion != 'm15M21Showcase') {