more work on soldier animation

.import/soldieremotions2.png-4937e67dff483b92b90e7503eea0a771.md5

@@ -0,0 +1,3 @@
+source_md5="b33b49654971f9b15f2df06b95c794b8"
+dest_md5="aa6055a945a45923ad76853e64ecb81e"
+

NPC/soldier/soldieranim.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=57 format=2]
+[gd_scene load_steps=58 format=2]
 
 [ext_resource path="res://Art/NPC/soldier/head2.png" type="Texture" id=1]
 [ext_resource path="res://Art/NPC/soldier/helmet.png" type="Texture" id=2]
@@ -17,6 +17,7 @@
 [ext_resource path="res://art/NPC/soldier/helmet2.png" type="Texture" id=15]
 [ext_resource path="res://art/NPC/soldier/soldiertest2.png" type="Texture" id=16]
 [ext_resource path="res://art/NPC/soldier/head3.png" type="Texture" id=17]
+[ext_resource path="res://art/NPC/soldier/soldieremotions2.png" type="Texture" id=18]
 
 [sub_resource type="Animation" id=39]
 length = 0.001
@@ -104,6 +105,42 @@ tracks/6/keys = {
 "update": 0,
 "values": [ false ]
 }
+tracks/7/type = "value"
+tracks/7/path = NodePath("body/arm2/forearm:rotation_degrees")
+tracks/7/interp = 1
+tracks/7/loop_wrap = true
+tracks/7/imported = false
+tracks/7/enabled = true
+tracks/7/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ -14.8424 ]
+}
+tracks/8/type = "value"
+tracks/8/path = NodePath("body/arm2:rotation_degrees")
+tracks/8/interp = 1
+tracks/8/loop_wrap = true
+tracks/8/imported = false
+tracks/8/enabled = true
+tracks/8/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ -66.6456 ]
+}
+tracks/9/type = "value"
+tracks/9/path = NodePath("body/head/soldieremotions:frame")
+tracks/9/interp = 1
+tracks/9/loop_wrap = true
+tracks/9/imported = false
+tracks/9/enabled = true
+tracks/9/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ 7 ]
+}
 
 [sub_resource type="Animation" id=1]
 resource_name = "aim"
@@ -15937,6 +15974,7 @@ tracks/67/keys = {
 
 [sub_resource type="Animation" id=21]
 length = 1.4
+loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath("body/arm2/forearm/hand:scale")
 tracks/0/interp = 1
@@ -16717,6 +16755,18 @@ tracks/64/keys = {
 "update": 1,
 "values": [ 5 ]
 }
+tracks/65/type = "value"
+tracks/65/path = NodePath("body/head/soldieremotions:frame")
+tracks/65/interp = 1
+tracks/65/loop_wrap = true
+tracks/65/imported = false
+tracks/65/enabled = true
+tracks/65/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 7 ]
+}
 
 [sub_resource type="Animation" id=22]
 loop = true
@@ -26416,7 +26466,7 @@ tracks/4/keys = {
 "times": PoolRealArray( 0, 0.25, 0.45, 0.65 ),
 "transitions": PoolRealArray( 1, 1, 1, 1 ),
 "update": 0,
-"values": [ 0.0, -5.33154, 55.4324, -7.28775 ]
+"values": [ 0.0, -5.33154, -14.8424, -7.28775 ]
 }
 tracks/5/type = "value"
 tracks/5/path = NodePath("body/arm2/forearm:position")
@@ -26485,10 +26535,10 @@ tracks/10/loop_wrap = true
 tracks/10/imported = false
 tracks/10/enabled = true
 tracks/10/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PoolRealArray( 0, 0.45 ),
+"transitions": PoolRealArray( 1, 1 ),
 "update": 0,
-"values": [ 0.0 ]
+"values": [ 0.0, -66.6456 ]
 }
 tracks/11/type = "value"
 tracks/11/path = NodePath("body/arm2:position")
@@ -27174,6 +27224,42 @@ tracks/67/keys = {
 "update": 1,
 "values": [ false ]
 }
+tracks/68/type = "value"
+tracks/68/path = NodePath("body/head/Sprite2:frame")
+tracks/68/interp = 1
+tracks/68/loop_wrap = true
+tracks/68/imported = false
+tracks/68/enabled = true
+tracks/68/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 4 ]
+}
+tracks/69/type = "value"
+tracks/69/path = NodePath("body/head/Sprite3:frame")
+tracks/69/interp = 1
+tracks/69/loop_wrap = true
+tracks/69/imported = false
+tracks/69/enabled = true
+tracks/69/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 4 ]
+}
+tracks/70/type = "value"
+tracks/70/path = NodePath("body/gun/handle/Sprite:frame")
+tracks/70/interp = 1
+tracks/70/loop_wrap = true
+tracks/70/imported = false
+tracks/70/enabled = true
+tracks/70/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ 0 ]
+}
 
 [sub_resource type="Shader" id=36]
 code = "shader_type canvas_item;
@@ -27204,7 +27290,7 @@ shader_param/particles_anim_h_frames = 4
 shader_param/particles_anim_v_frames = 4
 shader_param/offset = 2.0
 shader_param/particles_anim_loop = true
-shader_param/progress = 0.0
+shader_param/progress = 0.600034
 
 [sub_resource type="Animation" id=38]
 loop = true
@@ -27237,7 +27323,7 @@ tracks/1/keys = {
 position = Vector2( 48.0731, 59.8597 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-autoplay = "rotate2"
+autoplay = "idle"
 anims/RESET = SubResource( 39 )
 anims/aim = SubResource( 1 )
 anims/alert = SubResource( 2 )
@@ -27299,6 +27385,7 @@ region_rect = Rect2( 28.5615, 66.124, 16.7204, 19.779 )
 position = Vector2( -3.23602, 12.4778 )
 
 [node name="Sprite2" type="Sprite" parent="body/head"]
+visible = false
 position = Vector2( 1, 0 )
 texture = ExtResource( 1 )
 offset = Vector2( 0, -7 )
@@ -27310,11 +27397,14 @@ text1 = ExtResource( 1 )
 text2 = ExtResource( 17 )
 
 [node name="soldieremotions" type="Sprite" parent="body/head"]
-visible = false
 position = Vector2( 1, -7 )
 texture = ExtResource( 7 )
 hframes = 5
 vframes = 5
+frame = 7
+script = ExtResource( 4 )
+text1 = ExtResource( 7 )
+text2 = ExtResource( 18 )
 
 [node name="Sprite3" type="Sprite" parent="body/head"]
 position = Vector2( 1, 0 )
@@ -27329,13 +27419,14 @@ text1 = ExtResource( 2 )
 text2 = ExtResource( 15 )
 
 [node name="medal" type="Sprite" parent="body"]
-position = Vector2( -1.0702, 20.0597 )
+position = Vector2( 0.879767, 19.8856 )
+z_index = 1
 texture = ExtResource( 5 )
 region_enabled = true
 region_rect = Rect2( 126.614, 74.6779, 5.20671, 6.94229 )
 
 [node name="belt" type="Sprite" parent="body"]
-position = Vector2( -2.57571, 23.7251 )
+position = Vector2( -3, 24 )
 z_index = 1
 texture = ExtResource( 5 )
 region_enabled = true
@@ -27351,7 +27442,7 @@ region_enabled = true
 region_rect = Rect2( 116.939, 29.9277, 18.1202, 9.5099 )
 
 [node name="leg" type="Sprite" parent="body"]
-position = Vector2( -5.652, 30 )
+position = Vector2( -7, 30 )
 z_index = -3
 texture = ExtResource( 5 )
 offset = Vector2( 0, 5 )
@@ -27359,13 +27450,13 @@ region_enabled = true
 region_rect = Rect2( 82, 34, 7, 13 )
 
 [node name="feet" type="Sprite" parent="body/leg"]
-position = Vector2( -0.696178, 11.486 )
+position = Vector2( 0, 12 )
 texture = ExtResource( 5 )
 region_enabled = true
 region_rect = Rect2( 7, 45, 6, 10 )
 
 [node name="leg2" type="Sprite" parent="body"]
-position = Vector2( -0.607, 30 )
+position = Vector2( 0, 30 )
 z_index = -3
 texture = ExtResource( 5 )
 offset = Vector2( 0, 5 )
@@ -27373,16 +27464,15 @@ region_enabled = true
 region_rect = Rect2( 82, 34, 7, 13 )
 
 [node name="feet" type="Sprite" parent="body/leg2"]
-position = Vector2( -0.696178, 11.4781 )
+position = Vector2( 0, 11 )
 texture = ExtResource( 5 )
 region_enabled = true
 region_rect = Rect2( 7, 44, 6, 10 )
 
 [node name="arm" type="Sprite" parent="body"]
 show_behind_parent = true
-position = Vector2( -9.39812, 13.3782 )
-rotation = -0.42142
-z_index = 4
+position = Vector2( -8.42379, 14.0876 )
+z_index = 3
 texture = ExtResource( 5 )
 offset = Vector2( 0, 3.18198 )
 region_enabled = true
@@ -27396,16 +27486,16 @@ region_enabled = true
 region_rect = Rect2( 4.98756, 125.181, 5.78305, 4.11239 )
 
 [node name="forearm" type="Sprite" parent="body/arm"]
-position = Vector2( -1.20538, 6.99522 )
-rotation = 0.502236
+position = Vector2( -1.94454, 7.29204 )
+rotation = -0.166435
 texture = ExtResource( 5 )
 offset = Vector2( 2.51907, 2.87262 )
 region_enabled = true
 region_rect = Rect2( 76.8466, 81.4215, 10.1525, 6.2971 )
 
 [node name="hand" type="Sprite" parent="body/arm/forearm"]
-position = Vector2( 4.21074, 3.71294 )
-rotation = -0.138136
+position = Vector2( 4.42659, 3.85746 )
+rotation = 0.169022
 texture = ExtResource( 5 )
 offset = Vector2( 1.62801, 0.0316229 )
 region_enabled = true
@@ -27426,8 +27516,9 @@ z_index = -1
 texture = ExtResource( 14 )
 
 [node name="gun" type="Node2D" parent="body"]
-position = Vector2( 1.53586, 20.7368 )
-z_index = 3
+position = Vector2( 2.68762, 23.8267 )
+rotation = 0.253078
+z_index = 1
 
 [node name="handle" type="Node2D" parent="body/gun"]
 
@@ -27452,9 +27543,8 @@ texture = ExtResource( 14 )
 
 [node name="arm2" type="Sprite" parent="body"]
 show_behind_parent = true
-position = Vector2( 1.23305, 13.6592 )
-rotation = -0.804405
-z_index = 2
+position = Vector2( 1.31518, 14.6016 )
+rotation = -1.16318
 texture = ExtResource( 5 )
 offset = Vector2( 0, 3.18198 )
 region_enabled = true
@@ -27477,16 +27567,16 @@ region_enabled = true
 region_rect = Rect2( 4.98756, 125.181, 5.78305, 4.11239 )
 
 [node name="forearm" type="Sprite" parent="body/arm2"]
-position = Vector2( -2.51022, 7.23914 )
-rotation = 2.29643
+position = Vector2( -1.94454, 7.29204 )
+rotation = -0.259049
 texture = ExtResource( 5 )
 offset = Vector2( 2.51907, 2.87262 )
 region_enabled = true
 region_rect = Rect2( 76.8466, 81.4215, 10.1525, 6.2971 )
 
 [node name="hand" type="Sprite" parent="body/arm2/forearm"]
-position = Vector2( 5.29813, 3.5056 )
-rotation = 1.77627
+position = Vector2( 4.42659, 2.26468 )
+rotation = -0.541674
 z_index = 2
 texture = ExtResource( 5 )
 offset = Vector2( 1.62801, 0.0316229 )
@@ -27502,13 +27592,13 @@ texture = ExtResource( 8 )
 [node name="esclamation" type="Sprite" parent="body"]
 visible = false
 position = Vector2( 11.6929, -0.907277 )
-scale = Vector2( 1.10078, 1.10078 )
+scale = Vector2( 5, 1e-05 )
 texture = ExtResource( 9 )
 
 [node name="siren" type="Sprite" parent="."]
 visible = false
 position = Vector2( 35.0016, 23.0102 )
-scale = Vector2( -1, 0.9 )
+scale = Vector2( -1.04, 0.860003 )
 z_index = -1
 texture = ExtResource( 11 )
 

art/NPC/soldier/soldieremotions2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/soldieremotions2.png-4937e67dff483b92b90e7503eea0a771.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/NPC/soldier/soldieremotions2.png"
+dest_files=[ "res://.import/soldieremotions2.png-4937e67dff483b92b90e7503eea0a771.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0