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

Merge branch 'fixmonsterdifficulty' into nut_test_brimhaven

Browse Source 
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt
This commit is contained in:
Gonk
2020-02-22 20:47:24 +01:00
parent b03905c1f9 ca833b3803
commit 6c61910bb1
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,6 +488,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
// see this post for explenations about the calculation: https://andorstrail.com/viewtopic.php?f=3&t=6661
// if you change code here make sure to run the tests in CombatControllerTest.java
public static float getAverageDamagePerHit(final Actor attacker, final Actor target) {
final int numPossibleOutcomes = attacker.getDamagePotential().max - attacker.getDamagePotential().current + 1;
float avgNonCriticalDamage = 0;

30
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt Normal file
View File

@@ -0,0 +1,30 @@
package com.gpl.rpg.AndorsTrail.controller;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import org.junit.Test;
import static org.junit.Assert.*;
public class CombatControllerTest {
@Test
public void getAverageDamagePerHit() throws Exception {
Actor attacker = new Actor(null, false, false);
attacker.attackChance = 100;
attacker.damagePotential.set(5, 3);
Actor target = new Actor(null, false, false);
target.damageResistance = 3;
target.blockChance = 50;
float averageDamagePerHit = CombatController.getAverageDamagePerHit(attacker, target);
assertEquals(0.5, averageDamagePerHit, 0.01);
attacker.criticalSkill = 30;
attacker.criticalMultiplier = 2.5f;
averageDamagePerHit = CombatController.getAverageDamagePerHit(attacker, target);
assertEquals(1.038, averageDamagePerHit, 0.01);
}
}