Commit graph

26230 commits

Author SHA1 Message Date
Earth-Cake
29349b025a Dunefolk extra define (#4239)
* Added ENABLE_PARAGON

* Tweak experience from 180 to 220
2019-08-16 20:30:32 -05:00
nemaara
e97a4e4a96 LoW: remove unused unit 2019-08-16 20:50:02 -04:00
Pentarctagon
6efdd1e9ab Remove extra sprite on hex 48,17.
Fixes #4242
2019-08-16 16:49:36 -05:00
Severin Glöckner
4eb7fccaa0 HttT 20b – translator comments
Turn code comments into translator comments
[ci skip]
2019-08-16 20:59:50 +02:00
jostephd
0a6ed0ae4f
help: Add 'Why did I lose?' help topic (#4217)
* Draft 'Why did I lose?' help topic

* fixup! Draft 'Why did I lose?' help topic

Implement @beetlenaut's suggestions

* help: Change to title case for consistency with the rest of the section

* help: Explain the term 'foreknowledge'
2019-08-16 00:30:50 +00:00
Celtic Minstrel
ad98a23e16 Move the Wose sapling and Shaman to mainline
The ranged-halo images are unused, the elven/nature halo is used
for the Shaman's ranged attack instead.
2019-08-15 23:57:26 +02:00
Earth-Cake
9ccb04bdf0 Dunefolk bug fixes (#4235)
* Updated from missile to chakram in Zephyr
* Updated in Ringcaster's file from missile to chakram
* Removed portraits
* Fix Ranger's alignment
* Delete ringcaster.png
* Delete zephyr.png
* Updated Ringcaster and Zephyr
2019-08-16 05:47:22 +11:00
nemaara
cb5c2669ef Dune Sunderer: fix description typo 2019-08-14 22:19:08 -04:00
Pentarctagon
8f7eabeac8 Fix Dune Range advances_to value. 2019-08-14 21:08:24 -05:00
Gunter Labes
211f14176c
campaignd: Assign port 15015 to 1.15.x (#4228)
campaignd: Assign port 15015 to 1.15.x
2019-08-14 21:26:15 +02:00
Steve Cotton
b2cd1cf6c3 Handle unit overlays as modifications, allow [effect] to remove them
Possible fix for #4058, with the following logic:

* If non-empty, [unit]overlay= is handled by adding modifications
* unit::write will always output an empty overlay=
* The Lua API's get_units() will still provide the list of overlays
* [effect]apply_to=overlay can now remove as well as add overlays
* [remove_unit_overlay] is implemented with [effect]apply_to=overlay

Using [object]s with durations hasn't been tested, but expected effects:
* An expired add= followed by a non-expired remove= will simply cause the remove=
    to have no effect when std::remove(overlays_ ...) is called.
* A remove= followed by [remove_unit_overlay] cause the [remove_unit_overlay] to be a no-op,
    and the overlay will reappear when the first remove= expires. This edge case is already
	documented as unsupported on the wiki.
2019-08-10 23:25:04 +02:00
josteph
08352d2ab4 theme: Add optional argument to REPLAY_THEME for the benefit of user-defined themes
See #4184
2019-08-10 20:09:36 +00:00
FranPrin
4819846910 Dunefolk faction rework by various people
Changelog provided by @ghype below. Additional credits at the end.
=================================================================================================

*Art*
Most of units were reworked - some more some less - but our goal was to make them fit for mainline all together.
If any changes are needed to any unit, then we gladly execute those. There have been months worth of progress
documented in the according art thread for this project.

Base Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49075
Extra Units: https://forums.wesnoth.org/viewtopic.php?f=9&t=49625

*Balance*
The main reason why this project started in the first place. Here as well we have all the progress for balancing
Dunefolk documented and all developers and users interested in this project and seemed to agree on the current
state of balance. Thats the reason why we will not enlist all the changes here. If there are any problems with
the balance, then we too are willing to provide alternatives that can be discussed either here or on forum.

Balance Thread: https://forums.wesnoth.org/viewtopic.php?f=15&t=49627

*Alignment*
The balance of this faction was based on the newly proposed liminal alignment which works as +0/+0/+25/+0/+0/+25
instead of the old -25/-25/+0/-25/-25/+0

*Weapon Portraits*
As Dunefolk features entirely new units, we found some weapon portraits that fits the attacks of certain units.
The portrait - called „blade-curved“ is a franken but a convincing one. As the current blow pipe for UtbS is a
franken as well, this new weapon portrait should good enough to be mainlined as well. If this request get’s denied,
then we are free to provide alternatives as well. It just fits very well the theme of exotic Naga weapon
craftsmanship without relying on the orcish theme. It used for the following two units:

Lv2 Naga Bladewhirler
Lv3 Naga Dervish

*Descriptions*
New unit concepts require changes and new units require entirely new descriptions. We enlisted all problems and
inconsistencies that resulted with the rework and provided either solutions for them or new descriptions. Yumi
already started doing them but for those who want to see the initial conflicts, here you can find all the problems
displayed:

Unit Descriptions: https://forums.wesnoth.org/viewtopic.php?f=32&t=49867#p642698

*Female Dunefolk Names*
With the introduction of female units to this faction, we would require female names as well. Apparently this was
already coded in mainline, but simple not used.

*Future Plans - Animations*
There are some recourses from past works that allow us to - more or less - easily animate most of Dunefolk units.
The animations range from idle to attack-only, while other units will be fully animated. Some of the units that
are harder to animate will first receive single attack/defend frames until animation concepts were agreed upon.
Our goal is to make Dunefolk as alive as possible.

*Future Plans - Theme, Sound FX*
Rather unimportant to most people but I am interested to add some new sound fx that can start with different hit/death
sounds or new weapon sounds for scimitars. Those are just example and I do not know what I will end up with. But I know
that I will compose a Dunefolk Theme at some point. Using your feedback, I am sure I can manage to create something that
fits the faction the best.

*Future Plans - Wyvern Rider*
This is the only unit is the only one that did not get touched or reworked. The wyvern on it self looks amazing an does
not need any rework but the rider does not really fit thematically anymore, not to mention the weapon is too oversized
and not the usual Wesnoth style. But I won’t touch this sprite until it actually will be needed, most likely - IF -
there is ever going to be a mainline Dunefolk campaign.

*Credits*
I don’t know how detailed you need this to be but here all contributors.
ghype, Hejnewar, Krogen, The_Gnat, Lordlewis, EarthCake, Tom_Of_Wesnoth

It is however important to mention that the amount of contributions of each varies a lot in different categories. I will
organise it a bit and you make use of this info how ever you want. The names are in order of the amount of work put in.

Art: ghype, The_Gnat, Lordlewis
Balance: Hejnewar, Krogen, ghype, The_Gnat
Descriptions: Tom_Of_Wesnoth, Hejnewar

Earthcake joined us in the end and helped us finishing this project by cleaning/finishing the codes and doing all the git
stuff together with The_Gnat. Although none of his work can be categorised in one of the three categories, he still deserves
to be credit in one way or another.

Thanks for your time and efforts.
2019-08-11 07:02:58 +11:00
josteph
bc90feedee statistics_dialog: Move a static tooltip from C++ to WML 2019-08-10 17:20:41 +00:00
josteph
14daf1c4f3 statistics_dialog: Clarify tooltip 2019-08-10 16:40:00 +00:00
josteph
0b0569457d help: Fix punctuation 2019-08-10 13:28:49 +00:00
nemaara
ef50f12be3 TSG S5: reduce difficulty 2019-08-08 22:20:07 -04:00
Charles Dang
80d3e93d2b Moved Leonard03 to Artwork and Graphics
[ci skip]
2019-08-08 05:20:27 +11:00
Severin Glöckner
b7234a48b2 help: use no pango markup
Pango support for the help has been reverted together with the help's GUI2 port.
[ci skip]
2019-08-04 22:21:46 +02:00
sigurdfdragon
d44a978d0b WoV: Update to match the 1.0.2 version on the 1.14 add-on server
Changes:
S01: Clarify & simplify objectives
S05: Give the player a warning about the sea serpents
S09: Ensure dialog is spoken by a drake
2019-08-03 14:16:45 -04:00
Steve Cotton
862e482895 Add a hint about not save-loading, and link to it from the "Back to ..." menu 2019-08-03 20:05:27 +02:00
Severin Glöckner
6e7eebfd23 SotA: use SotA textdomain in Lua part too 2019-08-03 07:11:34 +02:00
Steve Cotton
0f948f793c Refactoring [movetype] to deprecate the "flies" key, use "flying" instead
This makes [movetype] consistent with [unit]. The code in movetype.cpp is used
for handling both of those tags and so already had support for "flying" in the
merge() and write() functions.

This shouldn't be backported to 1.14. For this reason, it also includes
handling the C++ todos to use C++14's std::make_unique.
2019-08-01 18:58:56 +02:00
sigurdfdragon
23dd6661b5 DM: Use [leader] tag for side 1 throughout 2019-07-29 17:10:34 -04:00
sigurdfdragon
887dd1c586 DM: Expand use of wmllint validate to silence warnings 2019-07-29 17:10:34 -04:00
sigurdfdragon
31e1a21398 DM S12: Allow respective recruits when the loyalists & mages join Delfador 2019-07-29 17:10:33 -04:00
sigurdfdragon
02a68df071 DM S08: Show carryover report to make it clear the scenario has ended 2019-07-29 17:10:33 -04:00
sigurdfdragon
924287be15 DM S09 & 10: Increase difficulty 2019-07-29 17:10:33 -04:00
Praveen Batra
a3a57cbff6 EI S15: Fix typo 2019-07-29 17:41:57 +11:00
Steve Cotton
358f564301 Add unit tests for movement and vision costs
Includes changing the terrain costs, and aliased terrains.

Can be cleanly cherry-picked to 1.14.
2019-07-22 17:18:20 +02:00
nemaara
3818582149 TSG: fix storytext typo 2019-07-20 15:57:57 -04:00
loonycyborg
4ed39d7ee7 pot-update and regenerate doc files
as requested in issue #4173
2019-07-18 16:10:13 +03:00
Pentarctagon
95286cb49f Command line --preprocess missing some macros.
Command line --preprocess doesn't process macros in data/core/units.cfg.

Fixes #4152.
2019-07-16 19:15:29 -05:00
Steve Cotton
66f0924c8b SoF S2: Dialogue fixes (no dwarves outside, repeated comment about side entrances)
If all the dwarves are inside when the gate closes, don't say there were some lost outside.

Make the dialogue about the north and south side entrances only trigger once.
2019-07-15 20:51:07 +02:00
nemaara
ab4f8aa4f4 DiD S4: reduce difficulty on easier modes 2019-07-14 23:05:52 -04: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
Pentarctagon
0bd3682b66 Fixes incorrect handling of Xue transitions.
The transitions from the Xue terrain to the Xoc / Xos / Xoi / Xom terrains were displayed incorrectly.

Fixes #4154.
2019-07-13 05:14:44 +11:00
mattsc
e148d25d2a ExpAI grab villages CA: fix enemy distance rating under fog
ai_helper.get_closest_enemy() returns math.huge for the enemy distance if no enemy is visible to the AI. This fixes #4157.
2019-07-10 08:07:11 -07:00
sigurdfdragon
6e27a3ffbd WoV: Update to match the 1.0.1 version on the 1.14 add-on server
Changes:
S01: Objectives clarified.
S02: Objectives clarified.
S02: Up turn limit & enemy income so leveling objective is easier.
S03: Replace hard-coding of recruit with dynamic storing.
S05: Lower difficulty.
S06: Use all 6 permutations for temple contents.
S08: Fix OOS in replay of the scenario.
Misc: A few dialog, grammar and punctuation fixes.
2019-07-09 23:03:54 -04:00
josteph
6220f7106e statistics_dialog: Show the actual (empirical) CTH. 2019-07-09 16:51:05 +00:00
josteph
84c6467c56 statistics_dialog: Rename column id and struct member after last commit 2019-07-09 16:45:13 +00:00
josteph
a3efd28010 statistics_dialog: Change the hits table format to "+2% (1703.2 + 42) | 93.6"
This is a mix of "Option B" and "Option C" from
https://forums.wesnoth.org/viewtopic.php?f=12&t=49785&p=643513#p643495
2019-07-09 16:42:05 +00:00
josteph
7b78a8c019 statistics_dialog: Change the hits table format to "1703.2 + 42 | 93.6"
This is "Option B" from
https://forums.wesnoth.org/viewtopic.php?f=12&t=49785&p=643513#p643495
2019-07-09 16:33:48 +00:00
Nils Kneuper
9623e79e20 updated Portuguese (Brazil) translation 2019-07-06 14:20:16 +02:00
sigurdfdragon
6e2fbc7b1a Schema: Fix travis error by allowing additional keys in two situations
1. Allow carryover_percentage & carryover_add with
victory_when_enemies_defeated=no. Code from newfrenchy83

2. Allow use of current_time in [time_area].
2019-07-02 23:19:38 -04:00
doofus-01
d53ff6568c adding spider soulless variation 2019-07-01 15:10:54 +11:00
doofus-01
945e3a0a7b new spider variation for WC 2019-07-01 15:10:54 +11:00
nemaara
e1ca7b11c6 TSG S5: add narrator warning when siding with bandits 2019-06-28 22:26:17 -04:00
Charles Dang
ff9b8d7734 Tutorial S1: fixed typo
[ci skip]
2019-06-25 10:13:32 +11:00
sigurdfdragon
670488d53e DM S08: Move location of key to fix travis schema validation error 2019-06-23 23:15:45 -04:00