badhouseplants/open-strike-2
4
0
Fork 0
Code Issues 11 Pull Requests 4 Actions Packages Projects 2 Releases Activity

Fix the aiming and bullet creation

Browse Source
This commit is contained in:
Nikolai Rodionov
2025-02-01 18:03:00 +01:00
parent 33f1d57a50
commit bd91818682
19 changed files with 334 additions and 8089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scenes/maps/base/map_loader.gd
View File

@ -3,9 +3,11 @@ class_name MapController extends Node
const PLAYER_SPAWNER: String = "res://scenes/maps/base/player_spawner/player_spawner.tscn"
const OBJECT_SPAWNER: String = "res://scenes/maps/base/object_spawner/object_spawner.tscn"
const BULLET_SPAWNER: String = "res://scenes/maps/base/bullet_spawner/bullet_spawner.tscn"
var player_spawner: PlayerSpawnerController
var object_spawner: Node3D
var bullet_spawner: BulletSpawnerController
@onready var spawn_locations: SpawnController = $SpawnLocations
func _on_player_connected(id):
@ -25,6 +27,11 @@ func _ready() -> void:
err = _add_object_spawner()
if err != OK:
push_error("Couldn't load object spawner")
err = _add_bullet_spawner()
if err != OK:
push_error("Couldn't load bullet spawner")
# add objects spawner
if not OS.has_feature("dedicated_server"):
_request_spawn.rpc_id(1, multiplayer.get_unique_id())
@ -71,18 +78,19 @@ func _add_object_spawner() -> Error :
add_child(node)
object_spawner = node
return OK
func _add_bullet_spawner() -> Error :
if not ResourceLoader.exists(BULLET_SPAWNER):
return ERR_DOES_NOT_EXIST
var scene: PackedScene = ResourceLoader.load(BULLET_SPAWNER)
if not scene.can_instantiate():
return ERR_CANT_OPEN
var node: BulletSpawnerController = scene.instantiate()
add_child(node)
bullet_spawner = node
return OK
var bullet_amount: int = 0
# -- TODO: Better bullet naming handler
var bullet_amount: int = -2147483647
func spawn_bullet(starting_point: Node3D, speed: int, damage: int):
var node: Node3D = ResourceLoader.load("res://scenes/weapon/bullet.tscn").instantiate()
node.position = starting_point.global_position
node.transform.basis = starting_point.global_transform.basis
node.name = str(bullet_amount)
node.speed = speed
node.damage = damage
bullet_amount += 1
var spawner: MultiplayerSpawner = object_spawner.find_child("MultiplayerSpawner")
var root_node: Node3D = object_spawner.find_child("Objects")
spawner.spawn(node)
root_node.add_child(node)
bullet_spawner.spawn_bullet(starting_point, speed, damage)