Skip to content
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

Jump to bottom

Implement character bonuses for combined features #2286

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
+161 −42
Open

Implement character bonuses for combined features #2286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37c0818
implement feature character bonuses for combine & fix num result comb…
Phong940253 Aug 6, 2023
cf8af7d
change regionToId to constant
Phong940253 Aug 9, 2023
7e87fd2
fix double extra item bonus
Phong940253 Aug 9, 2023
75a6d2d
Apply suggestions from code review (clean code CombineResult)
Phong940253 Aug 11, 2023
af1da93
Update src/main/java/emu/grasscutter/game/combine/CombineResult.java
KingRainbow44 Aug 12, 2023
d248ddd
Chore: Remove CombineBonusData class and update GameData (CombineBonu…
Phong940253 Jul 25, 2024
8cdf7a2
Merge branch 'development' into combine-patch
Phong940253 Jul 25, 2024
0b8f9ad
refactor: Replace HashMap with Map in GameConstants & CombineManager
Phong940253 Jul 25, 2024
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 src/main/java/emu/grasscutter/data/excels/CombineBonusData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import lombok.Setter;

@ResourceType(
name = {"CombineBonusExcelConfigData.json"},
name = "CombineBonusExcelConfigData.json",
loadPriority = LoadPriority.LOW)
public class CombineBonusData extends GameResource {
@Getter @Setter private int avatarId;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/emu/grasscutter/game/combine/CombineResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import java.util.List;
import lombok.Getter;
import lombok.Setter;

@Setter @Getter
KingRainbow44 marked this conversation as resolved.
Show resolved Hide resolved
public class CombineResult {
@Getter @Setter private List<ItemParamData> material;
@Getter @Setter private List<ItemParamData> result;
@Getter @Setter private List<ItemParamData> extra;
@Getter @Setter private List<ItemParamData> back;
@Getter @Setter private List<ItemParamData> random;
private List<ItemParamData> material;
private List<ItemParamData> result;
private List<ItemParamData> extra;
private List<ItemParamData> back;
private List<ItemParamData> random;
}