bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Implement factory offset saving

Browse Source
This commit is contained in:
NG (Graham)
2026-01-05 16:21:14 -05:00
parent 49255e7e7c
commit 437b7f9fdd
8 changed files with 166 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
rc_services_room/src/operations/crf_shift_vehicle.rs Normal file
View File

@@ -0,0 +1,66 @@
use polariton_server::operations::{SimpleOpError, SimpleOperation, SimpleOpImpl};
use polariton::operation::{ParameterTable, Typed};
use oj_rc_factory::VehicleFactoryAdapter;
const CODE: u8 = 97;
const ID_PARAM_KEY: u8 = 45; // int; in
const OFFSET_X_PARAM_KEY: u8 = 104; // int; in
const OFFSET_Z_PARAM_KEY: u8 = 105; // int; in
const EXPECTED_FIRST_X_PARAM_KEY: u8 = 106; // int; in
const EXPECTED_FIRST_Y_PARAM_KEY: u8 = 107; // int; in
const EXPECTED_FIRST_Z_PARAM_KEY: u8 = 108; // int; in
pub(super) struct FactoryVehicleOffsetApplier {
factory: std::sync::Arc<oj_rc_core::factory::Factory>,
offsetter: std::sync::Arc<oj_rc_core::cubes::OffsetParser>,
}
#[async_trait::async_trait]
impl <C: Send + 'static> SimpleOperation<C> for FactoryVehicleOffsetApplier {
type User = crate::UserTy;
const CODE: u8 = CODE;
async fn handle(&self, mut params: ParameterTable<C>, user: &Self::User) -> Result<ParameterTable<C>, SimpleOpError> {
if let Some(Typed::Int(factory_id)) = params.remove(&ID_PARAM_KEY) {
if let Some(Typed::Int(offset_x)) = params.remove(&OFFSET_X_PARAM_KEY) {
if let Some(Typed::Int(offset_z)) = params.remove(&OFFSET_Z_PARAM_KEY) {
if let Some(Typed::Int(expected_first_x)) = params.remove(&EXPECTED_FIRST_X_PARAM_KEY) {
if let Some(Typed::Int(expected_first_y)) = params.remove(&EXPECTED_FIRST_Y_PARAM_KEY) {
if let Some(Typed::Int(expected_first_z)) = params.remove(&EXPECTED_FIRST_Z_PARAM_KEY) {
let _ = user.user()?; // double-check they're authenticated
log::debug!("Factory vehicle {} has first expected cube at (x:{}, y:{}, z:{}) offset (x:{}, z:{})", factory_id, expected_first_x, expected_first_y, expected_first_z, offset_x, offset_z);
let vehicle_opt = self.factory.vehicle(factory_id).await.map_err(|e| {
log::error!("Failed to retrieve vehicle {} (for offset) from factory: {}", factory_id, e);
SimpleOpError::with_message(
oj_rc_core::data::error_codes::WebServicesError::DatabaseError as i16,
format!("Failed to retrieve vehicle (for offset) from factory: {}", e)
)
})?;
if let Some((mut vehicle, _)) = vehicle_opt {
self.offsetter.offset_inplace_by(&mut vehicle.cube_data, &mut vehicle.colour_data, (offset_x as _, 0, offset_z as _));
self.factory.update_vehicle(factory_id, Some(vehicle.cube_data), Some(vehicle.colour_data)).await
.map_err(|e| {
log::error!("Failed to update factory vehicle {} (for offset): {}", factory_id, e);
SimpleOpError::with_message(
oj_rc_core::data::error_codes::WebServicesError::DatabaseError as i16,
format!("Failed to retrieve factory vehicle (for offset): {}", e)
)
})?;
}
}
}
}
}
}
}
Ok(ParameterTable::with_capacity(1))
}
}
pub(super) fn factory_offset_provider<C: Send + 'static>(factory: &std::sync::Arc<oj_rc_core::factory::Factory>, offsetter: std::sync::Arc<oj_rc_core::cubes::OffsetParser>) -> SimpleOpImpl<C, crate::UserTy, FactoryVehicleOffsetApplier> {
SimpleOpImpl::new(FactoryVehicleOffsetApplier {
factory: factory.to_owned(),
offsetter,
})
}

3
rc_services_room/src/operations/mod.rs
View File

@@ -102,6 +102,7 @@ mod campaign_save_result;
mod item_shop_purchase;
mod code_redeem;
mod crf_rate_vehicle;
mod crf_shift_vehicle;
use polariton_server::operations::OperationsHandler;
@@ -224,7 +225,7 @@ pub fn handler(init_ctx: &crate::InitConfig) -> OperationsHandler<crate::UserTy>
.add(garage_slot_copy::garage_slot_copy_provider())
.add(polariton_server::operations::Ack::<12, _>::default()) // TODO handle UpdatePlayerDailyQuestProgressRequest instead of ignoring it
.add(crf_rate_vehicle::crf_rating_provider(&init_ctx.factory))
//.add(polariton_server::operations::Ack::<97, _>::default()) // TODO handle UpdateShopRobotOffsetRequest instead of ignoring it (this seems to break newly-uploaded vehicles for now)
.add(crf_shift_vehicle::factory_offset_provider(&init_ctx.factory, init_ctx.parsers.offset()))
.add(steam_promo::steam_promos_provider())
.add(item_shop_purchase::item_purchase_provider(&init_ctx.cubes))
.add(code_redeem::code_redeem_provider(&init_ctx.cubes))