Skip to content

Bounty ability #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramen-cat-coder wants to merge 2 commits into
base: slow_kotlin
Choose a base branch
from
Open

Bounty ability #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b925d3c
Bounty ability
ramen-cat-coder Apr 21, 2026
c5043ec
First work on change money proc
ramen-cat-coder Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion battle/attack/AtkModelEnemy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AtkModelEnemy extends AtkModelEntity {
protected AtkModelEnemy(EEnemy ent, float d0) {
super(ent, d0, 1);
String[] arr = { "KB", "STOP", "SLOW", "WEAK", "WARP", "CURSE", "SNIPER", "SEAL", "POISON", "BOSS",
"POIATK", "ARMOR", "SPEED", "LETHARGY", "DMGCUT", "DMGCAP", "DELAY" };
"POIATK", "ARMOR", "SPEED", "LETHARGY", "DMGCUT", "DMGCAP", "DELAY", "CHANGEMONEY" };
cursed = new Proc[data.getAtkCount()];
for (int i = 0; i < cursed.length; i++) {
cursed[i] = data.getAtkModel(i).getProc().clone();
Expand Down
7 changes: 6 additions & 1 deletion battle/attack/AtkModelEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@ public void invokeLater(AttackAb atk, Entity e) {
summon(proc, e, e, rst);
}
}
if (atk.getProc().CHANGEMONEY.exists()) {
if (e.health <= 0) {
atk.attacker.triggerChangeMoney(2); // on kill
}
}
}

/**
Expand Down Expand Up @@ -278,7 +283,7 @@ protected void setProc(int ind, Proc proc) {
String[] par = {
"CRIT", "WAVE", "KB", "WARP", "STOP", "SLOW", "WEAK", "POISON", "MOVEWAVE", "CURSE", "SNIPER",
"BOSS", "SEAL", "BREAK", "SUMMON", "SATK", "POIATK", "VOLC", "ARMOR", "SPEED", "LETHARGY", "MINIWAVE", "SHIELDBREAK",
"MINIVOLC", "METALKILL", "BLAST", "DELAY"
"MINIVOLC", "METALKILL", "BLAST", "DELAY", "CHANGEMONEY"
};

for (String s0 : par)
Expand Down
2 changes: 1 addition & 1 deletion battle/attack/ContVolcano.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private void updateProc() {
}
performed[1] = performed[3] = true;
}
String[] cursep = {"KB", "STOP", "SLOW", "WEAK", "WARP", "CURSE", "SNIPER", "SEAL", "POISON", "BOSS", "POIATK", "ARMOR", "SPEED", "LETHARGY", "DMGCUT", "DMGCAP", "DELAY"};
String[] cursep = {"KB", "STOP", "SLOW", "WEAK", "WARP", "CURSE", "SNIPER", "SEAL", "POISON", "BOSS", "POIATK", "ARMOR", "SPEED", "LETHARGY", "DMGCUT", "DMGCAP", "DELAY", "CHANGEMONEY"};
if (v.attacker.status[P_CURSE][0] > 0 || v.attacker.status[P_SEAL][0] > 0 && performed[2]) {
performed[2] = false;
for (String s : cursep)
Expand Down
1 change: 1 addition & 0 deletions battle/entity/ECastle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public boolean damaged(AttackAb atk) {

int ans = atk.atk;
ans = (int) (ans * (1 + atk.getProc().ATKBASE.mult / 100.0));
atk.attacker.triggerChangeMoney(4); // on hit base

int satk = atk.getProc().SATK.mult;
if (satk > 0) {
Expand Down
110 changes: 110 additions & 0 deletions battle/entity/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import common.util.stage.StageLimit;
import common.util.unit.Level;
import common.util.unit.Trait;
import org.jcodec.common.tools.MathUtil;

import java.util.*;

Expand Down Expand Up @@ -1478,6 +1479,19 @@ public void update() {
*/
private int regentimer;

/**
* change money cooldown
*/
private int bountycooldown;
/**
* change money cooldown that it wants to be set to (for multi hits)
*/
private int trybountycooldown;
/**
* change money tracking of multi hits
*/
private boolean firstbountydone;

public final Proc proc;

protected Entity(StageBasis b, MaskEnemy de, EAnimU ea, float atkMagnif, float hpMagnif) {
Expand Down Expand Up @@ -1565,6 +1579,11 @@ public boolean damaged(AttackAb atk) {
regentimer = getProc().HPREGEN.interval; // Reset if enabled
}

atk.attacker.triggerChangeMoney(1); // on hit
if (isBase) {
atk.attacker.triggerChangeMoney(4); // on hit base
}

if (anim.corpse != null && anim.corpse.type == ZombieEff.REVIVE && status[P_REVIVE][1] >= REVIVE_SHOW_TIME)
return false;

Expand Down Expand Up @@ -1865,6 +1884,81 @@ else if (basis.activeGuard != 1)
return true;
}

public void triggerChangeMoney(int context) {
boolean isFirstTrigger = false;
if (getProc().CHANGEMONEY.prob <= 0) {
return;
}
if (getProc().CHANGEMONEY.condition != context) {
return;
}
if (getProc().CHANGEMONEY.condition != 0 && health <= 0) {
return;
}
if (firstbountydone && !getProc().CHANGEMONEY.hitstacks) {
return;
}
if (bountycooldown > 0) {
return;
}
if (getProc().CHANGEMONEY.freezeeff && status[P_STOP][0] > 0) {
return;
}
if (!firstbountydone) {
isFirstTrigger = true;
}
firstbountydone = true;
float actualChance = getProc().CHANGEMONEY.prob / 100f;
if (basis.r.nextFloat() < actualChance) {
if (getProc().CHANGEMONEY.usesound && isFirstTrigger) {
switch (getProc().CHANGEMONEY.sound) {
case 0:
CommonStatic.setSE(14);
break;
case 1:
CommonStatic.setSE(13);
break;
case 2:
CommonStatic.setSE(12);
break;
case 3:
CommonStatic.setSE(190);
break;
case 4:
CommonStatic.setSE(107);
break;
case 5:
CommonStatic.setSE(64);
break;
}
}
float actualPercent = (getProc().CHANGEMONEY.amount/100f);
switch (getProc().CHANGEMONEY.type) {
case 0: // change by flat
basis.money += getProc().CHANGEMONEY.amount * 100;
break;
case 1: // change by % of max
basis.money += (int)(basis.maxMoney * actualPercent);
break;
case 2: // change by % of current
basis.money = (int)(basis.money * (1 + actualPercent));
break;
case 3: // change by % of missing
int missing = basis.maxMoney - basis.money;
basis.money += (int)(missing * actualPercent);
break;
case 4: // set to amount
basis.money = getProc().CHANGEMONEY.amount * 100;
break;
case 5: // set to % of max
basis.money = (int)(basis.maxMoney * actualPercent);
break;
}
basis.money = MathUtil.clip(basis.money,0,basis.maxMoney);
}
trybountycooldown = getProc().CHANGEMONEY.cooldown;
}

private int applyLethargy(int tba) {
if (status[P_LETHARGY][0] > 0) {
if (status[P_LETHARGY][2] == 0) {
Expand Down Expand Up @@ -2207,6 +2301,18 @@ public void cont() {
@Override
public void postUpdate() {
regenUpdate();
if ((getProc().CHANGEMONEY.freezeeff && status[P_STOP][0] == 0) || !getProc().CHANGEMONEY.freezeeff) {
bountycooldown = Math.max(bountycooldown-1,-1);
}
firstbountydone = false;
triggerChangeMoney(3); // constantly
if (getProc().CHANGEMONEY.condition == 5 && !walking && !dead) {
triggerChangeMoney(5); // while idle/attacking
}
if (trybountycooldown != -1) {
bountycooldown = trybountycooldown;
trybountycooldown = -1;
}

int hb = data.getHb();
long ext = health * hb % maxH;
Expand Down Expand Up @@ -2258,6 +2364,10 @@ public void postUpdate() {
tokens.get(i).model.invokeLater(tokens.get(i), this);
tokens.clear();

if (health <= 0) {
triggerChangeMoney(0); // on death
}

if(isBase && health <= 0)
kbTime = 1;

Expand Down
51 changes: 49 additions & 2 deletions util/Data.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ public ProcItem clear() {
for (Field f : fs)
if (f.getType() == int.class)
f.set(this, 0);
else if (f.getType() == boolean.class)
f.set(this, false);
else if (IntType.class.isAssignableFrom(f.getType()))
f.set(this, (f.getType().getDeclaredConstructor().newInstance()));
else if (f.getType() == Identifier.class)
Expand Down Expand Up @@ -779,6 +781,46 @@ public static class DELAY extends ProcItem {
public int type;
}

@JsonClass(noTag = NoTag.LOAD)
public static class CHANGEMONEY extends ProcItem {
@Order(0)
public int prob;
@Order(1)
public int condition;
@Order(2)
public int amount;
@Order(3)
public int type;
@Order(4)
public int cooldown;
@Order(5)
public int sound;
@Order(6)
public boolean usesound;
@Order(7)
public boolean freezeeff;
}

@JsonClass(noTag = NoTag.LOAD)
public static class CHANGEMONEYPROC extends ProcItem {
@Order(0)
public int prob;
@Order(1)
public int condition;
@Order(2)
public int amount;
@Order(3)
public int type;
@Order(4)
public int sound;
@Order(5)
public boolean usesound;
@Order(6)
public boolean hitstacks;
@Order(7)
public boolean freezeeff;
}

public static Proc blank() {
return new Proc();
}
Expand Down Expand Up @@ -942,6 +984,8 @@ public static Proc load(int[][] data) {
public final DELAY DELAY = new DELAY();
@Order(65)
public final IMUAD IMUDELAY = new IMUAD();
@Order(66)
public final CHANGEMONEY CHANGEMONEY = new CHANGEMONEY();

// Talent orbs, shouldn't be given @Order unless allowed as editable fields
public final MINIVOLC MINIDEATHSURGE = new MINIVOLC(); // TODO: implement this as a normal ability?
Expand Down Expand Up @@ -1332,7 +1376,9 @@ public static Proc genProc(JsonElement elem) {
public static final int P_IMULETH = 63;
public static final int P_DELAY = 64; // Works like Speed
public static final int P_IMUDELAY = 65;
public static final byte PROC_TOT = 66;
public static final int P_CHANGEMONEY = 66;
public static final int P_CHANGEMONEYPROC = 67;
public static final byte PROC_TOT = 68;
public static final byte PROC_WIDTH = 6;

public static final int SCORE_WEAK = 0;
Expand Down Expand Up @@ -1412,7 +1458,8 @@ public static Proc genProc(JsonElement elem) {
false, //lethargy
true, //imu.lethargy
false, //delay
true //imu delay
true, //imu delay
true //bounty
};

/**
Expand Down
2 changes: 2 additions & 0 deletions util/Res.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ private static void readAbiIcon() {
aux.icon[1][P_SPEEDUP] = new VImg("./org/page/icons/Speed.png");
aux.icon[1][P_HPREGEN] = new VImg("./org/page/icons/Barrier.png");
aux.icon[1][P_LETHARGY] = new VImg("./org/page/icons/Lethargy.png");
aux.icon[1][P_CHANGEMONEY] = new VImg("./org/page/icons/Bounty.png");
aux.icon[1][P_CHANGEMONEYPROC] = new VImg("./org/page/icons/Bounty.png");
CommonStatic.getConfig().icon = false;
}

Expand Down
18 changes: 18 additions & 0 deletions util/lang/Editors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,24 @@ else if (t.killCount == 0)
}));

map().put("IMUDELAY", imuad);

map().put("CHANGEMONEY", new EditControl<>(Proc.CHANGEMONEY.class, (t) -> {
t.prob = MathUtil.clip(t.prob, 0, 100);
if (t.prob == 0) {
t.type = 0;
t.condition = 0;
t.amount = 0;
t.hitstacks = false;
t.usesound = false;
t.sound = 0;
t.cooldown = 0;
} else {
t.condition = MathUtil.clip(t.condition, 0, 5);
t.sound = MathUtil.clip(t.sound, 0, 5);
t.cooldown = Math.max(0, t.cooldown);
t.type = MathUtil.clip(t.type, 0, 5);
}
}));
}

private static void setComponentVisibility(EditorGroup egg, boolean boo, int... fields) {
Expand Down
Loading