Browse Source

Merge branch 'monthly-release' of mifu/lexicon into master

pull/48/head
mifu 6 months ago
parent
commit
3569c36eb7

+ 7
- 4
pk3/Acs/Lexicon.c View File

@@ -16,6 +16,7 @@ strict namespace
#define STATE_RESULTS 3
#define MAPSET_MAX 193
#define PLAYER_TID 1000
#endif
// this is where the names that show up in the votes are, and the map names to go to when that wad wins
@@ -360,7 +361,7 @@ strict namespace
// when a player enters the game(server side)
script "SV_PlayerEnter" enter
{
Thing_ChangeTID(0, playernumber()+1337);
Thing_ChangeTID(0, playernumber()+PLAYER_TID);

// we have entered the VR map
if(GetLevelInfo(LEVELINFO_LEVELNUM) == 99)
@@ -581,7 +582,7 @@ strict namespace
int pnum = playernumber();

// special vr map logic so players cant vote from shooting the invisible parts of the linedef
if(GetActorZ(pnum+1337) < 1144.0) { terminate; }
if(GetActorZ(0) < 1144.0) { terminate; }
// if the player has not voted...
if (players[pnum] < 0)
@@ -646,14 +647,14 @@ strict namespace
{
for(int i = 0; i < 63; i++)
{
GiveActorInventory(1337+i, "Lexicon_GodMode", 1);
GiveActorInventory(PLAYER_TID+i, "Lexicon_GodMode", 1);
}
}
if(instakiller)
{
for(int i = 0; i < 63; i++)
{
GiveActorInventory(1337+i, "Lexicon_InstaKiller", 1);
GiveActorInventory(PLAYER_TID+i, "Lexicon_InstaKiller", 1);
}
}
}
@@ -914,6 +915,8 @@ strict namespace
script "lex_lore1" (void) clientside
{
// special vr map logic so players cant activate this script if they are higher than 300.0 units
if(GetActorZ(0) > 300.0) { terminate; }
HudSetup(0,0);
setfont("HUDFONT");
hudmessage(s:"\c[Gold]The Painting of Afina\n\n\c[White]--------------------\n\n\c[White]You found a rather mysterious painting. By zapping it with your votegun\n\c[White]you received some knowledge. This is a painting of a very powerfull wizard named Afina.\n\c[White]It's rumored she is very beautiful but also a powerfull adept in the school of runic magic\n\c[White]You feel as if theres massive power oozing off the picture. You wonder why out of all places, this picture is here\n\c[White]As you would think, it belongs in a frame. There is more to this painting and you have became curious"; HUDMSG_LOG, 9701, 0, hud_width_half, hud_height_half, 10.0);

BIN
pk3/Acs/Lexicon.o View File


BIN
pk3/Maps/VR.wad View File


BIN
pk3/Textures/Lexicon/LCREDITS.png View File


+ 3
- 1
workshop/creditsmake/src/credits.txt View File

@@ -9,7 +9,9 @@
990 Scripting, Effects, Texturing,
990 Additional Mapping
999 Tribeam
999 Willo - For custom Artwork
000
990 Artwork
999 Willo
000
990 VR Map Design
999 Fiendzy

BIN
workshop/creditsmake/src/results/LCREDITS.png View File


Loading…
Cancel
Save