From 8d41849c5ee92913cc49f14c4f82f6e39b5467db Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Thu, 30 May 2013 16:06:34 -0500
Subject: Minor fixes
---
src/fakeStarCoin.cpp | 17 +++++++++++++++--
src/koopatlas/core.cpp | 2 +-
src/koopatlas/starcoin.cpp | 4 ++--
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/fakeStarCoin.cpp b/src/fakeStarCoin.cpp
index ae7ac8b..fe65652 100644
--- a/src/fakeStarCoin.cpp
+++ b/src/fakeStarCoin.cpp
@@ -66,9 +66,22 @@ bool daFakeStarCoin::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhy
}
bool daFakeStarCoin::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) {
+ SpawnEffect("Wm_en_explosion", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
+ SpawnEffect("Wm_en_explosion_smk", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){3.0, 3.0, 3.0});
+
+ PlaySound(this, SE_OBJ_EMY_FIRE_DISAPP);
+ this->Delete(1);
+
return true;
}
bool daFakeStarCoin::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) {
+ SpawnEffect("Wm_ob_cmnicekira", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5});
+ SpawnEffect("Wm_ob_icebreakwt", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
+ SpawnEffect("Wm_ob_iceattack", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5});
+
+ PlaySound(this, SE_OBJ_PNGN_ICE_BREAK);
+
+ this->Delete(1);
return true;
}
bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {
@@ -82,10 +95,10 @@ bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePh
return true;
}
bool daFakeStarCoin::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {
- return true;
+ return collisionCat9_RollingObject(apThis, apOther);
}
bool daFakeStarCoin::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {
- return true;
+ return collisionCat1_Fireball_E_Explosion(apThis, apOther);
}
bool daFakeStarCoin::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther) {
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp
index c6b0aef..40776c8 100644
--- a/src/koopatlas/core.cpp
+++ b/src/koopatlas/core.cpp
@@ -1089,7 +1089,7 @@ static const wchar_t *completionMsgs[] = {
L"You have collected all the\nnecessary \x0B\x014F\xBEEF coins to enter\nthe Special World!",
L"You have collected all the \x0B\x014F\xBEEF Star\nCoins in the game!",
L"You've found every \x0B\x013B\xBEEF exit in the\ngame!",
- L"You've completed everything in\nNEWER SUPER MARIO BROS. Wii!"
+ L"You've completed everything in\nNEWER SUPER MARIO BROS. Wii!\n\nWe present you a new quest.\nTry pressing \x0B\x0122\xBEEF, \x0B\x0123\xBEEF and \x0B\x0125\xBEEF\n on the Star Coin menu."
};
void dScKoopatlas_c::beginState_CompletionMsg() {
diff --git a/src/koopatlas/starcoin.cpp b/src/koopatlas/starcoin.cpp
index 5725ceb..8cb819b 100644
--- a/src/koopatlas/starcoin.cpp
+++ b/src/koopatlas/starcoin.cpp
@@ -447,14 +447,14 @@ void dWMStarCoin_c::executeState_Wait() {
const int lineCountOn = 9, lineCountOff = 2;
static const wchar_t *linesOn[lineCountOn] = {
- L"You've activated Hard Mode",
+ L"You've activated Hard Mode!",
L" ",
L"In Hard Mode, Mario will die",
L"any time he takes damage, and",
L"the timer will be more strict.",
L" ",
L"So treasure your Yoshi, and",
- L"and hold on to your hats, you're",
+ L"hold on to your hat, you're",
L"in for a wild ride!",
};
static const wchar_t *linesOff[lineCountOff] = {
--
cgit v1.2.3