mirror of
https://github.com/Steffo99/pineapple-surf.git
synced 2024-11-25 01:04:18 +00:00
Fix misc things
This commit is contained in:
parent
990c7bcb17
commit
566ebc118d
7 changed files with 14 additions and 28 deletions
|
@ -6,10 +6,10 @@
|
||||||
[ext_resource type="AudioStream" uid="uid://lkftwgdun745" path="res://assets/pop.wav" id="3_gur2a"]
|
[ext_resource type="AudioStream" uid="uid://lkftwgdun745" path="res://assets/pop.wav" id="3_gur2a"]
|
||||||
[ext_resource type="Script" path="res://island/Pop.gd" id="4_5e7wk"]
|
[ext_resource type="Script" path="res://island/Pop.gd" id="4_5e7wk"]
|
||||||
|
|
||||||
[sub_resource type="BoxShape3D" id="BoxShape3D_370jp"]
|
[sub_resource type="BoxShape3D" id="BoxShape3D_b16fk"]
|
||||||
size = Vector3(1, 0.1, 1)
|
size = Vector3(1, 0.1, 1)
|
||||||
|
|
||||||
[sub_resource type="ArrayMesh" id="ArrayMesh_i27yi"]
|
[sub_resource type="ArrayMesh" id="ArrayMesh_phpc3"]
|
||||||
_surfaces = [{
|
_surfaces = [{
|
||||||
"aabb": AABB(-0.5, 0, -0.5, 1.00001, 1.00001, 1),
|
"aabb": AABB(-0.5, 0, -0.5, 1.00001, 1.00001, 1),
|
||||||
"attribute_data": PackedByteArray(143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 31, 133, 107, 63, 183, 109, 91, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63),
|
"attribute_data": PackedByteArray(143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 31, 133, 107, 63, 183, 109, 91, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63, 143, 194, 117, 63, 183, 109, 91, 63, 31, 133, 107, 63, 183, 109, 91, 63, 31, 133, 107, 63, 219, 182, 109, 63, 143, 194, 117, 63, 219, 182, 109, 63),
|
||||||
|
@ -37,15 +37,15 @@ collision_mask = 0
|
||||||
|
|
||||||
[node name="PlantableArea" type="CollisionShape3D" parent="Plant"]
|
[node name="PlantableArea" type="CollisionShape3D" parent="Plant"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
|
||||||
shape = SubResource("BoxShape3D_370jp")
|
shape = SubResource("BoxShape3D_b16fk")
|
||||||
|
|
||||||
[node name="Sprout" type="MeshInstance3D" parent="Plant"]
|
[node name="Sprout" type="MeshInstance3D" parent="Plant"]
|
||||||
transform = Transform3D(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
|
transform = Transform3D(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
|
||||||
mesh = SubResource("ArrayMesh_i27yi")
|
mesh = SubResource("ArrayMesh_phpc3")
|
||||||
skeleton = NodePath("../../..")
|
skeleton = NodePath("../../..")
|
||||||
|
|
||||||
[node name="GrowthTimer" type="Timer" parent="."]
|
[node name="GrowthTimer" type="Timer" parent="."]
|
||||||
wait_time = 2.0
|
wait_time = 30.0
|
||||||
one_shot = true
|
one_shot = true
|
||||||
|
|
||||||
[node name="Pop" type="AudioStreamPlayer3D" parent="."]
|
[node name="Pop" type="AudioStreamPlayer3D" parent="."]
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
[ext_resource type="PackedScene" uid="uid://ci0hy0d4d1476" path="res://island/CollectibleByPlayer.tscn" id="5_yps0c"]
|
[ext_resource type="PackedScene" uid="uid://ci0hy0d4d1476" path="res://island/CollectibleByPlayer.tscn" id="5_yps0c"]
|
||||||
[ext_resource type="PackedScene" uid="uid://bj4d3a0jxgvpu" path="res://island/CanSplash.tscn" id="7_3mgie"]
|
[ext_resource type="PackedScene" uid="uid://bj4d3a0jxgvpu" path="res://island/CanSplash.tscn" id="7_3mgie"]
|
||||||
|
|
||||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_e5jtb"]
|
[sub_resource type="CylinderShape3D" id="CylinderShape3D_q83gf"]
|
||||||
height = 0.9
|
height = 0.9
|
||||||
radius = 0.3
|
radius = 0.3
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ script = ExtResource("1_sbec5")
|
||||||
|
|
||||||
[node name="Shape" type="CollisionShape3D" parent="."]
|
[node name="Shape" type="CollisionShape3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, 0)
|
||||||
shape = SubResource("CylinderShape3D_e5jtb")
|
shape = SubResource("CylinderShape3D_q83gf")
|
||||||
|
|
||||||
[node name="PineappleMesh" parent="." instance=ExtResource("1_ndmmp")]
|
[node name="PineappleMesh" parent="." instance=ExtResource("1_ndmmp")]
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,8 @@ var player: Player:
|
||||||
return player
|
return player
|
||||||
set(p):
|
set(p):
|
||||||
player = p
|
player = p
|
||||||
self._on_player_set(p)
|
for weapon in weapons:
|
||||||
|
weapon.player = player
|
||||||
|
|
||||||
|
|
||||||
var weapons: Array = [
|
var weapons: Array = [
|
||||||
|
@ -29,11 +30,6 @@ func _ready() -> void:
|
||||||
self._switch_weapon(BaseWeapon.WeaponSlot.ONE)
|
self._switch_weapon(BaseWeapon.WeaponSlot.ONE)
|
||||||
|
|
||||||
|
|
||||||
func _on_player_set(player: Player) -> void:
|
|
||||||
for weapon in weapons:
|
|
||||||
weapon.player = player
|
|
||||||
|
|
||||||
|
|
||||||
func _input(_event: InputEvent) -> void:
|
func _input(_event: InputEvent) -> void:
|
||||||
if Input.is_action_just_pressed("slot1"):
|
if Input.is_action_just_pressed("slot1"):
|
||||||
_switch_weapon(BaseWeapon.WeaponSlot.ONE)
|
_switch_weapon(BaseWeapon.WeaponSlot.ONE)
|
||||||
|
|
|
@ -27,7 +27,7 @@ script/source = "extends Camera3D
|
||||||
|
|
||||||
@export var MainCamera: Camera3D
|
@export var MainCamera: Camera3D
|
||||||
|
|
||||||
func _process(delta):
|
func _process(_delta):
|
||||||
if not MainCamera:
|
if not MainCamera:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -79,7 +79,6 @@ grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
|
|
||||||
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
|
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -119,7 +118,6 @@ theme = SubResource("Theme_smyke")
|
||||||
|
|
||||||
[node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"]
|
[node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"]
|
||||||
show_behind_parent = true
|
show_behind_parent = true
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
@ -149,7 +147,6 @@ scale = Vector2(1.65, 1)
|
||||||
metadata/_edit_lock_ = true
|
metadata/_edit_lock_ = true
|
||||||
|
|
||||||
[node name="AmmoLabel" type="Label" parent="HUD"]
|
[node name="AmmoLabel" type="Label" parent="HUD"]
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 3
|
anchors_preset = 3
|
||||||
anchor_left = 1.0
|
anchor_left = 1.0
|
||||||
anchor_top = 1.0
|
anchor_top = 1.0
|
||||||
|
@ -169,7 +166,6 @@ vertical_alignment = 2
|
||||||
|
|
||||||
[node name="Crosshair" type="ColorRect" parent="HUD"]
|
[node name="Crosshair" type="ColorRect" parent="HUD"]
|
||||||
material = SubResource("ShaderMaterial_2p6rt")
|
material = SubResource("ShaderMaterial_2p6rt")
|
||||||
layout_mode = 1
|
|
||||||
anchors_preset = 15
|
anchors_preset = 15
|
||||||
anchor_right = 1.0
|
anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
|
|
|
@ -47,6 +47,5 @@ func bob_weapon(node: Node3D, delta: float):
|
||||||
|
|
||||||
func _input(event: InputEvent) -> void:
|
func _input(event: InputEvent) -> void:
|
||||||
if event is InputEventMouseMotion:
|
if event is InputEventMouseMotion:
|
||||||
var vec = event.relative
|
|
||||||
self.last_mouse_movement = event.relative
|
self.last_mouse_movement = event.relative
|
||||||
|
|
||||||
|
|
|
@ -11,14 +11,9 @@ script/source = "extends Node3D
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
var mesh = self.get_child(0) as MeshInstance3D
|
var mesh = self.get_child(0) as MeshInstance3D
|
||||||
var mat = mesh.get_active_material(0) as BaseMaterial3D
|
var mat = mesh.get_active_material(0) as BaseMaterial3D
|
||||||
# mat.texture_filter = BaseMaterial3D.TEXTURE_FILTER_NEAREST
|
mat.texture_filter = BaseMaterial3D.TEXTURE_FILTER_NEAREST
|
||||||
mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
# mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||||
# mat.ao_enabled = true
|
# mat.ao_enabled = true
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
|
||||||
func _process(delta: float) -> void:
|
|
||||||
pass
|
|
||||||
"
|
"
|
||||||
|
|
||||||
[sub_resource type="Image" id="Image_435th"]
|
[sub_resource type="Image" id="Image_435th"]
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
config_version=5
|
config_version=5
|
||||||
|
|
||||||
_global_script_classes=[{
|
_global_script_classes=[{
|
||||||
"base": "Node",
|
"base": "Node3D",
|
||||||
"class": &"BaseWeapon",
|
"class": &"BaseWeapon",
|
||||||
"language": &"GDScript",
|
"language": &"GDScript",
|
||||||
"path": "res://player/onhand/BaseWeapon.gd"
|
"path": "res://player/onhand/BaseWeapon.gd"
|
||||||
|
|
Loading…
Reference in a new issue