- Magieabschwächung, trivial

This commit is contained in:
Christian Schlittchen 2003-12-12 16:10:12 +00:00
parent 421c2a2ac8
commit 2c53f3a8e7
2 changed files with 63 additions and 2 deletions

View File

@ -1102,13 +1102,15 @@ spellpower(region * r, unit * u, spell * sp, int cast_level)
{
curse * c;
int force = cast_level;
if (sp==NULL) return 0;
else {
if (sp==NULL) {
return 0;
} else {
/* Bonus durch Magieturm und gesegneten Steinkreis */
struct building * b = inside_building(u);
const struct building_type * btype = b?b->type:NULL;
if (btype && btype->flags & BTF_MAGIC) ++force;
}
if (get_item(u, I_RING_OF_POWER) > 0) ++force;
/* Antimagie in der Zielregion */
@ -1127,6 +1129,10 @@ spellpower(region * r, unit * u, spell * sp, int cast_level)
cmistake(u, findorder(u, u->thisorder), 185, MSG_MAGIC);
}
#ifdef MAGICPOWER
force = force * MAGICPOWER;
#endif
return max(force, 0);
}
@ -1491,6 +1497,10 @@ regeneration(unit * u)
/* Würfeln */
aura = (rand() % d + rand() % d)/2 + 1;
#ifdef MAGICREGEN
aura = aura * MAGICREGEN;
#endif
return aura;
}

51
src/common/settings-wdw.h Normal file
View File

@ -0,0 +1,51 @@
/* vi: set ts=2:
+-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
| | Enno Rehling <enno@eressea-pbem.de>
| Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
| (c) 1998 - 2003 | Henning Peters <faroul@beyond.kn-bremen.de>
| | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
+-------------------+ Stefan Reich <reich@halbling.de>
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
/*
* Contains defines for the "alliance" vinyambar game (V3).
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20
#define IMMUN_GEGEN_ANGRIFF 8
#define RESOURCE_CONVERSION 1
#define NEW_RESOURCEGROWTH 1
#define LARGE_CASTLES 1
#define GROWING_TREES 1
#define REDUCED_PEASANTGROWTH 1
#define RACE_ADJUSTMENTS 1
#define TEACHDIFFERENCE 2
#define PEASANT_ADJUSTMENT 1
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */
#define CHANGED_CROSSBOWS 1
#define NEWATSROI 0
#define COMBAT_TURNS 5
#define PEASANTS_DO_NOT_STARVE 0
#define NEW_MIGRATION 1
#define MIGRANTS_CAN_LEARN_EXPENSIVE_SKILLS 1 /* vinyambar 3 only */
#define MAGICPOWER 0.5
#define MAGICREGEN 0.5
#if NEWATSROI == 1
#define ATSBONUS 2
#define ROIBONUS 4
#endif
#define ENHANCED_QUIT
#define ALLIANCES
#undef ALLIANCEJOIN
#define AUTOALLIANCE (HELP_FIGHT)
#define MAILITPATH "/usr/sbin:$HOME/bin:/bin:/usr/bin:/usr/local/bin"