Browse Source

bunch of fixes based on feedback, adding changelog

galo 1 year ago
parent
commit
6e08d66000
7 changed files with 46 additions and 11 deletions
  1. 1 1
      PowerUpControl.gd
  2. 2 2
      bacteria.gd
  3. 30 6
      bacteria.tscn
  4. 10 1
      effects/xp.tscn
  5. 1 0
      fadeout.gd
  6. 1 1
      powerups.gd
  7. 1 0
      restarter.gd

+ 1 - 1
PowerUpControl.gd

@@ -86,7 +86,7 @@ func _on_ItemList_item_activated(index):
 			for x in Powerups[dict][power]['upgrade'].keys():
 				 Powerups[dict][power][x] += Powerups[dict][power]['upgrade'][x]
 		Powerups.dict[dict2] = Powerups[dict][power]
-		get_parent().get_node("bacteria")._ready()
+		get_parent().get_node("bacteria")._load()
 		print(dict2)
 		print(power)
 #		get_tree().paused = false

+ 2 - 2
bacteria.gd

@@ -2,7 +2,7 @@ extends KinematicBody2D
 
 var motion = Vector2()
 var dir = Vector2()
-export var speed = 500
+export var speed = 200
 var attackrange = 80
 signal dieproxy
 var exppt = 0
@@ -21,7 +21,7 @@ func get_stat(arg):
 	print(arg +" stat is : "+ str(buff))
 	return buff
 
-func _ready():
+func _load():
 	
 	self.speed = get_stat('speed') * 200
 	self.xpmult = get_stat('xpmult')

+ 30 - 6
bacteria.tscn

@@ -49,7 +49,7 @@ tracks/0/keys = {
 "times": PoolRealArray( -0.00999999, 0.5, 0.99 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 80.0, 100.0, 80.0 ]
+"values": [ 70.0, 110.0, 70.0 ]
 }
 tracks/1/type = "value"
 tracks/1/path = NodePath("Icon/l/menbros1:rotation_degrees")
@@ -61,7 +61,7 @@ tracks/1/keys = {
 "times": PoolRealArray( -0.00999999, 0.5, 1 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 80.0, 100.0, 80.0 ]
+"values": [ 70.0, 110.0, 70.0 ]
 }
 tracks/2/type = "value"
 tracks/2/path = NodePath("Icon/r/menbros0:rotation_degrees")
@@ -73,7 +73,7 @@ tracks/2/keys = {
 "times": PoolRealArray( 0, 0.5, 1 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 100.0, 80.0, 100.0 ]
+"values": [ 110.0, 70.0, 110.0 ]
 }
 tracks/3/type = "value"
 tracks/3/path = NodePath("Icon/l/menbros2:rotation_degrees")
@@ -85,7 +85,7 @@ tracks/3/keys = {
 "times": PoolRealArray( 0, 0.5, 1 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 100.0, 80.0, 100.0 ]
+"values": [ 110.0, 70.0, 110.0 ]
 }
 tracks/4/type = "value"
 tracks/4/path = NodePath("Icon/r/menbros1:rotation_degrees")
@@ -97,7 +97,7 @@ tracks/4/keys = {
 "times": PoolRealArray( 0, 0.5, 1 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 100.0, 80.0, 100.0 ]
+"values": [ 110.0, 70.0, 110.0 ]
 }
 tracks/5/type = "value"
 tracks/5/path = NodePath("Icon/r/menbros2:rotation_degrees")
@@ -109,7 +109,19 @@ tracks/5/keys = {
 "times": PoolRealArray( -0.00999999, 0.5, 1 ),
 "transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ 80.0, 100.0, 80.0 ]
+"values": [ 70.0, 110.0, 70.0 ]
+}
+tracks/6/type = "value"
+tracks/6/path = NodePath("Icon:scale")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/keys = {
+"times": PoolRealArray( 0, 0.3, 0.7, 1 ),
+"transitions": PoolRealArray( 1, 1, 1, 1 ),
+"update": 0,
+"values": [ Vector2( 1, 1 ), Vector2( 0.9, 1.1 ), Vector2( 1.05, 0.95 ), Vector2( 1, 1 ) ]
 }
 
 [sub_resource type="Animation" id=3]
@@ -186,6 +198,18 @@ tracks/5/keys = {
 "update": 0,
 "values": [ 90.0 ]
 }
+tracks/6/type = "value"
+tracks/6/path = NodePath("Icon:scale")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Vector2( 1, 1 ) ]
+}
 
 [node name="bacteria" type="KinematicBody2D" groups=["player"]]
 script = ExtResource( 1 )

+ 10 - 1
effects/xp.tscn

@@ -1,7 +1,12 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://icon.png" type="Texture" id=1]
 
+[sub_resource type="Curve" id=3]
+min_value = -360.0
+max_value = 360.0
+_data = [ Vector2( 0, 360 ), 0.0, 0.0, 0, 0, Vector2( 1, -359.182 ), 0.0, 0.0, 0, 0 ]
+
 [sub_resource type="Curve" id=2]
 _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.5, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]
 
@@ -38,10 +43,14 @@ func _physics_process(delta):
 "
 
 [node name="CPUParticles2D" type="CPUParticles2D"]
+modulate = Color( 1, 10, 10, 1 )
 lifetime = 0.2
 local_coords = false
 texture = ExtResource( 1 )
 gravity = Vector2( 0, 0 )
+angle = -720.0
+angle_random = 1.0
+angle_curve = SubResource( 3 )
 scale_amount = 0.25
 scale_amount_curve = SubResource( 2 )
 script = SubResource( 1 )

+ 1 - 0
fadeout.gd

@@ -13,3 +13,4 @@ func _physics_process(delta):
 	node.scale.x += delta * speed
 	node.scale.y += delta * speed
 	node.modulate.a -= delta * speed
+

+ 1 - 1
powerups.gd

@@ -25,7 +25,7 @@ var menbros = {
 		'upgrade': {'atkspeed':0.1,'range':0.05},
 		'level':1,
 		'name':'menbro_chicote',
-		'icone':load("res://sprite/menbros/MembroChicote.png"),
+		'icone':load("res://sprite/IconesMembros/MembroChicote.png"),
 	},
 	'pernas_ligeiras':{
 		'img':load("res://sprite/menbros/PatasLigeiras.png"),

+ 1 - 0
restarter.gd

@@ -10,5 +10,6 @@ func _on_Button_button_down():
 
 func _on_bacteria_dieproxy():
 	$MarginContainer.show()
+	Powerups.dict = Powerups.dictbkp
 	get_tree().paused = true
 	pass # Replace with function body.