19240 Commits

Author SHA1 Message Date
Turuk
a9f0458202 Khalifate: Rasikh Description 2014-01-03 15:23:02 -05:00
Turuk
cc1c33e1f2 Khalifate: Mudafi Description 2014-01-03 15:11:49 -05:00
Groggy Dice
f9cc64d08a SotBE: replace "wmllint: recognize" with "who" and "whofield" magic comments 2014-01-03 11:14:51 -05:00
Groggy Dice
128958511a wmllint: prevent zero-length unit ids from crashing python-enchant spellcheck 2014-01-03 11:09:21 -05:00
Groggy Dice
6e47a1818d ai.cfg: fix "#ifdef MEDIUM" to NORMAL in attack_depth
Though this may be in vain, as I read on the wiki that attack_depth is not
working with the RCA ai and is deprecated. While this bug might break
attack_depth on one difficulty level, it shouldn't have broken it entirely,
so this is probably not the reason it doesn't seem to be working.
2014-01-03 11:09:00 -05:00
Groggy Dice
95538bb0fb DW: conversion of "wmllint: recognize" to "wmllint: who"
I haven't finished the campaign, so I hope I haven't suffered any big
spoilers.
2014-01-03 11:08:57 -05:00
Groggy Dice
86fcecaebb LoW: delete brackets from "wmllint: who" comments
The brackets are a relic from when I had a different conception of how the
"who ... is ..." comment would work. Although these comments still work,
because I now strip brackets from the macro name, I don't want UMC authors
getting the idea that this is the "right" way to do these comments.
2014-01-03 11:07:40 -05:00
Groggy Dice
ccda440360 DM: add and delete "who" and "recognize" wmllint magic comments 2014-01-03 10:50:39 -05:00
Groggy Dice
6cd77630ab TRoW: exchange "who" and "whofield" magic comments for "recognize"
In scenario 16, El'Isomithir's id uses a straight apostrophe, and in 18 a
slanted one. The maintainer can decide which to go with, or simply leave
it be.
2014-01-03 10:50:37 -05:00
Groggy Dice
f7a2a189ef DiD 08: remove already-unnecessary "wmllint: recognize" 2014-01-03 10:46:07 -05:00
Groggy Dice
cb098cb60d HttT: remove obsolete "wmllint: recognize" magic comments
The exception is Gryphon Mountain, where the magic comments are updated to
recognize the awakened ids.

This is not the only approach that could be used. wmllint could be upgraded
to recognize the transformed ids in [modify_unit]. This is more involved
than I want to do right now, for what I expect to be a corner case.

The other way would be to also filter the awakening events by type as well
as id, and not change the id at all. The original awakening code killed the
old unit and created a new one in its place, and the new id distinguished
the new unit from the old one. However, now that we are modifying an existing
unit, we do not need to change ids, especially since this is not seen by
the player.

For now, though, the easiest path is just to tweak the already existing
magic comments.
2014-01-03 10:46:05 -05:00
Groggy Dice
7728a15bf6 South Guard 06a: fix ogre last breath, delete unncessary "recognize" comments
The "unknown speaker" warning shows its usefulness, as it turns up a busted
last breath event.

We also delete a few "# wmllint: recognize" magic comments that we don't
need now that ids in NAMED_GENERIC_UNIT are auto-recognized.
2014-01-03 10:46:02 -05:00
Groggy Dice
d7668ee721 SoF 09, Epilogue: delete already-unnecessary 'wmllint: recognize' magic comments 2014-01-03 10:46:01 -05:00
Groggy Dice
cf380305f9 Liberty 07: delete now-unnecessary 'wmllint: recognize' magic comments 2014-01-03 10:35:37 -05:00
Groggy Dice
c81632cd88 AOI 01: delete now-unnecessary 'wmllint: recognize' magic comment 2014-01-03 10:35:35 -05:00
Groggy Dice
f6983d516d UtBS: add and remove "wmllint: who" and "recognize" magic comments
The main character macros now have "who is" pairings. This, along with the
advent of auto-recognition of  NAMED_*UNIT ids, makes some "recognize" magic
comments unnecessary. Meanwhile, the new "unknown speaker" warning makes
adding others necessary.

The ally characters still trigger "unknown speaker" warnings. There are two
possible solutions: one, to add a set of four "recognize" mcs to several
scenarios. The second, which I lean towards, would be to create a macro
for the recall of the ally character, and pair it with a "who" mc. I will
leave the choice to the UtBS maintainer, however.
2014-01-03 10:35:33 -05:00
Groggy Dice
9689cd0d0b wmllint: add "unknown speaker" warning
I actually thought this was already checked by the "unknown 'xx' referred to
by id" warning. Probably because many more [message]s used to use id= and
role= rather than speaker=.

As a side effect, this new error will force designers to use my 'who' and
'whofield' magic comments!
2014-01-03 10:35:31 -05:00
Groggy Dice
82862d11bd HttT deaths.cfg: fix Konrad's dying words event
The hero of Wesnoth's flagship campaign -- and his death event hasn't worked
since 1.7.5.
2014-01-03 10:35:29 -05:00
Groggy Dice
d580b2b476 wmltools.py: fix macro call parsing to prevent wmlscope stringliteral mismatch
I am responsible for wmlscope suddenly giving macro mismatch errors, as was
pointed out on IRC. The tell is that in each of these errors, the last field
is interpreted as a stringliteral.

An argument that starts and ends with a quote is interpreted as a stringliteral.
But under previous code, that couldn't happen: quote characters toggled the
instring status on and off, but weren't added to arg, so no arg contained any
quotes. I didn't like the fact that this stripped the quotes out of translatable
strings, so I changed the code to include quotes in arg and strip them out if
they began and ended the arg. Unfortunately, while I stripped out quotes when
arg was terminated by a space, I didn't think it was necessary when the right
bracket terminated the arg. It was.
2014-01-03 10:35:27 -05:00
Groggy Dice
20bc51302e wmllint: rewrite test of permitted tags in [part]
The tags are now tested directly, rather than as a parent of a key. The old
test was probably not missing tags like the test for illegal child of [if]
did, because [part] could be anywhere in ancestors. Anyway, [part] rarely
contains other tags.
2014-01-03 10:35:25 -05:00
Groggy Dice
b68feb74f4 wmllint: clean up detection of "illegal children of [if]"
Previously, only lines that parse_attribute could process got passed to
local_sanity_check. So tags survived as ancestors of attribute lines, but
the lines with the tags themselves got discarded. Hence, the "illegal child
of [if]" error was actually triggered by attributes, and the line number
referred to that line rather than the child tag.

While working on [aspect] and [facet] (which originally preceded this commit),
I changed the TypeError exception to pass all lines to local_sanity_check. This
allows for a direct test of the child tags. It turns out many child tags were
not tested because all the attributes were nested deeper inside other tags,
so that the child tag was not the parent of any attribute.

Two core macros failed the new test with the tags [filter_second] and
[filter_second_attack]. This pointed up the fact that these were not in the
list of valid child tags.

It also turns out that tags inside #ifdefs didn't fit the original test,
because "#ifdef" was considered an ancestor, interrupting the link between
"[if]" and the child tag.
2014-01-03 10:35:23 -05:00
Groggy Dice
98abe1ea42 wmllint: rewrite "who" magic comment to match exact macro name
Previously, the string only needed to match part of the macro. However, this
left too much room for unintended matches. This change is also quicker for
wmllint to process.
2014-01-03 10:35:22 -05:00
Turuk
2831eacd83 Khalifate: Khalid Description 2014-01-02 22:50:27 -05:00
Turuk
7ca58d978f Khalifate: Shuja Description 2014-01-02 22:42:13 -05:00
Turuk
0bdaac38b9 Khalifate: Ghazi Description
Turuk learns how to spell 'the' properly.
2014-01-02 22:35:41 -05:00
Turuk
3da8428070 Khalifate: Ghazi Description 2014-01-02 22:34:27 -05:00
Turuk
b6c07634aa Khalifate: Arif Description 2014-01-02 22:15:12 -05:00
Turuk
f656453f66 Khalifate: Elder Falcon Description 2014-01-02 21:45:33 -05:00
Turuk
902dd14646 Khalifate: Tabib Description 2014-01-02 21:35:10 -05:00
Turuk
146b902c9d Khalifate: Hakim Description 2014-01-02 20:19:34 -05:00
Turuk
a4fa7fc1a3 Khalifate: Falcon Description 2014-01-02 20:18:05 -05:00
fendrin
9ee891db99 Context menu item for saving areas. 2014-01-03 00:33:37 +01:00
mattsc
c01e534567 Mainline campaigns: don't use aggression > 1
aggression=1 is the largest sensible value.  For larger values, the AI
actually prefers attacks in which it receives more damage, leading to
it choosing the wrong attacks.
2014-01-02 10:52:32 -08:00
fendrin
87be0f688a Fix the alias attribute of the "cloud" terrain. 2014-01-02 19:46:44 +01:00
fendrin
ab90eedd5f Remove obsolete overlay= attributes from actions which have own icons. 2014-01-02 11:53:06 +01:00
fendrin
89576acca6 Made use of the new bigmap macro in LoW1 2014-01-02 10:44:20 +01:00
fendrin
1c2527df9a A macro for the new LoW bigmap from Zookeeper. 2014-01-02 10:44:19 +01:00
fendrin
657f3c4c80 Added image_icon with CROP argument making in fiting the sidebar box. 2014-01-02 10:44:19 +01:00
fendrin
10b56130b1 Replaced forest segments with those from the different climate zone.
This is just an attempt to make the map look more like "Prairie".
2014-01-02 10:44:19 +01:00
fendrin
03f33bfc30 Just 4 pieces of terrain to beautify the map. 2014-01-02 10:44:19 +01:00
ln-zookeeper
4d004b8575 Removed the old-style map from the credits. 2014-01-01 16:55:34 +02:00
ln-zookeeper
61effe50fd Removed images-only [about] tag which does nothing anymore. 2014-01-01 13:12:30 +02:00
Ignacio R. Morelle
6c58f9539a Remove file that doesn't belong in the Git repository 2014-01-01 02:23:47 -03:00
Ignacio R. Morelle
1d2a59b0ab addons.w.o: New Year copyright update 2014-01-01 02:18:05 -03:00
Ignacio R. Morelle
503492dc96 website: New Year copyright update 2014-01-01 02:17:42 -03:00
Ignacio R. Morelle
785d6c8a17 units.w.o: New Year copyright update 2014-01-01 02:16:52 -03:00
Espreon
8d16e1630c leanto.png depicts a lean-to; not a lectern. 2013-12-31 21:42:01 -05:00
ln-zookeeper
2570d7345b Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-01-01 03:05:31 +02:00
ln-zookeeper
461a2573aa Changed the gold carryover to "inverse early finish bonus" and made a bunch of balancing changes. 2014-01-01 03:03:09 +02:00
Ignacio R. Morelle
74e933bcc0 Revert wmlindent pass on data/gui/ by bumbadadabum
Commit ef2bdfbc12d97f7bde074cc1b14435abb9659182 includes a wmlindent
pass on data/gui/ which is currently not intended to be wmlindent-ed
(see the 'reindent' data/tools/Makefile target).

One adverse effect of the commit includes portraits being rendered near
the top of the screen instead of the bottom in the [message] GUI2
dialogs.
2013-12-31 19:45:17 -03:00