From 1dabc07979fcaaa2820148c039b7ae22f2cc0b87 Mon Sep 17 00:00:00 2001 From: twanvl Date: Thu, 20 Sep 2007 19:01:17 +0000 Subject: [PATCH] Reordered the magic statistics panel git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@717 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic.mse-game/game | 85 +++++++++----------- data/magic.mse-game/stats/card_type.png | Bin 0 -> 400 bytes data/magic.mse-game/stats/creature_type.png | Bin 383 -> 416 bytes src/data/field.cpp | 2 + src/data/field.hpp | 1 + src/data/statistics.cpp | 2 +- 6 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 data/magic.mse-game/stats/card_type.png diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 2a694fe8..25a6e4d0 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -343,13 +343,13 @@ init script: replace: {"" + mana_filter_t() + ""} ) + # step 7 : italic reminder text replace_rule( - match: "[(][^)\n]*[)]?", + match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?", in_context: "(^|[[:space:]])|&") + # step 8 : automatic capitalization replace_rule( match: "[a-z]", - in_context: "[(]()?|[ ]*: |—| — ", + in_context: "[(]()?[^)]|[ ]*: |—| — ", replace: to_upper) + curly_quotes @@ -709,6 +709,7 @@ card field: type: text name: casting cost icon: stats/casting_cost.png + position hint: 1 script: mana_filter(value) card list visible: true card list column: 2 @@ -719,6 +720,7 @@ card field: card field: type: choice name: card symbol + position hint: 10 icon: stats/card_symbol.png choice: none choice: tombstone @@ -747,13 +749,15 @@ card field: card field: type: text name: super type - icon: stats/creature_type.png + icon: stats/card_type.png + position hint: 30 editable: false script: super_type_filter(value) card field: type: text name: sub type icon: stats/creature_type.png + position hint: 31 script: sub_type_filter(value, type:card.super_type) editable: false card field: @@ -777,6 +781,7 @@ card field: type: choice name: rarity icon: stats/rarity.png + position hint: 100 choice: basic land choice: common choice: uncommon @@ -817,6 +822,7 @@ card field: type: choice name: watermark icon: stats/watermark.png + position hint: 200 include file: magic-watermarks.mse-include/watermark-names description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol @@ -825,6 +831,7 @@ card field: type: text name: loyalty icon: stats/toughness.png + position hint: 59 card field: type: text name: loyalty cost 1 @@ -842,10 +849,12 @@ card field: type: text name: power icon: stats/power.png + show statistics: false script: type_over_pt(value) card field: type: text name: toughness + show statistics: false icon: stats/toughness.png card field: type: text @@ -886,6 +895,7 @@ card field: type: text name: illustrator icon: stats/illustrator.png + position hint: 210 default: set.artist description: Illustrator of this card, the default value can be changed on the 'set info' tab card field: @@ -1042,6 +1052,7 @@ card field: name: watermark 2 include file: magic-watermarks.mse-include/watermark-names icon: stats/watermark.png + show statistics: false description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, a special symbol, or a guild symbol card field: type: text @@ -1123,7 +1134,7 @@ card list color script: statistics dimension: name: card color - position hint: -1 + position hint: 0 script: primary_card_color(card.card_color) icon: stats/card_color.png colors: @@ -1149,19 +1160,36 @@ statistics dimension: group: hybrid statistics dimension: + position hint: 2 name: converted mana cost script: cmc(card.casting_cost) numeric: true icon: stats/casting_cost.png statistics dimension: + position hint: 3 name: colored mana cost script: colored_mana(card.casting_cost) numeric: true icon: stats/colored_casting_cost.png +statistics dimension: + position hint: 50 + name: power + script: card.power + numeric: true + icon: stats/power.png + +statistics dimension: + position hint: 51 + name: toughness + script: card.toughness + numeric: true + icon: stats/toughness.png + statistics dimension: name: keywords + position hint: 1000 script: keyword_usage(unique:true) show empty: false split list: true @@ -1169,6 +1197,7 @@ statistics dimension: statistics dimension: name: race + position hint: 32 icon: stats/creature_type.png description: Race of creatures and tribal cards script: @@ -1177,6 +1206,7 @@ statistics dimension: show empty: false statistics dimension: name: creature class + position hint: 33 icon: stats/creature_type.png description: Class of creature cards script: @@ -1185,35 +1215,17 @@ statistics dimension: show empty: false split list: true -#statistics dimension: -# name: word count -# type: word count -# display: list - statistics category: name: color / rarity + position hint: 101 type: stack icon: stats/color_rarity.png dimension: card color dimension: rarity -#statistics category: -# name: power / toughness -# type: scatter -# icon: stats/pt.png -# dimension: power -# dimension: toughness - -#statistics category: -# name: power / toughness / color -# type: scatter pie -# icon: stats/pt.png -# dimension: power -# dimension: toughness -# dimension: card color - statistics category: name: power / toughness + position hint: 52 type: scatter pie icon: stats/pt.png dimension: power @@ -1228,6 +1240,7 @@ statistics category: statistics category: name: color / cost + position hint: 4 type: scatter pie icon: stats/color_cost.png dimension: card color @@ -1236,6 +1249,7 @@ statistics category: statistics category: name: color / colored cost + position hint: 5 icon: stats/color_colored_cost.png type: scatter dimension: card color @@ -1243,6 +1257,7 @@ statistics category: statistics category: name: cost / colored cost + position hint: 6 icon: stats/cost_colored_cost.png type: scatter pie dimension: converted mana cost @@ -1251,33 +1266,13 @@ statistics category: statistics category: name: creature race / class + position hint: 34 icon: stats/creature_type.png type: scatter pie dimension: race dimension: creature class dimension: card color -#statistics field: -# name: creature type -# data 1: -# if card.super_type == "Creature" or card.super_type == "Legendary Creature" then -# split(around:" ", input: card.sub_type) - -#statistics field: -# name: converted mana cost -# graph style: bar -# data 1: -# card.casting_cost -# # TODO - -#statistics field: -# name: color / rarity -# graph style: cross -# data 1: card.card_color -# data 2: card.rarity - -# The following (until keywords) doesn't do anything yet - ############################################################## Word lists diff --git a/data/magic.mse-game/stats/card_type.png b/data/magic.mse-game/stats/card_type.png new file mode 100644 index 0000000000000000000000000000000000000000..d783bc216f99e9a771a69987d3ff72ec220be155 GIT binary patch literal 400 zcmV;B0dM|^P)KQCu$Z!7W8;6Y_J3F*qudsFk9?XN1N)1P(1xfsaftHu$1e-?+@!!F&=Q;TX6ovqSDQ( uruC>LEGDuo;zT*0JIa+)e_7U2xb+E@;%LqUP*URn0000z$4YF-24yP=DJzng(r6?L`G~NXqVYM7Gw)0@yrwC?&HFp&KKI;v&V3=V zQn5v>_xfB0EcNEKIko9nx2?Y;i+|b91_*Z%jEQ1kFnW6MM zDB)Vs1@Xh`0)KQUW|e9BWN?j<^7*VOaKoH_FR3@?xh40Vlon%@CRGB8MTT!>h@fn8 znLX#Gg8LNeIm_Y?DK-Nw?8u^@BJnMpi}zAs{);%ci_@%07*qoM6N<$g0oAwk^lez delta 357 zcmV-r0h<1x1OEb$BYyx1a7bBm000XT000XT0n*)m`~Uy|33NqRbVF}#ZDnqB004<9 zjRpV!0USw0K~#90V_+Zy$T6&A_z#6&84fY{<5!-@@E)%GAH!M(ete3}7@orw|7SSL zV1iF^9g@=j40{<=a4YpkQuvwS14B7(r5PxuzQ^qZW`-pwN`JpIIO9^v$RG)noW}45 zuDAuC$3Vb|;Woo>u+khtN*Nf08BT+h-e<5NthfxU^frSo0~;*GGPW#Y=toJ z0%1BO620~0od=zxznWjFx