amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

The DECLARE_TYPEOF(()) calls don't work in MSVC, I changed it to use a COMMA macro instead of ,

Browse Source 
If this doesn't work in GCC, the COMMA definition could be made only for MSVC, then GCC sees DECLARE_TYPEOF(map<int COMMA string>). GCC doesn't need DECLARE_TYPEOF anyway.

Keyword expansion now works, still todo:
 - marking parameters, e.g. "Cycling 2W" -> "Cycling <param-mana>2W</param-mana>"
 - user interface for toggling reminder text
 - user interface for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@210 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-03-17 23:58:16 +00:00
parent 83b6aa36f8
commit 0464f5f7fc
29 changed files with 560 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/en.mse-locale/locale
+14 -5
View File
@@ -260,8 +260,11 @@ error:
unable to store file: Error while saving, unable to store file
# Script stuff
collection has no member: Collection has no member '%s'
object has no member: Object has no member '%s'
has no member: %s has no member '%s'
can't convert: Can't convert from %s to %s
has no member value: String "%s" has no member '%s'
can't convert value: Can't convert "%s" from %s to %s
unsupported format: Invalid string format: '%s'
# Image stuff
coordinates for blending overlap: Coordinates for blending overlap
@@ -287,9 +290,15 @@ error:
############################################################## Types used in scripts
type:
real: Real number
integer: Integer number
string: String
function: function
collection: collection
object: object
real: real number
integer: integer number
string: string
boolean: boolean
color: color
nil: nothing
############################################################## Magic
game:
data/magic.mse-game/game
+11 -7
View File
@@ -161,18 +161,22 @@ init script:
# after: ")",
# fix_english: true
# ) +
# step 3 : expand shortcut words ~ and CARDNAME
expand_keywords_rule(
default_expand: { set.automatic_reminder_text == "yes" },
combine: { "{keyword}<atom-reminder><i> ({reminder})</i></atom-reminder>" }
) +
# step 3a : expand shortcut words ~ and CARDNAME
replace_rule(
match: "~|~THIS~|CARDNAME",
in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
replace: "<atom-cardname></atom-cardname>"
) +
# step 4 : fill in atom fields
# step 3b : fill in atom fields
tag_contents_rule(
tag: "<atom-cardname>",
contents: { if card_name=="" then "CARDNAME" else card_name }
) +
# step 4.5 : explict non mana symbols
# step 4 : explict non mana symbols
replace_rule(
match: "\\][STXYZWUBRG0-9/|]+\\[",
replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
@@ -802,7 +806,7 @@ keyword parameter type:
keyword parameter type:
name: cost
#insert as: word
match: ***:[XYZ0-9WUBRGS/]+|[^(.,\n]|([XYZ0-9WUBRGS/]+,)?[^(.,\n]*
match: [XYZ0-9WUBRGS/]+|[^(.,\n]|([XYZ0-9WUBRGS/]+,)?[^(.,\n]*
keyword parameter type:
name: number
match: [XYZ0-9]+
@@ -821,11 +825,11 @@ keyword parameter type:
keyword parameter type:
name: action
#insert as: word
match: ***:[^(.,\n]+
match: [^(.,\n]+
keyword parameter type:
name: name
#insert as: word
match: ***:[^(.,\n]+
match: [^(.,\n]+
############################# All Magic keywords
# By JrEye and Neko_Asakami
@@ -851,7 +855,7 @@ keyword:
keyword: Cycling
separator: whitespace [ ]
parameter: cost
reminder: <param>, Discard this card: Draw a card.
reminder: {param1}, Discard this card: Draw a card.
keyword:
keyword: Trample
reminder: If this creature would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.