diff --git a/All.tscn b/All.tscn index 62f38d4..be4c055 100644 --- a/All.tscn +++ b/All.tscn @@ -36,10 +36,10 @@ world = null transparent_bg = false render_target/enabled = false render_target/v_flip = false -render_target/clear_on_new_frame = false +render_target/clear_on_new_frame = true render_target/filter = false render_target/gen_mipmaps = false -render_target/update_mode = 2 +render_target/update_mode = 3 audio_listener/enable_2d = true audio_listener/enable_3d = false physics/object_picking = false @@ -106,7 +106,6 @@ visibility_mode = 0 [node name="Bttn_AS" type="TouchScreenButton" parent="Control/Buttons"] -visibility/visible = false visibility/opacity = 0.5 transform/pos = Vector2( 1088, 416 ) transform/scale = Vector2( 2, 2 ) @@ -155,7 +154,7 @@ visibility_mode = 0 visibility/opacity = 0.0 transform/pos = Vector2( 288, 576 ) -transform/scale = Vector2( 0.25, 0.25 ) +transform/scale = Vector2( 0.474074, 0.481203 ) normal = ExtResource( 4 ) pressed = null bitmask = null @@ -170,7 +169,7 @@ visibility_mode = 0 visibility/opacity = 0.0 transform/pos = Vector2( 32, 576 ) -transform/scale = Vector2( 0.25, 0.25 ) +transform/scale = Vector2( 0.474074, 0.481203 ) normal = ExtResource( 4 ) pressed = null bitmask = null diff --git a/Controles.gd b/Controles.gd index 9f7e2ff..547c27e 100644 --- a/Controles.gd +++ b/Controles.gd @@ -116,9 +116,7 @@ func _on_Bttn_S_released(): # MIX func _on_Bttn_AS_pressed(): - Input.action_press("ui_jump") - Input.action_press("ui_shoot") + Input.action_press("ui_change_weapon") func _on_Bttn_AS_released(): - Input.action_release("ui_jump") - Input.action_release("ui_shoot") + Input.action_release("ui_change_weapon") diff --git a/Splash.tscn b/Splash.tscn new file mode 100644 index 0000000..0ad630b --- /dev/null +++ b/Splash.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=2 format=1] + +[ext_resource path="res://leche.png" type="Texture" id=1] + +[node name="Splash" type="Particles2D"] + +config/amount = 30 +config/lifetime = 0.2 +config/preprocess = 1282.8 +config/emit_timeout = 0.2 +config/emitting = false +config/process_mode = 0 +config/local_space = false +config/texture = ExtResource( 1 ) +params/direction = 0.0 +params/spread = 180.0 +params/linear_velocity = 200.0 +params/spin_velocity = 0.0 +params/orbit_velocity = 0.0 +params/gravity_direction = 0.0 +params/gravity_strength = 9.8 +params/radial_accel = 0.0 +params/tangential_accel = 0.0 +params/damping = 0.0 +params/initial_angle = 0.0 +params/initial_size = 1.0 +params/final_size = 0.0 +params/hue_variation = 0.0 +params/anim_speed_scale = 1.0 +params/anim_initial_pos = 0.0 + + diff --git a/bullet.tscn b/bullet.tscn index e5eb43c..193a2ad 100644 --- a/bullet.tscn +++ b/bullet.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=4 format=1] +[gd_scene load_steps=5 format=1] [ext_resource path="res://bullet.gd" type="Script" id=1] [ext_resource path="res://leche.png" type="Texture" id=2] +[ext_resource path="res://Splash.tscn" type="PackedScene" id=3] [sub_resource type="CircleShape2D" id=1] @@ -67,32 +68,7 @@ params/hue_variation = 0.0 params/anim_speed_scale = 0.0 params/anim_initial_pos = 0.0 -[node name="Splash" type="Particles2D" parent="."] - -config/amount = 30 -config/lifetime = 0.2 -config/preprocess = 1282.8 -config/emit_timeout = 0.2 -config/emitting = false -config/process_mode = 0 -config/local_space = false -config/texture = ExtResource( 2 ) -params/direction = 0.0 -params/spread = 180.0 -params/linear_velocity = 200.0 -params/spin_velocity = 0.0 -params/orbit_velocity = 0.0 -params/gravity_direction = 0.0 -params/gravity_strength = 9.8 -params/radial_accel = 0.0 -params/tangential_accel = 0.0 -params/damping = 0.0 -params/initial_angle = 0.0 -params/initial_size = 1.0 -params/final_size = 0.0 -params/hue_variation = 0.0 -params/anim_speed_scale = 1.0 -params/anim_initial_pos = 0.0 +[node name="Splash" parent="." instance=ExtResource( 3 )] [connection signal="body_enter" from="." to="." method="_on_RigidBody2D_body_enter"] diff --git a/enemy_1.gd b/enemy_1.gd index ae501a6..1186213 100644 --- a/enemy_1.gd +++ b/enemy_1.gd @@ -9,6 +9,7 @@ export var velocity = 250 var v = Vector2(-velocity, 0) onready var sprite = get_node("Sprite") +onready var area_head = get_node("area_head") export(bool) var dir_left = true; @@ -31,6 +32,7 @@ func die_by_jump(): set_shape_as_trigger(0, true) get_node("Sprite").set_opacity(0) Input.action_press("ui_jump") + Input.action_release("ui_jump") var t = Timer.new() t.set_wait_time(0.2) t.set_one_shot(true) @@ -38,7 +40,7 @@ func die_by_jump(): t.start() yield(t, "timeout") queue_free() - Input.action_release("ui_jump") + func die(): queue_free() @@ -74,7 +76,7 @@ func _on_area_body_body_enter( body ): func _on_area_head_body_enter( body ): if (body.is_in_group("player") and body.can_receive_damage()): - if (body.foots.get_pos().y > get_pos().y): + if (body.foots.get_global_pos().y > area_head.get_global_pos().y): print ("cabeza") life = 0 die_by_jump() \ No newline at end of file diff --git a/enemy_1.tscn b/enemy_1.tscn index 299c562..16463a3 100644 --- a/enemy_1.tscn +++ b/enemy_1.tscn @@ -151,7 +151,8 @@ trigger = false transform/pos = Vector2( 3.8147e-06, 0 ) frames = SubResource( 8 ) animation = "walking" -frame = 8 +frame = 3 +playing = true [connection signal="body_enter" from="area_head" to="." method="_on_area_head_body_enter"] diff --git a/engine.cfg b/engine.cfg index c9b4265..d89f8a3 100644 --- a/engine.cfg +++ b/engine.cfg @@ -20,10 +20,16 @@ stretch_mode="viewport" fullscreen=false orientation="landscape" +[image_loader] + +filter=false +gen_mipmaps=false + [input] ui_left=[key(Left)] ui_right=[key(Right)] +ui_change_weapon=[key(R)] ui_jump=[key(A), key(Space), jbutton(0, 2)] ui_shoot=[key(S), jbutton(0, 3)] diff --git a/global.gd b/global.gd index 19d11e4..3129152 100644 --- a/global.gd +++ b/global.gd @@ -17,5 +17,5 @@ func release_all(): func _ready(): # Called every time the node is added to the scene. - # Initialization here - pass + # Initialization here + pass \ No newline at end of file diff --git a/milk_ray/middle/.directory b/milk_ray/middle/.directory new file mode 100644 index 0000000..5d0d62b --- /dev/null +++ b/milk_ray/middle/.directory @@ -0,0 +1,7 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2017,7,27,21,57,16 +Version=4 + +[Settings] +HiddenFilesShown=true diff --git a/milk_ray/middle/milk_ray.png b/milk_ray/middle/milk_ray.png new file mode 100644 index 0000000..f1add94 Binary files /dev/null and b/milk_ray/middle/milk_ray.png differ diff --git a/milk_ray/middle/milk_ray.png.flags b/milk_ray/middle/milk_ray.png.flags new file mode 100644 index 0000000..e69de29 diff --git a/milk_ray/middle/milk_ray_middle0000.png b/milk_ray/middle/milk_ray_middle0000.png new file mode 100644 index 0000000..f1add94 Binary files /dev/null and b/milk_ray/middle/milk_ray_middle0000.png differ diff --git a/milk_ray/middle/milk_ray_middle0000.png.flags b/milk_ray/middle/milk_ray_middle0000.png.flags new file mode 100644 index 0000000..d5476d5 --- /dev/null +++ b/milk_ray/middle/milk_ray_middle0000.png.flags @@ -0,0 +1 @@ +repeat=true diff --git a/milk_ray/origin/milk_ray_origin0000.png b/milk_ray/origin/milk_ray_origin0000.png new file mode 100644 index 0000000..8ffeeda Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0000.png differ diff --git a/milk_ray/origin/milk_ray_origin0001.png b/milk_ray/origin/milk_ray_origin0001.png new file mode 100644 index 0000000..8ffeeda Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0001.png differ diff --git a/milk_ray/origin/milk_ray_origin0002.png b/milk_ray/origin/milk_ray_origin0002.png new file mode 100644 index 0000000..8ffeeda Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0002.png differ diff --git a/milk_ray/origin/milk_ray_origin0003.png b/milk_ray/origin/milk_ray_origin0003.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0003.png differ diff --git a/milk_ray/origin/milk_ray_origin0004.png b/milk_ray/origin/milk_ray_origin0004.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0004.png differ diff --git a/milk_ray/origin/milk_ray_origin0005.png b/milk_ray/origin/milk_ray_origin0005.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0005.png differ diff --git a/milk_ray/origin/milk_ray_origin0006.png b/milk_ray/origin/milk_ray_origin0006.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0006.png differ diff --git a/milk_ray/origin/milk_ray_origin0007.png b/milk_ray/origin/milk_ray_origin0007.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0007.png differ diff --git a/milk_ray/origin/milk_ray_origin0008.png b/milk_ray/origin/milk_ray_origin0008.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0008.png differ diff --git a/milk_ray/origin/milk_ray_origin0009.png b/milk_ray/origin/milk_ray_origin0009.png new file mode 100644 index 0000000..ac962aa Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0009.png differ diff --git a/milk_ray/origin/milk_ray_origin0010.png b/milk_ray/origin/milk_ray_origin0010.png new file mode 100644 index 0000000..ac962aa Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0010.png differ diff --git a/milk_ray/origin/milk_ray_origin0011.png b/milk_ray/origin/milk_ray_origin0011.png new file mode 100644 index 0000000..ac962aa Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0011.png differ diff --git a/milk_ray/origin/milk_ray_origin0012.png b/milk_ray/origin/milk_ray_origin0012.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0012.png differ diff --git a/milk_ray/origin/milk_ray_origin0013.png b/milk_ray/origin/milk_ray_origin0013.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0013.png differ diff --git a/milk_ray/origin/milk_ray_origin0014.png b/milk_ray/origin/milk_ray_origin0014.png new file mode 100644 index 0000000..a7c354e Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0014.png differ diff --git a/milk_ray/origin/milk_ray_origin0015.png b/milk_ray/origin/milk_ray_origin0015.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0015.png differ diff --git a/milk_ray/origin/milk_ray_origin0016.png b/milk_ray/origin/milk_ray_origin0016.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0016.png differ diff --git a/milk_ray/origin/milk_ray_origin0017.png b/milk_ray/origin/milk_ray_origin0017.png new file mode 100644 index 0000000..316818a Binary files /dev/null and b/milk_ray/origin/milk_ray_origin0017.png differ diff --git a/player.gd b/player.gd index 490b524..eb22508 100644 --- a/player.gd +++ b/player.gd @@ -22,6 +22,7 @@ onready var shooter = get_node("shooter") onready var sprite = get_node("sprite") onready var foots = get_node("foots") + var can_jump = true var jumping = false var velocity = Vector2() @@ -51,8 +52,8 @@ func add_milk(amount): func get_milk_level(): return milk_level -func decrease_milk(): - milk_level = milk_level - 1 +func decrease_milk(amount): + milk_level = milk_level - amount emit_signal("update_milk", get_max_milk(), get_milk_level()); func on_opacity_low (): @@ -100,7 +101,6 @@ func horizontal_movement_amount (): walk_speed += WALK_SPEED_INCREMENT return walk_speed - func _fixed_process(delta): if (jumping): jump_time -= altitude @@ -123,14 +123,17 @@ func _fixed_process(delta): # Movimiento horizontal if (Input.is_action_pressed("ui_left")): + sprite.set_animation("walk") emit_signal("looking_left"); velocity.x = - horizontal_movement_amount() sprite.set_flip_h(true) elif (Input.is_action_pressed("ui_right")): + sprite.set_animation("walk") velocity.x = horizontal_movement_amount() emit_signal("looking_right"); sprite.set_flip_h(false) else: + sprite.set_animation("Idle") if (velocity.x > SLIDE_LEVEL): velocity.x -= SLIDE_LEVEL elif (velocity.x < -SLIDE_LEVEL): @@ -168,7 +171,7 @@ func _fixed_process(delta): jump_time = 0 else: # Está en el suelo - if (normal.y < -0.5): + if (normal.y < -0.25): can_jump = true jumping = false motion = normal.slide(motion) @@ -181,4 +184,5 @@ func _fixed_process(delta): func _ready(): connect("update_milk",get_tree().get_nodes_in_group("control")[0],"on_update_milk_bar") emit_signal("update_milk", get_max_milk(), get_milk_level()); - set_fixed_process(true) + set_fixed_process(true) + diff --git a/player.tscn b/player.tscn index b434647..77e2838 100644 --- a/player.tscn +++ b/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=1] +[gd_scene load_steps=27 format=1] [ext_resource path="res://player.gd" type="Script" id=1] [ext_resource path="res://shooter.gd" type="Script" id=2] @@ -7,11 +7,27 @@ [ext_resource path="res://vaca_idle_2.tex" type="Texture" id=5] [ext_resource path="res://vaca_idle_3.tex" type="Texture" id=6] [ext_resource path="res://vaca_idle_4.tex" type="Texture" id=7] +[ext_resource path="res://vaca_walk/vakacaminar0005.png" type="Texture" id=8] +[ext_resource path="res://vaca_walk/vakacaminar0006.png" type="Texture" id=9] +[ext_resource path="res://vaca_walk/vakacaminar0007.png" type="Texture" id=10] +[ext_resource path="res://vaca_walk/vakacaminar0008.png" type="Texture" id=11] +[ext_resource path="res://vaca_walk/vakacaminar0009.png" type="Texture" id=12] +[ext_resource path="res://vaca_walk/vakacaminar0010.png" type="Texture" id=13] +[ext_resource path="res://vaca_walk/vakacaminar0011.png" type="Texture" id=14] +[ext_resource path="res://vaca_walk/vakacaminar0012.png" type="Texture" id=15] +[ext_resource path="res://vaca_walk/vakacaminar0013.png" type="Texture" id=16] +[ext_resource path="res://vaca_walk/vakacaminar0014.png" type="Texture" id=17] +[ext_resource path="res://vaca_walk/vakacaminar0015.png" type="Texture" id=18] +[ext_resource path="res://vaca_walk/vakacaminar0016.png" type="Texture" id=19] +[ext_resource path="res://vaca_walk/vakacaminar0017.png" type="Texture" id=20] +[ext_resource path="res://vaca_walk/vakacaminar0018.png" type="Texture" id=21] +[ext_resource path="res://vaca_walk/vakacaminar0019.png" type="Texture" id=22] +[ext_resource path="res://vaca_walk/vakacaminar0020.png" type="Texture" id=23] [sub_resource type="ConvexPolygonShape2D" id=1] custom_solver_bias = 0.0 -points = Vector2Array( -16.5903, -10.3465, 13.4341, -10.3403, 13.4341, 9.72513, 10.9093, 12.2861, -13.9703, 12.2402, -16.5903, 9.71889 ) +points = Vector2Array( -16.5903, -10.3465, 13.4341, -10.3403, 13.6042, 6.10309, 1.07087, 13.1015, -3.59432, 13.1015, -16.6847, 5.56475 ) [sub_resource type="RectangleShape2D" id=2] @@ -25,6 +41,11 @@ animations = [ { "loop": true, "name": "Idle", "speed": 10.0 +}, { +"frames": [ ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ) ], +"loop": true, +"name": "walk", +"speed": 20.0 } ] [node name="Player" type="KinematicBody2D"] @@ -32,7 +53,7 @@ animations = [ { transform/scale = Vector2( 1.8, 1.8 ) input/pickable = false shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.19062, 2.93931, -5.78916 ) +shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.10364, 2.93931, -4.91934 ) shapes/0/trigger = false shapes/1/shape = SubResource( 2 ) shapes/1/transform = Matrix32( 2.31574, 0, 0, 1.23398, -0.18514, 15.1934 ) @@ -51,6 +72,7 @@ invulneravility_time = 2 [node name="shooter" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 32, 0 ) transform/scale = Vector2( 0.5, 0.5 ) script/script = ExtResource( 2 ) @@ -63,10 +85,10 @@ layer_mask = 30 [node name="Collision_Normal" type="CollisionPolygon2D" parent="."] -transform/pos = Vector2( 2.93931, -5.78916 ) -transform/scale = Vector2( 1.89755, 3.19062 ) +transform/pos = Vector2( 2.93931, -4.91934 ) +transform/scale = Vector2( 1.89755, 3.10364 ) build_mode = 0 -polygon = Vector2Array( -16.5903, 9.71889, -13.9703, 12.2402, 10.9093, 12.2861, 13.4341, 9.72513, 13.4341, -10.3403, -16.5903, -10.3465 ) +polygon = Vector2Array( -16.6847, 5.56475, -3.59432, 13.1015, 1.07087, 13.1015, 13.6042, 6.10309, 13.4341, -10.3403, -16.5903, -10.3465 ) shape_range = Vector2( 0, 0 ) trigger = false @@ -82,12 +104,12 @@ _update_shape_index = 1 frames = SubResource( 3 ) animation = "Idle" -frame = 3 +frame = 2 playing = true [node name="Camera2D" type="Camera2D" parent="sprite"] -transform/pos = Vector2( -18.8808, 11.007 ) +transform/pos = Vector2( -16.3704, 15.4993 ) transform/scale = Vector2( 23.4375, 45.3125 ) anchor_mode = 1 rotating = false diff --git a/ray.gd b/ray.gd index 067c7b1..fdb0fa5 100644 --- a/ray.gd +++ b/ray.gd @@ -6,7 +6,7 @@ extends RayCast2D func _ready(): - set_fixed_process(true) + set_process_input(true) pass func _fixed_process(delta): @@ -14,3 +14,9 @@ func _fixed_process(delta): print ("Colliding") else: print ("Not colliding") + +func _input(event): + print ("asd") + if event.type == InputEvent.MOUSE_MOTION: + print ("asd") + \ No newline at end of file diff --git a/ray_milk.tscn b/ray_milk.tscn index 5bd8f9b..b53d2cb 100644 --- a/ray_milk.tscn +++ b/ray_milk.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=1] +[gd_scene load_steps=7 format=1] [ext_resource path="res://rayo_leche.gd" type="Script" id=1] -[ext_resource path="res://corazon2.tex" type="Texture" id=2] -[ext_resource path="res://corazon_vacio.png" type="Texture" id=3] +[ext_resource path="res://Splash.tscn" type="PackedScene" id=2] +[ext_resource path="res://corazon2.tex" type="Texture" id=3] +[ext_resource path="res://milk_ray/middle/milk_ray_middle0000.png" type="Texture" id=4] [sub_resource type="RectangleShape2D" id=1] @@ -51,11 +52,11 @@ type_mask = 31 script/script = ExtResource( 1 ) damage = 10 -[node name="end" type="Sprite" parent="."] +[node name="end" parent="." instance=ExtResource( 2 )] transform/pos = Vector2( 0, -1 ) transform/scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +config/emit_timeout = 0.0 [node name="Area2D" type="Area2D" parent="end"] @@ -78,19 +79,19 @@ _update_shape_index = 0 [node name="origin" type="Sprite" parent="."] +visibility/visible = false transform/pos = Vector2( 0, -1 ) transform/scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) +texture = ExtResource( 3 ) [node name="middle" type="Sprite" parent="."] -transform/pos = Vector2( 0, -2 ) -transform/scale = Vector2( 0.5, 2.13333 ) -texture = ExtResource( 3 ) +transform/pos = Vector2( 0, 7 ) +texture = ExtResource( 4 ) centered = false -offset = Vector2( 0, -7 ) +offset = Vector2( 0, -14.5 ) region = true -region_rect = Rect2( 10, 10, 100, 15 ) +region_rect = Rect2( 0, 0, 50, 29 ) [connection signal="body_enter" from="end/Area2D" to="end/Area2D" method="_on_Area2D_body_enter"] diff --git a/rayo_leche.gd b/rayo_leche.gd index d99a7f8..95b67d6 100644 --- a/rayo_leche.gd +++ b/rayo_leche.gd @@ -7,7 +7,7 @@ onready var origin = get_node("origin") export var damage = 10 var enabled = false -const MAX_DISTANCE = 100000 +const MAX_DISTANCE = 1000000 var distance = MAX_DISTANCE func look_left(): @@ -22,17 +22,23 @@ func _ready(): set_fixed_process(true) func enable(): + end.set_emitting(true) enabled = true func disable(): + end.set_emitting(false) enabled = false middle.set_region_rect(Rect2(Vector2(0,0),Vector2(0,0))) end.set_global_pos(get_global_pos()) func _fixed_process(delta): if (enabled): + var end_point set_cast_to(Vector2(distance, 0)) - var end_point = Vector2 (abs(get_global_pos().x - get_collision_point().x) * 2, 15) + if (is_colliding()): + end_point = Vector2 (abs(get_global_pos().x - get_collision_point().x), 29) + else: + end_point = Vector2 (distance, 29) middle.set_region_rect(Rect2(get_pos(),end_point)) end.set_global_pos(get_collision_point()) origin.set_pos(get_pos()) \ No newline at end of file diff --git a/shooter.gd b/shooter.gd index 3ab9bf2..47d7c90 100644 --- a/shooter.gd +++ b/shooter.gd @@ -19,10 +19,10 @@ onready var instanced_ray = get_node("ray") var shoot_dir = Vector2(500,-250) + func _ready(): set_fixed_process(true) - func shoot_regular (): var instanced_bullet = BULLET.instance() get_parent().get_parent().add_child(instanced_bullet) @@ -38,13 +38,12 @@ func shoot_regular (): t.start() yield(t, "timeout") shooting = false - player.decrease_milk() + player.decrease_milk(1) -func shoot_laser(): - #player.decrease_milk() - pass +func shoot_laser(): + player.decrease_milk(0.5) -func _fixed_process(delta): +func _fixed_process(delta): if (Input.is_action_pressed("ui_shoot") and !shooting and player.get_milk_level() > 0): if (weapon == WEAPONS.regular): shoot_regular() @@ -53,6 +52,14 @@ func _fixed_process(delta): shoot_laser() else: instanced_ray.disable() + + if (Input.is_action_pressed("ui_change_weapon")): + Input.action_release("ui_change_weapon") + if (weapon == WEAPONS.regular): + weapon = WEAPONS.laser + else: + weapon = WEAPONS.regular + func _on_KinematicBody2D_looking_left(): shoot_dir = Vector2(-500,-250) diff --git a/top.tscn b/top.tscn index 3d2a225..80578ad 100644 --- a/top.tscn +++ b/top.tscn @@ -11,7 +11,7 @@ [ext_resource path="res://apple.tscn" type="PackedScene" id=9] [ext_resource path="res://DeathLine.gd" type="Script" id=10] -[sub_resource type="LineShape2D" id=1] +[sub_resource type="LineShape2D" id=2] custom_solver_bias = 0.0 normal = Vector2( 0, -1 ) @@ -51,7 +51,7 @@ __meta__ = { ] instance=ExtResource( 2 )] editor/display_folded = true -transform/pos = Vector2( 640, -3744 ) +transform/pos = Vector2( 640, -4128 ) JUMP_SPEED = 600 MAX_JUMP_TIME = 25 max_milk = 100 @@ -268,6 +268,42 @@ transform/pos = Vector2( 624, -3600 ) transform/scale = Vector2( 1, 0.999998 ) amount = 20 +[node name="Apple13" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3680 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + +[node name="Apple14" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3744 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + +[node name="Apple15" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3808 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + +[node name="Apple16" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3872 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + +[node name="Apple17" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3936 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + +[node name="Apple18" parent="." instance=ExtResource( 9 )] + +transform/pos = Vector2( 640, -3936 ) +transform/scale = Vector2( 1, 0.999998 ) +amount = 20 + [node name="Apple10" parent="." instance=ExtResource( 9 )] transform/pos = Vector2( 2368, -4000 ) @@ -320,7 +356,7 @@ amount = 20 transform/pos = Vector2( 288, -192 ) transform/scale = Vector2( 83, 1 ) input/pickable = true -shapes/0/shape = SubResource( 1 ) +shapes/0/shape = SubResource( 2 ) shapes/0/transform = Matrix32( 0.43012, 0, 0, 1, 0.71084, 0 ) shapes/0/trigger = false gravity_vec = Vector2( 0, 1 ) @@ -335,7 +371,7 @@ script/script = ExtResource( 10 ) transform/pos = Vector2( 0.71084, 0 ) transform/scale = Vector2( 0.43012, 1 ) -shape = SubResource( 1 ) +shape = SubResource( 2 ) trigger = false _update_shape_index = 0