76984 Commits

Author SHA1 Message Date
Pentarctagon
ca7ab8ec8a Resend the announcements and server info text when rejoining the lobby.
Fixes #5095
2020-09-01 00:55:11 -05:00
Steve Cotton
67dfb4f23d
Refactor text.cpp's buffer alloc, throw instead of crashing if it needs more than 2GB (#5042)
The limit is arbitrary, and 2 gigabytes is very large. The new TODO comment
in the .cpp file gives a possible future refactor which would reduce the limit.

The old early-return for surface_buffer_.empty() moves upwards and changes to
testing for zeros before the allocation; it now also acts as a guard for
division by zero in the (height > int::max() / stride) test.

The loop around from_cairo_format() relied on stride being exactly
sizeof(uint32_t) * width, an assumption which would break if
cairo_format_stride_for_width added padding.
2020-09-01 04:17:49 +02:00
Steve Cotton
fbfda841bb Changelog; update for #5110 and add some placeholder headings
The placeholders will hopefully avoid merge conflicts when changelog
entries are included in PRs.

[ci-skip]
2020-08-31 19:44:25 +02:00
Severin Glöckner
7136e3cfc3 NR: fix errors
- Typo found by travis
- Duplicated code
2020-08-31 16:20:07 +02:00
gfgtdf
ae3eea28f8
fix unit_type::variation_id_ not set 2020-08-31 14:34:46 +02:00
Severin Glöckner
9cda7e7353 MP Survivals: remove quick trait for slow leaders
In PvE the player doesn't need this bonus, like he doesn't have it in campaigns either.

[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
8b26a1b9d2 NR: make heroes unrenamable
[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
723f24f4ab NR: add comments for scenarios and characters
[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
4aefaa84c9 NR: Tallin loses his traits
Three traits is one too much. Normally leaders don't have any.

[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
b03d441240 NR misc
[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
c0f8d3618a NR 10 & 11: hide sides until their leader arrives (if ever)
[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
d1b00b1ce8 NR: handle dead loyals
In place of death loyals other units are recalled.
Best level 2 ones, in difference to level 3 ones they need still xp.

[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
f3727e98ff NR: better supporter death handler
[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
71f77c5263 NR 13: remove duplicate recall
happened in prestart already

[ci skip]
2020-08-30 22:28:44 +02:00
Severin Glöckner
f2d616498b NR 09: increase gold carryover to 80%
This scenario is not guaranteed to take place.
If the player wouldn't play it, he wouldn't lose 60% of his gold.

The enemies give up to 248 XP, but the players units mightt also
have already reached Level 3. (There's no keep, only preselected loyals)

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
f2b6b089ee NR 09: unhide side
[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
b78087dfad NR 07: fix 2nd objectives not showing
They were supposed to be unlocked by a die event,
but it never happened because [store_unit]kill=yes
removed the unit in it's last breath event.

Refactor the handling of that.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
59bf5d0d82 NR S5: avoid three traits unit
Abhai is a loyal who has absoutely no relevance in path A.
Remove his third trait, because more than two traits is not UI-friendly.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
a7cffd78c2 NR 10: clean up code
- avoid duplicated text
- add a comment explaining eryssa_hostile variable

using boolean_equals instead of equals is difficult here

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
514205b9e7 Nr 09: handle debug mode
Arriving there without Eryssa is normally not possible,
but with ":n" one will.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
dc3934acd9 NR 08: handle a corner case
Let the player advance to S9 as well if he defeated all enemies.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
a01fc14dd6 NR: move objectives to prestart
[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
7a24276f29 NR 07: use new castle terrain
The outside variant of the dwarvish castle.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
408e18c297 TSG: move objectives to prestart
In some cases, players can see the obectives already earlier
by pressing CTRL + J. E.g. when the game scrolls to a unit
for a [message]. If the objectives aren't set at that time,
then the default objectives are displayed (kill all enemy leaders).

Because the code uses boolean_equals instead of equals it's not
anymore dependent of other variables being set beforehand.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
3278201971 TSG: remove explicit overlay
Done implicit by loyal trait now.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
96dc05ae75 TSG 8b: add a micro AI
Chocobones arrive ahead of all other units,
this brings them a bit more in sync with the other forces.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
3b2cb8849e ANL: recommend lowering starting gold
closes #1149

The difficulty slider is in fact the gold setting.
bob_the_mighty suggest setting it to 75, though for new players 100 might be better.

I think the best we can get from this situation is to have it by default on 100,
but to tell players about changing the gold setting if the scenario becomes too easy for them.

[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
662938bd73 TSG 6a: make human guard non-loyal too
Side-effect of this change: It's gender is now random.
Handling that too.

(income was already increased by former commit)
[ci skip]
2020-08-30 22:28:43 +02:00
Severin Glöckner
c55da47912 TSG 6a: increase upkeep istead of using loyal guardians
[ci skip]
2020-08-30 22:28:42 +02:00
Severin Glöckner
9542a296af TSG 8b: remove loyal from enemies
For side 3: additional upkeep costs are
1 / 2 / 4
Try to compensate by increasing upkeep by
0 / 0 / 1

For side 2: additional upkeep costs are
2 / 5 / 6
Try to compensate by increasing upkeep by
0 / 2 / 2

[ci skip]
2020-08-30 22:28:42 +02:00
Severin Glöckner
3465c662c0 TSG 7b: remove loyals
The two guardians can directly be compensated by increasing income.

For the starting units, additional costs for upkeep are:
5 / 8 / 12
Try to compensate it by increasing income by
1 / 2 / 3

And apply the turn 3 bonus at game start.
(Income is first given in turn 2, so it effectively gives only +5 gold)

[ci skip]
2020-08-30 22:28:42 +02:00
Severin Glöckner
e45cfb0ed9 TSG 7b: use [store_gold] instead of [store_side]
[ci skip]
2020-08-30 22:28:42 +02:00
Steve Cotton
7b1d5bc19b
Help browser: fix behavior of clicking on icons of terrain sections (#5110)
This commit uses the UI's calculated indent for the UI's event handling, and
removes section::level. The code generating the help sections still has its own
"level", which is used to detect excessive recursion.

This fixes a UI quirk that I only noticed while working out what section::level
was for, while considering the subtopics needed for implementing a taxonomy
system. The help browser calculates indentation for its tree-view based on the
data tree given to it. However, the logic for deciding whether a mouse-click
was on the icon or the text used section::level, rather than any value
calculated in the UI classes. While section::level was often the correct
number, it was wrong for the terrain types' sections.
2020-08-30 17:19:21 +02:00
Nils Kneuper
214c5fab5f revert accidential changes to credits entry for shadwm 2020-08-30 14:17:49 +02:00
Nils Kneuper
e3a7fc738b updated Chinese (Traditional) translation
fixing "binary symbol" error in file by removing translations for 2 strings
newline fix in "wc"
2020-08-30 13:41:26 +02:00
Nils Kneuper
6958923609 updated Chinese (Simplified) translation 2020-08-30 13:37:55 +02:00
Nils Kneuper
75a30a10af updated Turkish translation 2020-08-30 13:34:52 +02:00
Nils Kneuper
8ed9b41951 updated Russian translation (just newline fix in header) 2020-08-30 13:33:10 +02:00
Nils Kneuper
daee1b32eb updated Italian translation (no change, just newline fix in header) 2020-08-30 13:31:27 +02:00
Nils Kneuper
f542b6653d updated Spanish translation 2020-08-30 13:30:01 +02:00
Nils Kneuper
e9a7d5f630 updated Portuguese (Brazil) translation 2020-08-30 13:22:54 +02:00
Nils Kneuper
f2371e2b23 updated British English translation 2020-08-30 13:20:35 +02:00
Martin Hrubý (hrubymar10)
d067f1de0f Remove hairline fonts variants in order to fix pango's thin font issue on macOS #5009 2020-08-29 09:51:23 -05:00
gfgtdf
1423dfdba4
fix unit_type image not set in the editor. 2020-08-28 16:47:30 +02:00
gfgtdf
fa75ad5f76
remove outdated comment 2020-08-28 12:00:27 +02:00
gfgtdf
d1f56287bd
fix saved_game::get_scenario_id for replay saves 2020-08-28 11:48:09 +02:00
Martin Hrubý (hrubymar10)
8ba4e4fca9
Fix "refusing to merge unrelated histories" error 2020-08-28 10:10:47 +02:00
Iris Morelle
9e5326aa1d WC: First pot update
Because the first pot update automatically generates translations for
the English locales from the source, en@shaw and en_GB get automatically
populated with msgstrs identical to their respective msgids. As far as I
understand from the discussions around the inclusion of WoV, this is
expected behaviour for en_GB, but undesirable for en@shaw (different
language script), so I've manually blanked out the latter in this
commit.

(Allowing CI builds for this one to ensure translations can be built
before merging the PR.)
2020-08-27 22:40:06 -04:00
Iris Morelle
ee37e9fdd4 WC: Set up wesnoth-wc textdomain
This creates an empty template catalogue so SCons will generate the
template catalogue and the translation catalogues on a subsequent
pot-update (if there isn't a pot file at all SCons won't attempt to do
anything with the textdomain at all).

[ci skip]
2020-08-27 22:40:06 -04:00
Iris Morelle
1389719887 WC: Use a mainline-style textdomain
This changes the campaign's textdomain from wesnoth-World_Conquest to
wesnoth-wc in WML and Lua code files.

[ci skip]
2020-08-27 22:40:06 -04:00