diff --git a/api.lua b/api.lua index 9c96435..56dc988 100644 --- a/api.lua +++ b/api.lua @@ -1927,7 +1927,6 @@ minetest.register_entity(name, { and math.random(1, 100) <= 60 then self.timer = 0 - minetest.chat_send_all("Sparo!") set_animation(self, "dattack") --NSSM modification -- play shoot attack sound diff --git a/darts.lua b/darts.lua index 0c97c5a..c206ade 100644 --- a/darts.lua +++ b/darts.lua @@ -186,12 +186,15 @@ nssm:register_arrow("nssm:phoenix_arrow", { self.timer = os.time() end - if os.time() - self.timer > 7 or minetest.is_protected(pos, "") or ((n~="air") and (n~="fire:basic_flame")) then + if os.time() - self.timer > 5 or minetest.is_protected(pos, "") or ((n~="air") and (n~="fire:basic_flame")) then self.object:remove() end - minetest.env:set_node(pos, {name="fire:basic_flame"}) - if math.random(1,3)==1 then + if math.random(1,2)==2 then + minetest.env:set_node(pos, {name="fire:basic_flame"}) + end + + if math.random(1,6)==1 then dx = math.random(-1,1) dy = math.random(-1,1) dz = math.random(-1,1) diff --git a/models/masticone.x b/models/masticone.x index dbe6775..24afe80 100644 --- a/models/masticone.x +++ b/models/masticone.x @@ -147,20 +147,13 @@ Frame Root { } Frame Armature_Bone_010 { FrameTransformMatrix { -<<<<<<< HEAD 0.881380, 0.465344,-0.081383, 0.000000, -0.472402, 0.867390,-0.156432, 0.000000, -0.002204, 0.176322, 0.984330, 0.000000, -======= - 0.998305,-0.049942,-0.029873, 0.000000, - 0.052052, 0.995854, 0.074607, 0.000000, - 0.026023,-0.076036, 0.996765, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d -0.000000, 0.337279, 0.000000, 1.000000;; } Frame Armature_Bone_013 { FrameTransformMatrix { -<<<<<<< HEAD 0.940590,-0.256939,-0.221976, 0.000000, -0.023686, 0.602501,-0.797766, 0.000000, 0.338718, 0.755628, 0.560621, 0.000000, @@ -172,19 +165,6 @@ Frame Root { -0.788258, 0.608608,-0.090802, 0.000000, -0.544758,-0.621575, 0.562923, 0.000000, -0.000000, 0.717308,-0.000000, 1.000000;; -======= - 0.637689, 0.649642,-0.413906, 0.000000, - -0.346187,-0.238310,-0.907393, 0.000000, - -0.688119, 0.721924, 0.072930, 0.000000, - 0.000000, 0.699206, 0.000000, 1.000000;; - } - Frame Armature_Bone_016 { - FrameTransformMatrix { - 0.286159, 0.493193, 0.821507, 0.000000, - -0.788258, 0.608608,-0.090802, 0.000000, - -0.544759,-0.621576, 0.562923, 0.000000, - -0.000000, 0.717308, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_016 Frame Armature_Bone_019 { @@ -192,11 +172,7 @@ Frame Root { 0.779615,-0.128092, 0.613020, 0.000000, -0.308933, 0.772811, 0.554368, 0.000000, -0.544759,-0.621576, 0.562923, 0.000000, -<<<<<<< HEAD -0.000000, 0.717308,-0.000000, 1.000000;; -======= - -0.000000, 0.717308, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_019 } // End of Armature_Bone_013 @@ -211,28 +187,16 @@ Frame Root { } Frame Armature_Bone_025 { FrameTransformMatrix { -<<<<<<< HEAD 0.610441,-0.617878,-0.495569, 0.000000, 0.570323, 0.777052,-0.266311, 0.000000, 0.549631,-0.120067, 0.826735, 0.000000, -======= - 0.654596,-0.553406,-0.515020, 0.000000, - 0.509884, 0.826177,-0.239686, 0.000000, - 0.558142,-0.105703, 0.822985, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d -0.000000, 0.337917, 0.000000, 1.000000;; } Frame Armature_Bone_028 { FrameTransformMatrix { -<<<<<<< HEAD 0.945093, 0.187293, 0.267805, 0.000000, 0.039799, 0.747414,-0.663165, 0.000000, -0.324367, 0.637411, 0.698922, 0.000000, -======= - 0.963152, 0.010964, 0.268734, 0.000000, - 0.168567, 0.753972,-0.634911, 0.000000, - -0.209579, 0.656816, 0.724341, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 0.000000, 0.696020, 0.000000, 1.000000;; } Frame Armature_Bone_031 { @@ -240,25 +204,15 @@ Frame Root { 0.764100,-0.548141,-0.340136, 0.000000, 0.644544, 0.670551, 0.367322, 0.000000, 0.026734,-0.499903, 0.865669, 0.000000, -<<<<<<< HEAD -0.000000, 0.687858, 0.000000, 1.000000;; -======= - 0.000000, 0.687857,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_031 Frame Armature_Bone_034 { FrameTransformMatrix { 0.200109,-0.845774,-0.494594, 0.000000, -<<<<<<< HEAD 0.979409, 0.186450, 0.077424, 0.000000, 0.026735,-0.499903, 0.865669, 0.000000, -0.000000, 0.687858, 0.000000, 1.000000;; -======= - 0.979409, 0.186451, 0.077423, 0.000000, - 0.026735,-0.499903, 0.865669, 0.000000, - 0.000000, 0.687857,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_034 } // End of Armature_Bone_028 @@ -283,15 +237,9 @@ Frame Root { } Frame Armature_Bone_009 { FrameTransformMatrix { -<<<<<<< HEAD 0.358592, 0.737777, 0.571924, 0.000000, -0.445810, 0.673635,-0.589465, 0.000000, -0.820162,-0.043592, 0.570469, 0.000000, -======= - 0.069917, 0.790557, 0.608384, 0.000000, - -0.665814, 0.491131,-0.561678, 0.000000, - -0.742835,-0.365800, 0.560702, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d -0.000000, 0.337279,-0.000000, 1.000000;; } Frame Armature_Bone_012 { @@ -299,22 +247,14 @@ Frame Root { 0.917225, 0.325005,-0.230369, 0.000000, -0.071817, 0.703710, 0.706848, 0.000000, 0.391842,-0.631794, 0.668801, 0.000000, -<<<<<<< HEAD 0.000000, 0.699206,-0.000000, 1.000000;; -======= - 0.000000, 0.699206, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } Frame Armature_Bone_015 { FrameTransformMatrix { 0.799654, 0.554937,-0.229341, 0.000000, -0.523419, 0.831379, 0.186660, 0.000000, 0.294254,-0.029222, 0.955280, 0.000000, -<<<<<<< HEAD -0.000000, 0.717308,-0.000000, 1.000000;; -======= - 0.000000, 0.717308, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_015 Frame Armature_Bone_018 { @@ -322,11 +262,7 @@ Frame Root { 0.922187,-0.253791,-0.291824, 0.000000, 0.250969, 0.966818,-0.047731, 0.000000, 0.294254,-0.029222, 0.955280, 0.000000, -<<<<<<< HEAD -0.000000, 0.717308,-0.000000, 1.000000;; -======= - 0.000000, 0.717308, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_018 } // End of Armature_Bone_012 @@ -341,20 +277,13 @@ Frame Root { } Frame Armature_Bone_024 { FrameTransformMatrix { -<<<<<<< HEAD 0.825945,-0.562247, 0.041157, 0.000000, 0.546860, 0.781322,-0.300801, 0.000000, 0.136968, 0.270952, 0.952799, 0.000000, -======= - 0.999323,-0.002804, 0.036691, 0.000000, - 0.016105, 0.929855,-0.367575, 0.000000, - -0.033087, 0.367917, 0.929270, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 0.000000, 0.337917,-0.000000, 1.000000;; } Frame Armature_Bone_027 { FrameTransformMatrix { -<<<<<<< HEAD 0.880759,-0.440862,-0.172926, 0.000000, 0.439507, 0.896947,-0.048169, 0.000000, 0.176342,-0.033577, 0.983756, 0.000000, @@ -366,34 +295,14 @@ Frame Root { 0.014045, 0.982799, 0.184144, 0.000000, -0.047541,-0.183297, 0.981907, 0.000000, -0.000000, 0.687857, 0.000000, 1.000000;; -======= - 0.014491,-0.909016,-0.416509, 0.000000, - 0.938707, 0.155849,-0.307474, 0.000000, - 0.344411,-0.386524, 0.855558, 0.000000, - 0.000000, 0.696021, 0.000000, 1.000000;; - } - Frame Armature_Bone_030 { - FrameTransformMatrix { - 0.998771,-0.022546, 0.044149, 0.000000, - 0.014045, 0.982799, 0.184144, 0.000000, - -0.047541,-0.183297, 0.981907, 0.000000, - -0.000000, 0.687858,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_030 Frame Armature_Bone_033 { FrameTransformMatrix { -<<<<<<< HEAD 0.775065,-0.626861,-0.079493, 0.000000, 0.630091, 0.757263, 0.171869, 0.000000, -0.047541,-0.183297, 0.981907, 0.000000, -0.000000, 0.687857, 0.000000, 1.000000;; -======= - 0.775065,-0.626862,-0.079493, 0.000000, - 0.630091, 0.757263, 0.171869, 0.000000, - -0.047541,-0.183297, 0.981907, 0.000000, - -0.000000, 0.687858,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_033 } // End of Armature_Bone_027 @@ -410,41 +319,24 @@ Frame Root { } Frame Armature_Bone_008 { FrameTransformMatrix { -<<<<<<< HEAD 0.893649, 0.448767, 0.000000, 0.000000, -0.408523, 0.813509,-0.413900, 0.000000, -0.185745, 0.369881, 0.910322, 0.000000, -======= - 0.970403,-0.239017, 0.034473, 0.000000, - 0.231851, 0.882198,-0.409843, 0.000000, - 0.067547, 0.405706, 0.911504, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 0.000000, 0.337279, 0.000000, 1.000000;; } Frame Armature_Bone_011 { FrameTransformMatrix { -<<<<<<< HEAD 0.570472, 0.820479,-0.037085, 0.000000, -0.816741, 0.561955,-0.130924, 0.000000, -0.086580, 0.104977, 0.990698, 0.000000, 0.000000, 0.699206,-0.000000, 1.000000;; -======= - -0.128459, 0.990892, 0.040397, 0.000000, - -0.896797,-0.098678,-0.431297, 0.000000, - -0.423382,-0.091632, 0.901305, 0.000000, - -0.000000, 0.699206, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } Frame Armature_Bone_014 { FrameTransformMatrix { 0.828834, 0.361432, 0.427085, 0.000000, -0.387525, 0.921442,-0.027734, 0.000000, -0.403558,-0.142519, 0.903786, 0.000000, -<<<<<<< HEAD 0.000000, 0.717308, 0.000000, 1.000000;; -======= - 0.000000, 0.717308,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_014 Frame Armature_Bone_017 { @@ -452,11 +344,7 @@ Frame Root { 0.839878,-0.449567, 0.304129, 0.000000, 0.362968, 0.881804, 0.301125, 0.000000, -0.403558,-0.142519, 0.903786, 0.000000, -<<<<<<< HEAD 0.000000, 0.717308, 0.000000, 1.000000;; -======= - 0.000000, 0.717308,-0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_017 } // End of Armature_Bone_011 @@ -471,54 +359,32 @@ Frame Root { } Frame Armature_Bone_023 { FrameTransformMatrix { -<<<<<<< HEAD 0.906488,-0.395453, 0.147973, 0.000000, 0.422231, 0.848999,-0.317683, 0.000000, -0.000000, 0.350454, 0.936580, 0.000000, -======= - 0.775750,-0.613446, 0.147973, 0.000000, - 0.624686, 0.713334,-0.317683, 0.000000, - 0.089327, 0.338879, 0.936580, 0.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 0.000000, 0.337917, 0.000000, 1.000000;; } Frame Armature_Bone_026 { FrameTransformMatrix { -<<<<<<< HEAD 0.627516,-0.778332, 0.020559, 0.000000, 0.719586, 0.569665,-0.397086, 0.000000, 0.297353, 0.263972, 0.917551, 0.000000, 0.000000, 0.696020,-0.000000, 1.000000;; -======= - 0.810416,-0.582985, 0.057923, 0.000000, - 0.569939, 0.761647,-0.308324, 0.000000, - 0.135631, 0.282883, 0.949516, 0.000000, - 0.000000, 0.696020, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } Frame Armature_Bone_029 { FrameTransformMatrix { 0.905858, 0.351605,-0.236212, 0.000000, -0.213208, 0.860340, 0.462988, 0.000000, 0.366011,-0.369039, 0.854310, 0.000000, -<<<<<<< HEAD -0.000000, 0.687858,-0.000000, 1.000000;; -======= - 0.000000, 0.687858, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_029 Frame Armature_Bone_032 { FrameTransformMatrix { 0.843012,-0.257348,-0.472338, 0.000000, 0.394166, 0.893075, 0.216912, 0.000000, -<<<<<<< HEAD 0.366012,-0.369039, 0.854310, 0.000000, -0.000000, 0.687858,-0.000000, 1.000000;; -======= - 0.366011,-0.369039, 0.854310, 0.000000, - 0.000000, 0.687858, 0.000000, 1.000000;; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } } // End of Armature_Bone_032 } // End of Armature_Bone_026 @@ -3243,7 +3109,6 @@ Frame Root { 45; } SkinWeights { -<<<<<<< HEAD "Armature_Bone_042"; 192; 600, @@ -3725,42 +3590,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -======= - "Armature_Bone_036"; - 0; - 0.000000, 0.009036,-0.262788, 0.000000, - -0.344107,-0.000000,-0.000000, 0.000000, - -0.000000, 0.286770, 0.009860, 0.000000, - 0.000000,-0.294199, 0.012363, 1.000000;; - } // End of Armature_Bone_036 skin weights - SkinWeights { - "Armature_Bone_009"; - 24; - 168, - 169, - 170, - 171, - 172, - 173, - 174, - 175, - 176, - 177, - 178, - 179, - 180, - 181, - 182, - 183, - 184, - 185, - 186, - 187, - 188, - 189, - 190, - 191; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -3777,7 +3606,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 1.000000; 0.008479,-0.003122,-0.262788, 0.000000, 0.118888, 0.322917, 0.000000, 0.000000, @@ -3812,8 +3640,6 @@ Frame Root { 550, 551; 0.208977, -======= ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 0.862927, @@ -3821,197 +3647,16 @@ Frame Root { 0.879162, 1.000000, 1.000000, -<<<<<<< HEAD 0.208977, 0.889382, -======= ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -0.586060,-0.337279, 0.014136, 1.000000;; - } // End of Armature_Bone_009 skin weights - SkinWeights { - "Armature_Bone_039"; - 168; - 840, - 841, - 842, - 843, - 844, - 845, - 846, - 847, - 848, - 849, - 850, - 851, - 852, - 853, - 854, - 855, - 856, - 857, - 858, - 859, - 860, - 861, - 862, - 863, - 864, - 865, - 866, - 867, - 868, - 869, - 870, - 871, - 872, - 873, - 874, - 875, - 876, - 877, - 878, - 879, - 880, - 881, - 882, - 883, - 884, - 885, - 886, - 887, - 888, - 889, - 890, - 891, - 892, - 893, - 894, - 895, - 896, - 897, - 898, - 899, - 900, - 901, - 902, - 903, - 904, - 905, - 906, - 907, - 908, - 909, - 910, - 911, - 912, - 913, - 914, - 915, - 916, - 917, - 918, - 919, - 920, - 921, - 922, - 923, - 924, - 925, - 926, - 927, - 928, - 929, - 930, - 931, - 932, - 933, - 934, - 935, - 936, - 937, - 938, - 939, - 940, - 941, - 942, - 943, - 944, - 945, - 946, - 947, - 948, - 949, - 950, - 951, - 952, - 953, - 954, - 955, - 956, - 957, - 958, - 959, - 960, - 961, - 962, - 963, - 964, - 965, - 966, - 967, - 968, - 969, - 970, - 971, - 972, - 973, - 974, - 975, - 976, - 977, - 978, - 979, - 980, - 981, - 982, - 983, - 1080, - 1081, - 1082, - 1083, - 1084, - 1085, - 1086, - 1087, - 1088, - 1089, - 1090, - 1091, - 1092, - 1093, - 1094, - 1095, - 1096, - 1097, - 1098, - 1099, - 1100, - 1101, - 1102, - 1103; 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD + 1.000000, + 1.000000, + 1.000000, 0.879162, 0.862927, 0.889382, @@ -4250,8 +3895,6 @@ Frame Root { 213, 214, 215; -======= ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -4275,7 +3918,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 1.000000; -0.009036, 0.000000,-0.262788, 0.000000, 0.000000,-0.344107, 0.000000, 0.000000, @@ -4309,8 +3951,6 @@ Frame Root { 189, 190, 191; -======= ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -4382,7 +4022,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 1.000000, 1.000000, 1.000000, @@ -4481,8 +4120,6 @@ Frame Root { 22, 23; 1.000000, -======= ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -4552,54 +4189,6 @@ Frame Root { 0.707608, 1.000000, 1.000000, - 0.161860, - 0.143469, - 0.142657, - 0.162599, - 0.163390, - 0.166003, - 0.215414, - 0.152312, - 0.161860, - 0.163390, - 0.152312, - 0.143469, - 0.143469, - 0.152312, - 0.215414, - 0.142657, - 0.142657, - 0.215414, - 0.166003, - 0.162599, - 0.163390, - 0.161860, - 0.162599, - 0.166003, - 0.255835, - 0.225497, - 0.226710, - 0.257164, - 0.258237, - 0.262585, - 0.342934, - 0.238679, - 0.255835, - 0.258237, - 0.238679, - 0.225497, - 0.225497, - 0.238679, - 0.342934, - 0.226710, - 0.226710, - 0.342934, - 0.262585, - 0.257164, - 0.258237, - 0.255835, - 0.257164, - 0.262585, 1.000000, 1.000000, 1.000000, @@ -4712,41 +4301,8 @@ Frame Root { 1.000000, 1.000000, 1.000000, - 1.000000; - -0.000000, 0.009036,-0.262788, 0.000000, - -0.344107, 0.000000, 0.000000, 0.000000, - 0.000000, 0.286770, 0.009860, 0.000000, - -0.494581,-0.935918, 0.151424, 1.000000;; - } // End of Armature_Bone_039 skin weights - SkinWeights { - "Armature_Bone_028"; - 21; - 336, - 337, - 338, - 340, - 341, - 342, - 343, - 344, - 345, - 346, - 347, - 348, - 349, - 350, - 351, - 352, - 353, - 354, - 356, - 357, - 359; - 0.092024, 1.000000, 1.000000, - 0.609272, - 0.097029, 1.000000, 1.000000; -0.009036, 0.000000,-0.262788, 0.000000, @@ -4782,13 +4338,8 @@ Frame Root { 70, 71; 1.000000, -<<<<<<< HEAD 0.089313, 0.053636, -======= - 0.092024, - 0.609272, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -4807,76 +4358,8 @@ Frame Root { 1.000000, 1.000000, 1.000000, - 0.097029, - 0.609272, - 0.092024, - 0.097029; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 1.166603,-1.033937, 0.014136, 1.000000;; - } // End of Armature_Bone_028 skin weights - SkinWeights { - "Armature_Bone_034"; - 48; - 289, - 290, - 294, - 295, - 298, - 299, - 300, - 301, - 302, - 303, - 304, - 305, - 312, - 313, - 314, - 315, - 316, - 317, - 318, - 319, - 320, - 321, - 322, - 323, - 324, - 325, - 326, - 327, - 328, - 329, - 330, - 331, - 332, - 333, - 334, - 335, - 336, - 339, - 340, - 341, - 344, - 345, - 354, - 355, - 356, - 357, - 358, - 359; - 0.235566, - 0.081284, 1.000000, - 0.847824, - 0.847824, - 0.235566, - 0.235566, - 0.847824, 1.000000, -<<<<<<< HEAD 1.000000; -0.008427, 0.003261,-0.262788, 0.000000, -0.124182,-0.320918, 0.000000, 0.000000, @@ -5016,10 +4499,6 @@ Frame Root { 405, 406, 407; -======= - 0.081284, - 0.081284, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -5108,56 +4587,11 @@ Frame Root { 0.948022, 1.000000, 1.000000, - 0.021491, - 0.039881, - 0.195093, - 0.765058, - 0.021491, - 0.195093, - 0.765058, - 0.039881, - 0.195093, - 0.021491, - 0.039881, - 0.765058; - 0.008589, 0.002806,-0.262788, 0.000000, - -0.106858, 0.327095, 0.000000, 0.000000, - 0.272592, 0.089053, 0.009860, 0.000000, - 1.643609,-1.274397, 0.014136, 1.000000;; - } // End of Armature_Bone_034 skin weights - SkinWeights { - "Armature_Bone_013"; - 24; - 216, - 217, - 218, - 219, - 220, - 221, - 222, - 223, - 224, - 225, - 226, - 227, - 228, - 229, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 239; 1.000000, 0.952572, 0.952572, 1.000000, 1.000000, -<<<<<<< HEAD 0.948022, 0.948022, 1.000000, @@ -5179,21 +4613,11 @@ Frame Root { 0.868553, 0.868553, 0.930695, -======= 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, - 1.000000, - 1.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, -<<<<<<< HEAD 1.000000; -0.008427, 0.003261,-0.262788, 0.000000, -0.124182,-0.320918, 0.000000, 0.000000, @@ -5230,49 +4654,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -======= - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -1.166603,-1.036485, 0.014136, 1.000000;; - } // End of Armature_Bone_013 skin weights - SkinWeights { - "Armature_Bone_023"; - 24; - 384, - 385, - 386, - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -5464,7 +4845,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 0.097029, 0.609272, 0.092024, @@ -5474,45 +4854,19 @@ Frame Root { 0.286770,-0.000000, 0.009860, 0.000000, 1.166603,-1.033937, 0.014136, 1.000000;; } // End of Armature_Bone_028 skin weights -======= - 1.000000; - 0.009036, 0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770, 0.000000, 0.009860, 0.000000, - -0.007662,-0.337917, 0.014136, 1.000000;; - } // End of Armature_Bone_023 skin weights ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d SkinWeights { - "Armature_Bone_030"; - 48; - 480, - 481, - 482, - 483, - 484, - 485, - 486, - 487, - 488, - 489, - 490, - 491, - 492, - 493, - 494, - 495, - 496, - 497, - 498, - 499, - 500, - 501, - 502, - 503, + "Armature_Bone_033"; + 24; + 504, 505, 506, + 507, + 508, + 509, 510, 511, + 512, + 513, 514, 515, 516, @@ -5521,71 +4875,41 @@ Frame Root { 519, 520, 521, - 528, - 531, - 532, - 533, - 536, - 537, - 546, - 547, - 548, - 549, - 550, - 551; + 522, + 523, + 524, + 525, + 526, + 527; + 1.000000, + 0.127296, + 0.025218, + 1.000000, + 1.000000, + 1.000000, + 0.900570, + 0.883382, + 1.000000, + 1.000000, + 0.883382, + 0.127296, + 0.127296, + 0.883382, + 0.900570, + 0.025218, + 0.025218, + 0.900570, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 0.872704, - 0.974782, - 0.099430, - 0.116618, - 0.116618, - 0.872704, - 0.872704, - 0.116618, - 0.099430, - 0.974782, - 0.974782, - 0.099430, - 0.791023, - 0.137073, - 0.110618, - 0.120838, - 0.791023, - 0.110618, - 0.120838, - 0.137073, - 0.110618, - 0.791023, - 0.137073, - 0.120838; - 0.008479,-0.003122,-0.262788, 0.000000, - 0.118888, 0.322917, 0.000000, 0.000000, - 0.269111,-0.099078, 0.009860, 0.000000, - -0.044905,-1.818248, 0.014136, 1.000000;; - } // End of Armature_Bone_030 skin weights + 1.000000; + 0.008589, 0.002806,-0.262788, 0.000000, + -0.106858, 0.327095, 0.000000, 0.000000, + 0.272592, 0.089053, 0.009860, 0.000000, + 1.091768,-1.454678, 0.014136, 1.000000;; + } // End of Armature_Bone_033 skin weights SkinWeights { "Armature_Bone_040"; 168; @@ -5931,7 +5255,6 @@ Frame Root { 0.504667,-0.915084, 0.140261, 1.000000;; } // End of Armature_Bone_040 skin weights SkinWeights { -<<<<<<< HEAD "Armature_Bone_030"; 48; 480, @@ -5985,82 +5308,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -======= - "Armature_Bone_029"; - 48; - 408, - 411, - 412, - 413, - 416, - 417, - 426, - 427, - 428, - 429, - 430, - 431, - 433, - 434, - 438, - 439, - 442, - 443, - 444, - 445, - 446, - 447, - 448, - 449, - 456, - 457, - 458, - 459, - 460, - 461, - 462, - 463, - 464, - 465, - 466, - 467, - 468, - 469, - 470, - 471, - 472, - 473, - 474, - 475, - 476, - 477, - 478, - 479; - 0.887597, - 0.280357, - 0.653946, - 0.489176, - 0.887597, - 0.653946, - 0.489176, - 0.280357, - 0.653946, - 0.887597, - 0.280357, - 0.489176, - 1.000000, - 0.895321, - 0.292392, - 0.607828, - 0.607828, - 1.000000, - 1.000000, - 0.607828, - 0.292392, - 0.895321, - 0.895321, - 0.292392, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -6082,7 +5329,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 0.872704, 0.974782, 0.099430, @@ -6121,601 +5367,12 @@ Frame Root { 1109, 1112, 1113, -======= - 1.000000, - 1.000000, - 1.000000; - 0.008479,-0.003122,-0.262788, 0.000000, - 0.118888, 0.322917, 0.000000, 0.000000, - 0.269111,-0.099078, 0.009860, 0.000000, - -0.602065,-1.613119, 0.014136, 1.000000;; - } // End of Armature_Bone_029 skin weights - SkinWeights { - "Armature_Bone_042"; - 192; - 600, - 601, - 602, - 603, - 604, - 605, - 606, - 607, - 608, - 609, - 610, - 611, - 612, - 613, - 614, - 615, - 616, - 617, - 618, - 619, - 620, - 621, - 622, - 623, - 624, - 625, - 626, - 627, - 628, - 629, - 630, - 631, - 632, - 633, - 634, - 635, - 636, - 637, - 638, - 639, - 640, - 641, - 642, - 643, - 644, - 645, - 646, - 647, - 648, - 649, - 650, - 651, - 652, - 653, - 654, - 655, - 656, - 657, - 658, - 659, - 660, - 661, - 662, - 663, - 664, - 665, - 666, - 667, - 668, - 669, - 670, - 671, - 672, - 673, - 674, - 675, - 676, - 677, - 678, - 679, - 680, - 681, - 682, - 683, - 684, - 685, - 686, - 687, - 688, - 689, - 690, - 691, - 692, - 693, - 694, - 695, - 696, - 697, - 698, - 699, - 700, - 701, - 702, - 703, - 704, - 705, - 706, - 707, - 708, - 709, - 710, - 711, - 712, - 713, - 714, - 715, - 716, - 717, - 718, - 719, - 720, - 721, - 722, - 723, - 724, - 725, - 726, - 727, - 728, - 729, - 730, - 731, - 732, - 733, - 734, - 735, - 736, - 737, - 738, - 739, - 740, - 741, - 742, - 743, - 744, - 745, - 746, - 747, - 748, - 749, - 750, - 751, - 752, - 753, - 754, - 755, - 756, - 757, - 758, - 759, - 760, - 761, - 762, - 763, - 764, - 765, - 766, - 767, - 792, - 793, - 794, - 795, - 796, - 797, - 798, - 799, - 800, - 801, - 802, - 803, - 804, - 805, - 806, - 807, - 808, - 809, - 810, - 811, - 812, - 813, - 814, - 815; - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 0.764532, - 0.792198, - 0.785298, - 0.763043, - 0.762657, - 0.758494, - 0.686555, - 0.784675, - 0.764532, - 0.762657, - 0.784675, - 0.792198, - 0.792198, - 0.784675, - 0.686555, - 0.785298, - 0.785298, - 0.686555, - 0.758494, - 0.763043, - 0.762657, - 0.764532, - 0.763043, - 0.758494, - 0.857837, - 0.874796, - 0.869409, - 0.856878, - 0.856740, - 0.854180, - 0.810717, - 0.870714, - 0.857837, - 0.856740, - 0.870714, - 0.874796, - 0.874796, - 0.870714, - 0.810717, - 0.869409, - 0.869409, - 0.810717, - 0.854180, - 0.856878, - 0.856740, - 0.857837, - 0.856878, - 0.854180, - 0.546837, - 0.583985, - 0.634069, - 0.549655, - 0.538870, - 0.541979, - 0.509654, - 0.449633, - 0.546837, - 0.538870, - 0.449633, - 0.583985, - 0.583985, - 0.449633, - 0.509654, - 0.634069, - 0.634069, - 0.509654, - 0.541979, - 0.549655, - 0.538870, - 0.546837, - 0.549655, - 0.541979, - 0.106772, - 0.139905, - 0.095860, - 0.104896, - 0.104630, - 0.103937, - 0.090385, - 0.094085, - 0.106772, - 0.104630, - 0.094085, - 0.139905, - 0.139905, - 0.094085, - 0.090385, - 0.095860, - 0.095860, - 0.090385, - 0.103937, - 0.104896, - 0.104630, - 0.106772, - 0.104896, - 0.103937; - 0.000000, 0.009036,-0.262788, 0.000000, - -0.344107, 0.000000,-0.000000, 0.000000, - 0.000000, 0.286770, 0.009860, 0.000000, - 0.504667,-1.556829, 0.140261, 1.000000;; - } // End of Armature_Bone_042 skin weights - SkinWeights { - "Armature_Bone_026"; - 24; - 408, - 409, - 410, - 411, - 412, - 413, - 414, - 415, - 416, - 417, - 418, - 419, - 420, - 421, - 422, - 423, - 424, - 425, - 426, - 427, - 428, - 429, - 430, - 431; - 0.112403, - 1.000000, - 1.000000, - 0.719643, - 0.346054, - 0.510824, - 1.000000, - 1.000000, - 0.112403, - 0.346054, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 0.510824, - 0.719643, - 0.346054, - 0.112403, - 0.719643, - 0.510824; - 0.009036, 0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770, 0.000000, 0.009860, 0.000000, - -0.007662,-1.033937, 0.014136, 1.000000;; - } // End of Armature_Bone_026 skin weights - SkinWeights { - "Armature_Bone_027"; - 24; - 528, - 529, - 530, - 531, - 532, - 533, - 534, - 535, - 536, - 537, - 538, - 539, - 540, - 541, - 542, - 543, - 544, - 545, - 546, - 547, - 548, - 549, - 550, - 551; - 0.208977, - 1.000000, - 1.000000, - 0.862927, - 0.889382, - 0.879162, - 1.000000, - 1.000000, - 0.208977, - 0.889382, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 0.879162, - 0.862927, - 0.889382, - 0.208977, - 0.862927, - 0.879162; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 0.586060,-1.033937, 0.014136, 1.000000;; - } // End of Armature_Bone_027 skin weights - SkinWeights { - "Armature_Bone_022"; - 24; - 1176, - 1177, - 1178, - 1179, - 1180, - 1181, - 1182, - 1183, - 1184, - 1185, - 1186, - 1187, - 1188, - 1189, - 1190, - 1191, - 1192, - 1193, - 1194, - 1195, - 1196, - 1197, - 1198, - 1199; - 0.804076, - 0.104288, - 0.026557, - 0.212036, - 0.858261, - 0.817850, - 0.094127, - 0.104295, - 0.804076, - 0.858261, - 0.104295, - 0.104288, - 0.104288, - 0.104295, - 0.094127, - 0.026557, - 0.026557, - 0.094127, - 0.817850, - 0.212036, - 0.858261, - 0.804076, - 0.212036, - 0.817850; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 1.166603,-0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_022 skin weights - SkinWeights { - "Armature_Bone_043"; - 21; - 1104, - 1105, - 1106, - 1107, - 1108, - 1109, - 1110, - 1112, - 1113, - 1115, - 1116, - 1118, - 1119, - 1120, - 1121, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1122, 1123, 1124, 1125, 1126, 1127; -<<<<<<< HEAD 0.113446, 0.024816, 0.913378, @@ -6951,364 +5608,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -======= - 0.864091, - 0.049163, - 0.051904, - 0.910483, - 0.086622, - 0.852139, - 0.051162, - 0.864091, - 0.086622, - 0.049163, - 0.049163, - 0.051162, - 0.051904, - 0.051904, - 0.051162, - 0.852139, - 0.910483, - 0.086622, - 0.864091, - 0.910483, - 0.852139; - 0.009036,-0.000000,-0.262788, 0.000000, - -0.000000, 0.344107,-0.000000, 0.000000, - 0.286770, 0.000000, 0.009860, 0.000000, - -0.639437,-0.000000, 0.012363, 1.000000;; - } // End of Armature_Bone_043 skin weights - SkinWeights { - "Armature_Bone_044"; - 21; - 1104, - 1105, - 1106, - 1107, - 1109, - 1110, - 1111, - 1112, - 1114, - 1115, - 1116, - 1117, - 1118, - 1119, - 1120, - 1121, - 1122, - 1123, - 1125, - 1126, - 1127; - 0.022464, - 0.798268, - 0.924406, - 0.064701, - 0.036547, - 0.815374, - 0.073446, - 0.022464, - 0.073446, - 0.798268, - 0.798268, - 0.073446, - 0.815374, - 0.924406, - 0.924406, - 0.815374, - 0.036547, - 0.064701, - 0.022464, - 0.064701, - 0.036547; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107,-0.000000, 0.000000, - -0.286770,-0.000000, 0.009860, 0.000000, - 0.639437, 0.000000, 0.012363, 1.000000;; - } // End of Armature_Bone_044 skin weights - SkinWeights { - "Armature_Bone_015"; - 36; - 97, - 98, - 102, - 103, - 106, - 107, - 108, - 109, - 110, - 111, - 112, - 113, - 120, - 121, - 122, - 123, - 124, - 125, - 126, - 127, - 128, - 129, - 130, - 131, - 132, - 133, - 134, - 135, - 136, - 137, - 138, - 139, - 140, - 141, - 142, - 143; - 0.952572, - 0.948022, - 1.000000, - 1.000000, - 1.000000, - 0.952572, - 0.952572, - 1.000000, - 1.000000, - 0.948022, - 0.948022, - 1.000000, - 1.000000, - 0.045662, - 0.868553, - 1.000000, - 1.000000, - 1.000000, - 0.930695, - 0.820695, - 1.000000, - 1.000000, - 0.820695, - 0.045662, - 0.045662, - 0.820695, - 0.930695, - 0.868553, - 0.868553, - 0.930695, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, -<<<<<<< HEAD -======= - 1.000000; - -0.008427, 0.003261,-0.262788, 0.000000, - -0.124182,-0.320918, 0.000000, 0.000000, - -0.267445, 0.103490, 0.009860, 0.000000, - -1.179480,-1.424108, 0.014136, 1.000000;; - } // End of Armature_Bone_015 skin weights - SkinWeights { - "Armature_Bone_035"; - 24; - 1176, - 1177, - 1178, - 1179, - 1180, - 1181, - 1182, - 1183, - 1184, - 1185, - 1186, - 1187, - 1188, - 1189, - 1190, - 1191, - 1192, - 1193, - 1194, - 1195, - 1196, - 1197, - 1198, - 1199; - 0.153692, - 0.648677, - 0.134680, - 0.694354, - 0.036627, - 0.085521, - 0.021674, - 0.088209, - 0.153692, - 0.036627, - 0.088209, - 0.648677, - 0.648677, - 0.088209, - 0.021674, - 0.134680, - 0.134680, - 0.021674, - 0.085521, - 0.694354, - 0.036627, - 0.153692, - 0.694354, - 0.085521; - 0.000000,-0.009036,-0.262788, 0.000000, - 0.344107, 0.000000, 0.000000, 0.000000, - 0.000000,-0.286770, 0.009860, 0.000000, - 0.000000,-1.166603, 0.014136, 1.000000;; - } // End of Armature_Bone_035 skin weights - SkinWeights { - "Armature_Bone_033"; - 24; - 504, - 505, - 506, - 507, - 508, - 509, - 510, - 511, - 512, - 513, - 514, - 515, - 516, - 517, - 518, - 519, - 520, - 521, - 522, - 523, - 524, - 525, - 526, - 527; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 1.000000, - 0.127296, - 0.025218, - 1.000000, - 1.000000, - 1.000000, - 0.900570, - 0.883382, - 1.000000, - 1.000000, - 0.883382, - 0.127296, - 0.127296, - 0.883382, - 0.900570, - 0.025218, - 0.025218, - 0.900570, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, -<<<<<<< HEAD -======= - 1.000000; - 0.008589, 0.002806,-0.262788, 0.000000, - -0.106858, 0.327095, 0.000000, 0.000000, - 0.272592, 0.089053, 0.009860, 0.000000, - 1.091768,-1.454678, 0.014136, 1.000000;; - } // End of Armature_Bone_033 skin weights - SkinWeights { - "Armature_Bone_020"; - 24; - 1128, - 1129, - 1130, - 1131, - 1132, - 1133, - 1134, - 1135, - 1136, - 1137, - 1138, - 1139, - 1140, - 1141, - 1142, - 1143, - 1144, - 1145, - 1146, - 1147, - 1148, - 1149, - 1150, - 1151; - 0.826410, - 0.098021, - 0.039191, - 0.232735, - 0.881328, - 0.813214, - 0.101167, - 0.096063, - 0.826410, - 0.881328, - 0.096063, - 0.098021, - 0.098021, - 0.096063, - 0.101167, - 0.039191, - 0.039191, - 0.101167, - 0.813214, - 0.232735, - 0.881328, - 0.826410, - 0.232735, - 0.813214; - 0.009036, 0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770, 0.000000, 0.009860, 0.000000, - -0.007662, 0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_020 skin weights - SkinWeights { - "Armature_Bone_012"; - 24; - 144, - 145, - 146, - 147, - 148, - 149, - 150, - 151, - 152, - 153, - 154, - 155, - 156, - 157, - 158, - 159, - 160, - 161, - 162, - 163, - 164, - 165, - 166, - 167; 1.000000, 1.000000, 1.000000, @@ -7332,37 +5631,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, - 1.000000; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -0.586060,-1.036485, 0.014136, 1.000000;; - } // End of Armature_Bone_012 skin weights - SkinWeights { - "Armature_Bone_032"; - 21; - 432, - 434, - 435, - 436, - 437, - 438, - 439, - 440, - 441, - 442, - 445, - 446, - 447, - 448, - 449, - 450, - 451, - 452, - 453, - 454, - 455; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -7374,7 +5642,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 1.000000, 1.000000, 1.000000, @@ -7410,49 +5677,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -======= - 1.000000; - 0.008589, 0.002806,-0.262788, 0.000000, - -0.106858, 0.327095, 0.000000, 0.000000, - 0.272592, 0.089053, 0.009860, 0.000000, - 0.527399,-1.639050, 0.014136, 1.000000;; - } // End of Armature_Bone_032 skin weights - SkinWeights { - "Armature_Bone_002"; - 0; - 0.000000,-0.009036,-0.262788, 0.000000, - 0.344107, 0.000000, 0.000000, 0.000000, - 0.000000,-0.286770, 0.009860, 0.000000, - 0.000000,-0.286801, 0.014136, 1.000000;; - } // End of Armature_Bone_002 skin weights - SkinWeights { - "Armature_Bone_010"; - 24; - 192, - 193, - 194, - 195, - 196, - 197, - 198, - 199, - 200, - 201, - 202, - 203, - 204, - 205, - 206, - 207, - 208, - 209, - 210, - 211, - 212, - 213, - 214, - 215; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -7469,119 +5693,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, -<<<<<<< HEAD -======= - 1.000000; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -1.166603,-0.337279, 0.014136, 1.000000;; - } // End of Armature_Bone_010 skin weights - SkinWeights { - "Armature_Bone_005"; - 24; - 1128, - 1129, - 1130, - 1131, - 1132, - 1133, - 1134, - 1135, - 1136, - 1137, - 1138, - 1139, - 1140, - 1141, - 1142, - 1143, - 1144, - 1145, - 1146, - 1147, - 1148, - 1149, - 1150, - 1151; - 0.031542, - 0.226139, - 0.809222, - 0.098837, - 0.095178, - 0.100062, - 0.867533, - 0.821041, - 0.031542, - 0.095178, - 0.821041, - 0.226139, - 0.226139, - 0.821041, - 0.867533, - 0.809222, - 0.809222, - 0.867533, - 0.100062, - 0.098837, - 0.095178, - 0.031542, - 0.098837, - 0.100062; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - 0.007662, 0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_005 skin weights - SkinWeights { - "Armature_Bone_003"; - 0; - 0.000000,-0.009036,-0.262788, 0.000000, - 0.344107, 0.000000, 0.000000, 0.000000, - 0.000000,-0.286770, 0.009860, 0.000000, - 0.000000,-0.885319, 0.014136, 1.000000;; - } // End of Armature_Bone_003 skin weights - SkinWeights { - "Armature_Bone_018"; - 30; - 96, - 97, - 98, - 99, - 100, - 101, - 104, - 105, - 107, - 108, - 111, - 112, - 114, - 115, - 116, - 117, - 118, - 119, - 121, - 122, - 126, - 127, - 130, - 131, - 132, - 133, - 134, - 135, - 136, - 137; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 0.161860, @@ -7662,7 +5773,6 @@ Frame Root { -0.494581,-0.935918, 0.151424, 1.000000;; } // End of Armature_Bone_039 skin weights SkinWeights { -<<<<<<< HEAD "Armature_Bone_019"; 24; 264, @@ -7692,122 +5802,6 @@ Frame Root { 1.000000, 0.822834, 0.779567, -======= - "Armature_Bone_021"; - 24; - 1152, - 1153, - 1154, - 1155, - 1156, - 1157, - 1158, - 1159, - 1160, - 1161, - 1162, - 1163, - 1164, - 1165, - 1166, - 1167, - 1168, - 1169, - 1170, - 1171, - 1172, - 1173, - 1174, - 1175; - 0.868698, - 0.113493, - 0.079953, - 0.662600, - 0.892148, - 0.877645, - 0.109287, - 0.104403, - 0.868698, - 0.892148, - 0.104403, - 0.113493, - 0.113493, - 0.104403, - 0.109287, - 0.079953, - 0.079953, - 0.109287, - 0.877645, - 0.662600, - 0.892148, - 0.868698, - 0.662600, - 0.877645; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 0.586060,-0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_021 skin weights - SkinWeights { - "Armature_Bone_017"; - 36; - 49, - 50, - 54, - 55, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 72, - 73, - 74, - 75, - 76, - 77, - 78, - 79, - 80, - 81, - 82, - 83, - 84, - 85, - 86, - 87, - 88, - 89, - 90, - 91, - 92, - 93, - 94, - 95; - 0.910687, - 0.946364, - 0.511837, - 0.528822, - 0.528822, - 0.910687, - 0.910687, - 0.528822, - 0.511837, - 0.946364, - 0.946364, - 0.511837, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -7828,7 +5822,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD 1.000000; -0.008031,-0.004141,-0.262788, 0.000000, 0.157700,-0.305843, 0.000000, 0.000000, @@ -7918,102 +5911,6 @@ Frame Root { 381, 382, 383; -======= - 1.000000, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.008031,-0.004141,-0.262788, 0.000000, - 0.157700,-0.305843, 0.000000, 0.000000, - -0.254882,-0.131423, 0.009860, 0.000000, - 0.810552,-1.555267, 0.014136, 1.000000;; - } // End of Armature_Bone_017 skin weights - SkinWeights { - "Armature_Bone_006"; - 24; - 1152, - 1153, - 1154, - 1155, - 1156, - 1157, - 1158, - 1159, - 1160, - 1161, - 1162, - 1163, - 1164, - 1165, - 1166, - 1167, - 1168, - 1169, - 1170, - 1171, - 1172, - 1173, - 1174, - 1175; - 0.068578, - 0.241827, - 0.833958, - 0.286826, - 0.107852, - 0.122355, - 0.890713, - 0.815994, - 0.068578, - 0.107852, - 0.815994, - 0.241827, - 0.241827, - 0.815994, - 0.890713, - 0.833958, - 0.833958, - 0.890713, - 0.122355, - 0.286826, - 0.107852, - 0.068578, - 0.286826, - 0.122355; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -0.586060, 0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_006 skin weights - SkinWeights { - "Armature_Bone_008"; - 24; - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23; 1.000000, 1.000000, 1.000000, @@ -8038,7 +5935,6 @@ Frame Root { 1.000000, 1.000000, 1.000000; -<<<<<<< HEAD 0.009036,-0.000000,-0.262788, 0.000000, 0.000000, 0.344107, 0.000000, 0.000000, 0.286770,-0.000000, 0.009860, 0.000000, @@ -8107,100 +6003,127 @@ Frame Root { 0.081284, 0.081284, 1.000000, -======= - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - 0.007662,-0.337279, 0.014136, 1.000000;; - } // End of Armature_Bone_008 skin weights + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 0.021491, + 0.039881, + 0.195093, + 0.765058, + 0.021491, + 0.195093, + 0.765058, + 0.039881, + 0.195093, + 0.021491, + 0.039881, + 0.765058; + 0.008589, 0.002806,-0.262788, 0.000000, + -0.106858, 0.327095, 0.000000, 0.000000, + 0.272592, 0.089053, 0.009860, 0.000000, + 1.643609,-1.274397, 0.014136, 1.000000;; + } // End of Armature_Bone_034 skin weights SkinWeights { - "Armature_Bone_007"; - 24; - 1176, - 1177, - 1178, - 1179, - 1180, - 1181, - 1182, - 1183, - 1184, - 1185, - 1186, - 1187, - 1188, - 1189, - 1190, - 1191, - 1192, - 1193, - 1194, - 1195, - 1196, - 1197, - 1198, - 1199; - 0.042233, - 0.247035, - 0.838763, - 0.093610, - 0.105112, - 0.096629, - 0.884199, - 0.807497, - 0.042233, - 0.105112, - 0.807497, - 0.247035, - 0.247035, - 0.807497, - 0.884199, - 0.838763, - 0.838763, - 0.884199, - 0.096629, - 0.093610, - 0.105112, - 0.042233, - 0.093610, - 0.096629; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - -1.166603, 0.000000, 0.014136, 1.000000;; - } // End of Armature_Bone_007 skin weights - SkinWeights { - "Armature_Bone_038"; - 12; - 1104, - 1107, - 1108, - 1109, - 1112, - 1113, - 1122, - 1123, - 1124, - 1125, - 1126, - 1127; - 0.113446, - 0.024816, - 0.913378, - 0.111314, - 0.113446, - 0.913378, - 0.111314, - 0.024816, - 0.913378, - 0.113446, - 0.024816, - 0.111314; - 0.005257, 0.061282,-0.255648, 0.000000, - -0.164254, 0.294792, 0.067288, 0.000000, - 0.252075, 0.132045, 0.036836, 0.000000, - -0.561722,-0.301889,-0.048609, 1.000000;; - } // End of Armature_Bone_038 skin weights + "Armature_Bone_017"; + 36; + 49, + 50, + 54, + 55, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95; + 0.910687, + 0.946364, + 0.511837, + 0.528822, + 0.528822, + 0.910687, + 0.910687, + 0.528822, + 0.511837, + 0.946364, + 0.946364, + 0.511837, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000, + 1.000000; + -0.008031,-0.004141,-0.262788, 0.000000, + 0.157700,-0.305843, 0.000000, 0.000000, + -0.254882,-0.131423, 0.009860, 0.000000, + 0.810552,-1.555267, 0.014136, 1.000000;; + } // End of Armature_Bone_017 skin weights SkinWeights { "Armature_Bone_016"; 36; @@ -8240,7 +6163,6 @@ Frame Root { 279, 280, 281; ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d 1.000000, 1.000000, 1.000000, @@ -8265,25 +6187,6 @@ Frame Root { 1.000000, 1.000000, 1.000000, -<<<<<<< HEAD - 0.021491, - 0.039881, - 0.195093, - 0.765058, - 0.021491, - 0.195093, - 0.765058, - 0.039881, - 0.195093, - 0.021491, - 0.039881, - 0.765058; - 0.008589, 0.002806,-0.262788, 0.000000, - -0.106858, 0.327095, 0.000000, 0.000000, - 0.272592, 0.089053, 0.009860, 0.000000, - 1.643609,-1.274397, 0.014136, 1.000000;; - } // End of Armature_Bone_034 skin weights -======= 0.177166, 0.220433, 0.768493, @@ -8301,492 +6204,6 @@ Frame Root { -0.267445, 0.103490, 0.009860, 0.000000, -1.720901,-1.214600, 0.014136, 1.000000;; } // End of Armature_Bone_016 skin weights ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - SkinWeights { - "Armature_Bone_014"; - 24; - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 66, - 67, - 68, - 69, - 70, - 71; - 1.000000, - 0.089313, - 0.053636, - 1.000000, - 1.000000, - 1.000000, - 0.488163, - 0.471178, - 1.000000, - 1.000000, - 0.471178, - 0.089313, - 0.089313, - 0.471178, - 0.488163, - 0.053636, - 0.053636, - 0.488163, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.008427, 0.003261,-0.262788, 0.000000, - -0.124182,-0.320918, 0.000000, 0.000000, - -0.267445, 0.103490, 0.009860, 0.000000, - -0.625768,-1.638372, 0.014136, 1.000000;; - } // End of Armature_Bone_014 skin weights - SkinWeights { -<<<<<<< HEAD - "Armature_Bone_016"; - 36; - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 249, - 250, - 251, - 252, - 253, - 254, - 255, - 256, - 257, - 258, - 259, - 260, - 261, - 262, - 263, -======= - "Armature_Bone_004"; - 15; - 1152, - 1153, - 1154, - 1155, - 1159, - 1160, - 1162, - 1163, - 1164, - 1165, - 1167, - 1168, - 1171, - 1173, - 1174; - 0.062724, - 0.644680, - 0.086089, - 0.050573, - 0.079603, - 0.062724, - 0.079603, - 0.644680, - 0.644680, - 0.079603, - 0.086089, - 0.086089, - 0.050573, - 0.062724, - 0.050573; - 0.000000,-0.009036,-0.262788, 0.000000, - 0.344107, 0.000000, 0.000000, 0.000000, - 0.000000,-0.286770, 0.009860, 0.000000, - 0.000000,-0.586060, 0.014136, 1.000000;; - } // End of Armature_Bone_004 skin weights - SkinWeights { - "Armature_Bone_024"; - 24; - 552, - 553, - 554, - 555, - 556, - 557, - 558, - 559, - 560, - 561, - 562, - 563, - 564, - 565, - 566, - 567, - 568, - 569, - 570, - 571, - 572, - 573, - 574, - 575; - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 0.586060,-0.337917, 0.014136, 1.000000;; - } // End of Armature_Bone_024 skin weights - SkinWeights { - "Armature_Bone_001"; - 24; - 1128, - 1129, - 1130, - 1131, - 1132, - 1133, - 1134, - 1135, - 1136, - 1137, - 1138, - 1139, - 1140, - 1141, - 1142, - 1143, - 1144, - 1145, - 1146, - 1147, - 1148, - 1149, - 1150, - 1151; - 0.142049, - 0.675840, - 0.151587, - 0.668428, - 0.023494, - 0.086724, - 0.031300, - 0.082895, - 0.142049, - 0.023494, - 0.082895, - 0.675840, - 0.675840, - 0.082895, - 0.031300, - 0.151587, - 0.151587, - 0.031300, - 0.086724, - 0.668428, - 0.023494, - 0.142049, - 0.668428, - 0.086724; - 0.000000,-0.009036,-0.262788, 0.000000, - 0.344107, 0.000000, 0.000000, 0.000000, - 0.000000,-0.286770, 0.009860, 0.000000, - 0.000000, 0.007662, 0.014136, 1.000000;; - } // End of Armature_Bone_001 skin weights - SkinWeights { - "Armature_Bone"; - 0; - 0.262839, 0.007409, 0.000000, 0.000000, - 0.000000,-0.000000,-0.344107, 0.000000, - -0.008085, 0.286826,-0.000000, 0.000000, - -0.014184,-0.007574,-0.000000, 1.000000;; - } // End of Armature_Bone skin weights - SkinWeights { - "Armature_Bone_019"; - 24; - 264, ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d - 265, - 266, - 267, - 268, - 269, - 270, - 271, - 272, - 273, - 274, - 275, - 276, - 277, - 278, - 279, - 280, - 281, - 282, - 283, - 284, - 285, - 286, - 287; - 1.000000, - 0.822834, - 0.779567, - 1.000000, - 1.000000, - 1.000000, - 0.231507, - 0.086437, - 1.000000, - 1.000000, - 0.086437, - 0.822834, - 0.822834, - 0.086437, - 0.231507, - 0.779567, - 0.779567, - 0.231507, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.008031,-0.004141,-0.262788, 0.000000, - 0.157700,-0.305843, 0.000000, 0.000000, - -0.254882,-0.131423, 0.009860, 0.000000, - -0.233139,-2.093418, 0.014136, 1.000000;; - } // End of Armature_Bone_019 skin weights - SkinWeights { - "Armature_Bone_031"; - 33; - 288, - 289, - 290, - 291, - 292, - 293, - 295, - 296, - 297, - 298, - 299, - 300, - 301, - 303, - 304, - 306, - 307, - 308, - 309, - 310, - 311, - 336, - 339, - 340, - 341, - 344, - 345, - 354, - 355, - 356, - 357, - 358, - 359; - 1.000000, - 0.764434, - 0.918716, - 1.000000, - 1.000000, - 1.000000, - 0.152176, - 1.000000, - 1.000000, - 0.152176, - 0.764434, - 0.764434, - 0.152176, - 0.918716, - 0.918716, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 0.886485, - 0.960119, - 0.195634, - 0.137913, - 0.886485, - 0.195634, - 0.137913, - 0.960119, - 0.195634, - 0.886485, - 0.960119, - 0.137913; - 0.008479,-0.003122,-0.262788, 0.000000, - 0.118888, 0.322917, 0.000000, 0.000000, - 0.269111,-0.099078, 0.009860, 0.000000, - 0.499888,-2.018824, 0.014136, 1.000000;; - } // End of Armature_Bone_031 skin weights - SkinWeights { - "Armature_Bone_025"; - 24; - 360, - 361, - 362, - 363, - 364, - 365, - 366, - 367, - 368, - 369, - 370, - 371, - 372, - 373, - 374, - 375, - 376, - 377, - 378, - 379, - 380, - 381, - 382, - 383; - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - 0.009036,-0.000000,-0.262788, 0.000000, - 0.000000, 0.344107, 0.000000, 0.000000, - 0.286770,-0.000000, 0.009860, 0.000000, - 1.166603,-0.337917, 0.014136, 1.000000;; - } // End of Armature_Bone_025 skin weights - SkinWeights { - "Armature_Bone_011"; - 24; - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47; - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000, - 1.000000; - -0.009036, 0.000000,-0.262788, 0.000000, - 0.000000,-0.344107, 0.000000, 0.000000, - -0.286770, 0.000000, 0.009860, 0.000000, - 0.007662,-1.036485, 0.014136, 1.000000;; - } // End of Armature_Bone_011 skin weights SkinWeights { "Armature_Bone_036"; 0; @@ -9142,7 +6559,6 @@ Frame Root { -0.494581,-1.577662, 0.151424, 1.000000;; } // End of Armature_Bone_041 skin weights SkinWeights { -<<<<<<< HEAD "Armature_Bone_031"; 33; 288, @@ -9328,39 +6744,6 @@ Frame Root { 0.286770, 0.000000, 0.009860, 0.000000, -0.007662, 0.000000, 0.014136, 1.000000;; } // End of Armature_Bone_020 skin weights -======= - "Armature_Bone_037"; - 12; - 1105, - 1106, - 1110, - 1111, - 1114, - 1115, - 1116, - 1117, - 1118, - 1119, - 1120, - 1121; - 0.152568, - 0.023690, - 0.133465, - 0.926554, - 0.926554, - 0.152568, - 0.152568, - 0.926554, - 0.133465, - 0.023690, - 0.023690, - 0.133465; - 0.025991, 0.066124,-0.253162, 0.000000, - -0.166208,-0.286914,-0.092003, 0.000000, - -0.249642, 0.141024, 0.011204, 0.000000, - 0.552228,-0.322506, 0.008115, 1.000000;; - } // End of Armature_Bone_037 skin weights ->>>>>>> 82c6b55bc79293fa0978954c63f617656fd3f82d } // End of Cube_004 mesh } // End of Cube_004 } // End of Armature