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

Correct paint gun colours for #14

Browse Source
This commit is contained in:
NGnius (Graham)
2025-05-09 20:35:07 -04:00
parent 77ddeb7891
commit e05649f09d
2 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rc_services_room/src/operations/palette_town.rs
View File

@@ -11,51 +11,10 @@ pub(super) fn kanto() -> SimpleFunc<31, crate::UserTy, impl (Fn(ParameterTable,
let mut params = params.to_dict();
params.insert(PALETTE_KEY, Typed::Bytes({
let mut buf = Vec::new();
Colour::write_many(vec![
// Red
Colour {
index: 0,
diffuse: ColourValue { r: 255, g: 0, b: 0, a: u8::MAX },
specular: ColourValue { r: 255, g: 0, b: 0, a: u8::MAX },
overlay: ColourValue { r: 255, g: 0, b: 0, a: u8::MAX },
premium: false,
},
// Blue
Colour {
index: 1,
diffuse: ColourValue { r: 0, g: 0, b: 255, a: u8::MAX },
specular: ColourValue { r: 0, g: 0, b: 255, a: u8::MAX },
overlay: ColourValue { r: 0, g: 0, b: 255, a: u8::MAX },
premium: false,
},
// Green
Colour {
index: 2,
diffuse: ColourValue { r: 0, g: 255, b: 0, a: u8::MAX },
specular: ColourValue { r: 0, g: 255, b: 0, a: u8::MAX },
overlay: ColourValue { r: 0, g: 255, b: 0, a: u8::MAX },
premium: false,
},
// Black
Colour {
index: 3,
diffuse: ColourValue { r: 0, g: 0, b: 0, a: u8::MAX },
specular: ColourValue { r: 0, g: 0, b: 0, a: u8::MAX },
overlay: ColourValue { r: 0, g: 0, b: 0, a: u8::MAX },
premium: false,
},
// White
Colour {
index: 4,
diffuse: ColourValue { r: 255, g: 255, b: 255, a: u8::MAX },
specular: ColourValue { r: 255, g: 255, b: 255, a: u8::MAX },
overlay: ColourValue { r: 255, g: 255, b: 255, a: u8::MAX },
premium: false,
},
].as_slice(), &mut buf).unwrap_or_default();
Colour::write_many(Colour::default_many(), &mut buf).unwrap_or_default();
buf.into()
}));
params.insert(ORDER_KEY, Typed::Bytes(vec![0u8, 1, 2, 3, 4].into()));
params.insert(ORDER_KEY, Typed::Bytes(Colour::default_many().iter().map(|x| x.index).collect::<Vec<_>>().into()));
Ok(params.into())
})
}