Fixed ice item ot working. Added explosion sprite.

Author: hepfnepf

Diff for: .import/Bomb.png-d905e149af526d01319010a8865c5b6a.md5

@@ -0,0 +1,3 @@
+source_md5="65e5ab6165e3657ee63001e696f25f29"
+dest_md5="557bf384adbcd59447f433b911489998"
+

Diff for: .import/Bomb.png-d905e149af526d01319010a8865c5b6a.stex

@@ -0,0 +1,3 @@
+source_md5="f66222a59f38e90058a28684ee8973d0"
+dest_md5="c5bd65113e38dc18b22f794e33c3df62"
+

Diff for: .import/Granade.png-226f1f7196504ea340e413333b4f5810.md5

@@ -0,0 +1,3 @@
+source_md5="65e5ab6165e3657ee63001e696f25f29"
+dest_md5="557bf384adbcd59447f433b911489998"
+

Diff for: .import/Granade.png-226f1f7196504ea340e413333b4f5810.stex

@@ -0,0 +1,3 @@
+source_md5="65e5ab6165e3657ee63001e696f25f29"
+dest_md5="557bf384adbcd59447f433b911489998"
+

Diff for: .import/sparky-bomb.png-235de6405bd694702d9d83549b9bc14d.md5

@@ -0,0 +1,12 @@
+extends Item
+
+export (PackedScene) var explosion
+
+onready var game = get_node("/root/Game")
+
+func pick_up(player:Player):
+	if explosion==null:
+		return
+	var _exp = explosion.instance()
+	_exp.global_position = global_position
+	game.add_child(_exp)

Diff for: .import/sparky-bomb.png-235de6405bd694702d9d83549b9bc14d.stex

@@ -71,7 +71,7 @@ enemy_speed_increase = 0.01
 enemy_health_increase = 0.012
 enemy_damage_increase = 0.01
 item_array = [ ExtResource( 10 ), ExtResource( 2 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 23 ), ExtResource( 25 ), ExtResource( 16 ), ExtResource( 4 ), ExtResource( 24 ), ExtResource( 17 ), ExtResource( 26 ), ExtResource( 27 ) ]
-item_likelihood = [ 7, 15, 20, 10, 15, 5, 5, 6, 30, 6, 4, 4, 20, 3 ]
+item_likelihood = [ 7, 15, 20, 10, 15, 5, 5, 6, 10, 6, 4, 4, 20, 3 ]
 
 [node name="Map" parent="." instance=ExtResource( 3 )]
 material = SubResource( 2 )
@@ -84,9 +84,9 @@ autoplay = false
 bus = "Music"
 tracks = [ ExtResource( 19 ), ExtResource( 18 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 20 ) ]
 volumes = {
-ExtResource( 20 ): 0.0,
+ExtResource( 18 ): 0.0,
 ExtResource( 19 ): 6.0,
+ExtResource( 20 ): 0.0,
 ExtResource( 22 ): 0.0,
-ExtResource( 18 ): 0.0,
 ExtResource( 21 ): -6.0
 }

Diff for: .import/sparky-bomb.png-d76f9d5a101014ddd9e164e1f99f9cbe.md5

@@ -0,0 +1,5 @@
+[gd_scene format=2]
+
+[node name="Explosion1" type="Node2D"]
+
+[node name="Sprite" type="Sprite" parent="."]

Diff for: .import/sparky-bomb.png-d76f9d5a101014ddd9e164e1f99f9cbe.stex

@@ -28,6 +28,7 @@ shader_param/blink_speed = 1.5
 
 [node name="EffectItemBasis" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
+effect_node = null
 
 [node name="CollisionShape2D" parent="." index="0"]
 shape = SubResource( 1 )

Diff for: ExplosionBasis.gd

@@ -35,6 +35,9 @@ radius = 0.0
 
 [node name="EnemyAreaEffectItemBasis" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
+radius = 0.0
+effect_node = null
+blast_time = 1.0
 
 [node name="CollisionShape2D" parent="." index="0"]
 shape = SubResource( 3 )

Diff for: Scenes/Game.tscn

@@ -1,46 +1,34 @@
-tool
+#tool
 extends Item
+
 class_name EnemyAreaEffectItemBasis
 
-export (float) var radius setget resize_radius
-export (PackedScene) var effect_node
-onready var effect_area:Area2D = $EffectArea
-onready var coll_shape = $EffectArea/CollisionShape2D
-onready var sprite = $Sprite
 
-onready var tween_blast = $Blast
-onready var blast_radius = $BlastRadius
+export (PackedScene) var effect_node
 export (float) var blast_time = 1
-var blast_size:float = radius/4000 * 17
-
-func _ready():
-	._ready()
-	resize_radius(radius)
-
 
-func resize_radius(_radius):
-	radius = _radius
-	blast_size = (_radius/4000)*17
-	#var coll_shape:CollisionShape2D = effect_area.get_child(0)
-	if Engine.editor_hint:
-		coll_shape = get_node("EffectArea/CollisionShape2D")
-	if is_instance_valid(coll_shape):
-		#because else the moment this gets created, the radius would be set to radius, this setter would be called and create an error, becouse the collision shape does not exists yet
-		coll_shape.shape.radius = radius
+onready var tween_blast:Tween = $Blast
+onready var effect_area:Area2D = $EffectArea
+onready var blast_effect:Sprite = $BlastRadius
 
 func pick_up(player:Player):
 	if effect_node != null:
-		tween_blast.interpolate_property(blast_radius,"scale",Vector2(1,1),Vector2(blast_size,blast_size),blast_time)
+
+		var blast_size = effect_area.get_child(0).shape.radius / 4000 * 17
+		tween_blast.interpolate_property(blast_effect,"scale",Vector2(1,1),Vector2(blast_size,blast_size),blast_time)
 		tween_blast.start()
 
 		for child in get_children():
-			if child != tween_blast and child != blast_radius:
+			if child != tween_blast and child != blast_effect:
 				child.queue_free()
+
+
 		for body in effect_area.get_overlapping_bodies():
 			if body.is_in_group("ENEMIES"):
 				var _effect = effect_node.instance()
 				body.add_child(_effect)
-
+	else:
+		queue_free()
 
 
 func _on_Blast_tween_completed(object, key):

Diff for: Scenes/Items/EffectNodes/Explosion.tscn

@@ -0,0 +1,41 @@
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://ExplosionBasis.gd" type="Script" id=1]
+[ext_resource path="res://Scenes/Items/Helper/ItemBasis.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Sprites/Items/Effects/Bomb.png" type="Texture" id=3]
+
+[sub_resource type="RectangleShape2D" id=3]
+resource_local_to_scene = true
+extents = Vector2( 260.92, 255.384 )
+
+[sub_resource type="Shader" id=2]
+code = "shader_type canvas_item;
+
+uniform bool is_blinking = false;
+uniform float blink_speed = 1.5;
+uniform float starded_blinking = 0.0;
+
+void fragment(){
+	COLOR = texture(TEXTURE, UV);
+	//creates blinking
+	COLOR.a = COLOR.a*(1.0- float(is_blinking)* mod(TIME,1.0/blink_speed));//abs(sin(TIME*blink_speed)));
+	
+}"
+
+[sub_resource type="ShaderMaterial" id=4]
+resource_local_to_scene = true
+shader = SubResource( 2 )
+shader_param/is_blinking = false
+shader_param/blink_speed = 1.5
+shader_param/starded_blinking = 0.0
+
+[node name="ExplosionBasis" instance=ExtResource( 2 )]
+script = ExtResource( 1 )
+explosion = null
+
+[node name="CollisionShape2D" parent="." index="0"]
+shape = SubResource( 3 )
+
+[node name="Sprite" parent="." index="1"]
+material = SubResource( 4 )
+texture = ExtResource( 3 )

Diff for: Scenes/Items/Helper/EffectItemBasis.tscn

@@ -1,2 +1,3 @@
-tool
+#tool
+#extends Item
 extends EnemyAreaEffectItemBasis

Diff for: Scenes/Items/Helper/EnemyAreaEffectItemBasis.tscn

@@ -37,8 +37,8 @@ radius = 4000.0
 
 [node name="IceItem" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
-radius = 4000.0
 effect_node = ExtResource( 4 )
+blast_time = 1.0
 
 [node name="CollisionShape2D" parent="." index="0"]
 shape = SubResource( 3 )

Diff for: Scenes/Items/Helper/EnemyEffectItemBasis.gd

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Explosion.png-babe82cd74a80217c12f28a98ab68587.stex"
+path="res://.import/Bomb.png-d905e149af526d01319010a8865c5b6a.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Items/Effects/Explosion.png"
-dest_files=[ "res://.import/Explosion.png-babe82cd74a80217c12f28a98ab68587.stex" ]
+source_file="res://Sprites/Items/Effects/Bomb.png"
+dest_files=[ "res://.import/Bomb.png-d905e149af526d01319010a8865c5b6a.stex" ]
 
 [params]
 

Diff for: Scenes/Items/Items/Explosion.tscn

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Granade.png-226f1f7196504ea340e413333b4f5810.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Sprites/Items/Effects/Granade.png"
+dest_files=[ "res://.import/Granade.png-226f1f7196504ea340e413333b4f5810.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=true
+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