Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-09-13 12:55:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made most behavior constants into config file settings (closes #8).

Browse Source
This commit is contained in:
Ammon Lauritzen
2016-02-22 10:48:43 -06:00
parent ce3e5b6b9d
commit 1afd38fef1
2 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/fairies/FairyConfig.java
View File

@@ -9,11 +9,19 @@ public class FairyConfig extends Configuration {
public static int SPAWN_FACTION_MIN_SIZE = 8;
public static int SPAWN_FACTION_MAX_SIZE = 10;
public static double DEF_BASE_HEALTH = 15.0D;
public static float DEF_BASE_SPEED = 0.9F;
public static float DEF_SCOUT_SPEED = 1.05F;
public static float DEF_WITHER_MULT = 0.75F;
public static double GENERAL_HEALTH_BASE = 15.0D;
public static float GENERAL_SPEED_BASE = 0.9F;
public static float GENERAL_SPEED_SCOUT = 1.05F;
public static float GENERAL_SPEED_WITHER_MULT = 0.75F;
public static float BEHAVIOR_PATH_RANGE = 16F;
public static float BEHAVIOR_PURSUE_RANGE = BEHAVIOR_PATH_RANGE;
public static float BEHAVIOR_DEFEND_RANGE = BEHAVIOR_PURSUE_RANGE / 2;
public static float BEHAVIOR_FEAR_RANGE = 12F;
// how long will tame fairies stay mad? 3x for wild
public static int BEHAVIOR_AGGRO_TIMER = 15;
// fall speed
public static double DEF_FLOAT_RATE = -0.2D;
// fly speed
@@ -25,18 +33,6 @@ public class FairyConfig extends Configuration {
public static int DEF_MAX_PARTICLES = 5;
// how far will we path to something?
public static float DEF_PATH_RANGE = 16F;
// how far will we chase something?
public static float DEF_PURSUE_RANGE = DEF_PATH_RANGE;
// how close will guards protect the queen from?
public static float DEF_DEFEND_RANGE = DEF_PURSUE_RANGE / 2;
// how far will we flee from something?
public static float DEF_FEAR_RANGE = 12F;
// how long will tame fairies stay mad? 3x for wild
public static final int DEF_AGGRO_TIMER = 15;
public FairyConfig(File file) {
super(file);
@@ -58,7 +54,32 @@ public class FairyConfig extends Configuration {
/**
* General fairy stats
*/
//GENERAL_HEALTH_BASE = getFloat("health.base", "general", )
GENERAL_HEALTH_BASE = getFloat("health.base", "general", (float)GENERAL_HEALTH_BASE,
1.0F, 40.0F, "base maximum health");
GENERAL_SPEED_BASE = getFloat("speed.base", "general", GENERAL_SPEED_BASE,
0.1F, 2.0F, "base move speed");
GENERAL_SPEED_SCOUT = getFloat("speed.scout", "general", GENERAL_SPEED_SCOUT,
0.1F, 2.0F, "move speed for scouts");
GENERAL_SPEED_WITHER_MULT = getFloat("speed.wither_mult", "general", GENERAL_SPEED_WITHER_MULT,
0.05F, 0.95F, "multiplier to speed for wither debuff (lower is slower)");
/**
* Behavior modifiers
*/
BEHAVIOR_PATH_RANGE = getFloat("range.path", "behavior", BEHAVIOR_PATH_RANGE,
4.0F, 32F, "how far will we path to something?");
final float pursue_range_mult = getFloat("range.pursue_mult", "behavior", 1.0F,
0.25F, 2F, "how much farther will we chase something than our normal pathing?");
final float defend_range_mult = getFloat("range.defend_mult", "behavior", 0.5F,
0.25F, 2F, "how close will guards stay to the queen?");
BEHAVIOR_FEAR_RANGE = getFloat("range.fear", "behavior", BEHAVIOR_FEAR_RANGE,
4.0F, 32F, "how far will we run away when afraid?");
BEHAVIOR_PURSUE_RANGE = BEHAVIOR_PATH_RANGE * pursue_range_mult;
BEHAVIOR_DEFEND_RANGE = BEHAVIOR_PATH_RANGE * defend_range_mult;
BEHAVIOR_AGGRO_TIMER = getInt("timer.anger", "behavior", BEHAVIOR_AGGRO_TIMER,
1, 100, "how long will tame fairies stay angry? (wild are 3x this)");
}
}

28
src/main/java/fairies/entity/EntityFairy.java
View File

@@ -66,8 +66,6 @@ public class EntityFairy extends EntityAnimal {
private static final Logger LOG = FairyFactions.LOGGER;
// TODO: put these into config file
private boolean cower;
public boolean didHearts;
public boolean didSwing;
@@ -228,9 +226,9 @@ public class EntityFairy extends EntityAnimal {
protected void applyEntityAttributes() {
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth)
.setBaseValue(FairyConfig.DEF_BASE_HEALTH);
.setBaseValue(FairyConfig.GENERAL_HEALTH_BASE);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed)
.setBaseValue(FairyConfig.DEF_BASE_SPEED);
.setBaseValue(FairyConfig.GENERAL_SPEED_BASE);
// this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D);
// this.getEntityAttribute(SharedMonsterAttributes.followRange).setBaseValue(10.0D);
}
@@ -285,16 +283,16 @@ public class EntityFairy extends EntityAnimal {
if (scout()) {
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed)
.setBaseValue(FairyConfig.DEF_SCOUT_SPEED);
.setBaseValue(FairyConfig.GENERAL_SPEED_SCOUT);
} else {
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed)
.setBaseValue(FairyConfig.DEF_BASE_SPEED);
.setBaseValue(FairyConfig.GENERAL_SPEED_BASE);
}
if (withered()) {
IAttributeInstance speed = this
.getEntityAttribute(SharedMonsterAttributes.movementSpeed);
speed.setBaseValue(speed.getAttributeValue() * FairyConfig.DEF_WITHER_MULT);
speed.setBaseValue(speed.getAttributeValue() * FairyConfig.GENERAL_SPEED_WITHER_MULT);
}
if (!worldObj.isRemote) {
@@ -742,7 +740,7 @@ public class EntityFairy extends EntityAnimal {
if (j > 4 && j < worldObj.getHeight() - 1 && isAirySpace(i, j, k)
&& !isAirySpace(i, j - 1, k)) {
PathEntity dogs = worldObj.getEntityPathToXYZ(actor, i, j, k,
FairyConfig.DEF_PATH_RANGE, false, false, true, true);
FairyConfig.BEHAVIOR_PATH_RANGE, false, false, true, true);
if (dogs != null) {
return dogs;
@@ -778,7 +776,7 @@ public class EntityFairy extends EntityAnimal {
if (j > 4 && j < worldObj.getHeight() - 1 && isAirySpace(i, j, k)
&& !isAirySpace(i, j - 1, k)) {
PathEntity dogs = worldObj.getEntityPathToXYZ(actor, i, j, k,
FairyConfig.DEF_PATH_RANGE, false, false, true, true);
FairyConfig.BEHAVIOR_PATH_RANGE, false, false, true, true);
if (dogs != null) {
return dogs;
@@ -827,12 +825,12 @@ public class EntityFairy extends EntityAnimal {
if (entityToAttack != null) {
final float enemy_dist = getDistanceToEntity(entityToAttack);
if (enemy_dist >= FairyConfig.DEF_PURSUE_RANGE || ( rand.nextBoolean()
if (enemy_dist >= FairyConfig.BEHAVIOR_PURSUE_RANGE || ( rand.nextBoolean()
&& !canEntityBeSeen(entityToAttack) )) {
++loseInterest;
if (loseInterest >= ( tamed() ? FairyConfig.DEF_AGGRO_TIMER
: FairyConfig.DEF_AGGRO_TIMER * 3 )) {
if (loseInterest >= ( tamed() ? FairyConfig.BEHAVIOR_AGGRO_TIMER
: FairyConfig.BEHAVIOR_AGGRO_TIMER * 3 )) {
setTarget(null);
loseInterest = 0;
}
@@ -848,8 +846,8 @@ public class EntityFairy extends EntityAnimal {
if (fairy.entityToAttack != null) {
float queen_dist = getDistanceToEntity(fairy);
if (queen_dist < FairyConfig.DEF_DEFEND_RANGE
&& enemy_dist < FairyConfig.DEF_DEFEND_RANGE
if (queen_dist < FairyConfig.BEHAVIOR_DEFEND_RANGE
&& enemy_dist < FairyConfig.BEHAVIOR_DEFEND_RANGE
&& canEntityBeSeen(fairy)) {
this.setTarget(fairy.entityToAttack);
fairy.setTarget(null);
@@ -871,7 +869,7 @@ public class EntityFairy extends EntityAnimal {
float dist = getDistanceToEntity(getEntityFear());
// Run from entityFear if you can see it and it is close.
if (dist < FairyConfig.DEF_FEAR_RANGE) {
if (dist < FairyConfig.BEHAVIOR_FEAR_RANGE) {
PathEntity doug = roam(getEntityFear(), this, PATH_AWAY);
if (doug != null) {