diff --git a/images/Credits.png b/images/Credits.png new file mode 100644 index 0000000..1f0f57e Binary files /dev/null and b/images/Credits.png differ diff --git a/images/Credits.png.import b/images/Credits.png.import new file mode 100644 index 0000000..59aa9b9 --- /dev/null +++ b/images/Credits.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Credits.png-9bf7cc4eae6b4547731838f703ecca01.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/Credits.png" +dest_files=[ "res://.import/Credits.png-9bf7cc4eae6b4547731838f703ecca01.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=false +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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/images/campfire/Choice.png b/images/campfire/Choice.png index 5a935c8..d4accdc 100644 Binary files a/images/campfire/Choice.png and b/images/campfire/Choice.png differ diff --git a/images/game1/Herbert-02.png b/images/game1/Herbert-02.png index b865b25..2ed4586 100644 Binary files a/images/game1/Herbert-02.png and b/images/game1/Herbert-02.png differ diff --git a/images/game1/opening2bg.tres b/images/game1/opening2bg.tres index 2172663..4ff400e 100644 --- a/images/game1/opening2bg.tres +++ b/images/game1/opening2bg.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=3 format=2] +[gd_resource type="SpriteFrames" load_steps=5 format=2] [ext_resource path="res://images/game1/Herbert-02.png" type="Texture" id=1] @@ -6,10 +6,18 @@ atlas = ExtResource( 1 ) region = Rect2( 0, 0, 192, 108 ) +[sub_resource type="AtlasTexture" id=2] +atlas = ExtResource( 1 ) +region = Rect2( 192, 0, 192, 108 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 1 ) +region = Rect2( 384, 0, 192, 108 ) + [resource] animations = [ { -"frames": [ SubResource( 1 ) ], +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ], "loop": true, "name": "default", -"speed": 10.0 +"speed": 4.0 } ] diff --git a/images/oil_tanker/HerbertMustGo.png b/images/oil_tanker/HerbertMustGo.png index 6b576a8..225b30f 100644 Binary files a/images/oil_tanker/HerbertMustGo.png and b/images/oil_tanker/HerbertMustGo.png differ diff --git a/images/oil_tanker/HerbertMustGo.tres b/images/oil_tanker/HerbertMustGo.tres index eaaa9ba..76300fb 100644 --- a/images/oil_tanker/HerbertMustGo.tres +++ b/images/oil_tanker/HerbertMustGo.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=6 format=2] +[gd_resource type="SpriteFrames" load_steps=7 format=2] [ext_resource path="res://images/oil_tanker/HerbertMustGo.png" type="Texture" id=1] @@ -18,9 +18,13 @@ region = Rect2( 384, 0, 192, 108 ) atlas = ExtResource( 1 ) region = Rect2( 576, 0, 192, 108 ) +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 1 ) +region = Rect2( 768, 0, 192, 108 ) + [resource] animations = [ { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ], +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], "loop": true, "name": "default", "speed": 3.0 diff --git a/images/oil_tanker/oilTankerInside_Background.png b/images/oil_tanker/oilTankerInside_Background.png index bdb51f5..b876c3b 100644 Binary files a/images/oil_tanker/oilTankerInside_Background.png and b/images/oil_tanker/oilTankerInside_Background.png differ diff --git a/images/oil_tanker/oilTankerInside_Background.tres b/images/oil_tanker/oilTankerInside_Background.tres new file mode 100644 index 0000000..8b4ecda --- /dev/null +++ b/images/oil_tanker/oilTankerInside_Background.tres @@ -0,0 +1,23 @@ +[gd_resource type="SpriteFrames" load_steps=5 format=2] + +[ext_resource path="res://images/oil_tanker/oilTankerInside_Background.png" type="Texture" id=1] + +[sub_resource type="AtlasTexture" id=1] +atlas = ExtResource( 1 ) +region = Rect2( 0, 0, 192, 108 ) + +[sub_resource type="AtlasTexture" id=2] +atlas = ExtResource( 1 ) +region = Rect2( 192, 0, 192, 108 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 1 ) +region = Rect2( 384, 0, 192, 108 ) + +[resource] +animations = [ { +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] diff --git a/scenes/credits.tscn b/scenes/credits.tscn new file mode 100644 index 0000000..4410094 --- /dev/null +++ b/scenes/credits.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://images/Credits.png" type="Texture" id=1] + +[node name="Node2D" type="Node2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +centered = false diff --git a/scenes/game1.tscn b/scenes/game1.tscn index bca7771..d470348 100644 --- a/scenes/game1.tscn +++ b/scenes/game1.tscn @@ -38,6 +38,7 @@ script = ExtResource( 3 ) [node name="Opening2Bg" type="AnimatedSprite" parent="Opening2"] frames = ExtResource( 2 ) +playing = true centered = false [node name="Player" parent="Opening2" instance=ExtResource( 4 )] diff --git a/scenes/oil_tanker.tscn b/scenes/oil_tanker.tscn index 98ad70e..d7ce015 100644 --- a/scenes/oil_tanker.tscn +++ b/scenes/oil_tanker.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://scripts/oil_tanker.gd" type="Script" id=1] [ext_resource path="res://images/oil_tanker/OilTanker.tres" type="SpriteFrames" id=2] -[ext_resource path="res://images/oil_tanker/oilTankerInside_Background.png" type="Texture" id=3] +[ext_resource path="res://images/oil_tanker/oilTankerInside_Background.tres" type="SpriteFrames" id=3] [ext_resource path="res://scenes/SidePlayer.tscn" type="PackedScene" id=4] [ext_resource path="res://images/oil_tanker/oilTankerInside_Foreground.png" type="Texture" id=5] [ext_resource path="res://scripts/GooEmitter.gd" type="Script" id=6] @@ -193,8 +193,9 @@ collision_mask = 4 position = Vector2( 330.844, 100.227 ) shape = SubResource( 20 ) -[node name="InsideOilTanker" type="Sprite" parent="."] -texture = ExtResource( 3 ) +[node name="InsideOilTanker" type="AnimatedSprite" parent="."] +frames = ExtResource( 3 ) +playing = true centered = false [node name="Player" parent="InsideOilTanker" instance=ExtResource( 4 )] diff --git a/scripts/campfire2.gd b/scripts/campfire2.gd index 0e6ced9..84ce995 100644 --- a/scripts/campfire2.gd +++ b/scripts/campfire2.gd @@ -25,6 +25,7 @@ var choice = -1 func make_choice(choice : int): the_choice.hide() yield(dialogue_box.start_dialogue(end_truth_dialogue if choice == 0 else end_lie_dialogue), 'end') + get_tree().change_scene("res://scenes/credits.tscn") func _input(event): if the_choice.visible: