From dbcec1a1997fd8f3407ee7c2db5b818766e9ae96 Mon Sep 17 00:00:00 2001 From: "Nut.andor" Date: Sat, 18 Mar 2023 18:46:56 +0100 Subject: [PATCH] James' PR 54 to master - redirected to branch development Changed XP death penalty to 20% Give the player 9 BC by default --- .../main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java | 2 +- .../main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java index ca4767bbd..6e0fe9287 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java @@ -7,7 +7,7 @@ import com.gpl.rpg.AndorsTrail.util.ConstRange; import com.gpl.rpg.AndorsTrail.util.Range; public final class Constants { - public static final int PERCENT_EXP_LOST_WHEN_DIED = 30; + public static final int PERCENT_EXP_LOST_WHEN_DIED = 20; public static final int LEVELUP_EFFECT_HEALTH = 5; public static final int LEVELUP_EFFECT_ATK_CH = 5; public static final int LEVELUP_EFFECT_ATK_DMG = 1; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java index 67b2215c9..4b1c70951 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Player.java @@ -111,7 +111,7 @@ public final class Player extends Actor { baseTraits.criticalSkill = 0; baseTraits.criticalMultiplier = 1; baseTraits.damagePotential.set(1, 1); - baseTraits.blockChance = 0; + baseTraits.blockChance = 9; baseTraits.damageResistance = 0; baseTraits.useItemCost = 5; baseTraits.reequipCost = 5;