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

balancing to Scepter of Fire

Browse source
This commit is contained in:
Dave White 2004-06-24 20:29:23 +00:00
parent 7154367829
commit 9cc9aac916
4 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
data/items.cfg
View file

@ -332,6 +332,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Healing
image=misc/item-healingpotion.png
@ -361,6 +365,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Poison
image=item-potion2.png
@ -390,6 +398,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Holy Water
image=misc/item-holywater.png
@ -420,6 +432,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Strong
image=item-potion3.png
@ -455,6 +471,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Decay
image=item-potion4.png
@ -484,6 +504,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Ring of Regeneration
image=item-ring1.png
@ -519,6 +543,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Ring of Slowness
image=item-ring2.png
@ -548,6 +576,10 @@ What would you like to wish for?"
y={Y}
[/filter]
[object]
[filter]
x={X}
y={Y}
[/filter]
id={ID}
name=Staff of Swiftness
image=misc/item-staff.png
@ -585,6 +617,7 @@ What would you like to wish for?"
cannot_use_message="Only the mermen can use this item!"
[filter]
type=Merman,Merman Lord,Triton
x,y={X},{Y}
[/filter]
[effect]
apply_to=new_attack
@ -633,6 +666,7 @@ What would you like to wish for?"
cannot_use_message="Only the leader of an army can wield this sword!"
[filter]
description=Konrad
x,y={X},{Y}
[/filter]
[effect]
apply_to=new_attack
@ -668,6 +702,11 @@ What would you like to wish for?"
[/filter]
[object]
[filter]
type=Princess,Commander,Lord
x,y={X},{Y}
[/filter]
id={ID}
name=Sceptre of Fire
@ -680,12 +719,6 @@ What would you like to wish for?"
cannot_use_message="This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!"
[filter]
type=Princess,Commander,Lord
[/filter]
[effect]
apply_to=new_attack

10
data/scenarios/Heir_To_The_Throne/Sceptre.cfg
View file

@ -11,7 +11,7 @@ next_scenario=A_Choice_Must_Be_Made
name=The Sceptre of Fire
id=Sceptre
map_data="{maps/Heir_To_The_Throne/Sceptre}"
turns=60
turns=40
victory_when_enemies_defeated=no
{UNDERGROUND}
@ -113,7 +113,7 @@ Defeat:
recruit=Goblin Knight,Wolf Rider,Troll,Orcish Warrior,Orcish Crossbow
team_name=orcs
{GOLD 50 100 150}
{GOLD 30 50 90}
{INCOME 5 10 20}
[/side]
[/items]
@ -149,7 +149,7 @@ Defeat:
recruit=Troll,Troll Warrior,Ogre
#endif
team_name=orcs
{GOLD 50 100 150}
{GOLD 30 50 80}
{INCOME 5 10 20}
[/side]
[/items]
@ -200,7 +200,7 @@ Defeat:
#endif
team_name=orcs
{GOLD 50 100 180}
{GOLD 30 60 120}
{INCOME 5 10 20}
[/side]
[/items]
@ -228,7 +228,7 @@ Defeat:
recruit=Troll,Troll Warrior,Ogre,Goblin Knight,Wolf Rider,Troll Whelp,Saurian
#endif
team_name=orcs
{GOLD 50 100 200}
{GOLD 40 70 150}
{INCOME 5 10 20}
[/side]
[/items]

5
src/game_events.cpp
View file

@ -754,10 +754,7 @@ bool event_handler::handle_event_command(const queued_event& event_info, const s
const unit_map::iterator u = units->find(loc);
if(u == units->end())
return rval;
if(filter == NULL || u->second.matches_filter(*filter)) {
if(u != units->end() && (filter == NULL || u->second.matches_filter(*filter))) {
const std::string& lang = string_table[id];
if(!lang.empty())
text = lang;

2
src/map.cpp
View file

@ -321,7 +321,7 @@ gamemap::TERRAIN gamemap::get_terrain(const gamemap::location& loc) const
TERRAIN used_terrain = 0;
int terrain_count = 0;
for(int i = 0; i != nitems; ++i) {
if(items[i] != used_terrain && !is_village(items[i]) && !is_keep(items[i])) {
if(items[i] != used_terrain && !is_village(items[i]) && !is_keep(items[i]) && !is_castle(items[i])) {
const int c = std::count(items+i+1,items+nitems,items[i]) + 1;
if(c > terrain_count) {
used_terrain = items[i];