24317 Commits

Author SHA1 Message Date
Severin Glöckner
ae17a8d38e MP: add alot of xxx_lock setting
In these cases they have only in limited situations an effect:
In normal play the sides are hidden, if not using map settings they are ignored,
so this mostly only has an effect if starting the game in debug mode an using map
settings.

Other ones revert acidental changes caused by force_lock_settings.
fore_lock_settings does not only disallow the player to modify the settings,
but does also serve as default value for all the other lock settings.
2018-02-05 20:32:26 +01:00
Charles Dang
c2ead6e56b Addons Manager: updated dialog title
[ci skip]
2018-02-05 22:47:12 +11:00
Charles Dang
4f68df28ff ANL: added team and enemy leader names (fixes #2442)
[ci skip]

Also made side 9 hidden. Sevu/shiki's nicknames used with permission.
2018-02-05 16:44:55 +11:00
Charles Dang
4c2cddaa9e Surrender Quit: clearer button/message text
[ci skip]
2018-02-05 16:35:02 +11:00
Severin Glöckner
12039f3bfc MP: added some keys to scenarios with AI sides
Namely disallow_observers and user_team_name which is displayed in debug mode

The prisoners in ANL are now allied with the player

[ci skip]
2018-02-05 00:57:28 +01:00
Celtic Minstrel
d106dfb750
Add a very basic race description for the dunefolk
Eventually this will be expanded into a more proper description
2018-02-04 18:38:27 -05:00
kallaballa
78dff47bd3 Implemented dropout to observer on surrender 2018-02-05 00:35:35 +01:00
kallaballa
4f1a7a9faa Introduce surrender hotkey 2018-02-05 00:35:35 +01:00
kallaballa
024b2e7e9b Implement a surrender dialog
This records a surrender command in replays and quits the game.
2018-02-05 00:35:35 +01:00
Severin Glöckner
9cdd0242d5 ANL: disallow observers for AI sides
[ci skip]
2018-02-05 00:05:22 +01:00
Severin Glöckner
e260fe9543 6p Team Survival: fix terrain mask
This one has been overlooked in an earlier change

(closes #2440)

[ci skip]
2018-02-04 23:02:30 +01:00
ln-zookeeper
c7bbb809b8 Changed resistances and hitpoints for Tentacle of the Deep
Based on forum discussion: https://forums.wesnoth.org/viewtopic.php?t=46922
2018-02-04 21:30:16 +02:00
Charles Dang
36bd8dba8a Multiplayer: wmlindent run
[ci skip]
2018-02-05 04:00:09 +11:00
Charles Dang
1b79cb65f2 ANL: removed a bunch of duplicate allow_player= keys
[ci skip]
2018-02-05 04:00:08 +11:00
Severin Glöckner
02c79cf176 Dark Forecast: lock team selection
[ci skip]
2018-02-04 16:27:17 +01:00
Sofartin
3431976cbd Update about.cfg
Add my real name
2018-02-04 17:36:41 +11:00
Celtic Minstrel
61aad57dbd Add new contributors to credits
@stevecotton @hrubymar10 @ilyapopov @fluffbeast
@singalen @kallaballa @SoapGentoo

Also tweak entries for @vgaming @sevu
2018-02-03 23:08:35 -05:00
Severin Glöckner
762ec56e06 Dark Forcast: reanable solo playmode
force_lock_settings did also force controller_lock=yes

[ci skip]
2018-02-04 02:40:21 +01:00
Charles Dang
419568dad5 Tweaked Elvish Outrider description (closes #2429)
[ci skip]

Original suggestion raised by @catagent101 (see PR above), tweaks by myself and @jostephd.
2018-02-04 11:50:57 +11:00
pentarctagon
6976091626 Renames the Dunefolk(formerly Khalifate) units based on forum discussions.
This commit actually changes the contents of the unit files, and adds deprecated.cfg for all the old IDs.
2018-02-04 11:46:50 +11:00
pentarctagon
dc21c42683 Renames the Dunefolk(formerly Khalifate) units based on forum discussions.
See this thread, along with a few linked within:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47704

The purpose of this is both to:
a) Make the unit names more descriptive, so new players especially will have an easier time learning them and knowing what they do.
b) Make them eligible for translation, like the units of other factions are.

This commit only renames the files, along with the faction/AoH faction and wmllint.
2018-02-04 11:46:50 +11:00
ln-zookeeper
461e2aab26 UtBS: Disabled choice of old elf units, although old saves still work 2018-02-03 21:12:54 +02:00
sigurdfdragon
264167edcf Macros: Fixup DEPRECATE_ACTION_MACRO 2018-02-03 12:39:03 -05:00
Charles Dang
ae3300688d HttT S4: minor grammar fix (fixes #2435)
[ci skip]
2018-02-04 02:10:01 +11:00
josteph
b802d85a92 HttT S18: Rearrange the merman's message. 2018-02-04 01:00:33 +11:00
josteph
e1d192becf HttT: Fix English grammar and punctuation 2018-02-04 01:00:33 +11:00
Steve Cotton
bf754a8a8e tips: add tips that villages can be lures, and losses are necessary
From oaq's post https://forums.wesnoth.org/viewtopic.php?f=3&t=47702

Kai Laudiss is Kai Krellis' dad, and the quote would be 3 years
before Dead Water.
2018-02-04 00:24:41 +11:00
josteph
a83a7cabda core: Fix grammar in Lich description. 2018-02-03 14:04:42 +11:00
josteph
4ac110b8b5 core: Fix grammar and punctuation
Split from #2390 at @GregoryLundberg's request.
2018-02-03 14:04:42 +11:00
sigurdfdragon
23dddd88b9 SotA: Call the passengers what they are
Names are only seen in S04 in the sidebar.
2018-02-02 18:23:52 -05:00
ancestral
2598497c74 Changed text in tutorial to make it easier to understand how the tutorial works and better understand game topics
[ci skip]

* Expanded the text to explain how to read '5×4' and what it means
* Changed the wording slightly to emphasize the order of damage times attacks
* Added a message explaining the format of the tutorial
* Separated some long messages into multiple messages instead
* Removed some unnecessary wording to keep things simpler
* Changed some spelled numbers to regular numerals when referring to game currencies (such as gold and income)
* Minor changes to grammar
2018-02-02 16:14:52 +11:00
Charles Dang
c8abb8d5d9 Add formula= option to [set_variable] (change by @celticminstrel)
[ci skip]
2018-02-02 15:40:44 +11:00
Charles Dang
eee4b4e147 NR S2: change victory condition to prevent unwinnable scenario (fixes #2352)
[ci skip]

Previously, the scenario only ended if you triggered the sighted Hamel event with Tallin.
If you triggered it with any other unit, you wouldn't progress since you can't fire a
sighted event on a unit already visible.

I've changed the condition to move within five hexes of Hamel with Tallin. Still possible
this might result in an unwinnable scenario, but that's much less likely than with what
was there before.
2018-02-02 06:49:31 +11:00
sigurdfdragon
5bc09da48d Units: A more positive description for the Naffat 2018-01-31 14:05:10 -05:00
sigurdfdragon
57f06ab443 Units: Remove unnecessary religious references from Dunefolk units 2018-01-31 14:03:55 -05:00
sigurdfdragon
b0e0a75138 Units: Generalize Falcon description by removing faction reference 2018-01-31 14:01:21 -05:00
sigurdfdragon
7a6c39380e SotA S04: Update files to match faction renaming 2018-01-29 19:33:07 -05:00
sigurdfdragon
e288be9302 MP: Simplify Dunefolk faction and era description
Other factions lack magic users, so mentioning here it is superfluous
information. Also associated with the previous identity of the faction.
2018-01-30 10:16:27 +11:00
Wedge009
0925aa7e0c Align default quit hot-key with conventions (fixes #2397)
Switch quit to title-screen from Ctrl+Q to Ctrl+W (OSX already uses Cmd+W) and quit-to-desktop from Ctrl+Shift+Q to Ctrl+Q.
2018-01-26 14:12:03 +11:00
Charles Dang
671cebe035 TSG: tweak description slightly
[ci skip]
2018-01-24 12:00:14 +11:00
vgaming
728204665c fix code problems found by luacheck (#2388)
fix code problems found by luacheck

Second iteration of the process, now handling data/lua/wml/*.lua

luacheck command used to find bugs:
  luacheck ./*.lua --globals wesnoth wml --codes --ignore 542 213
Additionally, error code 211 (unused variables) could be ignored,
as using underscore convention `_` is controversial in
wesnoth ( see https://github.com/wesnoth/wesnoth/pull/2380#discussion_r162519341 )

Actual bugs found:
* items.lua, access of global `write_name` instead of local `cfg.write_name`
* kill.lua, typo `primary_unit` -> `primary`
* bad code style: global `i` instead of local `i`
  (would conflict with 3-rd party code if it would use global `i`, too)
2018-01-23 13:35:04 -06:00
Charles Dang
e34341145f Campaign Selection: removed excess borders around sort buttons
[ci skip]
2018-01-23 17:12:47 +11:00
V N
f4e9ac3f8f remove executable flag from images 2018-01-22 23:11:14 +11:00
Charles Dang
da3a0ed7cf Added [lua] conditional tag
Also made conditions fail if they encountered a syntax or runtime error. This seems the
more logical behavior than passing.

WML conditional tags were split into their own Lua file. The one in lua/wml/object.lua
relies on local variables so was left there.
2018-01-22 23:03:16 +11:00
pentarctagon
1192b0f1e5 Rename the Khalid's shield bash to pommel strike.
The sprite has two swords, not a shield.
2018-01-22 12:04:42 +11:00
josteph
a2be9c8f86 Hide 'Rails' and 'Fake Shroud' terrains in the unit help pages when impassable.
Fixes #1399. Supersedes #536.
2018-01-22 11:54:09 +11:00
vgaming
8ba6e5f40e fix code problems found by luacheck (#2380)
actual bugs found:
* backwards_compatibility.lua (undeclared global "helper")
* core.lua (use of undeclared global "helper")
* wml_tags.transform_unit had wrong code to deal with recall_cost
* wrong variable name in cave_map_generator
2018-01-20 23:05:58 -05:00
pentarctagon
5b31b87f6a MP: Renames the Khalifate to Dunefolk.
Part of an effort to make the faction better fit into Wesnoth. See:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47643
https://forums.wesnoth.org/viewtopic.php?f=12&t=47703
2018-01-19 17:28:40 -05:00
Gregory A Lundberg
b5f76eff79
Bump copyright to 2018 2018-01-19 00:02:20 -06:00
Charles Dang
fa6df6d664 Core: wmlindent run
[ci skip]
2018-01-19 12:34:36 +11:00