0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some training.cfg one-liner macros.

Browse source
This commit is contained in:
Pentarctagon 2022-06-30 02:05:04 -05:00 • committed by Pentarctagon
parent 875c6e0cf1
commit 3eb75b3e48
3 changed files with 17 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
data/campaigns/World_Conquest/resources/data/training.cfg
View file

@ -7,8 +7,8 @@
type=Lich
advanced_type=Ancient Lich
image=attacks/curse.png
name= {WC_STR_DARK_NAME}
dialogue= {WC_STR_DARK_FOUND}
name=_ "Dark"
dialogue=_ "I haven’t lived centuries fighting others’ battles, but I could combat boredom teaching your men a couple of things about dark techniques."
[grade]
[/grade]
[grade]
@ -56,8 +56,8 @@
type=Duelist
advanced_type=Master at Arms
image=icons/boots_elven.png
name= {WC_STR_MOVEMENT_NAME}
dialogue= {WC_STR_MOVEMENT_FOUND}
name=_ "Movement"
dialogue=_ "What, you want me to join the fight? Quite out of the question, old boy! I’m afraid battlefields just aren’t my scene - no drama, no style, no romance! No finesse at all! You probably wouldn’t understand, so let me show you. I’ll teach you how to break out of those dreary marching formations and step light as a feather!"
[grade]
[/grade]
[grade]
@ -74,8 +74,8 @@
type=Orcish Warrior
advanced_type=Orcish Warlord
image=attacks/halberd.png
name= {WC_STR_MELEE_NAME}
dialogue= {WC_STR_MELEE_FOUND}
name=_ "Melee Combat"
dialogue=_ "Looks like you could use some help. A grizzled old veteran like me won’t be much use on the field, but I bet I can teach your men a thing or two about swordplay."
[grade]
[/grade]
[grade]
@ -117,8 +117,8 @@
type=Elvish Ranger
advanced_type=Elvish Avenger
image=attacks/bow-elven.png
name= {WC_STR_RANGER_NAME}
dialogue= {WC_STR_RANGER_FOUND}
name=_ "Ranger Tactics"
dialogue=_ "I sympathize with your cause, but this is not my battle. I will not fight for you, but I will gladly instruct your recruits in the art of the ranger, that they may better fight on their own."
[grade]
[/grade]
[grade]
@ -156,8 +156,8 @@
type=Drake Flare
advanced_type=Drake Flameheart
image=icons/letter_and_ale.png
name= {WC_STR_EXPERIENCE_NAME}
dialogue= {WC_STR_EXPERIENCE_FOUND}
name=_ "Combat Experience"
dialogue=_ " Join the battle? Nay, lads, my talents would be wasted on the frontlines. Give me some raw recruits to work with, though, and I’ll whip ’em into shape for you. I know what real battle is like; by the time I’m through with ’em, your newbies might have some idea of it too."
[grade]
[/grade]
[grade]
@ -183,8 +183,8 @@
type=Dwarvish Runesmith
advanced_type=Dwarvish Runemaster
image=icons/cuirass_muscled.png
name= {WC_STR_HEALTH_NAME}
dialogue= {WC_STR_HEALTH_FOUND}
name=_ "Health"
dialogue=_ "Looks like a pretty grim fight you’ve got up ahead. I’ve got too many troubles of my own to join in, but stick about a while and I’ll put some steel in your backbone. When I’m through with you you’ll be able to keep on going no matter the odds!"
[grade]
[/grade]
[grade]

36
data/campaigns/World_Conquest/resources/strings/training.cfg
View file

@ -1,41 +1,5 @@
#textdomain wesnoth-wc
#define WC_STR_MELEE_NAME
_ "Melee Combat" #enddef
#define WC_STR_MELEE_FOUND
_ "Looks like you could use some help. A grizzled old veteran like me won’t be much use on the field, but I bet I can teach your men a thing or two about swordplay." #enddef
#define WC_STR_RANGER_NAME
_ "Ranger Tactics" #enddef
#define WC_STR_RANGER_FOUND
_ "I sympathize with your cause, but this is not my battle. I will not fight for you, but I will gladly instruct your recruits in the art of the ranger, that they may better fight on their own." #enddef
#define WC_STR_HEALTH_NAME
_ "Health" #enddef
#define WC_STR_HEALTH_FOUND
_ "Looks like a pretty grim fight you’ve got up ahead. I’ve got too many troubles of my own to join in, but stick about a while and I’ll put some steel in your backbone. When I’m through with you you’ll be able to keep on going no matter the odds!" #enddef
#define WC_STR_MOVEMENT_NAME
_ "Movement" #enddef
#define WC_STR_MOVEMENT_FOUND
_ "What, you want me to join the fight? Quite out of the question, old boy! I’m afraid battlefields just aren’t my scene - no drama, no style, no romance! No finesse at all! You probably wouldn’t understand, so let me show you. I’ll teach you how to break out of those dreary marching formations and step light as a feather!" #enddef
#define WC_STR_EXPERIENCE_NAME
_ "Combat Experience" #enddef
#define WC_STR_EXPERIENCE_FOUND
_ " Join the battle? Nay, lads, my talents would be wasted on the frontlines. Give me some raw recruits to work with, though, and I’ll whip ’em into shape for you. I know what real battle is like; by the time I’m through with ’em, your newbies might have some idea of it too." #enddef
#define WC_STR_DARK_NAME
_ "Dark" #enddef
#define WC_STR_DARK_FOUND
_ "I haven’t lived centuries fighting others’ battles, but I could combat boredom teaching your men a couple of things about dark techniques." #enddef
#define WC_STR_ID_AMBUSH
ambush #enddef

10
data/campaigns/World_Conquest/scenarios/WC_II_scenario.cfg
View file

@ -107,10 +107,10 @@ _ "World Conquest 4p" #enddef
{WC2_CAMPAIGN_DIFFICULTY NORMAL {WC2_HUMAN_DIFFICULTY human-loyalists/lieutenant brown} {WC_STR_LIEUTENANT} {WC_STR_MEDIUM} 8 4 2 5 yes 10} {DEFAULT_DIFFICULTY}
{WC2_CAMPAIGN_DIFFICULTY HARD {WC2_HUMAN_DIFFICULTY human-loyalists/general orange} {WC_STR_GENERAL} {WC_STR_HARD} 8 5 2 2 no 13}
# Challenging is a string that exists in mainline but only in campaigns so it probably counts as adding a string?
#textdomain wesnoth-httt
#textdomain wesnoth-httt
{WC2_CAMPAIGN_DIFFICULTY VERY_HARD {WC2_HUMAN_DIFFICULTY human-loyalists/marshal white} {WC_STR_GRAND_MARSHAL} _"Challenging" 9 6 2 1 no 17}
# Expert is a string that was supposed to be in wesnoth-wc but accidentally got added to wesnoth-units instead
#textdomain wesnoth-units
#textdomain wesnoth-units
{WC2_CAMPAIGN_DIFFICULTY NIGHTMARE {WC2_NIGHTMARE_DIFFICULTY} {WC_STR_NIGHTMARE} _"Expert" 9 7 1 0 no 20}
[about]
@ -207,7 +207,7 @@ _ "World Conquest 4p" #enddef
create_scenario = <<
local a = ...
local function doit()
wesnoth.dofile('campaigns/World_Conquest//lua/map/main.lua')
wesnoth.dofile('campaigns/World_Conquest/lua/map/main.lua')
return wc_ii_generate_scenario(a.nplayers, a)
end
@ -223,8 +223,8 @@ _ "World Conquest 4p" #enddef
user_config = <<
local a = ...
local function doit()
wesnoth.dofile('campaigns/World_Conquest//lua/map/main.lua');
wesnoth.dofile('campaigns/World_Conquest//lua/map/settings/settings_dialog.lua');
wesnoth.dofile('campaigns/World_Conquest/lua/map/main.lua');
wesnoth.dofile('campaigns/World_Conquest/lua/map/settings/settings_dialog.lua');
return wc2_debug_settings()
end