From abfc2f6f7ae584918e3930b6d73f561453e56977 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 4 Apr 2022 03:23:02 +0200 Subject: [PATCH] :sparkles: Add promotional media --- media/Favicon.png | 3 ++ media/Favicon.png.import | 35 +++++++++++++++ media/ItchCover.png | 3 ++ media/ItchCover.png.import | 35 +++++++++++++++ media/LDJamCover.png | 3 ++ media/LDJamCover.png.import | 35 +++++++++++++++ media/OpenGraph.png | 3 ++ media/OpenGraph.png.import | 35 +++++++++++++++ src/behaviours/damage/Damageable.gd | 2 +- src/behaviours/damage/Damageable.tscn | 2 +- src/entities/fire/Fire.gd | 2 +- src/entities/fire/Fire.tscn | 3 +- src/entities/fire/FireConcept.png | 3 -- src/levels/Game.tscn | 65 +-------------------------- 14 files changed, 157 insertions(+), 72 deletions(-) create mode 100644 media/Favicon.png create mode 100644 media/Favicon.png.import create mode 100644 media/ItchCover.png create mode 100644 media/ItchCover.png.import create mode 100644 media/LDJamCover.png create mode 100644 media/LDJamCover.png.import create mode 100644 media/OpenGraph.png create mode 100644 media/OpenGraph.png.import delete mode 100644 src/entities/fire/FireConcept.png diff --git a/media/Favicon.png b/media/Favicon.png new file mode 100644 index 0000000..aea67b7 --- /dev/null +++ b/media/Favicon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6ffdd6cf789b494f395b0a1b49ed7ad59e5aea85ca0a50067fb2dbe696278c2 +size 1112 diff --git a/media/Favicon.png.import b/media/Favicon.png.import new file mode 100644 index 0000000..3388c4b --- /dev/null +++ b/media/Favicon.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Favicon.png-2639b7301f302562a8686294057fd3bc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/Favicon.png" +dest_files=[ "res://.import/Favicon.png-2639b7301f302562a8686294057fd3bc.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 diff --git a/media/ItchCover.png b/media/ItchCover.png new file mode 100644 index 0000000..97c181d --- /dev/null +++ b/media/ItchCover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beb387846a970b361ae0940e559e69eee58771a79a24fc1ee1c2579ee6e9081f +size 116151 diff --git a/media/ItchCover.png.import b/media/ItchCover.png.import new file mode 100644 index 0000000..8fae259 --- /dev/null +++ b/media/ItchCover.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/ItchCover.png-134d30b12bb99c1254bd40e0afd5fe44.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/ItchCover.png" +dest_files=[ "res://.import/ItchCover.png-134d30b12bb99c1254bd40e0afd5fe44.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 diff --git a/media/LDJamCover.png b/media/LDJamCover.png new file mode 100644 index 0000000..998f907 --- /dev/null +++ b/media/LDJamCover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ad66c5088e7e3ff317a77018e527e5e6a3e0eb61911e087b7d16271420a9173 +size 116338 diff --git a/media/LDJamCover.png.import b/media/LDJamCover.png.import new file mode 100644 index 0000000..38d9411 --- /dev/null +++ b/media/LDJamCover.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LDJamCover.png-60abfd4432871ff04696db7233bf9466.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/LDJamCover.png" +dest_files=[ "res://.import/LDJamCover.png-60abfd4432871ff04696db7233bf9466.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 diff --git a/media/OpenGraph.png b/media/OpenGraph.png new file mode 100644 index 0000000..9a97b2f --- /dev/null +++ b/media/OpenGraph.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4766779e5e0322f0c67580ec793100d3b33f2e77069ac8d6172e797ac2b4eed6 +size 141024 diff --git a/media/OpenGraph.png.import b/media/OpenGraph.png.import new file mode 100644 index 0000000..863a02b --- /dev/null +++ b/media/OpenGraph.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/OpenGraph.png-4b234f59c1d47f7c0058658e051599e8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/OpenGraph.png" +dest_files=[ "res://.import/OpenGraph.png-4b234f59c1d47f7c0058658e051599e8.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 diff --git a/src/behaviours/damage/Damageable.gd b/src/behaviours/damage/Damageable.gd index 98b4278..5194bb8 100644 --- a/src/behaviours/damage/Damageable.gd +++ b/src/behaviours/damage/Damageable.gd @@ -1,4 +1,4 @@ -extends Node +extends Node2D signal health_changed(value) diff --git a/src/behaviours/damage/Damageable.tscn b/src/behaviours/damage/Damageable.tscn index a7af621..a5f0ad1 100644 --- a/src/behaviours/damage/Damageable.tscn +++ b/src/behaviours/damage/Damageable.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/behaviours/damage/Damageable.gd" type="Script" id=1] -[node name="Damageable" type="Node"] +[node name="Damageable" type="Node2D"] script = ExtResource( 1 ) __meta__ = { "_editor_description_": "Allows the parent entity to take damage and die." diff --git a/src/entities/fire/Fire.gd b/src/entities/fire/Fire.gd index bb3614a..64514f4 100644 --- a/src/entities/fire/Fire.gd +++ b/src/entities/fire/Fire.gd @@ -1,7 +1,7 @@ extends Node2D -export var intensity: float = 0.5 setget set_intensity +export var intensity: float = 1.0 setget set_intensity export var change_per_second: float = - 1.0 / 60.0 export var min_intensity: float = 0 export var max_intensity: float = INF diff --git a/src/entities/fire/Fire.tscn b/src/entities/fire/Fire.tscn index 7f32664..c024b30 100644 --- a/src/entities/fire/Fire.tscn +++ b/src/entities/fire/Fire.tscn @@ -41,7 +41,6 @@ animations = [ { [node name="Fire" type="Node2D"] script = ExtResource( 3 ) -intensity = 1.0 [node name="Firepit" type="StaticBody2D" parent="."] @@ -71,7 +70,7 @@ material = SubResource( 2 ) z_index = 1 frames = SubResource( 4 ) animation = "v1" -frame = 5 +frame = 4 playing = true [connection signal="body_entered" from="Flame" to="." method="_on_Flame_body_entered"] diff --git a/src/entities/fire/FireConcept.png b/src/entities/fire/FireConcept.png deleted file mode 100644 index f501816..0000000 --- a/src/entities/fire/FireConcept.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afdbee7cc2d77add5a23deb8a994872702a29ac882067d9ad5af87fcee824084 -size 129151 diff --git a/src/levels/Game.tscn b/src/levels/Game.tscn index 6e8b227..5ddf9a0 100644 --- a/src/levels/Game.tscn +++ b/src/levels/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://src/mechanics/Background.tscn" type="PackedScene" id=1] [ext_resource path="res://src/mechanics/Darkness.tscn" type="PackedScene" id=2] @@ -7,48 +7,12 @@ [ext_resource path="res://src/mechanics/RNG.tscn" type="PackedScene" id=5] [ext_resource path="res://src/levels/Game.gd" type="Script" id=6] [ext_resource path="res://src/ui/TimeSurvived.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/entities/enemies/EnemySnowmanLeft.png" type="Texture" id=8] -[ext_resource path="res://src/behaviours/damage/Alliance.tscn" type="PackedScene" id=9] -[ext_resource path="res://src/entities/enemies/EnemySnowmanBack.png" type="Texture" id=10] [ext_resource path="res://src/levels/PhaseOneMusic.gd" type="Script" id=11] -[ext_resource path="res://src/behaviours/damage/Damageable.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/entities/enemies/EnemySnowmanFront.png" type="Texture" id=13] [ext_resource path="res://src/ui/HealthBar.tscn" type="PackedScene" id=14] -[ext_resource path="res://src/behaviours/spawning/DropLoot.tscn" type="PackedScene" id=15] -[ext_resource path="res://src/entities/enemies/EnemySnowmanRight.png" type="Texture" id=16] -[ext_resource path="res://src/behaviours/graphics/FourSidedSprite.tscn" type="PackedScene" id=17] -[ext_resource path="res://src/behaviours/movement/AttractedToMovement.tscn" type="PackedScene" id=18] [ext_resource path="res://src/music/BaseDrum.mp3" type="AudioStream" id=19] [ext_resource path="res://src/music/BaseBell.mp3" type="AudioStream" id=20] [ext_resource path="res://src/music/BaseChoir.mp3" type="AudioStream" id=21] -[sub_resource type="CapsuleShape2D" id=1] -radius = 9.0 -height = 10.0 - -[sub_resource type="SpriteFrames" id=2] -animations = [ { -"frames": [ ExtResource( 8 ) ], -"loop": true, -"name": "left", -"speed": 5.0 -}, { -"frames": [ ExtResource( 16 ) ], -"loop": true, -"name": "right", -"speed": 5.0 -}, { -"frames": [ ExtResource( 10 ) ], -"loop": true, -"name": "up", -"speed": 5.0 -}, { -"frames": [ ExtResource( 13 ) ], -"loop": true, -"name": "down", -"speed": 5.0 -} ] - [node name="Game" type="Node2D"] script = ExtResource( 6 ) @@ -88,7 +52,6 @@ position = Vector2( 596, 268 ) [node name="Fire" parent="PhaseOne/Entities" instance=ExtResource( 3 )] position = Vector2( 640, 320 ) -intensity = 2.0 [node name="Pickups" type="Node" parent="PhaseOne/Entities"] @@ -96,31 +59,6 @@ intensity = 2.0 [node name="Enemies" type="Node" parent="PhaseOne/Entities"] -[node name="ChaserEnemy" type="KinematicBody2D" parent="PhaseOne/Entities/Enemies"] -position = Vector2( 800, 307 ) -scale = Vector2( 8, 8 ) -collision_layer = 3 - -[node name="Shape" type="CollisionShape2D" parent="PhaseOne/Entities/Enemies/ChaserEnemy"] -shape = SubResource( 1 ) - -[node name="FourSidedSprite" parent="PhaseOne/Entities/Enemies/ChaserEnemy/Shape" instance=ExtResource( 17 )] -frames = SubResource( 2 ) -animation = "down" - -[node name="Alliance" parent="PhaseOne/Entities/Enemies/ChaserEnemy" instance=ExtResource( 9 )] -alliance = -1 - -[node name="Damageable" parent="PhaseOne/Entities/Enemies/ChaserEnemy" instance=ExtResource( 12 )] -health = 250 -max_health = 250 - -[node name="DropLoot" parent="PhaseOne/Entities/Enemies/ChaserEnemy" instance=ExtResource( 15 )] - -[node name="AttractedToMovement" parent="PhaseOne/Entities/Enemies/ChaserEnemy" instance=ExtResource( 18 )] -movement_per_second = 64.0 -goal_path = NodePath("../../../PhaseOnePlayer") - [node name="UserInterface" type="CanvasLayer" parent="."] [node name="UserIntefaceContainer" type="Panel" parent="UserInterface"] @@ -139,4 +77,3 @@ margin_right = 640.0 margin_left = 14.0 [connection signal="intensity_changed" from="PhaseOne/Entities/Fire" to="PhaseOne/Music" method="_on_Fire_intensity_changed"] -[connection signal="moving_in_direction" from="PhaseOne/Entities/Enemies/ChaserEnemy/AttractedToMovement" to="PhaseOne/Entities/Enemies/ChaserEnemy/Shape/FourSidedSprite" method="turn"]