ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some changes for codes.

Browse source
This commit is contained in:
Ottermandias 2024-08-04 14:36:00 +02:00
parent 68bffba3cd
commit 6115d24775
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Glamourer/State/FunModule.cs
View file

@ -105,14 +105,15 @@ public unsafe class FunModule : IDisposable
return; return;
} }
switch (_codes.Masked(CodeService.FullCodes)) if (actor.Index < ObjectIndex.CutsceneStart)
{ switch (_codes.Masked(CodeService.FullCodes))
case CodeService.CodeFlag.Face: {
case CodeService.CodeFlag.Manderville: case CodeService.CodeFlag.Face when actor.Index != 0:
case CodeService.CodeFlag.Smiles: case CodeService.CodeFlag.Smiles:
KeepOldArmor(actor, slot, ref armor); case CodeService.CodeFlag.Manderville:
return; KeepOldArmor(actor, slot, ref armor);
} return;
}
if (_codes.Enabled(CodeService.CodeFlag.Crown) if (_codes.Enabled(CodeService.CodeFlag.Crown)
&& actor.OnlineStatus is OnlineStatus.PvEMentor or OnlineStatus.PvPMentor or OnlineStatus.TradeMentor && actor.OnlineStatus is OnlineStatus.PvEMentor or OnlineStatus.PvPMentor or OnlineStatus.TradeMentor
@ -170,6 +171,7 @@ public unsafe class FunModule : IDisposable
private static readonly PrioritizedList<NpcId> MandervilleMale = new private static readonly PrioritizedList<NpcId> MandervilleMale = new
( (
//(0000000, 400), // Nothing
(1008264, 30), // Hildi (1008264, 30), // Hildi
(1008731, 10), // Hildi, slightly damaged (1008731, 10), // Hildi, slightly damaged
(1011668, 3), // Zombi (1011668, 3), // Zombi
@ -187,6 +189,7 @@ public unsafe class FunModule : IDisposable
private static readonly PrioritizedList<NpcId> MandervilleFemale = new private static readonly PrioritizedList<NpcId> MandervilleFemale = new
( (
//(0000000, 400), // Nothing
(1025669, 5), // Hildi, Geisha (1025669, 5), // Hildi, Geisha
(1025670, 2), // Hildi, makeup, black (1025670, 2), // Hildi, makeup, black
(1042477, 2), // Hildi, makeup, white (1042477, 2), // Hildi, makeup, white
@ -210,6 +213,7 @@ public unsafe class FunModule : IDisposable
private static readonly PrioritizedList<NpcId> FaceMale = new private static readonly PrioritizedList<NpcId> FaceMale = new
( (
//(0000000, 700), // Nothing
(1016136, 35), // Gerolt (1016136, 35), // Gerolt
(1032667, 2), // Gerolt, Suit (1032667, 2), // Gerolt, Suit
(1030519, 35), // Grenoldt (1030519, 35), // Grenoldt
@ -220,6 +224,7 @@ public unsafe class FunModule : IDisposable
private static readonly PrioritizedList<NpcId> FaceFemale = new private static readonly PrioritizedList<NpcId> FaceFemale = new
( (
//(0000000, 400), // Nothing
(1013713, 10), // Rowena, Togi (1013713, 10), // Rowena, Togi
(1018496, 30), // Rowena, Poncho (1018496, 30), // Rowena, Poncho
(1032668, 2), // Rowena, Gown (1032668, 2), // Rowena, Gown
@ -232,13 +237,16 @@ public unsafe class FunModule : IDisposable
private bool ApplyFullCode(Actor actor, Span<CharacterArmor> armor, ref CustomizeArray customize) private bool ApplyFullCode(Actor actor, Span<CharacterArmor> armor, ref CustomizeArray customize)
{ {
if (actor.Index >= ObjectIndex.CutsceneStart)
return false;
var id = _codes.Masked(CodeService.FullCodes) switch var id = _codes.Masked(CodeService.FullCodes) switch
{ {
CodeService.CodeFlag.Face when customize.Gender is Gender.Female && actor.Index != 0 => FaceFemale.GetRandom(_rng), CodeService.CodeFlag.Face when customize.Gender is Gender.Female && actor.Index != 0 => FaceFemale.GetRandom(_rng),
CodeService.CodeFlag.Face when actor.Index != 0 => FaceFemale.GetRandom(_rng), CodeService.CodeFlag.Face when actor.Index != 0 => FaceMale.GetRandom(_rng),
CodeService.CodeFlag.Smiles => Smile.GetRandom(_rng), CodeService.CodeFlag.Smiles => Smile.GetRandom(_rng),
CodeService.CodeFlag.Manderville when customize.Gender is Gender.Female => MandervilleFemale.GetRandom(_rng), CodeService.CodeFlag.Manderville when customize.Gender is Gender.Female => MandervilleFemale.GetRandom(_rng),
CodeService.CodeFlag.Manderville => MandervilleMale.GetRandom(_rng), CodeService.CodeFlag.Manderville => MandervilleMale.GetRandom(_rng),
_ => (NpcId)0, _ => (NpcId)0,
}; };