From c423ec5de2764d62fa7d25d20e9464f68e5c79ea Mon Sep 17 00:00:00 2001 From: Clonkonaut Date: Tue, 3 Jan 2017 22:03:25 +0100 Subject: [PATCH] Made airplane touchable (#1663). Made it untouchable in all missions. --- planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c | 1 + planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c | 1 + planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c | 1 + planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c | 1 + 4 files changed, 4 insertions(+) diff --git a/planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c index 3f21ca58d..2d68b0d29 100644 --- a/planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c @@ -23,6 +23,7 @@ func Intro_Init() this.plane->FaceRight(); this.plane->PlaneMount(this.pilot); + this.plane.Touchable = 0; } func Intro_Start(object hero) diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c b/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c index 73a1aed0f..023a6e133 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c @@ -10,6 +10,7 @@ func Initialize(...) var closest_clonk = FindObject(Find_ID(Clonk), Find_Not(Find_Owner(NO_OWNER)), Sort_Distance()); SetColor(0xa04000); // Make sure it has the same color in all missions Dialogue->MessageBoxAll("$PlaneBuilt$", closest_clonk, true); + this.Touchable = 0; } return _inherited(...); } diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c index ffb46d606..c408b65d8 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c @@ -15,6 +15,7 @@ func Intro_Init(object flagpole) this.plane_cat = this.plane->GetCategory(); this.plane->SetCategory(C4D_StaticBack); this.plane->MakeInvincible(); + this.plane.Touchable = 0; // Pyrit the pilot this.pilot = npc_pyrit = CreateObjectAbove(Clonk, 100, 100, NO_OWNER); diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c index 4cc5218eb..64593e9ab 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c @@ -1119,3 +1119,4 @@ local HitPoints = 50; local MaxContentsCount = 20; local MaxPassengerCount = 3; local Components = {Metal = 6, Wood = 4}; +local Touchable = 1; \ No newline at end of file