Clean up and expand ranges compat layer

We no longer use the GUI2 draw events. We should implement the appropriate interface provided by top_level_drawable instead. DRAW is still a valid event for now, but would probably be removed in the future.

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks:          '-*,modernize-use-nullptr,performance-unnecessary-value-param'
+WarningsAsErrors: true
+...

.github/workflows/ci-main.yml

@@ -90,10 +90,15 @@ jobs:
                 scons "$@" build="$CFG" ctool="$CC" cxxtool="$CXX" cxx_std="$CXX_STD" \
                   extra_flags_config="-pipe" forum_user_handler=true \
                   nls=false enable_lto="$LTO" system_lua="$SYS_LUA" force_color=true \
-                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true
+                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true compile_db=true
               }
               build strict=true wesnoth boost_unit_tests
 
+              build cdb
+              # disable all warnings since we have coverage on them in a standard build, and clang-tidy
+              # triggers false positive compiler warnings that clang itself won't
+              run-clang-tidy -quiet -use-color -j 2 -extra-arg="-w" -warnings-as-errors='*' '^(?!.*src/modules/|.*build/)'
+
               apt remove -y -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev
 
               build strict=false wesnothd campaignd
@@ -104,7 +109,7 @@ jobs:
                 cmake "$@" -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
                   -DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_MYSQL=true \
                   -DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 \
-                  -DENABLE_SYSTEM_LUA="$SYS_LUA" .
+                  -DENABLE_SYSTEM_LUA="$SYS_LUA -DCLANG_TIDY=true" .
               }
               rm -R /usr/local/lib/cmake
               rm /usr/local/lib/libboost*
@@ -292,7 +297,7 @@ jobs:
           path: projectfiles/Xcode/Wesnoth_${{ matrix.cfg }}.dmg
       - name: Run WML tests
         if: matrix.cfg == 'Release'
-        run: ./run_wml_tests -g -c -t 30 -p "projectfiles/Xcode/build/$CFG/The Battle for Wesnoth.app/Contents/MacOS/The Battle for Wesnoth" -a=--userdata-dir="$PWD/ud"
+        run: ./run_wml_tests -g -c -t 30 -bt 350 -p "projectfiles/Xcode/build/$CFG/The Battle for Wesnoth.app/Contents/MacOS/The Battle for Wesnoth" -a=--userdata-dir="$PWD/ud"
       - name: Upload userdata files from WML unit tests (logs, replays)
         if: matrix.cfg == 'Release' && (success() || failure())
         uses: actions/upload-artifact@v4

.github/workflows/codeql.yml

@@ -50,6 +50,7 @@ jobs:
     - name: Install dependencies
       if: matrix.language == 'cpp'
       run: |
+        utils/autorevision.sh -t h > src/revision.h
         sudo apt update
         sudo apt install scons libboost-system1.83-dev libboost-filesystem1.83-dev libboost-iostreams1.83-dev \
           libboost-serialization1.83-dev libboost-locale1.83-dev libboost-regex1.83-dev libboost-random1.83-dev \

.github/workflows/image_metadata.yml

@@ -27,9 +27,9 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: check image metadata
+      - name: check image EXIF metadata
         run: |
-          mapfile -t image_files < <(git diff --name-only --diff-filter=d "$BASE_SHA" "$HEAD_SHA" | grep -E '\.(webp|png|je?pg)$')
+          mapfile -t image_files < <(git diff --name-only --diff-filter=d "$BASE_SHA" "$HEAD_SHA" | grep -E '\.(webp|je?pg)$')
           # cycle through the changed image files, make sure they have the right fields
           for file in "${image_files[@]}"; do
             # check Artist tag, fail if missing
@@ -56,3 +56,33 @@ jobs:
                 ;;
             esac
           done
+
+      - name: check png XMP metadata
+        run: |
+          mapfile -t image_files < <(git diff --name-only --diff-filter=d "$BASE_SHA" "$HEAD_SHA" | grep -E '\.png$')
+          # cycle through the changed image files, make sure they have the right fields
+          for file in "${image_files[@]}"; do
+            # check Creator tag, fail if missing
+            artist="$(exiftool -p '$XMP:Creator' "$file")"
+            if [ "$artist" ]; then
+              printf 'Creator tag in %s is %s\n' "$file" "$artist"
+            else
+              printf 'no Creator XMP tag in %s\n' "$file"
+              exit 1
+            fi
+            # check Rights tag, fail if missing or wrong type
+            copyright="$(exiftool -p '$XMP:Rights' "$file")"
+            case $copyright in
+              'GNU GPL v2+'|'CC BY-SA 4.0'|CC0)
+                printf 'Rights tag in %s is %s\n' "$file" "$copyright"
+                ;;
+              '')
+                printf 'no Rights XMP tag in %s\n' "$file"
+                exit 1
+                ;;
+              *)
+                printf 'Rights tag %s in file %s is not an accepted license! Must be one of: "GNU GPL v2+", "CC BY-SA 4.0", "CC0"\n' "$copyright" "$file"
+                exit 1
+                ;;
+            esac
+          done

.gitignore

@@ -127,6 +127,7 @@ wesnoth.plg
 *.exe
 *.dll
 *.so
+compile_commands.json
 
 # library files
 .libs

CMakeLists.txt

@@ -1,4 +1,4 @@
-# set minimum version
+# set minimum version
 cmake_minimum_required(VERSION 3.14)
 
 project(wesnoth)
@@ -171,6 +171,7 @@ option(GLIBCXX_ASSERTIONS "Whether to define _GLIBCXX_ASSERTIONS" OFF)
 option(GLIBCXX_DEBUG "Whether to define _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC. Requires a version of Boost's program_options that's compiled with __GLIBCXX_DEBUG too." OFF)
 option(ENABLE_POT_UPDATE_TARGET "Enables the tools to update the pot files and manuals. This target has extra dependencies." OFF)
 option(FORCE_COLOR_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
+option(CLANG_TIDY "Enable clang-tidy linter checks." OFF)
 
 if(UNIX AND NOT APPLE AND NOT CYGWIN)
 	option(ENABLE_NOTIFICATIONS "Enable Window manager notification messages" ON)
@@ -255,6 +256,11 @@ if(NOT MSVC)
 		endif()
 	endif()
 
+### Enable clang-tidy linting
+	if (CLANG_TIDY)
+		set(CMAKE_CXX_CLANG_TIDY "clang-tidy -Wno-unknown-warning-option")
+	endif()
+
 ### Set the final compiler flags.
 
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
@@ -474,7 +480,7 @@ if(NOT MSVC)
 else()
 	set(CMAKE_CXX_FLAGS "/W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8 /Zc:__cplusplus" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
 	set(CMAKE_C_FLAGS "/WX" CACHE STRING "Global flags used by the C compiler during all builds." FORCE)
-	add_definitions(-D_WIN32_WINNT=0x0601 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
+	add_definitions(-D_WIN32_WINNT=0x0A00 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
 
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG_LUA")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-Wesnoth requires a compiler with sufficient C++17 support such as GCC 8 and
+Wesnoth requires a compiler with sufficient C++17 support such as GCC 11 and
 later, or a version of Clang with equivalent support.
 
 You'll need to have these libraries and their development headers installed in
@@ -19,6 +19,7 @@ order to build Wesnoth:
    * System
    * Coroutine
    * Graph
+   * Charconv (This requires boost 1.85 or higher and is optional but reccomended especially for clang builds)
  * SDL2 libraries:
    * SDL2                      >= 2.0.18 (macOS: 2.0.22 due to needing https://github.com/libsdl-org/SDL/commit/3bebdaccb7bff8c40438856081d404a7ce3def30)
    * SDL2_image                >= 2.0.2 (with PNG, JPEG, and WEBP support)

SConstruct

@@ -120,6 +120,7 @@ opts.AddVariables(
     BoolVariable("OS_ENV", "Forward the entire OS environment to scons", False),
     BoolVariable("history", "Clear to disable GNU history support in lua console", True),
     BoolVariable('force_color', 'Always produce ANSI-colored output (GNU/Clang only).', False),
+    BoolVariable('compile_db', 'Produce a compile_commands.json file.', False),
     )
 
 #
@@ -189,6 +190,11 @@ if env['distcc']:
 
 if env['ccache']: env.Tool('ccache')
 
+if env['compile_db']:
+    env.Tool('compilation_db')
+    cdb = env.CompilationDatabase()
+    Alias('cdb', cdb)
+
 boost_version = "1.67"
 
 def SortHelpText(a, b):
@@ -379,6 +385,7 @@ if env["prereqs"]:
         conf.CheckBoost("program_options", require_version = boost_version) & \
         conf.CheckBoost("random", require_version = boost_version) & \
         conf.CheckBoost("smart_ptr", header_only = True) & \
+        conf.CheckBoostCharconv() & \
 	CheckAsio(conf) & \
 	conf.CheckBoost("thread") & \
         conf.CheckBoost("locale") & \
@@ -665,7 +672,7 @@ for env in [test_env, client_env, env]:
         env[d] = os.path.join(env["prefix"], env[d])
 
     if env["PLATFORM"] == 'win32':
-        env.Append(LIBS = ["wsock32", "crypt32", "iconv", "z", "shlwapi", "winmm", "ole32", "uuid"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0601"])
+        env.Append(LIBS = ["wsock32", "crypt32", "iconv", "z", "shlwapi", "winmm", "ole32", "uuid"], CCFLAGS = ["-mthreads"], LINKFLAGS = ["-mthreads"], CPPDEFINES = ["_WIN32_WINNT=0x0A00"])
 
     if env["PLATFORM"] == 'darwin':            # Mac OS X
         env.Append(FRAMEWORKS = "Cocoa")            # Cocoa GUI

add_source_file

@@ -81,7 +81,7 @@ code_blocks_target_translations = {
 # XCode #
 #=======#
 
-def add_to_xcode(filename, targets):
+def modify_xcode(filename, targets, remove):
     """Add the given file to the specified targets.
     """
     projectfile = rootdir.joinpath(
@@ -121,24 +121,29 @@ def add_to_xcode(filename, targets):
             raise Exception(f"problem finding '{d}' group in '{groupname}'")
         parent_group = found_groups[0]
 
-    # if the group already has an entry with the same filename, loudly skip.
-    # note: this doesn't allow adding to targets one at a time.
-    # a new file should be added to all targets at once...
-    # or maybe targets could be checked somehow,
-    # or maybe the file could simply be completely removed and readded.
-    if project.get_files_by_name(filename.name, parent=parent_group):
-        print("  '"+filename.name+"' already found in Xcode project '"+",".join(translated_targets)+"', skipping")
-        return
+    if remove :
+        # Remove from all targets if we want to remove
+        for file in project.get_files_by_name(filename.name, parent=parent_group):
+            project.remove_file_by_id(file.get_id())
+    else:
+        # if the group already has an entry with the same filename, loudly skip.
+        # note: this doesn't allow adding to targets one at a time.
+        # a new file should be added to all targets at once...
+        # or maybe targets could be checked somehow,
+        # or maybe the file could simply be completely removed and readded.
+        if project.get_files_by_name(filename.name, parent=parent_group):
+            print("  '"+filename.name+"' already found in Xcode project '"+",".join(translated_targets)+"', skipping")
+            return
 
-    # force is True here because otherwise a duplicate filename in
-    # a different place will block addition of the new file.
-    # the rest is just to match existing project file structure.
-    project.add_file(filename.name,
-        force=True,
-        tree="<group>",
-        parent=parent_group,
-        target_name=translated_targets,
-    )
+        # force is True here because otherwise a duplicate filename in
+        # a different place will block addition of the new file.
+        # the rest is just to match existing project file structure.
+        project.add_file(filename.name,
+            force=True,
+            tree="<group>",
+            parent=parent_group,
+            target_name=translated_targets,
+        )
 
     # that's done, save the file
     project.save()
@@ -148,7 +153,7 @@ def add_to_xcode(filename, targets):
 # source_lists #
 #==============#
 
-def add_to_source_list(filename, source_list):
+def modify_source_list(filename, source_list, remove):
     source_list_file = rootdir.joinpath("source_lists", source_list)
     sl_lines = open(source_list_file).readlines()
     file_line = filename.as_posix() + '\n'
@@ -157,12 +162,16 @@ def add_to_source_list(filename, source_list):
     if filename.suffix != ".cpp":
         return
 
-    # if the target already has an entry with the same filename, loudly skip
-    if file_line in sl_lines:
-        print(f"  '{filename}' already found in '{source_list}', skipping")
-        return
+    if remove:
+        if file_line in sl_lines: sl_lines.remove(file_line)
+    else:
+        # if the target already has an entry with the same filename, loudly skip
+        if file_line in sl_lines:
+            print(f"  '{filename}' already found in '{source_list}', skipping")
+            return
+
+        sl_lines.append(file_line)
 
-    sl_lines.append(file_line)
     sl_lines.sort()
     open(source_list_file, 'w').writelines(sl_lines)
 
@@ -170,13 +179,18 @@ def add_to_source_lists(filename, targets):
     translated_targets = [source_list_target_translations[t] for t in targets]
     print(" source_list targets:", translated_targets)
     for t in translated_targets:
-        add_to_source_list(filename, t)
+        modify_source_list(filename, t, False)
+
+def remove_from_source_lists(filename):
+    # remove from all tagerts if -r was specified.
+    for t in source_list_target_translations.values():
+        modify_source_list(filename, t, True)
 
 #==============#
 # Code::Blocks #
 #==============#
 
-def add_to_code_blocks_target(filename, target):
+def modify_code_blocks_target(filename, target, remove):
     cbp_file = rootdir.joinpath(
         "projectfiles",
         "CodeBlocks",
@@ -190,30 +204,33 @@ def add_to_code_blocks_target(filename, target):
 
     elem = f"\t\t<Unit filename=\"{filename_for_cbp}\" />\n"
 
-    # if the target already has an entry with the same filename, loudly skip
-    if elem in cbp_lines:
-        print(f"  '{filename}' already found in '{target}.cbp', skipping")
-        return
+    if remove:
+        if elem in cbp_lines: cbp_lines.remove(elem)
+    else:
+        # if the target already has an entry with the same filename, loudly skip
+        if elem in cbp_lines:
+            print(f"  '{filename}' already found in '{target}.cbp', skipping")
+            return
 
-    # find an appropriate line to add before/after
-    index = 0
-    for line in cbp_lines:
-        if line.startswith("\t\t<Unit "):
-            if elem < line:
+        # find an appropriate line to add before/after
+        index = 0
+        for line in cbp_lines:
+            if line.startswith("\t\t<Unit "):
+                if elem < line:
+                    break
+            elif line.startswith("\t\t<Extensions>"):
+                # we must be the last entry, as this comes after the Unit section
                 break
-        elif line.startswith("\t\t<Extensions>"):
-            # we must be the last entry, as this comes after the Unit section
-            break
-        index += 1
-    cbp_lines.insert(index, elem)
+            index += 1
+        cbp_lines.insert(index, elem)
 
     open(cbp_file, 'w').writelines(cbp_lines)
 
-def add_to_code_blocks(filename, targets):
-    translated_targets = [code_blocks_target_translations[t] for t in targets]
+def modify_code_blocks(filename, targets, remove):
+    translated_targets = code_blocks_target_translations.values() if remove else [code_blocks_target_translations[t] for t in targets]
     print(" code::blocks targets:", translated_targets)
     for t in translated_targets:
-        add_to_code_blocks_target(filename, t)
+        modify_code_blocks_target(filename, t, remove)
 
 def sanity_check_existing_cpp_hpp(filenames):
     """
@@ -285,6 +302,8 @@ if __name__ == "__main__":
         help="which build targets to add the file to")
     ap.add_argument("--no-checks", action="store_true",
         help="do not check whether the files exist, etc")
+    ap.add_argument("-r", "--remove", action="store_true",
+        help="remove the specified files from projectfiles instead of adding them, --target is then ignored")
     # By default, recognise --help too
     options = ap.parse_args()
 
@@ -301,7 +320,13 @@ if __name__ == "__main__":
         sanity_check_existing_cpp_hpp(filenames)
 
     for filename in filenames:
-        print(f"adding '{filename}' to targets: {options.target}")
-        add_to_xcode(filename, options.target)
-        add_to_source_lists(filename, options.target)
-        add_to_code_blocks(filename, options.target)
+        if options.remove:
+            print(f"removing '{filename}' from all targets")
+            modify_xcode(filename, options.target, True)
+            remove_from_source_lists(filename)
+            modify_code_blocks(filename, options.target, True)
+        else:
+            print(f"adding '{filename}' to targets: {options.target}")
+            modify_xcode(filename, options.target, False)
+            add_to_source_lists(filename, options.target)
+            modify_code_blocks(filename, options.target, False)

boost_test_schedule

@@ -171,20 +171,20 @@ test_lexical_cast_throw<unsigned long long>
 test_lexical_cast_throw<float>
 test_lexical_cast_throw<double>
 test_lexical_cast_throw<long double>
-test_lexical_cast_signed<signed char>
-test_lexical_cast_signed<short>
-test_lexical_cast_signed<int>
-test_lexical_cast_signed<long>
-test_lexical_cast_long_long
-test_lexical_cast_unsigned<unsigned char>
-test_lexical_cast_unsigned<unsigned short>
-test_lexical_cast_unsigned<unsigned int>
-test_lexical_cast_unsigned<unsigned long>
-test_lexical_cast_unsigned_long_long
+test_lexical_arethmetic_signed<signed char>
+test_lexical_arethmetic_signed<short>
+test_lexical_arethmetic_signed<int>
+test_lexical_arethmetic_signed<long>
+test_lexical_arethmetic_signed<long long>
+test_lexical_arethmetic_signed<unsigned char>
+test_lexical_arethmetic_signed<unsigned short>
+test_lexical_arethmetic_signed<unsigned int>
+test_lexical_arethmetic_signed<unsigned long>
+test_lexical_arethmetic_signed<unsigned long long>
+test_lexical_arethmetic_signed<float>
+test_lexical_arethmetic_signed<double>
+test_lexical_arethmetic_signed<long double>
 test_lexical_cast_bool
-test_lexical_cast_floating_point<float>
-test_lexical_cast_floating_point<double>
-test_lexical_cast_floating_point<long double>
 test_lexical_cast_result
 test_map_location/map_location_characterization_test_radial_mode
 test_map_location/reality_check_vector_negation

changelog_entries/dune_warmaster.md

@@ -0,0 +1,2 @@
+### Units
+   * Dune Warmaster: HP 59 -> 61 scimitar damage 9 -> 10

changelog_entries/ei-dialogue-fixes.md

@@ -0,0 +1,5 @@
+### Campaigns
+   * Eastern Invasion
+     * S04c: give Mal-Ravanal gold to recruit more units when their army becomes too small
+     * forbid all Dunefolk units to take the Plague Staff
+     * fix minor bugs with dialogues

changelog_entries/explorer_resistance_nerf.md

@@ -0,0 +1,2 @@
+ ### Units
+   * Dwarvish Explorer: physical resists reduced from 20% to 10%, melee damage increased from 10 to 11.

changelog_entries/fire_guardian_resistances.md

@@ -0,0 +1,3 @@
+ ### Units
+   * Fire Wisps and Guardian - Fire Resistance changed from 50% to 70%
+   * Fire Wraith - Fire Resistance changed from 50% to 80%

changelog_entries/orcish_xbowman_nerf.md

@@ -0,0 +1,2 @@
+### Units
+   * Orcish Crossbowman: melee 6-3 -> 4-3, experience to level 43 -> 57

data/advanced_preferences.cfg

@@ -21,6 +21,14 @@
     [/option]
 [/advanced_preference]
 
+[advanced_preference]
+    field=addon_icons
+    name= _ "Whether to show icons in the add-ons list on the add-ons manager"
+    description= _ "Disabling saves bandwidth by not sending icons for the add-ons list in the add-ons manager"
+    type=boolean
+    default=yes
+[/advanced_preference]
+
 [advanced_preference]
     field=ask_delete
     name= _ "Confirm deleting saves"

data/campaigns/Delfadors_Memoirs/utils/sides.cfg

@@ -550,7 +550,7 @@
                 end
                 -- level the unit and give it a random amount of experience up to half of max
                 units[i].experience = units[i].max_experience
-                units[i]:advance( )
+                units[i]:advance(false)
                 units[i].experience = mathx.random ( 0, mathx.round( units[i].max_experience / 2 ) )
             end
         >>

data/campaigns/Eastern_Invasion/scenarios/01_Eastern_Invasion.cfg

@@ -54,7 +54,7 @@
             #po: The River Guard posts had been built in 470 YW; they were abandoned in 544 YW.
             #po: The wave of colonization had begun around 530 YW.
             #po: This intro starts in 625 YW; the king's forces arrive at the outposts in 626 YW.
-            story= _ "In the days of King Garard I, two strong points had been built along the near bank of the River Weldyn, south of Soradoc, to stop bandits and orcish raiders out of the Estmarks from entering Wesnoth. In later years, the river guard posts had been abandoned as colonists spread into the Estmarks and the orcs were driven in retreat north of the Great River."
+            story= _ "In the days of King Garard I, two strong points had been built along the far bank of the River Weldyn, south of Soradoc, to stop bandits and orcish raiders out of the Estmarks from entering Wesnoth. In later years, the river guard posts had been abandoned as colonists spread into the Estmarks and the orcs were driven in retreat north of the Great River."
             {EI_BIGMAP}
         [/part]
         [part]

data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg

@@ -133,6 +133,8 @@
             [/modifications]
         [/unit]
 
+#endif
+#ifdef NORMAL
         {NAMED_NOTRAIT_UNIT 3 (Troll Whelp) 23 8 "Hur" (_"Hur")} {GUARDIAN}
         [+unit]
             [modifications]

data/campaigns/Eastern_Invasion/scenarios/03_An_Unexpected_Appearance.cfg

@@ -321,9 +321,6 @@
             #po: star wars reference
             message= _ "We will watch your career with great interest..."
         [/message]
-        [endlevel]
-            result=defeat
-        [/endlevel]
     [/event]
     [event]
         name=last breath
@@ -335,10 +332,6 @@
             speaker=Mal-Tar
             message= _ "Wait, please, not like this!"
         [/message]
-
-        # add in the herodeaths. Don't do these before, since we want special behavior for the achievement
-        {HERODEATH_GWEDDRY}
-        {HERODEATH_DACYN}
     [/event]
     [event]
         name=die

data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Interlude.cfg

@@ -485,6 +485,7 @@
                 [/set_achievement]
             [/then]
         [/if]
+        {HERODEATH_ADDOGIN}
     [/event]
 
     [event]

data/campaigns/Eastern_Invasion/scenarios/04b_Ill_Humors.cfg

@@ -801,7 +801,7 @@
             [else]
                 [gold]
                     side=1
-                    amount=-50
+                    amount=-$gold_cost
                 [/gold]
                 [sound]
                     name=gold.ogg
@@ -884,7 +884,7 @@
             [else]
                 [gold]
                     side=1
-                    amount=-150
+                    amount=-$gold_extra
                 [/gold]
                 [sound]
                     name=gold.ogg
@@ -1008,7 +1008,7 @@
             [/status]
         [/modify_unit]
 
-        {CLEAR_VARIABLE gold,gold_cost,herbs_needed,herb_locations}
+        {CLEAR_VARIABLE gold,gold_cost,gold_extra,herbs_needed,herb_locations}
     [/event]
 
     [event]

data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg

@@ -230,31 +230,32 @@
             [/effect]
         [/modify_unit]
     [/event]
-    [event] # manually set gold to 0
+    [event]
+        # if ravanal's low on units and ravanal_no_income is cleared, give him gold
+        # otherwise, clear Mal-Ravanal's gold so we don't go positive nor negative
         name=side 7 turn refresh
         first_time_only=no
-
-        [filter_condition]
-            {VARIABLE_CONDITIONAL ravanal_no_income equals yes}
-        [/filter_condition]
-
-        [modify_side]
-            side=7
-            gold=0
-        [/modify_side]
-    [/event]
-    [event] # manually set gold to 1000
-        name=side 1
-        first_time_only=no
-
-        [filter_condition]
+        [if]
             {VARIABLE_CONDITIONAL ravanal_no_income not_equals yes}
-        [/filter_condition]
-
-        [modify_side]
-            side=7
-            gold=9999
-        [/modify_side]
+            [and]
+                [have_unit]
+                    side=7
+                    count=0-10
+                [/have_unit]
+            [/and]
+            [then]
+                [modify_side]
+                    side=7
+                    gold=500
+                [/modify_side]
+            [/then]
+            [else]
+                [modify_side]
+                    side=7
+                    gold=0
+                [/modify_side]
+            [/else]
+        [/if]
     [/event]
 
     #--------------------
@@ -664,6 +665,12 @@
             side=4
             amount={ON_DIFFICULTY 15 45 75} # otherwise his armies start to feel a little thin around now
         [/gold]
+        [fire_event]
+            name=dacyn_warning
+        [/fire_event]
+    [/event]
+    [event]
+        name=dacyn_warning
         [message]
             speaker=Dacyn
             message= _ "Gweddry, we should not be here. They are merely toying with us right now, but all will be lost if Mal-Ravanal finds me amongst you!"
@@ -687,6 +694,9 @@
     [event]
         name=ravanal_gets_serious
 
+        [fire_event]
+            name=dacyn_warning
+        [/fire_event]
         {REPLACE_SCENARIO_MUSIC silence.ogg}
         [message]  # if you change this, also change 06b_Soradoc
             speaker=Mal-Ravanal
@@ -914,7 +924,7 @@
                     [/then]
 
                     [else]
-                        {FIND_NEARBY (type,side=Knight,1) 36 15 99}
+                        {FIND_NEARBY (trait,side=survivor,1) 36 15 99}
                     [/else]
                 [/if]
                 [message]
@@ -923,7 +933,6 @@
                 [/message]
 
                 {FIND_NEARBY (
-                    type=Knight,Terraent
                     side=8
                 ) 36 15 99}
                 [message]

data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg

@@ -516,6 +516,38 @@
         {MODIFY_UNIT id=Dacyn attacks_left 0}
     [/event]
 
+    [event]
+        name=owaec_joins
+
+        [capture_village]
+            owner_side=2
+            side=1
+        [/capture_village]
+        [modify_unit]
+            [filter]
+                side=2
+            [/filter]
+
+            side=1
+            moves=$($this_unit.max_moves)
+            attacks_left=1
+            {TEAM_COLOR_OVERRIDE () blue}
+        [/modify_unit]
+        [message]
+            speaker=narrator
+            image=wesnoth-icon.png
+            message= _ "(You may now recruit Horsemen and Cavalrymen!)"
+        [/message]
+        [set_extra_recruit] # need to set recruits per-unit (instead of per-side) so we don't mess up the plague staff
+            id=Gweddry
+            extra_recruit={REGULAR_RECRUIT_LIST}
+        [/set_extra_recruit]
+        [set_extra_recruit]
+            id=Owaec
+            extra_recruit={REGULAR_RECRUIT_LIST}
+        [/set_extra_recruit]
+    [/event]
+
     [event]
         name=capture
         first_time_only=no
@@ -718,34 +750,9 @@
                     speaker=Owaec
                     message= _ "Huzzah!! At last, these villagers are liberated! Gweddry, thank you for your aid. I place my Clansmen and myself at your service."
                 [/message]
-                [capture_village]
-                    owner_side=2
-                    side=1
-                [/capture_village]
-                [modify_unit]
-                    [filter]
-                        side=2
-                    [/filter]
-
-                    side=1
-                    moves=$($this_unit.max_moves)
-                    attacks_left=1
-                    {TEAM_COLOR_OVERRIDE () blue}
-                [/modify_unit]
-                [message]
-                    speaker=narrator
-                    image=wesnoth-icon.png
-                    message= _ "(You may now recruit Horsemen and Cavalrymen!)"
-                [/message]
-                [set_extra_recruit] # need to set recruits per-unit (instead of per-side) so we don't mess up the plague staff
-                    id=Gweddry
-                    extra_recruit={REGULAR_RECRUIT_LIST}
-                [/set_extra_recruit]
-                [set_extra_recruit]
-                    id=Owaec
-                    extra_recruit={REGULAR_RECRUIT_LIST}
-                [/set_extra_recruit]
-
+                [fire_event]
+                    name=owaec_joins
+                [/fire_event]
                 [if]
                     [not]
                         [have_unit]
@@ -879,33 +886,9 @@
                     speaker=Owaec
                     message= _ "Huzzah!! May these be the first of many undead to fall before our hooves! Gweddry, thank you for your aid. I place my Clansmen and myself at your service."
                 [/message]
-                [capture_village]
-                    owner_side=2
-                    side=1
-                [/capture_village]
-                [modify_unit]
-                    [filter]
-                        side=2
-                    [/filter]
-
-                    side=1
-                    moves=$($this_unit.max_moves)
-                    attacks_left=1
-                    {TEAM_COLOR_OVERRIDE () blue}
-                [/modify_unit]
-                [message]
-                    speaker=narrator
-                    image=wesnoth-icon.png
-                    message= _ "(You may now recruit Horsemen and Cavalrymen!)"
-                [/message]
-                [set_extra_recruit] # need to set recruits per-unit (instead of per-side) so we don't mess up the plague staff
-                    id=Gweddry
-                    extra_recruit={REGULAR_RECRUIT_LIST}
-                [/set_extra_recruit]
-                [set_extra_recruit]
-                    id=Owaec
-                    extra_recruit={REGULAR_RECRUIT_LIST}
-                [/set_extra_recruit]
+                [fire_event]
+                    name=owaec_joins
+                [/fire_event]
                 [message]
                     speaker=Owaec
                     message= _ "Now let us free these villagers from the outlaws terrorizing them!"

data/campaigns/Eastern_Invasion/scenarios/07b_Ogre_Crossing.cfg

@@ -918,19 +918,6 @@
         [/message]
     [/event]
 
-    [event]
-        name=last breath
-
-        [filter]
-            id=Grug
-        [/filter]
-
-        [message]
-            speaker=Grug
-            message= _ "Hurt... grarrgghh..." # wmllint: no spellcheck
-        [/message]
-    [/event]
-
     {ENEMYDEATHS_SORADOC}
     {FOREIGN_DEFEAT}
 
@@ -940,9 +927,8 @@
     {HERODEATH_ADDOGIN}
     {HERODEATH_HAHID}
     {HERODEATH_TERRAENT}
-    #     {HERODEATH_GRUG} # don't have Gweddry say "he was not one of us, yet [...]"
+    {HERODEATH_GRUG}
     {HERODEATH_DOLBURRAS}
-    {HERODEATH_HAHID}
 [/scenario]
 
 #undef SCENARIO_TURN_LIMIT

data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg

@@ -1862,5 +1862,6 @@ Your punishment is death."
     {HERODEATH_TERRAENT}
     {HERODEATH_DOLBURRAS}
     {HERODEATH_GRUG}
+    {HERODEATH_ADDOGIN}
     {HERODEATH_HAHID}
 [/scenario]

data/campaigns/Eastern_Invasion/scenarios/18_Epilogue.cfg

@@ -315,50 +315,30 @@
                     time=750
                 [/delay]
 
+                [message]
+                    speaker=Konrad
+                    image=portraits/konrad_II.webp
+                    message= _ "Dolburras, Owaec has told me of the help you provided his men; both your skill at arms and your tenacious spirit. We wish to offer you this finely crafted shield — an heirloom of my line — and an honor guard as you return to Knalga."
+                [/message]
                 [if]
-                    {VARIABLE_CONDITIONAL plague_staff_wielder_id equals Dolburras}
+                    [have_unit]
+                        id=Owaec
+                    [/have_unit]
+
                     [then]
-                        [message]
-                            speaker=Konrad
-                            image=portraits/konrad_II.webp
-                            #po: the player chose to give Dolburras the plague staff
-                            message= _ "Dwarf, <i>necromancer</i>, know that Wesnoth will never tolerate your kind. You shall surrender that accursed stave to be destroyed, you shall foreswear the practice of all magic on penalty of death, and you are hereby exiled from Wesnoth. Be grateful for Our mercy."
-                        [/message]
                         [message]
                             speaker=Dolburras
-                            #po: "Yeah, fair enough. I don't think my kinsmen will look kindly upon necromancies either."
-                            message= _ "Aye, fair enough. I dinnae think my kinsmen will look kindly upon necromancies either."
+                            #po: "Aye, I am honored. You have my sincerest thanks, your Majesty."
+                            message= _ "Aye, I be honored. Ye have my sincerest thanks, yer Majesty."
                         [/message]
-                        {CLEAR_VARIABLE plague_staff_wielder_id}
                     [/then]
 
                     [else]
                         [message]
-                            speaker=Konrad
-                            image=portraits/konrad_II.webp
-                            message= _ "Dolburras, Owaec has told me of the help you provided his men; both your skill at arms and your tenacious spirit. We wish to offer you this finely crafted shield — an heirloom of my line — and an honor guard as you return to Knalga."
+                            speaker=Dolburras
+                            #po: Owaec's dead
+                            message= _ "Aye, I be honored. I only wish he were here to see the Clans avenged."
                         [/message]
-                        [if]
-                            [have_unit]
-                                id=Owaec
-                            [/have_unit]
-
-                            [then]
-                                [message]
-                                    speaker=Dolburras
-                                    #po: "Aye, I am honored. You have my sincerest thanks, your Majesty."
-                                    message= _ "Aye, I be honored. Ye have my sincerest thanks, yer Majesty."
-                                [/message]
-                            [/then]
-
-                            [else]
-                                [message]
-                                    speaker=Dolburras
-                                    #po: Owaec's dead
-                                    message= _ "Aye, I be honored. I only wish he were here to see the Clans avenged."
-                                [/message]
-                            [/else]
-                        [/if]
                     [/else]
                 [/if]
             [/then]
@@ -423,34 +403,15 @@
                     time=750
                 [/delay]
 
-                [if]
-                    {VARIABLE_CONDITIONAL plague_staff_wielder_id equals "Hahid al-Ali"}
-                    [then]
-                        [message]
-                            speaker=Konrad
-                            image=portraits/konrad_II.webp
-                            #po: the player chose to give Hahid the plague staff
-                            message= _ "Southerner, <i>necromancer</i>, know that Wesnoth will never tolerate your kind. You shall surrender that accursed stave to be destroyed, you shall foreswear the practice of all magic on penalty of death, and you are hereby exiled back to the desert wastes. Be grateful for Our mercy."
-                        [/message]
-                        [message]
-                            speaker=Hahid al-Ali
-                            message= _ "Bah, I save you barbarians from an invasion, and this is the thanks I get! What happened to being paid thrice what I’m owed? So much for northerner generosity!"
-                        [/message]
-                        {CLEAR_VARIABLE plague_staff_wielder_id}
-                    [/then]
-
-                    [else]
-                        [message]
-                            speaker=Konrad
-                            image=portraits/konrad_II.webp
-                            message= _ "Hahid al-Ali, We know of your far-off people, but great distance has caused little contact between us. May it be thus no longer. If you accept, We would appoint you as ambassador between our two realms."
-                        [/message]
-                        [message]
-                            speaker=Hahid al-Ali
-                            message= _ "Me, ambassador to the barbarian kingdoms, what a thought! I am honored, and would be even more honored to learn that the job comes with... excellent pay I hope?"
-                        [/message]
-                    [/else]
-                [/if]
+                [message]
+                    speaker=Konrad
+                    image=portraits/konrad_II.webp
+                    message= _ "Hahid al-Ali, We know of your far-off people, but great distance has caused little contact between us. May it be thus no longer. If you accept, We would appoint you as ambassador between our two realms."
+                [/message]
+                [message]
+                    speaker=Hahid al-Ali
+                    message= _ "Me, ambassador to the barbarian kingdoms, what a thought! I am honored, and would be even more honored to learn that the job comes with... excellent pay I hope?"
+                [/message]
             [/then]
         [/if]
 

data/campaigns/Eastern_Invasion/utils/deaths.cfg

@@ -139,7 +139,8 @@
             message= _ "Hurt... grarrgghh..." # wmllint: no spellcheck
         [/message]
         [message]
-            speaker=Gweddry
+            id=Gweddry
+            side=$unit.side
             message= _ "Though he was not one of us, he served bravely alongside Wesnoth’s best. We must carry on the good fight."
         [/message]
     [/event]
@@ -171,11 +172,13 @@
             message= _ "Alas, my long, storied, and exceedingly profitable career has at last come to an end, so far from home! I only... wish I could have died on the soft sands... instead of among these primitive barbarians..."
         [/message]
         [message]
-            speaker=Grug
+            id=Grug
+            side=$unit.side
             message= _ "Bar... ber... bears? Die why?"
         [/message]
         [message]
-            speaker=Dolburras
+            id=Dolburras
+            side=$unit.side
             message= _ "Aye, ‘tis a sad place for one o’ us foreigners to fall. We’ll miss ye, that’s for sure."
         [/message]
     [/event]

data/campaigns/Eastern_Invasion/utils/items.cfg

@@ -70,10 +70,7 @@
             [/then]
 
             [else]
-                [message]
-                    speaker=unit
-                    message={INVALID_DESC}
-                [/message]
+                {INVALID_DESC}
             [/else]
         [/if]
     [/event]
@@ -139,7 +136,7 @@ crystal_quiver #enddef
     _"Crystal Quiver"
     _"Arrows from this crystalline quiver glimmer with a pale magical light, <i><b>illuminating</b></i> the surrounding area and making your bow or crossbow attacks <i><b>arcane</b></i>."
     {NOTE_REUSEABLE}
-    ""
+    ()
     (
         [effect]
             apply_to=new_ability
@@ -181,7 +178,7 @@ holy_amulet_3 #enddef
     _"Holy Amulet"
     _"Engraved with a consecrated symbol, this amulet will bless both your <i><b>melee</b></i> and <i><b>ranged</b></i> attacks with <i><b>arcane</b></i> damage."
     {NOTE_REUSEABLE}
-    ""
+    ()
     (
         [effect]
             apply_to=new_ability
@@ -216,7 +213,7 @@ sentinel #enddef
     _"Shield of the Sentinel"
     _"Deep within this shield’s towering bulk, enchanted machinery whirrs faintly. Whenever an adjacent ally is hit by an attack, <i><b>this shield’s bearer is hit instead</b></i>."
     {NOTE_REUSEABLE}
-    ""
+    ()
     (
         [effect]
             apply_to=overlay
@@ -568,7 +565,7 @@ yeti_steak #enddef
     _"Yetiburger"
     _"Eating this funny tasting meat <i><b>doubles your hitpoints</b></i> and grants <i><b>immunity to cold</b></i>."
     {NOTE_SINGLE_USE}
-    ""
+    ()
     (
         [effect]
             apply_to=hitpoints
@@ -598,7 +595,7 @@ yeti_steak #enddef
 
 <i><b><span color='#FF0000'>-1</span> damage, <span color='#FF0000'>-1</span> movement, <span color='#00FF00'>+10</span> hitpoints</b></i>."
     {NOTE_SINGLE_USE}
-    ""
+    ()
     (
         [effect]
             apply_to=movement
@@ -631,7 +628,7 @@ baneblade #enddef
     _"This incorporeal sword resembles those wielded by undead wraiths. Any mortal brave enough to wield it becomes <i><b>chaotic</b></i> and lashes out at their foes with reckless abandon.
 <i><b>6x4 arcane</b></i> damage, <i><b>drains</b></i>, <i><b>berserk</b></i>."
     {NOTE_REUSEABLE}
-    ""
+    ()
     (
         [effect]
             apply_to=attack
@@ -696,7 +693,7 @@ potion_of_barkskin #enddef
     _"Potion of Barkskin"
     _"This potion bubbles as though over an open flame, yet is cool to the touch. Its drinker gains the <i><b>steadfast</b></i> ability and can <i><b>heal 2 hitpoints each turn</b></i>, like dwarves with the ‘healthy’ trait."
     {NOTE_SINGLE_USE}
-    ""
+    ()
     (
         [effect]
             apply_to=new_ability
@@ -728,7 +725,7 @@ ring_of_invisibility #enddef
     _"Ring of Invisibility"
     _"This plain gold ring looks unremarkable, but its wearer gains <i><b>skirmisher</b></i> and <i><b>nightstalk</b></i>, becoming invisible in the dark."
     {NOTE_REUSEABLE}
-    ""
+    ()
     (
         [effect]
             apply_to=new_ability
@@ -767,15 +764,15 @@ plague_staff #enddef
     {ID_PLAGUE_STAFF}  _"staff"  items/plague-staff.png  {X}  {Y}
     (
         [not]
-            type_adv_tree=White Mage,Paladin
-
-            [not]
-                id=Dacyn
-            [/not]
+            race=dunefolk
         [/not]
 
         [not]
-            id=Owaec,Gweddry,Dacyn,Hahid al-Ali,Terraent,Konrad
+            type_adv_tree=White Mage,Paladin
+        [/not]
+
+        [not]
+            id=Owaec,Gweddry,Dacyn,Terraent,Konrad
         [/not]
         # messes with existing recruiting, and messes with the S18 cutscene
         # if Dacyn gets this, it also breaks his scripted advancements (and his S17a recruitment)
@@ -784,8 +781,83 @@ plague_staff #enddef
     _"Looted from a dead necromancer, the wielder of this dark staff becomes <i><b>chaotic</b></i>, and can <i><b>recruit and recall</b></i> Walking Corpses and Soulless.
 <i><b>6x3 impact</b></i> damage, <i>plague</i>."
     {NOTE_REUSEABLE}
-    _"I will not wield such a dark magical artifact, though I shall not begrudge its use by my companions."
-    # this message makes no sense for Dacyn (his entire quest is to get a dark magical artifact), but I couldn't think of something good and generic that works for everyone.
+    (
+        [switch]
+            variable=unit.id
+            [case]
+                value=Owaec
+                [message]
+                    speaker=unit
+                    message=_"Do not insult me! No clansman will ever stoop to such black magic."
+                [/message]
+            [/case]
+            [case]
+                value=Gweddry
+                [message]
+                    speaker=unit
+                    message=_"I already have an army of human soldiers — living soldiers. Let someone else use this staff."
+                [/message]
+            [/case]
+            [case]
+                value=Dacyn
+                [message]
+                    speaker=unit
+                    message=_"Tempting! Most tempting... but I fear it would be unwise for me to wield such a thing. That privilege passes onto another."
+                [/message]
+            [/case]
+            [case]
+                value=Hahid al-Ali
+                [message]
+                    speaker=unit
+                    message=_"Ha! Good joke! I’m not about to mess around with any of your foul northerner magic; necromancy was the cause of all this trouble in the first place."
+                [/message]
+            [/case]
+            [case]
+                value=Terraent
+                [message]
+                    speaker=unit
+                    message=_"I serve the light, not this staff of foul darkness! We should cast away this thing and be done with it."
+                [/message]
+            [/case]
+            [case]
+                value=Konrad
+                [message]
+                    speaker=unit
+                    message=_"...what foul thing is this? Remove it from my presence; necromancy shall not take root in Wesnoth, not under my watch."
+                [/message]
+            [/case]
+            [else]
+                [switch]
+                    variable=unit.type
+                    [case]
+                        value=White Mage,Mage of Light,Paladin
+                        [message]
+                            speaker=unit
+                            message=_"No. I serve that which is good and light, and will not wield such a dark magical artifact."
+                        [/message]
+                    [/case]
+                    [else]
+                        [switch]
+                            variable=unit.race
+                            [case]
+                                value=dunefolk
+                                [message]
+                                    speaker=unit
+                                    message=_"Fighting your northerners’ foul magic is bad enough. Don’t expect me to wield that — civilized cultures don’t mess around with magic."
+                                [/message]
+                            [/case]
+                            [else]
+                                [message]
+                                    speaker=unit
+                                    message=_"I will not wield such a dark magical artifact, though I shall not begrudge its use by my companions."
+                                [/message]
+                            [/else]
+                        [/switch]
+                    [/else]
+                [/switch]
+            [/else]
+        [/switch]
+    )
     (
         [effect]
             apply_to=new_attack

data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg

@@ -574,13 +574,13 @@ Been a tough few days since we left Elensefar with all them patrols running arou
     [event]
         name=attack_end
         [filter]
-            side=2
+            side=3
         [/filter]
         [filter_second]
             side=1
         [/filter_second]
 
-        {IF_VAR $second_unit.hitpoints greater_than 0 (
+        {IF_VAR second_unit.hitpoints greater_than 0 (
             [then]
                 [message]
                     speaker=Baldras

data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg

@@ -144,8 +144,8 @@
             x,y=18,1
             side=2
             [modifications]
-                {TRAIT_STRONG}
-                {TRAIT_RESILIENT}
+                {TRAIT_QUICK}
+                {TRAIT_DEXTROUS}
             [/modifications]
         [/unit]
         [unit]
@@ -156,8 +156,8 @@
             side=2
             facing=sw
             [modifications]
-                {TRAIT_DEXTROUS}
-                {TRAIT_RESILIENT}
+                {TRAIT_STRONG}
+                {TRAIT_QUICK}
             [/modifications]
         [/unit]
         [unit]
@@ -172,6 +172,18 @@
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]
+        [unit]
+            type=Elvish Outrider
+            id=Ealin
+            name= _ "Ealin"
+            x,y=18,1
+            side=2
+            facing=sw
+            [modifications]
+                {TRAIT_QUICK}
+                {TRAIT_RESILIENT}
+            [/modifications]
+        [/unit]
         [scroll_to]
             x,y=18,1
         [/scroll_to]

data/campaigns/Son_Of_The_Black_Eye/_main.cfg

@@ -67,6 +67,8 @@
             comment = "Sprite animations (defense and magic) of orcish shamans"
         [/entry]
     [/about]
+
+    {ENABLE_SAURIAN_SPEARTHROWER}
 [/campaign]
 
 #ifdef CAMPAIGN_SON_OF_THE_BLACK_EYE

data/campaigns/The_Hammer_of_Thursagan/achievements.cfg

@@ -1 +1,28 @@
 #textdomain wesnoth-thot
+
+[achievement_group]
+    display_name=_"The Hammer of Thursagan"
+    content_for=the_hammer_of_thursagan
+    [achievement]
+        id="gryphon_hunter"
+        name=_"Gryphon Hunter"
+        description=_"Kill the Gryphon leader in High Pass"
+        hidden=yes
+        icon="data/core/images/units/monsters/gryphon.png"
+        icon_completed="data/core/images/units/monsters/gryphon.png~SCALE(72,72)~BLIT("data/core/images/misc/achievement-frames/frame-3-red.png",0,0)"
+    [/achievement]
+    [achievement]
+        id="conqueror_of_the_forest"
+        name=_"Conqueror of the Forest"
+        description=_"Defeat an enemy leader in Forbidden Forest"
+        icon="data/core/images/units/woses/wose-die-fall-5.png"
+        icon_completed="data/core/images/units/woses/wose-die-fall-5.png~SCALE(72,72)~BLIT("data/core/images/misc/achievement-frames/frame-8-grey.png",0,0)"
+    [/achievement]
+    [achievement]
+        id="new_thursagan"
+        name=_"New Thursagan"
+        description=_"Complete The Underlevels on challenging difficulty"
+        icon="data/core/images/items/hammer-runic.png"
+        icon_completed="data/core/images/items/hammer-runic.png~SCALE(72,72)~BLIT("data/core/images/misc/achievement-frames/frame-3-red.png",0,0)"
+    [/achievement]
+[/achievement_group]

data/campaigns/The_Hammer_of_Thursagan/scenarios/04_High_Pass.cfg

@@ -233,6 +233,19 @@
 #endif
     [/event]
 
+    [event]
+        name=die
+
+        [filter]
+            id="Kaara"
+        [/filter]
+
+        [set_achievement]
+            content_for=the_hammer_of_thursagan
+            id="gryphon_hunter"
+        [/set_achievement]
+    [/event]
+
     [event]
         {QUANTITY name (turn 16) (turn 14) (turn 9)}
 

data/campaigns/The_Hammer_of_Thursagan/scenarios/06_Forbidden_Forest.cfg

@@ -249,6 +249,25 @@
         [/move_unit_fake]
     [/event]
 
+    #Death of an enemy leader
+    [event]
+        name=die
+        [filter]
+            canrecruit=yes
+            [not]
+                side=1
+            [/not]
+        [/filter]
+        [message]
+            speaker=second_unit
+            message= _ "We shall pass!"
+        [/message]
+        [set_achievement]
+            content_for=the_hammer_of_thursagan
+            id="conqueror_of_the_forest"
+        [/set_achievement]
+    [/event]
+
     # Angarthing and Aiglondur speak when they reach the signpost.
     [event]
         name=moveto

data/campaigns/The_Hammer_of_Thursagan/scenarios/09_The_Underlevels.cfg

@@ -1294,6 +1294,13 @@
             result=victory
             carryover_report=no
         [/endlevel]
+
+#ifdef HARD
+        [set_achievement]
+            content_for=the_hammer_of_thursagan
+            id="new_thursagan"
+        [/set_achievement]
+#endif
     [/event]
     #########################################################################################
     ######################################## Deaths #########################################

data/campaigns/Under_the_Burning_Suns/units/monsters/Darawf.cfg

@@ -8,12 +8,12 @@
     hitpoints=22
     movement_type=dwarvishfoot
     movement=4
-    experience=50
+    experience=25
     {AMLA_DEFAULT}
     advances_to=null
-    level=1
+    level=0
     alignment=neutral
-    cost=17
+    cost=12
     usage=fighter
     # wmllint: local spelling Dawarf
     description= _ "Don’t ask where the Dawarf came from. You really don’t want to know. It is a secret well guarded by the great lore-masters of Wesnoth. And it isn’t pretty. Hint: it involves lots of sherbet."

data/campaigns/World_Conquest/lua/campaign/scenario.lua

@@ -1,6 +1,10 @@
 --<<
+local _ = wesnoth.textdomain 'wesnoth-wc'
+local _wesnoth = wesnoth.textdomain "wesnoth"
+
 local wc2_scenario = {}
 local on_event = wesnoth.require("on_event")
+local carryover = wesnoth.require("carryover_gold.lua")
 
 function wc2_scenario.is_human_side(side_num)
 	return side_num <= wml.variables.wc2_player_count
@@ -42,18 +46,52 @@ function wesnoth.wml_actions.wc2_start_units(cfg)
 	end
 end
 
-function wesnoth.wml_actions.wc2_store_carryover(cfg)
-	local human_sides = wesnoth.sides.find(wml.get_child(cfg, "sides"))
-	--use an the average amount of villages for this scenario to stay independent of map generator results.
-	local nvillages = cfg.nvillages
-	local turns_left = math.max(wesnoth.scenario.turns - wesnoth.current.turn, 0)
-	local player_gold = 0
+function wc2_scenario.average_gold()
+	local total_gold = 0
+	local nsides = 0
 
-	for side_num, side in ipairs(human_sides) do
-		player_gold = player_gold + side.gold
+	for i, s in ipairs(wesnoth.sides) do
+		if wc2_scenario.is_human_side(i) then
+			nsides = nsides + 1
+			total_gold = total_gold + s.gold
+		end
 	end
-	player_gold = math.max(player_gold / #human_sides, 0)
-	wml.variables.wc2_carryover = math.ceil( (nvillages*turns_left + player_gold) * 0.15)
+	return math.floor(total_gold / nsides + 0.5)
+end
+
+-- overwrite parts of the carryover gold implementation.
+function carryover.set_side_carryover_gold(side)
+	local turns_left = carryover.turns_left()
+	-- make the carryover bonus independent of the map generation.
+	local num_villages = wml.variables.wc2_nvillages or carryover.get_num_villages()
+
+	local finishing_bonus_per_turn = wml.variables.wc2_early_victory_bonus or num_villages * side.village_gold + side.base_income
+	local finishing_bonus =  finishing_bonus_per_turn * turns_left
+	local avg_gold = wc2_scenario.average_gold()
+
+	side.carryover_gold = math.ceil((avg_gold + finishing_bonus) * side.carryover_percentage / 100)
+
+	return {
+		turns_left = turns_left,
+		avg_gold = avg_gold,
+		finishing_bonus = finishing_bonus,
+		finishing_bonus_per_turn = finishing_bonus_per_turn,
+	}
+end
+
+---@param side side
+---@param info table
+---@return string
+function carryover.remaining_gold_message(side, info)
+	return "<small>\n" .. _wesnoth("Remaining gold: ") .. carryover.half_signed_value(side.gold) .. "</small>"
+		.. "<small>\n" .. _("Average remaining gold: ") .. carryover.half_signed_value(info.avg_gold) .. "</small>"
+end
+
+---@param side side
+---@param info table
+---@return string
+function carryover.total_gold_message(side, info)
+	return "<small>" .. _wesnoth("Total gold: ") .. carryover.half_signed_value(info.avg_gold + info.finishing_bonus) .. "</small>"
 end
 
 -- carryover handling: we use a custom carryover machnics that
@@ -81,11 +119,10 @@ on_event("wc2_start", function(cx)
 		end
 	end
 
-	local gold = (wml.variables.wc2_carryover or 0) + (wml.variables["wc2_difficulty.extra_gold"] or 0)
+	local gold = (wml.variables["wc2_difficulty.extra_gold"] or 0)
 	for i = 1, wml.variables.wc2_player_count do
 		wesnoth.sides[i].gold = wesnoth.sides[i].gold + gold
 	end
-	wml.variables.wc2_carryover = nil
 end)
 
 -- our victory condition
@@ -96,9 +133,7 @@ on_event("enemies defeated", function(cx)
 	wesnoth.audio.play("ambient/ship.ogg")
 	wesnoth.wml_actions.endlevel {
 		result = "victory",
-		carryover_percentage = 0,
-		carryover_add = false,
-		carryover_report = false,
+		carryover_report = true,
 	}
 end)
 

data/campaigns/World_Conquest/lua/map/main.lua

@@ -10,7 +10,7 @@ wesnoth.dofile("./scenario_utils/plot.lua")
 wesnoth.dofile("./scenario_utils/side_definitions.lua")
 settings = globals.settings or {}
 
-local n_villages = {27, 40, 53, 63}
+local early_victory_bonus = {27, 40, 53, 63}
 
 local function get_map_generator(scenario_data)
 	if globals.settings.default_id then
@@ -45,7 +45,9 @@ function wc_ii_generate_scenario(nplayers, gen_args)
 	std_print("test_nplayers", wml.variables.test_nplayers)
 	local scenario_data = get_scenario_data(nplayers, scenario_num)
 
-	local prestart_event = { name = "prestart" }
+	local prestart_event = {
+		name = "prestart",
+	}
 	-- our [scenario] skeleton
 	local scenario = {
 		event = {
@@ -71,6 +73,7 @@ function wc_ii_generate_scenario(nplayers, gen_args)
 				description="enables the buildin mod to mark units, disable this to be compatible with other mods that do the same thing",
 			},
 		},
+		-- note: in later scenarios these variables will probably be overwritten by whatever is present in the carryover.
 		variables = {
 			wc2_scenario = scenario_num,
 			wc2_player_count = nplayers,
@@ -81,6 +84,8 @@ function wc_ii_generate_scenario(nplayers, gen_args)
 		description = "WC_II_" .. nplayers .. "p_desc",
 		modify_placing = false,
 		turns = scenario_data.turns,
+		carryover_percentage = 15,
+		carryover_add = true,
 	}
 
 	-- add [side]s to the [scenario]
@@ -90,21 +95,6 @@ function wc_ii_generate_scenario(nplayers, gen_args)
 	-- add plot (that is [event] with [message]s)
 	add_plot(scenario, scenario_num, nplayers)
 
-	-- add the gold carryover event
-	if scenario_num < #n_villages then
-		table.insert(scenario.event, {
-			name = "victory",
-			wml.tag.wc2_store_carryover {
-				nvillages = n_villages[scenario_num] + 2 * nplayers,
-				wml.tag.sides {
-					side="1,2,3",
-					wml.tag.has_unit {
-					}
-				}
-			}
-		})
-	end
-
 	-- add some wc2 specific wml [event]s
 	for side_num = 1, nplayers do
 		table.insert(scenario.event, {
@@ -117,19 +107,28 @@ function wc_ii_generate_scenario(nplayers, gen_args)
 		})
 	end
 
+	if early_victory_bonus[scenario_num] then
+		table.insert(prestart_event,
+			wml.tag.set_variable {
+				name = "wc2_early_victory_bonus",
+				value = early_victory_bonus[scenario_num] + 2 * nplayers,
+			}
+		)
+	end
+
 	-- generate the map. (this also adds certain events for example to create [item]s or [sound_source]s)
 	local mapgen_func = get_map_generator(scenario_data)
 	mapgen_func(scenario, nplayers)
 
 	-- set the correct scenario name.
 	if scenario_num == 1 then --first map
-		scenario.name = "WC_II_" .. nplayers .. " - " .. _"Start"
+		scenario.name = _"Start"
 	else
-		local scenario_desc = _ "Scenario" .. scenario_num
+		local scenario_desc = _ "Scenario " .. scenario_num
 		if scenario_num == 5 then
 			scenario_desc = _"Final Battle"
 		end
-		scenario.name = "WC_II_" .. nplayers .. " " .. scenario_desc .. " - "--.. scenario.map_name
+		scenario.name = scenario_desc
 	end
 
 	local res = wc2_convert.lon_to_wml(scenario, "scenario")

data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg

@@ -13,6 +13,18 @@ _ "World Conquest 3p" #enddef
 #define WC_II_CAMPAIGN_NAME_4P
 _ "World Conquest 4p" #enddef
 
+#define WC_II_ABBREV_1P
+_ "WC1p" #enddef
+
+#define WC_II_ABBREV_2P
+_ "WC2p" #enddef
+
+#define WC_II_ABBREV_3P
+_ "WC3p" #enddef
+
+#define WC_II_ABBREV_4P
+_ "WC4p" #enddef
+
 #define WC_II_CAMPAIGN_DESC_1P
     _ "A randomly generated campaign for 1 player. It has 6 levels of difficulty.
 (Expert level, 5 scenarios.)" #enddef
@@ -101,7 +113,7 @@ _ "World Conquest 4p" #enddef
         icon = {ICON}
         image = {IMAGE_ONE}
         type = mp
-        abbrev = _ "WC" + {PLAYERS}\
+        abbrev = {WC_II_ABBREV_{PLAYERS}P}
         {WC2_CAMPAIGN_DIFFICULTY VERY_EASY {WC2_HUMAN_DIFFICULTY human-peasants/peasant purple} _"Peasant" _"Beginner" 6 2 2 10 yes 0}
         {WC2_CAMPAIGN_DIFFICULTY EASY {WC2_HUMAN_DIFFICULTY human-loyalists/sergeant black} _"Sergeant" _"Easy" 7 3 2 7 yes 5}
         {WC2_CAMPAIGN_DIFFICULTY NORMAL {WC2_HUMAN_DIFFICULTY human-loyalists/lieutenant brown} _"Lieutenant" _"Medium" 8 4 2 5 yes 10} {DEFAULT_DIFFICULTY}

data/campaigns/tutorial/gui/character_selection.cfg

@@ -13,9 +13,9 @@
                 grow_factor = 1
                 border = "all"
                 border_size = 5
-                horizontal_alignment = "left"
+                horizontal_alignment = "center"
                 [label]
-                    definition = "title"
+                    definition = "title_script"
                     label = _"Select Character"
                 [/label]
             [/column]
@@ -25,7 +25,7 @@
                 grow_factor = 1
                 border = "all"
                 border_size = 5
-                horizontal_alignment = "left"
+                horizontal_alignment = "center"
                 [label]
                     label = _"Who do you want to play as?"
                 [/label]
@@ -39,37 +39,88 @@
                             grow_factor = 1
                             border = "all"
                             border_size = 5
-                            [image]
-                                label = "units/konrad-fighter.png"
-                            [/image]
-                        [/column]
-                        [column]
-                            grow_factor = 1
-                            border = "all"
-                            border_size = 5
-                            [image]
-                                label = "units/human-princess.png~TC(1,magenta)"
-                            [/image]
-                        [/column]
-                    [/row]
-                    [row]
-                        [column]
-                            grow_factor = 1
-                            border = "all"
-                            border_size = 5
-                            [button]
-                                label = _"Konrad"
-                                return_value = 1
-                            [/button]
-                        [/column]
-                        [column]
-                            grow_factor = 1
-                            border = "all"
-                            border_size = 5
-                            [button]
-                                label = _"Li’sar"
-                                return_value = 2
-                            [/button]
+
+                            [horizontal_listbox]
+                                id = "characters"
+                                has_minimum = false
+                                [list_definition]
+                                    [row]
+                                        [column]
+                                            horizontal_grow = true
+                                            vertical_grow = true
+
+                                            [toggle_panel]
+                                                definition = "default"
+                                                return_value_id = "ok"
+                                                linked_group = "panel"
+
+                                                [grid]
+                                                    [row]
+                                                        grow_factor = 0
+
+                                                        [column]
+                                                            grow_factor = 1
+                                                            horizontal_alignment = "center"
+
+                                                            border = "all"
+                                                            border_size = 5
+
+                                                            [image]
+                                                                id = "image"
+                                                                definition = "default"
+                                                            [/image]
+                                                        [/column]
+                                                    [/row]
+
+                                                    [row]
+                                                        grow_factor = 1
+
+                                                        [column]
+                                                            grow_factor = 0
+                                                            border = "all"
+                                                            border_size = 10
+                                                            horizontal_grow = true
+                                                            vertical_alignment = "top"
+
+                                                            [label]
+                                                                id = "name"
+                                                                use_markup = true
+                                                                text_alignment = "center"
+                                                            [/label]
+                                                        [/column]
+                                                    [/row]
+                                                [/grid]
+                                            [/toggle_panel]
+                                        [/column]
+                                    [/row]
+                                [/list_definition]
+                                [list_data]
+                                    [row]
+                                        [column]
+                                            [widget]
+                                                id = "image"
+                                                label = "portraits/konrad.webp~SCALE(200,200)"
+                                            [/widget]
+                                            [widget]
+                                                id = "name"
+                                                label = "<span size='x-large' face='OldaniaAdfStd'>" + _"Konrad" + "</span>"
+                                            [/widget]
+                                        [/column]
+                                    [/row]
+                                    [row]
+                                        [column]
+                                            [widget]
+                                                id = "image"
+                                                label = "portraits/lisar.webp~SCALE(200,200)~FL()"
+                                            [/widget]
+                                            [widget]
+                                                id = "name"
+                                                label = "<span size='x-large' face='OldaniaAdfStd'>" + _"Li’sar" + "</span>"
+                                            [/widget]
+                                        [/column]
+                                    [/row]
+                                [/list_data]
+                            [/horizontal_listbox]
                         [/column]
                     [/row]
                 [/grid]

data/campaigns/tutorial/lua/character_selection.lua

@@ -7,17 +7,26 @@ local T = wml.tag
 local wml_actions = wesnoth.wml_actions
 local _ = wesnoth.textdomain "wesnoth-tutorial"
 
+selected = 1
+
+function pre_show(dialog)
+	local list = dialog:find("characters")
+	list.on_modified = function()
+		selected = list.selected_index
+		dialog:close()
+	end
+end
+
 function wml_actions.select_character()
 	local character_selection_dialog = wml.load "campaigns/tutorial/gui/character_selection.cfg"
 	local dialog_wml = wml.get_child(character_selection_dialog, 'resolution')
 
 	local result = wesnoth.sync.evaluate_single(function()
-		return { value = gui.show_dialog(dialog_wml) }
+		return { value = gui.show_dialog(dialog_wml, pre_show, function() end) }
 	end)
-	local character = result.value
 	local unit = wml.variables.student_store
 
-	if character == 2 then
+	if selected == 2 then
 		wesnoth.units.to_map({
 			type = "Fighteress",
 			side = 1,

data/campaigns/tutorial/lua/hint_message.lua

@@ -14,6 +14,8 @@ function wesnoth.wml_actions.hint_message(cfg)
             size = 18,
             location = {5,5},
             color = {255, 255, 255},
+            bgcolor = {0, 0, 0},
+            bgalpha = 85,
             duration = "unlimited",
             max_width = "40%",
             valign = "top",

data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg

@@ -151,6 +151,7 @@
 
         [select_character][/select_character]
 
+        {HIGHLIGHT_IMAGE $student_store.x $student_store.y "misc/unit-marker.png" ()}
         {CLEAR_VARIABLE student_store}
 
         {GENDER (
@@ -376,6 +377,17 @@
         ) (
             {PRINT ( _ "Move Li’sar next to Delfador")}
         )}
+
+        [store_unit]
+            [filter]
+                id=Delfador
+            [/filter]
+            variable=mentor
+            kill=no
+        [/store_unit]
+
+        {HIGHLIGHT_IMAGE $mentor.x $mentor.y "misc/unit-marker.png" ()}
+        {CLEAR_VARIABLE mentor}
     [/event]
 
     [event]

data/core/_main.cfg

@@ -9,6 +9,7 @@ wesnoth.dofile 'lua/wml-tags.lua'
 wesnoth.dofile 'lua/feeding.lua'
 wesnoth.dofile 'lua/diversion.lua'
 wesnoth.dofile 'lua/stun.lua'
+wesnoth.dofile 'lua/scenario_end_events.lua'
 >>
 [/lua]
 

data/core/editor/help.cfg

@@ -358,7 +358,7 @@ The map won’t look exactly the same in the game as it does in the editor, beca
 
 • Event handlers and scripting
 
-The editor is not a tool to help you scripting the scenario’s event handlers.
+The editor is not a tool to help you with scripting the scenario’s event handlers.
 
 • Infinite Backwards Compatibility
 
@@ -424,7 +424,7 @@ If your add-on will only be used on 1.18 and later, it is instead recommended to
 • <span face='monospace'>maps/first.map</span>
   ◦ this is the .map file created by the scenario editor when saving in scenario mode
 • <span face='monospace'>scenarios/other.cfg</span>
-  ◦ this is the .cfg file containing everything that the scenario editor doesn't understand
+  ◦ this is the .cfg file containing everything that the scenario editor doesn’t understand
 • <span face='monospace'>scenarios/first.cfg</span>
   ◦ inside the <span face='monospace'>[scenario]</span> element, use <span face='monospace'>map_file=&quot;first.map&quot;</span> to load the map file
   ◦ inside the <span face='monospace'>[scenario]</span> element, use <span face='monospace'>include_file=&quot;other.cfg&quot;</span> to load the additional cfg file"
@@ -436,7 +436,7 @@ If your add-on will only be used on 1.18 and later, it is instead recommended to
 [topic]
     id=editor_masks
     title= _ "Editor Mask Usage"
-    text= _ "Masks can be applied to a base map for reusal in several scenarios playing at the same locations."
+    text= _ "Masks can be applied to a base map for reuse in several scenarios playing at the same locations."
 [/topic]
 # wmllint: markcheck on
 
@@ -463,9 +463,9 @@ In scenario mode, the button accesses an editor for individual schedules for <re
 
 There is a filter function to show only a subset of the available items — this is the leftmost of the four buttons at the top of the palette, and the graphic changes depending on what is selected. Examples:" +
         "<table>" +
-        "<row><col><img src=icons/terrain/terrain_group_all_30.png align=left /></col><col>" + _ "Show all kinds of terrain</col></row>" +
-        "<row><col><img src=icons/terrain/terrain_group_water_deep_30.png align=left /></col><col>" + _ "Show only water terrains</col></row>" +
-        "<row><col><img src=icons/terrain/terrain_group_village_30.png align=left /></col><col>" + _ "Show only villages</col></row>" +
+        "<row><col><img src=icons/terrain/terrain_group_all_30.png align=left /></col><col>" + _ "Show all kinds of terrain" + "</col></row>" +
+        "<row><col><img src=icons/terrain/terrain_group_water_deep_30.png align=left /></col><col>" + _ "Show only water terrains" + "</col></row>" +
+        "<row><col><img src=icons/terrain/terrain_group_village_30.png align=left /></col><col>" + _ "Show only villages" + "</col></row>" +
         "</table>"
 [/topic]
 # wmllint: markcheck on
@@ -483,7 +483,7 @@ There is a filter function to show only a subset of the available items — this
 
 " + _ "<header>Native</header>
 
-A map file consists of rows with comma separated terrain code strings. The only non-terrain information provided by the map syntax is the set of locations created by the <ref dst='editor_tool_starting'>Starting Locations Tool</ref>. The files can be edited with a general purpose text editor like notepad.
+A map file consists of rows with comma-separated terrain code strings. The only non-terrain information provided by the map syntax is the set of locations created by the <ref dst='editor_tool_starting'>Starting Locations Tool</ref>. The files can be edited with a general purpose text editor.
 
 These files can be used directly for multiplayer games, the number of players is automatically determined by the number of starting positions. When saved in the default directory, the map can be found in the “Custom Maps” game type of the multiplayer “Create Game” dialog; you may need to refresh the cache (press F5 on the title screen) before a newly-created map appears.
 
@@ -496,7 +496,7 @@ The <italic>map_file</italic> method is preferred over using a preprocessor incl
 
 " + _ "<header>Embedded</header>
 
-The map data can stored as part of a scenario’s .cfg file, directly in the <italic>map_data</italic> attribute. In other words, in the place that the preprocessor would include it when using the preprocessor-include method.
+The map data can be stored as part of a scenario’s .cfg file, directly in the <italic>map_data</italic> attribute. In other words, in the place that the preprocessor would include it when using the preprocessor-include method.
 
 <header>Using Embedded Format in Terrain Mode</header>
 

data/core/help.cfg

@@ -93,7 +93,7 @@
     [topic]
         id=..introduction
         title= _ "Introduction"
-        text="<img>src=misc/logo-bg.png~BLIT(misc/logo.png) align=middle</img>" + _ "<br/><italic>text='Battle for Wesnoth'</italic> is a turn-based fantasy strategy game somewhat unusual among modern strategy games. While other games strive for complexity, <italic>text='Battle for Wesnoth'</italic> strives for simplicity of both rules and gameplay. This does not make the game simple, however — from these simple rules arises a wealth of strategy, making the game easy to learn but a challenge to master.
+        text="<img src=misc/logo-bg.png~BLIT(misc/logo.png) align=middle /><br/>" + _ "<italic>Battle for Wesnoth</italic> is a turn-based fantasy strategy game somewhat unusual among modern strategy games. While other games strive for complexity, <italic>Battle for Wesnoth</italic> strives for simplicity of both rules and gameplay. This does not make the game simple, however — from these simple rules arises a wealth of strategy, making the game easy to learn but a challenge to master.
 
 The following pages outline all you need to know to play Wesnoth. As you play, new information is added to the various categories as you come across new aspects of the game. For more detailed information on special situations and exceptions, follow the included links."
     [/topic]
@@ -575,7 +575,7 @@ Mixed terrain types share the properties of multiple basic terrain types — uni
 
 " + "<img src='terrain/hills/regular.png~BLIT(terrain/forest/pine-tile.png)'/>" + "<img src='terrain/hills/desert.png'/>" + "<img src='terrain/cave/hills-variation.png'/><br/>" + _ "One notable exception is bridge terrains, such as <italic>bridges over shallow water</italic>, <italic>fords</italic>, and <italic>bridges over chasms</italic>. Fords are easily passable to both merfolk and humans — all units moving on a ford enjoy the best defense and best movement out of flat and shallow water, rather than the worse movement of the two. Similarly, bridges over chasms are passable to nonfliers (unsurprisingly).
 
-" + "<img src='terrain/water/coast-tile.png~BLIT(terrain/bridge/wood-se-nw.png)'/>" + "<img src='terrain/water/ford-tile.png'/>" + "<img src='terrain/chasm/regular-tile.png~BLIT(terrain/cave/chasm-stone-bridge-sw-ne-tile.png)'/>" + _ "<br/>Land-based villages generally give the best defense and movement as well. These villages are mixed terrains, based on the village terrain type, together with hill, swamp, and cave, respectively.
+" + "<img src='terrain/water/coast-tile.png~BLIT(terrain/bridge/wood-se-nw.png)'/>" + "<img src='terrain/water/ford-tile.png'/>" + "<img src='terrain/chasm/regular-tile.png~BLIT(terrain/cave/chasm-stone-bridge-sw-ne-tile.png)'/><br/>" + _ "Land-based villages generally give the best defense and movement as well. These villages are mixed terrains, based on the village terrain type, together with hill, swamp, and cave, respectively.
 
 " + "<img src='terrain/hills/regular.png~BLIT(terrain/village/human-hills-tile.png)'/>" + "<img src='terrain/swamp/water-tile.png~BLIT(terrain/village/swampwater-tile.png)'/>" + "<img src='terrain/cave/floor6.png~BLIT(terrain/village/cave-tile.png)'/><br/>" + _ "Finally, water villages are generally inhospitable to land units, and do not give defense or movement benefits associated with the village terrain type. Instead, they count only as water tiles.