Browse Source

bunch of fixes based on feedback, adding changelog

galo 1 year ago
parent
commit
35c2f4716e

+ 3 - 0
.import/footstep2s.png-ad88e1143e2deb61c2b8566b0a9ceef8.md5

@@ -0,0 +1,3 @@
+source_md5="52f7568c8d380f8f1dc1dc46576e75df"
+dest_md5="c8c1710fb7cd2cb0c62bb6dcbd31cbdf"
+

BIN
.import/footstep2s.png-ad88e1143e2deb61c2b8566b0a9ceef8.stex


+ 2 - 2
.import/footsteps.png-008bff48e024ef369299f0f4871067c2.md5

@@ -1,3 +1,3 @@
-source_md5="1213db5b1c96a5f6b86257f2cdf0e009"
-dest_md5="cfba474eb259be38e04986ed57cfa976"
+source_md5="726d95b85886f0248c85297c92e0363a"
+dest_md5="5d66f2d9a7096c023708108011873ba4"
 

BIN
.import/footsteps.png-008bff48e024ef369299f0f4871067c2.stex


+ 3 - 0
.import/sand.png-d9d9776527d00f72b59fbb5ce17778aa.md5

@@ -0,0 +1,3 @@
+source_md5="419dfa91d1be1ff194a4886ec8b4683f"
+dest_md5="0ec4c0b65bf2374ce93542d5a90c5e56"
+

BIN
.import/sand.png-d9d9776527d00f72b59fbb5ce17778aa.stex


+ 2 - 2
.import/sandtex22.png-4141b8044e51714f8229ed8d5c2b0752.md5

@@ -1,3 +1,3 @@
-source_md5="9f34183875b7622097537e4210119d3a"
-dest_md5="ab2c6acd14be690a3345c120a3782368"
+source_md5="b7b76d61c037c1cfad11a192e7089fc4"
+dest_md5="c282a7332128f6e64d87b175ab6064b3"
 

BIN
.import/sandtex22.png-4141b8044e51714f8229ed8d5c2b0752.stex


BIN
.sandtex22.png-autosave.kra


+ 6 - 5
bacteria.tscn

@@ -214,17 +214,21 @@ tracks/6/keys = {
 [node name="bacteria" type="KinematicBody2D" groups=["player"]]
 script = ExtResource( 1 )
 
-[node name="particles" parent="." instance=ExtResource( 5 )]
-
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
 
 [node name="Camera2D" type="Camera2D" parent="."]
 current = true
 
+[node name="hitbox" parent="." instance=ExtResource( 4 )]
+dmg = 10
+
 [node name="Icon" type="Sprite" parent="."]
 texture = ExtResource( 2 )
 
+[node name="particles" parent="Icon" instance=ExtResource( 5 )]
+rotation = 1.5708
+
 [node name="l" type="Node2D" parent="Icon"]
 z_index = -1
 
@@ -256,9 +260,6 @@ rotation = 1.5708
 position = Vector2( -9, -20 )
 rotation = 1.5708
 
-[node name="hitbox" parent="." instance=ExtResource( 4 )]
-dmg = 10
-
 [node name="Health" parent="." instance=ExtResource( 3 )]
 health_max = 50
 progressbar = NodePath("../CanvasLayer/ProgressBar3")

+ 16 - 1
enemy.gd

@@ -10,14 +10,26 @@ export var detectionzone = 128
 export var exppt = 15
 onready var initspeed = Vector2(sin(rand_range(0,TAU)),cos(rand_range(0,TAU)))
 
+var dict = {
+	'ovomonstro' : 20,
+	'besourodourado' : 10,
+	'escorpiao' : 10,
+}
+
 func _ready():
 	player = get_tree().get_nodes_in_group('player')[0]
 	var array = []
 	for x in $types.get_animation_list():
-		array.append(x)
+		if dict.has(x):
+#			print(x)
+			if dict[x] < player.lv: 
+				array.append(x)
+		else:
+			array.append(x)
 	array.shuffle()
 	while array[0] == 'RESET':
 		array.shuffle()
+#	print(array)
 	$types.play(array[0])
 	name = array[0]
 	yield(Timergen.createtime(self,0.1),'timeout')
@@ -43,6 +55,9 @@ func _physics_process(delta):
 				$hitbox.position = motion * attackrange
 			move_and_slide(motion * speed)
 			$Sprite.rotation = atan2(motion.y * speed,motion.x * speed)
+		else:
+			move_and_slide(initspeed * speed)
+			$Sprite.rotation = atan2(initspeed.y * speed,initspeed.x * speed)
 #		delete_buff -= 1
 #		if delete_buff < 0: 
 #			if not $VisibilityNotifier2D.is_visible_in_tree():

+ 18 - 19
enemy.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=36 format=2]
+[gd_scene load_steps=37 format=2]
 
 [ext_resource path="res://sprite/BesouroDourado/BesouroDourado.png" type="Texture" id=1]
 [ext_resource path="res://Health.tscn" type="PackedScene" id=2]
@@ -21,6 +21,7 @@
 [ext_resource path="res://sprite/Escorpiao/EscorpiaoPerna.png" type="Texture" id=19]
 [ext_resource path="res://sprite/BesouroDourado/BesouroDouradoBraco.png" type="Texture" id=20]
 [ext_resource path="res://hitanim.gd" type="Script" id=21]
+[ext_resource path="res://sprite/footstep2s.png" type="Texture" id=22]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 40, 40 )
@@ -1861,52 +1862,50 @@ tracks/3/keys = {
 
 [node name="enemy" type="KinematicBody2D" groups=["enemy"]]
 script = ExtResource( 3 )
-speed = -200
+speed = 120
 detectionzone = 256
-exppt = 50
-
-[node name="particles" parent="." instance=ExtResource( 6 )]
+exppt = 300
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="."]
 material = SubResource( 13 )
-texture = ExtResource( 9 )
+texture = ExtResource( 11 )
 
 [node name="Sprite2" type="Sprite" parent="Sprite"]
-visible = false
 material = SubResource( 13 )
-position = Vector2( 14, -1 )
+position = Vector2( 11, -1 )
 rotation = 0.179799
 z_index = -1
-texture = ExtResource( 20 )
+texture = ExtResource( 19 )
 
 [node name="Sprite3" type="Sprite" parent="Sprite"]
-visible = false
 material = SubResource( 13 )
-position = Vector2( -14, -1 )
+position = Vector2( 4, -1 )
 rotation = -0.154826
 z_index = -1
-texture = ExtResource( 17 )
+texture = ExtResource( 19 )
 
 [node name="Sprite4" type="Sprite" parent="Sprite"]
 material = SubResource( 13 )
-position = Vector2( -12, -1 )
+position = Vector2( -4, -1 )
 rotation = 0.232153
 z_index = -1
-texture = ExtResource( 18 )
+texture = ExtResource( 19 )
+
+[node name="particles" parent="Sprite" instance=ExtResource( 6 )]
+rotation = 1.5708
+texture = ExtResource( 22 )
 
 [node name="Health" parent="." instance=ExtResource( 2 )]
-health_max = 100
+health_max = 50
 xpparticles = true
 
 [node name="hitbox" parent="." instance=ExtResource( 4 )]
-visible = false
 z_index = -5
-dmg = 0
+dmg = 20
 affect = "player"
-apc = 5.0
 
 [node name="Target4" parent="hitbox" index="2"]
 visible = false
@@ -1947,7 +1946,7 @@ position = Vector2( 60, 60 )
 scale = Vector2( 3.78125, 3.75 )
 rect = Rect2( -32, -32, 32, 32 )
 
-[connection signal="die" from="Health" to="particles" method="set_emitting" binds= [ false ]]
+[connection signal="die" from="Health" to="Sprite/particles" method="set_emitting" binds= [ false ]]
 [connection signal="die" from="Health" to="hitbox" method="hide"]
 [connection signal="die" from="Health" to="die" method="_on_Health_die"]
 [connection signal="die" from="Health" to="fadeout" method="set_physics_process" binds= [ true ]]

+ 4 - 1
particles.tscn

@@ -8,8 +8,11 @@ colors = PoolColorArray( 0.183526, 0.128054, 0.23584, 0.596078, 0.191886, 0.1214
 
 [node name="particles" type="CPUParticles2D"]
 z_index = -3
-lifetime = 2.0
+amount = 32
+lifetime = 3.0
 local_coords = false
 texture = ExtResource( 1 )
 gravity = Vector2( 0, 0 )
 color_ramp = SubResource( 7 )
+
+[node name="VisibilityEnabler2D" type="VisibilityEnabler2D" parent="."]

BIN
sand.png


+ 35 - 0
sand.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/sand.png-d9d9776527d00f72b59fbb5ce17778aa.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sand.png"
+dest_files=[ "res://.import/sand.png-d9d9776527d00f72b59fbb5ce17778aa.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=1
+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

BIN
sandtex22.png


BIN
sandtex22.png~


BIN
sprite/footstep2s.png


+ 35 - 0
sprite/footstep2s.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/footstep2s.png-ad88e1143e2deb61c2b8566b0a9ceef8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprite/footstep2s.png"
+dest_files=[ "res://.import/footstep2s.png-ad88e1143e2deb61c2b8566b0a9ceef8.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

BIN
sprite/footsteps.png


BIN
sprite/footsteps.png~