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

Reverted commit 2006-10-09T21:38:45Z!mcn4bb@gmail.com upon request of Darth Fool.

Browse source 
Commit 2006-10-09T21:38:45Z!mcn4bb@gmail.com defines terrain y and this breaks UMC scenario's
which also uses terrain y. Noticed in the first scenario of Return of
the Legion, where the villages were aliassed to cavewalls.
This commit is contained in:
Mark de Wever 2006-11-05 13:30:12 +00:00
parent 55ddaf2b6a
commit c8b587b1a9
3 changed files with 13 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -42,7 +42,6 @@ Version 1.3-svn:
(patch #605)
* WML engine
* added fourth color in team_rgb definitions for representative color in minimap
* fixed terrain probabilities for terrains defined with rotations (bug #7274)
* added a 'hide_help' key that prevents a unit type from being listed in the
in-game help (bug #5701)
* added an 'allow_new_game' key (default=yes) to prevent [multiplayer]

47
data/scenario-test.cfg
View file

@ -1,47 +1,26 @@
#testing terrain rotation probability
[terrain]
symbol_image=castle
id=castle
name= _ "Castle"
char=y
aliasof=W
[/terrain]
{FORESTADJ y g 33 mountains}
{FORESTADJ y g 50 forest}
{FORESTADJ y g 100 reed1-small}
#{SHEX y overlay 50 mountains}
#{SHEX y overlay 100 forest}
[test]
name="Test scenario"
map_data="mmmmggggggggggggggggggggggggggggggggg
mmmmggggggggggggggggggggggggggggggggg
mgggggCCCCggggggggggggggggggggggggggg
mgggggC1Cgggggggggfffffgggggggggggggg
mgggggCCCgggggggggfffffgggccccggggggg
mgggggCCCgggggggggfffffgggcchhggggggg
mgggggtgtgggggggggggggggggccccygggygg
ggggggggggggggggggggggggggggggggygggg
ggggggggggggggggggggggggggggggygggygg
ggggggggggggggggggggggggggggggggygggg
gggggggggggggggggggggCCCggggggygggygg
gggggggggggggggggggggCCCggggggggygggg
ggggggggggggggggggggggggggggggygggygg
ggnnKnggggggggggggggggggggggggggygggg
gggnngggggggggggggggggggggggggygggygg
gggggggggggggggggggggggggggg2gggygggg
gggggggDgggggtggggggggggggggggygggygg
ggggggDgggtgggggggggggggggggggggygggg
ggggggggggggggggggggggggggggggygggygg
mgggggtgtgggggggggggggggggccccggggggg
ggggggggggggggggggggggggggggggggggggg
ggggggggggggggggggggggggggggggggggggg
ggggggggggggggggggggggggggggggggggggg
gggggggggggggggggggggCCCggggggggggggg
gggggggggggggggggggggCCCggggggggggggg
ggggggggggggggggggggggggggggggggggggg
ggnnKnggggggggggggggggggggggggggggggg
gggnngggggggggggggggggggggggggggggggg
gggggggggggggggggggggggggggg2gggggggg
gggggggDgggggtggggggggggggggggggggggg
ggggggDgggtgggggggggggggggggggggggggg
ggggggggggggggggggggggggggggggggggggg
"
[event]
name=moveto
[filter]

6
src/builder.cpp
View file

@ -643,15 +643,9 @@ void terrain_builder::add_rotated_rules(building_ruleset& rules, building_rule&
add_rule(rules, tpl);
} else {
const std::vector<std::string>& rot = utils::split(rotations, ',');
int prob = tpl.probability;
double p = ((float)prob)/100;
double in = 1.0/rot.size();
prob = (prob >= 100 || prob<0) ? 100 : floor(100*(1.0 - pow(1.0 - p,in)));
for(size_t angle = 0; angle < rot.size(); angle++) {
building_rule rule = rotate_rule(tpl, angle, rot);
rule.probability=prob;
//correct probability for number of rotations
add_rule(rules, rule);
}
}