diff --git a/img/frames/m15/regular/new/a.png b/img/frames/m15/new/a.png similarity index 100% rename from img/frames/m15/regular/new/a.png rename to img/frames/m15/new/a.png diff --git a/img/frames/m15/regular/new/aThumb.png b/img/frames/m15/new/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/aThumb.png rename to img/frames/m15/new/aThumb.png diff --git a/img/frames/m15/regular/new/b.png b/img/frames/m15/new/b.png similarity index 100% rename from img/frames/m15/regular/new/b.png rename to img/frames/m15/new/b.png diff --git a/img/frames/m15/regular/new/bThumb.png b/img/frames/m15/new/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/bThumb.png rename to img/frames/m15/new/bThumb.png diff --git a/img/frames/m15/regular/new/border.png b/img/frames/m15/new/border.png similarity index 100% rename from img/frames/m15/regular/new/border.png rename to img/frames/m15/new/border.png diff --git a/img/frames/m15/regular/new/borderThumb.png b/img/frames/m15/new/borderThumb.png similarity index 100% rename from img/frames/m15/regular/new/borderThumb.png rename to img/frames/m15/new/borderThumb.png diff --git a/img/frames/m15/regular/new/c.png b/img/frames/m15/new/c.png similarity index 100% rename from img/frames/m15/regular/new/c.png rename to img/frames/m15/new/c.png diff --git a/img/frames/m15/regular/new/cThumb.png b/img/frames/m15/new/cThumb.png similarity index 100% rename from img/frames/m15/regular/new/cThumb.png rename to img/frames/m15/new/cThumb.png diff --git a/img/frames/m15/regular/new/frame.png b/img/frames/m15/new/frame.png similarity index 100% rename from img/frames/m15/regular/new/frame.png rename to img/frames/m15/new/frame.png diff --git a/img/frames/m15/regular/new/frameThumb.png b/img/frames/m15/new/frameThumb.png similarity index 100% rename from img/frames/m15/regular/new/frameThumb.png rename to img/frames/m15/new/frameThumb.png diff --git a/img/frames/m15/regular/new/fullart/a.png b/img/frames/m15/new/fullart/a.png similarity index 100% rename from img/frames/m15/regular/new/fullart/a.png rename to img/frames/m15/new/fullart/a.png diff --git a/img/frames/m15/regular/new/fullart/aThumb.png b/img/frames/m15/new/fullart/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/aThumb.png rename to img/frames/m15/new/fullart/aThumb.png diff --git a/img/frames/m15/regular/new/fullart/b.png b/img/frames/m15/new/fullart/b.png similarity index 100% rename from img/frames/m15/regular/new/fullart/b.png rename to img/frames/m15/new/fullart/b.png diff --git a/img/frames/m15/regular/new/fullart/bThumb.png b/img/frames/m15/new/fullart/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/bThumb.png rename to img/frames/m15/new/fullart/bThumb.png diff --git a/img/frames/m15/regular/new/fullart/g.png b/img/frames/m15/new/fullart/g.png similarity index 100% rename from img/frames/m15/regular/new/fullart/g.png rename to img/frames/m15/new/fullart/g.png diff --git a/img/frames/m15/regular/new/fullart/gThumb.png b/img/frames/m15/new/fullart/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/gThumb.png rename to img/frames/m15/new/fullart/gThumb.png diff --git a/img/frames/m15/regular/new/fullart/l.png b/img/frames/m15/new/fullart/l.png similarity index 100% rename from img/frames/m15/regular/new/fullart/l.png rename to img/frames/m15/new/fullart/l.png diff --git a/img/frames/m15/regular/new/fullart/lThumb.png b/img/frames/m15/new/fullart/lThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lThumb.png rename to img/frames/m15/new/fullart/lThumb.png diff --git a/img/frames/m15/regular/new/fullart/lb.png b/img/frames/m15/new/fullart/lb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lb.png rename to img/frames/m15/new/fullart/lb.png diff --git a/img/frames/m15/regular/new/fullart/lbThumb.png b/img/frames/m15/new/fullart/lbThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lbThumb.png rename to img/frames/m15/new/fullart/lbThumb.png diff --git a/img/frames/m15/regular/new/fullart/lg.png b/img/frames/m15/new/fullart/lg.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lg.png rename to img/frames/m15/new/fullart/lg.png diff --git a/img/frames/m15/regular/new/fullart/lgThumb.png b/img/frames/m15/new/fullart/lgThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lgThumb.png rename to img/frames/m15/new/fullart/lgThumb.png diff --git a/img/frames/m15/regular/new/fullart/lm.png b/img/frames/m15/new/fullart/lm.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lm.png rename to img/frames/m15/new/fullart/lm.png diff --git a/img/frames/m15/regular/new/fullart/lmThumb.png b/img/frames/m15/new/fullart/lmThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lmThumb.png rename to img/frames/m15/new/fullart/lmThumb.png diff --git a/img/frames/m15/regular/new/fullart/lr.png b/img/frames/m15/new/fullart/lr.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lr.png rename to img/frames/m15/new/fullart/lr.png diff --git a/img/frames/m15/regular/new/fullart/lrThumb.png b/img/frames/m15/new/fullart/lrThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lrThumb.png rename to img/frames/m15/new/fullart/lrThumb.png diff --git a/img/frames/m15/regular/new/fullart/lu.png b/img/frames/m15/new/fullart/lu.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lu.png rename to img/frames/m15/new/fullart/lu.png diff --git a/img/frames/m15/regular/new/fullart/luThumb.png b/img/frames/m15/new/fullart/luThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/luThumb.png rename to img/frames/m15/new/fullart/luThumb.png diff --git a/img/frames/m15/regular/new/fullart/lw.png b/img/frames/m15/new/fullart/lw.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lw.png rename to img/frames/m15/new/fullart/lw.png diff --git a/img/frames/m15/regular/new/fullart/lwThumb.png b/img/frames/m15/new/fullart/lwThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/lwThumb.png rename to img/frames/m15/new/fullart/lwThumb.png diff --git a/img/frames/m15/regular/new/fullart/m.png b/img/frames/m15/new/fullart/m.png similarity index 100% rename from img/frames/m15/regular/new/fullart/m.png rename to img/frames/m15/new/fullart/m.png diff --git a/img/frames/m15/regular/new/fullart/mThumb.png b/img/frames/m15/new/fullart/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/mThumb.png rename to img/frames/m15/new/fullart/mThumb.png diff --git a/img/frames/m15/regular/new/fullart/r.png b/img/frames/m15/new/fullart/r.png similarity index 100% rename from img/frames/m15/regular/new/fullart/r.png rename to img/frames/m15/new/fullart/r.png diff --git a/img/frames/m15/regular/new/fullart/rThumb.png b/img/frames/m15/new/fullart/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/rThumb.png rename to img/frames/m15/new/fullart/rThumb.png diff --git a/img/frames/m15/regular/new/fullart/u.png b/img/frames/m15/new/fullart/u.png similarity index 100% rename from img/frames/m15/regular/new/fullart/u.png rename to img/frames/m15/new/fullart/u.png diff --git a/img/frames/m15/regular/new/fullart/uThumb.png b/img/frames/m15/new/fullart/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/uThumb.png rename to img/frames/m15/new/fullart/uThumb.png diff --git a/img/frames/m15/regular/new/fullart/v.png b/img/frames/m15/new/fullart/v.png similarity index 100% rename from img/frames/m15/regular/new/fullart/v.png rename to img/frames/m15/new/fullart/v.png diff --git a/img/frames/m15/regular/new/fullart/vThumb.png b/img/frames/m15/new/fullart/vThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/vThumb.png rename to img/frames/m15/new/fullart/vThumb.png diff --git a/img/frames/m15/regular/new/fullart/w.png b/img/frames/m15/new/fullart/w.png similarity index 100% rename from img/frames/m15/regular/new/fullart/w.png rename to img/frames/m15/new/fullart/w.png diff --git a/img/frames/m15/regular/new/fullart/wThumb.png b/img/frames/m15/new/fullart/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/fullart/wThumb.png rename to img/frames/m15/new/fullart/wThumb.png diff --git a/img/frames/m15/regular/new/g.png b/img/frames/m15/new/g.png similarity index 100% rename from img/frames/m15/regular/new/g.png rename to img/frames/m15/new/g.png diff --git a/img/frames/m15/regular/new/gThumb.png b/img/frames/m15/new/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/gThumb.png rename to img/frames/m15/new/gThumb.png diff --git a/img/frames/m15/regular/new/l.png b/img/frames/m15/new/l.png similarity index 100% rename from img/frames/m15/regular/new/l.png rename to img/frames/m15/new/l.png diff --git a/img/frames/m15/regular/new/lThumb.png b/img/frames/m15/new/lThumb.png similarity index 100% rename from img/frames/m15/regular/new/lThumb.png rename to img/frames/m15/new/lThumb.png diff --git a/img/frames/m15/regular/new/lb.png b/img/frames/m15/new/lb.png similarity index 100% rename from img/frames/m15/regular/new/lb.png rename to img/frames/m15/new/lb.png diff --git a/img/frames/m15/regular/new/lbThumb.png b/img/frames/m15/new/lbThumb.png similarity index 100% rename from img/frames/m15/regular/new/lbThumb.png rename to img/frames/m15/new/lbThumb.png diff --git a/img/frames/m15/regular/new/lg.png b/img/frames/m15/new/lg.png similarity index 100% rename from img/frames/m15/regular/new/lg.png rename to img/frames/m15/new/lg.png diff --git a/img/frames/m15/regular/new/lgThumb.png b/img/frames/m15/new/lgThumb.png similarity index 100% rename from img/frames/m15/regular/new/lgThumb.png rename to img/frames/m15/new/lgThumb.png diff --git a/img/frames/m15/regular/new/lm.png b/img/frames/m15/new/lm.png similarity index 100% rename from img/frames/m15/regular/new/lm.png rename to img/frames/m15/new/lm.png diff --git a/img/frames/m15/regular/new/lmThumb.png b/img/frames/m15/new/lmThumb.png similarity index 100% rename from img/frames/m15/regular/new/lmThumb.png rename to img/frames/m15/new/lmThumb.png diff --git a/img/frames/m15/regular/new/lr.png b/img/frames/m15/new/lr.png similarity index 100% rename from img/frames/m15/regular/new/lr.png rename to img/frames/m15/new/lr.png diff --git a/img/frames/m15/regular/new/lrThumb.png b/img/frames/m15/new/lrThumb.png similarity index 100% rename from img/frames/m15/regular/new/lrThumb.png rename to img/frames/m15/new/lrThumb.png diff --git a/img/frames/m15/regular/new/lu.png b/img/frames/m15/new/lu.png similarity index 100% rename from img/frames/m15/regular/new/lu.png rename to img/frames/m15/new/lu.png diff --git a/img/frames/m15/regular/new/luThumb.png b/img/frames/m15/new/luThumb.png similarity index 100% rename from img/frames/m15/regular/new/luThumb.png rename to img/frames/m15/new/luThumb.png diff --git a/img/frames/m15/regular/new/lw.png b/img/frames/m15/new/lw.png similarity index 100% rename from img/frames/m15/regular/new/lw.png rename to img/frames/m15/new/lw.png diff --git a/img/frames/m15/regular/new/lwThumb.png b/img/frames/m15/new/lwThumb.png similarity index 100% rename from img/frames/m15/regular/new/lwThumb.png rename to img/frames/m15/new/lwThumb.png diff --git a/img/frames/m15/regular/new/m.png b/img/frames/m15/new/m.png similarity index 100% rename from img/frames/m15/regular/new/m.png rename to img/frames/m15/new/m.png diff --git a/img/frames/m15/regular/new/mThumb.png b/img/frames/m15/new/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/mThumb.png rename to img/frames/m15/new/mThumb.png diff --git a/img/frames/m15/regular/new/nyx/a.png b/img/frames/m15/new/nyx/a.png similarity index 100% rename from img/frames/m15/regular/new/nyx/a.png rename to img/frames/m15/new/nyx/a.png diff --git a/img/frames/m15/regular/new/nyx/aThumb.png b/img/frames/m15/new/nyx/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/aThumb.png rename to img/frames/m15/new/nyx/aThumb.png diff --git a/img/frames/m15/regular/new/nyx/b.png b/img/frames/m15/new/nyx/b.png similarity index 100% rename from img/frames/m15/regular/new/nyx/b.png rename to img/frames/m15/new/nyx/b.png diff --git a/img/frames/m15/regular/new/nyx/bThumb.png b/img/frames/m15/new/nyx/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/bThumb.png rename to img/frames/m15/new/nyx/bThumb.png diff --git a/img/frames/m15/regular/new/nyx/g.png b/img/frames/m15/new/nyx/g.png similarity index 100% rename from img/frames/m15/regular/new/nyx/g.png rename to img/frames/m15/new/nyx/g.png diff --git a/img/frames/m15/regular/new/nyx/gThumb.png b/img/frames/m15/new/nyx/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/gThumb.png rename to img/frames/m15/new/nyx/gThumb.png diff --git a/img/frames/m15/regular/new/nyx/m.png b/img/frames/m15/new/nyx/m.png similarity index 100% rename from img/frames/m15/regular/new/nyx/m.png rename to img/frames/m15/new/nyx/m.png diff --git a/img/frames/m15/regular/new/nyx/mThumb.png b/img/frames/m15/new/nyx/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/mThumb.png rename to img/frames/m15/new/nyx/mThumb.png diff --git a/img/frames/m15/regular/new/nyx/r.png b/img/frames/m15/new/nyx/r.png similarity index 100% rename from img/frames/m15/regular/new/nyx/r.png rename to img/frames/m15/new/nyx/r.png diff --git a/img/frames/m15/regular/new/nyx/rThumb.png b/img/frames/m15/new/nyx/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/rThumb.png rename to img/frames/m15/new/nyx/rThumb.png diff --git a/img/frames/m15/regular/new/nyx/u.png b/img/frames/m15/new/nyx/u.png similarity index 100% rename from img/frames/m15/regular/new/nyx/u.png rename to img/frames/m15/new/nyx/u.png diff --git a/img/frames/m15/regular/new/nyx/uThumb.png b/img/frames/m15/new/nyx/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/uThumb.png rename to img/frames/m15/new/nyx/uThumb.png diff --git a/img/frames/m15/regular/new/nyx/w.png b/img/frames/m15/new/nyx/w.png similarity index 100% rename from img/frames/m15/regular/new/nyx/w.png rename to img/frames/m15/new/nyx/w.png diff --git a/img/frames/m15/regular/new/nyx/wThumb.png b/img/frames/m15/new/nyx/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/nyx/wThumb.png rename to img/frames/m15/new/nyx/wThumb.png diff --git a/img/frames/m15/regular/new/pinline.png b/img/frames/m15/new/pinline.png similarity index 100% rename from img/frames/m15/regular/new/pinline.png rename to img/frames/m15/new/pinline.png diff --git a/img/frames/m15/regular/new/pinlineThumb.png b/img/frames/m15/new/pinlineThumb.png similarity index 100% rename from img/frames/m15/regular/new/pinlineThumb.png rename to img/frames/m15/new/pinlineThumb.png diff --git a/img/frames/m15/regular/new/r.png b/img/frames/m15/new/r.png similarity index 100% rename from img/frames/m15/regular/new/r.png rename to img/frames/m15/new/r.png diff --git a/img/frames/m15/regular/new/rThumb.png b/img/frames/m15/new/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/rThumb.png rename to img/frames/m15/new/rThumb.png diff --git a/img/frames/m15/regular/new/rules.png b/img/frames/m15/new/rules.png similarity index 100% rename from img/frames/m15/regular/new/rules.png rename to img/frames/m15/new/rules.png diff --git a/img/frames/m15/regular/new/rulesThumb.png b/img/frames/m15/new/rulesThumb.png similarity index 100% rename from img/frames/m15/regular/new/rulesThumb.png rename to img/frames/m15/new/rulesThumb.png diff --git a/img/frames/m15/regular/new/snow/a.png b/img/frames/m15/new/snow/a.png similarity index 100% rename from img/frames/m15/regular/new/snow/a.png rename to img/frames/m15/new/snow/a.png diff --git a/img/frames/m15/regular/new/snow/aThumb.png b/img/frames/m15/new/snow/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/aThumb.png rename to img/frames/m15/new/snow/aThumb.png diff --git a/img/frames/m15/regular/new/snow/b.png b/img/frames/m15/new/snow/b.png similarity index 100% rename from img/frames/m15/regular/new/snow/b.png rename to img/frames/m15/new/snow/b.png diff --git a/img/frames/m15/regular/new/snow/bThumb.png b/img/frames/m15/new/snow/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/bThumb.png rename to img/frames/m15/new/snow/bThumb.png diff --git a/img/frames/m15/regular/new/snow/g.png b/img/frames/m15/new/snow/g.png similarity index 100% rename from img/frames/m15/regular/new/snow/g.png rename to img/frames/m15/new/snow/g.png diff --git a/img/frames/m15/regular/new/snow/gThumb.png b/img/frames/m15/new/snow/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/gThumb.png rename to img/frames/m15/new/snow/gThumb.png diff --git a/img/frames/m15/regular/new/snow/l.png b/img/frames/m15/new/snow/l.png similarity index 100% rename from img/frames/m15/regular/new/snow/l.png rename to img/frames/m15/new/snow/l.png diff --git a/img/frames/m15/regular/new/snow/lThumb.png b/img/frames/m15/new/snow/lThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lThumb.png rename to img/frames/m15/new/snow/lThumb.png diff --git a/img/frames/m15/regular/new/snow/lb.png b/img/frames/m15/new/snow/lb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lb.png rename to img/frames/m15/new/snow/lb.png diff --git a/img/frames/m15/regular/new/snow/lbThumb.png b/img/frames/m15/new/snow/lbThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lbThumb.png rename to img/frames/m15/new/snow/lbThumb.png diff --git a/img/frames/m15/regular/new/snow/lg.png b/img/frames/m15/new/snow/lg.png similarity index 100% rename from img/frames/m15/regular/new/snow/lg.png rename to img/frames/m15/new/snow/lg.png diff --git a/img/frames/m15/regular/new/snow/lgThumb.png b/img/frames/m15/new/snow/lgThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lgThumb.png rename to img/frames/m15/new/snow/lgThumb.png diff --git a/img/frames/m15/regular/new/snow/lm.png b/img/frames/m15/new/snow/lm.png similarity index 100% rename from img/frames/m15/regular/new/snow/lm.png rename to img/frames/m15/new/snow/lm.png diff --git a/img/frames/m15/regular/new/snow/lmThumb.png b/img/frames/m15/new/snow/lmThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lmThumb.png rename to img/frames/m15/new/snow/lmThumb.png diff --git a/img/frames/m15/regular/new/snow/lr.png b/img/frames/m15/new/snow/lr.png similarity index 100% rename from img/frames/m15/regular/new/snow/lr.png rename to img/frames/m15/new/snow/lr.png diff --git a/img/frames/m15/regular/new/snow/lrThumb.png b/img/frames/m15/new/snow/lrThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lrThumb.png rename to img/frames/m15/new/snow/lrThumb.png diff --git a/img/frames/m15/regular/new/snow/lu.png b/img/frames/m15/new/snow/lu.png similarity index 100% rename from img/frames/m15/regular/new/snow/lu.png rename to img/frames/m15/new/snow/lu.png diff --git a/img/frames/m15/regular/new/snow/luThumb.png b/img/frames/m15/new/snow/luThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/luThumb.png rename to img/frames/m15/new/snow/luThumb.png diff --git a/img/frames/m15/regular/new/snow/lw.png b/img/frames/m15/new/snow/lw.png similarity index 100% rename from img/frames/m15/regular/new/snow/lw.png rename to img/frames/m15/new/snow/lw.png diff --git a/img/frames/m15/regular/new/snow/lwThumb.png b/img/frames/m15/new/snow/lwThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/lwThumb.png rename to img/frames/m15/new/snow/lwThumb.png diff --git a/img/frames/m15/regular/new/snow/m.png b/img/frames/m15/new/snow/m.png similarity index 100% rename from img/frames/m15/regular/new/snow/m.png rename to img/frames/m15/new/snow/m.png diff --git a/img/frames/m15/regular/new/snow/mThumb.png b/img/frames/m15/new/snow/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/mThumb.png rename to img/frames/m15/new/snow/mThumb.png diff --git a/img/frames/m15/regular/new/snow/r.png b/img/frames/m15/new/snow/r.png similarity index 100% rename from img/frames/m15/regular/new/snow/r.png rename to img/frames/m15/new/snow/r.png diff --git a/img/frames/m15/regular/new/snow/rThumb.png b/img/frames/m15/new/snow/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/rThumb.png rename to img/frames/m15/new/snow/rThumb.png diff --git a/img/frames/m15/regular/new/snow/u.png b/img/frames/m15/new/snow/u.png similarity index 100% rename from img/frames/m15/regular/new/snow/u.png rename to img/frames/m15/new/snow/u.png diff --git a/img/frames/m15/regular/new/snow/uThumb.png b/img/frames/m15/new/snow/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/uThumb.png rename to img/frames/m15/new/snow/uThumb.png diff --git a/img/frames/m15/regular/new/snow/w.png b/img/frames/m15/new/snow/w.png similarity index 100% rename from img/frames/m15/regular/new/snow/w.png rename to img/frames/m15/new/snow/w.png diff --git a/img/frames/m15/regular/new/snow/wThumb.png b/img/frames/m15/new/snow/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/snow/wThumb.png rename to img/frames/m15/new/snow/wThumb.png diff --git a/img/frames/m15/regular/new/title.png b/img/frames/m15/new/title.png similarity index 100% rename from img/frames/m15/regular/new/title.png rename to img/frames/m15/new/title.png diff --git a/img/frames/m15/regular/new/titleThumb.png b/img/frames/m15/new/titleThumb.png similarity index 100% rename from img/frames/m15/regular/new/titleThumb.png rename to img/frames/m15/new/titleThumb.png diff --git a/img/frames/m15/regular/new/type.png b/img/frames/m15/new/type.png similarity index 100% rename from img/frames/m15/regular/new/type.png rename to img/frames/m15/new/type.png diff --git a/img/frames/m15/regular/new/typeThumb.png b/img/frames/m15/new/typeThumb.png similarity index 100% rename from img/frames/m15/regular/new/typeThumb.png rename to img/frames/m15/new/typeThumb.png diff --git a/img/frames/m15/regular/new/u.png b/img/frames/m15/new/u.png similarity index 100% rename from img/frames/m15/regular/new/u.png rename to img/frames/m15/new/u.png diff --git a/img/frames/m15/regular/new/uThumb.png b/img/frames/m15/new/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/uThumb.png rename to img/frames/m15/new/uThumb.png diff --git a/img/frames/m15/regular/new/ub/a.png b/img/frames/m15/new/ub/a.png similarity index 100% rename from img/frames/m15/regular/new/ub/a.png rename to img/frames/m15/new/ub/a.png diff --git a/img/frames/m15/regular/new/ub/aThumb.png b/img/frames/m15/new/ub/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/aThumb.png rename to img/frames/m15/new/ub/aThumb.png diff --git a/img/frames/m15/regular/new/ub/b.png b/img/frames/m15/new/ub/b.png similarity index 100% rename from img/frames/m15/regular/new/ub/b.png rename to img/frames/m15/new/ub/b.png diff --git a/img/frames/m15/regular/new/ub/bThumb.png b/img/frames/m15/new/ub/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/bThumb.png rename to img/frames/m15/new/ub/bThumb.png diff --git a/img/frames/m15/regular/new/ub/g.png b/img/frames/m15/new/ub/g.png similarity index 100% rename from img/frames/m15/regular/new/ub/g.png rename to img/frames/m15/new/ub/g.png diff --git a/img/frames/m15/regular/new/ub/gThumb.png b/img/frames/m15/new/ub/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/gThumb.png rename to img/frames/m15/new/ub/gThumb.png diff --git a/img/frames/m15/regular/new/ub/l.png b/img/frames/m15/new/ub/l.png similarity index 100% rename from img/frames/m15/regular/new/ub/l.png rename to img/frames/m15/new/ub/l.png diff --git a/img/frames/m15/regular/new/ub/lThumb.png b/img/frames/m15/new/ub/lThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lThumb.png rename to img/frames/m15/new/ub/lThumb.png diff --git a/img/frames/m15/regular/new/ub/lb.png b/img/frames/m15/new/ub/lb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lb.png rename to img/frames/m15/new/ub/lb.png diff --git a/img/frames/m15/regular/new/ub/lbThumb.png b/img/frames/m15/new/ub/lbThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lbThumb.png rename to img/frames/m15/new/ub/lbThumb.png diff --git a/img/frames/m15/regular/new/ub/lg.png b/img/frames/m15/new/ub/lg.png similarity index 100% rename from img/frames/m15/regular/new/ub/lg.png rename to img/frames/m15/new/ub/lg.png diff --git a/img/frames/m15/regular/new/ub/lgThumb.png b/img/frames/m15/new/ub/lgThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lgThumb.png rename to img/frames/m15/new/ub/lgThumb.png diff --git a/img/frames/m15/regular/new/ub/lm.png b/img/frames/m15/new/ub/lm.png similarity index 100% rename from img/frames/m15/regular/new/ub/lm.png rename to img/frames/m15/new/ub/lm.png diff --git a/img/frames/m15/regular/new/ub/lmThumb.png b/img/frames/m15/new/ub/lmThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lmThumb.png rename to img/frames/m15/new/ub/lmThumb.png diff --git a/img/frames/m15/regular/new/ub/lr.png b/img/frames/m15/new/ub/lr.png similarity index 100% rename from img/frames/m15/regular/new/ub/lr.png rename to img/frames/m15/new/ub/lr.png diff --git a/img/frames/m15/regular/new/ub/lrThumb.png b/img/frames/m15/new/ub/lrThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lrThumb.png rename to img/frames/m15/new/ub/lrThumb.png diff --git a/img/frames/m15/regular/new/ub/lu.png b/img/frames/m15/new/ub/lu.png similarity index 100% rename from img/frames/m15/regular/new/ub/lu.png rename to img/frames/m15/new/ub/lu.png diff --git a/img/frames/m15/regular/new/ub/luThumb.png b/img/frames/m15/new/ub/luThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/luThumb.png rename to img/frames/m15/new/ub/luThumb.png diff --git a/img/frames/m15/regular/new/ub/lw.png b/img/frames/m15/new/ub/lw.png similarity index 100% rename from img/frames/m15/regular/new/ub/lw.png rename to img/frames/m15/new/ub/lw.png diff --git a/img/frames/m15/regular/new/ub/lwThumb.png b/img/frames/m15/new/ub/lwThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/lwThumb.png rename to img/frames/m15/new/ub/lwThumb.png diff --git a/img/frames/m15/regular/new/ub/m.png b/img/frames/m15/new/ub/m.png similarity index 100% rename from img/frames/m15/regular/new/ub/m.png rename to img/frames/m15/new/ub/m.png diff --git a/img/frames/m15/regular/new/ub/mThumb.png b/img/frames/m15/new/ub/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/mThumb.png rename to img/frames/m15/new/ub/mThumb.png diff --git a/img/frames/m15/regular/new/ub/r.png b/img/frames/m15/new/ub/r.png similarity index 100% rename from img/frames/m15/regular/new/ub/r.png rename to img/frames/m15/new/ub/r.png diff --git a/img/frames/m15/regular/new/ub/rThumb.png b/img/frames/m15/new/ub/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/rThumb.png rename to img/frames/m15/new/ub/rThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/a.png b/img/frames/m15/new/ub/stamp/a.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/a.png rename to img/frames/m15/new/ub/stamp/a.png diff --git a/img/frames/m15/regular/new/ub/stamp/aThumb.png b/img/frames/m15/new/ub/stamp/aThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/aThumb.png rename to img/frames/m15/new/ub/stamp/aThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/b.png b/img/frames/m15/new/ub/stamp/b.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/b.png rename to img/frames/m15/new/ub/stamp/b.png diff --git a/img/frames/m15/regular/new/ub/stamp/bThumb.png b/img/frames/m15/new/ub/stamp/bThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/bThumb.png rename to img/frames/m15/new/ub/stamp/bThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/g.png b/img/frames/m15/new/ub/stamp/g.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/g.png rename to img/frames/m15/new/ub/stamp/g.png diff --git a/img/frames/m15/regular/new/ub/stamp/gThumb.png b/img/frames/m15/new/ub/stamp/gThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/gThumb.png rename to img/frames/m15/new/ub/stamp/gThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/gray.png b/img/frames/m15/new/ub/stamp/gray.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/gray.png rename to img/frames/m15/new/ub/stamp/gray.png diff --git a/img/frames/m15/regular/new/ub/stamp/grayThumb.png b/img/frames/m15/new/ub/stamp/grayThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/grayThumb.png rename to img/frames/m15/new/ub/stamp/grayThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/l.png b/img/frames/m15/new/ub/stamp/l.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/l.png rename to img/frames/m15/new/ub/stamp/l.png diff --git a/img/frames/m15/regular/new/ub/stamp/lThumb.png b/img/frames/m15/new/ub/stamp/lThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/lThumb.png rename to img/frames/m15/new/ub/stamp/lThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/m.png b/img/frames/m15/new/ub/stamp/m.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/m.png rename to img/frames/m15/new/ub/stamp/m.png diff --git a/img/frames/m15/regular/new/ub/stamp/mThumb.png b/img/frames/m15/new/ub/stamp/mThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/mThumb.png rename to img/frames/m15/new/ub/stamp/mThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/r.png b/img/frames/m15/new/ub/stamp/r.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/r.png rename to img/frames/m15/new/ub/stamp/r.png diff --git a/img/frames/m15/regular/new/ub/stamp/rThumb.png b/img/frames/m15/new/ub/stamp/rThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/rThumb.png rename to img/frames/m15/new/ub/stamp/rThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/u.png b/img/frames/m15/new/ub/stamp/u.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/u.png rename to img/frames/m15/new/ub/stamp/u.png diff --git a/img/frames/m15/regular/new/ub/stamp/uThumb.png b/img/frames/m15/new/ub/stamp/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/uThumb.png rename to img/frames/m15/new/ub/stamp/uThumb.png diff --git a/img/frames/m15/regular/new/ub/stamp/w.png b/img/frames/m15/new/ub/stamp/w.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/w.png rename to img/frames/m15/new/ub/stamp/w.png diff --git a/img/frames/m15/regular/new/ub/stamp/wThumb.png b/img/frames/m15/new/ub/stamp/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/stamp/wThumb.png rename to img/frames/m15/new/ub/stamp/wThumb.png diff --git a/img/frames/m15/regular/new/ub/u.png b/img/frames/m15/new/ub/u.png similarity index 100% rename from img/frames/m15/regular/new/ub/u.png rename to img/frames/m15/new/ub/u.png diff --git a/img/frames/m15/regular/new/ub/uThumb.png b/img/frames/m15/new/ub/uThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/uThumb.png rename to img/frames/m15/new/ub/uThumb.png diff --git a/img/frames/m15/regular/new/ub/v.png b/img/frames/m15/new/ub/v.png similarity index 100% rename from img/frames/m15/regular/new/ub/v.png rename to img/frames/m15/new/ub/v.png diff --git a/img/frames/m15/regular/new/ub/vThumb.png b/img/frames/m15/new/ub/vThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/vThumb.png rename to img/frames/m15/new/ub/vThumb.png diff --git a/img/frames/m15/regular/new/ub/w.png b/img/frames/m15/new/ub/w.png similarity index 100% rename from img/frames/m15/regular/new/ub/w.png rename to img/frames/m15/new/ub/w.png diff --git a/img/frames/m15/regular/new/ub/wThumb.png b/img/frames/m15/new/ub/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/ub/wThumb.png rename to img/frames/m15/new/ub/wThumb.png diff --git a/img/frames/m15/regular/new/v.png b/img/frames/m15/new/v.png similarity index 100% rename from img/frames/m15/regular/new/v.png rename to img/frames/m15/new/v.png diff --git a/img/frames/m15/regular/new/vThumb.png b/img/frames/m15/new/vThumb.png similarity index 100% rename from img/frames/m15/regular/new/vThumb.png rename to img/frames/m15/new/vThumb.png diff --git a/img/frames/m15/regular/new/vector masks/border.svg b/img/frames/m15/new/vector masks/border.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/border.svg rename to img/frames/m15/new/vector masks/border.svg diff --git a/img/frames/m15/regular/new/vector masks/frame.svg b/img/frames/m15/new/vector masks/frame.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/frame.svg rename to img/frames/m15/new/vector masks/frame.svg diff --git a/img/frames/m15/regular/new/vector masks/pinline.svg b/img/frames/m15/new/vector masks/pinline.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/pinline.svg rename to img/frames/m15/new/vector masks/pinline.svg diff --git a/img/frames/m15/regular/new/vector masks/rules.svg b/img/frames/m15/new/vector masks/rules.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/rules.svg rename to img/frames/m15/new/vector masks/rules.svg diff --git a/img/frames/m15/regular/new/vector masks/title.svg b/img/frames/m15/new/vector masks/title.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/title.svg rename to img/frames/m15/new/vector masks/title.svg diff --git a/img/frames/m15/regular/new/vector masks/type.svg b/img/frames/m15/new/vector masks/type.svg similarity index 100% rename from img/frames/m15/regular/new/vector masks/type.svg rename to img/frames/m15/new/vector masks/type.svg diff --git a/img/frames/m15/regular/new/w.png b/img/frames/m15/new/w.png similarity index 100% rename from img/frames/m15/regular/new/w.png rename to img/frames/m15/new/w.png diff --git a/img/frames/m15/regular/new/wThumb.png b/img/frames/m15/new/wThumb.png similarity index 100% rename from img/frames/m15/regular/new/wThumb.png rename to img/frames/m15/new/wThumb.png diff --git a/js/creator-23.js b/js/creator-23.js index 3e9ee659..845fd2c2 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -1686,7 +1686,7 @@ function makeM15NewFrameByLetter(letter, mask = false, maskToRightHalf = false, if (style == 'ub') { var frame = { 'name': frameName + ' Holo Stamp', - 'src': '/img/frames/m15/regular/new/ub/stamp/' + letter.toLowerCase() + '.png', + 'src': '/img/frames/m15/new/ub/stamp/' + letter.toLowerCase() + '.png', 'masks': [], 'bounds': {x:857/2015, y:2534/2814, width:299/2015, height:137/2814} } @@ -1724,7 +1724,7 @@ function makeM15NewFrameByLetter(letter, mask = false, maskToRightHalf = false, } var frame = { 'name': frameName + ' Frame', - 'src': '/img/frames/m15/regular/new/' + stylePath + letter + '.png', + 'src': '/img/frames/m15/new/' + stylePath + letter + '.png', } // if (letter.includes('L') && letter.length > 1) { @@ -1734,7 +1734,7 @@ function makeM15NewFrameByLetter(letter, mask = false, maskToRightHalf = false, if (mask) { frame.masks = [ { - 'src': '/img/frames/m15/regular/new/' + mask.toLowerCase() + '.png', + 'src': '/img/frames/m15/new/' + mask.toLowerCase() + '.png', 'name': mask } ] diff --git a/js/frames/packFullArtNew.js b/js/frames/packFullArtNew.js index 4ee2609b..14998d49 100644 --- a/js/frames/packFullArtNew.js +++ b/js/frames/packFullArtNew.js @@ -1,18 +1,18 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/fullart/w.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/fullart/u.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/fullart/b.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/fullart/r.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/fullart/g.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/fullart/m.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/m15/regular/new/fullart/a.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/m15/regular/new/fullart/l.png', masks:masks}, - {name:'Eldrazi Frame', src:'/img/frames/m15/regular/new/fullart/c.png', masks:masks}, - {name:'Vehicle Frame', src:'/img/frames/m15/regular/new/fullart/v.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/fullart/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/fullart/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/fullart/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/fullart/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/fullart/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/fullart/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/fullart/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/new/fullart/l.png', masks:masks}, + {name:'Eldrazi Frame', src:'/img/frames/m15/new/fullart/c.png', masks:masks}, + {name:'Vehicle Frame', src:'/img/frames/m15/new/fullart/v.png', masks:masks}, {name:'White Power/Toughness', src:'/img/frames/m15/regular/m15PTW.png', bounds:bounds}, {name:'Blue Power/Toughness', src:'/img/frames/m15/regular/m15PTU.png', bounds:bounds}, @@ -24,12 +24,12 @@ availableFrames = [ {name:'Colorless Power/Toughness', src:'/img/frames/m15/regular/m15PTC.png', bounds:bounds}, {name:'Vehicle Power/Toughness', src:'/img/frames/m15/regular/m15PTV.png', bounds:bounds}, - {name:'White Land Frame', src:'/img/frames/m15/regular/new/fullart/lw.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/m15/regular/new/fullart/lu.png', masks:masks}, - {name:'Black Land Frame', src:'/img/frames/m15/regular/new/fullart/lb.png', masks:masks}, - {name:'Red Land Frame', src:'/img/frames/m15/regular/new/fullart/lr.png', masks:masks}, - {name:'Green Land Frame', src:'/img/frames/m15/regular/new/fullart/lg.png', masks:masks}, - {name:'Multicolored Land Frame', src:'/img/frames/m15/regular/new/fullart/lm.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/m15/new/fullart/lw.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/m15/new/fullart/lu.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/m15/new/fullart/lb.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/m15/new/fullart/lr.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/m15/new/fullart/lg.png', masks:masks}, + {name:'Multicolored Land Frame', src:'/img/frames/m15/new/fullart/lm.png', masks:masks}, ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; diff --git a/js/frames/packM15LandsNew.js b/js/frames/packM15LandsNew.js index d44e94c0..9d59a01d 100644 --- a/js/frames/packM15LandsNew.js +++ b/js/frames/packM15LandsNew.js @@ -1,15 +1,15 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:0.3267, y:0.6491, width:0.3474, height:0.2496} //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/lw.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/lu.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/lb.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/lr.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/lg.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/lm.png', masks:masks}, - {name:'Colorless Frame', src:'/img/frames/m15/regular/new/ll.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/lw.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/lu.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/lb.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/lr.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/lg.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/lm.png', masks:masks}, + {name:'Colorless Frame', src:'/img/frames/m15/new/ll.png', masks:masks}, {name:'Plains Watermark', src:'/img/frames/m15/basics/w.png', bounds:bounds}, {name:'Island Watermark', src:'/img/frames/m15/basics/u.png', bounds:bounds}, {name:'Swamp Watermark', src:'/img/frames/m15/basics/b.png', bounds:bounds}, diff --git a/js/frames/packM15NyxNew.js b/js/frames/packM15NyxNew.js index 7d193550..ba83e5a3 100644 --- a/js/frames/packM15NyxNew.js +++ b/js/frames/packM15NyxNew.js @@ -1,15 +1,15 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:329/2010, y:70/2814, width:1353/2010, height:64/2814}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/nyx/w.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/nyx/u.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/nyx/b.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/nyx/r.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/nyx/g.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/nyx/m.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/m15/regular/new/nyx/a.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/nyx/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/nyx/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/nyx/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/nyx/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/nyx/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/nyx/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/nyx/a.png', masks:masks}, {name:'White Inner Crown (Companion)', src:'/img/frames/m15/innerCrowns/new/companion/w.png', bounds:bounds}, {name:'Blue Inner Crown (Companion)', src:'/img/frames/m15/innerCrowns/new/companion/u.png', bounds:bounds}, diff --git a/js/frames/packM15RegularNew.js b/js/frames/packM15RegularNew.js index afbd3ab9..4f2c278b 100644 --- a/js/frames/packM15RegularNew.js +++ b/js/frames/packM15RegularNew.js @@ -1,18 +1,18 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/w.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/u.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/b.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/r.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/g.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/m.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/m15/regular/new/a.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/m15/regular/new/l.png', masks:masks}, - {name:'Eldrazi Frame', src:'/img/frames/m15/regular/new/c.png', masks:masks}, - {name:'Vehicle Frame', src:'/img/frames/m15/regular/new/v.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/new/l.png', masks:masks}, + {name:'Eldrazi Frame', src:'/img/frames/m15/new/c.png', masks:masks}, + {name:'Vehicle Frame', src:'/img/frames/m15/new/v.png', masks:masks}, {name:'White Power/Toughness', src:'/img/frames/m15/regular/m15PTW.png', bounds:bounds}, {name:'Blue Power/Toughness', src:'/img/frames/m15/regular/m15PTU.png', bounds:bounds}, @@ -24,12 +24,12 @@ availableFrames = [ {name:'Colorless Power/Toughness', src:'/img/frames/m15/regular/m15PTC.png', bounds:bounds}, {name:'Vehicle Power/Toughness', src:'/img/frames/m15/regular/m15PTV.png', bounds:bounds}, - {name:'White Land Frame', src:'/img/frames/m15/regular/new/lw.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/m15/regular/new/lu.png', masks:masks}, - {name:'Black Land Frame', src:'/img/frames/m15/regular/new/lb.png', masks:masks}, - {name:'Red Land Frame', src:'/img/frames/m15/regular/new/lr.png', masks:masks}, - {name:'Green Land Frame', src:'/img/frames/m15/regular/new/lg.png', masks:masks}, - {name:'Multicolored Land Frame', src:'/img/frames/m15/regular/new/lm.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/m15/new/lw.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/m15/new/lu.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/m15/new/lb.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/m15/new/lr.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/m15/new/lg.png', masks:masks}, + {name:'Multicolored Land Frame', src:'/img/frames/m15/new/lm.png', masks:masks}, ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; diff --git a/js/frames/packSnowNew.js b/js/frames/packSnowNew.js index 6592e594..3024f8d0 100644 --- a/js/frames/packSnowNew.js +++ b/js/frames/packSnowNew.js @@ -1,23 +1,23 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:0.3267, y:0.6491, width:0.3474, height:0.2496}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/snow/w.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/snow/u.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/snow/b.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/snow/r.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/snow/g.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/snow/m.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/m15/regular/new/snow/a.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/m15/regular/new/snow/l.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/snow/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/snow/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/snow/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/snow/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/snow/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/snow/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/snow/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/new/snow/l.png', masks:masks}, - {name:'White Land Frame', src:'/img/frames/m15/regular/new/snow/lw.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/m15/regular/new/snow/lu.png', masks:masks}, - {name:'Black Land Frame', src:'/img/frames/m15/regular/new/snow/lb.png', masks:masks}, - {name:'Red Land Frame', src:'/img/frames/m15/regular/new/snow/lr.png', masks:masks}, - {name:'Green Land Frame', src:'/img/frames/m15/regular/new/snow/lg.png', masks:masks}, - {name:'Multicolored Land Frame', src:'/img/frames/m15/regular/new/snow/lm.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/m15/new/snow/lw.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/m15/new/snow/lu.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/m15/new/snow/lb.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/m15/new/snow/lr.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/m15/new/snow/lg.png', masks:masks}, + {name:'Multicolored Land Frame', src:'/img/frames/m15/new/snow/lm.png', masks:masks}, {name:'Green Land Frame', src:'/img/frames/m15/snow/gl.png', masks:masks}, {name:'Plains Watermark', src:'/img/frames/snow/watermarks/w.png', bounds:bounds}, diff --git a/js/frames/packUBNew.js b/js/frames/packUBNew.js index ea634f0d..de73b2ae 100644 --- a/js/frames/packUBNew.js +++ b/js/frames/packUBNew.js @@ -1,26 +1,26 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/m15/regular/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/new/title.png', name:'Title'}, {src:'/img/frames/m15/regular/new/type.png', name:'Type'}, {src:'/img/frames/m15/regular/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/regular/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/regular/new/border.png', name:'Border'}]; +var masks = [{src:'/img/frames/m15/new/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; var bounds2 = {x:857/2015, y:2534/2814, width:299/2015, height:137/2814}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/m15/regular/new/ub/w.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/m15/regular/new/ub/u.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/m15/regular/new/ub/b.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/m15/regular/new/ub/r.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/m15/regular/new/ub/g.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/m15/regular/new/ub/m.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/m15/regular/new/ub/a.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/m15/regular/new/ub/l.png', masks:masks}, - {name:'Vehicle Frame', src:'/img/frames/m15/regular/new/ub/v.png', masks:masks}, - {name:'Colorless Frame', src:'/img/frames/m15/regular/new/ub/c.png', masks:masks}, + {name:'White Frame', src:'/img/frames/m15/new/ub/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/ub/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/ub/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/ub/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/ub/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/ub/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/ub/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/new/ub/l.png', masks:masks}, + {name:'Vehicle Frame', src:'/img/frames/m15/new/ub/v.png', masks:masks}, + {name:'Colorless Frame', src:'/img/frames/m15/new/ub/c.png', masks:masks}, - {name:'White Land Frame', src:'/img/frames/m15/regular/new/ub/lw.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/m15/regular/new/ub/lu.png', masks:masks}, - {name:'Black Land Frame', src:'/img/frames/m15/regular/new/ub/lb.png', masks:masks}, - {name:'Red Land Frame', src:'/img/frames/m15/regular/new/ub/lr.png', masks:masks}, - {name:'Green Land Frame', src:'/img/frames/m15/regular/new/ub/lg.png', masks:masks}, - {name:'Multicolored Land Frame', src:'/img/frames/m15/regular/new/ub/lm.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/m15/new/ub/lw.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/m15/new/ub/lu.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/m15/new/ub/lb.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/m15/new/ub/lr.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/m15/new/ub/lg.png', masks:masks}, + {name:'Multicolored Land Frame', src:'/img/frames/m15/new/ub/lm.png', masks:masks}, {name:'White Power/Toughness', src:'/img/frames/m15/ub/pt/w.png', bounds:bounds}, {name:'Blue Power/Toughness', src:'/img/frames/m15/ub/pt/u.png', bounds:bounds}, @@ -32,15 +32,15 @@ availableFrames = [ {name:'Colorless Power/Toughness', src:'/img/frames/m15/ub/pt/c.png', bounds:bounds}, {name:'Vehicle Power/Toughness', src:'/img/frames/m15/ub/pt/v.png', bounds:bounds}, - {name:'White Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/w.png', bounds:bounds2}, - {name:'Blue Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/u.png', bounds:bounds2}, - {name:'Black Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/b.png', bounds:bounds2}, - {name:'Red Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/r.png', bounds:bounds2}, - {name:'Green Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/g.png', bounds:bounds2}, - {name:'Multicolored Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/m.png', bounds:bounds2}, - {name:'Artifact Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/a.png', bounds:bounds2}, - {name:'Land Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/l.png', bounds:bounds2}, - {name:'Gray Holo Stamp', src:'/img/frames/m15/regular/new/ub/stamp/gray.png', bounds:bounds2} + {name:'White Holo Stamp', src:'/img/frames/m15/new/ub/stamp/w.png', bounds:bounds2}, + {name:'Blue Holo Stamp', src:'/img/frames/m15/new/ub/stamp/u.png', bounds:bounds2}, + {name:'Black Holo Stamp', src:'/img/frames/m15/new/ub/stamp/b.png', bounds:bounds2}, + {name:'Red Holo Stamp', src:'/img/frames/m15/new/ub/stamp/r.png', bounds:bounds2}, + {name:'Green Holo Stamp', src:'/img/frames/m15/new/ub/stamp/g.png', bounds:bounds2}, + {name:'Multicolored Holo Stamp', src:'/img/frames/m15/new/ub/stamp/m.png', bounds:bounds2}, + {name:'Artifact Holo Stamp', src:'/img/frames/m15/new/ub/stamp/a.png', bounds:bounds2}, + {name:'Land Holo Stamp', src:'/img/frames/m15/new/ub/stamp/l.png', bounds:bounds2}, + {name:'Gray Holo Stamp', src:'/img/frames/m15/new/ub/stamp/gray.png', bounds:bounds2} ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false;