From 4b380a29fc1e6aa79f3e90d9a2c436ba5d37e74d Mon Sep 17 00:00:00 2001 From: Chris Ringeval <eatdirt@protonmail.com> Date: Sun, 17 Jan 2021 16:05:55 +0100 Subject: [PATCH 1/5] Fix various paths and remove executable bit for SpaceShuttle AI landing demo --- AI/Aircraft/SpaceShuttle/Effects/shuttle-main.eff | 0 AI/Aircraft/SpaceShuttle/OMSPods.ac | 0 AI/Aircraft/SpaceShuttle/OMSPods.xml | 4 ++-- AI/Aircraft/SpaceShuttle/SSME.ac | 0 AI/Aircraft/SpaceShuttle/SSME1.xml | 2 +- AI/Aircraft/SpaceShuttle/SSME2.xml | 2 +- AI/Aircraft/SpaceShuttle/SSME3.xml | 0 AI/Aircraft/SpaceShuttle/SpaceShuttle.ac | 0 AI/Aircraft/SpaceShuttle/SpaceShuttle.xml | 2 +- AI/Aircraft/SpaceShuttle/spstob_1.png | Bin AI/Aircraft/SpaceShuttle/spstob_3.png | Bin AI/Aircraft/SpaceShuttle/spstob_4.png | Bin AI/Aircraft/SpaceShuttle/spstob_e.png | Bin 13 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/Effects/shuttle-main.eff mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/OMSPods.ac mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/OMSPods.xml mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SSME.ac mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SSME1.xml mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SSME2.xml mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SSME3.xml mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SpaceShuttle.ac mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/SpaceShuttle.xml mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/spstob_1.png mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/spstob_3.png mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/spstob_4.png mode change 100755 => 100644 AI/Aircraft/SpaceShuttle/spstob_e.png diff --git a/AI/Aircraft/SpaceShuttle/Effects/shuttle-main.eff b/AI/Aircraft/SpaceShuttle/Effects/shuttle-main.eff old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/OMSPods.ac b/AI/Aircraft/SpaceShuttle/OMSPods.ac old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/OMSPods.xml b/AI/Aircraft/SpaceShuttle/OMSPods.xml old mode 100755 new mode 100644 index d737749a6..657b6004e --- a/AI/Aircraft/SpaceShuttle/OMSPods.xml +++ b/AI/Aircraft/SpaceShuttle/OMSPods.xml @@ -2,10 +2,10 @@ <PropertyList> - <path>Aircraft/SpaceShuttle/Models/OMSPods.ac</path> + <path>OMSPods.ac</path> <effect> - <inherits-from>Aircraft/SpaceShuttle/Models/Effects/shuttle-main</inherits-from> + <inherits-from>Effects/shuttle-main</inherits-from> <object-name>omsLeftBase</object-name> <object-name>omsLeft.001</object-name> <object-name>omsLeft</object-name> diff --git a/AI/Aircraft/SpaceShuttle/SSME.ac b/AI/Aircraft/SpaceShuttle/SSME.ac old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/SSME1.xml b/AI/Aircraft/SpaceShuttle/SSME1.xml old mode 100755 new mode 100644 index 9e81368ac..4f0b63b6b --- a/AI/Aircraft/SpaceShuttle/SSME1.xml +++ b/AI/Aircraft/SpaceShuttle/SSME1.xml @@ -4,7 +4,7 @@ <path>SSME.ac</path> <effect> - <inherits-from>Aircraft/SpaceShuttle/Models/Effects/shuttle-main</inherits-from> + <inherits-from>Effects/shuttle-main</inherits-from> <object-name>SSME</object-name> </effect> diff --git a/AI/Aircraft/SpaceShuttle/SSME2.xml b/AI/Aircraft/SpaceShuttle/SSME2.xml old mode 100755 new mode 100644 index c5e92d935..0b0589690 --- a/AI/Aircraft/SpaceShuttle/SSME2.xml +++ b/AI/Aircraft/SpaceShuttle/SSME2.xml @@ -4,7 +4,7 @@ <path>SSME.ac</path> <effect> - <inherits-from>Aircraft/SpaceShuttle/Models/Effects/shuttle-main</inherits-from> + <inherits-from>Effects/shuttle-main</inherits-from> <object-name>SSME</object-name> </effect> diff --git a/AI/Aircraft/SpaceShuttle/SSME3.xml b/AI/Aircraft/SpaceShuttle/SSME3.xml old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/SpaceShuttle.ac b/AI/Aircraft/SpaceShuttle/SpaceShuttle.ac old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/SpaceShuttle.xml b/AI/Aircraft/SpaceShuttle/SpaceShuttle.xml old mode 100755 new mode 100644 index 2d1deeeb3..1a19546c8 --- a/AI/Aircraft/SpaceShuttle/SpaceShuttle.xml +++ b/AI/Aircraft/SpaceShuttle/SpaceShuttle.xml @@ -12,7 +12,7 @@ <effect> - <inherits-from>Aircraft/SpaceShuttle/Models/Effects/shuttle-main</inherits-from> + <inherits-from>Effects/shuttle-main</inherits-from> <object-name>spaceshutt_spstob_3</object-name> <object-name>spaceshutt_spstob_eal</object-name> <object-name>SpeedBrakeL</object-name> diff --git a/AI/Aircraft/SpaceShuttle/spstob_1.png b/AI/Aircraft/SpaceShuttle/spstob_1.png old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/spstob_3.png b/AI/Aircraft/SpaceShuttle/spstob_3.png old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/spstob_4.png b/AI/Aircraft/SpaceShuttle/spstob_4.png old mode 100755 new mode 100644 diff --git a/AI/Aircraft/SpaceShuttle/spstob_e.png b/AI/Aircraft/SpaceShuttle/spstob_e.png old mode 100755 new mode 100644 From 72ec6a07784aabb7b019991c2356a44450c21062 Mon Sep 17 00:00:00 2001 From: Chris Ringeval <eatdirt@protonmail.com> Date: Sun, 17 Jan 2021 16:07:18 +0100 Subject: [PATCH 2/5] Add where the Shuttle lands in the description (KEDW) --- AI/shuttle_landing_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/shuttle_landing_demo.xml b/AI/shuttle_landing_demo.xml index 3bf2d8ed2..fc4d9c09f 100644 --- a/AI/shuttle_landing_demo.xml +++ b/AI/shuttle_landing_demo.xml @@ -6,7 +6,7 @@ <name>Space Shuttle landing</name> <description> - The Space Shuttle returns from entry interface to a landing + The Space Shuttle returns from entry interface to a landing at KEDW </description> <entry> From 9c4623967028349614c942fe76b13680a9c4a825 Mon Sep 17 00:00:00 2001 From: Chris Ringeval <eatdirt@protonmail.com> Date: Sun, 17 Jan 2021 16:12:53 +0100 Subject: [PATCH 3/5] Add KEDW in the scenario name as to appear in the AI tick box --- AI/shuttle_landing_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/shuttle_landing_demo.xml b/AI/shuttle_landing_demo.xml index fc4d9c09f..c1039b63a 100644 --- a/AI/shuttle_landing_demo.xml +++ b/AI/shuttle_landing_demo.xml @@ -4,7 +4,7 @@ <scenario> - <name>Space Shuttle landing</name> + <name>Space Shuttle landing at KEDW</name> <description> The Space Shuttle returns from entry interface to a landing at KEDW </description> From 82998f06a5af7e160f70ea973cf4c46f61b19bd8 Mon Sep 17 00:00:00 2001 From: Chris Ringeval <eatdirt@protonmail.com> Date: Sun, 17 Jan 2021 16:15:10 +0100 Subject: [PATCH 4/5] Remove executable bit on truman_demo.xml --- AI/truman_demo.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 AI/truman_demo.xml diff --git a/AI/truman_demo.xml b/AI/truman_demo.xml old mode 100755 new mode 100644 From 8362cd1f4e5941e198db61a673a79050097973f9 Mon Sep 17 00:00:00 2001 From: Chris Ringeval <eatdirt@protonmail.com> Date: Sun, 17 Jan 2021 16:26:38 +0100 Subject: [PATCH 5/5] Fix path in SSME3.xml --- AI/Aircraft/SpaceShuttle/SSME3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AI/Aircraft/SpaceShuttle/SSME3.xml b/AI/Aircraft/SpaceShuttle/SSME3.xml index 42f469d52..d199eb18b 100644 --- a/AI/Aircraft/SpaceShuttle/SSME3.xml +++ b/AI/Aircraft/SpaceShuttle/SSME3.xml @@ -4,7 +4,7 @@ <path>SSME.ac</path> <effect> - <inherits-from>Aircraft/SpaceShuttle/Models/Effects/shuttle-main</inherits-from> + <inherits-from>Effects/shuttle-main</inherits-from> <object-name>SSME</object-name> </effect>