Archive/engine-psx
0
0
Fork 0
mirror of https://github.com/luksamuk/engine-psx.git synced 2025-04-28 13:28:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nasty bug when generating map of objects with extra properties

Browse source
This commit is contained in:
Lucas S. Vieira 2024-12-22 23:18:55 -03:00
parent db173b5756
commit cf7931a34b
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/cookobj/parsers.py
View file

@ -164,18 +164,19 @@ def parse_object_group(
p.rotcw = int(float(obj.get("rotation", 0))) == 90 p.rotcw = int(float(obj.get("rotation", 0))) == 90
p.rotct = int(float(obj.get("rotation", 0))) == -90 p.rotct = int(float(obj.get("rotation", 0))) == -90
props = obj.find("properties") props = obj.find("properties")
if props: if p.otype == ObjectId.MONITOR.value:
if p.otype == ObjectId.MONITOR.value: m = MonitorProperties()
if props:
prop = props.find("property") prop = props.find("property")
m = MonitorProperties()
m.kind = MonitorKind.get(prop.get("value")).value m.kind = MonitorKind.get(prop.get("value")).value
p.properties = m p.properties = m
elif p.otype == ObjectId.BUBBLE_PATCH.value: elif p.otype == ObjectId.BUBBLE_PATCH.value:
bp = BubblePatchProperties()
if props:
prop = props.find("property") prop = props.find("property")
bp = BubblePatchProperties()
# Get first available value # Get first available value
bp.frequency = int(prop.get("value")) bp.frequency = int(prop.get("value"))
p.properties = bp p.properties = bp
# print( # print(
# f"Object type {current_ts.object_types[p.otype + current_ts.firstgid].name if p.otype >= 0 else 'DUMMY'}" # f"Object type {current_ts.object_types[p.otype + current_ts.firstgid].name if p.otype >= 0 else 'DUMMY'}"
# ) # )

31
tools/layouts/omp.hexpat
View file

@ -4,16 +4,21 @@ enum ObjectType: s8 {
RING_3V = 0xfe, // -2 RING_3V = 0xfe, // -2
RING_3H = 0xff, // -1 RING_3H = 0xff, // -1
RING = 0, RING = 0x0,
MONITOR = 1, MONITOR = 0x1,
SPIKES = 2, SPIKES = 0x2,
CHECKPOINT = 3, CHECKPOINT = 0x3,
SPRING_YELLOW = 4, SPRING_YELLOW = 0x4,
SPRING_RED = 5, SPRING_RED = 0x5,
SPRING_YELLOW_DIAGONAL = 6, SPRING_YELLOW_DIAGONAL = 0x6,
SPRING_RED_DIAGONAL = 7, SPRING_RED_DIAGONAL = 0x7,
GOAL_SIGN = 8, SWITCH = 0x8,
SWITCH = 9, GOAL_SIGN = 0x9,
EXPLOSION = 0xa,
MONITOR_IMAGE = 0xb,
SHIELD = 0xc,
BUBBLE_PATCH = 0xd,
BUBBLE = 0xe
}; };
enum MonitorKind: u8 { enum MonitorKind: u8 {
@ -38,6 +43,10 @@ struct MonitorProperties {
MonitorKind kind; MonitorKind kind;
}; };
struct BubblePatchProperties {
u8 frequency;
};
struct ObjectPlacement { struct ObjectPlacement {
u8 is_level_specific; u8 is_level_specific;
ObjectType type; ObjectType type;
@ -48,6 +57,8 @@ struct ObjectPlacement {
// Properties, type-dependent // Properties, type-dependent
if(type == ObjectType::MONITOR) { if(type == ObjectType::MONITOR) {
MonitorProperties properties; MonitorProperties properties;
} else if(type == ObjectType::BUBBLE_PATCH) {
BubblePatchProperties properties;
} }
}; };