Skip to content

Qualifier 296 fix + small Android support update #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EX0RCIST0N wants to merge 11 commits into
base: 2024-nebula
Choose a base branch
from
Open

Qualifier 296 fix + small Android support update #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a20534
Qualifier 296 fix + small Android support update
EX0RCIST0N May 26, 2026
bfaa343
some changes
EX0RCIST0N May 26, 2026
774e4d8
reverted in ACEventBase, made diff in ParamObject
EX0RCIST0N May 26, 2026
cd09357
oops
EX0RCIST0N May 26, 2026
d59baf5
returned qualifier code in act and cond
EX0RCIST0N May 26, 2026
1c33403
another oops
EX0RCIST0N May 26, 2026
7c1b7c3
moved GetObject to ObjectCommon to fix qualifiers
EX0RCIST0N May 27, 2026
038e118
changed from 2 diff methods to 1
EX0RCIST0N May 27, 2026
4463f9c
Revert "changed from 2 diff methods to 1"
EX0RCIST0N May 28, 2026
cd758d0
reverted previous changes, did different ones
EX0RCIST0N May 30, 2026
8ccedad
reverted ACEventBase, added check for bit mask
EX0RCIST0N May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Nebula.CLI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ static void AutoDetectReader()
case ".zip":
NebulaCore.CurrentReader = new OpenFileReader();
break;
case ".xapk":
case ".apk":
NebulaCore.CurrentReader = new APKFileReader();
break;
Expand Down
2 changes: 1 addition & 1 deletion Nebula.Core/Data/Chunks/FrameChunks/Events/Action.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public override void ReadCCN(ByteReader reader, params object[] extraInfo)
ObjectInfo = ObjectInfo,
Type = ObjectType
});
}
}
}

Fix((List<Action>)extraInfo[0], reader, endPosition);
Expand Down
2 changes: 1 addition & 1 deletion Nebula.Core/Data/Chunks/FrameChunks/Events/Condition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public override void ReadCCN(ByteReader reader, params object[] extraInfo)
ObjectInfo = ObjectInfo,
Type = ObjectType
});
}
}
}

Fix((List<Condition>)extraInfo[0], reader);
Expand Down
137 changes: 3 additions & 134 deletions Nebula.Core/Data/Chunks/FrameChunks/Events/Parameters/ParameterExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ public override string ToString()

public ObjectInfo? GetObject()
{
if (Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo).Any() == true)
// added here just because without it - any other changes with qualifiers won't do anything (will still get KeyNotFoundException, means that it won't get added)
if (Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo).Any() == true || (NebulaCore.Windows && NebulaCore.Build >= 296 && NebulaCore.Fusion >= 2.5 && (ObjectInfo & 0x8000) != 0))
return null;
else if (NebulaCore.MFA && Parent?.FrameEvents?.EventObjects.Count > 0)
return NebulaCore.PackageData.FrameItems.Items[(int)Parent.FrameEvents.EventObjects[ObjectInfo].ItemHandle];
Expand Down Expand Up @@ -614,140 +615,8 @@ public string GetObjectName()
ObjectInfo? objectInfo = GetObject();
if (objectInfo != null)
return objectInfo.Name;
Qualifier[] qualifier = Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo && x.Type == ObjectType).ToArray()!;
if (qualifier.Length > 0)
return GetQualifierName(qualifier.First());
return "Unknown Object";
}

public string GetQualifierName(Qualifier qualifier)
{
string qualifierName = "Group." + (qualifier.ObjectInfo & 0x7FFF) switch
{
0 => "Player",
1 => "Good",
2 => "Neutral",
3 => "Bad",
4 => "Enemies",
5 => "Friends",
6 => "Bullets",
7 => "Arms",
8 => "Bonus",
9 => "Collectables",
10 => "Traps",
11 => "Doors",
12 => "Keys",
13 => "Texts",
14 => "0",
15 => "1",
16 => "2",
17 => "3",
18 => "4",
19 => "5",
20 => "6",
21 => "7",
22 => "8",
23 => "9",
24 => "Parents",
25 => "Children",
26 => "Data",
27 => "Timed",
28 => "Engine",
29 => "Areas",
30 => "Reference Points",
31 => "Radar Enemies",
32 => "Radar Friends",
33 => "Radar Neutrals",
34 => "Music",
35 => "Sound",
36 => "Waveform",
37 => "Background Scenery",
38 => "Foreground Scenery",
39 => "Decorations",
40 => "Water",
41 => "Clouds",
42 => "Empty",
43 => "Fog",
44 => "Flowers",
45 => "Animals",
46 => "Bosses",
47 => "NPC",
48 => "Vehicles",
49 => "Rockets",
50 => "Balls",
51 => "Bombs",
52 => "Explosions",
53 => "Particles",
54 => "Clothes",
55 => "Glow",
56 => "Arrows",
57 => "Buttons",
58 => "Cursors",
59 => "Drawing Tools",
60 => "Indicator",
61 => "Shapes",
62 => "Shields",
63 => "Shifting Blocks",
64 => "Magnets",
65 => "Negative Matter",
66 => "Neutral Matter",
67 => "Positive Matter",
68 => "Breakable",
69 => "Dissolving",
70 => "Dialogue",
71 => "HUD",
72 => "Inventory",
73 => "Inventory Item",
74 => "Interface",
75 => "Movable",
76 => "Perspective",
77 => "Calculation Objects",
78 => "Invisible",
79 => "Masks",
80 => "Obstacles",
81 => "Value Holder",
82 => "Helpful",
83 => "Powerups",
84 => "Targets",
85 => "Trapdoors",
86 => "Dangers",
87 => "Forbidden",
88 => "Physical objects",
89 => "3D Objects",
90 => "Generic 1",
91 => "Generic 2",
92 => "Generic 3",
93 => "Generic 4",
94 => "Generic 5",
95 => "Generic 6",
96 => "Generic 7",
97 => "Generic 8",
98 => "Generic 9",
99 => "Generic 10",
_ => string.Empty
};

qualifierName += "." + qualifier.Type switch
{
2 => "Sprite",
3 => "Text",
4 => "Question",
5 => "Score",
6 => "Lives",
7 => "Counter",
_ => string.Empty
};

if (qualifier.Type >= 32 && NebulaCore.PackageData.Extensions.Exts.ContainsKey(qualifier.Type - 32))
{
Extension ext = NebulaCore.PackageData.Extensions.Exts[qualifier.Type - 32];
qualifierName += ext.Name;
}

if (qualifierName.StartsWith("Group.."))
return "Unknown Qualifier";
else
return qualifierName;
return ObjectCommon.TryGetQualifier(this, ObjectInfo, ObjectType);
}
}
}
140 changes: 5 additions & 135 deletions Nebula.Core/Data/Chunks/FrameChunks/Events/Parameters/ParameterObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Nebula.Core.Data.Chunks.AppChunks;
using Nebula.Core.Data.Chunks.ObjectChunks;
using Nebula.Core.Data.Chunks.ObjectChunks.ObjectCommon;
using Nebula.Core.Memory;

namespace Nebula.Core.Data.Chunks.FrameChunks.Events.Parameters
Expand Down Expand Up @@ -37,150 +38,19 @@ public override string ToString()
ObjectInfo? objectInfo = GetObject();
if (objectInfo != null)
return objectInfo.Name;
Qualifier[] qualifier = Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo && x.Type == ObjectType).ToArray()!;
if (qualifier.Length > 0)
return GetQualifierName(qualifier.First());
return "Unknown Object";
else
return ObjectCommon.TryGetQualifier(this, ObjectInfo, ObjectType);
}

public ObjectInfo? GetObject()
{
if (Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo).Any() == true)
// added here just because without it - any other changes with qualifiers won't do anything (will still get KeyNotFoundException, means that it won't get added)
if (Parent?.FrameEvents?.Qualifiers.Where(x => x.ObjectInfo == ObjectInfo).Any() == true || (NebulaCore.Windows && NebulaCore.Build >= 296 && NebulaCore.Fusion >= 2.5 && (ObjectInfo & 0x8000) != 0))
return null;
else if (NebulaCore.MFA && Parent?.FrameEvents?.EventObjects.Count > 0)
return NebulaCore.PackageData.FrameItems.Items[(int)Parent.FrameEvents.EventObjects[ObjectInfo].ItemHandle];
else
return NebulaCore.PackageData.FrameItems.Items[ObjectInfo];
}

public string GetQualifierName(Qualifier qualifier)
{
string qualifierName = "Group." + (qualifier.ObjectInfo & 0x7FFF) switch
{
0 => "Player",
1 => "Good",
2 => "Neutral",
3 => "Bad",
4 => "Enemies",
5 => "Friends",
6 => "Bullets",
7 => "Arms",
8 => "Bonus",
9 => "Collectables",
10 => "Traps",
11 => "Doors",
12 => "Keys",
13 => "Texts",
14 => "0",
15 => "1",
16 => "2",
17 => "3",
18 => "4",
19 => "5",
20 => "6",
21 => "7",
22 => "8",
23 => "9",
24 => "Parents",
25 => "Children",
26 => "Data",
27 => "Timed",
28 => "Engine",
29 => "Areas",
30 => "Reference Points",
31 => "Radar Enemies",
32 => "Radar Friends",
33 => "Radar Neutrals",
34 => "Music",
35 => "Sound",
36 => "Waveform",
37 => "Background Scenery",
38 => "Foreground Scenery",
39 => "Decorations",
40 => "Water",
41 => "Clouds",
42 => "Empty",
43 => "Fog",
44 => "Flowers",
45 => "Animals",
46 => "Bosses",
47 => "NPC",
48 => "Vehicles",
49 => "Rockets",
50 => "Balls",
51 => "Bombs",
52 => "Explosions",
53 => "Particles",
54 => "Clothes",
55 => "Glow",
56 => "Arrows",
57 => "Buttons",
58 => "Cursors",
59 => "Drawing Tools",
60 => "Indicator",
61 => "Shapes",
62 => "Shields",
63 => "Shifting Blocks",
64 => "Magnets",
65 => "Negative Matter",
66 => "Neutral Matter",
67 => "Positive Matter",
68 => "Breakable",
69 => "Dissolving",
70 => "Dialogue",
71 => "HUD",
72 => "Inventory",
73 => "Inventory Item",
74 => "Interface",
75 => "Movable",
76 => "Perspective",
77 => "Calculation Objects",
78 => "Invisible",
79 => "Masks",
80 => "Obstacles",
81 => "Value Holder",
82 => "Helpful",
83 => "Powerups",
84 => "Targets",
85 => "Trapdoors",
86 => "Dangers",
87 => "Forbidden",
88 => "Physical objects",
89 => "3D Objects",
90 => "Generic 1",
91 => "Generic 2",
92 => "Generic 3",
93 => "Generic 4",
94 => "Generic 5",
95 => "Generic 6",
96 => "Generic 7",
97 => "Generic 8",
98 => "Generic 9",
99 => "Generic 10",
_ => string.Empty
};

qualifierName += "." + qualifier.Type switch
{
2 => "Sprite",
3 => "Text",
4 => "Question",
5 => "Score",
6 => "Lives",
7 => "Counter",
_ => string.Empty
};

if (qualifier.Type >= 32 && NebulaCore.PackageData.Extensions.Exts.ContainsKey(qualifier.Type - 32))
{
Extension ext = NebulaCore.PackageData.Extensions.Exts[qualifier.Type - 32];
qualifierName += ext.Name;
}

if (qualifierName.StartsWith("Group.."))
return "Unknown Qualifier";
else
return qualifierName;
}
}
}
Loading