55395 Commits

Author SHA1 Message Date
Ignacio R. Morelle
7a9e1b5974 gui2/taddon_description: Update wiki documentation 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
6e16b0c659 addon/info: Add support for the [campaign] feedback_url field from the server 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
6df984ffd8 campaignd: Implement .pbl [feedback] block and [campaign] feedback_url field
The .pbl [feedback] block (also used in the server configuration WML)
specifies a list of format values interpolated into the
feedback_url_format string from [server_info] to build a web page URL
that is delivered to clients each time an add-on's metadata is sent in a
[campaign] block.

For example, given the following campaignd-side configuration:

  [server_info]
      feedback_url_format="http://forums.wesnoth.org/viewtopic.php?t=$thread_id"
  [/server_info]

And the following tag in the _server.pbl WML:

  [feedback]
      thread_id=32091
  [/feedback]

..., the server will deliver the following field as part of the
[campaign] block provided in the response to [request_campaign_list]:

  feedback_url="http://forums.wesnoth.org/viewtopic.php?t=32091

The fields from the [feedback] block are percent-encoded to ensure that
the .pbl WML can't manipulate query strings from the
feedback_url_format. If for a system administrator it is somehow
desirable to let authors enter arbitrary URL fragments (e.g.
feedback_url_format="$url" and [feedback]
url="http://this-site-kills-kittens.example.com, bad idea btw), then
they should probably remove the utils::urlencode() call themselves and
take responsibility for any malicious links that could be served to
users of the add-ons server that way.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
44e823baa5 campaign: Implement [server_info] block and feedback_url_format attribute
The [server_info] configuration block is intended to contain additional
information about a campaignd instance that may be used by clients or
the server for various purposes.

As a first such information field, the feedback_url_format string
contains a format string for use with
fast_interpolate_variables_into_string() to build add-on feedback page
URLs.
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
9a1ca1cbc4 campaignd: Add dumb alternative to utils::interpolate_variables_into_string()
utils::interpolate_variables_into_string() requires a bunch of formula
AI implementation details at linking time, which really shouldn't be in
server-side code (see commit 495f481fdf6cbd6d5eea2ffaa20423f08c955eec).

Since I'm going to need a similar variable interpolation scheme for an
upcoming campaignd feature, add a
fast_interpolate_variables_into_string() function that does something
roughly equivalent, except using simple string replacements without
support for the full WML $variable syntax (e.g. pipes don't have any
meaning in this version of the functionality).
2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
92938d3404 addon/client: Minor Doxygen comment clarification 2014-01-04 07:19:41 -03:00
Ignacio R. Morelle
5ee16b8aa4 Add utils::urlencode() function for percent-escaping UTF-8 strings 2014-01-04 07:19:41 -03:00
ln-zookeeper
37e5f78c6f Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-01-04 11:52:06 +02:00
ln-zookeeper
87cd3ebf54 Changed carryover to 20%, as well as some other balancing. 2014-01-04 11:51:35 +02:00
Groggy Dice
afb02595eb update changelog 2014-01-04 00:58:32 -05:00
Groggy Dice
b79d759a62 NR 05a: change "Should this unit" to "Should I" in Rod dialog
The other choice dialogs in this scenario use "I" or "we", so
this brings it into conformity with them.

On the mailing list, I also spoke of a desire to have Camerin's
lines run before the choice is made, but looking at it, this
is a more complex change than I want to deal with right now.
2014-01-04 00:37:01 -05:00
Turuk
b11ea6e685 Khalifate: Jawal Description 2014-01-03 23:28:32 -05:00
Turuk
6488d00569 Khalifate: Saree Description 2014-01-03 23:24:37 -05:00
happygrue
38e2034751 Updated Khalifate changelog and release notes 2014-01-03 23:17:42 -05:00
Turuk
e48a72027f Khalifate: Rami Description 2014-01-03 23:15:17 -05:00
Turuk
54d783c318 Khalifate: Tineen Description 2014-01-03 23:13:30 -05:00
Turuk
301818e61f Khalifate: Qatif-al-nar Description 2014-01-03 23:08:27 -05:00
Turuk
2c609da8f0 Khalifate: Naffat Description 2014-01-03 23:04:20 -05:00
Turuk
41f64b96af Khalifate: Hadaf Description 2014-01-03 22:59:52 -05:00
Turuk
28dbc57814 Khalifate: Description Qanas 2014-01-03 22:56:24 -05:00
Turuk
96396a4011 Khalifate: Mufariq Description 2014-01-03 22:41:23 -05:00
Turuk
dc50514d61 Khalifate: Faris Description 2014-01-03 22:23:58 -05:00
Turuk
bfd1fb6db9 Khalifate: Khaiyal Description 2014-01-03 22:13:15 -05:00
mattsc
f856cadff6 Coward Micro AI: add optional tag [filter_second]
This tag determines from which units the coward flees.  It defaults to
all enemy units, but can be set to enemy and/or allied units if
specified.
2014-01-03 19:03:06 -08:00
Turuk
c55f9215cf Khalifate: Batal Update 2014-01-03 21:58:54 -05:00
Turuk
722d1f6a26 Khalifate: Muharib Update 2014-01-03 21:55:51 -05:00
Turuk
f363b2b87a Khalifate: Batal Description 2014-01-03 21:53:13 -05:00
Turuk
098f4f8579 Khalifate: Muharib Description 2014-01-03 21:52:46 -05:00
Turuk
6159463017 Khalifate: Mudafi Description Update 2014-01-03 19:52:10 -05:00
JaMiT
26a2307298 Fix the display of numbers between 0 and -1. 2014-01-03 17:37:45 -06:00
Turuk
30e9c6afb7 Khalifate: Mighwar Description 2014-01-03 15:54:03 -05:00
Turuk
e815ef15b1 Khalifate: Monawish Description 2014-01-03 15:41:56 -05:00
Turuk
c92525fd06 Khalifate: Jundi Description 2014-01-03 15:30:58 -05:00
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