Merge branch 'master' of https://gitlab.hexaquo.at/Light/fhwikijam
This commit is contained in:
commit
491fd69d38
30
WikiJam/Enemies/Dino.gd
Normal file
30
WikiJam/Enemies/Dino.gd
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
extends KinematicBody
|
||||||
|
|
||||||
|
export(NodePath) var player_path
|
||||||
|
export(float) var speed
|
||||||
|
|
||||||
|
var _current_nav_path: PoolVector3Array
|
||||||
|
var _player
|
||||||
|
|
||||||
|
onready var _navigation = get_parent()
|
||||||
|
|
||||||
|
|
||||||
|
func _ready():
|
||||||
|
_player = get_node(player_path)
|
||||||
|
|
||||||
|
|
||||||
|
func _process(delta):
|
||||||
|
var to = _navigation.get_closest_point(_player.transform.origin)
|
||||||
|
_current_nav_path = _navigation.get_simple_path(transform.origin, to)
|
||||||
|
|
||||||
|
var dir: Vector3
|
||||||
|
|
||||||
|
if _current_nav_path.size() > 0:
|
||||||
|
var index = 0
|
||||||
|
if (_current_nav_path[0] - transform.origin).length() < 0.1: index = 1
|
||||||
|
|
||||||
|
dir = (_current_nav_path[index] - transform.origin).normalized()
|
||||||
|
else:
|
||||||
|
dir = (_player.transform.origin - transform.origin).normalized()
|
||||||
|
|
||||||
|
move_and_slide(dir * speed)
|
25
WikiJam/Enemies/Dino.tscn
Normal file
25
WikiJam/Enemies/Dino.tscn
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
[gd_scene load_steps=4 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://Enemies/Dino.gd" type="Script" id=1]
|
||||||
|
|
||||||
|
[sub_resource type="CylinderMesh" id=1]
|
||||||
|
top_radius = 2.053
|
||||||
|
bottom_radius = 4.158
|
||||||
|
height = 13.579
|
||||||
|
|
||||||
|
[sub_resource type="CapsuleShape" id=2]
|
||||||
|
radius = 3.79447
|
||||||
|
height = 6.59163
|
||||||
|
|
||||||
|
[node name="Dino" type="KinematicBody"]
|
||||||
|
script = ExtResource( 1 )
|
||||||
|
speed = 10.0
|
||||||
|
|
||||||
|
[node name="MeshInstance" type="MeshInstance" parent="."]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, 0 )
|
||||||
|
mesh = SubResource( 1 )
|
||||||
|
material/0 = null
|
||||||
|
|
||||||
|
[node name="CollisionShape" type="CollisionShape" parent="."]
|
||||||
|
transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 7, 0 )
|
||||||
|
shape = SubResource( 2 )
|
File diff suppressed because one or more lines are too long
52
WikiJam/Level/Objects/Ground.tscn
Normal file
52
WikiJam/Level/Objects/Ground.tscn
Normal file
File diff suppressed because one or more lines are too long
@ -7,32 +7,62 @@
|
|||||||
|
|
||||||
[node name="Walls" type="Spatial" parent="."]
|
[node name="Walls" type="Spatial" parent="."]
|
||||||
|
|
||||||
[node name="LargeWall" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 49 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 49 )
|
||||||
|
|
||||||
[node name="LargeWall2" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall2" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -20, 0, 49 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -20, 0, 49 )
|
||||||
|
|
||||||
[node name="LargeWall7" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall7" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -34, 0, 63 )
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -34, 0, 63 )
|
||||||
|
|
||||||
[node name="LargeWall4" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall4" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 35, 0, 63 )
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 35, 0, 63 )
|
||||||
|
|
||||||
[node name="LargeWall5" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall5" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 27, 0, 77 )
|
transform = Transform( -0.8, 0, 1.50996e-07, 0, 1, 0, -1.20797e-07, 0, -1, 23.9878, 0, 77.1579 )
|
||||||
|
|
||||||
[node name="LargeWall6" type="Spatial" parent="Walls" instance=ExtResource( 1 )]
|
[node name="LargeWall6" parent="Walls" instance=ExtResource( 1 )]
|
||||||
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -3, 0, 77 )
|
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -3, 0, 77 )
|
||||||
|
|
||||||
[node name="Wall" type="Spatial" parent="Walls" instance=ExtResource( 2 )]
|
[node name="Wall" parent="Walls" instance=ExtResource( 2 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 55 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 55 )
|
||||||
|
|
||||||
[node name="Wall2" type="Spatial" parent="Walls" instance=ExtResource( 2 )]
|
[node name="Wall10" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 0, 55 )
|
||||||
|
|
||||||
|
[node name="Wall12" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -28, 0, 59.4168 )
|
||||||
|
|
||||||
|
[node name="Wall13" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -28, 6, 59.4168 )
|
||||||
|
|
||||||
|
[node name="Wall14" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -18, 6, 59.4168 )
|
||||||
|
|
||||||
|
[node name="Wall11" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14, 6, 55 )
|
||||||
|
|
||||||
|
[node name="Wall2" parent="Walls" instance=ExtResource( 2 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 6, 55 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 6, 55 )
|
||||||
|
|
||||||
[node name="Wall3" type="Spatial" parent="Walls" instance=ExtResource( 2 )]
|
[node name="Wall3" parent="Walls" instance=ExtResource( 2 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 6, 65 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 6, 65 )
|
||||||
|
|
||||||
[node name="Wall4" type="Spatial" parent="Walls" instance=ExtResource( 2 )]
|
[node name="Wall9" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 0.7, 21, 6, 73.528 )
|
||||||
|
|
||||||
|
[node name="Wall4" parent="Walls" instance=ExtResource( 2 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 65 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21, 0, 65 )
|
||||||
|
|
||||||
|
[node name="Wall5" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1.12, 0, 1, 0, 1, 0, -4.89568e-08, 0.48988, 6, 49 )
|
||||||
|
|
||||||
|
[node name="Wall6" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -23, 6, 77 )
|
||||||
|
|
||||||
|
[node name="Wall7" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -0.7, 0, 1, 0, 1, 0, -3.0598e-08, -31.5015, 6, 77.0825 )
|
||||||
|
|
||||||
|
[node name="Wall8" parent="Walls" instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -0.7, 0, 1, 0, 1, 0, -3.0598e-08, -31.5015, 0, 77.0825 )
|
||||||
|
66
WikiJam/Level/Objects/RectTower.tscn
Normal file
66
WikiJam/Level/Objects/RectTower.tscn
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1]
|
||||||
|
[ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2]
|
||||||
|
|
||||||
|
[node name="RectTower" type="Spatial"]
|
||||||
|
|
||||||
|
[node name="LargeWall" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 0, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall7" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 12, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall11" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 24, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall5" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 12, 14.2772 )
|
||||||
|
|
||||||
|
[node name="LargeWall10" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 24, 14.2772 )
|
||||||
|
|
||||||
|
[node name="LargeWall2" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 0, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall6" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 12, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall9" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 24, 0 )
|
||||||
|
|
||||||
|
[node name="LargeWall8" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 12, -14.2661 )
|
||||||
|
|
||||||
|
[node name="LargeWall12" parent="." instance=ExtResource( 1 )]
|
||||||
|
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 24, -14.2661 )
|
||||||
|
|
||||||
|
[node name="Wall" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 0, -14.1777 )
|
||||||
|
|
||||||
|
[node name="Wall10" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 0, 13.8908 )
|
||||||
|
|
||||||
|
[node name="Wall2" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 6, -14.1777 )
|
||||||
|
|
||||||
|
[node name="Wall9" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 6, 13.8908 )
|
||||||
|
|
||||||
|
[node name="Wall3" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 6, -14.1777 )
|
||||||
|
|
||||||
|
[node name="Wall8" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 6, 13.8908 )
|
||||||
|
|
||||||
|
[node name="Wall4" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 0, -14.1777 )
|
||||||
|
|
||||||
|
[node name="Wall7" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 0, 13.8908 )
|
||||||
|
|
||||||
|
[node name="Wall5" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 0, 6, -14.1777 )
|
||||||
|
|
||||||
|
[node name="Wall6" parent="." instance=ExtResource( 2 )]
|
||||||
|
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 0, 6, 13.8908 )
|
@ -1,51 +0,0 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
|
||||||
|
|
||||||
[ext_resource path="res://Level/Objects/LargeWall.tscn" type="PackedScene" id=1]
|
|
||||||
[ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=2]
|
|
||||||
|
|
||||||
[node name="SmallBuilding" type="Spatial"]
|
|
||||||
|
|
||||||
[node name="LargeWall" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 0, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall7" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 12, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall11" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -14.1343, 24, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall3" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 0, 14.2772 )
|
|
||||||
|
|
||||||
[node name="LargeWall5" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 12, 14.2772 )
|
|
||||||
|
|
||||||
[node name="LargeWall10" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.134278, 24, 14.2772 )
|
|
||||||
|
|
||||||
[node name="LargeWall2" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 0, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall6" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 12, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall9" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 14.2347, 24, 0 )
|
|
||||||
|
|
||||||
[node name="LargeWall8" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 12, -14.2661 )
|
|
||||||
|
|
||||||
[node name="LargeWall12" type="Spatial" parent="." instance=ExtResource( 1 )]
|
|
||||||
transform = Transform( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0, 24, -14.2661 )
|
|
||||||
|
|
||||||
[node name="Wall" type="Spatial" parent="." instance=ExtResource( 2 )]
|
|
||||||
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 0, -14.1777 )
|
|
||||||
|
|
||||||
[node name="Wall2" type="Spatial" parent="." instance=ExtResource( 2 )]
|
|
||||||
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, 10, 6, -14.1777 )
|
|
||||||
|
|
||||||
[node name="Wall3" type="Spatial" parent="." instance=ExtResource( 2 )]
|
|
||||||
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 6, -14.1777 )
|
|
||||||
|
|
||||||
[node name="Wall4" type="Spatial" parent="." instance=ExtResource( 2 )]
|
|
||||||
transform = Transform( -2.98023e-08, 0, -1, 0, 1, 0, 1, 0, -2.98023e-08, -10, 0, -14.1777 )
|
|
13
WikiJam/Level/Particles/GrassParticles.tscn
Normal file
13
WikiJam/Level/Particles/GrassParticles.tscn
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
|
[sub_resource type="PrismMesh" id=1]
|
||||||
|
|
||||||
|
[sub_resource type="MultiMesh" id=2]
|
||||||
|
instance_count = 1
|
||||||
|
mesh = SubResource( 1 )
|
||||||
|
transform_array = PoolVector3Array( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
|
||||||
|
|
||||||
|
[node name="GrassParticles" type="Spatial"]
|
||||||
|
|
||||||
|
[node name="MultiMeshInstance" type="MultiMeshInstance" parent="."]
|
||||||
|
multimesh = SubResource( 2 )
|
6
WikiJam/Materials/Grass.tres
Normal file
6
WikiJam/Materials/Grass.tres
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[gd_resource type="SpatialMaterial" format=2]
|
||||||
|
|
||||||
|
[resource]
|
||||||
|
params_cull_mode = 2
|
||||||
|
albedo_color = Color( 0.384314, 0.623529, 0.388235, 1 )
|
||||||
|
roughness = 0.9
|
BIN
WikiJam/Models/Grass.glb
Normal file
BIN
WikiJam/Models/Grass.glb
Normal file
Binary file not shown.
1062
WikiJam/Models/Grass.glb.import
Normal file
1062
WikiJam/Models/Grass.glb.import
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user