18066 Commits

Author SHA1 Message Date
Charles Dang
fab74c0c1c Updated imagepaths to selection border images 2013-06-12 20:07:05 +11:00
Alarantalara
2b1c2f24d4 Remove orc side from capture message
Orcs can't raise corpses
2013-06-11 23:41:02 -04:00
flix
aafe86364b Convert a (unused) macro to use [goal] 2013-06-12 02:41:38 +03:00
Emilien Rotival
e087bbfa59 Add 2 new TC shades ("Bright orange" and "Light blue") and apply them to the part-moved & ally orb
The existing "Blue" TC rendered a orb that looked too much like the black one.
Same with existing orange vs. red.
2013-06-11 23:28:44 +02:00
flix
8c91d2e5cb Add deprecation messages to aspects
[target], [protect_unit], [protect_location],
protect_leader=, protect_leader_radius=.
Patch by pl_kolek. See https://gna.org/patch/?3884
2013-06-11 22:55:35 +03:00
flix
db2f04636f Replace deprecated aspects with [goal] tag
in mainline campaigns.
Patch by pl_kolek. See https://gna.org/patch/?3884
Examined by me and mattsc.
2013-06-11 22:54:56 +03:00
Alexander van Gessel
6bc3de7663 Use hero ellipse alongside hero crown 2013-06-11 16:50:13 +02:00
Emilien Rotival
d201f1d590 Syntax fix in team-color.cfg
I pasted the raw WML from WesnothRCX and committed before realizing there was a difference in syntax
2013-06-11 14:48:03 +02:00
Emilien Rotival
10e61be88d Add a new TC shade ("Bright green") and apply to the unmoved orb
The existing "Green" TC was darker than the old unmoved orb artwork, which made the recolored orb difficult to spot against a green background.
2013-06-11 14:43:30 +02:00
mattsc
66913d3aa8 Return Guardian MAI: bug fix for situation when return hex is occupied 2013-06-10 19:50:13 -07:00
Alexander van Gessel
6b02a922dc Merge pull request #20 from groggydice/lint-win
convert a couple of Windows-isms (backslashes, 'userdata/') to be more x-platform friendly
2013-06-10 14:09:53 -07:00
Alexander van Gessel
6675dee702 Merge pull request #24 from spixi/master
fixed bug #20870 Typo in NAMED_LOYAL_UNIT macro documentation
2013-06-10 14:03:33 -07:00
Charles Dang
bbb51bc557 ToTB: updated campaign icon and difficulty images paths since jetrel moved them into specific folders 2013-06-10 23:38:00 +11:00
Richard Kettering
e458f40658 New base frames for the elven cavalry units. 2013-06-10 01:03:34 -05:00
Richard Kettering
85b15a2c52 New base frames for the cavalryman line. 2013-06-10 00:22:59 -05:00
Richard Kettering
b11612cce9 Moved all the horseman images to their own folder. 2013-06-09 23:43:33 -05:00
Richard Kettering
444549dc34 New base frames for the knight, lancer, and grand-knight. 2013-06-09 22:08:22 -05:00
Richard Kettering
dbd2adf66a New base image for the paladin. 2013-06-09 21:34:35 -05:00
JaMiT
0952dfb180 Fix to unit abilities sometimes matching too often.
Abilities are sometimes checked at locations other than a unit's
current location. If the checked location is adjacent to the unit's
location, then (before this fix) the unit could affect itself as an
adjacent unit.
2013-06-09 17:28:57 -05:00
Richard Kettering
c1065bcbca New image for the skeletal dragon. 2013-06-09 17:10:01 -05:00
flix
9d1dfe0638 Add possibility to kill unit under cursor
...with context menu in debug mode.
Also assign the hotkey "shift+k" for this action.
Patch by pl_kolek. See https://gna.org/patch/?3905
2013-06-09 21:50:48 +03:00
fendrin
1f94b40846 Wired in the item group icons. 2013-06-09 12:54:47 +02:00
fendrin
2dff1967bf New orb image wired in. 2013-06-09 08:47:10 +02:00
Charles Dang
7d67312f06 Fixed more paths to gold coins image 2013-06-09 17:14:17 +11:00
Charles Dang
0ca3f3f268 Removed editor settings dialog. Custom TOD dialog has replaced it 2013-06-09 12:42:32 +11:00
Charles Dang
3d59e29be6 Removed old theme image previously used in now-removed expirimental theme 2013-06-09 12:41:37 +11:00
Espreon
7bfe81e824 'End scenario' -> 'End Scenario'. 2013-06-08 20:11:26 -04:00
Derek Hoagland
88e2040204 Move images/flags/ to data/core/images/flags where WML is 'allowed' to access it. 2013-06-08 17:10:17 -04:00
Charles Dang
e0fb308439 Fixed wrong macro arg name and missing quote 2013-06-09 05:07:04 +11:00
Charles Dang
7d654199ed Convert uses of lite button to H20 menu button
Lite has the same dimensions of the H18 menu button, which is unused
and moved to attic. Since all uses of lite were menus, I reassigned
them to use the current H20 menu image.
2013-06-09 04:53:59 +11:00
Charles Dang
cd07621cc0 Use grayscale IPF for slider disabled state 2013-06-09 03:28:17 +11:00
Charles Dang
60283c1455 USe opacity IPF for transparent scrollbars instead of seperate images (value set to 65%) 2013-06-09 03:13:02 +11:00
Alexander van Gessel
ce8e60bdda Merge pull request #23 from groggydice/rgb
append pango code to message about color spec requiring manual fix
2013-06-08 08:06:13 -07:00
Charles Dang
0348e68de6 Use grayscale IPF for disabled tree view toggle button state 2013-06-09 01:11:42 +11:00
Galen Brooks
69c9e3d9d7 Drake animation file name extension was missing 2013-06-08 07:57:59 -04:00
Charles Dang
7fe8cc5f84 Use grayscale IPF for disabled widget variations instead of specific images 2013-06-08 22:54:37 +11:00
fendrin
d971585a20 Fix the low resolution editor theme. 2013-06-08 13:50:44 +02:00
fendrin
85b2774f28 Wired in a button for the minimap color coding. 2013-06-08 10:52:30 +02:00
fendrin
8fe409717d Added mini-map specific buttons. 2013-06-08 08:54:13 +02:00
mattsc
e6ec4152d2 ExpAI: make recruiting work with all keys of [chance_to_hit] special
Previously there would be an error, and subsequently no recruiting, if
the value= key was not set.
2013-06-07 19:17:21 -07:00
Charles Dang
750d9d084a Used correct image paths for default toggle button's disabled state 2013-06-08 11:07:53 +11:00
spixi
9625d6df6e fixed bug #20870 Typo in NAMED_LOYAL_UNIT macro documentation 2013-06-07 21:01:28 +03:00
mattsc
f06daf98fd Micro AIs: minor grammar fixes 2013-06-07 07:34:17 -07:00
mattsc
ec21fad877 Healer Support MAI: make [filter] work correctly when aggression=0
Previously, all healers were excluded from attacks when aggression=0
was set, not only those specified in [filter].
2013-06-07 06:48:55 -07:00
groggydice
2167195685 append pango code to message about color spec requiring manual fix
When pangoize detects an old-style color spec, it prints a message that it needs a "manual fix." Unfortunately, the old markup used decimal values while pango uses hexadecimal, and authors were left to do the conversion themselves.

My modification not only does the hex conversion, it provides pango code ready to copy and paste into the line.

Going over this:

rgb =:  First step is to turn the original regular expression into a regex object. The one change is that later on, wmllint turns non-pango "<" and ">" into "&lt;/&gt;", so I have the regex match those too, in case we are dealing with a file that has already been through wmllint before.
if rgb:  Having turned the original search into a regex object, we are ready for an if test again.
  r, g, b =:  We need Python to recognize these strings as numbers.
  if > 255:  At least one old campaign ("A Sortie") has color specs that include values over 255. Given the impossibility of deciphering what color the author may have intended, I think the proper thing to do is to print an error pointing to the problem.
  else:  This, of course, is the normal case.
    hexed:  Here we convert our numbers to hexadecimal, and back into a string. Because numbers up to 15 will only have one hex digit and we need two, we will leave a "0" when we remove the "0x" prefix; then we take the last two characters, lopping off the zero from the numbers greater than 15 that already have two digits.
    print:  The new error message. With the regex object, we can cite the color spec specifically, not just refer to it as being "in line". And at the end is pango code, ready to copy and paste.
2013-06-06 22:42:43 -04:00
mattsc
2139c84188 Zone guardian MAI: add optional station_x,station_y= keys 2013-06-06 19:24:13 -07:00
groggydice
89673c9672 regex sub to remove 'userdata/' from paths
The misguided authors who put userdata/ in their paths cause problems not just for non-Windows users, but fellow Windows users who chose not to put userdata in the install directory. This error can be removed by an approach similar to that just used to purge backslashes:

* if 'userdata': A basic filter to cut down the number of lines being run through complicated regex speeds up performance.
* while: It is possible, though rare, for a line to contain more than one path with userdata. Points about the regex: a) We continue to use precomment, though it would be well to correct commented-out old paths also, lest they mislead any more UMC writers.  b) In case you're wondering why I made one 'data/' string optional, there's a set of add-ons in 1.4 that use "userdata/campaigns" instead of "userdata/data/campaigns".  c) The '[ac]' at the end is something of an artifact of the time before I excluded comments, but it provides another safety measure insuring that the string is actually a value.
* regex object: This splits precomment into groups. Notes: a) Some authors begin with an unnecessary "../", might as well get rid of it as well. (As far as I can tell, this prefix has no effect anywhere I've seen it used, but I'd want to be positive that it ALWAYS does nothing before having wmllint replace it everywhere.) b) The first two groups have been made non-capturing; we will not need to refer to them.  c) For reporting to stdout, group(1) is extended to the next '/', though this part of the match is optional, to insure that there's no way to get trapped in a while loop.
* precomment: Here, we reconstruct precomment based on the regex object, except we simply drop what's outside group(1).
* print: In case designers don't get the point from seeing the elimination logged in stdout, I include an all-caps admonition against "userdata/". This is a really irritating bug.
* This code was inserted before the reconstruction of lines[i] from precomment and comment.
2013-06-06 19:34:07 -04:00
groggydice
8b01e0b19c code to change Windows-style backslashes in file paths to frontslashes
The task is to replace Windows backslashes in paths, without indiscriminately replacing backslashes in legitimate use as escapes (or bridge terrain).

Breaking this down:

* "no-syntax-rewrite": I don't think this is really necessary, but I will follow the practice of the hack_syntax section.
* if lines[i].lstrip().startswith("#"): Excludes lines that are only comments or defines.
* precomment: Originally, I simply excluded "#" during the while statement, but I realized that this could wrongly mistake a Pango color code (or old-style markup for green) as a comment. I now look for whitespace before "#", and rewrote this section to operate on precomment rather than the whole line.
* comment: Simply going with the second field would exclude the separator itself, so I use len.
* if '\\': Technically, this code worked going straight to the while statement, but running every line through the complicated regex made it sluggish. Faster to make sure the line meets a simple filter first.
* while: It is possible, though very uncommon, that a line could contain more than one file path. Looking at the regex test: a) Match the backslash itself, then be on the lookout for a character used to set apart a file path from other text. By excluding these, we ensure that there is an unbroken chain from the backslash to the file extension.  b) Then we have a list of file extensions, bracketed on the left by a period and the right by \b, to make sure they do not coincidentally match a string. These are the file types that might be referenced by a value (for instance, translation files are not referred to directly, so their extensions are not included). As a practical matter, EVERY instance in the wild I know of involves png, not counting one commented-out path in an ancient campaign.  c) File extensions can include capitals, particularly on Windows, where the effects of DOS unicase linger. So we make the search case-insensitive.
* regex object: This splits the line into groups. The differences from the regex used in the while statement: a) We also look for a non-pathbreaking string to the left of the backslash as well as the right. This means that group(1) will match the entire file path except the extension. b) The \b boundary has been made a non-consuming look-ahead assertion, to simplify future references to the regex object and its groups.
* fronted: The regex object, except all backslashes in group(1) are replaced by frontslashes.
* precomment: Here, we simply reconstruct precomment with the modified regex object.
* print: Besides reporting the substitution to stdout, I include a plea for cross-platform compatibility.
* lines[i]: Now it's time to rebuild the whole line.
2013-06-06 19:34:01 -04:00
mattsc
3fadf4cc31 Goto Micro AI: do not exclude leaders by default
The MAI accidentally excluded units with canrecruit=yes.  Thanks H-Hour.
2013-06-06 13:20:00 -07:00
Charles Dang
beb177e09b Made repeating button use opacity IPF for transparent versions (value set to 65%).
Thanks to bumbadadabum for pointing out I had forgot to do this
2013-06-07 02:48:41 +11:00