Merge branch 'master' of git://github.com/wesnoth/wesnoth
This commit is contained in:
Chris Beck
commit
267ebd3385
4 changed files with 91 additions and 69 deletions
|
|
@ -19,6 +19,8 @@ Version 1.13.0-dev:
|
|||
them for UMC and adding functionality from other versions of Wesnoth. Some
|
||||
code cleanup for consistency, readability and speed, as well as fixing of
|
||||
some minor and subtle bugs.
|
||||
* Fix bug in Random Recruit Micro AI: the AI can now handle custom castle
|
||||
terrain independent of its terrain code
|
||||
* Campaigns:
|
||||
* Changed all occurrences of {FLAG_VARIANT ragged} to {FLAG_VARIANT6 ragged}
|
||||
* Eastern Invasion:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
local H = wesnoth.require "lua/helper.lua"
|
||||
local AH = wesnoth.require("ai/lua/ai_helper.lua")
|
||||
local LS = wesnoth.dofile "lua/location_set.lua"
|
||||
|
||||
local recruit_type
|
||||
|
||||
|
|
@ -13,26 +15,44 @@ function ca_recruit_random:evaluation(ai, cfg)
|
|||
return 0
|
||||
end
|
||||
|
||||
-- Check if there is space left for recruiting
|
||||
-- Find all connected castle hexes
|
||||
local castle_map = LS.of_pairs({ { leader.x, leader.y } })
|
||||
local width, height, border = wesnoth.get_map_size()
|
||||
local castle = {
|
||||
locs = wesnoth.get_locations {
|
||||
x = "1-"..width, y = "1-"..height,
|
||||
{ "and", {
|
||||
x = leader.x, y = leader.y, radius = 200,
|
||||
{ "filter_radius", { terrain = 'C*,K*,C*^*,K*^*,*^K*,*^C*' } }
|
||||
} }
|
||||
}
|
||||
}
|
||||
local new_castle_hex_found = true
|
||||
|
||||
local no_space = true
|
||||
for _,loc in ipairs(castle.locs) do
|
||||
local unit = wesnoth.get_unit(loc[1], loc[2])
|
||||
if (not unit) then
|
||||
no_space = false
|
||||
break
|
||||
while new_castle_hex_found do
|
||||
new_castle_hex_found = false
|
||||
local new_hexes = {}
|
||||
|
||||
castle_map:iter(function(x, y)
|
||||
for xa,ya in H.adjacent_tiles(x, y) do
|
||||
if (not castle_map:get(xa, ya))
|
||||
and (xa >= 1) and (xa <= width)
|
||||
and (ya >= 1) and (ya <= height)
|
||||
then
|
||||
local is_castle = wesnoth.get_terrain_info(wesnoth.get_terrain(xa, ya)).castle
|
||||
|
||||
if is_castle then
|
||||
table.insert(new_hexes, { xa, ya })
|
||||
new_castle_hex_found = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
for _,hex in ipairs(new_hexes) do
|
||||
castle_map:insert(hex[1], hex[2])
|
||||
end
|
||||
end
|
||||
|
||||
-- Check if there is space left for recruiting
|
||||
local no_space = true
|
||||
castle_map:iter(function(x, y)
|
||||
local unit = wesnoth.get_unit(x, y)
|
||||
if (not unit) then
|
||||
no_space = false
|
||||
end
|
||||
end)
|
||||
if no_space then return 0 end
|
||||
|
||||
-- Set up the probability array
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gs^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gs^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gs^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gs^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm , Mm , Gg^Vh , Mm , Mm , Hh , Gs^Fp , Gs^Fp , Mm , Hh , Mm , Hh , Mm , Gs^Fp , Gs^Fp , Mm , Mm , Mm , Mm , Hh , Mm , Hh , Mm , Hh^Vc , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm^Xm , Mm , Mm , Mm , Gg^Vh , Mm , Mm , Hh , Hh , Mm , Gg^Vh , Gs^Fp , Mm , Gs^Fp , Gg^Vh , Hh , Hh , Mm , Gs^Fp , Gs^Fp , Hh , Hh , Hh , Mm , Hh , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm , Hh , Hh , Gs^Fp , Hh , Hh , Hh , Mm , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh , Hh , Re , Hh , Gg , Mm , Gg , Hh , Hh , Gg^Vh , Hh , Hh , Gg , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Chr , Re , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vh , Gs^Fp , Gg , Gg , Gg , Re^Gvs , Hh , Gg , Hh , Hh , Rd , Re , Re , Mm , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Mm , Gs^Fp , Mm , Mm , Hh , Hh , Gs^Fp , Chr , Chr , Chr , Re , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg^Vh , Re^Gvs , Re^Gvs , Gg , Chr , Chr , Re , Kh , Hh , Hh , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Hh , Gs^Fp , Mm , Gs^Fp , Gg^Vh , Gs^Fp , Re , Chr , 1 Kh , Chr , Gs^Fp , Gs^Fp , Re , Gs^Fp , Chr , Gg , Gs^Fp , Gg , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Rd , Rd , Chr , Hh , Mm , Hh , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Mm , Hh , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Chr , Gs^Fp , Chr , Chr , Gs^Fp , Re , Re , Gs^Fp , Chr , Gg , Gg , Gg , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re , Gg , Gg , Gg , Hh , Hh , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Gg^Vh , Hh , Hh , Hh , Gs^Fp , Gs^Fp , Gs^Fp , Chr , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Gs^Fp , Re^Gvs , Rd , Rd , Re^Gvs , Re^Gvs , Gg , Gg , Gg , Rd , Re , Rd , Rd , Gg , Gg^Vh , Hh , Gg , Hh , Hh , Mm , Mm , Mm
|
||||
Mm , Mm , Hh , Hh , Gg , Hh , Gs^Fp , Gg^Vh , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vh , Gs^Fp , Rd , Re^Gvs , Re^Gvs , Re^Gvs , Gg^Vh , Re^Gvs , Gg , Gg , Rd , Rd , Gg^Vh , Rd , Gs^Fp , Re , Gg , Gg , Hh , Hh , Mm , Hh , Mm , Mm , Mm
|
||||
Hh , Hh , Hh , Hh , Mm , Gg , Gg , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Re , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Rd , Re , Re , Re^Gvs , Gg , Re^Gvs , Gs^Fp , Gs^Fp , Gg , Gg , Hh , Hh , Hh , Mm , Hh , Mm , Mm , Mm
|
||||
Hh , Hh , Hh , Mm , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Rd , Gg , Rd , Gs^Fp , Re , Re^Gvs , Re^Gvs , Gg , Chr , Rd , Gg^Vh , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gs^Fp , Gg , Gg , Re^Gvs , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm
|
||||
Hh , Hh , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg^Vh , Gg , Re , Rd , Gg^Vh , Re , Gg , Re , Gg^Vh , Re^Gvs , Re^Gvs , Re , Re , Chr , Rd , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg , Hh , Mm , Mm , Mm
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh , Gg , Re , Re , Gg , Gg , Gs^Fp , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Re , Chr , Re , Kh , Rd , Re , Re^Gvs , Re , Gg , Gg , Gg , Gg , Gg , Gg^Vh , Gg , Hh , Hh , Gg^Vh , Mm , Mm
|
||||
Gg , Gg , Gs^Fp , Mm , Hh , Gg , Re , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Gs^Fp , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Re , Re , Chr , Gg , Gg , Gg , Rd , Re , Gg , Gg , Gg , Gg , Gg , Gg , Hh , Hh , Hh , Hh , Mm , Mm
|
||||
Gg , Gg , Gg , Gg , Gg^Vh , Rd , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Rd , Rd , Gg , Gg , Gg , Gg , Gg , Gg^Vh , Re , Gg , Re^Gvs , Gg^Vh , Re^Gvs , Re^Gvs , Hh , Hh , Gg , Hh , Hh , Hh , Hh
|
||||
Re , Re , Re^Gvs , Re^Gvs , Chr , Chr , Re , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gs^Fp , Rd , Gg , Gg , Gg , Re^Gvs , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Gg , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Hh , Ce , Hh , Gg , Hh , Hh
|
||||
Rd , Rd , Rd , Re^Gvs , Re , Rd , Rd , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Rd , Gg , Gs^Fp , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Gg^Vh , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Gg , Re^Gvs , Gg , Re^Gvs , Rd , Re , Rd , Ce , 3 Ke , Ce , Rd , Rd , Rd
|
||||
Hh , Hh , Gg^Vh , Re , Hh , Chr , Gg , Re , Gg , Gg^Vh , Rd , Rd , Gs^Fp , Gs^Fp , Chr , Gs^Fp , Re^Gvs , Re^Gvs , Gg , Chr , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Rd , Gg , Gg , Gg , Rd , Gg^Vh , Gg , Ce , Ce , Ce , Gg , Gg , Gg
|
||||
Mm , Mm , Hh , Hh , Mm , Hh , Hh , Gg , Gg , Gg , Rd , Gg , Gs^Fp , Gs^Fp , Chr , Gg , Rd , Re^Gvs , Gg , Gg , Rd , Gs^Fp , Re^Gvs , Re^Gvs , Gg , Rd , Re , Rd , Re , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Hh , Gg^Vh , Gg
|
||||
Mm , Mm , Hh , Mm , Mm , Hh , Gg^Vh , Hh , Gg , Gg , Rd , Gs^Fp , Gg^Vh , Chr , Gg , Gg , Rd , Gg , Ch , Rd , Gg , Rd , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Rd , Re , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Hh , Hh , Mm , Hh , Hh
|
||||
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gg , Rd , Re^Gvs , Gg , Re^Gvs , Gg , Gg , Gg , Rd , Ch , 2 Kh , Ch , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re , Rd , Gg , Gg , Gs^Fp , Gg^Vh , Gs^Fp , Hh , Gg^Vh , Hh , Mm , Mm , Mm
|
||||
Mm^Xm , Mm^Xm , Mm^Xm , Mm^Xm , Mm , Mm , Mm , Hh , Hh , Rd , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Gg^Vh , Gg , Ch , Ch , Ch , Gg , Gg , Chr , Gg , Re , Gg^Vh , Gg , Gg , Gs^Fp , Gs^Fp , Hh , Hh , Mm , Mm , Mm , Mm , Mm
|
||||
Mm^Xm , Mm^Xm , Mm , Mm , Mm , Mm , Hh , Chr , Gg , Rd , Rd , Re^Gvs , Gg^Vh , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Rd , Re , Gg , Chr , Gs^Fp , Gs^Fp , Gg , Re , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Chr , Chr , Hh , Mm , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Mm , Mm , Gg , Chr , Kh , Hh , Gg , Gg , Re , Gg , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Rd , Re^Gvs , Re , Gg , Gg^Vh , Gs^Fp , Gs^Fp , Gg , Re , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Hh , Hh , Kh , Mm , Mm , Mm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm , Gg^Vh , Gg , Chr , Chr , Gg , Gg , Gg , Re , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Re^Gvs , Re^Gvs , Rd , Rd , Gg , Gg , Gs^Fp , Gs^Fp , Gg^Vh , Re , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg^Vh , Chr , Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm , Mm , Chr , Gg , Gg , Re^Gvs , Gg^Vh , Rd , Re^Gvs , Gg , Gs^Fp , Chr , Gs^Fp , Gs^Fp , Re^Gvs , Re^Gvs , Rd , Gg , Gg , Gg , Gs^Fp , Gg , Rd , Gg , Gg , Gg , Gg , Hh , Hh , Hh , Mm , Mm , Mm , Mm^Xm , Mm^Xm
|
||||
Mm , Mm , Mm , Chr , Hh , Gg , Re^Gvs , Re^Gvs , Rd , Rd , Re^Gvs , Gg , Gg , Gs^Fp , Gg , Gg^Vh , Gg , Re^Gvs , Rd , Gg , Gg , Gg , Rd , Rd , Gg , Gg , Re^Gvs , Gg , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Mm , Mm , Hh , Hh , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re , Re^Gvs , Rd , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg^Efm , Re , Re , Gg , Rd , Re^Gvs , Re^Gvs , Gg^Efm , Gg^Vh , Re^Gvs , Hh , Hh , Mm , Mm , Mm , Mm , Mm^Xm , Mm , Mm
|
||||
Mm , Mm , Gg , Hh , Gg , Re^Gvs , Rd , Rd , Re , Re^Gvs , Gg , Re^Gvs , Re^Gvs , Gg , Re^Gvs , Gg , Gg , Gg^Efm , Gg^Vh , Re , Rd , Re , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Gg^Efm , Re^Gvs , Mm , Hh , Hh , Mm , Mm^Xm , Mm^Xm , Mm , Mm , Mm
|
||||
Gg , Gg , Gg^Vh , Gg , Re , Rd , Gg , Gg^Vh , Gs^Fp , Gg , Gs^Fp , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg^Efm , Gs^Fp , Rd , Gg , Gg , Gg , Gg , Gg , Gg^Efm , Gg , Hh , Mm , Hh , Mm , Mm , Mm^Xm , Mm^Xm , Mm , Mm , Mm
|
||||
Rd , Rd , Rd , Re , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vh , Hh , Re^Gvs , Re^Gvs , Gg , Gg , Gs^Fp , Gs^Fp , Rd , Gg , Gg^Vh , Gg , Gg , Gg , Gg , Gg , Hh , Mm , Mm , Mm , Mm , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
|
||||
Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh , Hh , Hh , Hh , Mm , Gg^Vh , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg^Vh , Hh , Hh , Hh , Mm , Mm , Mm , Hh , Mm^Xm , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
|
||||
Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg , Gs^Fp , Hh , Gs^Fp , Gs^Fp , Hh , Mm , Hh , Mm , Mm , Hh , Chr , Chr , Gg , Gs^Fp , Gs^Fp , Re , Gs^Fp , Gs^Fp , Gg , Gg , Chr , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm , Mm
|
||||
Re^Gvs , Re^Gvs , Gg^Vh , Gg , Gg , Gs^Fp , Mm , Mm , Mm , Hh , Mm , Mm , Mm , Mm , Mm , Hh , Chr , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Gs^Fp , Gs^Fp , Gg , Gg , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Re^Gvs , Re^Gvs , Gg , Gg , Gg , Gs^Fp , Mm , Mm , Mm , Hh , Mm , Mm , Mm , Mm , Mm , Hh , Chr , Gs^Fp , Gs^Fp , Gs^Fp , Rd , Gs^Fp , Gs^Fp , Gg , Gg , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Hh^Vhh, Mm, Mm, Hh, Gs^Fp, Gs^Fp, Mm, Hh^Emf, Mm, Hh, Mm, Gs^Fp, Gs^Fp, Mm, Mm, Mm, Mm, Hh, Mm, Hh, Mm, Hh^Vhh, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm^Xm, Mm, Mm, Mm, Hh^Vhh, Mm, Mm, Hh^Emf, Hh, Mm, Hh^Vhh, Gs^Fp, Mm, Gs^Fp, Hh^Vhh, Hh, Hh, Mm, Gs^Fp, Gs^Fp, Hh, Hh, Hh, Mm, Hh^Emf, Hh, Hh, Hh^Emf, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Hh^Emf, Hh, Gs^Fp, Hh, Hh^Emf, Hh, Mm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Emf, Hh^Emf, Re, Hh, Gg^Es, Mm, Gg, Hh, Hh^Emf, Hh^Vhh, Hh, Hh, Gg, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Gs^Fms, Gs^Fms, Gs^Fp, Gs^Fp, Ch, Re, Gs^Fms, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Vhh, Gs^Fp, Gg, Gg, Gg, Re^Gvs, Hh, Gg, Hh^Emf, Hh, Rd, Re, Re, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Gs^Fp, Mm, Mm, Hh, Hh, Gs^Fp, Ch, Ch, Ch, Re, Gs^Fp, Gs^Fp, Gs^Fms, Gs^Fms, Gs^Fp, Gs^Fp, Gs^Fms, Gg, Gg, Gg^Vh, Re^Gvs, Re^Gvs, Gg, Chr, Chr, Re, Kh, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Gs^Fp, Mm, Gs^Fp, Gg^Vh, Gs^Fp, Re, Ch, 2 Kh, Ch, Gs^Fp, Gs^Fms, Re, Gs^Fp, Gs^Fms, Gll^Fp, Gs^Fms, Gg^Es, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Rd, Rd, Chr, Hh, Mm, Hh, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ch, Gs^Fp, Ch, Ch, Gs^Fp, Re, Re, Gs^Fp, Gs^Fms, Gg, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Gg, Gg, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh^Vhh, Hh^Emf, Hh, Hh, Gs^Fms, Gs^Fp, Gs^Fp, Gs^Fms, Gs^Fp, Gs^Fms, Gs^Fp, Rd, Gs^Fp, Re^Gvs, Rd, Rd, Re^Gvs, Re^Gvs, Gg, Gg^Es, Gg, Rd, Re, Rd, Rd, Gg, Gg^Vh, Hh, Gg, Hh, Hh, Mm, Mm, Mm
|
||||
Mm, Mm, Hh, Hh^Emf, Gg, Hh, Gs^Fp, Gg^Vh, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fms, Gg^Vh, Gs^Fp, Rd, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Vh, Re^Gvs, Gg, Gg^Es, Rd, Rd, Gg^Vh, Rd, Gs^Fp, Re, Gg, Gg, Hh, Hh, Mm, Hh, Mm, Mm, Mm
|
||||
Hh, Hh, Hh, Hh, Mm, Gg, Gg, Gs^Fp, Gg, Gs^Fms, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Rd, Re, Re, Re^Gvs, Gg, Re^Gvs, Gs^Fp, Gs^Fms, Gg, Gg, Hh, Hh, Hh, Mm, Hh, Mm, Mm, Mm
|
||||
Hh, Hh, Hh, Mm, Gs^Fp, Gg, Gg, Gg^Es, Gg, Gg, Rd, Gg, Rd, Gs^Fp, Re, Re^Gvs, Re^Gvs, Gg, Chr, Rd, Gg^Vh, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fp, Gg, Gg, Re^Gvs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Hh, Hh, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg^Vh, Gg, Re, Rd, Gg^Vh, Re, Gg, Re, Gg^Vh, Re^Gvs, Re^Gvs, Re, Re, Chr, Rd, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gs^Fp, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Hh, Mm, Mm, Mm
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Gg, Re, Re, Gg, Gg, Gs^Fp, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Wm, Re^Gvs, Re, Chr, Re, Kh, Rd, Re, Re^Gvs, Re, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Gg, Hh, Hh^Emf, Hh^Vhh, Mm, Mm
|
||||
Gg, Gg, Gs^Fp, Mm, Hh, Gg^Es, Re, Re^Gvs, Re^Gvs, Gg^Es, Gs^Fp, Gs^Fp, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Re, Re, Chr, Gg, Gg, Gg, Rd, Re, Gg, Gg, Gg^Es, Gg, Gg, Gg, Hh, Hh, Hh^Emf, Hh, Mm, Mm
|
||||
Gg, Gg, Gg^Es, Gg, Gg^Vh, Rd, Re^Gvs, Re^Gvs, Gg, Gs^Fp, Gs^Fp, Gs^Fms, Gs^Fp, Gg, Gg, Gg^Es, Rd, Rd, Gg, Gg, Gg, Gg, Gg, Gg^Vh, Re, Gg, Re^Gvs, Gg^Vh, Re^Gvs, Re^Gvs, Hh, Hh, Gg, Hh, Hh, Hh, Hh
|
||||
Re, Re, Re^Gvs, Re^Gvs, Gs, Rd, Re, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fp, Rd, Gg, Gg, Gg, Re^Gvs, Gg, Gg, Gg, Gs^Fp, Gs^Fms, Gs^Fp, Rd, Gg, Gg^Es, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Hh, Ce, Hh, Gg, Hh, Hh
|
||||
Rd, Rd, Rd, Re^Gvs, Chr, Rd, Rd, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Rd, Gg, Gs^Fp, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Gg^Vh, Gll^Fp, Gs^Fp, Gs^Fp, Rd, Gg, Re^Gvs, Gg, Re^Gvs, Rd, Re, Rd, Ce, 3 Ke, Ce, Rd, Rd, Rd
|
||||
Hh, Hh^Emf, Hh^Vhh, Chr, Kh, Chr, Gg, Re, Gg, Gg^Vh, Rd, Rd, Gs^Fms, Gs^Fp, Gll^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Gg, Gs^Fms, Gll^Fp, Gs^Fms, Gs^Fp, Rd, Rd, Gg, Gg, Gg, Rd, Gg^Vh, Gg, Ce, Ce, Ce, Gg, Gg, Gg
|
||||
Mm, Mm, Hh, Hh, Mm, Chr, Hh, Gg, Gg^Es, Gg, Rd, Gll^Fp, Gll^Fp, Gs^Fp, Gs^Fms, Gg, Rd, Re^Gvs, Gg, Gg, Rd, Gs^Fms, Re^Gvs, Re^Gvs, Gg, Rd, Re, Rd, Re, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Hh^Emf, Hh^Vhh, Gg
|
||||
Mm, Mm, Hh, Mm, Mm, Hh, Hh^Vhh, Hh^Emf, Gg, Gg, Rd, Gs^Fp, Gg^Vh, Gll^Fp, Gg^Es, Gg, Rd, Gg^Es, Gs, Rd, Gg, Rd, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Rd, Re, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Hh, Mm, Hh, Hh
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Rd, Re^Gvs, Gg, Re^Gvs, Gg^Wm, Gg, Gg, Rd, Gg, Rd, Rd, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re, Rd, Gg, Gg, Gs^Fp, Gg^Vh, Gs^Fp, Hh, Hh^Vhh, Hh^Emf, Mm, Mm, Mm
|
||||
Mm^Xm, Mm^Xm, Mm^Xm, Mm^Xm, Mm, Mm, Mm, Hh, Hh, Rd, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Gg^Vh, Gg, Rd, Gg, Gg, Gg, Gg, Gll^Fp, Gg, Re, Gg^Vh, Gg, Gg^Es, Gs^Fp, Gs^Fp, Hh, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm^Xm, Mm^Xm, Mm, Mm, Mm, Mm, Chr, Ch, Gll^Fp, Rd, Rd, Re^Gvs, Gg^Vh, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Rd, Re, Gg, Gll^Fp, Gs^Fp, Gs^Fp, Gg, Re, Re^Gvs, Re^Gvs, Gg, Gs^Fp, Chr, Chr, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Gll^Fp, Ch, 1 Kh, Hh^Fp, Gll^Fp, Gll^Fp, Re, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Rd, Re^Gvs, Re, Gg, Gg^Vh, Gs^Fp, Gll^Fp, Gg, Re, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Hh, Chr, Kh, Mm, Mm, Mm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm, Hh^Vhh, Gs^Fms, Ch, Chr, Gs^Fms, Gs^Fms, Gg, Re, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Rd, Rd, Gg, Gg^Es, Gs^Fp, Gs^Fp, Gg^Vh, Re, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Hh^Vhh, Chr, Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm, Mm, Hh, Gll^Fp, Gs^Fms, Gs^Fms, Gg^Vh, Rd, Re^Gvs, Gg, Gs^Fp, Gll^Fp, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Rd, Gg, Gg, Gg, Gs^Fp, Gg, Rd, Gg, Gg, Gg, Gg^Es, Hh^Emf, Hh, Hh, Mm, Mm, Mm, Mm^Xm, Mm^Xm
|
||||
Mm, Mm, Mm, Hh, Hh, Gll^Fp, Re^Gvs, Re^Gvs, Rd, Rd, Re^Gvs, Gg, Gg, Gs^Fp, Gg, Gg^Vh, Gg, Re^Gvs, Rd, Gg, Gg, Gg, Rd, Rd, Gg, Gg, Re^Gvs, Gg, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Hh, Hh, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re^Gvs, Rd, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Re, Re, Gg, Rd, Re^Gvs, Re^Gvs, Gg^Wm, Gg^Vh, Re^Gvs, Hh, Hh, Mm, Mm, Mm, Mm, Mm^Xm, Mm, Mm
|
||||
Mm, Mm, Gg, Hh, Gg, Re^Gvs, Rd, Rd, Re, Re^Gvs, Gg, Re^Gvs, Re^Gvs, Gg, Re^Gvs, Gg^Es, Gg, Gg^Efm, Gg^Vh, Re, Rd, Re, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg^Efm, Re^Gvs, Mm, Hh, Hh, Mm, Mm^Xm, Mm^Xm, Mm, Mm, Mm
|
||||
Gg, Gg, Gg^Vh, Gg, Re, Rd, Gg, Gg^Vh, Gs^Fp, Gg, Gs^Fp, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Efm, Gs^Fp, Rd, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Hh, Mm, Hh, Mm, Mm, Mm^Xm, Mm^Xm, Mm, Mm, Mm
|
||||
Rd, Rd, Rd, Re, Gg, Gg^Es, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Vhh, Hh^Emf, Re^Gvs, Re^Gvs, Gg, Gg, Gs^Fp, Gs^Fp, Rd, Gg, Gg^Vh, Gg^Es, Gg, Gg, Gg, Gg, Hh, Mm, Mm, Mm, Mm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Hh^Emf, Hh, Hh, Mm, Hh^Vhh, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Hh^Vhh, Hh^Emf, Hh, Hh, Mm, Mm, Mm, Hh, Mm^Xm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg, Gs^Fp, Hh, Gs^Fp, Gs^Fp, Hh, Mm, Hh, Mm, Mm, Hh, Gs^Fms, Gll^Fp, Gg, Gs^Fp, Gs^Fp, Re, Gs^Fp, Gs^Fp, Gg, Chr, Hh, Kh, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm, Mm
|
||||
Re^Gvs, Re^Gvs, Gg^Vh, Gg, Gg, Gs^Fp, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Gs^Fms, Gll^Fp, Gs^Fp, Gs^Fp, Rd, Gs^Fp, Gs^Fp, Gg, Gg, Chr, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Re^Gvs, Re^Gvs, Gg, Gg, Gg, Gs^Fp, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Chr, Gs^Fp, Gs^Fp, Gs^Fp, Rd, Gs^Fp, Gs^Fp, Gg, Gg, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@
|
|||
id=Zlex
|
||||
name= _ "Zlex"
|
||||
side=1
|
||||
x=10
|
||||
y=7
|
||||
x=6
|
||||
y=24
|
||||
[modifications]
|
||||
{TRAIT_LOYAL}
|
||||
{TRAIT_RESILIENT}
|
||||
|
|
@ -210,23 +210,23 @@
|
|||
name=start
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "The orcs have gotten careless — look how easily I stole these weapons and this bright gold from them. Now they’re killing each other. This might be the only chance we got to get rid of this scum once and for all. Let’s give it to ’em!"
|
||||
message= _ "This challenger has made the orcs careless — I managed to sneak in and filch the key to the storerooms. Come with me lads, and grab some weapons! Let them hack at each other, we can use this as our chance to get rid of this scum once and for all. Who's with me?"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Zlex
|
||||
message= _ "Brave words, Tallin, but moon-touched crazy ones. You have weapons for fewer than a dozen men. None of us has any armor, or any training. What are the rest of us going to fight them with, pitchforks?!"
|
||||
message= _ "Brave words, Tallin, but if I didn't know you better I'd say you were moon-touched. These are not weapons, just pitchforks and hunting bows. We have no armor, no training. Are we supposed to beat them with bad breath and colorful language?"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "There’s nothing wrong with pitchforks, I’ll give these orcish weapons to any man among you who wants to take ’em and fight with a pitchfork myself. We easily outnumber the orcs, not to speak of the fact that they are killing each other."
|
||||
message= _ "Well, those things will certainly get their attention, and there’s nothing wrong with pitchforks. We easily outnumber the orcs, not to speak of the fact that they are killing each other."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Zlex
|
||||
message= _ "But their wolves run faster than we can walk, and their swords are sharper than our farm tools."
|
||||
message= _ "But their wolves run faster than we can walk, and their swords are sharper than these farm tools."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "We must use our strength of numbers. Stay shoulder-to shoulder with the man next to you; never get isolated, especially not on open ground. Swarm them — surround them, five or six to one, and they will go down."
|
||||
message= _ "Our numbers are our strength. Stay shoulder-to shoulder with the man next to you; never get isolated, especially not on open ground. Swarm them — surround them, five or six to one, and they will go down."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Zlex
|
||||
|
|
@ -234,7 +234,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "(<i>Sigh</i>) Yes, well I know it. But would you rather live as slaves to the orcs forever?"
|
||||
message= _ "But, but, but... Are you full of nothing but doubts? (<i>Sigh</i>) Yes, it will be a massacre. But would you rather live as slaves to the orcs forever?"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Zlex
|
||||
|
|
@ -242,20 +242,20 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "Then it’s time to fight!"
|
||||
message= _ "Then what choice do we have? This may be the only chance we ever get, it’s time to fight!"
|
||||
[/message]
|
||||
[message]
|
||||
speaker="Al'Tar"
|
||||
message= _ "You clod of dung! How dare you step onto my land!"
|
||||
message= _ "You dare greatly, you miserable excuse for an orc! How dare you step onto my land!"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Garrugch
|
||||
message= _ "You puny weakling, this land now belongs to my master! Surrender now and he might let you be his slave."
|
||||
message= _ "Idle threats. Time as a slavemaster has made you weak. You have the strength of a goblin, and the brains to match. This land now belongs to my master. Surrender now and he might let you be (<i>his</i>) slave."
|
||||
[/message]
|
||||
[message]
|
||||
speaker="Al'Tar"
|
||||
# wmllint: local spelling Pah
|
||||
message= _ "Pah! Grunts, attack! Whoever brings me the head of Garrugch will get five villages!"
|
||||
message= _ "Pah! Grunts, attack! Whoever brings me the head of Garrugch will be rewarded in gold!"
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
|
|
@ -272,11 +272,11 @@
|
|||
|
||||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "Ack! These bloody slaves are always getting in the way. Let’s give them a beating!"
|
||||
message= _ "Ack! These bloody slaves are always getting in the way. Cut them down!"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Garrugch
|
||||
message= _ "Haha! Look boys, that weakling Al’Tar can’t even keep his slaves under control."
|
||||
message= _ "Look at that, the weakling Al’Tar can’t even keep his slaves under control. This will prove easier than I thought!"
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
|
|
@ -357,7 +357,7 @@
|
|||
[/filter]
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ "I die now, you orcish scum, but I die free! More will come after me. We will rise again and again until we work a fitting vengeance on you!"
|
||||
message= _ "I die now, you orcish scum, but I die free! More will come after me. We will rise again until our vengeance has wiped your stain from our land!"
|
||||
[/message]
|
||||
[/event]
|
||||
[event]
|
||||
|
|
@ -382,7 +382,7 @@
|
|||
[/filter]
|
||||
[message]
|
||||
speaker=unit
|
||||
message= _ "What the...? (<i>Gurgle</i>) Hey! Look... a slave... uprising!"
|
||||
message= _ "What the...? (<i>Gurgle</i>) Killed... by... slaves?"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue