diff --git a/data/scripts/hacienda/collisions.as b/data/scripts/hacienda/collisions.as index b20ff237e..c4bdc070e 100644 --- a/data/scripts/hacienda/collisions.as +++ b/data/scripts/hacienda/collisions.as @@ -1,16 +1,18 @@ void onKartObjectCollision() { - if (getCollidingID()=="stklib_fitchBarrelTestDestroyed_a"){ + if (getCollidingID()=="stklib_fitchBarreltest_a_main"){ int kart_id = getCollidingKart1(); Vec3 location = getKartLocation(kart_id); -//createExplosion(location); +createExplosion(location); disable("stklib_fitchBarreltest_a_main"); +enable("stklib_fitchBarrelTestDestroyed_a"); +enable("stklib_fitchBarrelTestcovert_a"); } else { - displayMessage("Woot! You hit item of ID: " + getCollidingID()); + /* displayMessage("Woot! You hit item of ID: " + getCollidingID()); disable(getCollidingID()); Vec3 explosion_loc = Vec3(79.53,0.07,97.13); -createExplosion(explosion_loc); +createExplosion(explosion_loc);*/ } } diff --git a/data/scripts/hacienda/start.as b/data/scripts/hacienda/start.as index d7350ac6a..e9f545e1c 100644 --- a/data/scripts/hacienda/start.as +++ b/data/scripts/hacienda/start.as @@ -1,4 +1,5 @@ void onStart() { - + disable("stklib_fitchBarrelTestDestroyed_a"); + disable("stklib_fitchBarrelTestcovert_a"); }