From baef25680f03e0b6125956b0c3926d2440a3fb91 Mon Sep 17 00:00:00 2001 From: logictc Date: Wed, 25 May 2022 22:06:17 -0400 Subject: [PATCH] change indentation to tab --- .../game/ability/AbilityManager.java | 7 - .../SkillParticleGenerationEntry.java | 16 +- .../SkillParticleGenerationInfo.java | 16 +- .../data/SkillParticleGeneration.json | 1156 ++++++++--------- 4 files changed, 594 insertions(+), 601 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index 612951d6a..15be934be 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -45,13 +45,6 @@ public class AbilityManager { public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception { // 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()) { case ABILITY_META_OVERRIDE_PARAM: handleOverrideParam(invoke); diff --git a/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java b/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java index 826691e7d..e99f99231 100644 --- a/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java +++ b/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java @@ -3,14 +3,14 @@ package emu.grasscutter.game.managers.EnergyManager; import java.util.List; public class SkillParticleGenerationEntry { - private int avatarId; - private List amountList; + private int avatarId; + private List amountList; - public int getAvatarId() { - return this.avatarId; - } + public int getAvatarId() { + return this.avatarId; + } - public List getAmountList() { - return this.amountList; - } + public List getAmountList() { + return this.amountList; + } } diff --git a/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java b/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java index 525c3d843..a461b1035 100644 --- a/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java +++ b/src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java @@ -1,14 +1,14 @@ package emu.grasscutter.game.managers.EnergyManager; public class SkillParticleGenerationInfo { - private int value; - private int chance; + private int value; + private int chance; - public int getValue() { - return this.value; - } + public int getValue() { + return this.value; + } - public int getChance() { - return this.chance; - } + public int getChance() { + return this.chance; + } } diff --git a/src/main/resources/defaults/data/SkillParticleGeneration.json b/src/main/resources/defaults/data/SkillParticleGeneration.json index 683927b3b..f0e67848b 100644 --- a/src/main/resources/defaults/data/SkillParticleGeneration.json +++ b/src/main/resources/defaults/data/SkillParticleGeneration.json @@ -1,580 +1,580 @@ [ - { - "avatarId": 10000002, - "name": "Kamisato Ayaka", - "amountList": [ - { - "value": 4, - "chance": 50 - }, - { - "value": 5, - "chance": 50 - } - ] - }, - { - "avatarId": 10000003, - "name": "Jean", - "amountList": [ - { - "value": 2, - "chance": 33 - }, - { - "value": 3, - "chance": 67 - } - ] - }, - { - "avatarId": 10000005, - "name": "Traveler", - "amountList": [ - { - "value": 3, - "chance": 67 - }, - { - "value": 4, - "chance": 33 - } - ] - }, - { - "avatarId": 10000006, - "name": "Lisa", - "amountList": [ - { - "value": 5, - "chance": 100 - } - ] - }, - { - "avatarId": 10000007, - "name": "Traveler", - "amountList": [ - { - "value": 3, - "chance": 67 - }, - { - "value": 4, - "chance": 33 - } - ] - }, - { - "avatarId": 10000014, - "name": "Barbara", - "amountList": [ - { - "value": 0, - "chance": 100 - } - ] - }, - { - "avatarId": 10000015, - "name": "Kaeya", - "amountList": [ - { - "value": 2, - "chance": 33 - }, - { - "value": 3, - "chance": 67 - } - ] - }, - { - "avatarId": 10000016, - "name": "Diluc", - "amountList": [ - { - "value": 1, - "chance": 33 - }, - { - "value": 2, - "chance": 67 - } - ] - }, - { - "avatarId": 10000020, - "name": "Razor", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000021, - "name": "Amber", - "amountList": [ - { - "value": 4, - "chance": 100 - } - ] - }, - { - "avatarId": 10000022, - "name": "Venti", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000023, - "name": "Xiangling", - "amountList": [ - { - "value": 1, - "chance": 100 - } - ] - }, - { - "avatarId": 10000024, - "name": "Beidou", - "amountList": [ - { - "value": 2, - "chance": 100 - } - ] - }, - { - "avatarId": 10000025, - "name": "Xingqiu", - "amountList": [ - { - "value": 5, - "chance": 100 - } - ] - }, - { - "avatarId": 10000026, - "name": "Xiao", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000027, - "name": "Ningguang", - "amountList": [ - { - "value": 3, - "chance": 33 - }, - { - "value": 4, - "chance": 67 - } - ] - }, - { - "avatarId": 10000029, - "name": "Klee", - "amountList": [ - { - "value": 4, - "chance": 100 - } - ] - }, - { - "avatarId": 10000030, - "name": "Zhongli", - "amountList": [ - { - "value": 0, - "chance": 50 - }, - { - "value": 1, - "chance": 50 - } - ] - }, - { - "avatarId": 10000031, - "name": "Fischl", - "amountList": [ - { - "value": 0, - "chance": 33 - }, - { - "value": 1, - "chance": 67 - } - ] - }, - { - "avatarId": 10000032, - "name": "Bennett", - "amountList": [ - { - "value": 2, - "chance": 75 - }, - { - "value": 3, - "chance": 25 - } - ] - }, - { - "avatarId": 10000033, - "name": "Tartaglia", - "amountList": [ - { - "value": 1, - "chance": 100 - } - ] - }, - { - "avatarId": 10000034, - "name": "Noelle", - "amountList": [ - { - "value": 0, - "chance": 100 - } - ] - }, - { - "avatarId": 10000035, - "name": "Qiqi", - "amountList": [ - { - "value": 0, - "chance": 100 - } - ] - }, - { - "avatarId": 10000036, - "name": "Chongyun", - "amountList": [ - { - "value": 4, - "chance": 100 - } - ] - }, - { - "avatarId": 10000037, - "name": "Ganyu", - "amountList": [ - { - "value": 2, - "chance": 100 - } - ] - }, - { - "avatarId": 10000038, - "name": "Albedo", - "amountList": [ - { - "value": 0, - "chance": 33 - }, - { - "value": 1, - "chance": 67 - } - ] - }, - { - "avatarId": 10000039, - "name": "Diona", - "amountList": [ - { - "value": 0, - "chance": 20 - }, - { - "value": 1, - "chance": 80 - } - ] - }, - { - "avatarId": 10000041, - "name": "Mona", - "amountList": [ - { - "value": 3, - "chance": 67 - }, - { - "value": 4, - "chance": 33 - } - ] - }, - { - "avatarId": 10000042, - "name": "Keqing", - "amountList": [ - { - "value": 2, - "chance": 50 - }, - { - "value": 3, - "chance": 50 - } - ] - }, - { - "avatarId": 10000043, - "name": "Sucrose", - "amountList": [ - { - "value": 4, - "chance": 100 - } - ] - }, - { - "avatarId": 10000044, - "name": "Xinyan", - "amountList": [ - { - "value": 4, - "chance": 100 - } - ] - }, - { - "avatarId": 10000045, - "name": "Rosaria", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000046, - "name": "Hu Tao", - "amountList": [ - { - "value": 2, - "chance": 50 - }, - { - "value": 3, - "chance": 50 - } - ] - }, - { - "avatarId": 10000047, - "name": "Kaedehara Kazuha", - "amountList": [ - { - "value": 3, - "chance": 50 - }, - { - "value": 4, - "chance": 50 - } - ] - }, - { - "avatarId": 10000048, - "name": "Yanfei", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000049, - "name": "Yoimiya", - "amountList": [ - { - "value": 1, - "chance": 100 - } - ] - }, - { - "avatarId": 10000050, - "name": "Thoma", - "amountList": [ - { - "value": 3, - "chance": 50 - }, - { - "value": 4, - "chance": 50 - } - ] - }, - { - "avatarId": 10000051, - "name": "Eula", - "amountList": [ - { - "value": 1, - "chance": 50 - }, - { - "value": 2, - "chance": 50 - } - ] - }, - { - "avatarId": 10000052, - "name": "Raiden Shogun", - "amountList": [ - { - "value": 0, - "chance": 50 - }, - { - "value": 1, - "chance": 50 - } - ] - }, - { - "avatarId": 10000053, - "name": "Sayu", - "amountList": [ - { - "value": 2, - "chance": 100 - } - ] - }, - { - "avatarId": 10000054, - "name": "Sangonomiya Kokomi", - "amountList": [ - { - "value": 0, - "chance": 33 - }, - { - "value": 1, - "chance": 67 - } - ] - }, - { - "avatarId": 10000055, - "name": "Gorou", - "amountList": [ - { - "value": 2, - "chance": 100 - } - ] - }, - { - "avatarId": 10000056, - "name": "Kujou Sara", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000057, - "name": "Arataki Itto", - "amountList": [ - { - "value": 3, - "chance": 50 - }, - { - "value": 4, - "chance": 50 - } - ] - }, - { - "avatarId": 10000058, - "name": "Yae Miko", - "amountList": [ - { - "value": 1, - "chance": 100 - } - ] - }, - { - "avatarId": 10000062, - "name": "Aloy", - "amountList": [ - { - "value": 5, - "chance": 100 - } - ] - }, - { - "avatarId": 10000063, - "name": "Shenhe", - "amountList": [ - { - "value": 3, - "chance": 100 - } - ] - }, - { - "avatarId": 10000064, - "name": "Yun Jin", - "amountList": [ - { - "value": 2, - "chance": 100 - } - ] - }, - { - "avatarId": 10000066, - "name": "Kamisato Ayato", - "amountList": [ - { - "value": 1, - "chance": 50 - }, - { - "value": 2, - "chance": 50 - } - ] - } + { + "avatarId": 10000002, + "name": "Kamisato Ayaka", + "amountList": [ + { + "value": 4, + "chance": 50 + }, + { + "value": 5, + "chance": 50 + } + ] + }, + { + "avatarId": 10000003, + "name": "Jean", + "amountList": [ + { + "value": 2, + "chance": 33 + }, + { + "value": 3, + "chance": 67 + } + ] + }, + { + "avatarId": 10000005, + "name": "Traveler", + "amountList": [ + { + "value": 3, + "chance": 67 + }, + { + "value": 4, + "chance": 33 + } + ] + }, + { + "avatarId": 10000006, + "name": "Lisa", + "amountList": [ + { + "value": 5, + "chance": 100 + } + ] + }, + { + "avatarId": 10000007, + "name": "Traveler", + "amountList": [ + { + "value": 3, + "chance": 67 + }, + { + "value": 4, + "chance": 33 + } + ] + }, + { + "avatarId": 10000014, + "name": "Barbara", + "amountList": [ + { + "value": 0, + "chance": 100 + } + ] + }, + { + "avatarId": 10000015, + "name": "Kaeya", + "amountList": [ + { + "value": 2, + "chance": 33 + }, + { + "value": 3, + "chance": 67 + } + ] + }, + { + "avatarId": 10000016, + "name": "Diluc", + "amountList": [ + { + "value": 1, + "chance": 33 + }, + { + "value": 2, + "chance": 67 + } + ] + }, + { + "avatarId": 10000020, + "name": "Razor", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000021, + "name": "Amber", + "amountList": [ + { + "value": 4, + "chance": 100 + } + ] + }, + { + "avatarId": 10000022, + "name": "Venti", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000023, + "name": "Xiangling", + "amountList": [ + { + "value": 1, + "chance": 100 + } + ] + }, + { + "avatarId": 10000024, + "name": "Beidou", + "amountList": [ + { + "value": 2, + "chance": 100 + } + ] + }, + { + "avatarId": 10000025, + "name": "Xingqiu", + "amountList": [ + { + "value": 5, + "chance": 100 + } + ] + }, + { + "avatarId": 10000026, + "name": "Xiao", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000027, + "name": "Ningguang", + "amountList": [ + { + "value": 3, + "chance": 33 + }, + { + "value": 4, + "chance": 67 + } + ] + }, + { + "avatarId": 10000029, + "name": "Klee", + "amountList": [ + { + "value": 4, + "chance": 100 + } + ] + }, + { + "avatarId": 10000030, + "name": "Zhongli", + "amountList": [ + { + "value": 0, + "chance": 50 + }, + { + "value": 1, + "chance": 50 + } + ] + }, + { + "avatarId": 10000031, + "name": "Fischl", + "amountList": [ + { + "value": 0, + "chance": 33 + }, + { + "value": 1, + "chance": 67 + } + ] + }, + { + "avatarId": 10000032, + "name": "Bennett", + "amountList": [ + { + "value": 2, + "chance": 75 + }, + { + "value": 3, + "chance": 25 + } + ] + }, + { + "avatarId": 10000033, + "name": "Tartaglia", + "amountList": [ + { + "value": 1, + "chance": 100 + } + ] + }, + { + "avatarId": 10000034, + "name": "Noelle", + "amountList": [ + { + "value": 0, + "chance": 100 + } + ] + }, + { + "avatarId": 10000035, + "name": "Qiqi", + "amountList": [ + { + "value": 0, + "chance": 100 + } + ] + }, + { + "avatarId": 10000036, + "name": "Chongyun", + "amountList": [ + { + "value": 4, + "chance": 100 + } + ] + }, + { + "avatarId": 10000037, + "name": "Ganyu", + "amountList": [ + { + "value": 2, + "chance": 100 + } + ] + }, + { + "avatarId": 10000038, + "name": "Albedo", + "amountList": [ + { + "value": 0, + "chance": 33 + }, + { + "value": 1, + "chance": 67 + } + ] + }, + { + "avatarId": 10000039, + "name": "Diona", + "amountList": [ + { + "value": 0, + "chance": 20 + }, + { + "value": 1, + "chance": 80 + } + ] + }, + { + "avatarId": 10000041, + "name": "Mona", + "amountList": [ + { + "value": 3, + "chance": 67 + }, + { + "value": 4, + "chance": 33 + } + ] + }, + { + "avatarId": 10000042, + "name": "Keqing", + "amountList": [ + { + "value": 2, + "chance": 50 + }, + { + "value": 3, + "chance": 50 + } + ] + }, + { + "avatarId": 10000043, + "name": "Sucrose", + "amountList": [ + { + "value": 4, + "chance": 100 + } + ] + }, + { + "avatarId": 10000044, + "name": "Xinyan", + "amountList": [ + { + "value": 4, + "chance": 100 + } + ] + }, + { + "avatarId": 10000045, + "name": "Rosaria", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000046, + "name": "Hu Tao", + "amountList": [ + { + "value": 2, + "chance": 50 + }, + { + "value": 3, + "chance": 50 + } + ] + }, + { + "avatarId": 10000047, + "name": "Kaedehara Kazuha", + "amountList": [ + { + "value": 3, + "chance": 50 + }, + { + "value": 4, + "chance": 50 + } + ] + }, + { + "avatarId": 10000048, + "name": "Yanfei", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000049, + "name": "Yoimiya", + "amountList": [ + { + "value": 1, + "chance": 100 + } + ] + }, + { + "avatarId": 10000050, + "name": "Thoma", + "amountList": [ + { + "value": 3, + "chance": 50 + }, + { + "value": 4, + "chance": 50 + } + ] + }, + { + "avatarId": 10000051, + "name": "Eula", + "amountList": [ + { + "value": 1, + "chance": 50 + }, + { + "value": 2, + "chance": 50 + } + ] + }, + { + "avatarId": 10000052, + "name": "Raiden Shogun", + "amountList": [ + { + "value": 0, + "chance": 50 + }, + { + "value": 1, + "chance": 50 + } + ] + }, + { + "avatarId": 10000053, + "name": "Sayu", + "amountList": [ + { + "value": 2, + "chance": 100 + } + ] + }, + { + "avatarId": 10000054, + "name": "Sangonomiya Kokomi", + "amountList": [ + { + "value": 0, + "chance": 33 + }, + { + "value": 1, + "chance": 67 + } + ] + }, + { + "avatarId": 10000055, + "name": "Gorou", + "amountList": [ + { + "value": 2, + "chance": 100 + } + ] + }, + { + "avatarId": 10000056, + "name": "Kujou Sara", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000057, + "name": "Arataki Itto", + "amountList": [ + { + "value": 3, + "chance": 50 + }, + { + "value": 4, + "chance": 50 + } + ] + }, + { + "avatarId": 10000058, + "name": "Yae Miko", + "amountList": [ + { + "value": 1, + "chance": 100 + } + ] + }, + { + "avatarId": 10000062, + "name": "Aloy", + "amountList": [ + { + "value": 5, + "chance": 100 + } + ] + }, + { + "avatarId": 10000063, + "name": "Shenhe", + "amountList": [ + { + "value": 3, + "chance": 100 + } + ] + }, + { + "avatarId": 10000064, + "name": "Yun Jin", + "amountList": [ + { + "value": 2, + "chance": 100 + } + ] + }, + { + "avatarId": 10000066, + "name": "Kamisato Ayato", + "amountList": [ + { + "value": 1, + "chance": 50 + }, + { + "value": 2, + "chance": 50 + } + ] + } ] \ No newline at end of file