diff --git a/src/actors/player/Player.gd b/src/actors/player/Player.gd index b724a90f08173077de8dd80158a6c135a0df7af7..2b2c2571ce71737d4e1fa13a28f5f8799da5c852 100755 --- a/src/actors/player/Player.gd +++ b/src/actors/player/Player.gd @@ -68,7 +68,10 @@ func _ready(): $Control/HealthBar.tint_progress = Color.green $MeleeDetector.monitoring = false + print("ready") + set_black_white(false) + func _process(delta): if not is_alive: @@ -245,7 +248,6 @@ func take_damage(n : int): is_alive = false update_animation() - func take_damage_player(n : int): take_damage(n) @@ -281,7 +283,11 @@ func update_animation(): $InfoLabel.text = "is_moving: " + str(is_moving) + "\nis_jumping: " + str(is_jumping) + "\nis_attacking: " + str(is_attacking) + "\nvh: " + str(velocity.x) + "\nvv" + str(velocity.y) + "\nhp: " + str(hitpoints) - +func set_black_white(boolean: bool): + if boolean: + $AnimatedSprite.material = load("res://src/actors/player/PlayerShader.tres") + else: + $AnimatedSprite.material = null """ SECTION SIGNAL FUNCTIONS """ diff --git a/src/actors/player/Player.tscn b/src/actors/player/Player.tscn index 695270db6e306485c18b07b1fc9293ac6881c989..3bb2911e2fde883ac1a250a07b75e2936b12beac 100755 --- a/src/actors/player/Player.tscn +++ b/src/actors/player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=55 format=2] +[gd_scene load_steps=56 format=2] [ext_resource path="res://src/assets/actors/Player/player_attack_melee.png" type="Texture" id=1] [ext_resource path="res://src/actors/player/Player.gd" type="Script" id=2] @@ -11,6 +11,7 @@ [ext_resource path="res://src/assets/actors/Player/health-bar-under.png" type="Texture" id=9] [ext_resource path="res://src/assets/actors/Player/health-bar-over.png" type="Texture" id=10] [ext_resource path="res://src/assets/actors/Player/health_bar_health.png" type="Texture" id=11] +[ext_resource path="res://src/actors/player/PlayerShader.tres" type="Material" id=12] [sub_resource type="AtlasTexture" id=1] flags = 4 @@ -259,10 +260,11 @@ collision/safe_margin = 0.01 script = ExtResource( 2 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] +material = ExtResource( 12 ) position = Vector2( 10, -24 ) frames = SubResource( 38 ) animation = "melee" -frame = 7 +frame = 5 playing = true [node name="Camera2D" type="Camera2D" parent="."] diff --git a/src/actors/player/PlayerShader.tres b/src/actors/player/PlayerShader.tres new file mode 100644 index 0000000000000000000000000000000000000000..a0d39de55b70c7ceae1f1cbcfca25d21780c37ba --- /dev/null +++ b/src/actors/player/PlayerShader.tres @@ -0,0 +1,14 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=2] + +[sub_resource type="Shader" id=52] +code = "shader_type canvas_item; +render_mode unshaded; + +void fragment() { + COLOR = texture(TEXTURE, UV); + float lumi = (COLOR.r + COLOR.g + COLOR.b) / 3f; + COLOR.rgb = vec3(lumi); +}" + +[resource] +shader = SubResource( 52 )