From fab664634b8aba929acd92cfe4ade42edd57dd63 Mon Sep 17 00:00:00 2001 From: twanvl Date: Wed, 4 Jun 2008 22:41:45 +0000 Subject: [PATCH] Fixed: 10/C and higher mana symbols do not work. Regex was incorrect, was "([XYZ0-9])+/W" should be "([XYZ0-9]+)/W" git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@973 0fc631ac-6414-0410-93d0-97cfa31319b6 --- .../symbol-font | 36 +++++++++--------- .../symbol-font | 38 +++++++++---------- .../symbol-font | 38 +++++++++---------- .../symbol-font | 38 +++++++++---------- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/data/magic-mana-beveled.mse-symbol-font/symbol-font b/data/magic-mana-beveled.mse-symbol-font/symbol-font index ca304988..934cc2e0 100644 --- a/data/magic-mana-beveled.mse-symbol-font/symbol-font +++ b/data/magic-mana-beveled.mse-symbol-font/symbol-font @@ -181,21 +181,7 @@ symbol: image: mana_s.png symbol: image: mana_nw.png - code: ([XYZ0-9])+/W - regex: yes - draw text: 1 - text margin left: -.05 - text margin right: .2 - text margin top: -.14 - text margin bottom: .35 - text font: - name: MPlantin - size: .5 - color: rgb(0,0,0) - max stretch: 0.5 -symbol: - image: mana_ng.png - code: ([XYZ0-9])+/G + code: ([XYZ0-9]+)/W regex: yes draw text: 1 text margin left: -.05 @@ -209,7 +195,7 @@ symbol: max stretch: 0.5 symbol: image: mana_nu.png - code: ([XYZ0-9])+/U + code: ([XYZ0-9]+)/U regex: yes draw text: 1 text margin left: -.05 @@ -223,7 +209,7 @@ symbol: max stretch: 0.5 symbol: image: mana_nb.png - code: ([XYZ0-9])+/B + code: ([XYZ0-9]+)/B regex: yes draw text: 1 text margin left: -.05 @@ -237,7 +223,21 @@ symbol: max stretch: 0.5 symbol: image: mana_nr.png - code: ([XYZ0-9])+/R + code: ([XYZ0-9]+)/R + regex: yes + draw text: 1 + text margin left: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + color: rgb(0,0,0) + max stretch: 0.5 +symbol: + image: mana_ng.png + code: ([XYZ0-9]+)/G regex: yes draw text: 1 text margin left: -.05 diff --git a/data/magic-mana-large.mse-symbol-font/symbol-font b/data/magic-mana-large.mse-symbol-font/symbol-font index 59849ec7..e487cf62 100644 --- a/data/magic-mana-large.mse-symbol-font/symbol-font +++ b/data/magic-mana-large.mse-symbol-font/symbol-font @@ -204,22 +204,7 @@ symbol: image: mana_s.png symbol: image: mana_nw.png - code: ([XYZ0-9])+/W - regex: yes - draw text: 1 - text margin left: -.25 - text margin right: .2 - text margin top: -.14 - text margin bottom: .4 - text font: - name: MPlantin - size: .6 - color: rgb(0,0,0) - max stretch: 0.5 - image font size: 145 -symbol: - image: mana_ng.png - code: ([XYZ0-9])+/G + code: ([XYZ0-9]+)/W regex: yes draw text: 1 text margin left: -.25 @@ -234,7 +219,7 @@ symbol: image font size: 145 symbol: image: mana_nu.png - code: ([XYZ0-9])+/U + code: ([XYZ0-9]+)/U regex: yes draw text: 1 text margin left: -.25 @@ -249,7 +234,7 @@ symbol: image font size: 145 symbol: image: mana_nb.png - code: ([XYZ0-9])+/B + code: ([XYZ0-9]+)/B regex: yes draw text: 1 text margin left: -.25 @@ -264,7 +249,22 @@ symbol: image font size: 145 symbol: image: mana_nr.png - code: ([XYZ0-9])+/R + code: ([XYZ0-9]+)/R + regex: yes + draw text: 1 + text margin left: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 + image font size: 145 +symbol: + image: mana_ng.png + code: ([XYZ0-9]+)/G regex: yes draw text: 1 text margin left: -.25 diff --git a/data/magic-mana-small-grey.mse-symbol-font/symbol-font b/data/magic-mana-small-grey.mse-symbol-font/symbol-font index ed628ee9..d6b8e441 100644 --- a/data/magic-mana-small-grey.mse-symbol-font/symbol-font +++ b/data/magic-mana-small-grey.mse-symbol-font/symbol-font @@ -211,22 +211,7 @@ symbol: image: mana_s.png symbol: image: mana_nw.png - code: ([XYZ0-9])+/W - regex: yes - draw text: 1 - text margin left: -.30 - text margin right: .2 - text margin top: -.14 - text margin bottom: .34 - text font: - name: MPlantin - size: .6 - color: rgb(0,0,0) - max stretch: 0.5 - image font size: 145 -symbol: - image: mana_ng.png - code: ([XYZ0-9])+/G + code: ([XYZ0-9]+)/W regex: yes draw text: 1 text margin left: -.30 @@ -241,7 +226,7 @@ symbol: image font size: 145 symbol: image: mana_nu.png - code: ([XYZ0-9])+/U + code: ([XYZ0-9]+)/U regex: yes draw text: 1 text margin left: -.30 @@ -256,7 +241,7 @@ symbol: image font size: 145 symbol: image: mana_nb.png - code: ([XYZ0-9])+/B + code: ([XYZ0-9]+)/B regex: yes draw text: 1 text margin left: -.30 @@ -271,7 +256,22 @@ symbol: image font size: 145 symbol: image: mana_nr.png - code: ([XYZ0-9])+/R + code: ([XYZ0-9]+)/R + regex: yes + draw text: 1 + text margin left: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 + image font size: 145 +symbol: + image: mana_ng.png + code: ([XYZ0-9]+)/G regex: yes draw text: 1 text margin left: -.30 diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font index deea90de..961dd216 100644 --- a/data/magic-mana-small.mse-symbol-font/symbol-font +++ b/data/magic-mana-small.mse-symbol-font/symbol-font @@ -214,22 +214,7 @@ symbol: image: mana_infinite.png symbol: image: mana_nw.png - code: ([XYZ0-9])+/W - regex: yes - draw text: 1 - text margin left: -.30 - text margin right: .2 - text margin top: -.14 - text margin bottom: .34 - text font: - name: MPlantin - size: .6 - color: rgb(0,0,0) - max stretch: 0.5 - image font size: 145 -symbol: - image: mana_ng.png - code: ([XYZ0-9])+/G + code: ([XYZ0-9]+)/W regex: yes draw text: 1 text margin left: -.30 @@ -244,7 +229,7 @@ symbol: image font size: 145 symbol: image: mana_nu.png - code: ([XYZ0-9])+/U + code: ([XYZ0-9]+)/U regex: yes draw text: 1 text margin left: -.30 @@ -259,7 +244,7 @@ symbol: image font size: 145 symbol: image: mana_nb.png - code: ([XYZ0-9])+/B + code: ([XYZ0-9]+)/B regex: yes draw text: 1 text margin left: -.30 @@ -274,7 +259,22 @@ symbol: image font size: 145 symbol: image: mana_nr.png - code: ([XYZ0-9])+/R + code: ([XYZ0-9]+)/R + regex: yes + draw text: 1 + text margin left: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 + image font size: 145 +symbol: + image: mana_ng.png + code: ([XYZ0-9]+)/G regex: yes draw text: 1 text margin left: -.30