balas funcionales, ya comunican el impacto, npc en escenario con posi…

…bilidad de recibir daño, ese daño no tiene comportamiento
SergioJimenezM · Sep 8, 2019 · a8b1d76 · a8b1d76
1 parent 0b2ffb4
commit a8b1d76
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 5 deletions.
diff --git a/proyectoTanks/escenas/Mapa.tscn b/proyectoTanks/escenas/Mapa.tscn
@@ -4,10 +4,10 @@
 [ext_resource path="res://icon.png" type="Texture" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 380, 10 )
+extents = Vector2( 370, 10 )
 
 [sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 380, 10 )
+extents = Vector2( 370, 10 )
 
 [sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 10, 300 )
@@ -33,7 +33,7 @@ __meta__ = {
 }
 
 [node name="colisionSuperior" type="CollisionShape2D" parent="."]
-position = Vector2( 390, 8 )
+position = Vector2( 400, 8 )
 shape = SubResource( 1 )
 __meta__ = {
 "_edit_lock_": true
@@ -61,7 +61,7 @@ __meta__ = {
 }
 
 [node name="puntoDeSpawn2" type="Position2D" parent="."]
-position = Vector2( 80, 300 )
+position = Vector2( 100, 300 )
 __meta__ = {
 "_edit_lock_": true
 }
diff --git a/proyectoTanks/escenas/kbNPCprovicional.tscn b/proyectoTanks/escenas/kbNPCprovicional.tscn
@@ -3,7 +3,6 @@
 [ext_resource path="res://scripts/kbNPCprovicional.gd" type="Script" id=1]
 [ext_resource path="res://sprites/tankeEstructuraVerde.png" type="Texture" id=2]
 
-
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 68.804, 82.5844 )
 

diff --git a/proyectoTanks/project.godot b/proyectoTanks/project.godot
@@ -45,6 +45,34 @@ ui_cancel={
 "events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
+ui_left={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_right={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
+ ]
+}
 ui_shoot={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null)

diff --git a/proyectoTanks/scripts/Mapa.gd b/proyectoTanks/scripts/Mapa.gd
@@ -2,6 +2,11 @@ extends Node2D
 
 func _ready():
 	var spawn = get_node("puntoDeSpawn1")
+	var spawn2 = get_node("puntoDeSpawn2")
 	var tank = load("res://escenas/tankeJugador.tscn").instance()
+	var npc = load("res://escenas/kbNPCprovicional.tscn").instance()
 	tank.set_position(spawn.get_position())
+	npc.set_position(spawn2.get_position())
 	get_parent().add_child(tank)
+	get_parent().add_child(npc)
+
diff --git a/proyectoTanks/scripts/bala.gd b/proyectoTanks/scripts/bala.gd
@@ -11,5 +11,7 @@ func inicio(pos, dir):
 func _physics_process(delta):
 	var collision = move_and_collide(velocity*delta)
 	if collision:
+		if collision.collider.has_method("recibeDamages"):
+			collision.collider.recibeDamages()
 		queue_free()
 	pass
diff --git a/proyectoTanks/scripts/kbNPCprovicional.gd b/proyectoTanks/scripts/kbNPCprovicional.gd
@@ -18,6 +18,10 @@ func atacar():
 
 	pass
 
+func recibeDamages():
+	print("DAÑOOOOO")
+	pass
+
 func _physics_process(delta):
 
 	pass