diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java index 1aac73cdf..436bd69ed 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerWorldSceneInfoListNotify.java @@ -30,10 +30,10 @@ public class PacketPlayerWorldSceneInfoListNotify extends BasePacket { .addSceneTagIdList(102) .addSceneTagIdList(113) .addSceneTagIdList(117) - .addSceneTagIdList(1093) // Vanarana (real) - //.addSceneTagIdList(1094) // Vanarana (dream)) - //.addSceneTagIdList(1095) // Vanarana (first)) - //.addSceneTagIdList(1096) // Vanarana (festival)) + .addSceneTagIdList(1093) + //.addSceneTagIdList(1094) + //.addSceneTagIdList(1095) + //.addSceneTagIdList(1096) //.addAllSceneTagIdList(IntStream.range(1000, 2000).boxed().collect(Collectors.toList())) .build() ) diff --git a/src/main/resources/defaults/data/ReliquaryDecompose.json b/src/main/resources/defaults/data/ReliquaryDecompose.json index a9aa8ba44..5277ba9bc 100644 --- a/src/main/resources/defaults/data/ReliquaryDecompose.json +++ b/src/main/resources/defaults/data/ReliquaryDecompose.json @@ -1,72 +1,58 @@ [ { "configId": 1, - "comment": "Gladiator", "items": [75513, 75514, 75523, 75524, 75533, 75534, 75543, 75544, 75553, 75554] }, { "configId": 2, - "comment": "Wanderer's Troupe", "items": [77513, 77514, 77523, 77524, 77533, 77534, 77543, 77544, 77553, 77554] }, { "configId": 3, - "comment": "Bloodstained", "items": [82513, 82514, 82523, 82524, 82533, 82534, 82543, 82544, 82553, 82554] }, { "configId": 4, - "comment": "Noblesse", "items": [81513, 81514, 81523, 81524, 81533, 81534, 81543, 81544, 81553, 81554] }, { "configId": 5, - "comment": "Thundering Fury", "items": [ 79513, 79514, 79523, 79524, 79533, 79534, 79543, 79544, 79553, 79554 ] }, { "configId": 6, - "comment": "Thundersoother", "items": [ 72513, 72514, 72523, 72524, 72533, 72534, 72543, 72544, 72553, 72554 ] }, { "configId": 7, - "comment": "Viridescent Venerer", "items": [ 76513, 76514, 76523, 76524, 76533, 76534, 76543, 76544, 76553, 76554 ] }, { "configId": 8, - "comment": "Maiden Beloved", "items": [ 74513, 74514, 74523, 74524, 74533, 74534, 74543, 74544, 74553, 74554 ] }, { "configId": 9, - "comment": "Archaic Petra", "items": [ 88513, 88514, 88523, 88524, 88533, 88534, 88543, 88544, 88553, 88554 ] }, { "configId": 10, - "comment": "Archaic Petra", "items": [ 89513, 89514, 89523, 89524, 89533, 89534, 89543, 89544, 89553, 89554 ] }, { "configId": 11, - "comment": "Crimson Witch of Flames", "items": [ 80513, 80514, 80523, 80524, 80533, 80534, 80543, 80544, 80553, 80554 ] }, { "configId": 12, - "comment": "Lavawalker", "items": [ 73513, 73514, 73523, 73524, 73533, 73534, 73543, 73544, 73553, 73554 ] }, { "configId": 13, - "comment": "Blizzard Strayer", "items": [ 71513, 71514, 71523, 71524, 71533, 71534, 71543, 71544, 71553, 71554 ] }, { "configId": 14, - "comment": "Heart of Depth", "items": [ 90513, 90514, 90523, 90524, 90533, 90534, 90543, 90544, 90553, 90554 ] } ] diff --git a/src/main/resources/defaults/data/SkillParticleGeneration.json b/src/main/resources/defaults/data/SkillParticleGeneration.json index 69c94b447..42520e11a 100644 --- a/src/main/resources/defaults/data/SkillParticleGeneration.json +++ b/src/main/resources/defaults/data/SkillParticleGeneration.json @@ -1,7 +1,6 @@ [ { "avatarId": 10000002, - "name": "Kamisato Ayaka", "amountList": [ { "value": 4, @@ -15,7 +14,6 @@ }, { "avatarId": 10000003, - "name": "Jean", "amountList": [ { "value": 2, @@ -29,7 +27,6 @@ }, { "avatarId": 10000005, - "name": "Traveler", "amountList": [ { "value": 3, @@ -43,7 +40,6 @@ }, { "avatarId": 10000006, - "name": "Lisa", "amountList": [ { "value": 5, @@ -53,7 +49,6 @@ }, { "avatarId": 10000007, - "name": "Traveler", "amountList": [ { "value": 3, @@ -67,7 +62,6 @@ }, { "avatarId": 10000014, - "name": "Barbara", "amountList": [ { "value": 0, @@ -77,7 +71,6 @@ }, { "avatarId": 10000015, - "name": "Kaeya", "amountList": [ { "value": 2, @@ -91,7 +84,6 @@ }, { "avatarId": 10000016, - "name": "Diluc", "amountList": [ { "value": 1, @@ -105,7 +97,6 @@ }, { "avatarId": 10000020, - "name": "Razor", "amountList": [ { "value": 3, @@ -115,7 +106,6 @@ }, { "avatarId": 10000021, - "name": "Amber", "amountList": [ { "value": 4, @@ -125,7 +115,6 @@ }, { "avatarId": 10000022, - "name": "Venti", "amountList": [ { "value": 3, @@ -135,7 +124,6 @@ }, { "avatarId": 10000023, - "name": "Xiangling", "amountList": [ { "value": 1, @@ -145,7 +133,6 @@ }, { "avatarId": 10000024, - "name": "Beidou", "amountList": [ { "value": 2, @@ -155,7 +142,6 @@ }, { "avatarId": 10000025, - "name": "Xingqiu", "amountList": [ { "value": 5, @@ -165,7 +151,6 @@ }, { "avatarId": 10000026, - "name": "Xiao", "amountList": [ { "value": 3, @@ -175,7 +160,6 @@ }, { "avatarId": 10000027, - "name": "Ningguang", "amountList": [ { "value": 3, @@ -189,7 +173,6 @@ }, { "avatarId": 10000029, - "name": "Klee", "amountList": [ { "value": 4, @@ -199,7 +182,6 @@ }, { "avatarId": 10000030, - "name": "Zhongli", "amountList": [ { "value": 1, @@ -209,7 +191,6 @@ }, { "avatarId": 10000031, - "name": "Fischl", "amountList": [ { "value": 1, @@ -219,7 +200,6 @@ }, { "avatarId": 10000032, - "name": "Bennett", "amountList": [ { "value": 2, @@ -233,7 +213,6 @@ }, { "avatarId": 10000033, - "name": "Tartaglia", "amountList": [ { "value": 1, @@ -243,7 +222,6 @@ }, { "avatarId": 10000034, - "name": "Noelle", "amountList": [ { "value": 0, @@ -253,7 +231,6 @@ }, { "avatarId": 10000035, - "name": "Qiqi", "amountList": [ { "value": 0, @@ -263,7 +240,6 @@ }, { "avatarId": 10000036, - "name": "Chongyun", "amountList": [ { "value": 4, @@ -273,7 +249,6 @@ }, { "avatarId": 10000037, - "name": "Ganyu", "amountList": [ { "value": 2, @@ -283,7 +258,6 @@ }, { "avatarId": 10000038, - "name": "Albedo", "amountList": [ { "value": 1, @@ -293,7 +267,6 @@ }, { "avatarId": 10000039, - "name": "Diona", "amountList": [ { "value": 1, @@ -303,7 +276,6 @@ }, { "avatarId": 10000041, - "name": "Mona", "amountList": [ { "value": 3, @@ -317,7 +289,6 @@ }, { "avatarId": 10000042, - "name": "Keqing", "amountList": [ { "value": 2, @@ -331,7 +302,6 @@ }, { "avatarId": 10000043, - "name": "Sucrose", "amountList": [ { "value": 4, @@ -341,7 +311,6 @@ }, { "avatarId": 10000044, - "name": "Xinyan", "amountList": [ { "value": 4, @@ -351,7 +320,6 @@ }, { "avatarId": 10000045, - "name": "Rosaria", "amountList": [ { "value": 3, @@ -361,7 +329,6 @@ }, { "avatarId": 10000046, - "name": "Hu Tao", "amountList": [ { "value": 2, @@ -375,7 +342,6 @@ }, { "avatarId": 10000047, - "name": "Kaedehara Kazuha", "amountList": [ { "value": 3, @@ -389,7 +355,6 @@ }, { "avatarId": 10000048, - "name": "Yanfei", "amountList": [ { "value": 3, @@ -399,7 +364,6 @@ }, { "avatarId": 10000049, - "name": "Yoimiya", "amountList": [ { "value": 1, @@ -409,7 +373,6 @@ }, { "avatarId": 10000050, - "name": "Thoma", "amountList": [ { "value": 3, @@ -423,7 +386,6 @@ }, { "avatarId": 10000051, - "name": "Eula", "amountList": [ { "value": 1, @@ -437,7 +399,6 @@ }, { "avatarId": 10000052, - "name": "Raiden Shogun", "amountList": [ { "value": 1, @@ -447,7 +408,6 @@ }, { "avatarId": 10000053, - "name": "Sayu", "amountList": [ { "value": 2, @@ -457,7 +417,6 @@ }, { "avatarId": 10000054, - "name": "Sangonomiya Kokomi", "amountList": [ { "value": 1, @@ -467,7 +426,6 @@ }, { "avatarId": 10000055, - "name": "Gorou", "amountList": [ { "value": 2, @@ -477,7 +435,6 @@ }, { "avatarId": 10000056, - "name": "Kujou Sara", "amountList": [ { "value": 3, @@ -487,7 +444,6 @@ }, { "avatarId": 10000057, - "name": "Arataki Itto", "amountList": [ { "value": 3, @@ -501,7 +457,6 @@ }, { "avatarId": 10000058, - "name": "Yae Miko", "amountList": [ { "value": 1, @@ -511,7 +466,6 @@ }, { "avatarId": 10000060, - "name": "Yelan", "amountList": [ { "value": 4, @@ -521,7 +475,6 @@ }, { "avatarId": 10000062, - "name": "Aloy", "amountList": [ { "value": 5, @@ -531,7 +484,6 @@ }, { "avatarId": 10000063, - "name": "Shenhe", "amountList": [ { "value": 3, @@ -541,7 +493,6 @@ }, { "avatarId": 10000064, - "name": "Yun Jin", "amountList": [ { "value": 2, @@ -551,7 +502,6 @@ }, { "avatarId": 10000065, - "name": "Kuki Shinobu", "amountList": [ { "value": 1, @@ -561,7 +511,6 @@ }, { "avatarId": 10000066, - "name": "Kamisato Ayato", "amountList": [ { "value": 1, @@ -575,7 +524,6 @@ }, { "avatarId": 10000067, - "name": "Collei", "amountList": [ { "value": 3, @@ -585,7 +533,6 @@ }, { "avatarId": 10000068, - "name": "Dori", "amountList": [ { "value": 2, @@ -595,7 +542,6 @@ }, { "avatarId": 10000069, - "name": "Tighnari", "amountList": [ { "value": 3,