OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-20 10:31:28 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Only apply "Rejuvenate" to negative conditions. Do not apply "Rejuvenate" to spiritual conditions.

Browse Source 
git-svn-id: https://andors-trail.googlecode.com/svn/trunk@242 08aca716-68be-ccc6-4d58-36f5abd142ac
This commit is contained in:
oskar.wiksten
2012-05-07 20:58:31 +00:00
parent 8ef8f59da2
commit 5bc85fc4f8
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
View File

@@ -205,27 +205,34 @@ public class ActorStatsController {
decreaseDurationAndRemoveConditions(player);
}
private void removeConditionsFromSkillEffects(Player player) {
private static void removeConditionsFromSkillEffects(Player player) {
if (SkillController.rollForSkillChance(player, SkillCollection.SKILL_REJUVENATION, SkillCollection.PER_SKILLPOINT_INCREASE_REJUVENATION_CHANCE)) {
ArrayList<Integer> potentialConditionsToDecrease = new ArrayList<Integer>();
for(int i = 0; i < player.conditions.size(); ++i) {
ActorCondition c = player.conditions.get(i);
if (!c.isTemporaryEffect()) continue;
potentialConditionsToDecrease.add(i);
int i = getRandomConditionForRejuvenate(player);
if (i >= 0) {
ActorCondition c = player.conditions.remove(i);
if (c.magnitude > 1) {
int magnitude = c.magnitude - 1;
player.conditions.add(i, new ActorCondition(c.conditionType, magnitude, c.duration));
}
recalculateActorCombatTraits(player);
}
if (potentialConditionsToDecrease.isEmpty()) return;
int i = potentialConditionsToDecrease.get(Constants.rnd.nextInt(potentialConditionsToDecrease.size()));
ActorCondition c = player.conditions.remove(i);
if (c.magnitude > 1) {
int magnitude = c.magnitude - 1;
player.conditions.add(i, new ActorCondition(c.conditionType, magnitude, c.duration));
}
recalculateActorCombatTraits(player);
}
}
private static int getRandomConditionForRejuvenate(Player player) {
ArrayList<Integer> potentialConditions = new ArrayList<Integer>();
for(int i = 0; i < player.conditions.size(); ++i) {
ActorCondition c = player.conditions.get(i);
if (!c.isTemporaryEffect()) continue;
if (c.conditionType.isPositive) continue;
if (c.conditionType.conditionCategory == ActorConditionType.ACTORCONDITIONTYPE_SPIRITUAL) continue;
potentialConditions.add(i);
}
if (potentialConditions.isEmpty()) return -1;
return potentialConditions.get(Constants.rnd.nextInt(potentialConditions.size()));
}
public void applyConditionsToMonsters(PredefinedMap map, boolean isFullRound) {
for (MonsterSpawnArea a : map.spawnAreas) {
for (Monster m : a.monsters) {
@@ -316,7 +323,7 @@ public class ActorStatsController {
, 0);
}
private VisualEffect applyStatsModifierEffect(Actor actor, StatsModifierTraits effect, int magnitude, VisualEffect existingVisualEffect) {
private static VisualEffect applyStatsModifierEffect(Actor actor, StatsModifierTraits effect, int magnitude, VisualEffect existingVisualEffect) {
if (effect == null) return existingVisualEffect;
int effectValue = 0;