ashpie
/
crabs-game
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

progress

This commit is contained in:
Alice Gaudon 2020-08-20 16:33:27 +02:00
parent 00a4a54bea
commit 6da977a4da
12 changed files with 83 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dialogues/game1.json
View File

@ -1,4 +1,4 @@
[
{"name": "Herbert", "text": "There was some sort of weird goo floating around.", "upside_down": true, "timer": 6, "auto": true},
{"name": "Herbert", "text": "So I decided to look for the source.", "upside_down": true, "timer": 6, "auto": true}
{"name": "", "text": "There was some sort of weird goo floating around.", "upside_down": true, "timer": 6, "auto": true},
{"name": "", "text": "So I decided to look for the source.", "upside_down": true, "timer": 6, "auto": true}
]

2
dialogues/intro_1.json
View File

@ -1,5 +1,5 @@
[
{"timer": 2, "auto": true},
{"animation": "fadein", "timer": 2, "auto": true},
{"name": "Ely", "text": "What a shame..."},
{"name": "Ely", "text": "I don't like being alone."},

6
dialogues/oilTanker1.json
View File

@ -1,6 +1,6 @@
[
{"animation": "fadein", "timer": 2, "auto": true},
{"name": "Herbert", "text": "Finally I found the source.", "timer": 4, "auto": true, "upside_down": true},
{"name": "Herbert", "text": "It was a recently sunk oil tanker.", "timer": 4, "auto": true, "upside_down": true},
{"name": "Herbert", "text": "I had to investigate further.", "timer": 4, "auto": true, "upside_down": true}
{"name": "", "text": "Finally I found the source.", "timer": 4, "auto": true, "upside_down": true},
{"name": "", "text": "It was a recently sunk oil tanker.", "timer": 4, "auto": true, "upside_down": true},
{"name": "", "text": "I had to investigate further.", "timer": 4, "auto": true, "upside_down": true}
]

2
dialogues/oilTanker2.json
View File

@ -1,3 +1,3 @@
[
{"name": "Herbert", "text": "The closer I got, the more oil there was.", "timer": 6, "auto": true, "upside_down": true}
{"name": "", "text": "The closer I got, the more oil there was.", "timer": 6, "auto": true, "upside_down": true}
]

2
dialogues/oilTanker3.json
View File

@ -1,3 +1,3 @@
[
{"name": "Herbert", "text": "The inside was full of oil, I was really close.", "upside_down": true, "timer": 6, "auto": true}
{"name": "", "text": "The inside was full of oil, I was really close.", "upside_down": true, "timer": 6, "auto": true}
]

4
dialogues/oilTanker4.json
View File

@ -1,4 +1,4 @@
[
{"name": "Herbert", "text": "And there it was, one of the tank was damaged.", "upside_down": true},
{"name": "Herbert", "text": "I'm just a crab, I couldn't do anything about it.", "upside_down": true, "animation": "fadeout", "timer": 2}
{"name": "", "text": "And there it was, one of the tank was damaged.", "upside_down": true},
{"name": "", "text": "I'm just a crab, I couldn't do anything about it.", "upside_down": true, "animation": "fadeout", "timer": 2}
]

4
dialogues/oilTanker5.json
View File

@ -1,5 +1,5 @@
[
{"name": "Herbert", "text": "Back at my home, there was goo everywhere.", "expression": "black"},
{"name": "", "text": "Back at my home, there was goo everywhere.", "expression": "black"},
{"animation": "fadein", "timer": 2, "auto": true},
{"name": "Herbert", "text": "My friends and I were forced to move..."}
{"name": "", "text": "My friends and I were forced to move..."}
]

BIN
images/game1/ParralaxPoutre3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

34
images/game1/ParralaxPoutre3.png.import Normal file
View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/ParralaxPoutre3.png-b5d3bc235ed07e42bde584c21cebcf92.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://images/game1/ParralaxPoutre3.png"
dest_files=[ "res://.import/ParralaxPoutre3.png-b5d3bc235ed07e42bde584c21cebcf92.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

1
scenes/campfire2.tscn
View File

@ -29,6 +29,7 @@ __meta__ = {
[node name="Dialogue" parent="UI" instance=ExtResource( 4 )]
[node name="TheChoice" type="AnimatedSprite" parent="."]
visible = false
frames = ExtResource( 5 )
animation = "lie"
centered = false

64
scenes/oil_tanker.tscn
View File

@ -25,52 +25,52 @@
[ext_resource path="res://images/oil_tanker/OilTankerLeak_Midground_GooMask.png" type="Texture" id=23]
[ext_resource path="res://images/oil_tanker/OilTankerCrabnimation.tres" type="SpriteFrames" id=24]
[sub_resource type="RectangleShape2D" id=6]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 10, 34.563 )
[sub_resource type="RectangleShape2D" id=7]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 10, 34.563 )
[sub_resource type="RectangleShape2D" id=8]
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 276.861, 9.9101 )
[sub_resource type="RectangleShape2D" id=9]
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 276.861, 9.9101 )
[sub_resource type="RectangleShape2D" id=10]
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 175.74, 9.07445 )
[sub_resource type="CircleShape2D" id=11]
[sub_resource type="CircleShape2D" id=6]
radius = 31.4057
[sub_resource type="RectangleShape2D" id=20]
[sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 10, 22.4756 )
[sub_resource type="RectangleShape2D" id=12]
[sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 10, 27.9493 )
[sub_resource type="RectangleShape2D" id=13]
[sub_resource type="RectangleShape2D" id=9]
extents = Vector2( 10, 27.9493 )
[sub_resource type="RectangleShape2D" id=14]
[sub_resource type="RectangleShape2D" id=10]
extents = Vector2( 20.5315, 7.16187 )
[sub_resource type="RectangleShape2D" id=15]
[sub_resource type="RectangleShape2D" id=11]
extents = Vector2( 85.2849, 7.16187 )
[sub_resource type="SegmentShape2D" id=16]
[sub_resource type="SegmentShape2D" id=12]
b = Vector2( 70.2283, 33.9024 )
[sub_resource type="SegmentShape2D" id=17]
[sub_resource type="SegmentShape2D" id=13]
b = Vector2( 122.205, -7.65517 )
[sub_resource type="SegmentShape2D" id=18]
[sub_resource type="SegmentShape2D" id=14]
b = Vector2( 107.673, 44.0238 )
[sub_resource type="RectangleShape2D" id=19]
[sub_resource type="RectangleShape2D" id=15]
extents = Vector2( 4.85875, 16.0913 )
[sub_resource type="RectangleShape2D" id=21]
[sub_resource type="RectangleShape2D" id=16]
extents = Vector2( 4.85875, 16.0913 )
[node name="Node2D" type="Node2D"]
@ -127,7 +127,7 @@ collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall"]
position = Vector2( -23.7448, 88.1799 )
shape = SubResource( 6 )
shape = SubResource( 1 )
[node name="Wall4" type="StaticBody2D" parent="InsideOilTanker2/walls"]
collision_layer = 2147483652
@ -138,7 +138,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall4"]
position = Vector2( 520.202, 91.1098 )
shape = SubResource( 7 )
shape = SubResource( 2 )
[node name="Wall2" type="StaticBody2D" parent="InsideOilTanker2/walls"]
collision_layer = 2147483652
@ -149,7 +149,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall2"]
position = Vector2( 249.14, 122.296 )
shape = SubResource( 8 )
shape = SubResource( 3 )
[node name="Wall3" type="StaticBody2D" parent="InsideOilTanker2/walls"]
collision_layer = 2147483652
@ -160,7 +160,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall3"]
position = Vector2( 244.468, 58.9552 )
shape = SubResource( 9 )
shape = SubResource( 4 )
[node name="Wall5" type="StaticBody2D" parent="InsideOilTanker2/walls"]
collision_layer = 2147483652
@ -172,7 +172,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall5"]
position = Vector2( 342.076, 75.064 )
rotation = 0.0123712
shape = SubResource( 10 )
shape = SubResource( 5 )
[node name="Wall6" type="StaticBody2D" parent="InsideOilTanker2/walls"]
collision_layer = 2147483652
@ -184,7 +184,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/walls/Wall6"]
position = Vector2( 168.01, 51.7275 )
rotation = 0.0123712
shape = SubResource( 11 )
shape = SubResource( 6 )
[node name="NextTrigger" type="Area2D" parent="InsideOilTanker2"]
collision_layer = 4
@ -192,7 +192,7 @@ collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker2/NextTrigger"]
position = Vector2( 330.844, 100.227 )
shape = SubResource( 20 )
shape = SubResource( 7 )
[node name="InsideOilTanker" type="AnimatedSprite" parent="."]
frames = ExtResource( 3 )
@ -219,55 +219,55 @@ centered = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall"]
position = Vector2( 208.261, 91.1098 )
shape = SubResource( 12 )
shape = SubResource( 8 )
[node name="Wall2" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall2"]
position = Vector2( -23.7448, 81.6604 )
shape = SubResource( 13 )
shape = SubResource( 9 )
[node name="Wall5" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall5"]
position = Vector2( 6.44882, 51.7275 )
shape = SubResource( 14 )
shape = SubResource( 10 )
[node name="Wall6" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall6"]
position = Vector2( 127.185, 119.399 )
shape = SubResource( 15 )
shape = SubResource( 11 )
[node name="Wall7" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall7"]
position = Vector2( 10.2871, 55.1923 )
shape = SubResource( 16 )
shape = SubResource( 12 )
[node name="Wall9" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall9"]
position = Vector2( 79.5423, 88.1799 )
shape = SubResource( 17 )
shape = SubResource( 13 )
[node name="Wall10" type="StaticBody2D" parent="InsideOilTanker/walls"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/walls/Wall10"]
position = Vector2( -15.3507, 75.064 )
shape = SubResource( 18 )
shape = SubResource( 14 )
[node name="NextTrigger" type="Area2D" parent="InsideOilTanker"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/NextTrigger"]
position = Vector2( 197.689, 97.7763 )
shape = SubResource( 19 )
shape = SubResource( 15 )
[node name="DialogueTrigger" type="Area2D" parent="InsideOilTanker"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="InsideOilTanker/DialogueTrigger"]
position = Vector2( 84.0628, 97.7763 )
shape = SubResource( 21 )
shape = SubResource( 16 )
[node name="OilTanker" type="AnimatedSprite" parent="."]
frames = ExtResource( 2 )

5
scripts/DialogueBox.gd
View File

@ -96,11 +96,14 @@ func update() -> void:
$MarginContainer/VBoxContainer.alignment = BoxContainer.ALIGN_END
$MarginContainer/VBoxContainer.add_child_below_node($MarginContainer/VBoxContainer/NameContainer, $MarginContainer/VBoxContainer/TextContainer)
if text != '' and character_name != '':
if text != '':
name_label.bbcode_text = character_name
name_label.rect_min_size.x = name_label.get_font('normal_font').get_string_size(name_label.text).x
text_label.bbcode_text = text
if character_name == '': $MarginContainer/VBoxContainer/NameContainer.hide()
else: $MarginContainer/VBoxContainer/NameContainer.show()
if text == "": $MarginContainer.hide()
else: $MarginContainer.show()