Skip to content
Snippets Groups Projects
Commit baef2568 authored by logictc's avatar logictc Committed by Melledy
Browse files

change indentation to tab

parent c26bf08d
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
+ 0
− 7
View file @ baef2568
...@@ -45,13 +45,6 @@ public class AbilityManager { ...@@ -45,13 +45,6 @@ public class AbilityManager {
public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception { public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception {
// Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray())); // Grasscutter.getLogger().info(invoke.getArgumentType() + " (" + invoke.getArgumentTypeValue() + "): " + Utils.bytesToHex(invoke.toByteArray()));
//AbilityIdentifier identifier = AbilityIdentifier.parseFrom(invoke.getAbilityData());
//AbilityInvocationsNotify notify = AbilityInvocationsNotify.parseFrom(invoke.getAbilityData());
//Grasscutter.getLogger().info("Ability id: " + Integer.toString(invoke.getEntityId()));
//Grasscutter.getLogger().info("invoke count: " + Double.toString(invoke.getTotalTickTime()));
switch (invoke.getArgumentType()) { switch (invoke.getArgumentType()) {
case ABILITY_META_OVERRIDE_PARAM: case ABILITY_META_OVERRIDE_PARAM:
handleOverrideParam(invoke); handleOverrideParam(invoke);
......
src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java
+ 8
− 8
View file @ baef2568
...@@ -3,14 +3,14 @@ package emu.grasscutter.game.managers.EnergyManager; ...@@ -3,14 +3,14 @@ package emu.grasscutter.game.managers.EnergyManager;
import java.util.List; import java.util.List;
public class SkillParticleGenerationEntry { public class SkillParticleGenerationEntry {
private int avatarId; private int avatarId;
private List<SkillParticleGenerationInfo> amountList; private List<SkillParticleGenerationInfo> amountList;
public int getAvatarId() { public int getAvatarId() {
return this.avatarId; return this.avatarId;
} }
public List<SkillParticleGenerationInfo> getAmountList() { public List<SkillParticleGenerationInfo> getAmountList() {
return this.amountList; return this.amountList;
} }
} }
src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java
+ 8
− 8
View file @ baef2568
package emu.grasscutter.game.managers.EnergyManager; package emu.grasscutter.game.managers.EnergyManager;
public class SkillParticleGenerationInfo { public class SkillParticleGenerationInfo {
private int value; private int value;
private int chance; private int chance;
public int getValue() { public int getValue() {
return this.value; return this.value;
} }
public int getChance() { public int getChance() {
return this.chance; return this.chance;
} }
} }
src/main/resources/defaults/data/SkillParticleGeneration.json
+ 578
− 578
View file @ baef2568
[ [
{ {
"avatarId": 10000002, "avatarId": 10000002,
"name": "Kamisato Ayaka", "name": "Kamisato Ayaka",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 50 "chance": 50
}, },
{ {
"value": 5, "value": 5,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000003, "avatarId": 10000003,
"name": "Jean", "name": "Jean",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 33 "chance": 33
}, },
{ {
"value": 3, "value": 3,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000005, "avatarId": 10000005,
"name": "Traveler", "name": "Traveler",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 67 "chance": 67
}, },
{ {
"value": 4, "value": 4,
"chance": 33 "chance": 33
} }
] ]
}, },
{ {
"avatarId": 10000006, "avatarId": 10000006,
"name": "Lisa", "name": "Lisa",
"amountList": [ "amountList": [
{ {
"value": 5, "value": 5,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000007, "avatarId": 10000007,
"name": "Traveler", "name": "Traveler",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 67 "chance": 67
}, },
{ {
"value": 4, "value": 4,
"chance": 33 "chance": 33
} }
] ]
}, },
{ {
"avatarId": 10000014, "avatarId": 10000014,
"name": "Barbara", "name": "Barbara",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000015, "avatarId": 10000015,
"name": "Kaeya", "name": "Kaeya",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 33 "chance": 33
}, },
{ {
"value": 3, "value": 3,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000016, "avatarId": 10000016,
"name": "Diluc", "name": "Diluc",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 33 "chance": 33
}, },
{ {
"value": 2, "value": 2,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000020, "avatarId": 10000020,
"name": "Razor", "name": "Razor",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000021, "avatarId": 10000021,
"name": "Amber", "name": "Amber",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000022, "avatarId": 10000022,
"name": "Venti", "name": "Venti",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000023, "avatarId": 10000023,
"name": "Xiangling", "name": "Xiangling",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000024, "avatarId": 10000024,
"name": "Beidou", "name": "Beidou",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000025, "avatarId": 10000025,
"name": "Xingqiu", "name": "Xingqiu",
"amountList": [ "amountList": [
{ {
"value": 5, "value": 5,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000026, "avatarId": 10000026,
"name": "Xiao", "name": "Xiao",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000027, "avatarId": 10000027,
"name": "Ningguang", "name": "Ningguang",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 33 "chance": 33
}, },
{ {
"value": 4, "value": 4,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000029, "avatarId": 10000029,
"name": "Klee", "name": "Klee",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000030, "avatarId": 10000030,
"name": "Zhongli", "name": "Zhongli",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 50 "chance": 50
}, },
{ {
"value": 1, "value": 1,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000031, "avatarId": 10000031,
"name": "Fischl", "name": "Fischl",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 33 "chance": 33
}, },
{ {
"value": 1, "value": 1,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000032, "avatarId": 10000032,
"name": "Bennett", "name": "Bennett",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 75 "chance": 75
}, },
{ {
"value": 3, "value": 3,
"chance": 25 "chance": 25
} }
] ]
}, },
{ {
"avatarId": 10000033, "avatarId": 10000033,
"name": "Tartaglia", "name": "Tartaglia",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000034, "avatarId": 10000034,
"name": "Noelle", "name": "Noelle",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000035, "avatarId": 10000035,
"name": "Qiqi", "name": "Qiqi",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000036, "avatarId": 10000036,
"name": "Chongyun", "name": "Chongyun",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000037, "avatarId": 10000037,
"name": "Ganyu", "name": "Ganyu",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000038, "avatarId": 10000038,
"name": "Albedo", "name": "Albedo",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 33 "chance": 33
}, },
{ {
"value": 1, "value": 1,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000039, "avatarId": 10000039,
"name": "Diona", "name": "Diona",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 20 "chance": 20
}, },
{ {
"value": 1, "value": 1,
"chance": 80 "chance": 80
} }
] ]
}, },
{ {
"avatarId": 10000041, "avatarId": 10000041,
"name": "Mona", "name": "Mona",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 67 "chance": 67
}, },
{ {
"value": 4, "value": 4,
"chance": 33 "chance": 33
} }
] ]
}, },
{ {
"avatarId": 10000042, "avatarId": 10000042,
"name": "Keqing", "name": "Keqing",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 50 "chance": 50
}, },
{ {
"value": 3, "value": 3,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000043, "avatarId": 10000043,
"name": "Sucrose", "name": "Sucrose",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000044, "avatarId": 10000044,
"name": "Xinyan", "name": "Xinyan",
"amountList": [ "amountList": [
{ {
"value": 4, "value": 4,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000045, "avatarId": 10000045,
"name": "Rosaria", "name": "Rosaria",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000046, "avatarId": 10000046,
"name": "Hu Tao", "name": "Hu Tao",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 50 "chance": 50
}, },
{ {
"value": 3, "value": 3,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000047, "avatarId": 10000047,
"name": "Kaedehara Kazuha", "name": "Kaedehara Kazuha",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 50 "chance": 50
}, },
{ {
"value": 4, "value": 4,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000048, "avatarId": 10000048,
"name": "Yanfei", "name": "Yanfei",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000049, "avatarId": 10000049,
"name": "Yoimiya", "name": "Yoimiya",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000050, "avatarId": 10000050,
"name": "Thoma", "name": "Thoma",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 50 "chance": 50
}, },
{ {
"value": 4, "value": 4,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000051, "avatarId": 10000051,
"name": "Eula", "name": "Eula",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 50 "chance": 50
}, },
{ {
"value": 2, "value": 2,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000052, "avatarId": 10000052,
"name": "Raiden Shogun", "name": "Raiden Shogun",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 50 "chance": 50
}, },
{ {
"value": 1, "value": 1,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000053, "avatarId": 10000053,
"name": "Sayu", "name": "Sayu",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000054, "avatarId": 10000054,
"name": "Sangonomiya Kokomi", "name": "Sangonomiya Kokomi",
"amountList": [ "amountList": [
{ {
"value": 0, "value": 0,
"chance": 33 "chance": 33
}, },
{ {
"value": 1, "value": 1,
"chance": 67 "chance": 67
} }
] ]
}, },
{ {
"avatarId": 10000055, "avatarId": 10000055,
"name": "Gorou", "name": "Gorou",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000056, "avatarId": 10000056,
"name": "Kujou Sara", "name": "Kujou Sara",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000057, "avatarId": 10000057,
"name": "Arataki Itto", "name": "Arataki Itto",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 50 "chance": 50
}, },
{ {
"value": 4, "value": 4,
"chance": 50 "chance": 50
} }
] ]
}, },
{ {
"avatarId": 10000058, "avatarId": 10000058,
"name": "Yae Miko", "name": "Yae Miko",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000062, "avatarId": 10000062,
"name": "Aloy", "name": "Aloy",
"amountList": [ "amountList": [
{ {
"value": 5, "value": 5,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000063, "avatarId": 10000063,
"name": "Shenhe", "name": "Shenhe",
"amountList": [ "amountList": [
{ {
"value": 3, "value": 3,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000064, "avatarId": 10000064,
"name": "Yun Jin", "name": "Yun Jin",
"amountList": [ "amountList": [
{ {
"value": 2, "value": 2,
"chance": 100 "chance": 100
} }
] ]
}, },
{ {
"avatarId": 10000066, "avatarId": 10000066,
"name": "Kamisato Ayato", "name": "Kamisato Ayato",
"amountList": [ "amountList": [
{ {
"value": 1, "value": 1,
"chance": 50 "chance": 50
}, },
{ {
"value": 2, "value": 2,
"chance": 50 "chance": 50
} }
] ]
} }
] ]
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment