update common

This commit is contained in:
Quaternions 2024-02-12 21:42:35 -08:00
parent ea48c40938
commit c3fef4dc35
3 changed files with 6 additions and 5 deletions

2
Cargo.lock generated
View File

@ -420,7 +420,7 @@ dependencies = [
[[package]] [[package]]
name = "strafesnet_common" name = "strafesnet_common"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.itzana.me/StrafesNET/common?rev=f155dd6a5015e4494c233888cb570a5014f86208#f155dd6a5015e4494c233888cb570a5014f86208" source = "git+https://git.itzana.me/StrafesNET/common?rev=43f771fb0f19a3751875df1f25bf9cb5874f75f4#43f771fb0f19a3751875df1f25bf9cb5874f75f4"
dependencies = [ dependencies = [
"glam", "glam",
"id", "id",

View File

@ -12,4 +12,4 @@ rbx_binary = "0.7.4"
rbx_dom_weak = "2.7.0" rbx_dom_weak = "2.7.0"
rbx_reflection_database = "0.2.10" rbx_reflection_database = "0.2.10"
rbx_xml = "0.13.3" rbx_xml = "0.13.3"
strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "f155dd6a5015e4494c233888cb570a5014f86208" } strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "43f771fb0f19a3751875df1f25bf9cb5874f75f4" }

View File

@ -198,7 +198,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
gameplay_modes::ModeId::MAIN, gameplay_modes::ModeId::MAIN,
gameplay_modes::ModeUpdate::element( gameplay_modes::ModeUpdate::element(
model_id, model_id,
gameplay_modes::StageElement::new(0,false,gameplay_modes::StageElementBehaviour::Platform),//roblox does not know which stage the platform belongs to gameplay_modes::StageElement::new(gameplay_modes::StageId::FIRST,false,gameplay_modes::StageElementBehaviour::Platform),//roblox does not know which stage the platform belongs to
), ),
); );
}, },
@ -226,9 +226,10 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
}else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$") }else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
.captures(other){ .captures(other){
force_intersecting=true; force_intersecting=true;
let stage_id=gameplay_modes::StageId::new(captures[3].parse::<u32>().unwrap());
let stage_element=gameplay_modes::StageElement::new( let stage_element=gameplay_modes::StageElement::new(
//stage_id: //stage_id:
captures[3].parse::<u32>().unwrap(), stage_id,
//force: //force:
match captures.get(1){ match captures.get(1){
Some(m)=>m.as_str()=="Force", Some(m)=>m.as_str()=="Force",
@ -239,7 +240,7 @@ fn get_attributes(object:&rbx_dom_weak::Instance,can_collide:bool,velocity:Plana
"Spawn"=>{ "Spawn"=>{
modes_builder.insert_stage( modes_builder.insert_stage(
gameplay_modes::ModeId::MAIN, gameplay_modes::ModeId::MAIN,
gameplay_modes::StageId::new(captures[2].parse::<u32>().unwrap()), stage_id,
gameplay_modes::Stage::new(model_id), gameplay_modes::Stage::new(model_id),
); );
gameplay_modes::StageElementBehaviour::SpawnAt gameplay_modes::StageElementBehaviour::SpawnAt