0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
73397 commits 51 branches 369 tags 4.7 GiB
Commit graph

24919 commits

Author SHA1 Message Date
josteph
9abdc20841 MP Create Game: Increase slider step size 
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680
 2018-09-23 17:02:42 +03:00
mattsc
81ef9ea390
Merge pull request #3506 from mattsc/lua_ai_cleanup 
Lua AI Cleanup
 2018-09-22 06:18:33 -07:00
jostephd
3a3b752881 WML: Support [filter_side] in [item]. (#3533) 
* WML: Support [filter_side] in [item].

If [filter_side] is present then "team_name" is ignored.

Fixes #1477.

* WML: Compare [item]team_name to [side]team_name using intersection.

Fixes problems with substrings and when one or the other is a
comma-separated list. See #3533

* WML: Rename [item][filter_side] to [item][filter_team]

* Add changelog entry
 2018-09-21 21:11:08 -04:00
V N
6010ffe98e prevent double execution of on_event.lua 
makes it safe to dofile("on_event.lua")
 2018-09-19 18:09:50 +02:00
Severin Glöckner
b8d8be3436 THoT: replace [filter_wml] 
[ci skip]
 2018-09-16 00:46:27 +02:00
Severin Glöckner
e5b4fcdfd3 fixup 
[ci skip]
 2018-09-16 00:42:57 +02:00
Severin Glöckner
56111818e9 THoT: add potential workaround for #3547 
It's anyway a good idea to change this code.

[ci skip]
 2018-09-16 00:34:19 +02:00
Andras Szell
b16b7f032a 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]
 2018-09-16 00:23:31 +02:00
Severin Glöckner
09f418bdd8 ANL: fix village gold being too low 
[ci skip]
 2018-09-15 01:12:12 +02:00
DisherProject
648035fa1e SoF: add [show_if] to the objectives 2018-09-14 23:32:45 +02:00
DisherProject
67f49712c6 SoF: Postpone Gryphon Riders availability 2018-09-14 23:32:45 +02:00
DisherProject
bc4a5e832b SoF S9: Fix some events and add TODOs 2018-09-14 23:32:45 +02:00
DisherProject
5013a9f3e5 SoF S7: Don't let the player kill all of the enemies 2018-09-14 23:32:45 +02:00
DisherProject
20cd56324c SoF S6: Set correct speaker for [message] 
Alanin addresses Rugnur, and not Thursagan
 2018-09-14 23:32:45 +02:00
DisherProject
5dc6b796d3 SoF S5: Place the elvish encampment when the leader arrives 
So remove his starting castle from the map; otherwise the user
would see an empty keep and would know where the enemy is
going to spawn
 2018-09-14 23:32:45 +02:00
DisherProject
49d12cf1ef SoF S4: Add the tunnel the dwarves came from to reach the mines 2018-09-14 23:32:45 +02:00
DisherProject
29cec1a770 SoF S2: Place glyphs during prestart 
So we can see them while our ally is talking about them
 2018-09-14 23:32:45 +02:00
DisherProject
76f081addf SoF S1: Remove Caravans' upkeep cost 
In exchange, the player will have 2 starting villages
less than before
 2018-09-14 23:32:45 +02:00
DisherProject
9e8fb2d3e0 SoF: General cleanup 
1) Clear variables and macros
2) Remove default AI values
3) S7: Remove the ghost ship
 2018-09-14 23:32:45 +02:00
DisherProject
effb865040 SoF S2t,S3t,S4t - Move scenery items to map file 
The braziers will also be animated, while they were still
images before
 2018-09-14 23:32:45 +02:00
Severin Glöckner
c5cabd960b Micro AI Demos: use Cme instead of Chw for lurkers map 
[ci skip]
 2018-09-14 22:50:31 +02:00
Severin Glöckner
c5d3539880 Micro AI Demos: save maps in new format 
[ci skip]
 2018-09-14 22:50:31 +02:00
josteph
3809b64cf4 WML [message]: Limit the text width for messages with portraits on both sides as already done for messages with one portrait. 2018-09-14 13:36:18 -05:00
josteph
fc9e5f0484 WML [message]: Add left padding when the portrait is shown on the right. 
The text is now shown at exactly the same place regardless of which side
the portrait is on.

Fixes #1938.
 2018-09-14 13:36:18 -05:00
joeylmaalouf
243a542edd Menu: campaign order tweaks 2018-09-14 08:45:46 -05:00
joeylmaalouf
a3a9b72311 Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222) 2018-09-14 08:45:32 -05:00
josteph
046b141366 HttT S17: Show the 'Comic relief' comment to translators, too. 
(cherry picked from commit 31d333cc62)
 2018-09-12 16:08:28 +10:00
josteph
c006072356 HttT S17: Make Li'sar's dialog unconditional. 
(cherry picked from commit 6ea39b33e6)
 2018-09-12 16:08:26 +10:00
josteph
7b2289f818 HttT S17: Add comic relief. 
(cherry picked from commit f3407fddc9)
 2018-09-12 16:08:24 +10:00
josteph
15acd75636 HttT S17: Further updates to dialog 
- Improve Konrad's line
- Use variant portraits for Konrad and Li'sar
- Update the mage's dialog to match the dwarf's

(cherry picked from commit f7d8d0d257)
 2018-09-12 16:08:22 +10:00
josteph
865dcbf3a4 HttT S17: Further tweak dwarf's dialog. 
(cherry picked from commit 3e3bd320c9)
 2018-09-12 16:08:20 +10:00
josteph
0e9e3b30f9 HttT S17: Correct pronoun. 
(cherry picked from commit 96387a55d5)
 2018-09-12 16:08:18 +10:00
josteph
960a8fcc9f HttT S17: Add a po comments 
(cherry picked from commit edcccc56a7)
 2018-09-12 16:08:16 +10:00
josteph
25791d64e5 HttT S17: Change again due to an ambiguity. 
(cherry picked from commit 18e886d82e)
 2018-09-12 16:08:14 +10:00
josteph
c97fe98801 https://github.com/wesnoth/wesnoth/pull/3473#discussion_r211090169 
(cherry picked from commit bc52143390)
 2018-09-12 16:08:12 +10:00
josteph
0a0920fe79 HttT S17: Explain why Mages of Light aren't considered by the filter. 
(cherry picked from commit 4c2f4f7eda)
 2018-09-12 16:08:10 +10:00
josteph
2c9aeec8b0 fixup 
(cherry picked from commit 62eb450da6)
 2018-09-12 16:08:09 +10:00
josteph
fff478112c HttT S17: Fix "naught" and explain why only high-level mages. 
(cherry picked from commit 7ed9f2db9a)
 2018-09-12 16:08:07 +10:00
josteph
9072934d45 units: Add a po comment in Elvish High Lord. 
(cherry picked from commit 1f0c466a3d)
 2018-09-12 16:08:05 +10:00
josteph
f1d20c1edb HttT S17: Add po comment 
(cherry picked from commit b7c431e7b3)
 2018-09-12 16:08:03 +10:00
josteph
de9541fd76 HttT S17: Explain the lava mechanic 
Gameplay is not affected. The player can still lose units to {EXPAND_LAVA}.

(cherry picked from commit a3be912487)
 2018-09-12 16:08:01 +10:00
josteph
95b3ccd9fe HttT S6: Support unlikely player behavior. 
Trigger the undead reinforcements even if the player skips the main cave entrance.
 2018-09-11 03:36:37 +02:00
josteph
9509eecced HttT S6: Trigger the additional undead as soon as the player touches the cave entry. 
Seen in :debug with a Nightgaunt. Not sure if it can happen in normal play.
 2018-09-11 03:36:37 +02:00
josteph
e50b6fa7bd HttT S6: Allow canceling attack orders. 2018-09-11 03:36:37 +02:00
gfgtdf
3591e82586 add game_config.combat experience 
and make [harm_unit] use these values instead of hardcoded 8*level for
killing and level for combat.
 2018-09-10 22:09:50 +02:00
Severin Glöckner
00e41b9857 Core Macro Reference: Fix hint 
[ci skip]
 2018-09-10 00:37:51 +02:00
Severin Glöckner
f358beda51 TSG S5: fix typo in comment 
[ci skip]
 2018-09-10 00:37:51 +02:00
Severin Glöckner
7a29fc15b4 ANL: remove superfluous temp variables 
The other variables in that event are not needed either, left them in for
readability for the time being.

[ci skip]
 2018-09-10 00:37:51 +02:00
Severin Glöckner
001b444b10 core macros: don't clear nonexistant variable 
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]
 2018-09-10 00:37:50 +02:00
Severin Glöckner
0ef3c0d5f9 MP Tombs of Kesorak: adjust comment, avoid darkening overlay 
A better image is needed, I remove the darkening overlay, because it would be
missleading when a Mage of Light affects this field.

[ci skip]
 2018-09-10 00:37:50 +02:00