From f214aa32718ccbda688e0a19bc3d6ad674773e48 Mon Sep 17 00:00:00 2001
From: snake-biscuits <36507175+snake-biscuits@users.noreply.github.com>
Date: Tue, 7 Mar 2023 21:56:23 +0000
Subject: [PATCH] (#5) override entity type
---
fuse.py | 1 +
simulacrum/r1o/entities.ent | 4 ++--
simulacrum/r1o/spawn_entities.ent | 4 ++--
simulacrum/r2/entities.ent | 4 ++--
simulacrum/r2/script_entities.ent | 10 +++++-----
simulacrum/r2/spawn_entities.ent | 8 ++++----
simulacrum/r5/entities.ent | 4 ++--
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/fuse.py b/fuse.py
index f6d540b..4eb8f0d 100644
--- a/fuse.py
+++ b/fuse.py
@@ -180,6 +180,7 @@ def new_choice_type(json_spec: dict) -> ElementTree.Element:
# add .json data
contributors_comment = ElementTree.Comment(", ".join(json_ent["Contributors"]))
ent_classes_node.insert(ent_classes_node[::].index(xml_ent), contributors_comment)
+ xml_ent.tag = json_ent.get("Type", xml_ent.tag)
update_ent_metadata(xml_ent, json_ent, "Color", default="1 0 1")
if xml_ent.tag == "point":
update_ent_metadata(xml_ent, json_ent, "Box", default="-8 -8 -8 8 8 8")
diff --git a/simulacrum/r1o/entities.ent b/simulacrum/r1o/entities.ent
index 13b2131..37a0994 100644
--- a/simulacrum/r1o/entities.ent
+++ b/simulacrum/r1o/entities.ent
@@ -639,7 +639,7 @@ Introduced by Titanfall
Introduced by Titanfall
-
+
----- KEYS -----
New in Titanfall; TODO: identify
Chapter Title that appears on-screen when this level starts.
@@ -660,5 +660,5 @@ Introduced by Titanfall
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-
+
\ No newline at end of file
diff --git a/simulacrum/r1o/spawn_entities.ent b/simulacrum/r1o/spawn_entities.ent
index 8d4d7dd..5188b38 100644
--- a/simulacrum/r1o/spawn_entities.ent
+++ b/simulacrum/r1o/spawn_entities.ent
@@ -40,7 +40,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Team(s) allowed to spawn here
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Bounty HuntStart here in Sticks and StonesStart here in Amped KillraceStart here in Gun GameStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for DeathStart here in Free For All
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Bounty HuntStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CtFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in Free For AllStart here in InfectionStart here in Free Agents
----- KEYS -----
@@ -60,7 +60,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Team(s) allowed to spawn here
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Bounty HuntStart here in Sticks and StonesStart here in Amped KillraceStart here in Gun GameStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for DeathStart here in Free For All
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Bounty HuntStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CtFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in Free For AllStart here in InfectionStart here in Free Agents
----- KEYS -----
diff --git a/simulacrum/r2/entities.ent b/simulacrum/r2/entities.ent
index 3c662f2..1e44080 100644
--- a/simulacrum/r2/entities.ent
+++ b/simulacrum/r2/entities.ent
@@ -244,7 +244,7 @@ Introduced by Titanfall
Introduced by Titanfall
-
+
----- KEYS -----
New in Titanfall; TODO: identify
New in Titanfall; TODO: identify
@@ -276,5 +276,5 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-
+
\ No newline at end of file
diff --git a/simulacrum/r2/script_entities.ent b/simulacrum/r2/script_entities.ent
index e99fcf7..b966994 100644
--- a/simulacrum/r2/script_entities.ent
+++ b/simulacrum/r2/script_entities.ent
@@ -3,7 +3,7 @@
-
+
----- KEYS -----
New in Titanfall; TODO: identify
This entity's orientation in the world.
@@ -645,7 +645,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Team(s) allowed to spawn here
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in InfectionStart here in Sticks and StonesStart here in One in the ChamberStart here in FastballStart here in Hide and SeekStart here in The HiddenStart here in Free For AllStart here in Free AgentsStart here in SingleplayerStart here in Bounty HuntStart here in Amped KillraceStart here in Gun GameStart here in Amped HardpointStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in Capture the FlagStart here in Live FireStart here in Skirmish (Team DeathMatch)Start here in Marked for Death
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in ColiseumStart here in One in the ChamberStart here in Bounty HuntStart here in InfectionStart here in Skirmish (Team DeathMatch)Start here in Live FireStart here in Marked for DeathStart here in Competitive CtFStart here in AttritionStart here in Free For AllStart here in Free AgentsStart here in Amped HardpointStart here in Hide and SeekStart here in SingleplayerStart here in Capture the FlagStart here in Amped KillraceStart here in The HiddenStart here in Gun GameStart here in Fastball
----- KEYS -----
@@ -941,7 +941,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Introduced by Titanfall
-
+
----- KEYS -----
This entity's orientation in the world.
Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.
@@ -1076,7 +1076,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Introduced by Titanfall
-
+
----- KEYS -----
This entity's orientation in the world.
Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.
@@ -1208,7 +1208,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
Introduced by Titanfall
-
+
----- KEYS -----
This entity's orientation in the world.
Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll is the rotation around the X axis.
diff --git a/simulacrum/r2/spawn_entities.ent b/simulacrum/r2/spawn_entities.ent
index 1e699e0..5d6c990 100644
--- a/simulacrum/r2/spawn_entities.ent
+++ b/simulacrum/r2/spawn_entities.ent
@@ -106,7 +106,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Amped KillraceStart here in Sticks and StonesStart here in Gun GameStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for Death
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CtFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in InfectionStart here in Free Agents
----- KEYS -----
@@ -144,7 +144,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Amped KillraceStart here in Sticks and StonesStart here in Gun GameStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for Death
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CtFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in InfectionStart here in Free Agents
----- KEYS -----
@@ -241,7 +241,7 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Amped KillraceStart here in Sticks and StonesStart here in Gun GameStart here in Competitive CTFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for Death
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CTFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in InfectionStart here in Free Agents
----- KEYS -----
@@ -269,5 +269,5 @@ Pitch is rotation around the Y axis, Yaw is the rotation around the Z axis, Roll
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-Start here in Pilots vs PilotsStart here in Free AgentsStart here in InfectionStart here in SingleplayerStart here in Amped KillraceStart here in Sticks and StonesStart here in Gun GameStart here in Competitive CtFStart here in AttritionStart here in ColiseumStart here in FastballStart here in One in the ChamberStart here in Hide and SeekStart here in Live FireStart here in The HiddenStart here in Marked for Death
+Start here in Pilots vs PilotsStart here in Sticks and StonesStart here in Hide and SeekStart here in ColiseumStart here in One in the ChamberStart here in SingleplayerStart here in Live FireStart here in FastballStart here in Marked for DeathStart here in The HiddenStart here in Competitive CtFStart here in AttritionStart here in Amped KillraceStart here in Gun GameStart here in InfectionStart here in Free Agents
\ No newline at end of file
diff --git a/simulacrum/r5/entities.ent b/simulacrum/r5/entities.ent
index 7c48782..4e05338 100644
--- a/simulacrum/r5/entities.ent
+++ b/simulacrum/r5/entities.ent
@@ -78,7 +78,7 @@ Introduced by Titanfall
Introduced by Titanfall
-
+
----- KEYS -----
New in Titanfall; TODO: identify
New in Titanfall; TODO: identify
@@ -88,5 +88,5 @@ Introduced by Titanfall
New in Titanfall; TODO: identify
----- NOTES -----
Introduced by Titanfall
-
+
\ No newline at end of file