54667 Commits

Author SHA1 Message Date
Ignacio R. Morelle
cca7782ec3 CodeBlocks project update 2013-12-17 20:57:29 -03:00
fendrin
14d8e588f4 Add new files to the cmake build system. 2013-12-18 00:53:39 +01:00
fendrin
d5cf7cab2a Add support for filtering in editor generated scenarios. 2013-12-18 00:46:58 +01:00
fendrin
d60dc5ff2d Forgot to initialize some class members. 2013-12-18 00:46:58 +01:00
fendrin
130009ef7f Support for handling maps and scenarios differently.
Dialog for editing the scenario setup.
Dialog for editing the side setup.
A mechanism for loading and saving the different cases.
2013-12-18 00:46:58 +01:00
fendrin
4f5e0b415a Support for editor generated scenarios in the mp create screen. 2013-12-18 00:46:58 +01:00
fendrin
7ab41d4734 Flatened a method by adding a return and avoiding a indentation level. 2013-12-18 00:46:58 +01:00
fendrin
92a6d30ee7 Put the time schedule macros in use. 2013-12-18 00:46:57 +01:00
fendrin
4ace4354f4 Fix the spelling in a comment. 2013-12-18 00:46:57 +01:00
fendrin
281815d473 Create a directory for saving complete scenarios from the editor. 2013-12-18 00:46:57 +01:00
fendrin
e70d6a363f Handle minimap highlighting were colors went out of range. 2013-12-18 00:46:57 +01:00
fendrin
5e46a899f7 Aplied Title Case Rules on new hotkey actions. 2013-12-18 00:46:56 +01:00
Ignacio R. Morelle
d15745ea25 Hide and disable color cursors option on Mac OS X (bug #18112)
It is known to cause severe lags that may render the cursor completely
unusable at times. This probably won't be solved until Wesnoth can run
on SDL 2.0.
2013-12-17 20:31:38 -03:00
Ignacio R. Morelle
e512b72fc8 Revert accidental change resulting in color cursors being enabled by default again 2013-12-17 20:16:40 -03:00
Ignacio R. Morelle
a2422a8f15 Move color cursors option to Advanced Preferences
It is known to break under a variety of situations, including
(apparently) running on OS X, so it's not really fit for the Display
preferences page. This is probably going to remain the case until
Wesnoth is ported to SDL 2.

Also added a more discouraging tooltip to the option.
2013-12-17 20:11:08 -03:00
mattsc
fe070f7bd3 SotBE S6: slightly different location for one of the allied AI orcs
So that it does not end up blocking a village on Turn 2.
2013-12-17 12:54:18 -08:00
mattsc
61516f6b11 SotBE S6: balancing adjustments to gold, turns, AI parameters
Reduce turn limit, make AI more aggressive with slightly more gold, but
also give the player some more gold, as the carry-over from the
previous scenario is a lot less.
2013-12-17 12:54:18 -08:00
mattsc
da20ff9071 SotBE S5: balancing adjustments to gold, turns, AI parameters
The goal is to make the scenario harder and, more importantly, to
reduce the gold carry-over.
2013-12-17 12:54:17 -08:00
Groggy Dice
39557e8807 auto-recognize RECALL characters
Although this is not a core macro (yet - I've been meaning to ask why Wesnoth doesn't have core recall macros), it is used in many UMC projects in a consistent format, making it a de-facto standard.  Test that the macro has only one field, to make sure it isn't deviating from the format.
2013-12-17 04:48:57 -05:00
Groggy Dice
6dde83c3ac auto-recognize the people in the NAMED_*UNIT macros
If we have a regex match for the macro, we parse it and see if it meets key tests:

* There are at least 7 arguments parsed (NAMED_UNIT can have extra WML).
* The original regex could also match UMC macros, like "Attack of the Western Cavalry"'s NAMED_SHIP_UNIT. To make sure that such macros are following the format of the core macros, we check that the side, x, and y fields are numbers, or variables/macros consistent with those fields.
* Also make sure that the id field isn't blank. Not only would adding an empty id to the list of present characters be pointless, that list is added to spellings, and zero-length entries crash the spell-check.

If all those tests are passed, we append the id argument to the list of the present.

I also tweak the wording in the intro about the "wmllint: recognize" magic comment to reflect that wmllint is now recognizing ids in some macros.
2013-12-17 04:48:54 -05:00
Groggy Dice
c33b4c47ad update 1.4's LOYAL_UNIT macro to NAMED_LOYAL_UNIT
If an instance of LOYAL_UNIT is encountered, parse it for the number of fields.  If the number matches the old 1.4 macro, replace the string.
2013-12-17 04:48:51 -05:00
Groggy Dice
8660806c42 change instring to preserve quotes when not used to enclose a macro field
As it was, the code was excluding all quotes from arg, even in translatable strings.  Although this did not break any code that uses the args, I don't care for that behavior.
2013-12-17 04:48:48 -05:00
Groggy Dice
195399bcb2 replace startswith with re.match in finding lines that begin with macros
This will help later in searching the string created by re.match.
2013-12-17 04:48:45 -05:00
Groggy Dice
f2391f0966 preserve spaces inside parentheses for arg
During testing, I found that spaces inside quotes were preserved by the "instring" code, but not spaces inside naked parentheses. For example, "(Elvish Rider)" would be turned into "ElvishRider". This fix keeps interior whitespace from being discarded; the problem of leading and trailing whitespace is dealt with by stripping the arg before appending it to args.
2013-12-17 04:48:42 -05:00
Groggy Dice
7a014e8030 refactor macro reference-parsing into its own function
I have need for a macro-parsing ability, and realized that there was already existing code locked inside the CrossRef class.
2013-12-17 04:48:39 -05:00
Groggy Dice
096417df47 create a magic comment for appending custom usage classes
This will keep non-core usage types from being described as a "non-standard usage class" in recruitment error messages. These error messages will only be triggered if there is a mismatch between recruits and recruitment patterns, so this magic comment is low-priority.

It was suggested that wmllint could auto-detect new usage values in unit files, and automatically append them to the list of recognized usage types. This was rejected because of the possibility of adding misspelled or mistaken usage types.
2013-12-17 04:48:37 -05:00
Groggy Dice
990ac9a901 note when recruitment mismatches involve non-standard usage classes
When recruitment patterns include bogus usage classes, it will trigger a message during the consistency check. However, this check won't tell you whether your problem is with the usage classes or the recruits. For example, if you get a message that "no light fighter units are recruitable", your first thought might be that you didn't include a light fighter unit in the recruit list. The message doesn't clue you in directly that the light fighter simply doesn't exist in mainline.

Now a clause will be added to the message when non-mainline recruitment classes are involved, alerting designers when bogus usage classes are involved, but mild enough that it hopefully won't scare away authors legitimately seeking to use custom classes.

This replaces the old usage check. The next commit will add a magic comment for appending custom usage types.
2013-12-17 04:48:34 -05:00
David Mikos
7f66f29d73 Add missing space to MP lobby advertized campaign description 2013-12-17 20:07:27 +10:30
David Mikos
5b86a10361 Rearrange MP Lobby caadvertized campaign description to make it more concise 2013-12-17 20:03:10 +10:30
mattsc
48da8f4bca Xcode project update 2013-12-16 18:03:03 -08:00
Ignacio R. Morelle
8592b52f4c CodeBlocks project update 2013-12-16 20:48:28 -03:00
Alexander van Gessel
562a5be85c Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-17 00:36:58 +01:00
Alexander van Gessel
0d18c7ca56 Move format_time_summary to its own file to fix linking issues 2013-12-17 00:36:48 +01:00
Andrius Silinskas
79f0f28619 Added campaign difficulty info for game item in MP Lobby. 2013-12-16 14:03:21 +00:00
mattsc
fd3e6e6fcc SotBE S4: balancing adjustments to gold, turns, ...
... income, recruit lists, AI parameters
2013-12-15 12:50:37 -08:00
mattsc
d13f49696d SotBE S4: give the player control of side 3 orcs 2013-12-15 12:50:36 -08:00
mattsc
349cc748dc SotBE S4: move shamans to Side 1 at end of scenario 2013-12-15 12:50:36 -08:00
mattsc
5f91abf23e SotBE S4: remove two pieces of dialog
They are unnecessary or don't apply to the new map any more.
2013-12-15 12:50:35 -08:00
mattsc
3e5263fdb0 SotBE S4: change the map to make scenario more interesting
Kapou'e now has to go through the Side 5 elves to get to the center
keep with the shamans.
2013-12-15 12:50:35 -08:00
mattsc
dff106b8d3 SotBE: add side parameter to orcish shaman macros
In S4 they now start on Side 3, not Side 1.
2013-12-15 12:50:35 -08:00
mattsc
22b58cf400 SotBE S3: clarify objectives
Indicate that it is good enough to accomplish either one of the
objectives.
2013-12-15 12:50:34 -08:00
mattsc
9811d46ff9 SotBE S1: add bowmen to enemy AI recruit list 2013-12-15 12:50:34 -08:00
David Mikos
ccb0ea5067 MP lobby: hide map icon in the event the map is not loadable. 2013-12-15 22:08:57 +10:30
David Mikos
ff77d473ef MP lobby advertized game layout changes. 2013-12-15 21:36:13 +10:30
David Mikos
44431996c0 Make multiplayer lobby advertized game names and vacant slots bold. 2013-12-15 19:41:49 +10:30
David Mikos
86adae8b07 Move multiplayer lobby map size info to bottom icon area. 2013-12-15 19:22:44 +10:30
David Mikos
90ebb53855 Slightly tweak multiplayer lobby icon spacings for advertized games. 2013-12-15 18:29:52 +10:30
Bär Halberkamp
b7a0f40e34 Added some macros to S2 to make the code more compact 2013-12-14 20:29:50 +01:00
Bär Halberkamp
8d12ff8208 Also made side 4 hidden until it appears 2013-12-14 20:19:02 +01:00
Bär Halberkamp
7411ed053f EI: Made the undead side not appear in side list before it actually appears 2013-12-14 20:17:00 +01:00