mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Add setactivitycolour(colour) and setactivitytext() commands

Browse source 
These commands will change the colour and text of the next
activity zone that gets spawned. `setactivitycolour` takes all
textbox colors, and `setactivitytext` will take the text on
the next line. These commands were designed this way
to avoid breaking forwards compatibility.
This commit is contained in:
AllyTally 2021-04-15 02:09:47 -03:00 committed by Misa Elizabeth Kai
parent 0685cade69
commit b15e25f106
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
desktop_version/src/Entity.cpp
View file

@ -69,6 +69,8 @@ void entityclass::init(void)
customenemy = 0; customenemy = 0;
customwarpmode = false; customwarpmodevon = false; customwarpmodehon = false; customwarpmode = false; customwarpmodevon = false; customwarpmodehon = false;
customactivitycolour = "";
customactivitytext = "";
trophytext = 0; trophytext = 0;
oldtrophytext = 0; oldtrophytext = 0;
trophytype = 0; trophytype = 0;
@ -1065,6 +1067,18 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
break; break;
} }
if (customactivitytext != "")
{
block.prompt = customactivitytext;
customactivitytext = "";
}
if (customactivitycolour != "")
{
block.setblockcolour(customactivitycolour);
customactivitycolour = "";
}
if (!reuse) if (!reuse)
{ {
blocks.push_back(block); blocks.push_back(block);

2
desktop_version/src/Entity.h
View file

@ -193,6 +193,8 @@ public:
bool customwarpmode, customwarpmodevon, customwarpmodehon; bool customwarpmode, customwarpmodevon, customwarpmodehon;
std::string customscript; std::string customscript;
bool customcrewmoods[Game::numcrew]; bool customcrewmoods[Game::numcrew];
std::string customactivitycolour;
std::string customactivitytext;
}; };
#ifndef OBJ_DEFINITION #ifndef OBJ_DEFINITION

9
desktop_version/src/Script.cpp
View file

@ -1903,6 +1903,15 @@ void scriptclass::run(void)
obj.createblock(5, obj.entities[crewman].xp - 32, 0, 96, 240, i, "", (i == 35)); obj.createblock(5, obj.entities[crewman].xp - 32, 0, 96, 240, i, "", (i == 35));
} }
} }
else if (words[0] == "setactivitycolour")
{
obj.customactivitycolour = words[1];
}
else if (words[0] == "setactivitytext")
{
position++;
obj.customactivitytext = commands[position];
}
else if (words[0] == "createrescuedcrew") else if (words[0] == "createrescuedcrew")
{ {
//special for final level cutscene //special for final level cutscene