From 1969ba8332776d060c7fa9e990093655dcec6053 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:31:17 -0500
Subject: [PATCH 01/11] Update main.cpp
---
src/smw/main.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/smw/main.cpp b/src/smw/main.cpp
index fbd684fb2..8254edb9b 100644
--- a/src/smw/main.cpp
+++ b/src/smw/main.cpp
@@ -14,7 +14,7 @@
along with SMW. If not, see . */
-#define TITLESTRING "Super Mario War"
+#define TITLESTRING "Super Cat Wars"
#define VERSIONNUMBER "2.0"
#include "FileList.h"
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
create_globals();
printf("-------------------------------------------------------------------------------\n");
- printf(" %s %s\n", TITLESTRING, VERSIONNUMBER);
+ printf(" %s\n", TITLESTRING);
printf("-------------------------------------------------------------------------------\n");
printf("\n---------------- startup ----------------\n");
@@ -309,8 +309,8 @@ int main(int argc, char *argv[])
//currently this only sets the title, not the icon.
//setting the icon isn't implemented in sdl -> i'll ask on the mailing list
char title[128];
- sprintf(title, "%s %s", TITLESTRING, VERSIONNUMBER);
- gfx_settitle(title);
+ //sprintf(title, "%s %s", TITLESTRING, VERSIONNUMBER);
+ gfx_settitle(TITLESTRING);
SDL_ShowCursor(SDL_DISABLE);
printf("\n---------------- loading ----------------\n");
From 5d26bd03da4dfd7640becf6d0dea9fca8a3089ba Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:32:26 -0500
Subject: [PATCH 02/11] Super Cat Wars Icons
---
resources/icons/smw-leveledit.ico | Bin 3262 -> 17067 bytes
resources/icons/smw-server.ico | Bin 3262 -> 17115 bytes
resources/icons/smw-worldedit.ico | Bin 3262 -> 17237 bytes
resources/icons/smw.ico | Bin 3262 -> 17462 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/resources/icons/smw-leveledit.ico b/resources/icons/smw-leveledit.ico
index a87c289180cd1cdd83bf76e36677e7c3c373be5d..bee2d43c1b7d4db9f13e85a55c4f9bd408f1a557 100644
GIT binary patch
literal 17067
zcmeHOdr(wm6hGG`Hy^O3q$Vlbgs)M{@iC$ef`*Fyq3Ad{K1ybC3{9{}G%eE|AEiSj
z<>)lvAR&J+PHI}dUxb5NYQDz+HOdJexhf-JihFP8EFJy$v6z
zeCK}m?gao82m$&iV1@N&fT1Y&>{&C;?+9=U=d9NM$1MP|dH}RQPWs7c`uaeCWr-t(
zg*I*16iq{iC&Z7YRibAbBb)d^{uBUn+VJ>6W9F3D&u!dzc2@YoiW@zKrj#8CncS%$
zEqy@CyofGGuK&B~#QD`TQ)l;ES^UD1_gh7ETGlw~vn7)oWiC)u%kIMW-n~?D?Nauw
z9oHN==hq(Fx4lx$+2pu&JAG|cXlChiFvScVm83b4*b+YVi&zBr=HA#=)$jA`yRtsa
zy)*V$hb^&#ioP6pr_Wsrz+aFP1>$pW9z;>9{vM2O4=X2x6%?JCdE(yT6=%;J8>!_qgRN#;
zatDBK+C%PKfTY>5v|IsOv0}}{-k9Rg#j~c2`32S5g?QV<=)JA&nj`CCvRXCiSni$5
z$e#AX6+aYP+N$RMC6HHrW6hnu6n}Fh*sjjU9>wlkTE5nfQ#ldXqDM^tM;%z9a2gCN
z#T|?5hiYV#S&jI+&|vx2NB~xH)X)v$^L%~jL
z?-TQy+F}oV6=SpG;5;OT0$grvo92u%2Hosba@qkL4}~+%0Qq<+q?zLSI?=83&SWv1
zo)8vSGIq@;r`6Cg)ffMm+Q(wUU1$Vwveiz7GEW$Z!6~DdZzG&YD;K94qcGiE_H%J%
zNZ)44aAo^^^>Eb;>(#&4>|0*0+NkA=wz$h63h2{_O-_lhPhs4x@q6F>q?V$=MHYuzQ9uh
zLY;_?mr)iWejglGw$E}z#SBWv1b>Xignbg4o6D|P_T_a>c*hU!w*LbOcW;8VM;M&^
z(<`(Zc-|E^y8e2x
zgZOLq)#&=G-*r)$^!9@1UG)$9AkO;4gZN!vzj}2OYshkaufLd!C^LRnTu(oc{Uc%!
zWmmX)O;10F-}C+#Yv_y2dqUiZ`d_ZlG$w6*SIt+Fa}DCJdB5{;=hVz_?TO===$72=
z57obS_Xng`|NcX#s_sa9HVY(v5wj?Z{qKqVG~>tbM;epZSDy5bSab2&)mzz@`lqJu
z)tG|#AMJa!5%s@Zq2m4GVdB1`^GEC-dd{nh#9k8D#d%}!Ke*pLID6Im_dOZEn2RWj
zIQ8bARQzJTp2*_$t0#;7BR@m%Sd67te^E!T{-O@ay>;F@u$~@fasKh)?~2zOQSIwa
z9N)*;O?bW#Wqj^e-7lnb4-zvy!*?#rlXc_Zo3e`o|r1T4(H8LLT)6
z|7ybLW)B#@$m@QSt>?BbZ
zbnfTzIPv$w?-xiKT{n!))gG{p$R8_y;jE;ypY}pL17!LB`KkZ?O!xQ8;=cP!7V-6_
zbG)J97y5^5E9NB2tmA?QwEmj&6W&JVWwgQO@HS67r!r6-eCK8?G5M*@>F>0xNO4HP
zzth4ZxcTtCEl^yB6R5ZxM=w6VPcVwt_xSj}PxA-q)z4l2{)kOJ9yR{h(g~U`#P}O(
zeEI&#wcvSq%=65B&7b`+m*dG})?@B#eEyEe{$wu4m-U~N_?#DWxeh#**Zq}0`(@7Y
zWG=586`$kiamLlq<8vM|cb7NobN+hV-TBXcWFF}Fe10*?k1DyF!`e%YVQd0pnLrx#y*@8n8mzwGBxxxD|bVv1`<#b>{sa>nl~
z_cWfY=WATHuX#VCX$1f#BM9T*zrWQ%CQSn*dQXA>5AJ+dVf1?nUwf78`CRstlMSZl
z{E)2oTp-SizGZtp*Yr5~ab?eaMD`>z=XrPbbdIpDXwUPW*z;K=`gs(4_QRa~xr;By
z6m8j_d@#xNCmpIUakeE+AFB5Hp2Sr@OlI$ZzMwAF)bisuBV%cP*~f4wNd_W%F@
literal 3262
zcmds)AydOZ5QUdPP{9n2K~_fc6DpC&%1V9$G7=eytgJ*LEBh0W{Rzl8c$b&FZ0>H-
zOeYnv-DEcJuHU=t-At!uSNJTKhWmrOodqbU%6eT1x`$il+~(PWNN_cOhoj(UsnnR1Na(oy&!>YhJ7lcOnNTu=F)fLf;K
z>7Eb5s{HaPrWa99*FFDi2)~#$_59)j;rVLyjD_dx1!pWgKkEN1kDkBT*0ZPQUtoK~
z4@4g?k9I1thQoG^oVb`Cj$fl{ou*ZLFJb{A+on35&fxj81Pynk9qN#s2qWCPLK8u2{
zAozgaoJ$@4e*Fzcd=@PgLoUSU769(~e2WZUgrQN86Mkx;J~~j}2{jcPA(9PfCW;o}VF{Pgptn-?}tjzB4gDI-)%GyyxJ5RQo}E
Xo82AFZua=AP+s_g$93=up27PU{rjk(
diff --git a/resources/icons/smw-server.ico b/resources/icons/smw-server.ico
index ad2af64865e90698215cf5bef10e4550dea5db1b..ea98d5961338079fee2abc51c62d282bc9e065cd 100644
GIT binary patch
literal 17115
zcmeHO4{Vg>8GpX(;ay>H70|j#=pitvs4!TJF=_AGRV+~cWK|hP+Aa}w&Q0fL1-0!b
z!)y?vO{P;^rCn71ix`DQ#_UNGX(T31ihou%sBvfm=`1Uyqes7Q?|bl*r!Rf)?rZOC
zi@oIG_q@;h{Q14lJ>PfNuZ74UH_4Yle)^Y(Xr9n#&px-_GM#9um&orwzfL1Mcmq+I
zKop~(YmFJZyP)M2ct#k*!lT+Kb5;uyq5{M`;jg85_w*mpO8%)QMA^7dU@_mCBK?l|CzV6>F_@?fBk;pq;XxV
zyW5XG`EJ(@9mglM>{!-jn3D~&-c92s(9H$ZGCS5{yQk&t+TycK8>gHMhl@`<A3r#g8Viey40B`me@D})LoY6)n$7R+b5U03u`8%`>#R2^xFjyubuZSIg))xR
zJzH*lbojZCPL5i8oslL98iHQGmF*sXR?D6r`(435(OS2;(v>!z{+t@jr=R_hrWhp~
z`fa?^7rbs>)R_nGRAHK_DkjA?z
zxB6z0t1`_jC|hNunQQ5u|KlK
zgH*xhs%u4ok}48qf8!El`eXDT$__oB@}KVRjwRcV+Q(`GuU0QfxrSD{8mE(M>2z8l
z&V5JX7sqHv#={F}?@o{Zh0F5DU9*7Zi1{&ZG#b2Og7&)oQ^gFmjyInXQ&h7sahrv{
zQ2pNyw5G2rU%kHki1GH09^b8QTJH|Zi`6Zz+kPourZkpjQCmg+Tb9+yYGBR%FPUy0fOuldw>e_6Sh^@h%ryOQo=Jx-I4
zWX-D!bsQ`_)!}M<;l_uvHPy^H`_4t`@f^ia*b()8pZg>E0_qkO0^D}at_ra;o^KhN#;dZX;e02Tiv0UeQoa#Ie*Lfap
z=eo{kgn#tUGu}h4^M2}d?yu96-G5zO9cOOW#d7aOteQ}pIo|D(*`lZC*=~;Mx2BJIdKj*2_
z=U$&_$C3l}`|Wro+WAKK>)wTn?Yj3Q*832x|GGU<%Yx{x*^3!Qw|txYIcKg%XBd5V
zIP%APcpm$_uB%FaZ$tPQF;}`7QSH1|vU|>Xf_qiznqKE~%Aa%Qdi1G?zRP*)^r6O|
zzmJ@=c#djA#C_X_a378S&Amj)-OHZro-ZQXhP0lvZ7K2$8qVL?Ij?y2=u;7WSH}n3
zB@Si&yhr@mJJ)d*IZy1oy?(b9y-Ug4mHg+P|GgdO%=MwoKT|ySlrls6do=K0#QQH|
zlGoMvGxPc3I`2Q5nISzt!;}Ao`H9JYCi_`oh|CY4G|r#vY<`Bs%yZ6Mmz?Fj2=^oC
z!-+rdJM`hgpT8F)`bYH}d{5%KXN>H-mmyr`!l_EkiDyokC$#38R*SGR^g5P6&;;(@w)
zsvZ77r*+|vc%WKGUBgdBr`M+%uh!A6)i|t^T_1IT_`ZZWg54?V&Z*kfyn|IAbyWmE
zm3N}n$gkGL8vBW=r{+O^pjsDpH7-$WGf=R}uTkMzt>1$*%id&EGEmHWQQcJXvXim=%c@!58WNqfMyrQju>Q=|#;3yJ4Bg`5Xm8yuxw
zq#%jva|gaBbt!5r>>Q;JUqi=dYdk1pz)OCH$+a#HdqC;OZs4{x>(rZ
zD-rRr_#>7hkLNkL57+T|D{b(X_2mm|i9CkuYW%s#-v1&Gk5hH{^p5P!LD!F1v2v~?
zPx$qPYF)XOe(K!z<)^cu4xekCug;Df5_LYwu!n+GIVM%*kkPl8DOEWwLP8$l=c~#Q
Nf58)x0|IR!{|6-7aSZ?f
literal 3262
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
literal 3262
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
Date: Sat, 19 Dec 2020 15:34:08 -0500
Subject: [PATCH 03/11] Update leveleditor.cpp
---
src/leveleditor/leveleditor.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/leveleditor/leveleditor.cpp b/src/leveleditor/leveleditor.cpp
index 15d053876..92b4005ba 100644
--- a/src/leveleditor/leveleditor.cpp
+++ b/src/leveleditor/leveleditor.cpp
@@ -77,7 +77,7 @@ void removeifprojectile(IO_MovingObject * object, bool playsound, bool forcedead
#endif
-#define MAPTITLESTRING "SMW 2.0 Level Editor"
+#define MAPTITLESTRING "Super Cat Wars Level Editor"
extern CMap* g_map;
@@ -2962,7 +2962,7 @@ SDL_Rect rBackground[2];
//SDL_Rect rTypeButton[8][4];
SDL_Rect rIconRects[MAXMAPHAZARDS][2];
-const char * szHazardNames[8] = {"Fireballs", "Rotodisc", "Bullet Bill", "Flame Thrower", "Green Pirhana", "Red Pirhana", "Tall Pirhana", "Short Pirhana"};
+const char * szHazardNames[8] = {"Firebar", "Electorbit", "Cannonball", "Flame Thrower", "Monkey", "Vulcan Turnip", "Bamboo Blossom", "Mr. Prickles"};
bool editor_maphazards_initialized = false;
void init_editor_maphazards()
From f12447175b094b94cee30452262e52d56f5b1b29 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:34:40 -0500
Subject: [PATCH 04/11] Update worldeditor.cpp
---
src/worldeditor/worldeditor.cpp | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/worldeditor/worldeditor.cpp b/src/worldeditor/worldeditor.cpp
index 26413aee9..a6dc1d383 100644
--- a/src/worldeditor/worldeditor.cpp
+++ b/src/worldeditor/worldeditor.cpp
@@ -57,7 +57,7 @@
#define SDL_Delay(n) ;
#endif
-#define MAPTITLESTRING "SMW 2.0 World Editor"
+#define MAPTITLESTRING "Super Cat Wars World Editor"
enum {EDITOR_EDIT, EDITOR_WATER, EDITOR_BACKGROUND, EDITOR_STAGEFOREGROUND, EDITOR_STRUCTUREFOREGROUND, EDITOR_BRIDGES, EDITOR_PATHSPRITE, EDITOR_VEHICLES, EDITOR_QUIT, SAVE_AS, FIND, CLEAR_WORLD, NEW_WORLD, RESIZE_WORLD, SAVE, EDITOR_WARP, DISPLAY_HELP, EDITOR_PATH, EDITOR_TYPE, EDITOR_BOUNDARY, EDITOR_START_ITEMS, EDITOR_STAGE};
@@ -603,11 +603,11 @@ int main(int argc, char *argv[])
SetStageMode(3, "Jail", "Kills", 5, 20);
SetStageMode(4, "Coin Collection", "Coins", 5, 20);
SetStageMode(5, "Stomp", "Kills", 10, 10);
- SetStageMode(6, "Yoshi's Eggs", "Eggs", 5, 20);
+ SetStageMode(6, "Bells & Kittens", "Bells", 5, 20);
SetStageMode(7, "Capture The Flag", "Points", 5, 20);
SetStageMode(8, "Chicken", "Points", 50, 200);
SetStageMode(9, "Tag", "Points", 50, 200);
- SetStageMode(10, "Star", "Lives", 1, 5);
+ SetStageMode(10, "Magic Bells", "Lives", 1, 5);
SetStageMode(11, "Domination", "Points", 50, 200);
SetStageMode(12, "King of the Hill", "Points", 50, 200);
SetStageMode(13, "Race", "Laps", 2, 10);
@@ -617,8 +617,8 @@ int main(int argc, char *argv[])
SetStageMode(17, "Greed", "Coins", 10, 40);
SetStageMode(18, "Health", "Lives", 1, 5);
SetStageMode(19, "Card Collection", "Points", 10, 30);
- SetStageMode(20, "Phanto Chase", "Points", 50, 200);
- SetStageMode(21, "Shy Guy Tag", "Points", 50, 200);
+ SetStageMode(20, "Ghost Chase", "Points", 50, 200);
+ SetStageMode(21, "Robo Tag", "Points", 50, 200);
//Setup The Mode Menu
mCurrentMenu = &mStageSettingsMenu;
@@ -818,15 +818,15 @@ int main(int argc, char *argv[])
//Create Vehicle Menu
miVehicleSpriteField = new MI_ImageSelectField(&rm->spr_selectfield, &spr_vehicleicons, 70, 80, "Sprite", 500, 150, 16, 16);
- miVehicleSpriteField->Add("Hammer Brother", 0, "", false, false);
- miVehicleSpriteField->Add("Boomerang Brother", 1, "", false, false);
- miVehicleSpriteField->Add("Fire Brother", 2, "", false, false);
- miVehicleSpriteField->Add("Tank 1", 3, "", false, false);
- miVehicleSpriteField->Add("Boat 1", 4, "", false, false);
- miVehicleSpriteField->Add("Boat 2", 5, "", false, false);
- miVehicleSpriteField->Add("Airship 1", 6, "", false, false);
- miVehicleSpriteField->Add("Airship 2", 7, "", false, false);
- miVehicleSpriteField->Add("Tank 2", 8, "", false, false);
+ miVehicleSpriteField->Add("Commander Kobolt", 0, "", false, false);
+ miVehicleSpriteField->Add("Kallio", 1, "", false, false);
+ miVehicleSpriteField->Add("Mustamon", 2, "", false, false);
+ miVehicleSpriteField->Add("Tank", 3, "", false, false);
+ miVehicleSpriteField->Add("Boat", 4, "", false, false);
+ miVehicleSpriteField->Add("Commander Gorudo", 5, "", false, false);
+ miVehicleSpriteField->Add("Lord Iridium", 6, "", false, false);
+ miVehicleSpriteField->Add("Airship", 7, "", false, false);
+ miVehicleSpriteField->Add("Commander Mizu", 8, "", false, false);
miVehicleSpriteField->SetData(&g_wvVehicleStamp.iDrawSprite, NULL, NULL);
miVehicleSpriteField->SetKey(g_wvVehicleStamp.iDrawSprite);
From 9740e2829c14562ba37a53476757eeb550284006 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:35:36 -0500
Subject: [PATCH 05/11] Update gamemodes.cpp
---
src/smw/gamemodes.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/smw/gamemodes.cpp b/src/smw/gamemodes.cpp
index b320d9b1d..d0188a065 100644
--- a/src/smw/gamemodes.cpp
+++ b/src/smw/gamemodes.cpp
@@ -1057,7 +1057,7 @@ CGM_ShyGuyTag::CGM_ShyGuyTag() : CGameMode()
goal = 200;
gamemode = game_mode_shyguytag;
- SetupModeStrings("Shyguy Tag", "Points", 50);
+ SetupModeStrings("Robo Tag", "Points", 50);
scorecounter = 0;
}
@@ -1181,7 +1181,7 @@ void CGM_ShyGuyTag::SetShyGuy(short iTeam)
if (list_players[iPlayer]->getTeamID() == iTeam) {
CPlayer * player = list_players[iPlayer];
player->shyguy = true;
- eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Shyguy!", -VELJUMP*1.5));
+ eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Robo Tag!", -VELJUMP*1.5));
eyecandy[2].add(new EC_SingleAnimation(&rm->spr_fireballexplosion, player->centerX() - 16, player->centerY() - 16, 3, 8));
player->StripPowerups();
@@ -1316,7 +1316,7 @@ CGM_Eggs::CGM_Eggs() : CGameMode()
goal = 20;
gamemode = game_mode_eggs;
- SetupModeStrings("Yoshi's Eggs", "Eggs", 5);
+ SetupModeStrings("Bells & Kittens", "Bells", 5);
};
void CGM_Eggs::init()
@@ -2171,7 +2171,7 @@ CGM_Star::CGM_Star() : CGM_TimeLimit()
{
goal = 5;
gamemode = game_mode_star;
- SetupModeStrings("Star", "Lives", 1);
+ SetupModeStrings("Magic Bells", "Lives", 1);
iCurrentModeType = 0;
};
@@ -2460,9 +2460,9 @@ CPlayer * CGM_Star::swapplayer(short id, CPlayer * player)
starItem[id]->setPlayerColor(starPlayer[id]->getColorID());
if (starItem[id]->getType() == 1)
- eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == 2 ? "Star Get!" : "Shine Get!", -VELJUMP*1.5));
+ eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), iCurrentModeType == 2 ? "Bell Get!" : "Shiny!", -VELJUMP*1.5));
else
- eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Ztarred!", -VELJUMP*1.5));
+ eyecandy[2].add(new EC_GravText(&rm->game_font_large, player->centerX(), player->bottomY(), "Corrupted!", -VELJUMP*1.5));
eyecandy[2].add(new EC_SingleAnimation(&rm->spr_fireballexplosion, player->centerX() - 16, player->centerY() - 16, 3, 8));
ifSoundOnPlay(rm->sfx_transform);
@@ -2958,7 +2958,7 @@ CGM_Chase::CGM_Chase() : CGameMode()
goal = 200;
gamemode = game_mode_chase;
- SetupModeStrings("Phanto", "Points", 50);
+ SetupModeStrings("Ghost Chase", "Points", 50);
}
void CGM_Chase::init()
@@ -3121,11 +3121,11 @@ void CGM_Boss_MiniGame::draw_foreground()
rm->game_font_large.drawCentered(smw->ScreenWidth/2, 96, "You Failed To Defeat");
if (iBossType == 0)
- rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Sledge Brother");
+ rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
else if (iBossType == 1)
- rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Bomb Brother");
+ rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
else if (iBossType == 2)
- rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Mighty Flame Brother");
+ rm->game_font_large.drawCentered(smw->ScreenWidth/2, 118, "The Boss");
}
}
}
From eec2fcdffb99534bef0c08661641653bc66726d5 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:36:23 -0500
Subject: [PATCH 06/11] Update ModeOptionsMenu.cpp
---
src/smw/menu/ModeOptionsMenu.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/smw/menu/ModeOptionsMenu.cpp b/src/smw/menu/ModeOptionsMenu.cpp
index 1ba5418ba..5f5137a09 100644
--- a/src/smw/menu/ModeOptionsMenu.cpp
+++ b/src/smw/menu/ModeOptionsMenu.cpp
@@ -403,7 +403,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miEggModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miEggModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
- miEggModeHeaderText = new MI_Text("Yoshi's Eggs Mode Menu", 320, 5, 0, 2, 1);
+ miEggModeHeaderText = new MI_Text("Bells & Kittens Mode Menu", 320, 5, 0, 2, 1);
mModeSettingsMenu[6].AddControl(miEggModeEggQuantityField[0], miEggModeBackButton, miEggModeEggQuantityField[1], NULL, miEggModeBackButton);
mModeSettingsMenu[6].AddControl(miEggModeEggQuantityField[1], miEggModeEggQuantityField[0], miEggModeEggQuantityField[2], NULL, miEggModeBackButton);
@@ -601,10 +601,10 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miStarModeTimeField->SetData(&game_values.gamemodemenusettings.star.time, NULL, NULL);
miStarModeTimeField->SetKey(game_values.gamemodemenusettings.star.time);
- miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Star Type", 400, 150);
- miStarModeShineField->Add("Ztar", 0, "", false, false);
- miStarModeShineField->Add("Shine", 1, "", false, false);
- miStarModeShineField->Add("Multi Star", 2, "", false, false);
+ miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Bell Type", 400, 150);
+ miStarModeShineField->Add("Dark", 0, "", false, false);
+ miStarModeShineField->Add("Golden", 1, "", false, false);
+ miStarModeShineField->Add("Multi-Bell", 2, "", false, false);
miStarModeShineField->Add("Random", 3, "", false, false);
miStarModeShineField->SetData(&game_values.gamemodemenusettings.star.shine, NULL, NULL);
miStarModeShineField->SetKey(game_values.gamemodemenusettings.star.shine);
@@ -640,7 +640,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miStarModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miStarModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
- miStarModeHeaderText = new MI_Text("Star Mode Menu", 320, 5, 0, 2, 1);
+ miStarModeHeaderText = new MI_Text("Magic Bells Mode Menu", 320, 5, 0, 2, 1);
mModeSettingsMenu[10].AddControl(miStarModeTimeField, miStarModeBackButton, miStarModeShineField, NULL, miStarModeBackButton);
mModeSettingsMenu[10].AddControl(miStarModeShineField, miStarModeTimeField, miStarModePercentExtraTime, NULL, miStarModeBackButton);
@@ -1248,7 +1248,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miChaseModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miChaseModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
- miChaseModeHeaderText = new MI_Text("Phanto Mode Menu", 320, 5, 0, 2, 1);
+ miChaseModeHeaderText = new MI_Text("Ghost Chase Mode Menu", 320, 5, 0, 2, 1);
mModeSettingsMenu[20].AddControl(miChaseModeSpeedField, miChaseModeBackButton, miChaseModeQuantitySlider[0], NULL, miChaseModeBackButton);
@@ -1304,7 +1304,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() : UI_Menu()
miShyGuyTagModeLeftHeaderBar = new MI_Image(&rm->menu_plain_field, 0, 0, 0, 0, 320, 32, 1, 1, 0);
miShyGuyTagModeRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
- miShyGuyTagModeHeaderText = new MI_Text("Shyguy Tag Mode Menu", 320, 5, 0, 2, 1);
+ miShyGuyTagModeHeaderText = new MI_Text("Robo Tag Mode Menu", 320, 5, 0, 2, 1);
mModeSettingsMenu[21].AddControl(miShyGuyTagModeTagOnSuicideField, miShyGuyTagModeBackButton, miShyGuyTagModeTagOnStompField, NULL, miShyGuyTagModeBackButton);
mModeSettingsMenu[21].AddControl(miShyGuyTagModeTagOnStompField, miShyGuyTagModeTagOnSuicideField, miShyGuyTagModeFreeTimeField, NULL, miShyGuyTagModeBackButton);
From b466212d4f635914061218a1707419aa68775b92 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:37:02 -0500
Subject: [PATCH 07/11] Update ProjectileLimitsMenu.cpp
---
src/smw/menu/options/ProjectileLimitsMenu.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/smw/menu/options/ProjectileLimitsMenu.cpp b/src/smw/menu/options/ProjectileLimitsMenu.cpp
index 1cad140b7..332c42e8f 100644
--- a/src/smw/menu/options/ProjectileLimitsMenu.cpp
+++ b/src/smw/menu/options/ProjectileLimitsMenu.cpp
@@ -11,7 +11,7 @@ extern CGameValues game_values;
UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
{
- miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Fireball Limit", 500, 220);
+ miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Chili Limit", 500, 220);
miFireballLimitField->Add("Unlimited", 0, "", false, false);
miFireballLimitField->Add("2", 2, "", false, false);
miFireballLimitField->Add("5", 5, "", false, false);
@@ -59,7 +59,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miBoomerangLimitField->SetData(&game_values.boomeranglimit, NULL, NULL);
miBoomerangLimitField->SetKey(game_values.boomeranglimit);
- miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Feather Limit", 500, 220);
+ miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Cloak Limit", 500, 220);
miFeatherLimitField->Add("Unlimited", 0, "", false, false);
miFeatherLimitField->Add("2", 2, "", false, false);
miFeatherLimitField->Add("5", 5, "", false, false);
@@ -91,7 +91,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miLeafLimitField->SetData(&game_values.leaflimit, NULL, NULL);
miLeafLimitField->SetKey(game_values.leaflimit);
- miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "P-Wings Limit", 500, 220);
+ miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Balloon Limit", 500, 220);
miPwingsLimitField->Add("Unlimited", 0, "", false, false);
miPwingsLimitField->Add("2", 2, "", false, false);
miPwingsLimitField->Add("5", 5, "", false, false);
@@ -107,7 +107,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miPwingsLimitField->SetData(&game_values.pwingslimit, NULL, NULL);
miPwingsLimitField->SetKey(game_values.pwingslimit);
- miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Tanooki Limit", 500, 220);
+ miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Moon Crystal Limit", 500, 220);
miTanookiLimitField ->Add("Unlimited", 0, "", false, false);
miTanookiLimitField ->Add("2", 2, "", false, false);
miTanookiLimitField ->Add("5", 5, "", false, false);
@@ -139,7 +139,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu()
miBombLimitField ->SetData(&game_values.bombslimit, NULL, NULL);
miBombLimitField ->SetKey(game_values.bombslimit);
- miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Wand Limit", 500, 220);
+ miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Freeze Pop Limit", 500, 220);
miWandLimitField ->Add("Unlimited", 0, "", false, false);
miWandLimitField ->Add("2", 2, "", false, false);
miWandLimitField ->Add("5", 5, "", false, false);
From 9fa3fe4cd05506b46b540dfc7cc69ebafcdff55c Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sat, 19 Dec 2020 15:37:29 -0500
Subject: [PATCH 08/11] Update ProjectileOptionsMenu.cpp
---
src/smw/menu/options/ProjectileOptionsMenu.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/smw/menu/options/ProjectileOptionsMenu.cpp b/src/smw/menu/options/ProjectileOptionsMenu.cpp
index 475bdcd2b..b0c539e65 100644
--- a/src/smw/menu/options/ProjectileOptionsMenu.cpp
+++ b/src/smw/menu/options/ProjectileOptionsMenu.cpp
@@ -192,12 +192,12 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() : UI_Menu()
miProjectileOptionsMenuRightHeaderBar = new MI_Image(&rm->menu_plain_field, 320, 0, 192, 0, 320, 32, 1, 1, 0);
miProjectileOptionsMenuHeaderText = new MI_Text("Projectile & Weapon Options Menu", 320, 5, 0, 2, 1);
- miFireballText = new MI_Text("Fireball", 10, 50, 0, 2, 0);
- miFeatherText = new MI_Text("Feather", 10, 120, 0, 2, 0);
+ miFireballText = new MI_Text("Chili Pepper", 10, 50, 0, 2, 0);
+ miFeatherText = new MI_Text("Olli's Cloak", 10, 120, 0, 2, 0);
miBoomerangText = new MI_Text("Boomerang", 10, 190, 0, 2, 0);
miHammerText = new MI_Text("Hammer", 325, 50, 0, 2, 0);
miShellText = new MI_Text("Shell", 10, 300, 0, 2, 0);
- miWandText = new MI_Text("Wand", 10, 370, 0, 2, 0);
+ miWandText = new MI_Text("Freeze Pop", 10, 370, 0, 2, 0);
miBlueBlockText = new MI_Text("Throwable Blocks", 325, 200, 0, 2, 0);
AddControl(miFireballLifeField, miProjectileOptionsMenuBackButton, miFeatherJumpsField, NULL, miHammerLifeField);
From cf160af02829774fd9f935a340e2139a2a8edbf6 Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sun, 17 Jan 2021 16:11:59 -0500
Subject: [PATCH 09/11] Update leveleditor.cpp
---
src/leveleditor/leveleditor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/leveleditor/leveleditor.cpp b/src/leveleditor/leveleditor.cpp
index 92b4005ba..dd494581d 100644
--- a/src/leveleditor/leveleditor.cpp
+++ b/src/leveleditor/leveleditor.cpp
@@ -2962,7 +2962,7 @@ SDL_Rect rBackground[2];
//SDL_Rect rTypeButton[8][4];
SDL_Rect rIconRects[MAXMAPHAZARDS][2];
-const char * szHazardNames[8] = {"Firebar", "Electorbit", "Cannonball", "Flame Thrower", "Monkey", "Vulcan Turnip", "Bamboo Blossom", "Mr. Prickles"};
+const char * szHazardNames[8] = {"Firebar", "Electorb", "Cannonball", "Flamethrower", "Monkey", "Vulcan Turnip", "Bamboo Blossom", "Mr. Prickles"};
bool editor_maphazards_initialized = false;
void init_editor_maphazards()
From d18e5197388cdec1ae6832fedc4994274ad4e66f Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Sun, 23 Jan 2022 18:44:12 -0500
Subject: [PATCH 10/11] Update PlayerAwardEffects.cpp
---
.../player_components/PlayerAwardEffects.cpp | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/smw/player_components/PlayerAwardEffects.cpp b/src/smw/player_components/PlayerAwardEffects.cpp
index adb2ba93f..61133d793 100644
--- a/src/smw/player_components/PlayerAwardEffects.cpp
+++ b/src/smw/player_components/PlayerAwardEffects.cpp
@@ -27,14 +27,14 @@ struct STextAward {
#define PAWARD_LAST 9
const STextAward awardtexts[PAWARD_LAST] = {
- STextAward("Double Kill", false),
- STextAward("Triple Kill", false),
- STextAward("Killing Spree", false),
- STextAward("Killing Spree x 2", false),
- STextAward("Killing Spree x 3", false),
- STextAward("Dominating", true),
- STextAward("Dominating x 2", true),
- STextAward("Dominating x 3", true),
+ STextAward("Nice!", false),
+ STextAward("Cool!", false),
+ STextAward("Good!", false),
+ STextAward("Great!", false),
+ STextAward("Amazing!", false),
+ STextAward("Awesome!", true),
+ STextAward("Excellent!", true),
+ STextAward("Dominating!", true),
STextAward("Unstoppable!", true)
};
@@ -238,10 +238,10 @@ void PlayerAwardEffects::addKillerAward(CPlayer& killer, CPlayer* killed, killst
//if we stopped the other players run show another award
if (killed && killed->killsinrow >= 2) {
short a = (killed->killsinrow - 2) >= PAWARD_LAST ? PAWARD_LAST -1 : (killed->killsinrow - 2);
- char text[128];
- sprintf(text, "%s Stopped!", awardtexts[a].name);
+ //char text[128];
+ //sprintf(text, "%s Stopped!", awardtexts[a].name);
- eyecandy[2].add(new EC_GravText(awardtexts[a].large ? &rm->game_font_large : &rm->game_font_small, killed->centerX(), killed->bottomY(), text, -VELJUMP*1.3f));
+ eyecandy[2].add(new EC_GravText(awardtexts[a].large ? &rm->game_font_large : &rm->game_font_small, killed->centerX(), killed->bottomY(), "Combo Broken!", -VELJUMP*1.3f));
}
}
}
From 22a118c42f9a6be8be2939f85e46cedaacaf119c Mon Sep 17 00:00:00 2001
From: AzureBerylBlue <53104010+AzureBerylBlue@users.noreply.github.com>
Date: Fri, 4 Feb 2022 16:37:02 -0500
Subject: [PATCH 11/11] Update leveleditor.cpp
---
src/leveleditor/leveleditor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/leveleditor/leveleditor.cpp b/src/leveleditor/leveleditor.cpp
index dd494581d..7fb32f48d 100644
--- a/src/leveleditor/leveleditor.cpp
+++ b/src/leveleditor/leveleditor.cpp
@@ -3319,7 +3319,7 @@ int editor_maphazards()
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight() * 2, "[esc] Exit, [l] Location, [+/-] Velocity, [LMB] Angle and Radius");
if (hazard->itype == 1)
- rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle, [1-9] Number of Rotodiscs");
+ rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle, [1-9] Number of Electorbs");
else
rm->menu_font_small.draw(0, 480 - rm->menu_font_small.getHeight(), "[Shift + LMB] Snap To Angle");
} else if (hazard->itype == 2) {