Browse Source

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

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

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

@@ -16,6 +16,7 @@ strict namespace
16 16
         #define STATE_RESULTS 3
17 17
         
18 18
         #define MAPSET_MAX 193
19
+        #define PLAYER_TID 1000
19 20
     #endif
20 21
     
21 22
     // 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
360 361
     // when a player enters the game(server side)
361 362
     script "SV_PlayerEnter" enter
362 363
     {
363
-        Thing_ChangeTID(0, playernumber()+1337);
364
+        Thing_ChangeTID(0, playernumber()+PLAYER_TID);
364 365
 
365 366
         // we have entered the VR map
366 367
         if(GetLevelInfo(LEVELINFO_LEVELNUM) == 99) 
@@ -581,7 +582,7 @@ strict namespace
581 582
             int pnum = playernumber();
582 583
 
583 584
             // special vr map logic so players cant vote from shooting the invisible parts of the linedef
584
-            if(GetActorZ(pnum+1337) < 1144.0) { terminate; }
585
+            if(GetActorZ(0) < 1144.0) { terminate; }
585 586
             
586 587
             // if the player has not voted...
587 588
             if (players[pnum] < 0)
@@ -646,14 +647,14 @@ strict namespace
646 647
         {
647 648
             for(int i = 0; i < 63; i++)
648 649
             {
649
-                GiveActorInventory(1337+i, "Lexicon_GodMode", 1);
650
+                GiveActorInventory(PLAYER_TID+i, "Lexicon_GodMode", 1);
650 651
             }
651 652
         }
652 653
         if(instakiller)
653 654
         {
654 655
             for(int i = 0; i < 63; i++)
655 656
             {
656
-                GiveActorInventory(1337+i, "Lexicon_InstaKiller", 1);
657
+                GiveActorInventory(PLAYER_TID+i, "Lexicon_InstaKiller", 1);
657 658
             }
658 659
         }
659 660
     }
@@ -914,6 +915,8 @@ strict namespace
914 915
 	
915 916
     script "lex_lore1" (void) clientside
916 917
     {
918
+        // special vr map logic so players cant activate this script if they are higher than 300.0 units
919
+        if(GetActorZ(0) > 300.0) { terminate; }
917 920
         HudSetup(0,0);
918 921
         setfont("HUDFONT");
919 922
         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 @@
9 9
 990 Scripting, Effects, Texturing,
10 10
 990 Additional Mapping
11 11
 999 Tribeam
12
-999 Willo - For custom Artwork
12
+000
13
+990 Artwork
14
+999 Willo
13 15
 000 
14 16
 990 VR Map Design
15 17
 999 Fiendzy

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


Loading…
Cancel
Save