Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 07:15:43 +00:00
Code Issues Projects Releases Wiki Activity

Add energy generation probabilities to WeaponType.

Browse Source
This commit is contained in:
ImmuState 2022-05-30 05:28:11 -07:00 committed by Melledy
parent 52a3f95729
commit 2e167d2d78
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyManager.java
View File

@ -256,7 +256,7 @@ public class EnergyManager {
// - Does the probability for a character reset when switching them out? // - Does the probability for a character reset when switching them out?
// - Does this really count every individual hit separately? // - Does this really count every individual hit separately?
// Make sure the avatar's weapon type makes sense. // Get the avatar's weapon type.
WeaponType weaponType = avatar.getAvatar().getAvatarData().getWeaponType(); WeaponType weaponType = avatar.getAvatar().getAvatarData().getWeaponType();
// Check if we already have probability data for this avatar. If not, insert it. // Check if we already have probability data for this avatar. If not, insert it.

10
src/main/java/emu/grasscutter/game/props/WeaponType.java
View File

@ -9,7 +9,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
public enum WeaponType { public enum WeaponType {
WEAPON_NONE (0), WEAPON_NONE (0),
WEAPON_SWORD_ONE_HAND (1), WEAPON_SWORD_ONE_HAND (1, 10, 5),
WEAPON_CROSSBOW (2), WEAPON_CROSSBOW (2),
WEAPON_STAFF (3), WEAPON_STAFF (3),
WEAPON_DOUBLE_DAGGER (4), WEAPON_DOUBLE_DAGGER (4),
@ -18,10 +18,10 @@ public enum WeaponType {
WEAPON_STICK (7), WEAPON_STICK (7),
WEAPON_SPEAR (8), WEAPON_SPEAR (8),
WEAPON_SHIELD_SMALL (9), WEAPON_SHIELD_SMALL (9),
WEAPON_CATALYST (10), WEAPON_CATALYST (10, 0, 10),
WEAPON_CLAYMORE (11), WEAPON_CLAYMORE (11, 0, 10),
WEAPON_BOW (12), WEAPON_BOW (12, 0, 5),
WEAPON_POLE (13); WEAPON_POLE (13, 0, 4);
private final int value; private final int value;
private int energyGainInitialProbability; private int energyGainInitialProbability;