Merge branch 'master' of https://github.com/wesnoth/wesnoth-old.git
This commit is contained in:
GunChleoc
commit
bd3061e78b
627 changed files with 101080 additions and 88810 deletions
|
|
@ -303,6 +303,12 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX)
|
|||
)
|
||||
endif(NOT CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
check_compiler_has_flag(
|
||||
CXX_FLAGS_STRICT_COMPILATION
|
||||
"-Wold-style-cast"
|
||||
HAS_COMPILER_FLAG_WOLD_STYLE_CAST
|
||||
)
|
||||
|
||||
check_compiler_has_flag(
|
||||
CXX_FLAGS_STRICT_COMPILATION
|
||||
"-Wdeprecated-register"
|
||||
|
|
@ -454,6 +460,40 @@ endif(X11_FOUND)
|
|||
|
||||
add_definitions(-DLOCALEDIR=\\\"${LOCALEDIR}\\\")
|
||||
|
||||
# -NDEBUG is automatically added to all release build types, so manually remove
|
||||
# this define from the related variables
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_CXX_FLAGS_RELEASE")
|
||||
separate_arguments(CMAKE_CXX_FLAGS_RELEASE)
|
||||
list(REMOVE_ITEM CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_C_FLAGS_RELEASE")
|
||||
separate_arguments(CMAKE_C_FLAGS_RELEASE)
|
||||
list(REMOVE_ITEM CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_CXX_FLAGS_RELWITHDEBINFO")
|
||||
separate_arguments(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
|
||||
list(REMOVE_ITEM CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
|
||||
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_C_FLAGS_RELWITHDEBINFO")
|
||||
separate_arguments(CMAKE_C_FLAGS_RELWITHDEBINFO)
|
||||
list(REMOVE_ITEM CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
|
||||
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_CXX_FLAGS_MINSIZEREL")
|
||||
separate_arguments(CMAKE_CXX_FLAGS_MINSIZEREL)
|
||||
list(REMOVE_ITEM CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
|
||||
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
MESSAGE ("removing NDEBUG flag from CMAKE_C_FLAGS_MINSIZEREL")
|
||||
separate_arguments(CMAKE_C_FLAGS_MINSIZEREL)
|
||||
list(REMOVE_ITEM CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG")
|
||||
string(REPLACE ";" " " CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
|
||||
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}" CACHE STRING "removed NDEBUG flag" FORCE)
|
||||
|
||||
|
||||
# When the path starts with a / on a Unix system it's an absolute path.
|
||||
# This means that on Windows the path used is always relative.
|
||||
if(LOCALEDIR MATCHES "^/")
|
||||
|
|
|
|||
|
|
@ -14,16 +14,21 @@ The release team should empty this file after each release.
|
|||
CHANGES
|
||||
=======
|
||||
|
||||
[section="RCA (default) AI gold saving default is reverted back to 'off'"]
|
||||
Based on the feedback we have gotten, we turned gold saving off by default for the RCA AI. There is no clear overall benefit to having it turned on and it would require many scenarios to be rebalanced. There are, however, individual scenarios which definitely benefit from enabling gold saving. Help with identifying such scenarios will be much appreciated.
|
||||
[/section]
|
||||
[section="Improved WML load error reports"]
|
||||
The user interface used for displaying WML errors during the content load and initialization phase (also known as “[i]Reading files and creating cache[/i]”) has received a complete makeover in this version:
|
||||
|
||||
[section="Son of the Black Eye campaign rebalancing"]
|
||||
Rebalancing of the campaign continues and is done for scenarios 1 (“End of Peace”) through 12 (“Giving Some Back”). [b]Play-testing and feedback by others would be extremely helpful at this time.[/b] The first newly rebalanced scenario of this release is “Shan Taum the Smug”, but some earlier scenarios have seen minor changes as well.
|
||||
[/section]
|
||||
[list]
|
||||
[*]The list of affected add-ons in the summary is now displayed in a bulleted format when applicable, and add-ons are identified by their regular names (or approximations thereof when those are unavailable) instead of the complete paths to their [tt]_main.cfg[/tt] files.
|
||||
[*]Users are encouraged to report any errors found to the add-on authors or maintainers. A new button is available above the detailed report to copy it to clipboard, e.g., for including it in a forum post without having to upload large screenshots or checking stderr.
|
||||
[*]Parser implementation details (specifically, “value ‘[i]token[/i]’ at [i]location[/i]”) are no longer included in the report since they don’t really help WML authors with debugging.
|
||||
[*]Error messages that point to chains of file and line locations have those displayed in separate indented lines to avoid the “text wall” effect.
|
||||
[/list]
|
||||
|
||||
[section="Input control scheme"]
|
||||
The old default has been restored again. Players who want to change how inputs work for them can assign the action supposed to be activated by left-/right-clicking in the hotkey preferences.
|
||||
Additionally, the format used for logging these errors to stderr has changed:
|
||||
[list]
|
||||
[*]Messages for errors from multiple add-ons are now sent to stderr one by one as they happen, rather than printed all at once at the end of the loading phase.
|
||||
[*]The indented format used in the UI is used in stderr now as well.
|
||||
[/list]
|
||||
[/section]
|
||||
|
||||
[section="Example section header"]
|
||||
|
|
|
|||
27
changelog
27
changelog
|
|
@ -1,17 +1,42 @@
|
|||
Version 1.11.9+dev:
|
||||
* Add-ons client:
|
||||
* Fixed faulty add-on _info.cfg files causing the game to display obscure
|
||||
error messages or crash to desktop.
|
||||
* Campaigns:
|
||||
* Eastern Invasion:
|
||||
* Rewrote scenario 'Training the Ogres' and renamed it to
|
||||
'Capturing the Ogres'.
|
||||
* Heir to the Throne:
|
||||
* Fixed Delfador clobbering whichever unit happens to be standing on
|
||||
31,11 at the end of The Bay of Pearls, causing it to disappear
|
||||
forever.
|
||||
* S15 (The Lost General): fix bug of sighted events firing too early
|
||||
* Editor:
|
||||
* Fixed: Drawing the offmap area for small resolutions.
|
||||
* GUI2
|
||||
* Added: FAI-function handling in GUI2 widgets.
|
||||
* Added: A new tooltip window.
|
||||
* Language and i18n:
|
||||
* Updated translations:
|
||||
* User interface:
|
||||
* New UI for displaying errors detected during the core and add-on WML
|
||||
loading process (parser and preprocessor errors), including the
|
||||
ability to copy the report to clipboard.
|
||||
* Fixed bug #21584: Properly redraw the minimap when the minimap is
|
||||
resized.
|
||||
* Fixed: Enable blurring in the title screen.
|
||||
* WML engine:
|
||||
* WML loading phase errors are reported to stderr in a new indented format.
|
||||
* Implemented [true] and [false] ConditionalWML tags, which describe a
|
||||
condition that always yields true or false, respectively.
|
||||
* Fixed: Disallow change and remove sections without an id in the ThemeWML.
|
||||
* Miscellaneous and bug fixes:
|
||||
* Fixed: A compilation warning with DEBUG_WINDOW_LAYOUT_GRAPHS.
|
||||
* Add translatable default filename to map editor save dialog box
|
||||
* Added -Wold-style-cast to the CMake strict flags.
|
||||
* Made sure that cmake does not add -NDEBUG for release builds since this
|
||||
flag breaks building.
|
||||
* Updated screenshots used inside the ingame help and fixed description of
|
||||
orbs.
|
||||
|
||||
Version 1.11.9:
|
||||
* Add-ons client:
|
||||
|
|
|
|||
|
|
@ -59,9 +59,28 @@ function ca_hang_out:execution(ai, cfg, self)
|
|||
}
|
||||
--print('#locs', #locs)
|
||||
|
||||
-- Get map for locations to be avoided (defaults to all castle terrain)
|
||||
local avoid = cfg.avoid or { terrain = 'C*,C*^*,*^C*' }
|
||||
local avoid_map = LS.of_pairs(wesnoth.get_locations(avoid))
|
||||
-- Get map of locations to be avoided.
|
||||
-- Use [micro_ai][avoid] tag with priority over [ai][avoid].
|
||||
-- If neither is given, default to all castle terrain.
|
||||
-- ai.get_avoid() cannot be used as it always returns an array, even when the aspect is not set,
|
||||
-- and an empty array could also mean that no hexes match the filter
|
||||
local avoid_tag
|
||||
if cfg.avoid then
|
||||
avoid_tag = cfg.avoid
|
||||
else
|
||||
local ai_tag = H.get_child(wesnoth.sides[wesnoth.current.side].__cfg, 'ai')
|
||||
for aspect in H.child_range(ai_tag, 'aspect') do
|
||||
if (aspect.id == 'avoid') then
|
||||
local facet = H.get_child(aspect, 'facet')
|
||||
if facet then
|
||||
avoid_tag = H.get_child(facet, 'value')
|
||||
else
|
||||
avoid_tag = { terrain = 'C*,C*^*,*^C*' }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
local avoid_map = LS.of_pairs(wesnoth.get_locations(avoid_tag))
|
||||
|
||||
local best_hex, best_unit, max_rating = {}, {}, -9e99
|
||||
for i,u in ipairs(units) do
|
||||
|
|
|
|||
97
data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
Normal file
97
data/campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
local H = wesnoth.require "lua/helper.lua"
|
||||
local AH = wesnoth.require "ai/lua/ai_helper.lua"
|
||||
local BC = wesnoth.require "ai/lua/battle_calcs.lua"
|
||||
--local LS = wesnoth.require "lua/location_set.lua"
|
||||
|
||||
local ca_ogres_flee = {}
|
||||
|
||||
function ca_ogres_flee:evaluation(ai, cfg, self)
|
||||
local units = wesnoth.get_units { side = wesnoth.current.side,
|
||||
formula = '$this_unit.moves > 0'
|
||||
}
|
||||
|
||||
if (not units[1]) then return 0 end
|
||||
return 110000
|
||||
end
|
||||
|
||||
function ca_ogres_flee:execution(ai, cfg, self)
|
||||
local units = wesnoth.get_units { side = wesnoth.current.side,
|
||||
formula = '$this_unit.moves > 0'
|
||||
}
|
||||
|
||||
local units_noMP = wesnoth.get_units { side = wesnoth.current.side,
|
||||
formula = '$this_unit.moves = 0'
|
||||
}
|
||||
|
||||
local width, height = wesnoth.get_map_size()
|
||||
|
||||
-- Need the enemy map and enemy attack map if avoid_enemies is set
|
||||
local enemies = wesnoth.get_units { { "filter_side", { {"enemy_of", {side = wesnoth.current.side} } } } }
|
||||
local enemy_attack_map = BC.get_attack_map(enemies)
|
||||
|
||||
local best_hex, best_unit, max_rating = {}, nil, -9e99
|
||||
for i,u in ipairs(units) do
|
||||
local reach = wesnoth.find_reach(u)
|
||||
|
||||
--local rating_map = LS.create()
|
||||
|
||||
for j,r in ipairs(reach) do
|
||||
local unit_in_way = wesnoth.get_unit(r[1], r[2])
|
||||
|
||||
if (not unit_in_way) or (unit_in_way == u) then
|
||||
|
||||
-- First rating is distance from a map edge
|
||||
local dist_left = r[1] - 1
|
||||
local dist_right = width - r[1]
|
||||
local dist_top = r[2] - 1
|
||||
local dist_bottom = height - r[2]
|
||||
local dist = math.min(dist_left, dist_right, dist_top, dist_bottom)
|
||||
|
||||
local rating = - dist
|
||||
|
||||
-- If we can reach the edge, we do so
|
||||
if (dist == 0) then rating = rating + 1000 end
|
||||
|
||||
local enemy_weight = 0.5
|
||||
local enemy_rating = - (enemy_attack_map.units:get(r[1], r[2]) or 0) * enemy_weight
|
||||
|
||||
local enemy_rating = 0
|
||||
for k,e in ipairs(enemies) do
|
||||
local dist = H.distance_between(r[1], r[2], e.x, e.y)
|
||||
enemy_rating = enemy_rating + math.sqrt(dist)
|
||||
end
|
||||
|
||||
rating = rating + enemy_rating
|
||||
|
||||
-- Also, maximize distance from own units that have already moved
|
||||
local own_unit_weight = 0.5
|
||||
local own_unit_rating = 0
|
||||
for k,u_noMP in ipairs(units_noMP) do
|
||||
local dist = H.distance_between(r[1], r[2], u_noMP.x, u_noMP.y)
|
||||
own_unit_rating = own_unit_rating + math.sqrt(dist)
|
||||
end
|
||||
|
||||
rating = rating + own_unit_rating * own_unit_weight
|
||||
|
||||
--rating_map:insert(r[1], r[2], rating)
|
||||
|
||||
if (rating > max_rating) then
|
||||
best_hex = { r[1], r[2] }
|
||||
best_unit = u
|
||||
max_rating = rating
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--AH.put_labels(rating_map)
|
||||
end
|
||||
--print(best_unit.id, best_unit.x, best_unit.y, best_hex[1], best_hex[2], max_rating)
|
||||
|
||||
if best_hex then
|
||||
AH.movefull_outofway_stopunit(ai, best_unit, best_hex[1], best_hex[2])
|
||||
else
|
||||
ai.stopunit_moves(best_unit)
|
||||
end
|
||||
end
|
||||
|
||||
return ca_ogres_flee
|
||||
|
|
@ -1,25 +1,30 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm^Vhh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Vhh, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gg, Hh, Hh, Gg, Hh, Gs, Gg, Gg^Efm, Gg, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gs, Gg, Gg, Hh^Fp, Gs^Fms, Gs, Gll^Fp, Gs, Gg^Efm, Hh, Gs, Gs, Gs, Gg, Hh, Hh, Mm, Mm
|
||||
Mm, Mm, Hh, Hh, Gs, Gll, Gll^Fp, Gll^Fp, Gll^Fp, Gg, Gs^Es, Gs, Gg, Gll, Gs, Gs^Fp, Gs^Efm, Hh^Fp, Gs^Fp, Gs^Fp, Hh^Fp, Gg^Es, Gg, Hh, Mm, Mm
|
||||
Mm, Mm, Hh, Gs, Gg, Gs, Gll^Fp, Gll, Gll, Gs, Gg, Gg, Gs, Gg, Gd, Gd, Gs, Gs, Gll^Fp, Hh^Fp, Gg, Hh^Fp, Hh, Hh, Mm, Mm
|
||||
Mm, Mm, Hh, Hh, Gs, Gs^Es, Gll^Fp, Gll^Fp, Gg, Gg, Gg, Gg, Gg^Efm, Gs, Gs, Gd^Es, Gs, Gll, Gll^Fms, Gs^Fms, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Hh, Gg, Gs, Gs, Hh^Fp, Hh^Fp, Gg, Gg, Gg^Efm, Gg, Gg, Gg, Gg, Gg, Gg, Gll, Hh, Gs, Gs, Hh, Hh, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Hh, Hh, Gll, Gg, Gg, Gg^Es, Gg, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gs, Hh, Gg, Hh, Gg, Hh, Hh, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Hh, Hh, Gll, Gll^Fp, Gll, Gs^Efm, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gll^Fp, Gs^Fp, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Hh, Gll, Gll^Fp, Gll^Fms, Gs, Gd, Gs, Gs, Gg, Gg^Efm, Gg, Gd^Es, Gg, Gll, Hh, Gg, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Gg, Gll, Gll^Fp, Gll, Gs, Gd, Gg^Efm, Gg, Gs, Gs, Gg, Gs, Gll^Fp, Gg, Hh^Fp, Gg, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Hh, Hh, Gs^Es, Gs, Gll^Fp, Gs, Gg, Gs, Gs, Gg, Gg^Efm, Gg, Gll, Gll^Fp, Gll^Fp, Gll^Em, Hh^Fp, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gs^Es, Gs, Gs, 1 Gg, Gg, Gg, Gg, Gll, Gll^Fp, Gll^Fms, Hh^Fp, Gg, Gg^Efm, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Hh, Gll, Gll^Fp, Gs, Gg, Hh, Hh, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs^Efm, Gg^Efm, Gs, Gs, Gs^Es, Gg, Hh, Gs, Hh, Gg, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gg, Gs, Gll, Gs, Gll^Fp, Gs, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh^Fp, Gll^Fms, Gll^Fp, Gll, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh^Fp, Gs^Fms, Gll, Hh^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm^Vhh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gll, Gll^Fp, Gs, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm^Vhh, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gg, Gg, Gg, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fmf, Gll^Fmf, Gll^Fp, Gll^Fmf, Gll^Fmf, Gll^Fdf, Gll^Fdf, Gs, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gd, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh
|
||||
Gll^Fmf, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fmf, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gs, Gd, Gd, Hh, Gd, Hh, Gs, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh, Hh
|
||||
Gll^Fmf, Gd^Fmf, Gd^Fp, Gd^Fmf, Gd^Fmf, Gd, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gd, Gll^Fp, Gd, Gll^Fp, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gll^Fp, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gll^Fp, Gll^Fp, Gs, Hh, Hh, Hh, Hh, Hh, Hh
|
||||
Gd^Fmf, Gd^Fp, Gd^Fp, Gd^Fp, Gd^Fp, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hh, Gll^Fp, Hh, Hh, Hh, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp, Hh^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gll^Fp, Gll^Fp, Gll^Fp, Gs, Gs, Hh, Hh, Hh, Hh, Hh
|
||||
Gll^Fdf, Gd^Fmf, Gll^Fdf, Gd^Fmf, Gd, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gll^Fp, Gll^Fp, Hh^Fp, Hh^Fp, Hh, Hh, Mm, Hh, Mm, Hh, Hh, Gll^Fp, Hh, Hh^Fp, Mm, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Gs, Hh, Gs, Gs, Gll^Fp, Gs, Gll^Fp, Gll^Fp, Gs, Hh, Hh, Hh, Hh
|
||||
Gll^Fmf, Gll^Fmf, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Hh, Hh, Hh^Fp, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Gs, Hh, Gd, Gs, Gs, Gs, Gll^Fp, Gs, Gs, Gs, Gd, Hh
|
||||
Gs, Gll^Fdf, Gd, Gs, Gs, Gs, Gll^Fdf, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gd, Gd, Gs, Gll^Fp, Gll^Fp, Gd, Gd, Gs, Hh
|
||||
Gs, Gs, Gd, Gd, Gd, Gll^Fdf, Gll^Fdf, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs, Mm, Gs, Mm, Mm, Mm, Mm^Vc, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gs, Gs, Gs, Gd, Gs, Hh
|
||||
Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Gs, Gs, Gd^Vc, Gs, Gs, Hh, Hh, Mm, Hh, Hh, Gs^Fdf, Gs, Gs^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gs, Gs, Gs, Gs, Gs
|
||||
Gs, Gd, Gs, Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Mm, Gs, Mm, Wwg, Gs, Gs, Gs, Wwg, Hh^Fdf, Hh^Fdf, Hh, Hh^Fdf, Gs^Fdf, Wwg, Gs^Fdf, Gs^Fdf, Gs^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gs, Gd, Gs
|
||||
Gd, Gd, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Gs, Gs, Gs, Gs, Gg^Fdf, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Wwg, Gg^Efm, Gll^Fdf, Gll^Fdf, Gll^Fdf, Gll^Fdf, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gs, Gd, Gs
|
||||
Gd, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gs, Gll^Gvs, Gll^Gvs, Gs, Gs, Gg^Fdf, Ds, Ds, Wwg, Gs, Wwg, Gs, Wwg, Gs, Gg, Gg, Gs, Gll^Fdf, Gll^Fdf, Gs, Gll^Fdf, Gs, Gs, Gs, Mm, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gd, Gd, Gd
|
||||
Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gd, Gs, Gg^Fdf, Gg^Fdf, Gs, Gs, Gs, Gs^Vc, Gs, Gs, Gg, Gg, Gs, Gs, Gll^Fdf, Gll^Fdf, Gs, Gs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gd, Gs, Gs, Gd, Gs
|
||||
Gs, Gs, Gd, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gd^Vc, Gs, Gs, Gs, Gs, Gg, Gg^Efm, Gg, Gs, Gs, Gg, Gg, Gs, Gs, Gs, Gs, Gll^Vc, Gs, Gs, Gs, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Gd, Gs, Gd, Gd, Gs
|
||||
Gd, Gs, Gd, Gd, Gs, Mm, Mm, Mm^Vc, Mm, Mm, Hh, Hh, Hh, Gd, Gs, Gd, Gs, Gs, Gs, Gs, Gg, Gg, Gg^Efm, Gg, Gg, Gg^Efm, Gs, Gs, Gs, Gs, Gs, Gll, Gll^Gvs, Hh, Hh, Hh^Fdf, Hh^Fdf, Mm, Mm, Mm, Mm, Gd, Gd, Gd, Gd, Gs
|
||||
Gs, Gd, Gs, Gd, Gs, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Gs, Gs, Gs, Gs, Gll^Fdf, Gg, Gg^Efm, Gs, Gg, Gg, Gg, Gg, Gg, Gs, Gs, Gll^Fdf, Gll^Fdf, Gs, Gs, Gs, Hh, Wwg, Hh^Fdf, Hh, Mm, Mm, Mm, Hh, Gs, Gs, Gd, Gd, Gd
|
||||
Gs, Gs, Gs, Gs, Gs, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs, Gll^Fdf, Gll^Fdf, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Gs^Vc, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Wwg, Wwg, Wwg, Hh, Mm, Mm, Hh, Mm, Gs, Gs, Gs, Gd, Gd
|
||||
Gd, Gs, Gs, Gs, Gs, Gd, Gd, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Gs, Gll^Fdf, Gll^Fdf, Gs^Vc, Gg, Gg, Gg^Efm, Gg, Gs, Gg, Gs, Gs, Gll^Fdf, Gs, Gll^Fdf, Gs, Gll^Gvs, Gll^Gvs, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Gs, Gs, Gs, Gd, Gd, Gd
|
||||
Gs, Gd, Gd, Gs, Hh, Gs, Hh, Gd, Hh, Mm, Mm, Hh, Hh, Mm, Mm, Gs, Gs, Gll^Fdf, Gg, Gs, Gs, Gs, Gs, Gg^Efm, Gs, Gs, Hh, Hh^Fdf, Hh, Gll^Fdf, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gd, Gd, Gs, Gs
|
||||
Gs, Gd, Gd, Gs, Gs, Hh, Hh, Gs, Gs, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Mm, Gs, Hh, Gs, Hh, Hh, Hh, Hh, Mm, Hh, Hh^Fdf, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs
|
||||
Gd, Gd, Gd, Gs, Gs, Gs, Hh, Hh, Gd, Gd, Hh, Mm, Mm, Mm, Mm, Hh, Mm, Mm, Hh, Hh, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Hh, Mm, Hh, Mm, Mm, Hh, Mm, Hh, Hh, Gs, Gs, Gs, Gs, Gd, Gd, Gd, Gd, Gs, Gs
|
||||
Gs, Gs, Gd, Gd, Gs, Gs, Hh, Hh, Hh, Gs, Gs, Mm, Mm, Mm, Mm, Mm, Mm, Hh, Mm, Hh, Hh, Hh, Ce, Mm, Gs, Mm, Gs, Mm, Mm, Mm, Hh, Hh, Hh, Hh, Gs, Gd, Gd, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs
|
||||
Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Hh, Gs, Gs, Gs, Mm, Gs, Mm, Mm, Gs, Gs, Gs, Gs, Ce, 1 Ke, Ce, Re, Gs, Gs, Gs, Hh, Hh, Gs, Hh, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Gd, Gs, Gd, Gd, Gs, Wwg, Wwg
|
||||
Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Ce, Ce, Ce, Gs, Re, Gd, Gs, Gs, Gs, Gs, Gs, Re, Gs, Gd, Gd, Gd, Gd, Gd, Gd, Gs, Gd, Wwg, Wwg, Wwg, Wwg
|
||||
Gd, Gd, Gd, Gs, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gd, Gd, Gs, Gs, Re, Re, Gs, Re, Re, Gd, Re, Gd, Re, Re, Re, Re, Gs, Wwg, Wwg, Wwg, Wwg, Gd, Gd
|
||||
Gs, Gs, Gd, Gs, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gs, Gs, Gd, Gd, Wwg^Bw\r, Wwg, Wwg, Gs, Gs, Gd
|
||||
Gd, Gd, Gd, Gs, Gs, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gd, Gs, Gd, Gd, Gd, Gd, Gs, Gs, Gs, Gs, Gs, Gd, Gs, Gd, Gs, Gs, Gs, Gd, Gs, Gs, Gs, Gs, Wwg, Wwg, Wwg, Wwg^Bw\r, Gd, Gd, Gs, Gs
|
||||
|
|
|
|||
|
|
@ -1,19 +1,24 @@
|
|||
#textdomain wesnoth-ei
|
||||
[scenario]
|
||||
id=08_Training_the_Ogres
|
||||
name= _ "Training the Ogres"
|
||||
name= _ "Capturing the Ogres"
|
||||
next_scenario=09_Xenophobia
|
||||
map_data="{campaigns/Eastern_Invasion/maps/08_Training_the_Ogres.map}"
|
||||
victory_when_enemies_defeated=no
|
||||
{TURNS 4 5 6}
|
||||
turns=-1
|
||||
{DEFAULT_SCHEDULE}
|
||||
|
||||
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg knolls.ogg}
|
||||
{EXTRA_SCENARIO_MUSIC revelation.ogg}
|
||||
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
|
||||
{INTRO_AND_SCENARIO_MUSIC revelation.ogg traveling_minstrels.ogg}
|
||||
{EXTRA_SCENARIO_MUSIC journeys_end.ogg}
|
||||
|
||||
{campaigns/Eastern_Invasion/utils/deaths.cfg}
|
||||
|
||||
#define MAP_EDGES_SLF
|
||||
[filter_adjacent_location]
|
||||
count=1-5
|
||||
[/filter_adjacent_location]
|
||||
#enddef
|
||||
|
||||
[story]
|
||||
[part]
|
||||
show_title=yes
|
||||
|
|
@ -26,7 +31,6 @@
|
|||
id=Gweddry
|
||||
name= _ "Gweddry"
|
||||
side=1
|
||||
income=-2
|
||||
canrecruit=no
|
||||
controller=human
|
||||
team_name=wesnothians
|
||||
|
|
@ -39,35 +43,80 @@
|
|||
side=2
|
||||
controller=ai
|
||||
no_leader=yes
|
||||
team_name=monster
|
||||
user_team_name=_"Monsters"
|
||||
[/side]
|
||||
team_name=ogres
|
||||
user_team_name=_"Ogres"
|
||||
[ai]
|
||||
aggression=1.0
|
||||
|
||||
#define OGRE
|
||||
[unit]
|
||||
type=Young Ogre
|
||||
side=2
|
||||
x=12
|
||||
y=10
|
||||
[/unit]
|
||||
#enddef
|
||||
{MODIFY_AI_ADD_CANDIDATE_ACTION 2 main_loop (
|
||||
[candidate_action]
|
||||
engine=lua
|
||||
name=ogres_flee
|
||||
id=ogres_flee
|
||||
max_score=110000
|
||||
location="campaigns/Eastern_Invasion/ai/ca_ogres_flee.lua"
|
||||
[/candidate_action]
|
||||
)}
|
||||
[/ai]
|
||||
[/side]
|
||||
|
||||
[event]
|
||||
name=prestart
|
||||
|
||||
# {SCATTER_IMAGE (terrain=Gs^Fp) 8 scenery/pine2.png}
|
||||
[set_variables]
|
||||
name=ogre_escape_msgs
|
||||
|
||||
[literal]
|
||||
message= _ "Waah! Run!"
|
||||
[/literal]
|
||||
|
||||
[literal]
|
||||
message= _ "Run for your lives!"
|
||||
[/literal]
|
||||
|
||||
[literal]
|
||||
message= _ "Help!"
|
||||
[/literal]
|
||||
[/set_variables]
|
||||
{VARIABLE next_ogre_escape_msg 0}
|
||||
|
||||
[set_variables]
|
||||
name=ogre_capture_msgs
|
||||
|
||||
[literal]
|
||||
message= _ "$ogre_name surrender!"
|
||||
[/literal]
|
||||
|
||||
[literal]
|
||||
message= _ "Don't hurt $ogre_name|!"
|
||||
[/literal]
|
||||
|
||||
[literal]
|
||||
message= _ "$ogre_name will be good! Promise!"
|
||||
[/literal]
|
||||
[/set_variables]
|
||||
{VARIABLE next_ogre_capture_msg 0}
|
||||
|
||||
{SCATTER_UNITS 8 "Ogre,Young Ogre" 1 (
|
||||
x=13,15,16,17,19,20,22,24,24,27,27,31,31
|
||||
y=12,14,18,11,16,13,17,12,15,12,14,14,16
|
||||
[not]
|
||||
[filter]
|
||||
[/filter]
|
||||
[/not]
|
||||
) (
|
||||
side=2
|
||||
generate_name=yes
|
||||
random_traits=yes
|
||||
)}
|
||||
|
||||
[objectives]
|
||||
side=1
|
||||
[objective]
|
||||
description= _ "Survive until end of turns"
|
||||
description= _ "Capture as many ogres as you can" + "<span foreground='white'> <small>" + _"(captured ogres will be made available for recall)" + "</small></span>"
|
||||
condition=win
|
||||
show_turn_counter=yes
|
||||
[/objective]
|
||||
[objective]
|
||||
description= _ "To add ogres to your army, keep two on the grass until end of turns"
|
||||
condition=win
|
||||
[/objective]
|
||||
[objective]
|
||||
description= _ "Death of Gweddry"
|
||||
condition=lose
|
||||
|
|
@ -81,6 +130,13 @@
|
|||
condition=lose
|
||||
[/objective]
|
||||
|
||||
[note]
|
||||
description= _ "An ogre is captured when it starts a turn being unable to move more than one hex."
|
||||
[/note]
|
||||
[note]
|
||||
description= _ "If an ogre reaches the edge of the map, it will escape."
|
||||
[/note]
|
||||
|
||||
[gold_carryover]
|
||||
carryover_percentage=100
|
||||
[/gold_carryover]
|
||||
|
|
@ -89,106 +145,222 @@
|
|||
|
||||
[event]
|
||||
name=start
|
||||
|
||||
[recall]
|
||||
id=Dacyn
|
||||
x,y=23,22
|
||||
[/recall]
|
||||
[recall]
|
||||
id=Owaec
|
||||
x,y=21,22
|
||||
[/recall]
|
||||
{OGRE}
|
||||
{OGRE}
|
||||
{OGRE}
|
||||
#ifdef NORMAL
|
||||
{OGRE}
|
||||
#endif
|
||||
#ifdef HARD
|
||||
{OGRE}
|
||||
{OGRE}
|
||||
#endif
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "Look, we have found a pack of ogres. We should try to capture some to train."
|
||||
message= _ "Look, this valley is inhabited by a tribe of ogres. We should try to capture some to train."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Dacyn
|
||||
message= _ "All right, we have to keep at least two of these ogres on the grass where they can’t escape until our troops get here to capture them."
|
||||
race=ogre
|
||||
message= _ "Humans are coming! Run!"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Owaec
|
||||
message= _ "We should try to surround them. Gweddry, you stay where you are. Dacyn, you go north-east. I’ll go north-west."
|
||||
message= _ "Looks like they are fleeing. I think they will surrender easily if we can surround them."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Dacyn
|
||||
message= _ "All right, we have to capture them one by one."
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
|
||||
[filter]
|
||||
race=ogre
|
||||
[filter_location]
|
||||
{MAP_EDGES_SLF}
|
||||
[/filter_location]
|
||||
[/filter]
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We have let one escape. Let’s hope they don’t all!"
|
||||
[/message]
|
||||
[teleport]
|
||||
[filter]
|
||||
id=Owaec
|
||||
[/filter]
|
||||
x=7
|
||||
y=7
|
||||
[/teleport]
|
||||
[teleport]
|
||||
[filter]
|
||||
id=Dacyn
|
||||
[/filter]
|
||||
x=17
|
||||
y=7
|
||||
[/teleport]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=moveto
|
||||
first_time_only=no
|
||||
|
||||
[filter]
|
||||
type=Young Ogre
|
||||
x=1-25,1-2,23-24,1-25
|
||||
y=1-2,1-20,1-20,18-20
|
||||
race=ogre
|
||||
[filter_location]
|
||||
{MAP_EDGES_SLF}
|
||||
[/filter_location]
|
||||
[/filter]
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We have let one escape. Let’s hope they don’t all!"
|
||||
speaker=unit
|
||||
message=$ogre_escape_msgs[$next_ogre_escape_msg].message
|
||||
[/message]
|
||||
|
||||
{VARIABLE_OP next_ogre_escape_msg add 1}
|
||||
{VARIABLE_OP next_ogre_escape_msg modulo $ogre_escape_msgs.length}
|
||||
|
||||
[kill]
|
||||
type=Young Ogre
|
||||
x=1-25,1-2,23-24,1-25
|
||||
y=1-2,1-20,1-20,18-20
|
||||
x,y=$x1,$y1
|
||||
[/kill]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=time over
|
||||
[role]
|
||||
type=Young Ogre
|
||||
role=ogre
|
||||
[/role]
|
||||
[kill]
|
||||
role=ogre
|
||||
[/kill]
|
||||
[if]
|
||||
[have_unit]
|
||||
type=Young Ogre
|
||||
[/have_unit]
|
||||
[then]
|
||||
[message]
|
||||
speaker=Dacyn
|
||||
message= _ "Our troops have caught up! Now, we will be able to recruit ogres!"
|
||||
[/message]
|
||||
{VARIABLE have_ogres yes}
|
||||
[allow_recruit]
|
||||
side=1
|
||||
type=Young Ogre
|
||||
[/allow_recruit]
|
||||
[/then]
|
||||
[else]
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We didn’t capture enough of the ogres here. We will have to go on without them."
|
||||
[/message]
|
||||
[/else]
|
||||
[/if]
|
||||
name=side 2 turn
|
||||
first_time_only=no
|
||||
|
||||
# This stores all ogres which have no free adjacent locations which
|
||||
# aren't adjacent to a side 1 unit; that is, the ones which are
|
||||
# ZoC-trapped so that they can't move more than one hex.
|
||||
[store_unit]
|
||||
[filter]
|
||||
side=2
|
||||
|
||||
[filter_location]
|
||||
[not]
|
||||
[filter_adjacent_location]
|
||||
[not]
|
||||
[filter]
|
||||
side=1
|
||||
[/filter]
|
||||
[/not]
|
||||
|
||||
[not]
|
||||
[filter_adjacent_location]
|
||||
[filter]
|
||||
side=1
|
||||
[/filter]
|
||||
[/filter_adjacent_location]
|
||||
[/not]
|
||||
[/filter_adjacent_location]
|
||||
[/not]
|
||||
[/filter_location]
|
||||
[/filter]
|
||||
|
||||
kill=no
|
||||
variable=ogres_to_capture
|
||||
[/store_unit]
|
||||
|
||||
{FOREACH ogres_to_capture i}
|
||||
{VARIABLE ogre_name $ogres_to_capture[$i].name}
|
||||
|
||||
[message]
|
||||
x,y=$ogres_to_capture[$i].x,$ogres_to_capture[$i].y
|
||||
message=$ogre_capture_msgs[$next_ogre_capture_msg].message
|
||||
[/message]
|
||||
|
||||
{VARIABLE_OP next_ogre_capture_msg add 1}
|
||||
{VARIABLE_OP next_ogre_capture_msg modulo $ogre_capture_msgs.length}
|
||||
|
||||
[kill]
|
||||
x,y=$ogres_to_capture[$i].x,$ogres_to_capture[$i].y
|
||||
[/kill]
|
||||
|
||||
{VARIABLE ogres_to_capture[$i].side 1}
|
||||
|
||||
[unstore_unit]
|
||||
variable=ogres_to_capture[$i]
|
||||
x,y=recall,recall
|
||||
[/unstore_unit]
|
||||
{NEXT i}
|
||||
|
||||
{CLEAR_VARIABLE ogres_to_capture,ogre_name}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=new turn
|
||||
|
||||
[filter_condition]
|
||||
[not]
|
||||
[have_unit]
|
||||
side=2
|
||||
[/have_unit]
|
||||
[/not]
|
||||
[/filter_condition]
|
||||
|
||||
[endlevel]
|
||||
result=victory
|
||||
bonus=yes
|
||||
{NEW_GOLD_CARRYOVER 100}
|
||||
[/endlevel]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=time over
|
||||
|
||||
[endlevel]
|
||||
result=victory
|
||||
{NEW_GOLD_CARRYOVER 100}
|
||||
[/endlevel]
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
name=victory
|
||||
|
||||
[store_unit]
|
||||
[filter]
|
||||
side=1
|
||||
race=ogre
|
||||
[/filter]
|
||||
|
||||
kill=no
|
||||
variable=ogres
|
||||
[/store_unit]
|
||||
|
||||
[switch]
|
||||
variable=ogres.length
|
||||
|
||||
[case]
|
||||
value=0
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We failed to capture any of them!"
|
||||
[/message]
|
||||
[/case]
|
||||
|
||||
[case]
|
||||
value=1
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We only captured one ogre."
|
||||
[/message]
|
||||
[/case]
|
||||
|
||||
[case]
|
||||
value=2
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We failed to capture more than two of the ogres."
|
||||
[/message]
|
||||
[/case]
|
||||
|
||||
[case]
|
||||
value=3
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We captured three ogres! I hope they will prove useful."
|
||||
[/message]
|
||||
[/case]
|
||||
|
||||
[else]
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
message= _ "We managed to capture many ogres! They will make a good addition to our troops."
|
||||
[/message]
|
||||
[/else]
|
||||
[/switch]
|
||||
[/event]
|
||||
|
||||
{FOREIGN_DEFEAT}
|
||||
[/scenario]
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
name= _ "Delfador"
|
||||
unrenamable=yes
|
||||
type=Elder Mage
|
||||
profile=portraits/delfador-elvish.png~RIGHT()
|
||||
profile=portraits/delfador-elvish.png
|
||||
side=1
|
||||
x=19
|
||||
y=23
|
||||
|
|
@ -450,6 +450,7 @@
|
|||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "Die, villain, die!"
|
||||
{KONRAD_VARIATION_ELF mad}
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
|
|
@ -460,7 +461,6 @@
|
|||
[/filter_second]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
{DELFADOR_VARIATION_ELF mad}
|
||||
message= _ "Only the foolish oppose me!"
|
||||
[/message]
|
||||
[/event]
|
||||
|
|
|
|||
|
|
@ -155,6 +155,8 @@
|
|||
|
||||
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
|
||||
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
|
||||
# wmllint: recognize Kalba
|
||||
# wmllint: recognize Gnaba
|
||||
|
||||
[message]
|
||||
speaker=Konrad
|
||||
|
|
@ -176,6 +178,7 @@
|
|||
[/message]
|
||||
|
||||
{NAMED_LOYAL_UNIT 1 (Outlaw) 20 10 (Delurin) ( _ "Delurin")}
|
||||
# wmllint: recognize Delurin
|
||||
|
||||
[redraw]
|
||||
side=1
|
||||
|
|
@ -430,7 +433,7 @@
|
|||
name=enemies defeated
|
||||
[message]
|
||||
speaker=Konrad
|
||||
{KONRAD_VARIATION_ELF mad}
|
||||
{KONRAD_VARIATION_ELF glad}
|
||||
message= _ "We have wrested control of the island from the evil undead! Now all we have to do is wait for the ship to arrive, so we can make our way to Elensefar!"
|
||||
[/message]
|
||||
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@
|
|||
|
||||
{VARIABLE delfador_store.x 24}
|
||||
{VARIABLE delfador_store.y 16}
|
||||
{VARIABLE delfador_store.profile "portraits/delfador.png~RIGHT()"}
|
||||
{VARIABLE delfador_store.profile "portraits/delfador.png"}
|
||||
|
||||
#show Delfador
|
||||
[unstore_unit]
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=unit
|
||||
{LISAR_VARIATION glad}
|
||||
{LISAR_VARIATION defeat}
|
||||
message= _ "(Ha ha, little do they know just how many undead have wandered the northern road of late. Surely they are doomed!)"
|
||||
[/message]
|
||||
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Delfador
|
||||
{DELFADOR_VARIATION mad}
|
||||
message= _ "Let us hold them off as long as we can!"
|
||||
[/message]
|
||||
[/event]
|
||||
|
|
|
|||
|
|
@ -173,7 +173,6 @@
|
|||
name=turn 2
|
||||
[message]
|
||||
speaker=Delfador
|
||||
{DELFADOR_VARIATION mad}
|
||||
message= _ "It appears that we are not the only ones interested in this mountain. Once again the Queen opposes us!"
|
||||
[/message]
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
side=1
|
||||
[/filter]
|
||||
|
||||
{NAMED_LOYAL_UNIT 2 (Dwarvish Fighter) 17 24 (Burlin) ( _ "Burlin")}
|
||||
{NAMED_LOYAL_UNIT 2 (Dwarvish Fighter) 17 23 (Burlin) ( _ "Burlin")}
|
||||
|
||||
[message]
|
||||
speaker=Burlin
|
||||
|
|
@ -434,6 +434,9 @@
|
|||
[filter]
|
||||
side=2
|
||||
[/filter]
|
||||
[filter_second]
|
||||
side=1
|
||||
[/filter_second]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "Who goes there? Friend or foe?"
|
||||
|
|
@ -449,6 +452,9 @@
|
|||
[filter]
|
||||
side=3
|
||||
[/filter]
|
||||
[filter_second]
|
||||
side=1
|
||||
[/filter_second]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "Vile creature! Let us rid these tunnels of its kind!"
|
||||
|
|
@ -460,6 +466,9 @@
|
|||
[filter]
|
||||
side=4
|
||||
[/filter]
|
||||
[filter_second]
|
||||
side=1
|
||||
[/filter_second]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "I did not know that the undead were in these pits!"
|
||||
|
|
@ -471,6 +480,9 @@
|
|||
[filter]
|
||||
id=Lionel
|
||||
[/filter]
|
||||
[filter_second]
|
||||
side=1
|
||||
[/filter_second]
|
||||
[message]
|
||||
speaker=second_unit
|
||||
message= _ "Who is this foul enemy that we fight?"
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@
|
|||
[/filter]
|
||||
[message]
|
||||
speaker=unit
|
||||
image=portraits/lisar-defeat.png
|
||||
{LISAR_VARIATION defeat}
|
||||
message= _ "I can’t believe it should end like this!"
|
||||
[/message]
|
||||
[endlevel]
|
||||
|
|
|
|||
|
|
@ -84,7 +84,9 @@
|
|||
carryover_percentage=40
|
||||
[/gold_carryover]
|
||||
|
||||
note= _ "If Delfador rests, he can concentrate on the location of the Sceptre of Fire."
|
||||
[note]
|
||||
description= _ "If Delfador rests, he can concentrate on the location of the Sceptre of Fire."
|
||||
[/note]
|
||||
[/objectives]
|
||||
|
||||
{SOF_TERRAIN_MASK}
|
||||
|
|
|
|||
|
|
@ -775,7 +775,6 @@
|
|||
[else]
|
||||
[message]
|
||||
speaker=Delfador
|
||||
{DELFADOR_VARIATION mad}
|
||||
message= _ "We have not yet reached the forest, and the battle still rages. We are caught between two vast armies and cannot escape to safety! We are defeated!"
|
||||
[/message]
|
||||
[/else]
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Delfador
|
||||
{DELFADOR_VARIATION mad}
|
||||
message= _ "Silence, foolish girl! With such arrogance, is it any surprise that the royal family of Wesnoth long ago saw their ancient alliances fall to pieces?"
|
||||
[/message]
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -248,7 +248,6 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=Delfador
|
||||
{DELFADOR_VARIATION mad}
|
||||
message= _ "How long must the people endure your rule? Give the throne to your daughter. She is the rightful heir. We even hold the scepter to prove it!"
|
||||
[/message]
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -19,15 +19,13 @@
|
|||
#enddef
|
||||
|
||||
#define DELFADOR_VARIATION NAME
|
||||
image=portraits/delfador-{NAME}.png~RIGHT()
|
||||
image=portraits/delfador-{NAME}.png
|
||||
#enddef
|
||||
|
||||
#define DELFADOR_VARIATION_ELF NAME
|
||||
image=portraits/delfador-elvish-{NAME}.png~RIGHT()
|
||||
image=portraits/delfador-elvish-{NAME}.png
|
||||
#enddef
|
||||
|
||||
# Seperate ones for mentoring, since they're not ~RIGHT() as of now
|
||||
|
||||
#define DELFADOR_MENTORING
|
||||
image=portraits/delfador-mentoring.png
|
||||
#enddef
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Ai , Ai , Ai , Ai , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha , Ha , Ha , Ha , Ha , Ai , Ai , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Ai , Ai , Ai , Ai , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Aa^Fpa , Ha^Fpa , Ha^Fpa , Ha , Ha^Vhha , Ha , Ha , Ha , Ai , Ai , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Ai , Ai , Ai , Ai , Ai , Mm , Mm , Mm , Mm^Vhh , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha^Fpa , Ha , Ha , Coa , Coa , Coa , Coa , Ai , Aa , Aa , Aa , Aa , Aa^Vca , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Ai , Ai , Ai , Ai , Mm , Ai , Mm , Mm , Mm , Mm , Mm , Aa , Aa , Aa^Fpa , Mm , Coa , Coa , 4 Koa , Coa , Ai , Ai , Aa , Aa , Aa , Aa , Aa , Coa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Ai , Ai , Aa , Aa^Vha , Mm , Ai , Ai , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Ha , Ha , Coa , Coa , Aa , Aa^Voa , Ai , Aa , Ha , Ha , Coa , Coa , Coa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Aa , Aa , Mm , Mm , Mm , Mm , Mm , Ai , Ai , Mm , Mm , Mm , Mm , Ha , Ha , Ha^Voa , Aa^Fpa , Aa , Aa^Fpa , Ai , Ai , Aa , Ai , Aa , Aa , Coa , 5 Koa , Coa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Ai , Ai , Ha^Vca , Ha , Ha , Ha^Fpa , Ha , Ha^Fpa , Aa^Fpa , Aa^Fpa , Aa , Aa^Fpa , Ai , Aa^Voa , Ai , Ai , Coa , Coa , Coa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ai , Aa^Fpa , Ha , Ha , Aa^Fpa , Aa^Fpa , Aa , Ha , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha , Mm , Ai , Ai , Ai , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm^Vhh , Mm , Mm , Aa , Aa^Voa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ai , Ha , Ha , Aa^Fpa , Ha^Vhha , Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Ha^Fpa , Ha^Fpa , Ha^Fpa , Ha , Ha , Ai , Ai , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm , Mm , Mm , Aa , Aa , Aa^Fpa , Aa^Fpa , Ha^Fpa , Aa^Fpa , Aa^Fpa , Ai , Ai , Ai , Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha , Ha^Fpa , Ha , Ha , Ha^Voa , Mm , Ai , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm , Mm , Mm , Mm , Aa , Aa^Fpa , Ha^Fpa , Ha , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ai , Aa^Fpa , Aa , Aa , Aa , Aa , Aa , Ha , Aa , Ha^Vhha , Ha , Ha , Ha , Ha , Mm , Mm , Ai , Aa^Fpa , Aa^Fpa , Aa^Fpa
|
||||
Mm , Mm , Cea , Ha , Ha , Mm , Ha , Ha , Mm , Mm , Aa , Aa^Fpa , Ai , Aa , Aa , Aa , Aa^Voa , Aa , Aa , Aa , Aa , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ai , Mm , Mm
|
||||
Ha , Cea , 3 Kea , Cea , Ha , Ha , Ha , Mm , Ai , Ha , Ai , Ai , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ai , Ai , Mm , Mm
|
||||
Ha , Cea , Cea , Cea , Ha , Ha , Ha^Voa , Ha , Ai , Ai , Ai , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Ha , Ha , Ha , Mm , Mm , Mm , Mm^Vhh , Mm , Mm , Ai , Mm , Mm , Mm , Mm
|
||||
Ha , Ha , Ha , Ha , Ai , Ha , Ai , Ai , Ai , Ai , Ai , Aa , Aa^Voa , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Ai , Mm , Mm , Mm , Mm
|
||||
Ha , Ha , Ai , Ai , Ha^Voa , Ai , Cea , Aa , Aa , Aa , Aa , Aa , Ha , Ha , Ha^Fpa , Ha , Ha , Ha^Vhha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ai , Mm , Mm , Mm , Mm
|
||||
Ha , Ha , Ai , Ha , Aa , Cea , 1 Kea , Cea , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha , Ha , Ha , Ha , Ha , Ha , Mm , Mm , Mm , Aa , Aa , Aa^Vha , Ai , Ai , Mm , Mm , Mm , Mm
|
||||
Ai , Ai , Aa , Aa , Aa , Cea , Cea , Cea , Aa^Fpa , Aa^Fpa , Mm , Ha , Cea , Cea , Cea , Ha , Aa^Fpa , Ha , Ha , Mm^Vhh , Mm , Mm , Mm , Mm , Aa , Aa , Ai , Mm , Mm , Mm , Mm , Mm
|
||||
Ai , Ai , Aa , Aa^Voa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Mm , Mm , Cea , 2 Kea , Cea , Ha , Mm , Aa^Fpa , Ha^Fpa , Ha^Fpa , Mm , Mm , Mm , Mm , Mm , Ai , Ai , Ai , Ai , Mm , Mm , Mm
|
||||
Ai , Ai , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Mm , Mm , Mm , Cea , Mm , Aa^Fpa , Mm , Mm , Ha^Fpa , Ha^Fpa , Aa^Fpa , Mm , Mm , Mm , Mm , Ai , Ai , Ai , Mm , Mm , Mm , Mm
|
||||
Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Ha , Ha , Aa^Fpa , Mm , Mm , Mm , Mm , Mm , Ai , Mm , Mm , Mm , Mm , Mm
|
||||
Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Aa^Fpa , Aa^Fpa , Ha , Aa^Fpa , Mm , Mm , Mm , Mm , Mm , Ai , Mm , Mm , Mm , Mm , Mm
|
||||
Ai, Ai, Ai, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ai, Ai, Ai, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Ha, Ha, Ha, Ha, Ha, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ai, Ai, Ai, Ai, Ai, Mm, Mm, Mm, Mm, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha, Ha, Coa, Coa, Coa, Coa, Ai, Aa, Aa, Aa, Aa, Aa^Vca, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ai, Ai, Ai, Ai, Mm, Ai, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Aa^Fpa, Mm, Coa, Coa, 4 Koa, Coa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Coa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ai, Ai, Aa, Aa^Vha, Mm, Ai, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Coa, Coa, Aa, Aa^Voa, Ai, Aa, Ha, Ha, Coa, Coa, Coa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Aa, Aa, Mm, Mm, Mm, Mm, Mm, Ai, Ai, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Aa^Fpa, Aa, Aa^Fpa, Ai, Ai, Aa, Ai, Aa, Aa, Coa, 5 Koa, Coa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Ai, Ai, Ha^Vca, Ha, Ha, Ha^Fpa, Ha, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Ai, Aa, Ai, Ai, Coa, Coa, Coa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ai, Aa^Fpa, Ha, Ha, Aa^Fpa, Aa^Fpa, Aa, Ha, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Mm, Ai, Ai, Ai, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm^Vhh, Mm, Mm, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ai, Ha, Ha, Aa^Fpa, Ha^Vhha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Ha^Fpa, Ha, Ha, Ai, Ai, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha^Fpa, Ha, Ha, Ha^Voa, Mm, Ai, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Mm, Aa, Aa^Fpa, Ha^Fpa, Ha, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ai, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Ha, Aa, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Ai, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Cea, Ha, Ha, Mm, Ha, Ha, Mm, Mm, Aa, Aa^Fpa, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm
|
||||
Ha, Cea, 3 Kea, Cea, Ha, Ha, Ha, Mm, Ai, Ha, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ai, Ai, Mm, Mm
|
||||
Ha, Cea, Cea, Cea, Ha, Ha, Ha^Voa, Ha, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm, Mm, Mm
|
||||
Ha, Ha, Ha, Ha, Ai, Ha, Ai, Ai, Ai, Ai, Ai, Aa, Aa^Voa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm, Mm, Mm
|
||||
Ha, Ha, Ai, Ai, Ha, Ai, Cea, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha^Fpa, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm, Mm, Mm
|
||||
Ha, Ha, Ai, Ha, Aa, Cea, 1 Kea, Cea, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Aa, Aa, Aa^Vha, Ai, Ai, Mm, Mm, Mm, Mm
|
||||
Ai, Ai, Aa, Aa, Aa, Cea, Cea, Cea, Aa^Fpa, Aa^Fpa, Mm, Ha, Cea, Cea, Cea, Ha, Aa^Fpa, Ha, Ha, Mm^Vhh, Mm, Mm, Mm, Mm, Aa, Aa, Ai, Mm, Mm, Mm, Mm, Mm
|
||||
Ai, Ai, Aa, Aa^Voa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Cea, 2 Kea, Cea, Ha, Mm, Aa^Fpa, Ha^Fpa, Ha^Fpa, Mm, Mm, Mm, Mm, Mm, Ai, Ai, Ai, Ai, Mm, Mm, Mm
|
||||
Ai, Ai, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Mm, Cea, Mm, Aa^Fpa, Mm, Mm, Ha^Fpa, Ha^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Ai, Ai, Ai, Mm, Mm, Mm, Mm
|
||||
Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Ha, Ha, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa^Fpa, Aa^Fpa, Ha, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Ai, Mm, Mm, Mm, Mm, Mm
|
||||
|
|
|
|||
|
|
@ -5,39 +5,39 @@ Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Mm, Mm, Mm,
|
|||
Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Ha, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Ha, Ha, Ha, Re^Vct, Cha, Cha, Ha, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Aa
|
||||
Mm^Xm, Mm^Xm, Mm^Xm, Ha, Ha, 4 Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Re, Cha, 8 Kha, Cha, Re^Vct, Ha, Ha, Aa^Vha, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm^Xm, Mm^Xm, Mm^Xm, Ha, Ha, 4 Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Re, Cha, 8 Kha, Cha, Aa, Ha, Ha, Aa^Vha, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Mm, Ha, Mm, Ha, Ha, Ha, Ha, Mm, Mm, Ha, Ha, Cha, Cha, Re, Aa, Ha, Ha, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Ha, Ha, Re, Re, Aa, Re^Vct, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Mm, Ha, Mm, Ha, Ha, Ha, Ha, Aa, Aa, Ha, Mm, Ha, Re^Vct, Aa, Re, Re, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Mm, Ha, Mm, Ha, Ha, Ha, Ha, Aa, Aa, Ha, Mm, Ha, Aa, Aa, Re, Re, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Ha, Aa, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha^Voa, Ha, Aa, Ha^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa^Voa, Ha, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha^Voa, Ha, Aa, Ha^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Re
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Re, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Re, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Re, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Re, Re, Re, Re, Aa, Aa, Aa, Aa, Re^Vct, Aa, Aa, Aa, Aa^Fpa, Aa, Re, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Re, Ha, Ha, Ha, Aa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Vea, Cha, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa, Re, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Re^Vct, Re, Re, Re, Ha, Aa, Cha, Aa, Aa^Vea, Aa, Aa, Aa, Aa^Vea, Aa, Cha, Cha, 7 Kha, Cha, Aa^Fpa, Re^Vct, Aa^Fpa, Aa, Re, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Re, Aa, Cha, Cha, Cha, Aa, Aa^Vea, Ai, Ai, Ai, Ai, Cha, Cha, Cha, Aa, Aa^Fpa, Aa^Fpa, Re^Vct, Re, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Ha, Ha, Aa^Vea, Aa, Aa, Re^Vct, Re, Aa^Vea, Cha, 6 Kha, Cha, Ai, Ai, Wo, Wo, Wo, Ai, Aa, Aa, Cha, Aa, Aa^Vha, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Re, Ha, Ha, Ha, Aa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Cha, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa, Re, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Re^Vct, Re, Re, Re, Ha, Aa, Cha, Aa, Aa, Aa, Aa, Aa, Aa^Vea, Aa, Cha, Cha, 7 Kha, Cha, Aa^Fpa, Re, Aa^Fpa, Aa, Re, Aa, Aa, Aa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Re, Aa, Cha, Cha, Cha, Aa, Aa, Ai, Ai, Ai, Ai, Cha, Cha, Cha, Aa, Aa^Fpa, Aa^Fpa, Re^Vct, Re, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Ha, Ha, Aa, Aa, Aa, Re^Vct, Re, Aa, Cha, 6 Kha, Cha, Ai, Ai, Wo, Wo, Wo, Ai, Aa, Aa, Cha, Aa, Aa, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Ha, Ha, Ha, Ha, Aa, Aa, Aa, Re, Re, Cha, Cha, Aa, Ai, Wo, Wo, Wo, Wo, Wo, Ai, Aa, Aa, Re, Re, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Re, Aa, Aa, Aa, Re^Vct, Aa, Ai, Wo, Wo, Wo, Ai, Ai, Aa, Aa, Re, Re, Re^Vct, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Ha, Ha, Aa, Aa, Ha, Aa, Aa, Re, Aa, Aa, Aa^Vea, Aa, Ai, Wo, Wo, Wo, Wo, Ai, Ai, Aa, Aa, Re^Vct, Re, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Mm, Ha, Ha, Aa, Aa, Ha, Aa, Aa, Re, Aa, Aa, Aa, Aa, Ai, Wo, Wo, Wo, Wo, Ai, Ai, Aa, Aa, Re, Re, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Ai, Wo, Wo, Wo, Wo, Wo, Ai, Aa, Aa, Aa, Re, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Ai, Wo, Wo, Wo, Wo, Wo, Ai, Aa, Re, Re, Re, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa^Vea, Aa, Aa, Re, Re, Aa, Aa, Aa, Ai, Wo, Wo, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Re, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Ai, Wo, Wo, Ai, Aa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Re, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Ai, Wo, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Ai, Ai, Ww^Bw|, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Cha, Re, Cha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha^Fpa, Ha^Fpa, Aa, Aa, Aa, Re, Aa, Aa, Ai, Aa, Aa, Aa, Cha, Re, Re^Vct, Aa^Fpa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Re, Aa, Ai, Aa, Aa, Re^Vct, Cha, 5 Kha, Cha, Re, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Aa^Fpa, Aa^Voa, Re, Aa, Ai, Ch, Aa, Aa, Cha, Cha, Cha, Re^Vct, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Aa, Aa, Re, Aa, Aa, Ww^Bw/, Aa, Aa, Cha, Cha, Cha, Re, Aa^Fpa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Ai, Ch, Aa, Aa, Aa, Re^Vct, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa
|
||||
Mm, Ha, Cea, Aa^Voa, 2 Cea, Cea, Aa, Aa, Ai, Aa, Aa^Vha, Aa, Re, Aa, Aa, Aa, Aa, Aa, Re^Vct, Re, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa
|
||||
Ha, Ha, Aa^Voa, Cea, 1 Kea, 3 Cea, Aa, Aa, Ai, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa^Vha, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Re, Re, Re
|
||||
Re, Ha, Re, Cea, Cea, Cea, Aa, Ai, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa, Re, Re, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Re, Ha, Aa^Voa, Aa, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Re, Re, Aa, Re, Re, Re^Vct, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa^Vea, Aa, Aa, Re, Re, Aa, Aa, Aa, Ai, Wo, Wo, Ai, Ai, Ai, Ai, Aa, Re, Aa, Aa, Re, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Ai, Wo, Wo, Ai, Aa, Aa^Vea, Aa, Re, Aa, Aa, Aa, Aa, Re, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Ai, Wo, Ai, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Ai, Ai, Ww^Bw|, Ai, Ai, Ai, Re, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Cha, Re, Cha, Re, Re, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Ha^Fpa, Ha^Fpa, Aa, Aa, Aa, Re, Aa, Aa, Ai, Aa, Aa, Aa, Cha, Re, Re^Vct, Aa^Fpa, Aa^Vea, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Re, Aa, Ai, Aa, Aa, Re^Vct, Cha, 5 Kha, Cha, Re, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Mm, Mm, Ha, Aa^Fpa, Aa^Voa, Re, Aa, Ai, Ch, Aa, Aa, Cha, Cha, Cha, Re, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Aa, Aa, Re, Aa, Aa, Ww^Bw/, Aa, Aa, Cha, Cha, Cha, Re, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa
|
||||
Mm, Mm, Ha, Ha, Aa, Aa, Aa, Aa, Ai, Ch, Aa, Aa, Aa, Re^Vct, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa
|
||||
Mm, Ha, Cea, Aa, 2 Cea, Cea, Aa, Aa, Ai, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa, Re^Vct, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa
|
||||
Ha, Ha, Aa, Cea, 1 Kea, 3 Cea, Aa, Aa, Ai, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Re, Re, Re
|
||||
Re, Ha, Re, Cea, Cea, Cea, Aa, Ai, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Re, Ha, Aa^Voa, Aa, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Re, Re, Aa, Re, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Ha, Ha, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Ha, Ha, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ usage=map
|
|||
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Aa, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha^Fpa, Ha^Fpa, Ha, Ha^Fpa, Ha, Ha, Ha^Fpa, Ha, Ha, Ha, Ha^Fpa, Ha, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Aa^Fpa, Ai, Ai, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Re, Aa, Aa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Ha, Ha^Fpa, Ha, Ha, Ha, Ha^Fpa, Ha, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Aa^Voa, Aa^Fpa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Re, Aa^Voa, Aa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Ha, Ha^Fpa, Ha, Ha, Ha, Ha^Fpa, Ha, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Aa^Voa, Aa^Fpa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Re, Aa, Aa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ai, Ai, Ai, Aa^Fpa, Aa^Fpa, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ce, Aa, Re, Re, Aa, Aa, Aa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa^Vca, Aa, Aa, Aa, Aa, Aa^Voa, Rd, Aa, Aa, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Aa, Re, Re, Ce, 1 Ke, Ce, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Rd, Chr, Rd, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Rd, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Ai, Ai, Aa, Aa^Voa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Re^Vct, Ce, Ce, Ce, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Ha, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Aa, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Aa, Re, Re, Ce, 1 Ke, Ce, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Rd, Chr, Rd, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Rd, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Ai, Ai, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Ce, Ce, Ce, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Aa, Rd, Chr, 2 Khr, Chr, Chr, Rd, Rd, Aa, Aa, Aa^Fpa, Rd, Rd, Aa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Re, Ce, Aa, Rd, Aa, Aa, Aa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Rd, Aa, Aa, Aa, Aa, Rd, Chr, Aa, Chr, Ha, Aa, Aa, Rd, Rd, Rd, Aa, Aa, Aa, Aa, Rd, Aa, Rd, Rd, Rd, Rd, Rd, Aa, Rd, Rd, Aa, Rd, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Re^Vct, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Rd, Aa, Ha, Ha, Aa, Aa, Rd, Rd, Aa, Aa, Ha^Voa, Ha, Aa, Aa, Aa, Aa, Aa, Aa^Voa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Aa^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa, Aa^Voa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Ha^Voa, Ha, Ha, Ha, Aa, Aa, Rd, Aa, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Ha, Ha, Ha, Rd, Ha, Ha, Ha^Voa, Aa, Ha, Aa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Rd, Aa, Aa, Aa, Aa, Rd, Chr, Aa, Chr, Ha, Aa, Aa, Rd, Rd, Rd, Aa, Aa, Aa, Aa, Rd, Aa, Rd, Rd, Rd, Rd, Rd, Aa, Rd, Rd, Aa, Rd, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Rd, Aa, Ha, Ha, Aa, Aa, Rd, Rd, Aa, Aa, Ha^Voa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Aa^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa, Aa^Voa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Ha, Ha, Ha, Ha, Aa, Aa, Rd, Aa, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Ha, Ha, Ha, Rd, Ha, Ha, Ha^Voa, Aa, Ha, Aa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Rd, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Ha, Ha, Ha, Ha, Ha, Aa, Rd, Aa, Aa, Aa, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Rd, Rd, Ha, Aa, Aa, Aa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Rd, Aa, Aa, Aa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Ha, Ha, Ha^Fpa, Ha^Vca, Ha, Aa, Aa, Rd, Aa, Aa, Ha, Ha, Ha, Aa, Aa, Ha, Ha, Ha, Ha, Ha, Rd, Ha, Aa, Aa, Aa, Aa, Mm, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Rd, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Rd, Rd, Rd, Aa, Aa, Ha, Ha^Fpa, Ha^Fpa, Ha, Ha, Aa, Rd, Rd, Rd, Aa, Ha, Ha, Aa, Aa, Aa, Ha, Ha, Ha, Rd, Rd, Aa, Ha, Ha, Aa, Aa, Aa, Mm, Mm, Mm, Aa, Rd, Aa, Aa, Aa^Vca, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa
|
||||
|
|
@ -18,17 +18,17 @@ Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha^Fpa, Ha^F
|
|||
Aa, Aa, Aa, Aa, Rd, Rd, Aa, Rd, Rd, Aa, Ch, Aa, Aa, Aa, Ha, Ha, Ha^Fpa, Ha^Fpa, Ha, Aa, Rd, Aa, Ha, Ha, Ha, Ha, Aa^Fpa, Rd, Aa, Aa, Aa, Rd, Rd, Rd, Ha, Ha, Ha^Voa, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Mm, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Aa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Ch, 3 Kh, Ch, Aa, Ha, Ha^Voa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha^Fpa, Ha, Ha^Fpa, Aa^Fpa, Aa^Fpa, Ha, Ha, Aa, Rd, Ha, Aa, Aa, Ai, Aa, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Mm, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Aa, Aa^Fpa, Aa^Voa, Aa^Fpa, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Aa, Aa, Aa, Aa, Aa, Ch, Ch, Ch, Aa, Ha, Aa, Aa, Rd, Aa, Rd, Rd, Aa, Ha, Ha, Ha^Fpa, Ha^Fpa, Ha^Fpa, Ha, Aa^Fpa, Rd, Ha, Aa, Aa, Ai^Bw|, Aa, Ai, Ai, Ww, Ai, Ai, Ai, Mm, Mm, Mm, Aa, Mm, Mm, Rd, Mm, Mm, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Rd, Aa, Aa, Aa, Mm, Mm, Mm, Aa^Fpa
|
||||
Aa^Fpa, Aa^Fpa, Rd, Rd, Aa, Aa^Vca, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Rd, Rd, Aa^Fpa, Rd, Aa, Aa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Rd, Rd, Aa, Aa, Ai, Ai, Ww, Ai, Ww, Ww, Ww, Ww, Ww, Ww, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Aa^Fpa, Mm, Ha^Voa, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Voa, Aa^Fpa, Aa, Aa^Fpa, Rd, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Aa, Ha, Rd, Ha, Aa, Ai, Ai, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ai, Ww, Ai, Mm, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa, Mm, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Rd, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Rd, Rd, Aa^Fpa, Ha^Fpa, Ha, Ha^Fpa, Ha, Aa, Ha, Ha, Ha, Aa, Ha, Ha^Voa, Rd, Aa, Ai, Ww, Ww, Ww, Ww, Ww, Ai, Ai, Ai^Bw\, Rd, Ai, Mm, Mm, Rd, Aa^Voa, Rd, Aa^Fpa, Aa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa^Fpa, Aa^Fpa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Rd, Rd, Aa^Fpa, Rd, Aa, Aa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Rd, Rd, Aa, Aa, Ai, Ai, Ww, Ai, Ww, Ww, Ww, Ww, Ww, Ww, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Aa^Fpa, Mm, Ha, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa^Fpa, Rd, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Aa, Ha, Rd, Ha, Aa, Ai, Ai, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ai, Ww, Ai, Mm, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa, Mm, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Rd, Rd, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Rd, Rd, Aa^Fpa, Ha^Fpa, Ha, Ha^Fpa, Ha, Aa, Ha, Ha, Ha, Aa, Ha, Ha^Voa, Rd, Aa, Ai, Ww, Ww, Ww, Ww, Ww, Ai, Ai, Ai^Bw\, Rd, Ai, Mm, Mm, Rd, Aa, Rd, Aa^Fpa, Aa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Rd, Aa^Fpa, Aa^Voa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa, Aa, Ha, Ha, Ha, Aa, Ha, Ha, Aa, Rd, Aa, Ai, Ai, Ai, Ww, Ww, Ai, Ai, Mm, Mm, Rd, Aa, Rd, Rd, Ha^Fpa, Rd, Ha^Fpa, Ha^Fpa, Ha^Fpa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Aa^Fpa, Aa, Aa^Fpa, Rd, Aa^Fpa, Aa, Aa^Fpa, Ha^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Aa, Mm, Aa, Mm, Mm, Aa, Ha, Aa, Ha, Aa, Ha, Aa, Aa, Ai, Ai, Ai, Ai, Ai, Ai, Mm, Mm, Mm, Mm, Ha, Rd, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Rd, Aa, Aa, Aa, Aa, Mm, Mm, Mm
|
||||
Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Rd, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha, Aa^Fpa, Ha, Ha, Ha^Voa, Rd, Aa, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Aa, Mm, Mm, Mm, Mm, Ai, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Rd, Rd, Rd, Rd, Mm, Ha, Mm, Aa, Mm, Ha^Voa, Mm, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Mm
|
||||
Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Rd, Ha^Fpa, Aa, Ha^Fpa, Ha^Fpa, Ha, Ha, Mm, Mm, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Ha, Ha, Ha^Fpa, Ha, Rd, Rd, Ha, Ha, Ha, Mm, Mm, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha^Voa, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Ha^Voa, Rd, Aa^Fpa, Aa, Aa, Aa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Co, Rd, Co, Aa, Aa, Aa, Aa
|
||||
Aa, Ha, Ha, Ha, Mm, Ha, Aa, Rd, Mm, Mm, Mm, Mm, Rd, Mm, Mm, Mm, Mm, Mm, Co, Mm, Mm, Mm, Mm, Mm, Aa, Ha^Voa, Aa, Mm, Rd, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Chr, Chr, Aa, Aa, Ha, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Rd, Rd, Aa, Aa, Aa, Aa^Voa, Aa, Aa
|
||||
Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Rd, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Ha, Aa^Fpa, Ha, Ha, Ha, Rd, Aa, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Aa, Mm, Mm, Mm, Mm, Ai, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Rd, Rd, Rd, Rd, Mm, Ha, Mm, Aa, Mm, Ha, Mm, Aa, Aa^Voa, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Mm
|
||||
Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Rd, Ha^Fpa, Aa, Ha^Fpa, Ha^Fpa, Ha, Ha, Mm, Mm, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Aa, Aa
|
||||
Ha, Ha, Ha, Ha^Fpa, Ha, Rd, Rd, Ha, Ha, Ha, Mm, Mm, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha^Voa, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Rd, Aa^Fpa, Aa, Aa, Aa, Aa^Fpa, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Co, Rd, Co, Aa, Aa, Aa, Aa
|
||||
Aa, Ha, Ha, Ha, Mm, Ha, Aa, Rd, Mm, Mm, Mm, Mm, Rd, Mm, Mm, Mm, Mm, Mm, Co, Mm, Mm, Mm, Mm, Mm, Aa, Ha, Aa, Mm, Rd, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Chr, Chr, Aa, Aa, Ha, Aa, Rd, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa, Rd, Rd, Aa, Aa, Aa, Aa^Voa, Aa, Aa
|
||||
Aa, Ha, Mm, Mm, Mm, Mm, Mm, Rd, Rd, Mm, Aa, Aa, Rd, Mm, Mm, Mm, Co, Co, 4 Ko, Co, Mm, Aa, Aa, Aa, Aa, Rd, Rd, Rd, Mm, Rd, Rd, Rd, Rd, Rd, Rd, Aa, Aa, Chr, Aa, Chr, Aa, Aa, Aa, Rd, Rd, Aa, Co, Aa, Aa, Aa, Aa, Aa, Rd, Rd, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Mm, Mm
|
||||
Ha, Ha, Ha, Mm, Mm, Mm, Mm, Ha, Ha, Rd, Rd, Aa, Rd, Mm, Mm, Mm, Rd, Co, Mm, Co, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Mm, Mm, Ha^Voa, Mm, Mm, Mm, Mm, Aa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Co, Co, 5 Ko, Co, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Ha, Ha, Ha, Mm, Mm, Mm, Mm, Ha, Ha, Rd, Rd, Aa, Rd, Mm, Mm, Mm, Rd, Co, Mm, Co, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Mm, Mm, Ha, Mm, Mm, Mm, Mm, Aa, Rd, Rd, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Co, Co, 5 Ko, Co, Aa, Aa, Aa, Aa, Rd, Aa, Aa, Aa, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Ha^Fpa, Ha, Ha^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Rd, Rd, Aa, Rd, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa^Fpa, Aa, Aa, Co, Co, Rd, Rd, Aa, Rd, Rd, Aa^Fpa, Aa, Aa^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Ha^Fpa, Ha^Fpa, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Rd, Aa, Mm, Mm, Ha^Voa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Aa, Mm, Mm, Mm, Aa, Aa, Aa, Aa, Co, Aa, Aa, Aa, Rd, Ha^Voa, Aa, Aa, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Mm, Mm, Mm, Mm, Mm, Mm, Aa, Aa, Rd, Rd, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Mm, Mm, Mm, Ha^Voa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Aa, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
|
|
|
|||
|
|
@ -7,34 +7,34 @@ Wo, Wo, Wo, Wo, Ww, Ww, Aa, Aa, Aa, Aa, Gg, Aa, Gg, Aa, Gg, Gg, Aa^Fpa, Aa^Fpa,
|
|||
Wo, Wo, Wo, Ww, Ww, Ww, Aa, Aa, Gg, Aa, Gg, Gg, Gg, Aa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Gg, Gg, Aa, Ha, Ha^Fpa, Aa^Fpa, Aa, Gg, Gg, Aa, Aa, Aa, Aa, Gg, Aa, Aa^Voa, Aa, Gg, Aa, Aa, Gg, Aa, Gg, Aa^Fpa, Gg, Aa, Aa^Fpa, Gg
|
||||
Wo, Wo, Wo, Ww, Ww, Ww, Ww, Gg, Aa, Gg, Aa, Aa, Aa, Aa^Fpa, Gg, Gg, Gg, Gg, Aa^Fpa, Gg, Aa, Ha, Aa^Fpa, Ha^Fpa, Gg, Gg, Gg, Aa, Gg, Gg, Gg, Aa, Aa^Fpa, Gg, Aa, Aa, Gg, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa^Fpa, Gg, Aa, Gg
|
||||
Wo, Wo, Wo, Ww, Ww, Aa, Gg, Gg, Gg, Gg, Aa, Aa, Aa^Fpa, Aa^Fpa, Gg, Gg, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Gg, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Gg, Aa, Gg, Gg, Aa, Aa, Ha^Fpa, Aa, Ha, Aa, Ha^Fpa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Gg
|
||||
Wo, Wo, Ww, Ww, Ww, Ww, Aa, Aa, Ha, Aa^Vca, Aa^Fpa, Aa^Fpa, Ha, Gg, Gg, Gg, Aa^Fpa, Gg, Aa^Fpa, Aa^Fpa, Aa, Aa, Gg, Gg, Aa^Fpa, Gg, Gg, Aa, Aa, Aa, Gg, Aa^Fpa, Aa, Aa^Fpa, Ha^Fpa, Ha, Ha, Ha^Fpa, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa, Aa, Aa, Gg, Gg
|
||||
Wo, Wo, Ww, Ww, Ww, Aa, Gg, Aa, Ha, Ha^Fpa, Aa^Fpa, Gg, Ha^Fpa, Ha, Gg, Aa^Fpa, Gg, Gg, Gg, Gg, Aa, Aa, Gg, Gg, Aa^Fpa, Aa^Fpa, Ha, Ha^Voa, Gg, Gg, Aa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Aa^Fpa, Aa, Aa, Aa^Voa, Aa, Gg, Gg
|
||||
Wo, Wo, Ww, Ww, Ww, Ww, Aa, Aa, Ha, Aa, Aa^Fpa, Aa^Fpa, Ha, Gg, Gg, Gg, Aa^Fpa, Gg, Aa^Fpa, Aa^Fpa, Aa, Aa, Gg, Gg, Aa^Fpa, Gg, Gg, Aa, Aa, Aa, Gg, Aa^Fpa, Aa, Aa^Fpa, Ha^Fpa, Ha, Ha, Ha^Fpa, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Aa, Aa, Aa, Gg, Gg
|
||||
Wo, Wo, Ww, Ww, Ww, Aa, Gg, Aa, Ha, Ha^Fpa, Aa^Fpa, Gg, Ha^Fpa, Ha, Gg, Aa^Fpa, Gg, Gg, Gg, Gg, Aa, Aa, Gg, Gg, Aa^Fpa, Aa^Fpa, Ha, Aa, Gg, Gg, Aa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Aa^Fpa, Aa, Aa, Aa^Voa, Aa, Gg, Gg
|
||||
Wo, Wo, Ww, Ww, Ww, Ww, Gg, Ha, Hh, Ha, Ha, Ha, Ha, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha, Ha, Aa, Aa, Aa, Gg, Aa, Gg, Aa, Aa, Ha, Aa, Aa, Gg, Aa, Aa, Gg, Gg, Aa, Aa, Gg, Aa
|
||||
Wo, Wo, Wo, Ww, Ww, Ww, Gg, Hh, Hh, Hh, Hh, Hh, Aa, Gg, Gg, Gg, Gg, Gg^Vo, Re^Gvs, Re, Aa, Aa, Gg, Gg, Gg, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Coa, Aa, Aa, Aa, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Aa, Cea, Cea, Aa
|
||||
Wo, Wo, Wo, Ww, Ww, Ww, Gg, Hh, Hh, Hh, Hh, Hh, Aa, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Re, Aa, Aa, Gg, Gg, Gg, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Coa, Aa, Aa, Aa, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Aa, Cea, Cea, Aa
|
||||
Wo, Wo, Wo, Ww, Ww, Ww, Gg, Hh, Gg, Gg, Gg, Aa, Gg, Gg, Aa, Aa, Gg, Re^Gvs, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Gg, Gg, Coa, 3 Koa, Coa, Aa, Aa, Gg, Gg, Gg, Gg, Gg, Gg, Aa, Gg, Cea, 1 Kea, Gg
|
||||
Wo, Wo, Wo, Ww, Ww, Ww, Ds, Gg, Hh, Hh, Re^Gvs, Hh, Hh, Aa, Re, Re, Gg, Re^Gvs, Re^Gvs, Aa, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Aa^Fpa, Gg, Gs^Fp, Gs^Fp, Co, Co, Coa, Aa, Aa, Aa^Voa, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Rb, Cea, Re
|
||||
Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Re^Gvs, Re^Gvs, Gg^Vo, Hh, Gg, Re, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Re, Gg, Aa, Gg, Gg, Gs^Fp, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Re, Aa, Aa, Gg, Aa, Gg, Aa, Gg, Gg, Gg, Re, Re, Aa, Re, Gg
|
||||
Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Re^Gvs, Re^Gvs, Gg, Hh, Gg, Re, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Re, Gg, Aa, Gg, Gg, Gs^Fp, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Gg, Re, Aa, Aa, Gg, Aa, Gg, Aa, Gg, Gg, Gg, Re, Re, Aa, Re, Gg
|
||||
Wo, Wo, Wo, Wo, Ww, Ww, Ds, Gg, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re, Gg, Re, Re, Gg, Re^Gvs, Gg, Re, Re, Gg, Gg, Aa, Re, Re, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Re, Re, Gg, Gg, Aa, Gg, Aa, Aa, Gg, Re, Re, Aa, Aa, Aa, Aa, Aa
|
||||
Wo, Wo, Wo, Wwr, Wwr, Ww, Ww, Ds, Gg, Re, Re, Re, Gg, Gg, Co, Re, Gg, Gg, Re, Re, Re, Gg, Gg, Re, Gg^Vo, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Re, Re, Gg, Gg, Gg, Gg, Gg, Aa, Gg, Gg, Re, Gg, Aa, Aa, Aa, Aa, Gg
|
||||
Wo, Wo, Wo, Wwr, Wwr, Ww, Ww, Ds, Gg^Vo, Gg, Co, Gg, Gg^Vc, Co, Re, Co, Gg, Gg, Gg, Re, Re, Gg, Re, Re, Re, Gg, Gg, Gg, Re, Re, Gg, Gg, Gg, Gg, Re, Gg, Re, Aa, Re, Re, Gg, Gg, Gg, Gg, Aa, Aa, Gg
|
||||
Wo, Wo, Wo, Wwr, Wwr, Ww, Ww, Ds, Gg, Re, Re, Re, Gg, Gg, Co, Re, Gg, Gg, Re, Re, Re, Gg, Gg, Re, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gg, Re, Re, Gg, Gg, Gg, Gg, Gg, Aa, Gg, Gg, Re, Gg, Aa, Aa, Aa, Aa, Gg
|
||||
Wo, Wo, Wo, Wwr, Wwr, Ww, Ww, Ds, Gg^Vo, Gg, Co, Gg, Gg, Co, Re, Co, Gg, Gg, Gg, Re, Re, Gg, Re, Re, Re, Gg, Gg, Gg, Re, Re, Gg, Gg, Gg, Gg, Re, Gg, Re, Aa, Re, Re, Gg, Gg, Gg, Gg, Aa, Aa, Gg
|
||||
Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Co, Co, Co, Re, Re, Re, Re, Re, Gg, Re, Gg, Re, Re, Hh, Re, Hh, Hh, Hh, Re, Re, Re, Re, Re, Re, Gg, Re, Re, Gg, Re, Gg, Re, Gg, Aa, Gg, Aa, Aa, Gg, Aa, Aa, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Re, Co, Re, Co, Re, Co, Re, Re, Re, Re, Gg, Gg, Gg, Hh^Vo, Hh, Hh, Re, Re, Gg, Gg, Gg^Vo, Re, Gg, Re, Gg, Gg, Gg, Re, Re, Aa^Voa, Aa, Aa, Gg, Gg, Aa, Gg, Gg, Gg, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Re, Gg^Vo, Re, Ch, Re, Re, Co, Re, Gg^Vo, Gg, Co, Co, Hh, Re, Re, Gg, Re, Re, Re, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Re, Gg, Re, Aa, Aa, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Re, Co, Re, Co, Re, Co, Re, Re, Re, Re, Gg, Gg, Gg, Hh^Vo, Hh, Hh, Re, Re, Gg, Gg, Gg, Re, Gg, Re, Gg, Gg, Gg, Re, Re, Aa^Voa, Aa, Aa, Gg, Gg, Aa, Gg, Gg, Gg, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Re, Gg^Vo, Re, Ch, Re, Re, Co, Re, Gg, Gg, Co, Co, Hh, Re, Re, Gg, Re, Re, Re, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Re, Gg, Re, Aa, Aa, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww^Bw/, Ds, Ch, Ch, Kh, 2 Ch, Re, Co, Re, Re, Gg, Gg, Co, Gg, Re, Gg, Re, Re, Gs^Fp, Gs^Fp, Gg, Re, Re, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Co, Coa, Co, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ds, Kh, Ch, Ch, Ch, Re, Re, Re, Re, Gg, Co, Gg, Gg, Re, Re, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Vo, Re, Re, Co, 4 Ko, Co, Gg, Ss, Ss, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww^Bw/, Ds, Ds, Ch, Gg^Vo, Re, Re, Co, Re, Re, Gg, Gg, Gg, Re, Gg, Gg, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Re, Re, Re, Gg, Co, Ss, Ss, Ww, Ww, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ds, Kh, Ch, Ch, Ch, Re, Re, Re, Re, Gg, Co, Gg, Gg, Re, Re, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Re^Gvs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Re, Re, Co, 4 Ko, Co, Gg, Ss, Ss, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww^Bw/, Ds, Ds, Ch, Gg, Re, Re, Co, Re, Re, Gg, Gg, Gg, Re, Gg, Gg, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Re, Re, Re, Gg, Co, Ss, Ss, Ww, Ww, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww^Bw/, Gg, Re, Re, Co, Re, Re, Gg^Vc, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gg, Re, Gs^Fp, Gg, Gs^Fp, Gg, Ss, Gg, Ss, Ss, Ss, Ss, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Re, Re, Re, Re, Re, Re, Gg, Co, Gg, Gg, Gg, Ds, Ds, Ds, Gg, Ds, Ds, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Ss, Ss, Ss, Gg, Gg, Gg, Gg^Vc, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Gs^Fp, Gs^Fp, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Re, Gg, Gg^Vo, Ds, Gg, Gg, Co, Gg, Gg, Ds, Ds, Gg, Ds, Ds, Ds, Ds, Ds, Ds, Gg, Ds, Gg, Gg, Gg, Ss, Ww, Ww, Gg, Gg, Gg, Gg, Gs^Fp, Ds, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Gs^Fp, Gs^Fp, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Re, Gg, Gg, Ds, Gg, Gg, Co, Gg, Gg, Ds, Ds, Gg, Ds, Ds, Ds, Ds, Ds, Ds, Gg, Ds, Gg, Gg, Gg, Ss, Ww, Ww, Gg, Gg, Gg, Gg, Gs^Fp, Ds, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Gs^Fp, Gs^Fp, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Ww, Ds, Ds, Ds, Ss, Ss, Ss, Co, Gg, Gg, Ds, Ds, Ds, Ds, Ds, Gg, Ds, Ds, Ds, Ds, Gg, Gg, Gg, Gg, Ss, Ww, Ww, Ww, Ww, Gg, Ds, Ds, Ds, Ds, Ds
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Ds, Ss, Ss, Co, Co, Ss, Gg, Gg, Ds, Gg, Gg^Vo, Ds, Ds, Ds, Gg, Gg, Ds, Gg, Gg^Vc, Gg, Gg, Ss, Ss, Ss, Ss, Ww, Ww, Ww, Ds, Gg, Ds, Ss, Ds, Ss
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Ds, Ss, Ss, Co, Co, Ss, Gg, Gg, Ds, Gg, Gg, Ds, Ds, Ds, Gg, Gg, Ds, Gg, Gg^Vc, Gg, Gg, Ss, Ss, Ss, Ss, Ww, Ww, Ww, Ds, Gg, Ds, Ss, Ds, Ss
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Wo, Wwr, Wwr, Ww, Co, Co, Co, Ss, Ss, Ss, Gg, Gg, Gg, Gg, Ds, Gg, Ds, Gg, Gg, Gg, Ss, Gg, Gg, Gg, Gg, Gg, Ss, Ss, Ss, Ww, Ss, Ds, Ds, Ds, Gg, Gg, Ss, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Hh, Gs^Fp, Gg^Vo, Ww, Ww, Ww, Ww, Ww, Ds, Ds, Ds, Ss, Ss, Gg, Ss, Ss, Ds, Gg, Ds, Ss, Gg, Gg, Gg, Ss, Gg, Gg, Gg, Ss, Gg, Chs, Khs, Chs, Chs, Ss, Ss, Ds, Gg, Gg, Ss, Ss, Ss
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Hh, Gs^Fp, Gg, Ww, Ww, Ww, Ww, Ww, Ds, Ds, Ds, Ss, Ss, Gg, Ss, Ss, Ds, Gg, Ds, Ss, Gg, Gg, Gg, Ss, Gg, Gg, Gg, Ss, Gg, Chs, Khs, Chs, Chs, Ss, Ss, Ds, Gg, Gg, Ss, Ss, Ss
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Gs^Fp, Hh^Fp, Gg, Gs^Fp, Ww, Ww, Ww, Ww, Ds, Ds, Ss, Ss, Ww, Ss, Ss, Ss, Ss, Ds, Ss, Ss, Gg, Ss, Ds, Ds, Ds, Gg, Ss, Gg, Ss, Ss, Ss, Ss, Gg, Gg, Ss, Ds, Ss, Ss, Ss, Ss, Ss
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Ww, Hh^Vc, Hh, Hh^Fp, Ww, Ww, Ww, Ww, Ds, Ss, Ss, Ww, Ww, Ss, Ds, Ss, Ds, Ds, Ss, Gg, Ss, Ds, Ss, Ss, Ss, Gg, Gg, Ss, Ss, Ww, Ds, Ds, Ss, Ss, Ss, Ss, Gg, Gg, Gs^Fp, Ss, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Gg^Vo, Ww, Ww, Ww, Ww, Ds, Ss, Ss, Ss, Ss, Ss, Gg, Ds, Ss, Ss, Gg, Gg, Ss, Ss, Gg, Gg, Ss, Gg, Ss, Ww, Ss, Ds, Ds, Ss, Gg, Ss, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Ww, Ww, Gg, Ww, Ww, Ww, Ww, Ds, Ss, Ss, Ss, Ss, Ss, Gg, Ds, Ss, Ss, Gg, Gg, Ss, Ss, Gg, Gg, Ss, Gg, Ss, Ww, Ss, Ds, Ds, Ss, Gg, Ss, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Wwr, Wwr, Ww, Ww, Ww, Ww, Ww, Ds, Ss, Ss, Ds, Ds, Gg, Ss, Ss, Ww, Ww, Ss, Ss, Ss, Gg, Ww, Ww, Ww, Ss, Ss, Ww, Ss, Ds, Ss, Ss, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Wo, Wwr, Wwr, Ww, Ww, Ww, Ss, Ss, Ss, Ss, Ss, Ss, Ww, Ss, Ww, Ww, Ss, Ss, Ww, Ww, Ss, Ss, Ww, Ww, Ww, Ss, Ds, Ss, Ds, Ss, Gg, Gs^Fp, Gg, Gg^Vo, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Wo, Wo, Ww, Ww, Ss, Ss, Ss, Ss, Ww, Ww, Ww, Ww, Ww, Ds, Ww, Ds, Ds, Gg^Vc, Ss, Ss, Gg, Gg, Ss, Ss, Ss, Ds, Ds, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wwr, Wo, Wo, Ww, Ww, Ss, Ss, Ss, Ss, Ww, Ww, Ww, Ww, Ww, Ds, Ww, Ds, Ds, Gg, Ss, Ss, Gg, Gg, Ss, Ss, Ss, Ds, Ds, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gg
|
||||
Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ss, Ww, Ww, Ww, Ds, Ss, Ss, Ww, Ss, Ds, Ss, Ss, Ss, Ss, Ss, Ss, Gg, Ss, Ds, Ds, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg
|
||||
Ww, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Wo, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ss, Ss, Gg, Ss, Ss, Gg, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Ss, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gg, Gg, Gg
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
id=13_The_Dwarvish_Stand
|
||||
name= _ "The Dwarvish Stand"
|
||||
map_data="{campaigns/Son_Of_The_Black_Eye/maps/13_The_Dwarvish_Stand.map}"
|
||||
{TURNS 35 30 27}
|
||||
{TURNS 28 24 22}
|
||||
|
||||
{DEFAULT_SCHEDULE}
|
||||
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
controller=human
|
||||
team_name=Kapoue
|
||||
user_team_name=_ "Kapou’e"
|
||||
gold=300
|
||||
gold=200
|
||||
{BLACK_FLAG}
|
||||
[/side]
|
||||
|
||||
|
|
@ -64,12 +64,12 @@
|
|||
|
||||
[side]
|
||||
{ALBROCK_SIDE}
|
||||
{GOLD 200 150 100}
|
||||
{GOLD 125 100 75}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
{FLARTAR_SIDE}
|
||||
{GOLD 200 150 100}
|
||||
{GOLD 125 100 75}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
canrecruit=yes
|
||||
team_name=villains
|
||||
user_team_name=_"Villains"
|
||||
{GOLD 200 250 300}
|
||||
{GOLD 350 400 450}
|
||||
{FLAG_VARIANT ragged}
|
||||
[/side]
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
id=14_Back_Home
|
||||
name= _ "Back Home"
|
||||
map_data="{campaigns/Son_Of_The_Black_Eye/maps/14_Back_Home.map}"
|
||||
{TURNS 40 35 30}
|
||||
turns=24
|
||||
|
||||
{DEFAULT_SCHEDULE}
|
||||
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
controller=human
|
||||
team_name=Kapoue
|
||||
user_team_name=_ "Kapou’e"
|
||||
gold=400
|
||||
gold=300
|
||||
{BLACK_FLAG}
|
||||
[/side]
|
||||
|
||||
|
|
@ -68,10 +68,12 @@
|
|||
|
||||
[side]
|
||||
{ALBROCK_SIDE}
|
||||
{GOLD 200 175 150}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
{FLARTAR_SIDE}
|
||||
{GOLD 150 125 100}
|
||||
[/side]
|
||||
|
||||
[side]
|
||||
|
|
@ -120,6 +122,7 @@
|
|||
team_name=villains
|
||||
user_team_name=_"Villains"
|
||||
{GOLD 250 300 350}
|
||||
income=12
|
||||
{AVOID_ALLIES}
|
||||
{FLAG_VARIANT loyalist}
|
||||
[/side]
|
||||
|
|
@ -138,6 +141,7 @@
|
|||
team_name=villains
|
||||
user_team_name=_"Villains"
|
||||
{GOLD 250 300 350}
|
||||
income=12
|
||||
{AVOID_ALLIES}
|
||||
{FLAG_VARIANT wood-elvish}
|
||||
[/side]
|
||||
|
|
@ -155,6 +159,7 @@
|
|||
team_name=villains
|
||||
user_team_name=_"Villains"
|
||||
{GOLD 250 300 350}
|
||||
income=12
|
||||
{AVOID_ALLIES}
|
||||
{FLAG_VARIANT loyalist}
|
||||
[/side]
|
||||
|
|
@ -172,6 +177,7 @@
|
|||
team_name=villains
|
||||
user_team_name=_"Villains"
|
||||
{GOLD 250 300 350}
|
||||
income=12
|
||||
{AVOID_ALLIES}
|
||||
{FLAG_VARIANT loyalist}
|
||||
[/side]
|
||||
|
|
@ -290,13 +296,13 @@
|
|||
[message]
|
||||
speaker="Flar'Tar"
|
||||
image=portraits/flartar.png~FL()~RIGHT()
|
||||
message= _ "Yeah, sure."
|
||||
message= _ "Yes, Chief."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker="Al'Brock"
|
||||
image=portraits/albrock.png~FL()~RIGHT()
|
||||
message= _ "Whatever."
|
||||
message= _ "Understood."
|
||||
[/message]
|
||||
|
||||
[store_unit]
|
||||
|
|
@ -412,11 +418,6 @@
|
|||
message= _ "Excellent. Now, where are the others?"
|
||||
[/message]
|
||||
|
||||
[modify_side]
|
||||
side=2
|
||||
{GOLD 350 300 250}
|
||||
[/modify_side]
|
||||
|
||||
[allow_recruit]
|
||||
side=2
|
||||
type=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
|
||||
|
|
@ -472,11 +473,6 @@
|
|||
message= _ "Dumb trolls, you can never rely on them."
|
||||
[/message]
|
||||
|
||||
[modify_side]
|
||||
side=3
|
||||
{GOLD 350 300 250}
|
||||
[/modify_side]
|
||||
|
||||
[allow_recruit]
|
||||
side=3
|
||||
type=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish Crossbowman, Orcish Warrior
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
name= _ "Civil War"
|
||||
map_data="{campaigns/Son_Of_The_Black_Eye/maps/15_Civil_War.map}"
|
||||
|
||||
{TURNS 40 35 30}
|
||||
turns=30
|
||||
|
||||
victory_when_enemies_defeated="no"
|
||||
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
controller=human
|
||||
team_name=Kapoue
|
||||
user_team_name=_ "Kapou’e"
|
||||
gold=400
|
||||
gold=300
|
||||
{BLACK_FLAG}
|
||||
[/side]
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
name= _ "The Coward"
|
||||
map_data="{campaigns/Son_Of_The_Black_Eye/maps/16_The_Coward.map}"
|
||||
|
||||
{TURNS 34 32 28}
|
||||
turns=22
|
||||
|
||||
victory_when_enemies_defeated="yes"
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
controller=human
|
||||
team_name=Kapoue
|
||||
user_team_name=_ "Kapou’e"
|
||||
gold=400
|
||||
gold=200
|
||||
{BLACK_FLAG}
|
||||
[/side]
|
||||
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
side=3
|
||||
canrecruit=yes
|
||||
recruit=Wolf Rider, Orcish Grunt, Orcish Archer, Young Ogre
|
||||
gold=100
|
||||
gold=150
|
||||
user_team_name=_"Rebels"
|
||||
team_name=rebels
|
||||
[/side]
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
side=4
|
||||
canrecruit=yes
|
||||
recruit=Wolf Rider, Orcish Grunt, Orcish Archer, Young Ogre
|
||||
gold=100
|
||||
gold=150
|
||||
user_team_name=_"Rebels"
|
||||
team_name=rebels
|
||||
[/side]
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
[message]
|
||||
speaker="Shan Taum"
|
||||
image=portraits/shan_taum.png~FL()~RIGHT()
|
||||
message= _ "..."
|
||||
message= _ "LIES! THESE ARE ALL LIES!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
@ -248,7 +248,7 @@
|
|||
[message]
|
||||
speaker="Shan Taum"
|
||||
image=portraits/shan_taum.png~FL()~RIGHT()
|
||||
message= _ "LIES! THESE ARE ALL LIES!"
|
||||
message= _ "How dare you accuse me of being a traitor, you turdlicker!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
speaker="Shan Taum"
|
||||
image=portraits/shan_taum.png~FL()~RIGHT()
|
||||
# wmllint: local spelling turdlicker
|
||||
message= _ "How dare you accuse me of being a traitor, you turdlicker! Orga, kill this kid for me. I’ll be in my keep."
|
||||
message= _ "Orga, kill this kid for me. I’ll be in my keep."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -189,9 +189,9 @@ Units not only cost gold to Recruit or Recall, they also require money to suppor
|
|||
text= _ "On top of the energy bar shown next to each unit of yours is an orb. For units you control, this orb is:" + "
|
||||
<img>src=help/orb-green.png align=here</img>" + _ " green if it hasn’t moved this turn," + "
|
||||
<img>src=help/orb-yellow.png align=here</img>" + _ " yellow if it has moved, but could still move further or attack, or" + "
|
||||
<img>src=help/orb-red.png align=here</img>" + _ " red if it can no longer move or attack, or the user ended the unit’s turn." + "
|
||||
<img>src=help/orb-black.png align=here</img>" + _ " black if it can no longer move or attack, or the user ended the unit’s turn." + "
|
||||
<img>src=help/orb-blue.png align=here</img>" + _ " blue if the unit is an ally you do not control." + "
|
||||
<img>src=help/orb-none.png align=here</img>" + _ " Enemy units have no orb on top of their energy bar."
|
||||
<img>src=help/orb-red.png align=here</img>" + _ " Enemy units have a red orb on top of their energy bar."
|
||||
[/topic]
|
||||
#wmllint: markcheck on
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 172 KiB After Width: | Height: | Size: 151 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 172 KiB After Width: | Height: | Size: 153 KiB |
BIN
data/core/images/help/orb-black.png
Normal file
BIN
data/core/images/help/orb-black.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 26 KiB |
|
|
@ -384,6 +384,18 @@
|
|||
{OVERLAY_F *^Bs| bridge cave/chasm-stone-bridge-s-n}
|
||||
{OVERLAY_F *^Bs/ bridge cave/chasm-stone-bridge-sw-ne}
|
||||
|
||||
# Trash/remains
|
||||
{TRASH_A *^Edt 33 misc/detritus/trashA}
|
||||
{TRASH_A *^Edb 33 misc/detritus/detritusA}
|
||||
|
||||
{LITTER_BASE *^Edb,*^Edt misc/detritus/liter}
|
||||
|
||||
{TRASH_B *^Edt trash_medium 70 "1;2;3;4;5;6;7;8;9;10" misc/detritus/trashB}
|
||||
{TRASH_B *^Edb detritus_medium 70 "1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16" misc/detritus/detritusB}
|
||||
|
||||
{TRASH_C *^Edt trash_big trash_medium 30 "1;2;3;4" misc/detritus/trashC}
|
||||
{TRASH_C *^Edb detritus_big detritus_medium 50 "1;2;3;4;5;6;7" misc/detritus/detritusC}
|
||||
|
||||
#
|
||||
# > B A S E T E R R A I N S <
|
||||
#
|
||||
|
|
@ -821,312 +833,5 @@
|
|||
# Default terrain
|
||||
{TERRAIN_BASE * void/void}
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Edt
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=33
|
||||
[image]
|
||||
name=misc/detritus/trashA-@V.png
|
||||
variations="1;2;3;4;5"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Edb
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=33
|
||||
[image]
|
||||
name=misc/detritus/detritusA-@V.png
|
||||
variations="1;2;3;4;5"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type=*^Edb,*^Edt
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=100
|
||||
[image]
|
||||
name=misc/detritus/liter@V.png
|
||||
variations=";2;3;4;5;6"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
##################### two neighbours ########################
|
||||
|
||||
#define TRI_TRASH_B TERRAIN FLAG PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
2 , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , 2
|
||||
, 1
|
||||
* , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , 2
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , *
|
||||
, 1
|
||||
2 , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-200
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
||||
{TRI_TRASH_B (*^Edt) (trash_medium) (70) ("1;2;3;4;5;6;7;8;9;10") (misc/detritus/trashB)}
|
||||
{TRI_TRASH_B (*^Edb) (detritus_medium) (70) ("1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16") (misc/detritus/detritusB)}
|
||||
|
||||
############################## Major ##########################
|
||||
|
||||
#define TRI_TRASH_C TERRAIN FLAG FLAG2 PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
3 , 3
|
||||
, 1
|
||||
3 , 3
|
||||
, 2"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
3 , 2
|
||||
, 1
|
||||
2 , 3
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
2 , 3
|
||||
, 1
|
||||
3 , 2
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-199
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
||||
{TRI_TRASH_C (*^Edt) (trash_big) (trash_medium) (30) ("1;2;3;4") (misc/detritus/trashC)}
|
||||
{TRI_TRASH_C (*^Edb) (detritus_big) (detritus_medium) (50) ("1;2;3;4;5;6;7") (misc/detritus/detritusC)}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#wmlindent: stop ignoring
|
||||
|
|
|
|||
280
data/core/terrain-graphics/trash.cfg
Normal file
280
data/core/terrain-graphics/trash.cfg
Normal file
|
|
@ -0,0 +1,280 @@
|
|||
#textdomain wesnoth
|
||||
|
||||
#define TRASH_A TERRAIN PROB IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGESTEM}-@V.png
|
||||
variations="1;2;3;4;5"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define LITTER_BASE TERRAIN IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag=litter_base
|
||||
[/tile]
|
||||
probability=100
|
||||
[image]
|
||||
name={IMAGESTEM}@V.png
|
||||
variations=";2;3;4;5;6"
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-201
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
##################### two neighbours ########################
|
||||
|
||||
#define TRASH_B TERRAIN FLAG PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
2 , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , 2
|
||||
, 1
|
||||
* , 2
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , 2
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
2 , *
|
||||
, 1
|
||||
2 , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN}
|
||||
has_flag=litter_base
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-200
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
||||
############################## Major ##########################
|
||||
|
||||
#define TRASH_C TERRAIN FLAG FLAG2 PROB VARIATIONS IMAGE
|
||||
|
||||
# set flags
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
3 , 3
|
||||
, 1
|
||||
3 , 3
|
||||
, 2"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
3 , 2
|
||||
, 1
|
||||
2 , 3
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 3
|
||||
2 , 3
|
||||
, 1
|
||||
3 , 2
|
||||
, 3"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
set_no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
has_flag={FLAG2}
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
no_flag={FLAG}
|
||||
[/tile]
|
||||
probability=100
|
||||
[/terrain_graphics]
|
||||
|
||||
# draw images
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
* , *
|
||||
, 1
|
||||
* , *
|
||||
, *"
|
||||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN}
|
||||
has_flag={FLAG}
|
||||
set_no_flag={FLAG}_drawn
|
||||
[/tile]
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}-@V.png
|
||||
variations={VARIATIONS}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer=-199
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
|
||||
#enddef
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
has_helptip_message = " (Press '$hotkey' for more information)"
|
||||
[/settings]
|
||||
|
||||
{hardwired/tips.cfg}
|
||||
{tips.cfg}
|
||||
|
||||
{gui/default/macros/}
|
||||
{gui/default/window/}
|
||||
|
|
|
|||
|
|
@ -73,11 +73,11 @@
|
|||
|
||||
# This color is used as background in the listbox.
|
||||
#define GUI__BACKGROUND_COLOR_ENABLED
|
||||
"21, 19, 19, 255"
|
||||
"0, 0, 0, 89"
|
||||
#enddef
|
||||
|
||||
#define GUI__BACKGROUND_COLOR_DISABLED
|
||||
"64, 64, 64, 255"
|
||||
"64, 64, 64, 64"
|
||||
#enddef
|
||||
|
||||
# Draws the background for a selected cell in a listbox. For now there's one
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@
|
|||
#enddef
|
||||
|
||||
{_GUI_DEFINITION "default" "default label" DEFAULT () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
|
||||
{_GUI_DEFINITION "default_bold" "default label, bold font" DEFAULT "bold" DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
|
||||
{_GUI_DEFINITION "scroll_label" "scroll label" DEFAULT () DEFAULT 0}
|
||||
{_GUI_DEFINITION "title" "label used for titles" TITLE "bold" TITLE ({GUI__TEXT_VERTICALLY_CENTRED})}
|
||||
{_GUI_DEFINITION "default_large" "default, large font size" LARGE () DEFAULT ({GUI__TEXT_VERTICALLY_CENTRED})}
|
||||
|
|
|
|||
|
|
@ -19,14 +19,13 @@
|
|||
|
||||
[draw]
|
||||
|
||||
# Blurring doesn't work yet, keeps adding
|
||||
# [pre_commit]
|
||||
#
|
||||
# [blur]
|
||||
# depth = 1
|
||||
# [/blur]
|
||||
#
|
||||
# [/pre_commit]
|
||||
[pre_commit]
|
||||
|
||||
[blur]
|
||||
depth = 1
|
||||
[/blur]
|
||||
|
||||
[/pre_commit]
|
||||
|
||||
[image]
|
||||
name = "dialogs/translucent54-border-topleft.png"
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
h = "(height - 2)"
|
||||
border_thickness = 1
|
||||
border_color = "0, 0, 0, 255"
|
||||
fill_color = "21, 22, 24, 255"
|
||||
fill_color = {GUI__BACKGROUND_COLOR_ENABLED}
|
||||
[/rectangle]
|
||||
|
||||
# 3D effect at upper side.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@
|
|||
### Definition of a single line text box.
|
||||
###
|
||||
|
||||
#define _GUI_DRAW_BACKGROUND COLOR
|
||||
[rectangle]
|
||||
x = 0
|
||||
y = 0
|
||||
w = "(width)"
|
||||
h = "(height)"
|
||||
|
||||
fill_color = {COLOR}
|
||||
|
||||
[/rectangle]
|
||||
#enddef
|
||||
|
||||
#define _GUI_DRAW_BORDER COLOR
|
||||
[rectangle]
|
||||
x = 0
|
||||
|
|
@ -85,6 +97,8 @@
|
|||
|
||||
[draw]
|
||||
|
||||
{_GUI_DRAW_BACKGROUND ({GUI__BACKGROUND_COLOR_ENABLED})}
|
||||
|
||||
{_GUI_DRAW_BORDER ({GUI__FONT_COLOR_ENABLED__TITLE}) }
|
||||
|
||||
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) }
|
||||
|
|
@ -97,6 +111,8 @@
|
|||
|
||||
[draw]
|
||||
|
||||
{_GUI_DRAW_BACKGROUND ({GUI__BACKGROUND_COLOR_DISABLED})}
|
||||
|
||||
{_GUI_DRAW_BORDER ({GUI__FONT_COLOR_DISABLED__TITLE}) }
|
||||
|
||||
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) }
|
||||
|
|
@ -109,6 +125,8 @@
|
|||
|
||||
[draw]
|
||||
|
||||
{_GUI_DRAW_BACKGROUND ({GUI__BACKGROUND_COLOR_ENABLED})}
|
||||
|
||||
{_GUI_DRAW_BORDER ({GUI__FONT_COLOR_ENABLED__TITLE}) }
|
||||
|
||||
{_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) }
|
||||
|
|
@ -137,3 +155,4 @@
|
|||
#undef _GUI_DRAW_CURSOR
|
||||
#undef _GUI_DRAW_TEXT
|
||||
#undef _GUI_DRAW_BORDER
|
||||
#undef _GUI_DRAW_BACKGROUND
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@
|
|||
|
||||
[column]
|
||||
|
||||
horizontal_alignment = "left"
|
||||
horizontal_grow = "true"
|
||||
|
||||
[grid]
|
||||
|
||||
|
|
@ -338,7 +338,7 @@
|
|||
border = "all"
|
||||
border_size = 5
|
||||
vertical_alignment = "top"
|
||||
horizontal_alignment = "left"
|
||||
horizontal_grow = "true"
|
||||
|
||||
[scroll_label]
|
||||
id = "description"
|
||||
|
|
|
|||
|
|
@ -136,12 +136,26 @@
|
|||
grow_factor = 7
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
[scroll_label]
|
||||
id = "msg"
|
||||
definition = "default"
|
||||
label = ""
|
||||
[/scroll_label]
|
||||
horizontal_grow = "true"
|
||||
|
||||
#
|
||||
# HACK:
|
||||
# In order to reserve a minimum screen space for the
|
||||
# central widget and avoid sudden window size changes when
|
||||
# switching pages or entering text in the search box, we
|
||||
# use two spacer widgets within a subgrid to restrict this
|
||||
# cell's minimum size. It's important to keep the spacers'
|
||||
# dimensions within certain limits so as to not cause
|
||||
# dialog-spanning scrollbars to appear on 800x480.
|
||||
#
|
||||
|
||||
{GUI_FORCE_WIDGET_MINIMUM_SIZE 200 250 (
|
||||
[scroll_label]
|
||||
id = "msg"
|
||||
definition = "description"
|
||||
label = ""
|
||||
[/scroll_label]
|
||||
)}
|
||||
[/column]
|
||||
[/row]
|
||||
[row] #status
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
[row]
|
||||
|
||||
[column]
|
||||
horizontal_alignment = "left"
|
||||
horizontal_grow = "true"
|
||||
|
||||
[grid]
|
||||
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
horizontal_grow = "true"
|
||||
|
||||
[text_box]
|
||||
id = "team_name"
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
grow_factor = 1
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
horizontal_grow = "true"
|
||||
|
||||
[text_box]
|
||||
id = "user_team_name"
|
||||
|
|
|
|||
173
data/gui/default/window/wml_error.cfg
Normal file
173
data/gui/default/window/wml_error.cfg
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
#textdomain wesnoth-lib
|
||||
###
|
||||
### Dialog used to report WML parser or preprocessor errors.
|
||||
###
|
||||
|
||||
[window]
|
||||
id = "wml_error"
|
||||
description = "WML preprocessor/parser error report dialog."
|
||||
|
||||
[resolution]
|
||||
definition = "default"
|
||||
|
||||
#click_dismiss = "true"
|
||||
maximum_width = 600
|
||||
maximum_height = 600
|
||||
|
||||
automatic_placement = "true"
|
||||
vertical_placement = "center"
|
||||
horizontal_placement = "center"
|
||||
|
||||
[tooltip]
|
||||
id = "tooltip_large"
|
||||
[/tooltip]
|
||||
|
||||
[helptip]
|
||||
id = "tooltip_large"
|
||||
[/helptip]
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
|
||||
[label]
|
||||
definition = "title"
|
||||
label = _ "Error"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
|
||||
[label]
|
||||
id = "summary"
|
||||
definition = "default"
|
||||
wrap = true
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
|
||||
[label]
|
||||
id = "files"
|
||||
definition = "default"
|
||||
wrap = true
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
|
||||
[label]
|
||||
id = "post_summary"
|
||||
definition = "default"
|
||||
wrap = true
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
horizontal_grow = "true"
|
||||
|
||||
[grid]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "left"
|
||||
vertical_alignment = "bottom"
|
||||
|
||||
[label]
|
||||
id = "details_heading"
|
||||
definition = "default_bold"
|
||||
label = _ "Details:"
|
||||
[/label]
|
||||
[/column]
|
||||
|
||||
[column]
|
||||
border = "top,left,right"
|
||||
border_size = 5
|
||||
horizontal_alignment = "right"
|
||||
|
||||
[button]
|
||||
id = "copy"
|
||||
definition = "action_copy"
|
||||
label = _ "clipboard^Copy"
|
||||
tooltip = _ "Copy this report to clipboard"
|
||||
[/button]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[/grid]
|
||||
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_grow = "true"
|
||||
|
||||
[scroll_label]
|
||||
id = "details"
|
||||
definition = "description"
|
||||
[/scroll_label]
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[row]
|
||||
|
||||
[column]
|
||||
border = "all"
|
||||
border_size = 5
|
||||
horizontal_alignment = "right"
|
||||
|
||||
[button]
|
||||
id = "ok"
|
||||
definition = "default"
|
||||
label = _ "OK"
|
||||
[/button]
|
||||
|
||||
[/column]
|
||||
|
||||
[/row]
|
||||
|
||||
[/grid]
|
||||
|
||||
[/resolution]
|
||||
|
||||
[/window]
|
||||
|
|
@ -16,27 +16,27 @@
|
|||
map_data="border_size=1
|
||||
usage=map
|
||||
|
||||
Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Gg , Ww , Gg , Dd , Gg , Aa , Gg , Aa , Gg , Hh , Gg , Mm , Gg , Uu , Gg , Wo , Wo , Ch , Wo , Wo , Wo , Gg , Wo , Wo , Wo , Md , Wo , Wo , Wo , Rd , Wo , Wo
|
||||
Mm , Mm , Mm , Mm , Mm^Xm , Mm^Xm , Mm^Xm , Gg^Vl , Ww^Vm , Gg , Dd^Vda , Gg , Aa^Vea , Aa^Vla , Aa^Vha , Gg , Hh^Vhh , Gg , Mm^Vhh , Gg , Uu^Vu , Gg , Wo , Wo , Ch , Wo , Wo , Wo , Gg^Fet , Wo , Wo , Wo , Md , Wo , Wo , Wo , Rd^Vov , 3 Wo , Wo
|
||||
Mm , Mm , Mm , Mm , Mm , Mm^Xm , Gg , Gg , Gg , Uu^Vud , Gg , Dd^Vdt , Gg , Gg^Ve , Gg , Gg^Vh , Gg^Vo , Ha^Vhha , Gg , Gs^Vht , Wo , Wo , Cud , Ch , Wo , Wo , Ds , Gg , Wo , Wo^Fet , Hd^Fet , Md^Fet , Wo^Fet , Wo , Re^Kov , Rd^Cov , Wo , Wo , Wo
|
||||
Mm , Mm , Gg , Gg , Gg , Gg , Gg , Ch , Ch , Ch , Ch , Gg , Gg , Gg , Gg , Gg , Gg^Vo , Gg^Vo , Gg^Em , Ss^Vhs , Gg , Cud , Wo , Wo , Dd , Ds , Wo , Wo , Ha , Hd , Wo , Wo , Ql^Fet , Re^Fet , Wo , Wo , Uu^Fp , Uu , Uu
|
||||
Mm , Mm , Gg , Gg , Gg , Gg , Gg , Ch , 1 Kh , Ch , Ww , Gg , Gg , Mm^Vhh , Gg , Gg , Gg , Gg , Gg^Es , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Dd , Wo , Wo , Gs , Ha , Wo , Wo , Mm , Ql , Wo , Wo , Uh^Fp , Uh^Fp , Wo^Fp , Wo^Fp , Wo
|
||||
Mm , Mm , Gg , Gg , Gg , Gg , Gg , Ch , Ch , Ch , Gg , Ww , Gg , Gg , Gg , Gg , Gg , Gg , Gg^Em , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Wo , Gs , Gs , Gg^Vh , Ww , Ww^Fp , Mm , Ww , Wo , Rr , Rr , Wo^Fp , Wo^Fp , Gg^Fp , Gg^Fp , Gg
|
||||
Mm , Mm , Gg , Gg , Gg , Gg , Gg , Ch , Ch , Ch , Gg^Em , Gg , Gg , Gg , Rr , Gg , Rr , Rr , Rr , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vh , Rr , Gg , Ww^Fp , Ww^Fp , Hh^Fp , Hh^Ft , Hh^Ft , Wo , Wo , Wo , Gg^Fp , Wo , Gg , Gg
|
||||
Mm , Mm , Gg , Gg , Gg^Es , Gg , Gg , Gg^Ve , Gg , Gg^Ve , Gg , Gg , Gg , Gg , Gg , Gg , Rr , Gg , Rr , Gg^Efm , Gg , Gg , Gg^Efm , Gg^Em , Gg^Em , Gg , Gg^Fdw , Ww^Fdw , Ww^Fp , Ww^Fp , Ww^Ft , Gg^Ft , Wo , Mm^Xm , Wo , Gg , Wo , Ha , Ha
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs , Gg , Gg , Rr , Gg^Em , Gg , Gg^Efm , Gg , Gg^Efm , Gg^Efm , Gg , Gg , Gg^Es , Gg^Fdw , Aa^Fdw , Gg^Fp , Gg , Gg , Wo , Mm^Xm , Wo , Gg , Wo , Ha , Ha
|
||||
Gg , Gg , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg^Es , Gg , Gg , Gs , Gg , Gs , Gg , Gs , Gg , Gg , Re , Gg^Efm , Gg^Efm , Gg^Efm , Gg , Gg^Efm , Gg^Efm , Gg , Gg , Gg^Em , Aa^Fdw , Aa^Fdw , Gg , Gg , Wo , Aa , Wo , Gg , Wo , Hh , Hh
|
||||
Gg , Gg , Gg , Gg , Gs^Ft , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg^Es , Gs , Gs , Gs , Gg , Re , Gg^Efm , Re , Gg^Efm , Gg , Gg , Gg , Gg , Gg^Em , Gg , Gg , Gg , Gg , Gg , Gg , Wo , Aa , Wo , Md , Wo , Hh , Hh
|
||||
Gg , Gg , Dd^Do , Gg , Gg , Gg , Gg , Gg^Es , Gg , Gg , Gg , Gs^Es , Gg , Gg , Rd , Gg , Gg^Es , Re , Re , Re , Gg^Efm , Gg , Ch , Ch , Ch , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Wo , Ai , Wo , Md , Wo , Ss^Bw| , Ss^Bw|
|
||||
Gg , Gg , Gg , Gg , Gg^Fet , Gg , Gg , Gg , Gs^Fpa , Ds^Fp , Gs^Fp , Gg , Gg , Rd , Gg , Rd , Gg , Gg , Gg , Gg , Gg , Gg , Ch , Ch , Ch , Gg , Gg , Gg , Ww , Gg , Wo , Gg , Wo , Ai , Wo , Mm , Wo , Ss , Ss
|
||||
Xu , Xu , Xu , Gg , Gg , Gg , Gg , Gg , Re^Fp , Gg^Fet , Gg^Fp , Ss^Vm , Gg , Rd , Rd , Rd , Gg , Re , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Wo^Bw\ , Wo^Bw/ , Wo^Bw| , Ww , Gg , Wo , Dd , Wo , Mm , Wo , Ss , Ss
|
||||
Xu , Xu , Xu , Ce , Ce , Ke , Ce , Gg , Gg , Re^Fp , Gg^Ve , Gg^Vh , Gg , Gg , Gg , Gg , Ce , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ss^Bw/ , Ww , Ss^Bw| , Ss^Bw\ , Gg , Wo , Dd , Wo , Qxu , Wo , Rr , Rr
|
||||
Xu , Xu , Uu^Uf , Xu , Ce , Ce , Xu , Gg , Uh , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ke , Ce , Gg , Gg , Gg , Gg , Gg^Es , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ss^Bw\ , Wo , Ds , Wo , Qxu , Wo , Rr , Rr
|
||||
Xu , Xu , Uu^Uf , Xu , Xu , Xu , Xu , Xu , Uu , Gg , Uh , Gg , Gg , Gg^Es , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ss , Gg , Gg , 2 Kh , Gg , Gg , Wo , Ds , Wo , Rd , Wo , Uh , Uh
|
||||
Xu , Xu , Qxu , Qxu , Cud , Xu , Uu , Uu^Ii , Uu^Vu , Gg , Xu , Gg , Gg , Gg , Gg^Ve , Gg , Ch , Gg , Gg , Chr , Chr , Gg , Chw , Ww , Gg , Chs , Chs , Gg , Cud , Gg , Gg , Gg , Wo , Gs , Wo , Rd , Wo , Uh , Uh
|
||||
Xu , Xu , Xu , Qxu , Ql , Cud , Uh , Uu^Vu , Uu^Uf , Xu , Ql , Gg^Ve , Xu , Gg , Gg , Gg , Kh , Ch , Gg , Khr , Gg , Gg , Khw , Chw , Gg , Khs , Gg , Gg , Kud , Cud , Ww^Bw/ , Ww^Bw/ , Wo , Gs , Wo , Re , Wo , Uu , Uu
|
||||
Xu , Xu , Qxu , Qxu , Ql , Ql , Ql , Xu , Xu , Xu , Xu , Xu , Xu , Xu , Xu , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Wo , Gg , Wo , Re , Wo , Uu , Uu
|
||||
Xu , Xu , Qxu , Qxu , Ql , Ql , Ql , Xu , Xu , Xu , Xu , Xu , Xu , Xu , Xu , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Wo , Gg , Wo , Re , Wo , Uu , Uu
|
||||
Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Gg, Ww, Gg, Dd, Gg, Aa, Gg, Aa, Gg, Hh, Gg, Mm, Gg, Uu, Gg, Wo, Wo, Ch, Wo, Wo, Wo, Gg, Wo, Wo, Wo, Md, Wo, Wo, Wo, Rd, Wo, Wo
|
||||
Mm, Mm, Mm, Mm, Mm^Xm, Mm^Xm, Mm^Xm, Gg^Vl, Ww^Vm, Gg, Dd^Vda, Gg, Aa^Vea, Aa^Vla, Aa^Vha, Gg, Hh^Vhh, Gg, Mm^Vhh, Gg, Uu^Vu, Gg, Wo, Wo, Ch, Wo, Wo, Wo, Gg^Fet, Wo, Wo, Wo, Md, Wo, Wo, Wo, Rd^Vov, 3 Wo, Wo
|
||||
Mm, Mm, Mm, Mm, Mm, Mm^Xm, Gg, Gg, Gg, Uu^Vud, Gg, Dd^Vdt, Gg, Gg^Ve, Gg, Gg^Vh, Gg^Vo, Ha^Vhha, Gg, Gs^Vht, Wo, Wo, Cud, Ch, Wo, Wo, Ds, Gg, Wo, Wo^Fet, Hd^Fet, Md^Fet, Wo^Fet, Wo, Re^Kov, Rd^Cov, Wo, Wo, Wo
|
||||
Mm, Mm, Gg, Gg, Gg, Gg, Gg, Ch, Ch, Ch, Ch, Gg, Gg, Gg, Gg, Gg, Gg^Vo, Gg^Vo, Gg^Em, Ss^Vhs, Gg, Cud, Wo, Wo, Dd, Ds, Wo, Wo, Ha, Hd, Wo, Wo, Ql^Fet, Re^Fet, Wo, Wo, Uu^Fp, Uu, Uu
|
||||
Mm, Mm, Gg, Gg, Gg, Gg, Gg, Ch, 1 Kh, Ch, Ww, Gg, Gg, Mm^Vhh, Gg, Gg, Gg, Gg, Gg^Es, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Dd, Wo, Wo, Gs, Ha, Wo, Wo, Mm, Ql, Wo, Wo, Uh^Fp, Uh^Fp, Wo^Fp, Wo^Fp, Wo
|
||||
Mm, Mm, Gg, Gg, Gg, Gg, Gg, Ch, Ch, Ch, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Em, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Wo, Gs, Gs, Gg^Vh, Ww, Ww^Fp, Mm, Ww, Wo, Rr, Rr, Wo^Fp, Wo^Fp, Gg^Fp, Gg^Fp, Gg
|
||||
Mm, Mm, Gg, Gg, Gg, Gg, Gg, Ch, Ch, Ch, Gg^Em, Gg, Gg, Gg, Rr, Gg, Rr, Rr, Rr, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg^Vh, Rr, Gg, Ww^Fp, Ww^Fp, Hh^Fp, Hh^Ft, Hh^Ft, Wo, Wo, Wo, Gg^Fp, Wo, Gg, Gg
|
||||
Mm, Mm, Gg, Gg, Gg^Es, Gg, Gg, Gg^Ve, Gg, Gg^Ve, Gg, Gg, Gg, Gg, Gg, Gg, Rr, Gg, Rr, Gg^Efm, Gg, Gg, Gg^Efm, Gg^Em, Gg^Em, Gg, Gg^Fdw, Ww^Fdw, Ww^Fp, Ww^Fp, Ww^Ft, Gg^Ft, Wo, Mm^Xm, Wo, Gg, Wo, Ha, Ha
|
||||
Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs, Gg, Gg, Rr, Gg^Em, Gg, Gg^Efm, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gg^Es, Gg^Fdw, Aa^Fdw, Gg^Fp, Gg, Gg, Wo, Mm^Xm, Wo, Gg, Wo, Ha, Ha
|
||||
Gg, Gg, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg^Es, Gg, Gg, Gs, Gg, Gs, Gg, Gs, Gg, Gg, Re, Gg^Efm, Gg^Efm, Gg^Efm, Gg, Gg^Efm, Gg^Efm, Gg, Gg, Gg^Em, Aa^Fdw, Aa^Fdw, Gg, Gg, Wo, Aa, Wo, Gg, Wo, Hh, Hh
|
||||
Gg, Gg, Gg, Gg, Gs^Ft, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg^Es, Gs, Gs, Gs, Gg, Re, Gg^Efm, Re, Gg^Efm, Gg, Gg, Gg, Gg, Gg^Em, Gg, Gg, Gg, Gg, Gg, Gg, Wo, Aa, Wo, Md, Wo, Hh, Hh
|
||||
Gg, Gg, Dd^Do, Gg, Gg, Gg, Gg, Gg^Es, Gg, Gg, Gg, Gs^Es, Gg, Gg, Rd, Gg, Gg^Es, Re, Re, Re, Gg^Efm, Gg, Ch, Ch, Ch, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Wo, Ai, Wo, Md, Wo, Ss^Bw|, Ss^Bw|
|
||||
Gg, Gg, Gg, Gg, Gg^Fet, Gg, Gg, Gg, Gs^Fpa, Ds^Fp, Gs^Fp, Gg, Gg, Rd, Gg, Rd, Gg, Gg, Gg, Gg, Gg, Gg, Ch, Ch, Ch, Gg, Gg, Gg, Ww, Gg, Wo, Gg, Wo, Ai, Wo, Mm, Wo, Ss, Ss
|
||||
Xu, Xu, Xu, Gg, Gg, Gg, Gg, Gg, Re^Fp, Gg^Fet, Gg^Fp, Ss^Vm, Gg, Rd, Rd, Rd, Gg, Re, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Wo^Bw\, Wo^Bw/, Wo^Bw|, Ww, Gg, Wo, Dd, Wo, Mm, Wo, Ss, Ss
|
||||
Xu, Xu, Xu, Ce, Ce, Ke, Ce, Gg, Gg, Re^Fp, Gg^Ve, Gg^Vh, Gg, Gg, Gg, Gg, Ce, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ss^Bw/, Ww, Ss^Bw|, Ss^Bw\, Gg, Wo, Dd, Wo, Qxu, Wo, Rr, Rr
|
||||
Xu, Xu, Uu^Uf, Xu, Ce, Ce, Xu, Gg, Uh, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ke, Ce, Gg, Gg, Gg, Gg, Gg^Es, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ss^Bw\, Wo, Ds, Wo, Qxu, Wo, Rr, Rr
|
||||
Xu, Xu, Uu^Uf, Xu, Xu, Xu, Xu, Xu, Uu, Gg, Uh, Gg, Gg, Gg^Es, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ss, Gg, Gg, 2 Kh, Gg, Gg, Wo, Ds, Wo, Rd, Wo, Uh, Uh
|
||||
Xu, Xu, Qxu, Qxu, Cud, Xu, Uu, Uu^Ii, Uu^Vu, Gg, Xu, Gg, Gg, Gg, Gg^Ve, Gg, Ch, Gg, Gg, Chr, Chr, Gg, Chw, Ww, Gg, Chs, Chs, Gg, Cud, Gg, Gg, Gg, Wo, Gs, Wo, Rd, Wo, Uh, Uh
|
||||
Xu, Xu, Xu, Qxu, Ql, Cud, Uh, Uu^Vu, Uu^Uf, Xu, Ql, Gg^Ve, Xu, Gg, Gg, Gg, Kh, Ch, Gg, Khr, Gg, Gg, Khw, Chw, Gg, Khs, Gg, Gg, Kud, Cud, Ww^Bw/, Ww^Bw/, Wo, Gs, Wo, Re, Wo, Uu, Uu
|
||||
Xu, Xu, Qxu, Qxu, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Wo, Gg, Wo, Re, Wo, Uu, Uu
|
||||
Xu, Xu, Qxu, Qxu, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Wo, Gg, Wo, Re, Wo, Uu, Uu
|
||||
"
|
||||
turns=-1
|
||||
id=test
|
||||
|
|
|
|||
|
|
@ -1516,13 +1516,13 @@
|
|||
[remove]
|
||||
id=top_button_file3
|
||||
[/remove]
|
||||
[remove]
|
||||
#[remove]
|
||||
#id=villages-panel
|
||||
# image=themes/status-bg.png
|
||||
# rect="+5,=+1,+71,+19"
|
||||
# xanchor=fixed
|
||||
# yanchor=fixed
|
||||
[/remove]
|
||||
#[/remove]
|
||||
[remove]
|
||||
id=villages-icon
|
||||
# icon=themes/villages.png
|
||||
|
|
|
|||
|
|
@ -305,19 +305,16 @@ class CampaignClient:
|
|||
|
||||
return None
|
||||
|
||||
def put_campaign(self, name, cfgfile, directory, ign, stuff):
|
||||
def put_campaign(self, name, cfgfile, directory, ign, pbl):
|
||||
"""
|
||||
Uploads a campaign to the server. The title, name, author, passphrase,
|
||||
description, version and icon parameters are what would normally be
|
||||
found in a .pbl file.
|
||||
Uploads a campaign to the server.
|
||||
|
||||
The cfgfile is the name of the main .cfg file of the campaign.
|
||||
|
||||
The directory is the name of the campaign's directory.
|
||||
"""
|
||||
request = wmldata.DataSub("upload")
|
||||
for k, v in stuff.items():
|
||||
request.set_text_val(k, v)
|
||||
request = pbl.copy()
|
||||
request.name = "upload"
|
||||
request.set_text_val("name", name)
|
||||
|
||||
data = wmldata.DataSub("data")
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ if __name__ == "__main__":
|
|||
print "[ERROR github in {0}] {1}".format(e.addon, str(e.message))
|
||||
error = True
|
||||
except libgithub.Error as e:
|
||||
print "[ERROR github] in addon '" + k + "'" + str(e)
|
||||
print "[ERROR github] in addon '{0}' {1}".format(k, str(e))
|
||||
error = True
|
||||
except socket.error as e:
|
||||
print "Socket error: " + str(e)
|
||||
|
|
|
|||
|
|
@ -327,12 +327,7 @@ dependencies="%s"
|
|||
"*.wesnoth",
|
||||
"*.project"]
|
||||
|
||||
stuff = {}
|
||||
for field in ["title", "author", "passphrase", "description",
|
||||
"version", "icon", "type", "email", "translate"]:
|
||||
stuff[field] = pbl.get_text_val(field)
|
||||
|
||||
mythread = cs.put_campaign_async(name, cfgfile, wmldir, ign, stuff)
|
||||
mythread = cs.put_campaign_async(name, cfgfile, wmldir, ign, pbl)
|
||||
|
||||
pcounter = 0
|
||||
while not mythread.event.isSet():
|
||||
|
|
|
|||
|
|
@ -16,33 +16,33 @@ Here is a list of the general howto for the screenshots:
|
|||
resolution to 640x480 and set quality level to 80%. This is the command to use
|
||||
when using imagemagick (change file name accordingly for the titlescreen
|
||||
screenshot):
|
||||
convert -resize 640x480 -quality 80 game-screen-1.5.7.png game-screen-1.5.7.jpg
|
||||
convert -resize 640x480 -quality 80 game-screen-1.11.9.bmp game-screen-1.11.9.jpg
|
||||
|
||||
4) For those "parts of the screen" screenshots just copy out the relevant part
|
||||
from the full versions. All "non fullscreen" screenshots should be stored with a
|
||||
compression/quality setting of 90% and in the original size. The imagemagick
|
||||
command would look like this:
|
||||
convert -quality 90 multiplayer-1.5.7.png multiplayer-1.5.7.jpg
|
||||
convert -quality 90 multiplayer-1.11.9.bmp multiplayer-1.11.9.jpg
|
||||
|
||||
5) Send the files in once you translated the strings in the po file. In the
|
||||
translation use your locale as prefix/foldername. So if you were eg translating
|
||||
to German, you would use 'de' as foldername where the images are in and the
|
||||
filename for the game-screen screenshot would be this:
|
||||
de/game-screen-1.5.7.jpg
|
||||
de/multiplayer-1.5.7.jpg
|
||||
de/game-screen-1.11.9.jpg
|
||||
de/multiplayer-1.11.9.jpg
|
||||
Please send the screenshots in a separate archive.
|
||||
|
||||
|
||||
As a hint where you could create the screenshots (that is: where the original
|
||||
ones were taken):
|
||||
* game-screen-1.5.7.jpg: 3rd scenario of two brothers, just jumping there with
|
||||
:debug and :n and then letting the AI play some turns with :droid
|
||||
* right_pane-1.5.7.jpg: right part from the "game-screen" screenshot
|
||||
* top_pane-1.5.7.jpg: top part from the "game-screen" screenshot
|
||||
* main-menu-1.5.7.jpg: the main menu (obvious, isn't it?)
|
||||
* multiplayer-1.5.7.jpg: just the dialog that pops up when clicking on
|
||||
'multiplayer' in the main menu, take care to set the player name to the default
|
||||
value 'player' (or whatever it is in your lang, since this one is a
|
||||
translatable string)
|
||||
* recruit-1.5.7.jpg: start a skirmish game and select elves as your race, click
|
||||
on recruit and take a screenshot of the dialog popping up
|
||||
* game-screen-1.11.9.jpg: 3rd scenario of two brothers, just jumping there with
|
||||
:debug and :n and then letting the AI play some turns with :droid
|
||||
* right_pane-1.11.9.jpg: right part from the "game-screen" screenshot
|
||||
* top_pane-1.11.9.jpg: top part from the "game-screen" screenshot
|
||||
* main-menu-1.11.9.jpg: the main menu (obvious, isn't it?)
|
||||
* multiplayer-1.11.9.jpg: just the dialog that pops up when clicking on
|
||||
'multiplayer' in the main menu, take care to set the player name to the
|
||||
default value 'player' (or whatever it is in your lang, since this one is a
|
||||
translatable string)
|
||||
* recruit-1.11.9.jpg: start a skirmish game and select default era and rebels as
|
||||
your race, click on recruit and take a screenshot of the dialog popping up
|
||||
|
|
|
|||
BIN
doc/manual/images/game-screen-1.11.9.jpg
Normal file
BIN
doc/manual/images/game-screen-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB |
BIN
doc/manual/images/main-menu-1.11.9.jpg
Normal file
BIN
doc/manual/images/main-menu-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 89 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB |
BIN
doc/manual/images/multiplayer-1.11.9.jpg
Normal file
BIN
doc/manual/images/multiplayer-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
BIN
doc/manual/images/orb-black.jpg
Normal file
BIN
doc/manual/images/orb-black.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.3 KiB |
BIN
doc/manual/images/recruit-1.11.9.jpg
Normal file
BIN
doc/manual/images/recruit-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
BIN
doc/manual/images/right_pane-1.11.9.jpg
Normal file
BIN
doc/manual/images/right_pane-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
BIN
doc/manual/images/top_pane-1.11.9.jpg
Normal file
BIN
doc/manual/images/top_pane-1.11.9.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue