Commit graph

24750 commits

Author SHA1 Message Date
Andras Szell
e3a95cc039 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.
2018-07-15 16:29:46 +02:00
josteph
f4aa5ac66a THoT S6: Highlight the hut mentioned in dialog.
[ci skip]
2018-07-14 21:41:58 +02:00
josteph
96fffa2182 THoT S3: Marth-Tak faces east before hailing Aiglondur.
[ci skip]
2018-07-14 21:41:58 +02:00
josteph
fbd08b006e THoT S4: Let the enemy recruit level 2 units on normal difficulty.
[ci skip]
2018-07-14 21:41:58 +02:00
Severin Glöckner
3c57546e89 THoT S6: improve mage appearance event
- is now less odd if the event is triggered from the map borders
- works with debug mode

[ci skip]
2018-07-14 21:39:27 +02:00
sigurdfdragon
d0931ae9cf DM: Fixup 370e50c 2018-07-14 13:35:21 -04:00
Jyrki Vesterinen
d11d8ec8e1 Help: Hide "Lit Stone Wall" terrain (#2966)
The terrain was deprecated in commit 64493b256f.
@Vultraz has said in comments of #2966 that deprecated terrains aren't
supposed to be shown in help.

Fixes #2966.

[ci skip]
2018-07-14 17:00:24 +03:00
DisherProject
d5e22a32c3 DM: add some TODOs 2018-07-13 20:28:23 -04:00
DisherProject
d0a369c65d DM S21: Add some visual effects
1) Give elves orcish bows
2) Animate the first two riders when they're spawned, so it
looks like they've been recruited
2018-07-13 20:28:23 -04:00
DisherProject
370e50c5a6 DM utils/sides.cfg: follow up FIXME 2018-07-13 20:28:23 -04:00
DisherProject
289af5ba1b DM S14: follow up TODO 2018-07-13 20:28:23 -04:00
DisherProject
4a9c6610d4 DM S08: Remove some (apparently) unused stuff 2018-07-13 20:28:23 -04:00
Severin Glöckner
5f7e8bd749 UtBS: change weapon name of the corrupted elf
to match the one of the Champion, and to match his sprite.

closes #3323
[ci skip]
2018-07-11 15:58:22 +02:00
Severin Glöckner
591b1cd68e TSG, end of campaign: Use linger mode to allow to review the current scenario.
Only after pressing the 'End Scenario' button the epilogue will be shown.

closes #3058
[ci skip]
2018-07-11 15:44:49 +02:00
sigurdfdragon
831e3e86d8 DM: Fix #3277
Make heroes have no upkeep, and remove hero status from character that
didn't need it. Minor touch ups.
2018-07-10 12:44:16 -04:00
Severin Glöckner
d4a6df034e TSG S4: improve magican's movement behaviour
- the movement restriction won't be applied if the magican is not
  in the caslte (due to the one exception).
- As for the exception, it's not enough if the magican has only one
  unit left, but this unit has to be on the caslte.

To sum up, the magican never leaves the castle, unless he has
(before recruiting) one last unit which is on the castle. (Maybe
from last turn's recruiting).
In case he left the castle, he goes back next to the keep next turn,
as leaders usually do.

[ci skip]
2018-07-10 01:59:58 +02:00
Iris Morelle
de8d468b14 Fix excessive dots in ellipses in several mainline scenarios
[ci skip]
2018-07-08 04:49:37 -04:00
Iris Morelle
b8b403185e gui2/preferences: Use curly quotes in quoted text in tooltips
[ci skip]
2018-07-08 04:49:33 -04:00
josteph
29e814d8f4 THoT S7: Select Darchas so the narrator's reference to him isn't dangling. 2018-07-08 15:53:40 +11:00
Severin Glöckner
7ea951d5b9 TSG 04: Better implementation to protect the magican
The player can all the time view the stats of any unit in the sidebar. This allowed to
see that he doesn't attack because he has only one move. There is no way to see the
movement costs directly, and as long as they are higher than the max_moves it's not
possible to figure out that this is not AI behavior but a game restriction.

Additionally, as the player has to kill both leaders to continue, try to not let the
player camp around the castle for the rest of the game, by giving the leader a possiblity
to attack if he recruited last turn a unit.

[ci skip]
2018-07-06 22:33:56 +02:00
Severin Glöckner
5bd6221c44 slight text edits
- missing dots in some MP strings
- superfluous space in some MP strings
-ran wmlinden on UtBS scenarios

[ci skip]
2018-07-05 08:38:26 +02:00
Severin Glöckner
2a5ea00ad0 Replace deprecated macro with terrain code in MP: Tombs of Kesorak
[ci skip]
2018-07-05 08:38:26 +02:00
Severin Glöckner
f5890c10a2 Change campfire timezones in MP: Tombs of Kesorak
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

For the always dark one exists no immage, uses one from after the fall,
with slightly adjusted ToD shifting as it looked to weak.

The 1 hex small campfires look best with dusk.

part of #3056

[ci skip]
2018-07-05 08:38:26 +02:00
Severin Glöckner
f2a1acd97e Change Campfire timezones in TSG S8b
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is an visual change, no gameplay changes included.

Due to the lack of a save I could not view the result myself,
I chose the ToD shifting colors based on the other scenarios.

part of #3056

[ci skip]
2018-07-05 08:38:26 +02:00
Severin Glöckner
c7d8d23256 Change campfire timezones in UtBS S3
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.

part of #3056

[ci skip]
2018-07-05 08:38:26 +02:00
josteph
045d331da8 WML: Don't add a \n before condition=lose objectives if there are no objectives listed before them. 2018-07-05 12:46:44 +11:00
Choicerer
f50b644c30 Fixes broken tooltips for the unit_side flag and the unit name. (#3315)
Fixes #3306
2018-07-05 12:46:42 +11:00
Severin Glöckner
785f91065b NR: Disallow lvl 0 recruits after scenario 5.
Don't bother carrying them through the whole campaign.
This scenario seems like a good time, because there begins a new episide in the story
and all the level 1 advancement are available now too.

closes #3074

[ci skip]
2018-07-05 02:04:23 +02:00
sigurdfdragon
d22c1746e8 SotA S21: Set facing for naga appearance 2018-07-04 18:06:57 -04:00
sigurdfdragon
2f710f83bf SotA S11 & 21: Fix #3294
Adjust units to have appropriate gender for story reasons.
2018-07-04 17:13:15 -04:00
sigurdfdragon
fd43d8454c SotA S16: Simplify dialog to fix #3291 2018-07-04 13:52:48 -04:00
Severin Glöckner
a62264412d DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives

[ci skip]
2018-07-04 15:45:39 +02:00
Severin Glöckner
090ad3140f TSG S4: prevent leader of the undeads from suiciding
This is generally a problem with most leaders, but here it's worse.

Also changed his keep to the ruined version.
(Not the ajdacent castle tiles as it looks better that way.)

[ci skip]
2018-07-04 15:45:39 +02:00
Severin Glöckner
5dc80e7428 TSG S5: fix an unlikely scenario outcome
In case the player goes south and runs away fromt he bandits, and defeats
the lich first, then the choice to side or not with the bandits would
happen very late.
In case he allied with them and the other undead leader still lived, he
could end the scenario still by triggering "enemies defeated". If they were
already defeated, the scenario could not end anymore. Furthermore, the
storytext doesn't make sense anymore, at least the ending dilogue would
miss,
In case of siding with the elves one can still win by defeating Urza Afalas.
and the story still makes sense,

To solve this, in this special situation the player has no choice anymore,
the path of the elves is chosen.

(the diff may be hard to read; a good part has been wrappend with an [if])

[ci skip]
2018-07-03 04:12:51 +02:00
josteph
ea62caadf0 TSG S05: Merge all instances of [objectives].
Suggested by @sevu.
2018-07-03 00:48:34 +02:00
josteph
f4ba5cbcb8 TSG S05: Hide completed objectives.
Fixes #3031.
2018-07-03 00:48:34 +02:00
Charles Dang
c39aa72f56 Fixup 7807694
[ci skip]
2018-07-03 06:58:31 +11:00
Charles Dang
78076941a0 DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]
2018-07-03 06:48:57 +11:00
gfgtdf
5ba389111e allow non hosts to change factions later.
previously players had to leave an rejoin the game to change their faction.
this was most annoying in coop games where you want might want to choose
your faction in consultation with the other players. Also you previously could
not even checkout the different available factions again after you joined
the game.
2018-06-30 01:07:30 +02:00
gfgtdf
26b5ca55e4 disallow attacking with disabled attacks via [do_command]
this fixes some rare cheats in mp.
2018-06-30 01:06:59 +02:00
pentarctagon
649fdc9a62 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.
2018-06-29 15:35:22 -05:00
Charles Dang
98ddc311fc Preferences: added a mention of the in-game accelerated speed toggle
[ci skip]
2018-06-29 18:21:55 +11:00
Charles Dang
10e663ed6c Preferences: shifted the Skip AI Moves button around
[ci skip]

Makes it clear it's not intrinsically tied to the Accelerated Speed factor.
2018-06-29 18:21:55 +11:00
Charles Dang
cb7a679142 Preferences Dialog: drop characters_per_line from hotkey list
[ci skip]

For some reason, this made the entire page stack thinner than it should be. I have
no idea why, and I'm not sure wrap= here instead does anything (namely, wrap if it
gets too long), but it's better than what was happening before.
2018-06-29 18:10:02 +11:00
Charles Dang
226a7f7d02 Removed preference to disable halos
There's really no reason to have this anymore. It was (AFAIK) introduced years ago
as a performance-saving measure, then was moved to Advanced Preferences in 1.13 since
modern PCs mostly have no issues. With accelerated rendering, there's even less of a
reason to have this.
2018-06-29 15:07:48 +11:00
Gunter Labes
51b5549bd2 Fix line endings
[ci skip]
2018-06-28 22:02:17 +02:00
Iris Morelle
ceca46c553 wmllint: Exit with non-zero status after failing to read any directories
[ci skip]
2018-06-28 00:32:18 -04:00
Iris Morelle
fbc9ac5a52 wmllint: Skip inexistent paths passed in the command line
Fixes issue #3286.

[ci skip]
2018-06-28 00:27:28 -04:00
Charles Dang
0cbbed2832 Updated a credits entry regarding the Dunefolk
[ci skip]
2018-06-28 10:42:44 +11:00
Iris Morelle
c92e167a14 wmllint: Leave gzipped binary files alone, they're not safe for consumption
Fixes wmllint crashing like this upon encountering a gzip tarball in an
add-on:

  Traceback (most recent call last):
    File "/home/shadowm/bin/wmllint-1.14", line 3188, in <module>
      for fn in allcfgfiles(directory):
    File "/home/shadowm/bin/wmllint-1.14", line 2944, in allcfgfiles
      if interesting(os.path.join(root, name)):
    File "/home/shadowm/bin/wmllint-1.14", line 2927, in interesting
      return fn.endswith(".cfg") or is_map(fn) or issave(fn)
    File "/home/shadowm/src/wesnoth-1.14/data/tools/wesnoth/wmltools3.py", line 270, in issave
      return firstline.startswith("label=")
  TypeError: startswith first arg must be bytes or a tuple of bytes, not str

[ci skip]
2018-06-27 03:42:58 -04:00