Browse Source

Merge branch 'Henrik' of http://git.pixdigit.tk/Team_Godot/GGJ21 into Henrik

Henrik
Desaru 3 months ago
parent
commit
a05b120938
35 changed files with 4188 additions and 422 deletions
  1. BIN
     
  2. BIN
     
  3. BIN
     
  4. BIN
     
  5. BIN
     
  6. BIN
     
  7. BIN
     
  8. BIN
     
  9. BIN
     
  10. BIN
     
  11. BIN
     
  12. BIN
     
  13. BIN
     
  14. BIN
     
  15. BIN
     
  16. BIN
     
  17. BIN
     
  18. BIN
     
  19. BIN
     
  20. BIN
     
  21. +3983
    -340
      assets/models/ship/prototype ship.escn
  22. BIN
     
  23. BIN
     
  24. BIN
     
  25. BIN
     
  26. BIN
     
  27. BIN
     
  28. BIN
     
  29. +3
    -0
      default_bus_layout.tres
  30. +0
    -4
      project.godot
  31. +20
    -2
      scenes/Ship.tscn
  32. +3
    -17
      scenes/sub_scenes/player.tscn
  33. +138
    -54
      scenes/sub_scenes/satzkasten.tscn
  34. +35
    -1
      scenes/sub_scenes/ship.tscn
  35. +6
    -4
      src/State.gd

BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


+ 3983
- 340
assets/models/ship/prototype ship.escn
File diff suppressed because it is too large
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


+ 3
- 0
default_bus_layout.tres View File

@@ -0,0 +1,3 @@
[gd_resource type="AudioBusLayout" format=2]

[resource]

+ 0
- 4
project.godot View File

@@ -34,10 +34,6 @@ gdscript/completion/autocomplete_setters_and_getters=true
window/size/width=1920
window/size/height=1080

[editor_plugins]

enabled=PoolStringArray( "randomAudioStreamPlayer" )

[gui]

theme/custom_font="res://assets/font/booter_mid.tres"


+ 20
- 2
scenes/Ship.tscn View File

@@ -10,6 +10,7 @@
background_mode = 1
ambient_light_color = Color( 1, 1, 1, 1 )
ambient_light_energy = 0.1
ss_reflections_enabled = true
ssao_enabled = true
glow_levels/1 = true
glow_levels/2 = true
@@ -308,6 +309,24 @@ omni_range = 41.9544
[node name="CameraCenter" type="Position3D" parent="prototype ship"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.222841, 9.063, -3.93741 )

[node name="ReflectionProbe" type="ReflectionProbe" parent="prototype ship"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -18.3905, 12.9766, 0 )
extents = Vector3( 12.3166, 25.0055, 21.0366 )
origin_offset = Vector3( -0.275391, 0, 0 )
enable_shadows = true

[node name="ReflectionProbe2" type="ReflectionProbe" parent="prototype ship"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.67378, 10.2301, 0 )
extents = Vector3( 10.1964, 28.2884, 21.0366 )
origin_offset = Vector3( -0.275391, 0, 0 )
enable_shadows = true

[node name="ReflectionProbe3" type="ReflectionProbe" parent="prototype ship"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.5999, 14.2964, 0 )
extents = Vector3( 10.1964, 21.0754, 21.0366 )
origin_offset = Vector3( -0.275391, 0, 0 )
enable_shadows = true

[node name="Player" parent="." instance=ExtResource( 2 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10.0034, 4.03126 )

@@ -351,7 +370,7 @@ transform = Transform( 1, 0, 0, 0, -0.416456, -0.909156, 0, 0.909156, -0.416456,
light_energy = 0.2

[node name="SeagullOrbit" type="Spatial" parent="."]
transform = Transform( 0.370987, 0, -0.928638, 0, 1, 0, 0.928638, 0, 0.370987, 0, 30, 0 )
transform = Transform( -0.998698, 0, -0.0510071, 0, 1, 0, 0.0510071, 0, -0.998698, 0, 30, 0 )
script = SubResource( 26 )
speed = 0.5

@@ -360,7 +379,6 @@ script = null

[node name="Steuer" parent="." instance=ExtResource( 4 )]
transform = Transform( -1.62921e-07, 0, -1, 0, 1, 0, 1, 0, -1.62921e-07, 11.2304, 7.93589, -0.296839 )
steer_plant_path = NodePath("../Steuer/Spatial/steer")

[node name="Bubble" parent="." instance=ExtResource( 5 )]
transform = Transform( 30, 0, 0, 0, 25, 0, 0, 0, 25, -2.66053, 15.0877, 0 )


+ 3
- 17
scenes/sub_scenes/player.tscn View File

@@ -13,8 +13,6 @@ var sprintFactor : float = 2
var jumpForce : float = 20.0




var vel : Vector3 = Vector3()
var gravity : Vector3 = Vector3(0,-0.9,0)

@@ -40,9 +38,7 @@ func _physics_process(_delta):
if Input.is_action_pressed(\"MovingLeft\"):
input.x -= 1

if Input.is_action_just_pressed(\"Jump\") && is_on_floor():
input.y += 1
@@ -52,30 +48,20 @@ func _physics_process(_delta):
if Input.is_action_pressed(\"Sprint\"):
input.x *= sprintFactor
input.z *= sprintFactor


vel += Vector3(input.x, 0, input.z)*moveSpeed
vel.y += input.y * jumpForce
vel += gravity

vel = move_and_slide(vel, Vector3.UP)
print_debug(vel.length())

if vel.length() > 1 and is_on_floor():
if stepTimer.is_stopped():
stepTimer.start()
else:
stepTimer.stop()

func _on_Timer_timeout():
audio.play()


+ 138
- 54
scenes/sub_scenes/satzkasten.tscn
File diff suppressed because it is too large
View File


+ 35
- 1
scenes/sub_scenes/ship.tscn View File

@@ -1,5 +1,39 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=3 format=2]

[ext_resource path="res://assets/models/ship/prototype ship.escn" type="PackedScene" id=1]

[sub_resource type="GDScript" id=1]
script/source = "extends Spatial

func _ready():
for child in get_children():
for child2 in child.get_children():
if child2 is AnimationPlayer:
var anim_name = child2.get_animation_list()[0]
var anim = child2.get_animation(anim_name)
anim.loop = true
child2.add_animation(\"anim\", anim)
child2.current_animation = \"anim\"
child2.play()
"

[node name="prototype ship" instance=ExtResource( 1 )]
script = SubResource( 1 )

[node name="Cube027" parent="." index="14"]
transform = Transform( 0.999242, 0, 0.0389346, 0, 1, 0, -0.0389346, 0, 0.999242, 16.2562, 24.1535, 3.22515 )

[node name="AnimationPlayer" parent="Cube027" index="0"]
autoplay = "Cube.027Action"

[node name="Cylinder006" parent="." index="15"]
transform = Transform( 0.36254, 0, -0.931968, 0, 1, 0, 0.931968, 0, 0.36254, 16.2562, 22.2277, -3.51538 )

[node name="AnimationPlayer" parent="Cylinder006" index="0"]
autoplay = "Cylinder.006Action.001"

[node name="Sphere" parent="." index="22"]
transform = Transform( 1, 0, 0, 0, 0.483518, -0.875335, 0, 0.875335, 0.483518, -20.9206, 18.9473, 1.98536 )

[node name="AnimationPlayer" parent="Sphere" index="0"]
autoplay = "SphereAction.001"

+ 6
- 4
src/State.gd View File

@@ -16,16 +16,19 @@ var plant_amounts: Dictionary = {
PLANT_TYPE.DECO: 0,
}

enum item {
enum ITEM {
EMPTY,
SEED,
FERTILIZER
}


var rng: RandomNumberGenerator = RandomNumberGenerator.new()

var o2: float = 0

var selected_plant: Spatial = null
var player_Inventory: int = item.EMPTY
var player_inventory: int = ITEM.FERTILIZER


func select_plant(plant: Spatial):
@@ -40,5 +43,4 @@ func unselect_plant(plant: Spatial):

func _input(_event):
if Input.is_action_just_pressed("Interact"):
pass
# TODO
selected_plant.interact()

Loading…
Cancel
Save