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

Replaced android.util.FloatMath by java.lang.Math

Browse Source
This commit is contained in:
Zukero
2016-08-08 12:26:55 +02:00
parent 49e5c9d930
commit 9840078ef3
7 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -1,8 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller;
import java.util.ArrayList;
import android.os.Handler;
import android.os.Message;
import android.util.FloatMath;
import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail.R;
@@ -23,8 +24,6 @@ import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail.util.Coord;
import java.util.ArrayList;
public final class CombatController implements VisualEffectCompletedCallback {
private final ControllerContext controllers;
private final WorldContext world;
@@ -493,7 +492,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
float averageDamagePerTurn = getAverageDamagePerTurn(attacker, target);
if (averageDamagePerTurn <= 0) return 100;
return (int) FloatMath.ceil(target.getMaxHP() / averageDamagePerTurn);
return (int) Math.ceil(target.getMaxHP() / averageDamagePerTurn);
}
public int getMonsterDifficulty(Monster monster) {
// returns [0..100) . 100 == easy.

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
View File

@@ -1,6 +1,5 @@
package com.gpl.rpg.AndorsTrail.controller;
import android.util.FloatMath;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
@@ -421,9 +420,9 @@ public final class SkillController {
if (originalValue == 0) {
return 0;
} else if (originalValue > 0) {
return (int) FloatMath.floor(originalValue * percentForPositiveValues / 100.0f);
return (int) Math.floor(originalValue * percentForPositiveValues / 100.0f);
} else {
return (int) FloatMath.floor(originalValue * percentForNegativeValues / 100.0f);
return (int) Math.floor(originalValue * percentForNegativeValues / 100.0f);
}
}

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
View File

@@ -1,6 +1,9 @@
package com.gpl.rpg.AndorsTrail.model.actor;
import android.util.FloatMath;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail.util.Coord;
@@ -8,10 +11,6 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail.util.Range;
import com.gpl.rpg.AndorsTrail.util.Size;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class Actor {
public int iconID;
public final Size tileSize;
@@ -75,7 +74,7 @@ public class Actor {
public int getEffectiveCriticalChance() { return getEffectiveCriticalChance(getCriticalSkill()); }
public static int getEffectiveCriticalChance(int criticalSkill) {
if (criticalSkill <= 0) return 0;
int v = (int) (-5 + 2 * FloatMath.sqrt(5*criticalSkill));
int v = (int) (-5 + 2 * Math.sqrt(5*criticalSkill));
if (v < 0) return 0;
return v;
}

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
View File

@@ -7,7 +7,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
import android.util.FloatMath;
import android.util.SparseIntArray;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -254,7 +253,7 @@ public final class Player extends Actor {
case attackCost: return baseTraits.attackCost;
case attackChance: return baseTraits.attackChance;
case criticalSkill: return baseTraits.criticalSkill;
case criticalMultiplier: return (int) FloatMath.floor(baseTraits.criticalMultiplier);
case criticalMultiplier: return (int) Math.floor(baseTraits.criticalMultiplier);
case damagePotentialMin: return baseTraits.damagePotential.current;
case damagePotentialMax: return baseTraits.damagePotential.max;
case blockChance: return baseTraits.blockChance;

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
View File

@@ -1,6 +1,8 @@
package com.gpl.rpg.AndorsTrail.resource.parsers;
import android.util.FloatMath;
import org.json.JSONException;
import org.json.JSONObject;
import com.gpl.rpg.AndorsTrail.controller.Constants;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
@@ -13,8 +15,6 @@ import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail.util.Pair;
import com.gpl.rpg.AndorsTrail.util.Size;
import org.json.JSONException;
import org.json.JSONObject;
public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType> {
@@ -100,7 +100,7 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
if (hitEffect != null && hitEffect.addedConditions_target != null && hitEffect.addedConditions_target.length > 0) {
attackConditionBonus += 50;
}
return (int) FloatMath.ceil((avgAttackHP * 3 + avgDefenseHP) * Constants.EXP_FACTOR_SCALING) + attackConditionBonus;
return (int) Math.ceil((avgAttackHP * 3 + avgDefenseHP) * Constants.EXP_FACTOR_SCALING) + attackConditionBonus;
}
private static int getAttacksPerTurn(int maxAP, int attackCost) {
return (int) Math.floor(maxAP / attackCost);

9
AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
View File

@@ -1,6 +1,8 @@
package com.gpl.rpg.AndorsTrail.savegames;
import android.util.FloatMath;
import java.io.DataInputStream;
import java.io.IOException;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.Constants;
@@ -14,9 +16,6 @@ import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail.util.Range;
import java.io.DataInputStream;
import java.io.IOException;
public final class LegacySavegameFormatReaderForPlayer {
public static void readQuestProgressPreV13(Player player, DataInputStream src, WorldContext world, int fileversion) throws IOException {
@@ -124,7 +123,7 @@ public final class LegacySavegameFormatReaderForPlayer {
public static int getExpectedNumberOfSkillpointsForLevel(int level) {
level -= Constants.FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL;
if (level < 0) return 0;
return 1 + (int) FloatMath.floor((float) level / Constants.NEW_SKILL_POINT_EVERY_N_LEVELS);
return 1 + (int) Math.floor((float) level / Constants.NEW_SKILL_POINT_EVERY_N_LEVELS);
}
private static void correctActorConditionsFromItemsPre0611b1(Player player, String conditionTypeID, WorldContext world, ControllerContext controllers, String itemTypeIDWithCondition) {

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
View File

@@ -1,6 +1,5 @@
package com.gpl.rpg.AndorsTrail.util;
import android.util.FloatMath;
public final class ConstRange {
public final int max;
@@ -36,6 +35,6 @@ public final class ConstRange {
return ((float) max + current) / 2f;
}
public String toPercentString() {
return Integer.toString((int) FloatMath.ceil((float)current * 100 / max)) + '%';
return Integer.toString((int) Math.ceil((float)current * 100 / max)) + '%';
}
}