From c588b7cab430f9144e06033fd68f59b55ee06df9 Mon Sep 17 00:00:00 2001 From: Sofia Date: Mon, 20 Jul 2026 20:30:40 +0300 Subject: [PATCH] Rename bullet to beam and weapon to raygun --- godot/scenes/player/raygun.tscn | 4 ++-- .../{raygun_bullet.tscn => raygun_beam.tscn} | 2 +- rust/src/player.rs | 6 +++--- rust/src/soldier_mesh.rs | 8 ++++---- rust/src/weapon.rs | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) rename godot/scenes/player/{raygun_bullet.tscn => raygun_beam.tscn} (91%) diff --git a/godot/scenes/player/raygun.tscn b/godot/scenes/player/raygun.tscn index 4d8788a..4577cc8 100644 --- a/godot/scenes/player/raygun.tscn +++ b/godot/scenes/player/raygun.tscn @@ -1,10 +1,10 @@ [gd_scene format=3 uid="uid://cw7duhhjebypt"] [ext_resource type="PackedScene" uid="uid://cg81784ct8gf5" path="res://mesh/raygun.tscn" id="1_ckadf"] -[ext_resource type="PackedScene" uid="uid://ctslratcr8h6v" path="res://scenes/player/raygun_bullet.tscn" id="1_m84jv"] +[ext_resource type="PackedScene" uid="uid://ctslratcr8h6v" path="res://scenes/player/raygun_beam.tscn" id="1_m84jv"] [ext_resource type="AudioStream" uid="uid://xxpkjhaovyd" path="res://assets/LaserWithRecoveryEdited.ogg" id="2_lxble"] -[node name="raygun" type="Weapon" unique_id=751705927 node_paths=PackedStringArray("sound_emitter", "bullet_source")] +[node name="raygun" type="Raygun" unique_id=573018429 node_paths=PackedStringArray("sound_emitter", "bullet_source")] sound_emitter = NodePath("sound_emitter") bullet_prefab = ExtResource("1_m84jv") bullet_source = NodePath("bullet_source") diff --git a/godot/scenes/player/raygun_bullet.tscn b/godot/scenes/player/raygun_beam.tscn similarity index 91% rename from godot/scenes/player/raygun_bullet.tscn rename to godot/scenes/player/raygun_beam.tscn index 189116a..89e146d 100644 --- a/godot/scenes/player/raygun_bullet.tscn +++ b/godot/scenes/player/raygun_beam.tscn @@ -15,7 +15,7 @@ top_radius = 0.2 bottom_radius = 0.2 height = 1.0 -[node name="raygun_bullet" type="Bullet" unique_id=1238833478] +[node name="raygun_beam" type="Beam" unique_id=2002340444] [node name="mesh_instance_3d" type="MeshInstance3D" parent="." unique_id=1295653371] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0) diff --git a/rust/src/player.rs b/rust/src/player.rs index 2dc01dd..f6afb79 100644 --- a/rust/src/player.rs +++ b/rust/src/player.rs @@ -21,7 +21,7 @@ use crate::{ }, soldier_mesh::SoldierMesh, ui::cli::CommandLinePanel, - weapon::Weapon, + weapon::Raygun, }; #[derive(Debug, Clone, Copy, Serialize, Deserialize)] @@ -83,7 +83,7 @@ pub struct LocalPlayer { soldier_mesh: Option>, pub player_id: Option, - pub weapon: Option>, + pub weapon: Option>, movement_dir: Vector3, y_speed: f32, @@ -314,7 +314,7 @@ pub struct RemotePlayer { soldier_mesh: Option>, pub player_id: Option, - pub weapon: Option>, + pub weapon: Option>, movement_dir: Vector3, y_speed: f32, diff --git a/rust/src/soldier_mesh.rs b/rust/src/soldier_mesh.rs index 0cc233f..4e875b0 100644 --- a/rust/src/soldier_mesh.rs +++ b/rust/src/soldier_mesh.rs @@ -6,7 +6,7 @@ use godot::{ prelude::*, }; -use crate::weapon::Weapon; +use crate::weapon::Raygun; #[derive(GodotClass)] #[class(base=Node3D, init)] @@ -43,16 +43,16 @@ impl SoldierMesh { } } - pub fn spawn_raygun(&mut self) -> Option> { + pub fn spawn_raygun(&mut self) -> Option> { if let Some(raygun) = &self.raygun { - let node = raygun.instantiate_as::(); + let node = raygun.instantiate_as::(); self.spawn_weapon(node) } else { None } } - fn spawn_weapon(&mut self, node: Gd) -> Option> { + fn spawn_weapon(&mut self, node: Gd) -> Option> { if let Some(hand) = &mut self.hand_attachment { hand.add_child(&node); Some(node) diff --git a/rust/src/weapon.rs b/rust/src/weapon.rs index 98f1c3e..be85b5b 100644 --- a/rust/src/weapon.rs +++ b/rust/src/weapon.rs @@ -5,7 +5,7 @@ use godot::{ #[derive(GodotClass)] #[class(base=Node3D, init)] -pub struct Weapon { +pub struct Raygun { #[export] sound_emitter: Option>, #[export] @@ -16,14 +16,14 @@ pub struct Weapon { base: Base, } -impl Weapon { +impl Raygun { pub fn shoot(&mut self, to: Vector3, deal_damage: bool) { if let Some(emitter) = &mut self.sound_emitter { emitter.play(); } if let Some(prefab) = &self.bullet_prefab { - let mut bullet = prefab.instantiate_as::(); + let mut bullet = prefab.instantiate_as::(); if let Some(source) = &self.bullet_source { bullet.bind_mut().source = Some(source.get_global_position()); @@ -39,7 +39,7 @@ impl Weapon { #[derive(GodotClass)] #[class(base=Node3D, init)] -pub struct Bullet { +pub struct Beam { pub source: Option, pub target: Option, @@ -52,7 +52,7 @@ pub struct Bullet { } #[godot_api] -impl INode3D for Bullet { +impl INode3D for Beam { fn ready(&mut self) { if let (Some(target), Some(source)) = (self.target, self.source) { let midway_point = (target + source) / 2.; @@ -71,13 +71,13 @@ impl INode3D for Bullet { } } -impl Bullet { +impl Beam { fn scale(&mut self) { let length = Vector3::BACK * self.distance; let girth_scale = (Vector3::UP + Vector3::RIGHT) * self.girth; self.base_mut().set_scale(length + girth_scale); - if self.girth < 0.05 { + if self.girth < 0.01 { self.base_mut().queue_free(); } }