From 692a296c759e323e5f1a5a14aa9e3ada66b8158e Mon Sep 17 00:00:00 2001
From: Jannik Rosendahl <jannik.rosendahl@me.com>
Date: Fri, 17 Dec 2021 08:45:22 +0100
Subject: [PATCH] player greyscale

---
 src/actors/player/Player.gd   |   4 +-
 src/actors/player/Player.tscn | 156 +++++++++++++++++-----------------
 src/scenes/levels/Level1.tscn |   3 +-
 src/scenes/levels/Level2.tscn |   3 +-
 src/scenes/levels/Level3.tscn |   5 +-
 src/scenes/levels/Level4.tscn |   4 +-
 6 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/src/actors/player/Player.gd b/src/actors/player/Player.gd
index a9a7ae9..92eb628 100644
--- a/src/actors/player/Player.gd
+++ b/src/actors/player/Player.gd
@@ -53,6 +53,7 @@ const invincible_cooldown : float = .2
 
 const stomp_velocity : int = -300
 
+export var grey_scale: bool = false
 
 """ SECTION OVERRIDE FUNCTIONS """
 
@@ -68,9 +69,8 @@ func _ready():
 	$Control/HealthBar.tint_progress = Color.green
 	$MeleeDetector.monitoring = false
 	
-	
+	set_black_white(grey_scale)
 	print("ready")
-	set_black_white(false)
 
 
 func _process(delta):
diff --git a/src/actors/player/Player.tscn b/src/actors/player/Player.tscn
index 3335c79..bbb3f3a 100644
--- a/src/actors/player/Player.tscn
+++ b/src/actors/player/Player.tscn
@@ -39,65 +39,45 @@ flags = 4
 atlas = ExtResource( 4 )
 region = Rect2( 144, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=5]
+[sub_resource type="AtlasTexture" id=31]
 flags = 4
-atlas = ExtResource( 5 )
+atlas = ExtResource( 6 )
 region = Rect2( 0, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=6]
+[sub_resource type="AtlasTexture" id=32]
 flags = 4
-atlas = ExtResource( 5 )
+atlas = ExtResource( 6 )
 region = Rect2( 48, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=7]
+[sub_resource type="AtlasTexture" id=33]
 flags = 4
-atlas = ExtResource( 5 )
+atlas = ExtResource( 6 )
 region = Rect2( 96, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=8]
+[sub_resource type="AtlasTexture" id=34]
 flags = 4
-atlas = ExtResource( 5 )
+atlas = ExtResource( 6 )
 region = Rect2( 144, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=9]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 48, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=10]
-flags = 4
-atlas = ExtResource( 7 )
-region = Rect2( 0, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=11]
-flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 0, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=12]
-flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 48, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=13]
+[sub_resource type="AtlasTexture" id=35]
 flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 96, 0, 48, 48 )
+atlas = ExtResource( 6 )
+region = Rect2( 192, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=14]
+[sub_resource type="AtlasTexture" id=36]
 flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 144, 0, 48, 48 )
+atlas = ExtResource( 6 )
+region = Rect2( 240, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=15]
+[sub_resource type="AtlasTexture" id=37]
 flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 192, 0, 48, 48 )
+atlas = ExtResource( 6 )
+region = Rect2( 288, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=16]
+[sub_resource type="AtlasTexture" id=38]
 flags = 4
-atlas = ExtResource( 8 )
-region = Rect2( 240, 0, 48, 48 )
+atlas = ExtResource( 6 )
+region = Rect2( 336, 0, 48, 48 )
 
 [sub_resource type="AtlasTexture" id=17]
 flags = 4
@@ -169,45 +149,65 @@ flags = 4
 atlas = ExtResource( 3 )
 region = Rect2( 240, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=31]
+[sub_resource type="AtlasTexture" id=5]
 flags = 4
-atlas = ExtResource( 6 )
+atlas = ExtResource( 5 )
 region = Rect2( 0, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=32]
+[sub_resource type="AtlasTexture" id=6]
 flags = 4
-atlas = ExtResource( 6 )
+atlas = ExtResource( 5 )
 region = Rect2( 48, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=33]
+[sub_resource type="AtlasTexture" id=7]
 flags = 4
-atlas = ExtResource( 6 )
+atlas = ExtResource( 5 )
 region = Rect2( 96, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=34]
+[sub_resource type="AtlasTexture" id=8]
 flags = 4
-atlas = ExtResource( 6 )
+atlas = ExtResource( 5 )
 region = Rect2( 144, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=35]
+[sub_resource type="AtlasTexture" id=9]
 flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 192, 0, 48, 48 )
+atlas = ExtResource( 7 )
+region = Rect2( 48, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=36]
+[sub_resource type="AtlasTexture" id=10]
 flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 240, 0, 48, 48 )
+atlas = ExtResource( 7 )
+region = Rect2( 0, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=37]
+[sub_resource type="AtlasTexture" id=11]
 flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 288, 0, 48, 48 )
+atlas = ExtResource( 8 )
+region = Rect2( 0, 0, 48, 48 )
 
-[sub_resource type="AtlasTexture" id=38]
+[sub_resource type="AtlasTexture" id=12]
 flags = 4
-atlas = ExtResource( 6 )
-region = Rect2( 336, 0, 48, 48 )
+atlas = ExtResource( 8 )
+region = Rect2( 48, 0, 48, 48 )
+
+[sub_resource type="AtlasTexture" id=13]
+flags = 4
+atlas = ExtResource( 8 )
+region = Rect2( 96, 0, 48, 48 )
+
+[sub_resource type="AtlasTexture" id=14]
+flags = 4
+atlas = ExtResource( 8 )
+region = Rect2( 144, 0, 48, 48 )
+
+[sub_resource type="AtlasTexture" id=15]
+flags = 4
+atlas = ExtResource( 8 )
+region = Rect2( 192, 0, 48, 48 )
+
+[sub_resource type="AtlasTexture" id=16]
+flags = 4
+atlas = ExtResource( 8 )
+region = Rect2( 240, 0, 48, 48 )
 
 [sub_resource type="SpriteFrames" id=39]
 animations = [ {
@@ -216,6 +216,21 @@ animations = [ {
 "name": "idle",
 "speed": 5.0
 }, {
+"frames": [ SubResource( 31 ), SubResource( 32 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ) ],
+"loop": true,
+"name": "attack1",
+"speed": 20.0
+}, {
+"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ],
+"loop": true,
+"name": "melee",
+"speed": 17.0
+}, {
+"frames": [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
+"loop": true,
+"name": "move",
+"speed": 5.0
+}, {
 "frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ],
 "loop": true,
 "name": "jump",
@@ -230,21 +245,6 @@ animations = [ {
 "loop": false,
 "name": "death",
 "speed": 7.0
-}, {
-"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ],
-"loop": true,
-"name": "melee",
-"speed": 17.0
-}, {
-"frames": [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
-"loop": true,
-"name": "move",
-"speed": 5.0
-}, {
-"frames": [ SubResource( 31 ), SubResource( 32 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ) ],
-"loop": true,
-"name": "attack1",
-"speed": 20.0
 } ]
 
 [sub_resource type="RectangleShape2D" id=40]
@@ -259,9 +259,7 @@ extents = Vector2( 9.11914, 2.77663 )
 [sub_resource type="RectangleShape2D" id=43]
 extents = Vector2( 12.751, 6.23259 )
 
-[node name="Player" type="KinematicBody2D" groups=[
-"player",
-]]
+[node name="Player" type="KinematicBody2D" groups=["player"]]
 collision_layer = 3
 collision_mask = 249
 collision/safe_margin = 0.01
@@ -272,7 +270,7 @@ material = ExtResource( 12 )
 position = Vector2( 10, -24 )
 frames = SubResource( 39 )
 animation = "melee"
-frame = 3
+frame = 4
 playing = true
 
 [node name="Camera2D" type="Camera2D" parent="."]
diff --git a/src/scenes/levels/Level1.tscn b/src/scenes/levels/Level1.tscn
index 5081627..7c2a501 100644
--- a/src/scenes/levels/Level1.tscn
+++ b/src/scenes/levels/Level1.tscn
@@ -1197,6 +1197,7 @@ position = Vector2( 11167, 292 )
 [node name="Player" parent="Level1" instance=ExtResource( 1 )]
 position = Vector2( 499.46, 426.182 )
 collision_mask = 16
+grey_scale = true
 
 [node name="Level" type="TileMap" parent="Level1"]
 tile_set = SubResource( 28 )
@@ -1236,8 +1237,8 @@ margin_left = 1144.0
 margin_top = 24.0
 margin_right = 1264.0
 margin_bottom = 56.0
-custom_fonts/font = SubResource( 30 )
 custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 )
+custom_fonts/font = SubResource( 30 )
 align = 1
 valign = 1
 __meta__ = {
diff --git a/src/scenes/levels/Level2.tscn b/src/scenes/levels/Level2.tscn
index 497389b..edf052d 100644
--- a/src/scenes/levels/Level2.tscn
+++ b/src/scenes/levels/Level2.tscn
@@ -940,6 +940,7 @@ position = Vector2( 2131, 297 )
 [node name="Player" parent="Level0" instance=ExtResource( 4 )]
 position = Vector2( 1880, 385 )
 collision_mask = 16
+grey_scale = true
 
 [node name="Level" type="TileMap" parent="Level0"]
 tile_set = SubResource( 29 )
@@ -980,8 +981,8 @@ margin_left = 1144.0
 margin_top = 24.0
 margin_right = 1264.0
 margin_bottom = 56.0
-custom_fonts/font = SubResource( 31 )
 custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 )
+custom_fonts/font = SubResource( 31 )
 align = 1
 valign = 1
 __meta__ = {
diff --git a/src/scenes/levels/Level3.tscn b/src/scenes/levels/Level3.tscn
index bd70ca5..f6965c2 100644
--- a/src/scenes/levels/Level3.tscn
+++ b/src/scenes/levels/Level3.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=50 format=2]
+[gd_scene load_steps=49 format=2]
 
-[ext_resource path="res://src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png" type="Texture" id=1]
 [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=2]
 [ext_resource path="res://src/scenes/PauseController.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/actors/player/Player.tscn" type="PackedScene" id=4]
@@ -881,7 +880,6 @@ font_data = ExtResource( 8 )
 [node name="BackGroundPNG" type="Sprite" parent="Level0/ParallaxBackground"]
 position = Vector2( 640, 361 )
 scale = Vector2( 1.41689, 1.43723 )
-texture = ExtResource( 1 )
 
 [node name="BackGround" type="TileMap" parent="Level0"]
 tile_set = SubResource( 12 )
@@ -1204,6 +1202,7 @@ position = Vector2( 4240, 66 )
 [node name="Player" parent="Level0" instance=ExtResource( 4 )]
 position = Vector2( 453, 448 )
 collision_mask = 16
+grey_scale = true
 
 [node name="Level" type="TileMap" parent="Level0"]
 tile_set = SubResource( 29 )
diff --git a/src/scenes/levels/Level4.tscn b/src/scenes/levels/Level4.tscn
index 97ef03f..f26a9e6 100644
--- a/src/scenes/levels/Level4.tscn
+++ b/src/scenes/levels/Level4.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=54 format=2]
+[gd_scene load_steps=53 format=2]
 
 [ext_resource path="res://src/scenes/Door.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/scenes/spike.tscn" type="PackedScene" id=2]
@@ -19,7 +19,6 @@
 [ext_resource path="res://src/scenes/Platforms/PFHSlow.tscn" type="PackedScene" id=17]
 [ext_resource path="res://src/scenes/levels/Score.gd" type="Script" id=18]
 [ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=19]
-[ext_resource path="res://src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png" type="Texture" id=20]
 [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=21]
 [ext_resource path="res://src/assets/colleticbles/coin/gold_1.png" type="Texture" id=22]
 
@@ -779,7 +778,6 @@ font_data = ExtResource( 19 )
 [node name="BackGroundPNG" type="Sprite" parent="Level0/ParallaxBackground"]
 position = Vector2( 555.711, 351.167 )
 scale = Vector2( 1.61459, 1.86551 )
-texture = ExtResource( 20 )
 
 [node name="BackGround" type="TileMap" parent="Level0"]
 tile_set = SubResource( 12 )
-- 
GitLab