Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Questenparteien bei der Punkteermittlung nicht mitzählen 

- Fix trollbelt
This commit is contained in:
Christian Schlittchen 2001-12-30 13:33:45 +00:00
parent cc1b872edf
commit 9cc525d199
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/kernel/item.c
View File

@ -1325,6 +1325,7 @@ static translate_t translation[] = {
{ "Eisen", "iron", "iron_p", "iron", "iron_p" }, { "Eisen", "iron", "iron_p", "iron", "iron_p" },
{ "Drachenblut", "dragonblood", "dragonblood_p", "dragonblood", "dragonblood_p" }, { "Drachenblut", "dragonblood", "dragonblood_p", "dragonblood", "dragonblood_p" },
{ "Feenstiefel", "fairyboot", "fairyboot_p", "fairyboot", "fairyboot_p" }, { "Feenstiefel", "fairyboot", "fairyboot_p", "fairyboot", "fairyboot_p" },
{ "Gürtel der Trollstärke", "trollbelt", "trollbelt_p", "trollbelt", "trollbelt_p" },
{ "Mallorn", "mallorn", "mallorn_p", "mallorn", "mallorn_p" }, { "Mallorn", "mallorn", "mallorn_p", "mallorn", "mallorn_p" },
{ "Wagen", "cart", "cart_p", "cart", "cart_p" }, { "Wagen", "cart", "cart_p", "cart", "cart_p" },
{ "Plattenpanzer", "plate", "plate_p", "plate", "plate_p" }, { "Plattenpanzer", "plate", "plate_p", "plate", "plate_p" },

4
src/common/modules/score.c
View File

@ -148,7 +148,7 @@ average_score_of_age(int age, int a)
int sum = 0, count = 0; int sum = 0, count = 0;
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
if (f->no != MONSTER_FACTION && f->age <= age + a && f->age >= age - a) { if (f->no != MONSTER_FACTION && f->race != new_race[RC_TEMPLATE] && f->age <= age + a && f->age >= age - a) {
sum += f->score; sum += f->score;
count++; count++;
} }
@ -253,7 +253,7 @@ score(void)
for (f = factions; f; f = f->next) { for (f = factions; f; f = f->next) {
f->score = f->score / 5; f->score = f->score / 5;
if (f->no != MONSTER_FACTION) if (f->no != MONSTER_FACTION && f->race != new_race[RC_TEMPLATE])
allscores += f->score; allscores += f->score;
} }
if( allscores == 0 ) if( allscores == 0 )

9
src/res/en/strings.txt
View File

@ -184,6 +184,7 @@ crossbow_p;en;crossbows
dolphin;en;dolphin dolphin;en;dolphin
dolphin_p;en;dolphins dolphin_p;en;dolphins
dragonblood;en;dragonblood dragonblood;en;dragonblood
dragonblood_p;en;dragonblood
dragonhead;en;dragonhead dragonhead;en;dragonhead
dragonhead_p;en;dragonheads dragonhead_p;en;dragonheads
dragonhoard;en;dragonhoard dragonhoard;en;dragonhoard
@ -194,6 +195,7 @@ elvenhorse_p;en;elven horses
eyeofdragon;en;eye of dragon eyeofdragon;en;eye of dragon
eyeofdragon_p;en;eye of dragons eyeofdragon_p;en;eye of dragons
fairyboot;en;fairyboot fairyboot;en;fairyboot
fairyboot_p;en;fairyboot
firesword;en;flaming sword firesword;en;flaming sword
firesword_p;en;flaming swords firesword_p;en;flaming swords
greatbow;en;great bow greatbow;en;great bow
@ -225,8 +227,11 @@ lance_p;en;lances
log;en;wood log;en;wood
log_p;en;wood log_p;en;wood
magicbag;en;magic bag magicbag;en;magic bag
magicbag_p;en;magic bags
magicherbbag;en;bag of conservation magicherbbag;en;bag of conservation
magicherbbag_p;en;bags of conservation
mallorn;en;mallorn mallorn;en;mallorn
mallorn_p;en;mallorn
mallornbow;en;mallorn bow mallornbow;en;mallorn bow
mallornbow_p;en;mallorn bows mallornbow_p;en;mallorn bows
mallorncrossbow;en;mallorn crossbow mallorncrossbow;en;mallorn crossbow
@ -282,7 +287,9 @@ stone_p;en;stones
sword;en;sword sword;en;sword
sword_p;en;swords sword_p;en;swords
toadslime;en;pot of toadslime toadslime;en;pot of toadslime
toadslime_p;en;pots of toadslime
trollbelt;en;trollbelt trollbelt;en;trollbelt
trollbelt_p;en;trollbelts
unit;en;unit unit;en;unit
unit_p;en;units unit_p;en;units
skillpotion;en;potion of skills skillpotion;en;potion of skills
@ -647,7 +654,7 @@ b_damage;en;damage
wand;en;wand wand;en;wand
wand_p;en;wands wand_p;en;wands
wand_of_tears;en;wand of tears wand_of_tears;en;wand of tears
wands_of_tear_p;en;wands of tears wand_of_tears_p;en;wands of tears
## Küsten ## Küsten
Nordwestküste;en;northwest coast Nordwestküste;en;northwest coast