Commit graph

19991 commits

Author SHA1 Message Date
fendrin
0c49932aed LoW 06: Fix the scenario's side setup. 2014-10-14 22:10:01 +02:00
fendrin
cc30aa202c LoW 05: Adjust the loyals' starting positions and fix missing save_id. 2014-10-14 22:09:08 +02:00
fendrin
328f2ac139 LoW 04: Adjust the loyals' starting positions. 2014-10-14 22:07:51 +02:00
fendrin
52db844d7b LoW 03: Adjust the coding to the different map size. 2014-10-14 22:07:01 +02:00
fendrin
01b345577e LoW 02: Adjust loyals' starting positions. 2014-10-14 22:05:40 +02:00
fendrin
d70b19d918 LoW 01: Adjust the loyals' starting positions. 2014-10-14 22:04:48 +02:00
fendrin
b3e2851b48 LoW: Move more of LoW's characters into their dedicated file. 2014-10-14 22:02:13 +02:00
fendrin
33055f214a LoW: Moved a partial map loading macro to the utils file. 2014-10-14 22:00:38 +02:00
fendrin
6a04be0503 LoW: Cosmetic updates to LoW's maps and masks. 2014-10-14 21:58:53 +02:00
Chris Beck
3b1579c6f7 fix a check in move_unit
The logic is supposed to be, if (x,y) == (prev_x, prev_y), then
skip the "find_vacant_hex" function because we don't have to move.
Instead we effectively had, if (x == prev_x OR y == prev_y), then
we can skip the check.

This revises a commit
72f138c544

in the hopes to fix a bug reported here:
http://forums.wesnoth.org/viewtopic.php?f=4&t=41084
2014-10-14 13:07:49 -04:00
fendrin
7208f82efc LoW: Fix errors reported by wmllint.
Mostly complains about [side] without a type=.
2014-10-14 03:05:33 +02:00
fendrin
04faf1d735 LoW 13: Just some cosmetic changes. 2014-10-13 22:10:30 +02:00
fendrin
a47b7e87e3 LoW 14: Introduced new sides for the players.
This commit introduces more sides comming to help from the scenarios 7
and 3.

It is the first commit in a row, attempting to balance the scenario.
2014-10-13 22:10:30 +02:00
fendrin
c1c349a701 LoW MP: Enable the 4th chapter. 2014-10-13 22:10:30 +02:00
fendrin
4e46760013 LoW 12 MP: Let the campaign propagate to 13 instead of ending in MP. 2014-10-13 22:10:30 +02:00
fendrin
00ca535581 LoW 07: Fix the starting position of "Eradion". 2014-10-13 22:10:30 +02:00
fendrin
a74f330194 LoW 4: Bigger Castle for Cleodil. 2014-10-13 22:10:30 +02:00
fendrin
e423476f4d Remove side specific attributes from characters.
This reduces the output clutter when character macros are used in [unit]
or [leader] tags.
2014-10-13 22:10:29 +02:00
fendrin
e5d21a7658 LoW 14: Map changes.
Introduce more Castles for several new elvish sides.
Make the map a square.
2014-10-13 22:10:29 +02:00
fendrin
135d616631 LoW 14: Made the map a square. 2014-10-13 22:10:29 +02:00
Nils Kneuper
899bd3889f updated Lithuanian translation 2014-10-12 00:05:09 +02:00
Ignacio R. Morelle
827a8bc271 Revert "Make Lit Mushroom Grove stats identical to Mushroom Grove"
Requested by Wintermute: <http://r.wesnoth.org/p573664>

This reverts commit 35a48f29f9.
2014-10-11 03:09:03 -03:00
Ignacio R. Morelle
76ba22b2b3 Revert "Fix bug #21971: visual glitch of terrains on 2p - Hornshark Island"
Requested by Wintermute: <http://r.wesnoth.org/p573664>

This reverts commit 18282b542f.
2014-10-11 03:05:00 -03:00
Ignacio R. Morelle
f968070eb0 UtBS S4: Specify side=1 for [remove_shroud] action
Fixes the following wmllint warning:

> "../../data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg", line 346: [remove_shroud] without "side" attribute is now applied to all sides
2014-10-11 00:47:35 -03:00
Evgeny Kapun
6e38c0d008 Fix missing message in 'The Siege of Elensefar'
Backported commit 93c877e623  by Evgeny Kapun.
2014-10-10 11:06:30 -07:00
Ignacio R. Morelle
27c817a46d Add test case for bug #22443/PR #275 2014-10-07 21:42:57 -03:00
ln-zookeeper
5b1e975bba Added secondary unit filters to sighted events
Added secondary unit filters to all sighted events I found which seemed
like they might suffer from the same problem as bug #22466.

Fixes bug #22466.
2014-10-07 08:27:54 -07:00
Chris Beck
39baaec814 Merge pull request #286 from cbeck88/remove_replay_viewer_text_label_1.12
remove replay viewer text label
2014-10-06 15:02:34 -04:00
Charles Dang
8d385fea00 HTTTT S23: 'Who do we serve?' -> 'Whom do we serve?' 2014-10-06 02:50:03 -03:00
Charles Dang
629857f448 06b storytext: fixed double 'of' 2014-10-06 02:48:04 -03:00
mattsc
396b4356b1 Add cropped image_icon for Grand Knight
So that it fits the unit box in the sidebar.
2014-10-05 16:23:32 -07:00
Ignacio R. Morelle
3c8a52e83c Fix incorrect image reference in the ToD help topic (bug #22537) 2014-10-04 01:37:56 -03:00
Chris Beck
0de963cd8a fix whitespace at end of line 2014-10-04 01:09:30 -03:00
unknown
0cb9891c29 Fix bug #22306: move_unit moves a unit even when it shouldn't
Modified the lua script for wml_action.move_unit. In the
loop to check for vacant tile, if the current location
is equal to the previous location we don't look for a
vacant tile since our location is free (where we are).

Conflicts:
	changelog
2014-10-04 01:07:23 -03:00
Chris Beck
23e28832c8 remove replay viewer text label
This label didn't seem to contribute much of anything, and it
caused big problems for translators because we don't have
dynamically resizing text labels, and that would have provoked
intractable layout problems anyways, so we decide just to remove
it and rely on the tooltips / media controller icons on the buttons
to tell the user what is going on.

See also discussion here:
http://forums.wesnoth.org/viewtopic.php?f=9&t=24598&start=120#p575851
2014-09-18 10:46:54 -04:00
mattsc
9a77179622 Dragon MAI test scenario: turn off debug output
The messages spoken by the hunter (dragon) are debug output and not
translatable.  They should not appear in the scenario.
2014-08-18 18:33:59 -07:00
mattsc
a9b56fadc9 MAI test scenario: fix string that caused trouble for translations
Somehow the combination of “” and new lines caused the string to be
terminated prematurely when it was extracted into the .pot file.  Fixed
by removing the “”.
2014-08-18 07:35:09 -07:00
Groggy Dice
a1ebdd8443 wmltools: split campaigns/add-ons into separate subtrees for wmlscope
The problem: wmlscope assigns each file to a directory-based subtree, and
assumes that it is visible to every other file in that subtree. The intent
is that each campaign (or add-on of another type) will be in its own
subtree.

However, wmlscope/wmltools has derived these subtrees based on what
arguments get passed to wmlscope, rather than checking whether campaigns
have actually been split out. For instance, invoking wmlscope with
"../data/core ../data/campaigns <userdata>/data/add-ons" will cause
wmlscope to see three subtrees, one of which consists of all mainline
campaigns and another that includes all the user's add-ons. This leads to
many spurious "more than one definition/resource is visible here" errors.

A wildcard like "data/campaigns/*" would be expanded to all the individual
campaign directories. However, the wmlscope user might not know that they
should do that. Also, until the glob module was imported recently, globbing
did not work in the Windows cmd shell.

The solution: declare "campaigns" and "add-ons" to be roots, and check for
their presence in the directory names. If indicated, split out the
subdirectories into their own subtrees. Since it is possible that the user
may have moved, copied, or drafted campaigns/add-ons to another folder
that isn't following Wesnoth convention, also check for that.
2014-08-14 06:00:15 -04:00
mattsc
5f0b284e6a Goto MAI: fix bug causing errors for unreachable goal hexes
This includes hexes occupied by an enemy unit.
2014-08-11 18:56:05 -07:00
Groggy Dice
f8b0103f0c wmltools GUI: remove -f and -p wmllint options, add -m 2014-08-06 06:09:52 -04:00
Groggy Dice
975ff7b0c3 wmltools: fix wmlscope crash in collection of unresolved macro calls
While testing wmlscope without including data/core, which guarantees lots
of "unresolved" references, I got a crash pointing to this line with the
traceback: "NameError: global name 'args' is not defined".

At first, I thought the crash might have been caused by my splitting out
parse_macroref into its own function, several months ago. However, the
line is at the wrong indentation level for those "args" to be the variable
referenced here. So what "args" might have been intended?

After tracking down the commit that added "args=args" to this line, I've
concluded that this was simply a mistake. ESR isn't around to ask anymore,
but if a macro was never defined, or is not called correctly, what "args"
could be relevant?
2014-08-01 05:28:00 -04:00
Groggy Dice
6a1a369ad1 wmltools: cite define locations when "more than one definition" is visible
When "more than one resource" is visible, wmlscope tells you where they
are.  Now it will do the same for macro definitions.
2014-08-01 04:37:56 -04:00
Groggy Dice
ea380c21c4 wmlscope: import glob for Windows shell
The Windows cmd shell will not expand a globbed argument by default, in
fact it will make the argument invalid. Importing and utilizing the glob
module is needed for x-platform.

Globbing is especially important for breaking up the subtree, so wmlscope
doesn't give off "more than one resource/definition is visible here"
errors.
2014-08-01 04:34:56 -04:00
Groggy Dice
1ebadbf7c4 wmllint: split introduction into labeled sections for clarity
Also, the top paragraphs, aimed at the core developers, have been moved to
the bottom, to get to the information key to general users.
2014-08-01 03:49:33 -04:00
Ignacio R. Morelle
de48c18618 LoW: remove an unneeded comment block 2014-07-31 16:12:53 -04:00
Groggy Dice
9ce28102bf wmllint: remove -p --progress option
This option is pretty similar in effect to -v -v. Particularly now that
some new switches have been added recently, the clutter makes it no
longer worth keeping around.

A comment notes the option's disappearance, in case anyone wonders what
happened to it or how to get the same functionality.
2014-07-29 06:09:14 -04:00
Groggy Dice
378da4cd0c wmllint: remove -f --future option
Going back through wmllint's history, it turns out that there apparently
haven't been any "experimental conversions" since 1.4. Especially since
some new switches have been added recently, the clutter makes it no longer
worth keeping around.

A comment notes the option's disappearance, in case anyone is interested
in recreating experimental conversions again.
2014-07-29 06:09:04 -04:00
Groggy Dice
bf43ff2c36 geography.cfg: correct wmllint spelling for Castelfranc and Rumyr
These towns were misspelled in their encyclopedia entries, compared to
the Wesnoth map. All of the instances in my UMC collection follow the map
spellings, so I am not leaving the incorrect spelling as an alternative.

Also, there were spelling rules for both "Memog" and Melmog on separate
lines. No reason to keep the mistake around.
2014-07-29 06:08:28 -04:00
ln-zookeeper
136b9c80d9 Made the undead spawns require Jevyan to be alive 2014-07-22 16:25:18 +03:00
ln-zookeeper
fe7cf1120f Balancing tweaks
Limited number of bats Khrakrahs may have at a time, moved the dwarves
closer to the map edge where possible, and gave the Berserkers
predefined traits to prevent them from being quick (except one on hard).
2014-07-22 16:24:43 +03:00