konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.5.1: significantly improved internal RNG for chaotic censer

Browse Source
This commit is contained in:
Evan Debenham
2024-09-16 11:18:11 -04:00
parent 823b0b6788
commit 795ed29a9d
1 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/ChaoticCenser.java
+56 -34
View File
@@ -97,60 +97,80 @@ public class ChaoticCenser extends Trinket {
int avgTurns = averageTurnsUntilGas(); int avgTurns = averageTurnsUntilGas();
if (avgTurns == -1){ if (avgTurns == -1){
spend(Random.NormalIntRange(2, 8)); spend(Random.NormalIntRange(1, 5));
return true; return true;
} else if (left > avgTurns*1.1f){ } else if (left > avgTurns*1.1f){
left = Random.IntRange((int) (avgTurns*0.9f), (int) (avgTurns*1.1f)); left = Random.IntRange((int) (avgTurns*0.9f), (int) (avgTurns*1.1f));
} }
if (left < avgTurns/5){ float triggerChance = 0;
if (left > 0 && left <= 30) {
//censer will try to delay spawning gas in certain safe areas, atm just inside shops if (TargetHealthIndicator.instance != null
&& TargetHealthIndicator.instance.target() != null
&& TargetHealthIndicator.instance.target().alignment == Char.Alignment.ENEMY
&& TargetHealthIndicator.instance.target().isAlive()) {
triggerChance = 0.5f;
}
} else if (left > -30 && left <= 0) {
if (TargetHealthIndicator.instance != null
&& TargetHealthIndicator.instance.target() != null
&& TargetHealthIndicator.instance.target().alignment == Char.Alignment.ENEMY
&& TargetHealthIndicator.instance.target().isAlive()) {
triggerChance = 1f;
} else if (Dungeon.level.openSpace[target.pos]){
triggerChance = 0.2f;
}
} else if (left <= -avgTurns/5) {
triggerChance = 1f;
}
if (triggerChance > 0) {
if (safeAreaDelay >= 0) { if (safeAreaDelay >= 0) {
boolean safeArea = false;
//shops are a safe area
for (Char ch : Actor.chars()) { for (Char ch : Actor.chars()) {
if (ch instanceof Shopkeeper if (ch instanceof Shopkeeper
&& Dungeon.level.distance(target.pos, ch.pos) <= 6 && Dungeon.level.distance(target.pos, ch.pos) <= 6
&& new Ballistica(target.pos, ch.pos, Ballistica.PROJECTILE).collisionPos == ch.pos) { && new Ballistica(target.pos, ch.pos, Ballistica.PROJECTILE).collisionPos == ch.pos) {
int delay = Random.NormalIntRange(2, 8); safeArea = true;
spend(delay);
safeAreaDelay -= delay;
return true;
} }
} }
}
//scales quadratically from ~4% at avgTurns/5, to 36% at 0, to 100% at -avgTurns/5 //enclosed spaces are a safe area if no enemies are present
float triggerChance = (float) Math.pow( 1f - (left + avgTurns/5f)/(avgTurns/2f), 2); if ((TargetHealthIndicator.instance == null || TargetHealthIndicator.instance.target() == null
|| TargetHealthIndicator.instance.target().alignment != Char.Alignment.ENEMY
//trigger chance is linearly increased by 5% for each open adjacent cell after 2 || !TargetHealthIndicator.instance.target().isAlive())
int openCells = 0; && !Dungeon.level.openSpace[target.pos]) {
for (int i : PathFinder.NEIGHBOURS8){ safeArea = true;
if (!Dungeon.level.solid[target.pos+i]){
openCells++;
} }
}
if (openCells > 2){
triggerChance += (openCells-2)*0.05f;
}
//if no target is present, quadratically scale back trigger chance again, strongly if (safeArea){
if (TargetHealthIndicator.instance.target() != null){ int delay = Random.NormalIntRange(1, 5);
triggerChance = (float)Math.pow(triggerChance, 3); spend(delay);
} safeAreaDelay -= delay;
return true;
if (Random.Float() < triggerChance){
if (produceGas()) {
Sample.INSTANCE.play(Assets.Sounds.GAS);
Dungeon.hero.interrupt();
left += Random.IntRange((int) (avgTurns * 0.9f), (int) (avgTurns * 1.1f));
} }
} }
} }
//buff ticks an average of every 5 turns if (Random.Float() < triggerChance){
int delay = Random.NormalIntRange(2, 8); if (produceGas()) {
Sample.INSTANCE.play(Assets.Sounds.GAS);
Dungeon.hero.interrupt();
left += Random.IntRange((int) (avgTurns * 0.9f), (int) (avgTurns * 1.1f));
}
}
//buff ticks an average of every 3 turns
int delay = Random.NormalIntRange(1, 5);
spend(delay); spend(delay);
safeAreaDelay = Math.min(safeAreaDelay+delay, 100); safeAreaDelay = Math.min(safeAreaDelay+2*delay, 100);
left -= delay; left -= delay;
return true; return true;
@@ -203,7 +223,9 @@ public class ChaoticCenser extends Trinket {
} }
Char target = null; Char target = null;
if (TargetHealthIndicator.instance != null){ if (TargetHealthIndicator.instance != null && TargetHealthIndicator.instance.target() != null
&& TargetHealthIndicator.instance.target().alignment == Char.Alignment.ENEMY
&& TargetHealthIndicator.instance.target().isAlive()) {
target = TargetHealthIndicator.instance.target(); target = TargetHealthIndicator.instance.target();
} }