Sync reloading and cash (#66)

crates/shared/src/player.rs

@@ -1,20 +1,13 @@
 use crate::{
     GameState,
-    backpack::Backpack,
-    camera::{CameraArmRotation, CameraTarget},
     cash::{Cash, CashCollectEvent},
     character::{AnimatedCharacter, Character},
-    control::{ControlState, controller_common::PlayerCharacterController},
     global_observer,
     head::ActiveHead,
-    head_drop::HeadDrops,
-    heads::{ActiveHeads, HeadChanged, HeadState},
+    heads::HeadChanged,
     heads_database::{HeadControls, HeadsDatabase},
-    hitpoints::{Hitpoints, Kill},
     loading_assets::AudioAssets,
-    npc::SpawnCharacter,
     sounds::PlaySound,
-    tb_entities::SpawnPoint,
 };
 use avian3d::prelude::*;
 use bevy::{
@@ -22,9 +15,6 @@ use bevy::{
     prelude::*,
     window::{CursorGrabMode, PrimaryWindow},
 };
-use lightyear::prelude::input::native::ActionState;
-#[cfg(feature = "server")]
-use lightyear::prelude::{ControlledBy, Lifetime, NetworkTarget, PredictionTarget, Replicate};
 use serde::{Deserialize, Serialize};
 
 #[derive(Component, Default, Serialize, Deserialize, PartialEq)]
@@ -50,86 +40,6 @@ pub fn plugin(app: &mut App) {
     global_observer!(app, on_update_head_mesh);
 }
 
-pub fn spawn(
-    mut commands: Commands,
-    #[cfg(feature = "server")] owner: Entity,
-    query: Query<&Transform, With<SpawnPoint>>,
-    asset_server: Res<AssetServer>,
-    heads_db: Res<HeadsDatabase>,
-) {
-    let Some(spawn) = query.iter().next() else {
-        return;
-    };
-
-    let transform = Transform::from_translation(spawn.translation + Vec3::new(0., 3., 0.));
-
-    let mut player = commands.spawn(player_bundle(transform, &heads_db));
-    player.observe(on_kill);
-
-    #[cfg(feature = "server")]
-    player.insert((
-        Replicate::to_clients(NetworkTarget::All),
-        PredictionTarget::to_clients(NetworkTarget::All),
-        ControlledBy {
-            owner,
-            lifetime: Lifetime::SessionBased,
-        },
-    ));
-
-    commands.spawn((
-        AudioPlayer::new(asset_server.load("sfx/heads/angry demonstrator.ogg")),
-        PlaybackSettings::DESPAWN,
-    ));
-
-    commands.trigger(SpawnCharacter(transform.translation));
-}
-
-fn player_bundle(transform: Transform, heads_db: &Res<HeadsDatabase>) -> impl Bundle {
-    (
-        Name::from("player"),
-        Player,
-        ActiveHead(0),
-        ActiveHeads::new([
-            Some(HeadState::new(0, heads_db.as_ref())),
-            Some(HeadState::new(3, heads_db.as_ref())),
-            Some(HeadState::new(6, heads_db.as_ref())),
-            Some(HeadState::new(10, heads_db.as_ref())),
-            Some(HeadState::new(9, heads_db.as_ref())),
-        ]),
-        Hitpoints::new(100),
-        CameraTarget,
-        transform,
-        Visibility::default(),
-        PlayerCharacterController,
-        ActionState::<ControlState>::default(),
-        Backpack::default(),
-        children![(
-            Name::new("player-rig"),
-            PlayerBodyMesh,
-            CameraArmRotation,
-            children![AnimatedCharacter::new(0)],
-        )],
-    )
-}
-
-fn on_kill(
-    trigger: Trigger<Kill>,
-    mut commands: Commands,
-    mut query: Query<(&Transform, &ActiveHead, &mut ActiveHeads, &mut Hitpoints)>,
-) {
-    let Ok((transform, active, mut heads, mut hp)) = query.get_mut(trigger.target()) else {
-        return;
-    };
-
-    commands.trigger(HeadDrops::new(transform.translation, active.0));
-
-    if let Some(new_head) = heads.loose_current() {
-        hp.set_health(heads.current().unwrap().health);
-
-        commands.trigger(HeadChanged(new_head));
-    }
-}
-
 fn cursor_recenter(q_windows: Single<&mut Window, With<PrimaryWindow>>) {
     let mut primary_window = q_windows;
     let center = Vec2::new(