411 Commits

Author SHA1 Message Date
Iris Morelle
affb15fbac freenode suffered a horrible accident, we're moving to Libera.Chat
The problem is that right now Libera.Chat does not have a web chat
interface, and no guarantee as to what its URLs are gonna be like
; although staff have said they're probably gonna stick to the same stack
as before so we might end up with very similar looking URLs.

For the time being, we have to get rid of the webchat URLs. They will be
missed a bit. Maybe.

Before anybody asks, yes, I am aware of the po comments in German
translation catalogues including a freenode IRC protocol URL. If I do
anything about it now, somebody will helpfully revert my changes during
a message catalogue merge (it happened some time ago). So, not touching
those until release time.

Also nobody cares about Travis anymore. It's dead cruft, just leave it
alone. (What on earth is that massive base64 string anyway?)

CC #5797
2021-05-21 05:20:44 -04:00
Charles Dang
daff648482 Campaigns: wmlindent pass
[ci skip]
2020-03-08 22:01:26 +11:00
nemaara
50e24404d4 Tutorial S2: fix coordinates in moveto event 2020-01-11 17:44:16 -05:00
Earth-Cake
1eca8258b1 Tutorial - minor improvements (#4682)
* Change victory objectives - S1

* S2 - Minor improvements

* Add a macro and add [cancel_action] tag

* Fix dialogue

* Revert objectives
2020-01-11 16:18:37 +01:00
Steve Cotton
22c7678322 Tutorial S2: When a second Shaman is recruited, say that the healing doesn't stack 2020-01-01 12:32:12 -05:00
Earth-Cake
2289bc6f31
Remove unnecessary [if] tag, fix capture event 2020-01-01 15:59:06 +01:00
Earth-Cake
d3f053fa1e
Add PRINT messages, disallow_end_turn messages
Add more reminding PRINT messages, disallow_end_turn messages, and fix a bug where player can just capture village and end turn without recruiting/recalling units.
2019-12-31 22:46:20 +01:00
Steve Cotton
a5a1fec226 Make map_file= search for a maps directory in the [binary_path] (#4633)
For both [scenario]map_file= and [replace_map]map_file=, this allows both of
these to have the same effect:

* map_file=campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map
* map_file=01_The_Elves_Besieged.map

This allows a lot of copies of the campaign/add-on's name to be omitted. Thus
it's no longer necessary to change every scenario's .cfg file to rename an
add-on, or to move a campaign between UMC and mainline.

This makes [binary_path] a misnomer, as it now also handles a text-based type
of file, however that's going to be the correct path for campaigns or add-ons
that use the standard layout with images/, maps/, scenarios/, etc.

This commit has the change itself, in filesystem_common.cpp, and the updates
for most of the campaigns. DM, LoW, UtBS and WoV are omitted from this, as they
all use a macro to do the same effect:

 #define MEMOIRS_MAP NAME
-    map_file=campaigns/Delfadors_Memoirs/maps/{NAME}
+    map_file={NAME}
 #enddef
2019-12-26 19:01:28 +01:00
nemaara
ce3ac1e33d Tutorial: starting grunt should not have random traits 2019-12-19 11:50:15 -05:00
nemaara
b0aed28de1 Tutorial: reduce difficulty 2019-12-19 02:51:12 -05:00
Earth-Cake
abb85d3dbe Tutorial S2 map overhaul (#4644) 2019-12-17 23:47:41 +01:00
Earth-Cake
32e8c710ff
Add variable 2019-12-14 00:10:21 +01:00
nemaara
666f3a2c78 AOI: remove from mainline 2019-12-02 11:47:50 +11:00
Celtic Minstrel
24b11221cf Use wml.array_variables instead of wml.array_access.get/set 2019-11-16 13:09:04 -05:00
Celtic Minstrel
aaa2dc4ece Rollback possibility of wesnoth.get_units matching recall list units
Now it's renamed to wesnoth.units.find_on_map.

wesnoth.units.find implements the case of finding units on either the map or a recall list.
2019-11-15 22:39:09 -05:00
Celtic Minstrel
977f05d77f Lua: Replace uses of deprecated (moved) unit functions
Also backtracked the removal of wesnoth.get_recall_units, which is now available as wesnoth.units.find_on_recall - it's just more convenient than passing x=recall to wesnoth.units.find
2019-11-15 22:39:08 -05:00
Steve Cotton
17940cb98f Replace the [tutorial] tag with [scenario]
The title screen's "tutorial" button will use the tag name from game_classification,
as would anything else that calls game_launcher::set_tutorial().
2019-11-04 17:09:10 +11:00
josteph
74589a642c Fixes from SpellingMistakes 2019-10-19 21:32:24 +00:00
Steve Cotton
b408a155b3 Tutorial S01: Correct dialogue about damage for strong / dextrous elves
Thanks to EarthCake for the implementation.
2019-10-15 01:16:26 +02:00
Steve Cotton
c5df7c4558 Tutorial S02: Show "recruit the right units" when the player has gold
It's confusing when it pops up on turn 12, regardless of the game state. My
leader is normally on the other side of the river from my keep, and I always
wonder "what about my play triggered that?"

Move the message to be part of the "I now have enough gold to recruit more
units" hint.

(cherry picked from commit 80a2ace28ca3728fea95cb5f53fb768ef00e64a3)
2019-10-08 19:39:11 +02:00
Steve Cotton
caf1c8eebd Tutorial S02: Make the grunt cross the bridge without bait (#4425)
Not a code-revert, but a behavior-revert of the switch of this unit
to use the guardian AI. 26327a5bdc41180ae1a4b73bffbaf668ca2c31da.

If he somehow doesn't get across the bridge, warn the player
that something has broken.

(cherry picked from commit 656a44664d3d16fc4179f06f0e902c1c8df861a1)
2019-10-05 20:18:35 +02:00
Severin Glöckner
6da85e9042 switch from map_data to map_file in SP 2019-10-02 02:54:25 +02:00
Severin Glöckner
8ca4ab075a Tutorial: use numerical comparision
[ci skip]
2019-09-23 16:45:25 +02:00
gfgtdf
5cb93694c6 move loyal overlays to the loyal trait
since the recent changes to overlays= in particular 1a7724e5472,
e71033374c35 and b2cd1cf6c [unit]overlays= is no longer the
recommended way to add an overlay and the use of the
apply_to=overlay effect is reccomended instead, so adding it
to the [trait] is the most natural option here.

this in particular fixes #4058 . Also people simply forgetting the
IS_LOYAL macro was a not-so-uncommon cause of bugs.

In some cases people want to give the LOYAL trait without giving the
loyal overlays for those cases i added a optional OVERLAY parameter to
the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO}
instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are
no longer needed in combination with those traits.
2019-08-25 20:36:35 +02:00
Steve Cotton
bd130fc8e3 Tutorial S2: Warn about orcs crossing the river when they cross
Closes issue 2a of #1584

Previously the warning was always given on turn 7. It will still trigger even
if the player has units ready to defend that crossing, because I think it's
better to show the message and let the player think "I'm already ready" than to
have it pop up once some fighting has already happened; and it seems easier to
test this logic than to test logic for not showing the message if the crossing
is currently guarded.

Also add a first_time_only=no to the check_income event, so that it can trigger
on turn 7 if it doesn't trigger on turn 6.
2019-07-14 17:00:30 +02:00
Charles Dang
ff9b8d7734 Tutorial S1: fixed typo
[ci skip]
2019-06-25 10:13:32 +11:00
nemaara
8d0f8be312 Tutorial: fix invalid key in filter 2019-03-04 11:55:54 -05:00
nemaara
ecb0f1a472 Tutorial: add dialogue for Konrad or Li'sar levelup 2019-03-02 16:52:17 -05:00
nemaara
8f3d10d619 Tutorial: change water warning to activate on all water hexes 2019-03-02 16:19:27 -05:00
Steve Cotton
309b6e9eae Tutorial S2: Hint that it's better to keep units about-to-level (#3683)
This backports 'Tutorial S2: "choose who gets the 16xp" is a topic for
the rookie campaigns' from 1.14.
2019-01-06 17:00:17 +00:00
Celtic Minstrel
ea9fddcd23 Support [disallow_end_turn]reason= and use it in the tutorial 2018-11-24 17:46:29 -05:00
Steve Cotton
5fa2ba279e
Tutorial S2: Don't allow the orc to recruit wolves on turn 1
If the wolves are recruited on the first turn then Galdrad's turn 3 hint about
getting to the island before them is too difficult for a tutorial, and his hint
about holding the village on turn 4 hint may be a turn too late.

Some have to be recruited on turn 2 to fit the turn 3 hint about them, so rig
the AI's recruitment to do that.
2018-11-06 15:07:49 -06:00
Severin Glöckner
c260cd2529 add / remove some comments
[ci skip]

(cherry picked from commit df8ac3cbb0be62929d654108bfb28ae36c0b41ad)
2018-10-28 02:53:05 +00:00
Severin Glöckner
cd6acf758a Tutorial Part2: Give the player a canche to undo his move
in case he started an attack from the water. The warning
makes no sense otherwise.

[ci skip]

(cherry picked from commit 9cac36e6b858cc9344674f5c90aa872e12e5ba9d)
2018-10-28 02:53:05 +00:00
Andras Szell
c4f8f759e0 Tutorial S1: display an undo message if impossible to reach next target
Fixes #3039

Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.

[ci skip]

(cherry-picked from commit b16b7f032a6be74451016be3b3f3d69cd229de00)
2018-10-07 03:25:16 +00:00
joeylmaalouf
009f8c0cf3 Tutorial: standardize Menu references
(cherry-picked from commit 05c6e397ba87b249efde322532f5049367d27155)
2018-10-07 03:23:44 +00:00
joeylmaalouf
7eaa5666e9 Tutorial: provide more detail about the Status Table
(cherry-picked from commit 9240d6d23d79394a68a4276b319f0f669a4ea5f9)
2018-10-07 03:23:43 +00:00
Severin Glöckner
aa0f5d298e Tutorial S1: followup previous commits
- Removed need for quick trait by spawning quantain next to Delfador
- Disabled movement point tracking due to #3344
- Use only one [label] tag to place both labels
- Removed id's of later quintains, as they are not used
- added some whitespaces

[ci skip]

(cherry-picked from commit 74b39ef3d68bee958998cae6780080c154997a01)
2018-10-07 03:23:34 +00:00
Andras Szell
1929b1a57c Tutorial S1: prevent getting stuck next to Delfador, unable to end turn
Fixes #1584 1c - Delfador summons the puppet, you have 0 MP left but the
                 puppet is not adjacent to you, and can't attack or undo

Changed Delfador's initial position to match the quintain's, and made him
step away to summon in the original place next to us, so we don't need to
move again to attack after we reach him.
The movement points of the mage are now updated and he gained quick trait
to fit for the more movements he does.
Final movement also touched, so he does not seem to sidestep the new
enemies when leaving the map.

(cherry-picked from commit e3a95cc039c1b7d1c5f71f7de35c260438a5cbb0)
2018-10-07 03:23:33 +00:00
Charles Dang
cc3e79c0a5 Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]

(cherry-picked from commit c7a06939abcc44a9f6d20d5e974ef4dc87b3e34d)
2018-10-07 03:22:13 +00:00
Fernando Carmona Varo
ba9d13f066 tutorial: add labels to villages and keep
Prevents new players from mistaking the graphics

(cherry-picked from commit 026ea6ee780c11859f495983dedaeb4f2e1ebb9f)
2018-10-07 03:20:57 +00:00
Wedge009
8516e1f1e7 Update text to match game-play changes (fixes #2950).
[ci skip]

(cherry-picked from commit d85e2a2886e1652749376e37c94e404d4b5ace98)
2018-10-07 03:20:34 +00:00
Severin Glöckner
50f2e1f474 Tutorial: fix two strings
This is one of the white on map messages
they never use punctuation characters for ending the instructions

Can't be pofixed.
[ci skip]

(cherry-picked from commit b8fe22877b60fa4a7638a99ce8e23f25d5bf87c1)
2018-10-07 03:19:39 +00:00
Steve Cotton
710ab61994 Tutorial: fix the overall translation hint comment
The comment at the start of 01_Tutorial_part_1.cfg wasn't immediately
before a string, so the hint for translators wasn't in the file that
goes to the translators. Fix it so that the tutorial shows working
usage of "# po:" style comments; this is probably more help to people
using the tutorial as a reference for WML, rather than the translators
themselves.

(cherry-picked from commit eab86c30163e2a2364d0abc9683cf4864fb3328b)
2018-10-07 03:19:38 +00:00
Severin Glöckner
b884c143ab Tutorial: remove forgotten bracket and superfluous space
[ci skip]

(cherry-picked from commit 3456b0a9cb0ebc863b1307652ffc5ffb065ca231)
2018-10-07 03:19:38 +00:00
Severin Glöckner
57f5463482 Tutorial: Button was renamed, update text accordingly
[ci skip]

(cherry-picked from commit 8b492a3ab424fb86bbf17a7e5ec0a39ac7fa1b29)
2018-10-07 03:19:35 +00:00
Severin Glöckner
f9a2d56437 Revert "tutorial: add translation note"
This should be addressed another way, not with a translation hint

This reverts commit 7a020c31304e1943dc6ed742c5d5ba92b8cadc3c.

(cherry-picked from commit beaddeee64ff6db897aa00e47b83d50ef8f398b7)
2018-10-07 03:19:31 +00:00
Severin Glöckner
577f541072 tutorial: add translation note
[ci skip]

(cherry-picked from commit 7a020c31304e1943dc6ed742c5d5ba92b8cadc3c)
2018-10-07 03:19:27 +00:00
Celtic Minstrel
402b6d4cec Fix #2875
(cherry-picked from commit bf70d50b80857b01b70357bf8e6d62b55c34b6ec)
2018-10-07 03:19:04 +00:00
Charles Dang
3783693cbe Campaigns: cleaned up more cases of deprecated Lua API usage
[ci skip]
2018-03-16 11:23:30 +11:00