From a5914e436b0f88d3f2fdc761c3fec5c72af169b9 Mon Sep 17 00:00:00 2001 From: Sachith Hasaranga Seneviratne Date: Wed, 9 Jul 2014 23:52:05 +0530 Subject: [PATCH] Changed all collision scripts to match new format --- data/scripts/20_chocolate/collisions.as | 13 ++++++++++++- data/scripts/20_harvest/collisions.as | 13 ++++++++++++- data/scripts/battleisland/collisions.as | 13 ++++++++++++- data/scripts/cave/collisions.as | 13 ++++++++++++- data/scripts/city/collisions.as | 13 ++++++++++++- data/scripts/endcutscene/collisions.as | 13 ++++++++++++- data/scripts/farm/collisions.as | 13 ++++++++++++- data/scripts/fortmagma/collisions.as | 13 ++++++++++++- data/scripts/introcutscene/collisions.as | 13 ++++++++++++- data/scripts/introcutscene2/collisions.as | 13 ++++++++++++- data/scripts/islandtrack/collisions.as | 13 ++++++++++++- data/scripts/jungle/collisions.as | 13 ++++++++++++- data/scripts/lighthouse/collisions.as | 13 ++++++++++++- data/scripts/mansion/collisions.as | 13 ++++++++++++- data/scripts/mansionl/collisions.as | 13 ++++++++++++- data/scripts/minel/collisions.as | 13 ++++++++++++- data/scripts/mines/collisions.as | 13 ++++++++++++- data/scripts/minigolf/collisions.as | 13 ++++++++++++- data/scripts/olivermath/collisions.as | 13 ++++++++++++- data/scripts/overworld/collisions.as | 13 ++++++++++++- data/scripts/sandtrack/collisions.as | 13 ++++++++++++- data/scripts/scotland/collisions.as | 13 ++++++++++++- data/scripts/snowmountain/collisions.as | 13 ++++++++++++- data/scripts/snowtuxpeak/collisions.as | 13 ++++++++++++- data/scripts/soccer_field/collisions.as | 13 ++++++++++++- data/scripts/stadium/collisions.as | 13 ++++++++++++- data/scripts/startrack/collisions.as | 13 ++++++++++++- data/scripts/subsea/collisions.as | 13 ++++++++++++- data/scripts/tutorial/collisions.as | 19 +++++++++++++------ data/scripts/xr591/collisions.as | 13 ++++++++++++- data/scripts/zengarden/collisions.as | 13 ++++++++++++- 31 files changed, 373 insertions(+), 36 deletions(-) diff --git a/data/scripts/20_chocolate/collisions.as b/data/scripts/20_chocolate/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/20_chocolate/collisions.as +++ b/data/scripts/20_chocolate/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/20_harvest/collisions.as b/data/scripts/20_harvest/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/20_harvest/collisions.as +++ b/data/scripts/20_harvest/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/battleisland/collisions.as b/data/scripts/battleisland/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/battleisland/collisions.as +++ b/data/scripts/battleisland/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/cave/collisions.as b/data/scripts/cave/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/cave/collisions.as +++ b/data/scripts/cave/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/city/collisions.as b/data/scripts/city/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/city/collisions.as +++ b/data/scripts/city/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/endcutscene/collisions.as b/data/scripts/endcutscene/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/endcutscene/collisions.as +++ b/data/scripts/endcutscene/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/farm/collisions.as b/data/scripts/farm/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/farm/collisions.as +++ b/data/scripts/farm/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/fortmagma/collisions.as b/data/scripts/fortmagma/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/fortmagma/collisions.as +++ b/data/scripts/fortmagma/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/introcutscene/collisions.as b/data/scripts/introcutscene/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/introcutscene/collisions.as +++ b/data/scripts/introcutscene/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/introcutscene2/collisions.as b/data/scripts/introcutscene2/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/introcutscene2/collisions.as +++ b/data/scripts/introcutscene2/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/islandtrack/collisions.as b/data/scripts/islandtrack/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/islandtrack/collisions.as +++ b/data/scripts/islandtrack/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/jungle/collisions.as b/data/scripts/jungle/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/jungle/collisions.as +++ b/data/scripts/jungle/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/lighthouse/collisions.as b/data/scripts/lighthouse/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/lighthouse/collisions.as +++ b/data/scripts/lighthouse/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/mansion/collisions.as b/data/scripts/mansion/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/mansion/collisions.as +++ b/data/scripts/mansion/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/mansionl/collisions.as b/data/scripts/mansionl/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/mansionl/collisions.as +++ b/data/scripts/mansionl/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/minel/collisions.as b/data/scripts/minel/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/minel/collisions.as +++ b/data/scripts/minel/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/mines/collisions.as b/data/scripts/mines/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/mines/collisions.as +++ b/data/scripts/mines/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/minigolf/collisions.as b/data/scripts/minigolf/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/minigolf/collisions.as +++ b/data/scripts/minigolf/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/olivermath/collisions.as b/data/scripts/olivermath/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/olivermath/collisions.as +++ b/data/scripts/olivermath/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/overworld/collisions.as b/data/scripts/overworld/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/overworld/collisions.as +++ b/data/scripts/overworld/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/sandtrack/collisions.as b/data/scripts/sandtrack/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/sandtrack/collisions.as +++ b/data/scripts/sandtrack/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/scotland/collisions.as b/data/scripts/scotland/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/scotland/collisions.as +++ b/data/scripts/scotland/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/snowmountain/collisions.as b/data/scripts/snowmountain/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/snowmountain/collisions.as +++ b/data/scripts/snowmountain/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/snowtuxpeak/collisions.as b/data/scripts/snowtuxpeak/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/snowtuxpeak/collisions.as +++ b/data/scripts/snowtuxpeak/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/soccer_field/collisions.as b/data/scripts/soccer_field/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/soccer_field/collisions.as +++ b/data/scripts/soccer_field/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/stadium/collisions.as b/data/scripts/stadium/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/stadium/collisions.as +++ b/data/scripts/stadium/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/startrack/collisions.as b/data/scripts/startrack/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/startrack/collisions.as +++ b/data/scripts/startrack/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/subsea/collisions.as b/data/scripts/subsea/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/subsea/collisions.as +++ b/data/scripts/subsea/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/tutorial/collisions.as b/data/scripts/tutorial/collisions.as index bb1b8c790..fff5c24bb 100644 --- a/data/scripts/tutorial/collisions.as +++ b/data/scripts/tutorial/collisions.as @@ -1,8 +1,15 @@ -void onCollision() +void onKartObjectCollision() { -/* -Currently activates on Kart collisions -*/ - displayMessage("Whoa! Road rage... between Kart: " + getCollidingKart1() + " - " + getCollidingKart2() + " " + getCollisionType() + "ID is : " + getCollidingID()); - disableAnimation(getCollidingID()); + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() +{ + } diff --git a/data/scripts/xr591/collisions.as b/data/scripts/xr591/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/xr591/collisions.as +++ b/data/scripts/xr591/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { } diff --git a/data/scripts/zengarden/collisions.as b/data/scripts/zengarden/collisions.as index f28e2d09a..fff5c24bb 100644 --- a/data/scripts/zengarden/collisions.as +++ b/data/scripts/zengarden/collisions.as @@ -1,4 +1,15 @@ -void onCollision() +void onKartObjectCollision() +{ + +} + +void onItemObjectCollision() +{ + +} + + +void onKartKartCollision() { }