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

Handelsbugfix 

kleine korrektur drachenzauber
This commit is contained in:
Katja Zedel 2001-02-18 19:07:31 +00:00
parent f59666b9cd
commit 2561eb90c4
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/laws.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: laws.c,v 1.27 2001/02/18 10:06:08 enno Exp $ * $Id: laws.c,v 1.28 2001/02/18 19:07:31 katze Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -2689,7 +2689,7 @@ setdefaults (void)
* werden. */ * werden. */
if(trade == true) { if(trade == true) {
fset(u, FL_LONGACTION); /* fset(u, FL_LONGACTION); */
set_string(&u->thisorder, ""); set_string(&u->thisorder, "");
} }
/* thisorder kopieren wir nun nach lastorder. in lastorder steht /* thisorder kopieren wir nun nach lastorder. in lastorder steht

6
src/common/kernel/battle.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: battle.c,v 1.17 2001/02/18 12:11:32 enno Exp $ * $Id: battle.c,v 1.18 2001/02/18 19:07:31 katze Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -1450,8 +1450,10 @@ do_combatspell(troop at)
} }
level = ((cspell_f)sp->sp_function)(fi, level, power, sp); level = ((cspell_f)sp->sp_function)(fi, level, power, sp);
if (level > 0) if (level > 0){
pay_spell(mage, sp, level, 1); pay_spell(mage, sp, level, 1);
at.fighter->action_counter++;
}
} }

9
src/common/kernel/combatspells.c
View File

@ -44,6 +44,9 @@ spell_damage(int sp)
case 3: case 3:
/* fast immer tödlich 30-50 HP */ /* fast immer tödlich 30-50 HP */
return "5d5+25"; return "5d5+25";
case 4:
/* verwundet 11-26 HP */
return "3d6+8";
default: default:
/* schwer verwundet 14-34 HP */ /* schwer verwundet 14-34 HP */
return "4d6+10"; return "4d6+10";
@ -73,7 +76,7 @@ get_force(int power, int formel)
/* (10,40,90,160,250,360,490,640,810,1000,1210,1440,..)*/ /* (10,40,90,160,250,360,490,640,810,1000,1210,1440,..)*/
return (power*power*10); return (power*power*10);
case 6: case 6:
/* (6,24,54,96,150,216,)*/ /* (6,24,54,96,150,216,294,384,486,600,726,864)*/
return (power*power*6); return (power*power*6);
default: default:
return power; return power;
@ -574,8 +577,8 @@ sp_dragonodem(fighter * fi, int level, int power, spell * sp)
const char *damage; const char *damage;
sprintf(buf, "%s zaubert %s", unitname(fi->unit), sp->name); sprintf(buf, "%s zaubert %s", unitname(fi->unit), sp->name);
/* 14-34 HP */ /* 11-26 HP */
damage = spell_damage(10); damage = spell_damage(4);
/* Jungdrache 3->54, Drache 6->216, Wyrm 12->864 Treffer */ /* Jungdrache 3->54, Drache 6->216, Wyrm 12->864 Treffer */
force = lovar(get_force(level,6)); force = lovar(get_force(level,6));