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

Fix display of items in garage customization and item shop

Browse Source
This commit is contained in:
NG (Graham)
2026-01-01 15:41:45 -05:00
parent ae091a7666
commit 83843377d7
2 changed files with 148 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rc_services_room/src/operations/all_customisations_info.rs
View File

@@ -27,7 +27,7 @@ fn all_skins() -> Vec<CustomisationData> {
localised_name: "strMothershipSkinNeptune01".to_string(),
skin_scene_name: "RC_MothershipSkin_Neptune_01".to_string(),
simulation_prefab: "TODO_sim_prefab".to_string(),
preview_image_name: "MothershipSkin_Neptune_BG".to_string(),
preview_image_name: "garagebayskintextures/MothershipSkin_Neptune_BG".to_string(),
is_default: false,
},
CustomisationData { // level 11
@@ -35,7 +35,7 @@ fn all_skins() -> Vec<CustomisationData> {
localised_name: "strMothershipSkinEarth01".to_string(),
skin_scene_name: "RC_MothershipSkin_Earth_01".to_string(),
simulation_prefab: "TODO_sim_prefab".to_string(),
preview_image_name: "MothershipSkin_Earth_BG".to_string(),
preview_image_name: "garagebayskintextures/MothershipSkin_Earth_BG".to_string(),
is_default: false,
},
CustomisationData { // level12
@@ -43,7 +43,7 @@ fn all_skins() -> Vec<CustomisationData> {
localised_name: "strMothershipSkinMars01".to_string(),
skin_scene_name: "RC_MothershipSkin_Mars_01".to_string(),
simulation_prefab: "TODO_sim_prefab".to_string(),
preview_image_name: "MothershipSkin_Mars_BG".to_string(),
preview_image_name: "garagebayskintextures/MothershipSkin_Mars_BG".to_string(),
is_default: false,
},
CustomisationData { // level14
@@ -51,7 +51,7 @@ fn all_skins() -> Vec<CustomisationData> {
localised_name: "strMothershipSkinRetro01".to_string(),
skin_scene_name: "RC_MothershipSkin_Retro_01".to_string(),
simulation_prefab: "TODO_sim_prefab".to_string(),
preview_image_name: "MothershipSkin_Retro_BG".to_string(),
preview_image_name: "garagebayskintextures/MothershipSkin_Retro_BG".to_string(),
is_default: false,
},
CustomisationData { // level2 (the is_default one seems to be special)
@@ -59,7 +59,7 @@ fn all_skins() -> Vec<CustomisationData> {
localised_name: "strMothershipSkinDefault".to_string(),
skin_scene_name: "RC_Mothership".to_string(),
simulation_prefab: "TODO_sim_prefab".to_string(),
preview_image_name: "Mothership_Premium_BG".to_string(), // FIXME
preview_image_name: "garagebayskintextures/Mothership_Premium_BG".to_string(), // FIXME
is_default: true,
},
]
@@ -72,7 +72,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnEffectDefault".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn".to_string(),
preview_image_name: "a".to_string(),
preview_image_name: "Spawn".to_string(),
is_default: true,
},
CustomisationData {
@@ -80,7 +80,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXBlackHole".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_BlackHole".to_string(),
preview_image_name: "Mothership_Premium_BG".to_string(),
preview_image_name: "Spawn_BlackHole".to_string(),
is_default: false,
},
CustomisationData {
@@ -88,7 +88,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXRoyaleLander".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_Lander".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Spawn_Lander".to_string(),
is_default: false,
},
CustomisationData {
@@ -96,7 +96,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXLootCrate".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_Lootcrate".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Spawn_Lootcrate".to_string(),
is_default: false,
},
CustomisationData {
@@ -104,7 +104,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXWarpIn".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_Warp".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Spawn_Warp".to_string(),
is_default: false,
},
CustomisationData {
@@ -112,7 +112,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXPresent".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_Present".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Spawn_Present".to_string(),
is_default: false,
},
CustomisationData {
@@ -120,7 +120,7 @@ fn all_spawns() -> Vec<CustomisationData> {
localised_name: "strSpawnFXHatch".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Spawn_EasterEgg".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Spawn_EasterEgg".to_string(),
is_default: false,
},
]
@@ -133,7 +133,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathEffectDefault".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion".to_string(),
preview_image_name: "a".to_string(),
preview_image_name: "Explosion".to_string(),
is_default: true,
},
CustomisationData {
@@ -141,7 +141,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXCartoonExplosion".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_Toon".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_Toon".to_string(),
is_default: false,
},
CustomisationData {
@@ -149,7 +149,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXFeatherExplosion".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_Feathers_Rainbow".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_Feathers_Rainbow".to_string(),
is_default: false,
},
CustomisationData {
@@ -157,7 +157,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXNuclearExplosion".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_Nuclear".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_Nuclear".to_string(),
is_default: false,
},
CustomisationData {
@@ -165,7 +165,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXEmergencyWarp".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_Warp".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_Warp".to_string(),
is_default: false,
},
CustomisationData {
@@ -173,7 +173,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXBlackHole".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_BlackHole".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_BlackHole".to_string(),
is_default: false,
},
CustomisationData {
@@ -181,7 +181,7 @@ fn all_deaths() -> Vec<CustomisationData> {
localised_name: "strDeathFXFireworkExplosion".to_string(),
skin_scene_name: "Splash_Loading_Screen".to_string(),
simulation_prefab: "Explosion_Firework".to_string(),
preview_image_name: "RC_Splash_Screen_01_Japanese".to_string(),
preview_image_name: "Explosion_Firework".to_string(),
is_default: false,
},
]

136
rc_services_room/src/operations/item_shop_bundles.rs
View File

@@ -9,21 +9,143 @@ pub(super) fn item_bundle_provider() -> SimpleFunc<188, crate::UserTy, impl (Fn(
SimpleFunc::new(|params, _| {
let mut params = params.to_dict();
params.insert(PARAM_KEY, ItemShopBundle::as_transmissible_vec(vec![
// weekly (top row of 3)
ItemShopBundle {
sku: "12345".to_owned(),
bundle_name_key: "RE_todo_item_shop_bundle_name_key".to_owned(),
sprite: "RE_todo_item_shop_sprite_name".to_owned(),
sku: "buy cc 100".to_owned(),
bundle_name_key: "strRealMoneyStoreName_CosmeticCredits1".to_owned(),
sprite: "ItemShop_CosmeticCredits".to_owned(),
is_sprite_full_size: false,
category: ItemShopCategory::Bundle,
currency: CurrencyType::Robits,
price: 100_000,
discount_time: 0,
discount_price: 100_000,
recurrence: ItemShopRecurrence::Weekly,
owns_required_cube: true,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 1".to_owned(),
bundle_name_key: "strRealMoneyStoreName_RoboPass".to_owned(),
sprite: "Store_RoboPass_Season2".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Bundle,
currency: CurrencyType::CosmeticCredits,
price: 10_000_000,
discount_time: 0,
discount_price: 10_000_000,
recurrence: ItemShopRecurrence::Weekly,
owns_required_cube: false,
is_limited_edition: true,
},
ItemShopBundle {
sku: "buy robit 100000".to_owned(),
bundle_name_key: "strRealMoneyStoreName_RobitsBundle2".to_owned(),
sprite: "ItemShop_Robits".to_owned(),
is_sprite_full_size: false,
category: ItemShopCategory::Bundle,
currency: CurrencyType::CosmeticCredits,
price: 100,
discount_time: 0,
discount_price: 100,
recurrence: ItemShopRecurrence::Weekly,
owns_required_cube: true,
is_limited_edition: false,
},
// daily (lower row or 6)
ItemShopBundle {
sku: "buy robopass 1 1".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Bundle,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 1_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: false,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 2".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Cube,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: 1,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 2_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: false,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 3".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Cube,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 3_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: false,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 4".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Cube,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 4_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: false,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 5".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Cube,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 5_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: true,
is_limited_edition: true,
}
owns_required_cube: false,
is_limited_edition: false,
},
ItemShopBundle {
sku: "buy robopass 1 6".to_owned(),
bundle_name_key: "strRoboPassSeason02".to_owned(),
sprite: "Store_RoboPass".to_owned(),
is_sprite_full_size: true,
category: ItemShopCategory::Cube,
currency: CurrencyType::Robits,
price: 10_000,
discount_time: (chrono::Utc::now() + std::time::Duration::from_secs(24*60*60)).timestamp(),
discount_price: 6_000,
recurrence: ItemShopRecurrence::Daily,
owns_required_cube: false,
is_limited_edition: false,
},
]));
Ok(params.into())
})
}
/*
Allowed sprites:
Emote_Chicken, Emote_CrayWave, Emote_FacePalm, Emote_Heart, Emote_LOL, Emote_ThumbsDown, Emote_ThumbsUp, Explosion, Explosion_BlackHole, Explosion_Feathers_Rainbow, Explosion_Firework, Explosion_Nuclear, Explosion_Toon, Explosion_Warp, ItemShop_2019_Holoflag, ItemShop_6_Years_Holoflag, ItemShop_AbleGamers_Holoflag, ItemShop_Alienware_Holoflag, ItemShop_Altimeter, ItemShop_Balloon, ItemShop_Bubble_Blower, ItemShop_Bundle_Alienware_Mask, ItemShop_Bundle_CatEye, ItemShop_Bundle_Cockpit_Mask, ItemShop_Bundle_Eagle_Mask, ItemShop_Bundle_Exhaust_Stack, ItemShop_Bundle_Flipper, ItemShop_Bundle_Football_Mask, ItemShop_Bundle_Football_Plate, ItemShop_Bundle_Glass_Cubes, ItemShop_Bundle_Honeydew_Mask, ItemShop_Bundle_Jammer, ItemShop_Bundle_Mech_7_Mask, ItemShop_Bundle_Ninja_Mask, ItemShop_Bundle_OverWolf_Mask, ItemShop_Bundle_Radar, ItemShop_Bundle_Receiver, ItemShop_Bundle_Rhino_8_Mask, ItemShop_Bundle_Sabretooth_Mask, ItemShop_Bundle_Scary_Mask, ItemShop_Bundle_Spike, ItemShop_Bundle_Spiked_Plate, ItemShop_Bundle_TRex_Mask, ItemShop_Bundle_Vigilant_Eyes, ItemShop_Bunny_Holoflag, ItemShop_Candy_Cane_Holoflag, ItemShop_ChronoGG_Holoflag, ItemShop_CosmeticCredits, ItemShop_Country_Holoflag_Bundle, ItemShop_Cube_with_C6_Logo, ItemShop_Cube_with_CARBON_Letters, ItemShop_Curse_Holoflag, ItemShop_Cyborg_Eyes, ItemShop_Dev_Supporter_Gold_Holoflag, ItemShop_Dev_Supporter_Holoflag, ItemShop_EasterEgg_Holoflag, ItemShop_Exhaust_Blower, ItemShop_Fairy_Light, ItemShop_Headlamp, ItemShop_Humble_Bundle_Holoflag, ItemShop_Insect_Leg_Huge_Spider, ItemShop_Insect_Leg_Large_Overwolf, ItemShop_Mega_Laser_Carbon_6, ItemShop_Mega_Plasma_Carbon_6, ItemShop_Mothership_Earth, ItemShop_Mothership_Mars, ItemShop_Mothership_Neptune, ItemShop_Mothership_Retro, ItemShop_Neon_Cone, ItemShop_Neon_Corner, ItemShop_Neon_Corner_Round, ItemShop_Neon_Corner_Slope, ItemShop_Neon_Cube, ItemShop_Neon_Cube_Bundle, ItemShop_Neon_Edge, ItemShop_Neon_Edge_Round, ItemShop_Neon_Edge_Slope, ItemShop_Neon_Inner, ItemShop_Neon_Inner_Round, ItemShop_Neon_Inner_Slope, ItemShop_Neon_Pyramid, ItemShop_Nyan_Cray_Holoflag, ItemShop_Overwolf_Holoflag, ItemShop_Pilot_Seat_Bunny, ItemShop_Pilot_Seat_Cray, ItemShop_Pilot_Seat_Gene, ItemShop_Pilot_Seat_Mega, ItemShop_Pilot_Seat_Retro, ItemShop_Pirate_Holoflag, ItemShop_Plasma_Huge_Carbon_6, ItemShop_Present_Large, ItemShop_Present_Small, ItemShop_Retro_Corner, ItemShop_Retro_Cube, ItemShop_Retro_Edge, ItemShop_Retro_Inner, ItemShop_Robits, ItemShop_Robocraft_Holoflag, ItemShop_RoboPass_Season_1_Holoflag, ItemShop_RoboPass_Season_2_Holoflag, ItemShop_Robot_Name_Banner, ItemShop_Rod_Long_Spring, ItemShop_Rod_Short_Spring, ItemShop_Rod_Spring, ItemShop_Rudder_Bat, ItemShop_Rudder_Vampire, ItemShop_Santa_Cray_Holoflag, ItemShop_Snowflake_Holoflag, ItemShop_Speedometer, ItemShop_Sprinter_Leg_Large_Carbon_6, ItemShop_T5_Mortar_Egg, ItemShop_T5_Seeker_Firework_Steam, ItemShop_Thruster_Huge_Carbon_6, ItemShop_Top_Laser_Huge_Carbon_6, ItemShop_Vapor_Trail_Single, ItemShop_Vapor_Trail_Single_Firework, ItemShop_Vapor_Trail_Single_Flower, ItemShop_Vapor_Trail_Single_Snowflake, ItemShop_Vapor_Trail_Twin, ItemShop_Wing_Bat, ItemShop_Wing_Vampire, ItemShop_Yogscast_Holoflag, Spawn, Spawn_BlackHole, Spawn_EasterEgg, Spawn_Lander, Spawn_Lootcrate, Spawn_Present, Spawn_Warp, Store_RoboPass, Store_RoboPass_Season2
*/