Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-20 20:33:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move all .tscn and .gd files into scenes/ directory

Browse source
This commit is contained in:
Sebastian Morr 2020-10-26 19:15:47 +01:00
parent c330524f8e
commit 61304803bc
38 changed files with 88 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -25,7 +25,7 @@ Wanna build your own level? Great! Here's how to do it:
1. Download the latest version of the [Godot game engine](https://godotengine.org).
1. Clone this repository.
1. Run the game – the easiest way to do so is to run `godot main.tscn` from the project directory.
1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
1. Get a bit familiar with the levels which are currently there.
1. Take a look into the `levels` directory. It's split into chapters, and each level is a file.
1. Make a copy of an existing level or start writing your own. See the documention of the format below. Put your level in the `contrib` chapter.

16
project.godot
View file

@ -12,22 +12,22 @@ _global_script_classes=[ {
"base": "Node",
"class": "Chapter",
"language": "GDScript",
"path": "res://chapter.gd"
"path": "res://scenes/chapter.gd"
}, {
"base": "Node",
"class": "Level",
"language": "GDScript",
"path": "res://level.gd"
"path": "res://scenes/level.gd"
}, {
"base": "Node",
"class": "LevelRepo",
"language": "GDScript",
"path": "res://level_repo.gd"
"path": "res://scenes/level_repo.gd"
}, {
"base": "Node",
"class": "Shell",
"language": "GDScript",
"path": "res://shell.gd"
"path": "res://scenes/shell.gd"
} ]
_global_script_class_icons={
"Chapter": "",
@ -39,14 +39,14 @@ _global_script_class_icons={
[application]
config/name="git-hydra"
run/main_scene="res://main.tscn"
run/main_scene="res://scenes/main.tscn"
config/use_custom_user_dir=true
[autoload]
game="*res://game.gd"
helpers="*res://helpers.gd"
levels="*res://levels.gd"
game="*res://scenes/game.gd"
helpers="*res://scenes/helpers.gd"
levels="*res://scenes/levels.gd"
[display]

0
arrow.gd → scenes/arrow.gd
View file

11
arrow.tscn → scenes/arrow.tscn
View file

@ -1,11 +1,12 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://arrow.gd" type="Script" id=1]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://scenes/arrow.gd" type="Script" id=2]
[node name="Arrow" type="Node2D"]
show_behind_parent = true
script = ExtResource( 1 )
script = ExtResource( 2 )
[node name="Line" type="Line2D" parent="."]
points = PoolVector2Array( -0.480499, -0.11055, 158.301, 0.581757 )
@ -37,7 +38,7 @@ margin_left = -19.374
margin_top = -5.93085
margin_right = 20.626
margin_bottom = 8.06915
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 1, 1, 1, 1 )
text = "label"
align = 1
@ -50,7 +51,7 @@ margin_left = -230.84
margin_top = 42.1225
margin_right = 231.16
margin_bottom = 68.1225
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 0.356863, 0.356863, 0.356863, 1 )
text = "label"
align = 1

2
card.gd → scenes/card.gd
View file

@ -110,7 +110,7 @@ func dropped_on(other):
func try_play(command):
if game.energy >= energy:
$PlaySound.play()
var particles = preload("res://card_particles.tscn").instance()
var particles = preload("res://scenes/card_particles.tscn").instance()
particles.position = position
get_parent().add_child(particles)
$"../../..".terminal.send_command(command)

29
card.tscn → scenes/card.tscn
View file

@ -1,11 +1,12 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://card.gd" type="Script" id=1]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2]
[ext_resource path="res://nodes/blob.svg" type="Texture" id=3]
[ext_resource path="res://sounds/poof.wav" type="AudioStream" id=4]
[ext_resource path="res://sounds/swish.wav" type="AudioStream" id=5]
[ext_resource path="res://sounds/swoosh.wav" type="AudioStream" id=6]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://nodes/blob.svg" type="Texture" id=2]
[ext_resource path="res://scenes/card.gd" type="Script" id=3]
[ext_resource path="res://sounds/swish.wav" type="AudioStream" id=4]
[ext_resource path="res://sounds/swoosh.wav" type="AudioStream" id=5]
[ext_resource path="res://sounds/poof.wav" type="AudioStream" id=6]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.45098, 0.584314, 0.843137, 1 )
@ -31,7 +32,7 @@ corner_radius_bottom_left = 10
[node name="Card" type="Node2D" groups=[
"cards",
]]
script = ExtResource( 1 )
script = ExtResource( 3 )
[node name="Panel" type="Panel" parent="."]
margin_left = -105.0
@ -68,7 +69,7 @@ margin_left = -89.0
margin_top = -276.0
margin_right = 85.0
margin_bottom = -185.0
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Name"
autowrap = true
@ -93,7 +94,7 @@ margin_top = -164.0
margin_right = 133.0
margin_bottom = 23.0
rect_scale = Vector2( 0.75, 0.75 )
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Description"
autowrap = true
@ -105,7 +106,7 @@ __meta__ = {
visible = false
position = Vector2( -103.288, -287.778 )
scale = Vector2( 0.542341, 0.542341 )
texture = ExtResource( 3 )
texture = ExtResource( 2 )
[node name="Energy" type="Label" parent="Sprite"]
margin_left = -51.1637
@ -113,7 +114,7 @@ margin_top = -47.4558
margin_right = -17.1637
margin_bottom = -16.4558
rect_scale = Vector2( 3, 3 )
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
text = "0"
align = 1
valign = 1
@ -122,14 +123,14 @@ __meta__ = {
}
[node name="PickupSound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 5 )
stream = ExtResource( 4 )
[node name="PlaySound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 4 )
stream = ExtResource( 6 )
volume_db = -6.848
[node name="ReturnSound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 6 )
stream = ExtResource( 5 )
volume_db = -6.848
[connection signal="mouse_entered" from="Area2D" to="." method="_mouse_entered"]
[connection signal="mouse_exited" from="Area2D" to="." method="_mouse_exited"]

0
card_particles.tscn → scenes/card_particles.tscn
View file

2
cardgame.gd → scenes/cardgame.gd
View file

@ -172,7 +172,7 @@ func draw_rand_card():
draw_card(card)
func draw_card(card):
var new_card = preload("res://card.tscn").instance()
var new_card = preload("res://scenes/card.tscn").instance()
new_card.command = card.command
new_card.arg_number = card.arg_number

7
cardgame.tscn → scenes/cardgame.tscn
View file

@ -1,11 +1,12 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://repository.tscn" type="PackedScene" id=3]
[ext_resource path="res://cardgame.gd" type="Script" id=4]
[ext_resource path="res://terminal.tscn" type="PackedScene" id=5]
[ext_resource path="res://scenes/repository.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/cardgame.gd" type="Script" id=4]
[ext_resource path="res://scenes/terminal.tscn" type="PackedScene" id=5]
[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=6]
[node name="Cardgame" type="Node2D"]
script = ExtResource( 4 )

3
cards.tscn → scenes/cards.tscn
View file

@ -2,7 +2,8 @@
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=2]
[ext_resource path="res://cardgame.gd" type="Script" id=3]
[ext_resource path="res://scenes/cardgame.gd" type="Script" id=3]
[node name="Cards" type="Control"]
anchor_right = 1.0

0
chapter.gd → scenes/chapter.gd
View file

0
drop_area.gd → scenes/drop_area.gd
View file

3
drop_area.tscn → scenes/drop_area.tscn
View file

@ -1,6 +1,7 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://drop_area.gd" type="Script" id=1]
[ext_resource path="res://scenes/drop_area.gd" type="Script" id=1]
[sub_resource type="CircleShape2D" id=1]
radius = 23.5871

6
file_browser.gd → scenes/file_browser.gd
View file

@ -50,7 +50,7 @@ func update():
file_path = file_path.substr(2)
if file_path.substr(0, 5) == ".git/":
continue
var item = preload("res://file_browser_item.tscn").instance()
var item = preload("res://scenes/file_browser_item.tscn").instance()
item.label = file_path
item.connect("clicked", self, "item_clicked")
grid.add_child(item)
@ -60,7 +60,7 @@ func update():
# The last entry is an empty string, remove it.
files.pop_back()
for file_path in files:
var item = preload("res://file_browser_item.tscn").instance()
var item = preload("res://scenes/file_browser_item.tscn").instance()
item.label = file_path
item.connect("clicked", self, "item_clicked")
grid.add_child(item)
@ -70,7 +70,7 @@ func update():
# The last entry is an empty string, remove it.
files.pop_back()
for file_path in files:
var item = preload("res://file_browser_item.tscn").instance()
var item = preload("res://scenes/file_browser_item.tscn").instance()
item.label = file_path
item.connect("clicked", self, "item_clicked")
grid.add_child(item)

3
file_browser.tscn → scenes/file_browser.tscn
View file

@ -1,9 +1,10 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://file_browser.gd" type="Script" id=1]
[ext_resource path="res://scenes/file_browser.gd" type="Script" id=1]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2]
[ext_resource path="res://styles/theme.tres" type="Theme" id=3]
[node name="FileBrowser" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0

0
file_browser_item.gd → scenes/file_browser_item.gd
View file

9
file_browser_item.tscn → scenes/file_browser_item.tscn
View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://file_browser_item.gd" type="Script" id=2]
[ext_resource path="res://scenes/file_browser_item.gd" type="Script" id=1]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2]
[node name="Control" type="Control"]
anchor_right = 0.052
@ -9,7 +10,7 @@ anchor_bottom = 0.093
margin_right = 100.16
margin_bottom = -0.439995
rect_min_size = Vector2( 150, 100 )
script = ExtResource( 2 )
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -47,6 +48,6 @@ __meta__ = {
margin_top = 75.0
margin_right = 200.0
margin_bottom = 100.0
custom_fonts/font = ExtResource( 1 )
custom_fonts/font = ExtResource( 2 )
text = "filename"
align = 1

0
game.gd → scenes/game.gd
View file

0
helpers.gd → scenes/helpers.gd
View file

0
level.gd → scenes/level.gd
View file

0
level_repo.gd → scenes/level_repo.gd
View file

0
levels.gd → scenes/levels.gd
View file

4
main.gd → scenes/main.gd
View file

@ -22,7 +22,7 @@ func _ready():
var args = helpers.parse_args()
if args.has("sandbox"):
var err = get_tree().change_scene("res://sandbox.tscn")
var err = get_tree().change_scene("res://scenes/sandbox.tscn")
if err != OK:
helpers.crash("Could not change to sandbox scene")
return
@ -73,7 +73,7 @@ func load_level(level_id):
for r in repo_names:
var repo = level.repos[r]
var new_repo = preload("res://repository.tscn").instance()
var new_repo = preload("res://scenes/repository.tscn").instance()
new_repo.path = repo.path
new_repo.label = repo.slug
new_repo.size_flags_horizontal = SIZE_EXPAND_FILL

6
main.tscn → scenes/main.tscn
View file

@ -1,8 +1,8 @@
[gd_scene load_steps=9 format=2]
[ext_resource path="res://terminal.tscn" type="PackedScene" id=1]
[ext_resource path="res://main.gd" type="Script" id=2]
[ext_resource path="res://cards.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/terminal.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/main.gd" type="Script" id=2]
[ext_resource path="res://scenes/cards.tscn" type="PackedScene" id=3]
[ext_resource path="res://styles/alert_button.tres" type="StyleBox" id=4]
[ext_resource path="res://styles/theme.tres" type="Theme" id=6]
[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=7]

2
node.gd → scenes/node.gd
View file

@ -13,7 +13,7 @@ var id_always_visible = false
var held = false
var hovered = false
var arrow = preload("res://arrow.tscn")
var arrow = preload("res://scenes/arrow.tscn")
func _ready():
content_set(content)

23
node.tscn → scenes/node.tscn
View file

@ -1,11 +1,12 @@
[gd_scene load_steps=9 format=2]
[ext_resource path="res://node.gd" type="Script" id=1]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://scenes/node.gd" type="Script" id=2]
[ext_resource path="res://nodes/blob.svg" type="Texture" id=3]
[ext_resource path="res://nodes/pop.wav" type="AudioStream" id=4]
[ext_resource path="res://drop_area.tscn" type="PackedScene" id=5]
[ext_resource path="res://file_browser.tscn" type="PackedScene" id=6]
[ext_resource path="res://scenes/file_browser.tscn" type="PackedScene" id=4]
[ext_resource path="res://nodes/pop.wav" type="AudioStream" id=5]
[ext_resource path="res://scenes/drop_area.tscn" type="PackedScene" id=6]
[sub_resource type="CircleShape2D" id=1]
radius = 23.6295
@ -22,7 +23,7 @@ corner_radius_bottom_right = 5
corner_radius_bottom_left = 5
[node name="Node" type="Node2D"]
script = ExtResource( 1 )
script = ExtResource( 2 )
[node name="Arrows" type="Node2D" parent="."]
@ -48,7 +49,7 @@ margin_left = -19.9265
margin_top = -12.0097
margin_right = 129.073
margin_bottom = 40.9903
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 1, 1, 1, 1 )
text = "object_id"
__meta__ = {
@ -56,9 +57,9 @@ __meta__ = {
}
[node name="Pop" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource( 4 )
stream = ExtResource( 5 )
[node name="DropArea" parent="." instance=ExtResource( 5 )]
[node name="DropArea" parent="." instance=ExtResource( 6 )]
[node name="Area2D" type="Area2D" parent="."]
@ -75,7 +76,7 @@ margin_top = -22.8078
margin_right = 41.3944
margin_bottom = 12.1922
custom_styles/normal = SubResource( 2 )
custom_fonts/font = ExtResource( 2 )
custom_fonts/font = ExtResource( 1 )
custom_colors/font_color = Color( 1, 1, 1, 1 )
__meta__ = {
"_edit_use_anchors_": false
@ -84,7 +85,7 @@ __meta__ = {
[node name="OnTop" type="Node2D" parent="."]
z_index = 2
[node name="FileBrowser" parent="OnTop" instance=ExtResource( 6 )]
[node name="FileBrowser" parent="OnTop" instance=ExtResource( 4 )]
visible = false
anchor_right = 0.0
anchor_bottom = 0.0

0
player.tscn → scenes/player.tscn
View file

2
repository.gd → scenes/repository.gd
View file

@ -13,7 +13,7 @@ export var file_browser_active = true setget set_file_browser_active
export var simplified_view = false setget set_simplified_view
export var editable_path = false setget set_editable_path
var node = preload("res://node.tscn")
var node = preload("res://scenes/node.tscn")
var shell = Shell.new()
var objects = {}

4
repository.tscn → scenes/repository.tscn
View file

@ -1,9 +1,9 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://repository.gd" type="Script" id=1]
[ext_resource path="res://scenes/repository.gd" type="Script" id=1]
[ext_resource path="res://styles/theme.tres" type="Theme" id=2]
[ext_resource path="res://fonts/big.tres" type="DynamicFont" id=3]
[ext_resource path="res://file_browser.tscn" type="PackedScene" id=4]
[ext_resource path="res://scenes/file_browser.tscn" type="PackedScene" id=4]
[node name="Repository" type="Control"]
anchor_right = 1.0

0
sandbox.gd → scenes/sandbox.gd
View file

5
sandbox.tscn → scenes/sandbox.tscn
View file

@ -1,10 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://terminal.tscn" type="PackedScene" id=1]
[ext_resource path="res://repository.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/terminal.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/repository.tscn" type="PackedScene" id=2]
[ext_resource path="res://styles/theme.tres" type="Theme" id=3]
[ext_resource path="res://sandbox.gd" type="Script" id=4]
[node name="Sandbox" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0

0
shell.gd → scenes/shell.gd
View file

0
tcp_server.gd → scenes/tcp_server.gd
View file

2
tcp_server.tscn → scenes/tcp_server.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://tcp_server.gd" type="Script" id=1]
[ext_resource path="res://scenes/tcp_server.gd" type="Script" id=1]
[node name="TCPServer" type="Node"]
script = ExtResource( 1 )

0
terminal.gd → scenes/terminal.gd
View file

21
terminal.tscn → scenes/terminal.tscn
View file

@ -1,12 +1,13 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://terminal.gd" type="Script" id=2]
[ext_resource path="res://tcp_server.tscn" type="PackedScene" id=3]
[ext_resource path="res://fonts/monospace.tres" type="DynamicFont" id=4]
[ext_resource path="res://text_editor.tscn" type="PackedScene" id=5]
[ext_resource path="res://sounds/typewriter_ding.wav" type="AudioStream" id=2]
[ext_resource path="res://fonts/monospace.tres" type="DynamicFont" id=3]
[ext_resource path="res://scenes/terminal.gd" type="Script" id=4]
[ext_resource path="res://scenes/text_editor.tscn" type="PackedScene" id=5]
[ext_resource path="res://scenes/tcp_server.tscn" type="PackedScene" id=6]
[ext_resource path="res://sounds/buzzer.wav" type="AudioStream" id=7]
[ext_resource path="res://sounds/typewriter_ding.wav" type="AudioStream" id=8]
[sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 5.0
@ -34,7 +35,7 @@ func pressed():
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 1
script = ExtResource( 2 )
script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -58,7 +59,7 @@ margin_top = -1.92206
margin_bottom = -1.92212
size_flags_vertical = 3
custom_styles/normal = SubResource( 1 )
custom_fonts/normal_font = ExtResource( 4 )
custom_fonts/normal_font = ExtResource( 3 )
scroll_following = true
__meta__ = {
"_edit_use_anchors_": false
@ -135,7 +136,7 @@ visible = false
mouse_filter = 1
syntax_highlighting = false
[node name="TCPServer" parent="." instance=ExtResource( 3 )]
[node name="TCPServer" parent="." instance=ExtResource( 6 )]
[node name="Pager" type="WindowDialog" parent="."]
anchor_right = 1.0
@ -151,7 +152,7 @@ __meta__ = {
[node name="Text" type="RichTextLabel" parent="Pager"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/normal_font = ExtResource( 4 )
custom_fonts/normal_font = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -160,7 +161,7 @@ __meta__ = {
stream = ExtResource( 7 )
[node name="OkSound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 8 )
stream = ExtResource( 2 )
[connection signal="item_selected" from="Rows/TopHalf/Completions" to="." method="_completion_selected"]
[connection signal="pressed" from="Rows/VBoxContainer/Button" to="Rows/VBoxContainer/Button" method="pressed"]
[connection signal="pressed" from="Rows/VBoxContainer/Button2" to="Rows/VBoxContainer/Button2" method="pressed"]

0
text_editor.gd → scenes/text_editor.gd
View file

3
text_editor.tscn → scenes/text_editor.tscn
View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://fonts/default.tres" type="DynamicFont" id=1]
[ext_resource path="res://text_editor.gd" type="Script" id=2]
[ext_resource path="res://scenes/text_editor.gd" type="Script" id=2]
[node name="TextEditor" type="TextEdit"]
anchor_right = 1.0