diff --git a/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json b/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json index c3cff7c33..ca72470c5 100644 --- a/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json @@ -4,8 +4,8 @@ { "description": { "identifier": "geometry.secondary_cataclysm", - "texture_width": 64, - "texture_height": 64, + "texture_width": 128, + "texture_height": 128, "visible_bounds_width": 4, "visible_bounds_height": 3, "visible_bounds_offset": [0, 0.5, 0] @@ -285,6 +285,53 @@ } ] }, + { + "name": "tex5_illuminated", + "parent": "bone21", + "pivot": [4.03863, -1.14504, -6.93633], + "cubes": [ + { + "origin": [3.57151, -1.33835, -7.0045], + "size": [0.93425, 0.38663, 0.13635], + "pivot": [4.03863, -1.14504, -5.3784], + "rotation": [0, 0, -22.5], + "uv": { + "east": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]}, + "west": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]} + } + }, + { + "origin": [3.57151, -1.33835, -7.0045], + "size": [0.93425, 0.38663, 0.13635], + "pivot": [4.03863, -1.14504, -5.3784], + "rotation": [0, 0, 22.5], + "uv": { + "east": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]}, + "west": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]} + } + }, + { + "origin": [3.5715, -1.33835, -7.0045], + "size": [0.93425, 0.38663, 0.13635], + "pivot": [4.03863, -1.14504, -5.3784], + "rotation": [0, 0, -112.5], + "uv": { + "east": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]}, + "west": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]} + } + }, + { + "origin": [3.57151, -1.33835, -7.0045], + "size": [0.93425, 0.38663, 0.13635], + "pivot": [4.03863, -1.14504, -5.3784], + "rotation": [0, 0, -67.5], + "uv": { + "east": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]}, + "west": {"uv": [25, 12.5], "uv_size": [0.25, 0.25]} + } + } + ] + }, { "name": "zhuanlun", "parent": "dangu", @@ -4465,6 +4512,16 @@ "up": {"uv": [16, 45], "uv_size": [0.5, 4.5]} } }, + { + "origin": [-0.858, 0.09932, -15.60483], + "size": [0.216, 1, 4.5], + "uv": { + "north": {"uv": [3.5, 55], "uv_size": [-0.5, 1]}, + "east": {"uv": [34.5, 7], "uv_size": [-4.5, 1]}, + "west": {"uv": [33.5, 25], "uv_size": [-4.5, 1]}, + "up": {"uv": [16.5, 45], "uv_size": [-0.5, 4.5]} + } + }, { "origin": [-0.675, 0.04932, -15.35483], "size": [1.35, 0.9, 0.5], @@ -4474,16 +4531,6 @@ "up": {"uv": [14, 53], "uv_size": [1.5, 0.5]} } }, - { - "origin": [-0.858, 0.09932, -15.60483], - "size": [0.216, 1, 4.5], - "uv": { - "north": {"uv": [55, 3], "uv_size": [0.5, 1]}, - "east": {"uv": [8, 30], "uv_size": [4.5, 1]}, - "west": {"uv": [30, 8], "uv_size": [4.5, 1]}, - "up": {"uv": [17, 45], "uv_size": [0.5, 4.5]} - } - }, { "origin": [-0.858, -0.56268, -11.10483], "size": [1.716, 1.662, 2.344], @@ -4599,6 +4646,75 @@ } ] }, + { + "name": "tex2_illuminated", + "parent": "body", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-0.64628, -1.75068, -15.60583], + "size": [1.296, 1.188, 6.595], + "uv": { + "east": {"uv": [12.25, 63.125], "uv_size": [-6.5, 1]}, + "west": {"uv": [5.75, 63.125], "uv_size": [6.5, 1]} + } + }, + { + "origin": [-0.858, -0.56268, -15.60483], + "size": [1.716, 0.662, 4.5], + "uv": { + "east": {"uv": [4.5, 63.875], "uv_size": [-4.5, 0.5]}, + "west": {"uv": [0, 63.875], "uv_size": [4.5, 0.5]} + } + }, + { + "origin": [0.642, 0.09932, -15.60483], + "size": [0.216, 1, 4.5], + "uv": { + "west": {"uv": [0, 62.875], "uv_size": [4.5, 1]} + } + }, + { + "origin": [-0.858, 0.09932, -15.60483], + "size": [0.216, 1, 4.5], + "uv": { + "east": {"uv": [4.5, 62.875], "uv_size": [-4.5, 1]} + } + }, + { + "origin": [-1.02032, 1.03928, -10.89558], + "size": [2.04175, 0.916, 6.5], + "uv": { + "east": {"uv": [42.5, 61.625], "uv_size": [-6.5, 1]}, + "west": {"uv": [36, 61.625], "uv_size": [6.5, 1]} + } + }, + { + "origin": [-1.02087, 1.03928, -4.39458], + "size": [2.04175, 0.916, 0.655], + "uv": { + "east": {"uv": [43, 61.625], "uv_size": [-0.5, 1]}, + "west": {"uv": [42.5, 61.625], "uv_size": [0.5, 1]} + } + }, + { + "origin": [-1.02087, 1.03928, -3.73958], + "size": [2.04175, 0.916, 8.335], + "uv": { + "east": {"uv": [51.5, 61.625], "uv_size": [-8.5, 1]}, + "west": {"uv": [43, 61.625], "uv_size": [8.5, 1]} + } + }, + { + "origin": [-1.02087, 1.03928, 4.59542], + "size": [2.04175, 0.916, 1.25], + "uv": { + "east": {"uv": [53, 61.625], "uv_size": [-1.5, 1]}, + "west": {"uv": [51.5, 61.625], "uv_size": [1.5, 1]} + } + } + ] + }, { "name": "tuo", "parent": "body", @@ -5332,6 +5448,29 @@ } ] }, + { + "name": "tex_illuminated", + "parent": "banji", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-0.858, -0.56268, -3.80483], + "size": [1.716, 1.612, 12.55], + "uv": { + "east": {"uv": [23.5, 62], "uv_size": [12.5, 1.5]}, + "west": {"uv": [36, 62], "uv_size": [-12.5, 1.5]} + } + }, + { + "origin": [-0.648, -2.71468, 4.48917], + "size": [1.296, 1.944, 3.78], + "uv": { + "east": {"uv": [57, 61.75], "uv_size": [4, 2]}, + "west": {"uv": [53, 61.75], "uv_size": [4, 2]} + } + } + ] + }, { "name": "group9", "parent": "banji", @@ -6161,6 +6300,31 @@ } ] }, + { + "name": "tex6_illuminated", + "parent": "sanre", + "pivot": [0.9064, 1.60279, -13.34133], + "cubes": [ + { + "origin": [0.7164, 1.54779, -15.53933], + "size": [0.83, 0.11, 4.396], + "pivot": [0.9064, 1.60279, -13.34133], + "rotation": [0, 0, 90], + "uv": { + "up": {"uv": [62, 28.75], "uv_size": [1, 4.5]} + } + }, + { + "origin": [-1.5464, 1.54779, -15.53933], + "size": [0.83, 0.11, 4.396], + "pivot": [-0.9064, 1.60279, -13.34133], + "rotation": [0, 0, -90], + "uv": { + "up": {"uv": [63, 28.75], "uv_size": [-1, 4.5]} + } + } + ] + }, { "name": "bone43", "parent": "sanre", @@ -7445,6 +7609,31 @@ } ] }, + { + "name": "tex3_illuminated", + "parent": "woba", + "pivot": [0, 0, 0], + "cubes": [ + { + "origin": [-0.71, -9.71079, -1.35833], + "size": [1.42, 3.828, 1.36], + "pivot": [0.83217, 0.12889, -7.53088], + "rotation": [22.5, 0, 0], + "uv": { + "east": {"uv": [61.875, 25.5], "uv_size": [1.5, 4]}, + "west": {"uv": [63.375, 25.5], "uv_size": [-1.5, 4]} + } + }, + { + "origin": [-0.71, -3.06305, 0.47238], + "size": [1.42, 2.978, 1.31], + "uv": { + "east": {"uv": [63.375, 22.125], "uv_size": [-1.5, 3]}, + "west": {"uv": [61.875, 22.125], "uv_size": [1.5, 3]} + } + } + ] + }, { "name": "qianwoba", "parent": "body", @@ -7652,20 +7841,20 @@ "origin": [1.40572, 3.06332, -12.95283], "size": [0.756, 0.216, 0.216], "uv": { - "north": {"uv": [13, 54], "uv_size": [1, 0.5]}, - "south": {"uv": [14, 54], "uv_size": [1, 0.5]}, - "up": {"uv": [54, 14], "uv_size": [1, 0.5]}, - "down": {"uv": [15, 54.5], "uv_size": [1, -0.5]} + "north": {"uv": [54, 9], "uv_size": [1, 0.5]}, + "south": {"uv": [10, 54], "uv_size": [1, 0.5]}, + "up": {"uv": [11, 54], "uv_size": [1, 0.5]}, + "down": {"uv": [12, 54.5], "uv_size": [1, -0.5]} } }, { "origin": [1.40572, 4.03532, -12.95283], "size": [0.756, 0.216, 0.216], "uv": { - "north": {"uv": [54, 15], "uv_size": [1, 0.5]}, - "south": {"uv": [16, 54], "uv_size": [1, 0.5]}, - "up": {"uv": [17, 54], "uv_size": [1, 0.5]}, - "down": {"uv": [54, 17.5], "uv_size": [1, -0.5]} + "north": {"uv": [54, 9], "uv_size": [1, 0.5]}, + "south": {"uv": [10, 54], "uv_size": [1, 0.5]}, + "up": {"uv": [11, 54], "uv_size": [1, 0.5]}, + "down": {"uv": [12, 54.5], "uv_size": [1, -0.5]} } }, { @@ -7726,7 +7915,50 @@ ] }, { - "name": "scrrren_illuminated", + "name": "tex4_illuminated", + "parent": "zhaomen", + "pivot": [0, 4, 0], + "cubes": [ + { + "origin": [1.95572, 4.13532, -12.95783], + "size": [0.106, 0.121, 0.226], + "uv": { + "north": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "east": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "south": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "west": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "up": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]}, + "down": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]} + } + }, + { + "origin": [1.95572, 3.16032, -12.95783], + "size": [0.106, 0.121, 0.226], + "uv": { + "north": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "east": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "south": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "west": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "up": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]}, + "down": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]} + } + }, + { + "origin": [1.95572, 2.29532, -12.95783], + "size": [0.106, 0.121, 0.226], + "uv": { + "north": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "east": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "south": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "west": {"uv": [59.75, 62.125], "uv_size": [0.125, 0.125]}, + "up": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]}, + "down": {"uv": [59.875, 62.25], "uv_size": [-0.125, -0.125]} + } + } + ] + }, + { + "name": "screen", "parent": "body", "pivot": [0, 0, 0], "cubes": [ @@ -7744,6 +7976,20 @@ } ] }, + { + "name": "screen_illuminated", + "parent": "screen", + "pivot": [0.97384, -2.08681, -13.43244], + "cubes": [ + { + "origin": [0.54172, -0.66268, -0.26283], + "size": [0.54, 1.728, 1.62], + "uv": { + "west": {"uv": [22, 62], "uv_size": [1.5, 1.5]} + } + } + ] + }, { "name": "cidao", "parent": "body", @@ -7855,6 +8101,20 @@ } ] }, + { + "name": "bone67", + "parent": "cidao", + "pivot": [0, 4, 0], + "cubes": [ + { + "origin": [0.74972, -1.85068, -14.90883], + "size": [0.498, 0.864, 1.262], + "uv": { + "west": {"uv": [12, 63.125], "uv_size": [1.5, 1]} + } + } + ] + }, { "name": "flare", "parent": "0", diff --git a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png index 9a5ad2270..4a90d989b 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png and b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_e.png b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_e.png deleted file mode 100644 index 1fec264fa..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_e.png and /dev/null differ