summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorFreeyorp <Freeyorp101@hotmail.com>2009-12-30 19:00:04 +1300
committerJared Adams <jaxad0127@gmail.com>2010-01-02 08:29:03 +0000
commitfb34e63289307d3b4c304199eed2bca50c628fa4 (patch)
tree66dd905e61da9cc4a564e1fecaeeed03107d1ed9 /src/map
parent295cecfcc93d4d9cf9c8a8b28f44296be826a392 (diff)
downloadtmwa-fb34e63289307d3b4c304199eed2bca50c628fa4.tar.gz
tmwa-fb34e63289307d3b4c304199eed2bca50c628fa4.tar.bz2
tmwa-fb34e63289307d3b4c304199eed2bca50c628fa4.tar.xz
tmwa-fb34e63289307d3b4c304199eed2bca50c628fa4.zip
Temporarily enclose astral soul modifications with ifdefs
Until the quests for this skill are available, this needs to be disabled on the server
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 6a2f4f4..689bcd2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -38,7 +38,9 @@
#define STATE_BLIND 0x10
+#ifdef USE_ASTRAL_SOUL_SKILL
#define MAGIC_SKILL_THRESHOLD 200 // [fate] At this threshold, the Astral Soul skill kicks in
+#endif
#define MAP_LOG_STATS(sd, suffix) \
MAP_LOG_PC(sd, "STAT %d %d %d %d %d %d " suffix, \
@@ -1500,10 +1502,12 @@ int pc_calcstatus (struct map_session_data *sd, int first)
}
}
+#ifdef USE_ASTRAL_SOUL_SKILL
if (sd->spellpower_bonus_target < 0)
sd->spellpower_bonus_target =
(sd->spellpower_bonus_target * 256) /
(MIN (128 + skill_power (sd, TMW_ASTRAL_SOUL), 256));
+#endif
if (sd->spellpower_bonus_target < sd->spellpower_bonus_current)
sd->spellpower_bonus_current = sd->spellpower_bonus_target;
@@ -1775,6 +1779,7 @@ int pc_calcstatus (struct map_session_data *sd, int first)
}
// [Fate] New tmw magic system
sd->matk1 += sd->status.base_level + sd->spellpower_bonus_current;
+#ifdef USE_ASTRAL_SOUL_SKILL
if (sd->matk1 > MAGIC_SKILL_THRESHOLD)
{
int bonus = sd->matk1 - MAGIC_SKILL_THRESHOLD;
@@ -1784,6 +1789,7 @@ int pc_calcstatus (struct map_session_data *sd, int first)
sd->matk1 = MAGIC_SKILL_THRESHOLD + bonus;
}
+#endif
sd->matk2 = 0;
if (sd->matk1 < 0)
sd->matk1 = 0;