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

Fix bug #12511...

Browse source 
...(NEWBIE difficulty level in NR is displayed incorrectly in load 
dialog).

At some point, someone working on the C++ code introduced an effective
requirement that difficulty levels be in a set enumerated in english.cfg.
The NR WML didn't track this change.

Also, I'm deleting the now-unused NR music directory.
This commit is contained in:
Eric S. Raymond 2008-10-27 17:41:55 +00:00
parent d0c10ac55b
commit fce50aa29f
5 changed files with 107 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Northern_Rebirth/_main.cfg
View file

@ -11,7 +11,7 @@
rank=240
first_scenario=chain_break
define=CAMPAIGN_NORTHERN_REBIRTH
difficulties=NEWBIE,EASY,NORMAL,HARD
difficulties=EASY,NORMAL,HARD,NIGHTMARE
difficulty_descriptions={MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Peasant" _"(Normal)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Spearman" _"(Challenging)"} + ";" +
{MENU_IMG_TXT2 "units/human-loyalists/swordsman.png~RC(magenta>red)" _"Swordsman" _"(Difficult)"} + ";" +

146
data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
View file

@ -53,16 +53,16 @@
user_team_name=_"Undead"
{GOLD4 50 100 150 250}
{INCOME4 4 10 16 22}
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -76,16 +76,16 @@
user_team_name=_"Undead"
{GOLD4 50 100 150 250}
{INCOME4 4 10 16 22}
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -99,16 +99,16 @@
team_name=undead
user_team_name=_"Undead"
gold=0
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -122,16 +122,16 @@
team_name=undead
user_team_name=_"Undead"
gold=0
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -145,16 +145,16 @@
team_name=undead
user_team_name=_"Undead"
gold=0
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -168,16 +168,16 @@
team_name=undead
user_team_name=_"Undead"
gold=0
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -190,16 +190,16 @@
team_name=undead
user_team_name=_"Undead"
gold=0
#ifdef NEWBIE
#ifdef EASY
recruit=Skeleton,Skeleton Archer
#endif
#ifdef EASY
#ifdef NORMAL
recruit=Skeleton,Skeleton Archer,Revenant
#endif
#ifdef NORMAL
#ifdef HARD
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter
#endif
#ifdef HARD
#ifdef NIGHTMARE
recruit=Skeleton,Skeleton Archer,Revenant,Bone Shooter,Deathblade
#endif
[/side]
@ -493,19 +493,19 @@
amount=100
[/gold]
# If the difficulty level is higher than Newbie add another 100
#ifndef NEWBIE
#ifndef EASY
[gold]
side=5
amount=100
[/gold]
# And another 150 if higher then Easy
#ifndef EASY
#ifndef NORMAL
[gold]
side=5
amount=150
[/gold]
# With last 150 thrown up on Hard
#ifndef NORMAL
#ifndef HARD
[gold]
side=5
amount=150
@ -1168,16 +1168,16 @@
side=7
amount=100
[/gold]
#ifndef NEWBIE
[gold]
side=6
amount=100
[/gold]
[gold]
side=7
amount=100
[/gold]
#ifndef EASY
[gold]
side=6
amount=100
[/gold]
[gold]
side=7
amount=100
[/gold]
#ifndef NORMAL
[gold]
side=6
amount=150
@ -1186,7 +1186,7 @@
side=7
amount=150
[/gold]
#ifndef NORMAL
#ifndef HARD
[gold]
side=6
amount=150
@ -1261,16 +1261,16 @@
side=7
amount=100
[/gold]
#ifndef NEWBIE
[gold]
side=6
amount=100
[/gold]
[gold]
side=7
amount=100
[/gold]
#ifndef EASY
[gold]
side=6
amount=100
[/gold]
[gold]
side=7
amount=100
[/gold]
#ifndef NORMAL
[gold]
side=6
amount=150
@ -1279,7 +1279,7 @@
side=7
amount=150
[/gold]
#ifndef NORMAL
#ifndef HARD
[gold]
side=6
amount=150
@ -1508,17 +1508,17 @@
{NOTRAIT_UNIT 2 "Giant Spider" 6 4}
{NOTRAIT_UNIT 2 "Giant Spider" 6 3}
{NOTRAIT_UNIT 2 "Giant Spider" 5 5}
#ifndef NEWBIE
#ifndef EASY
{NOTRAIT_UNIT 2 "Giant Spider" 23 3}
{NOTRAIT_UNIT 2 "Giant Spider" 24 3}
{NOTRAIT_UNIT 2 "Giant Spider" 5 3}
{NOTRAIT_UNIT 2 "Giant Spider" 5 2}
#ifndef EASY
#ifndef NORMAL
{NOTRAIT_UNIT 2 "Giant Spider" 20 2}
{NOTRAIT_UNIT 2 "Giant Spider" 21 3}
{NOTRAIT_UNIT 2 "Giant Spider" 8 2}
{NOTRAIT_UNIT 2 "Giant Spider" 8 3}
#ifndef NORMAL
#ifndef HARD
{NOTRAIT_UNIT 2 "Giant Spider" 21 4}
{NOTRAIT_UNIT 2 "Giant Spider" 25 4}
{NOTRAIT_UNIT 2 "Giant Spider" 4 2}
@ -1911,16 +1911,16 @@
side=9
amount=100
[/gold]
#ifndef NEWBIE
[gold]
side=8
amount=100
[/gold]
[gold]
side=9
amount=100
[/gold]
#ifndef EASY
[gold]
side=8
amount=100
[/gold]
[gold]
side=9
amount=100
[/gold]
#ifndef NORMAL
[gold]
side=8
amount=150
@ -1929,7 +1929,7 @@
side=9
amount=150
[/gold]
#ifndef NORMAL
#ifndef HARD
[gold]
side=8
amount=150
@ -1986,11 +1986,11 @@
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 35 23}
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 33 25}
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 33 23}
#ifndef NEWBIE
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 34 21}
#ifndef EASY
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 31 23}
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 34 21}
#ifndef NORMAL
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 31 23}
#ifndef HARD
{NOTRAIT_UNIT 2 "Tentacle of the Deep" 32 22}
#endif
#endif
@ -2291,11 +2291,11 @@
[/message]
{GENERIC_UNIT 2 "Naga Warrior" 28 11}
{GENERIC_UNIT 2 "Naga Fighter" 28 11}
#ifndef NEWBIE
{GENERIC_UNIT 2 "Naga Fighter" 29 10}
#ifndef EASY
{GENERIC_UNIT 2 "Naga Fighter" 29 11}
{GENERIC_UNIT 2 "Naga Fighter" 29 10}
#ifndef NORMAL
{GENERIC_UNIT 2 "Naga Fighter" 29 11}
#ifndef HARD
{GENERIC_UNIT 2 "Naga Fighter" 29 12}
#endif
#endif
@ -2561,7 +2561,7 @@
amount=150
[/gold]
# 6 guards and 200 gold at Easy
#ifndef NEWBIE
#ifndef EASY
{NOTRAIT_UNIT 2 Deathblade 25 11}
{NOTRAIT_UNIT 2 Lich 25 11}
[gold]
@ -2569,7 +2569,7 @@
amount=50
[/gold]
# 8 guards and 300 gold at Normal
#ifndef EASY
#ifndef NORMAL
{NOTRAIT_UNIT 2 Deathblade 25 11}
{NOTRAIT_UNIT 2 Lich 25 11}
[gold]
@ -2577,7 +2577,7 @@
amount=100
[/gold]
# 10 guards and 400 gold at Hard
#ifndef NORMAL
#ifndef HARD
{NOTRAIT_UNIT 2 Deathblade 25 11}
{NOTRAIT_UNIT 2 Lich 25 11}
[gold]

40
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View file

@ -344,23 +344,13 @@
{PLACE_IMAGE items/ankh-necklace.png 87 66}
#ifdef NEWBIE
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef EASY
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef NORMAL
@ -371,12 +361,22 @@
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef HARD
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef HARD
#ifdef NIGHTMARE
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
@ -648,28 +648,28 @@
message= _ "Bah! More undead. Alert chief!"
[/message]
#ifdef NEWBIE
#ifdef EASY
[gold]
side=8
amount=250
[/gold]
#endif
#ifdef EASY
#ifdef NORMAL
[gold]
side=8
amount=300
[/gold]
#endif
#ifdef NORMAL
#ifdef HARD
[gold]
side=8
amount=375
[/gold]
#endif
#ifdef HARD
#ifdef NIGHTMARE
[gold]
side=8
amount=450
@ -736,28 +736,28 @@
type=Draker Clasher,Drake Burner,Drake Fighter
[/allow_recruit]
#ifdef NEWBIE
#ifdef EASY
[gold]
side=9
amount=300
[/gold]
#endif
#ifdef EASY
#ifdef NORMAL
[gold]
side=9
amount=350
[/gold]
#endif
#ifdef NORMAL
#ifdef HARD
[gold]
side=9
amount=400
[/gold]
#endif
#ifdef HARD
#ifdef NIGHTMARE
[gold]
side=9
amount=450

24
data/campaigns/Northern_Rebirth/utils/utils.cfg
View file

@ -1,12 +1,8 @@
#textdomain wesnoth-nr
## These macros support a fourth (actually zeroth) difficulty level, NEWBIE.
## These macros support a fourth difficulty level, NIGHTMARE.
#macro to define a 'quantity' differently based on difficulty levels
#define QUANTITY4 NAME NEWBIE_VALUE EASY_VALUE NORMAL_VALUE HARD_VALUE
#ifdef NEWBIE
{NAME}={NEWBIE_VALUE}
#endif
#define QUANTITY4 NAME EASY_VALUE NORMAL_VALUE HARD_VALUE NIGHTMARE_VALUE
#ifdef EASY
{NAME}={EASY_VALUE}
#endif
@ -18,22 +14,26 @@
#ifdef HARD
{NAME}={HARD_VALUE}
#endif
#ifdef NIGHTMARE
{NAME}={NIGHTMARE_VALUE}
#endif
#enddef
#macro to define number of turns for different difficulty levels
#define TURNS4 NEWBIE_AMOUNT EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT
{QUANTITY4 turns {NEWBIE_AMOUNT} {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT}}
#define TURNS4 EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT NIGHTMARE_AMOUNT
{QUANTITY4 turns {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT} {NIGHTMARE_AMOUNT}}
#enddef
#macro which will let you go {GOLD w/x y z} to set
#the gold depending on newbie/easy/medium/hard - w/x/y/z
#define GOLD4 NEWBIE_AMOUNT EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT
{QUANTITY4 gold {NEWBIE_AMOUNT} {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT}}
#define GOLD4 EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT NIGHTMARE_AMOUNT
{QUANTITY4 gold {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT} {NIGHTMARE_AMOUNT}}
#enddef
#define INCOME4 NEWBIE_AMOUNT EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT
{QUANTITY4 income {NEWBIE_AMOUNT} {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT}}
#define INCOME4 EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT NIGHTMARE_AMOUNT
{QUANTITY4 income {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT} {NIGHTMARE_AMOUNT}}
#enddef
## These are campaign-specific.

1
data/hardwired/english.cfg
View file

@ -3,6 +3,7 @@
EASY= _ "Easy"
NORMAL= _ "Medium"
HARD= _ "Hard"
NIGHTMARE= _ "Nightmare"
lawful_description= _ "Lawful units fight better during the day, and worse at night.