Merge branch 'master' into srb2-extras-rendering

This commit is contained in:
spherallic 2023-06-01 18:16:42 +02:00
commit 93692dbe11

View file

@ -819,7 +819,7 @@ udmf
bosses
{
color = 8; // Dark_Gray
color = 4; // Dark Red
arrow = 1;
title = "Bosses";
@ -1216,79 +1216,79 @@ udmf
301
{
title = "Bounce Ring";
sprite = "internal:RNGBA0";
sprite = "RNGBA0";
}
302
{
title = "Rail Ring";
sprite = "internal:RNGRA0";
sprite = "RNGRA0";
}
303
{
title = "Infinity Ring";
sprite = "internal:RNGIA0";
sprite = "RNGIA0";
}
304
{
title = "Automatic Ring";
sprite = "internal:RNGAA0";
sprite = "RNGAA0";
}
305
{
title = "Explosion Ring";
sprite = "internal:RNGEA0";
sprite = "RNGEA0";
}
306
{
title = "Scatter Ring";
sprite = "internal:RNGSA0";
sprite = "RNGSA0";
}
307
{
title = "Grenade Ring";
sprite = "internal:RNGGA0";
sprite = "RNGGA0";
}
308
{
title = "CTF Team Ring (Red)";
sprite = "internal:RRNGA0";
sprite = "internal:TRNGA0R";
width = 16;
}
309
{
title = "CTF Team Ring (Blue)";
sprite = "internal:BRNGA0";
sprite = "internal:TRNGA0B";
width = 16;
}
330
{
title = "Bounce Ring Panel";
sprite = "internal:PIKBA0";
sprite = "PIKBA0";
}
331
{
title = "Rail Ring Panel";
sprite = "internal:PIKRA0";
sprite = "PIKRA0";
}
332
{
title = "Automatic Ring Panel";
sprite = "internal:PIKAA0";
sprite = "PIKAA0";
}
333
{
title = "Explosion Ring Panel";
sprite = "internal:PIKEA0";
sprite = "PIKEA0";
}
334
{
title = "Scatter Ring Panel";
sprite = "internal:PIKSA0";
sprite = "PIKSA0";
}
335
{
title = "Grenade Ring Panel";
sprite = "internal:PIKGA0";
sprite = "PIKGA0";
}
}
@ -2080,13 +2080,13 @@ udmf
{
arrow = 0;
title = "5 Vertical Rings (Yellow Spring)";
sprite = "RINGA0";
sprite = "internal:ringverticalyellow";
}
601
{
arrow = 0;
title = "5 Vertical Rings (Red Spring)";
sprite = "RINGA0";
sprite = "internal:ringverticalred";
height = 1024;
}
602
@ -2104,40 +2104,40 @@ udmf
604
{
title = "Circle of Rings";
sprite = "RINGA0";
sprite = "internal:circlering";
width = 96;
height = 192;
}
605
{
title = "Circle of Rings (Big)";
sprite = "RINGA0";
sprite = "internal:circlebigring";
width = 192;
}
606
{
title = "Circle of Blue Spheres";
sprite = "SPHRA0";
sprite = "internal:circlesphere";
width = 96;
height = 192;
}
607
{
title = "Circle of Blue Spheres (Big)";
sprite = "SPHRA0";
sprite = "internal:circlebigsphere";
width = 192;
}
608
{
title = "Circle of Rings and Spheres";
sprite = "SPHRA0";
sprite = "internal:circleringsphere";
width = 96;
height = 192;
}
609
{
title = "Circle of Rings and Spheres (Big)";
sprite = "SPHRA0";
sprite = "internal:circlebigringsphere";
width = 192;
}
610
@ -2274,7 +2274,7 @@ udmf
756
{
title = "Blast Linedef Executor";
sprite = "TOADA0";
sprite = "internal:blastexec";
width = 32;
height = 16;
arg0
@ -2286,7 +2286,7 @@ udmf
757
{
title = "Fan Particle Generator";
sprite = "PRTLA0";
sprite = "internal:fanparticles";
width = 8;
height = 16;
arg0
@ -2359,7 +2359,7 @@ udmf
greenflower
{
color = 10; // Green
color = 2; // Green
title = "Greenflower";
800
@ -2464,7 +2464,7 @@ udmf
technohill
{
color = 10; // Green
color = 2; // Green
title = "Techno Hill";
900
@ -2508,7 +2508,7 @@ udmf
deepsea
{
color = 10; // Green
color = 2; // Green
title = "Deep Sea";
1000
@ -2668,7 +2668,7 @@ udmf
castleeggman
{
color = 10; // Green
color = 2; // Green
title = "Castle Eggman";
1100
@ -3231,7 +3231,7 @@ udmf
aridcanyon
{
color = 10; // Green
color = 2; // Green
title = "Arid Canyon";
1200
@ -3489,7 +3489,7 @@ udmf
redvolcano
{
color = 10; // Green
color = 2; // Green
title = "Red Volcano";
1300
@ -3634,7 +3634,7 @@ udmf
botanicserenity
{
color = 10; // Green
color = 2; // Green
title = "Botanic Serenity";
width = 16;
height = 32;
@ -3877,7 +3877,7 @@ udmf
azuretemple
{
color = 10; // Green
color = 2; // Green
title = "Azure Temple";
1500
@ -3989,7 +3989,7 @@ udmf
dreamhill
{
color = 10; // Green
color = 2; // Green
title = "Dream Hill";
1600
@ -4023,8 +4023,8 @@ udmf
nightstrk
{
color = 13; // Pink
title = "NiGHTS Track";
color = 16; // Light Pink
title = "NiGHTS Track & Basics";
width = 8;
height = 4096;
sprite = "UNKNA0";
@ -4083,30 +4083,6 @@ udmf
title = "Order";
}
}
1710
{
title = "Ideya Capture";
sprite = "CAPSA0";
width = 72;
height = 144;
arg0
{
title = "Mare";
}
arg1
{
title = "Required spheres";
}
}
}
nights
{
color = 13; // Pink
title = "NiGHTS Items";
width = 16;
height = 32;
1703
{
title = "Ideya Drone";
@ -4144,6 +4120,30 @@ udmf
enum = "noyes";
}
}
1710
{
title = "Ideya Capture";
sprite = "CAPSA0";
width = 72;
height = 144;
arg0
{
title = "Mare";
}
arg1
{
title = "Required spheres";
}
}
}
nights
{
color = 13; // Pink
title = "NiGHTS Items";
width = 16;
height = 32;
1704
{
arrow = 1;
@ -4244,7 +4244,7 @@ udmf
{
arrow = 1;
title = "Hoop";
sprite = "HOOPA0";
sprite = "internal:nightshoop";
width = 80;
height = 160;
arg0
@ -4373,7 +4373,7 @@ udmf
christmasdisco
{
color = 10; // Green
color = 2; // Green
title = "Christmas & Disco";
1850
@ -4488,7 +4488,7 @@ udmf
stalagmites
{
color = 10; // Green
color = 2; // Green
title = "Stalagmites";
width = 16;
height = 40;
@ -4567,7 +4567,7 @@ udmf
hauntedheights
{
color = 10; // Green
color = 2; // Green
title = "Haunted Heights";
2000
@ -4673,7 +4673,7 @@ udmf
frozenhillside
{
color = 10; // Green
color = 2; // Green
title = "Frozen Hillside";
2100
@ -4728,7 +4728,7 @@ udmf
tutorial
{
color = 10; // Green
color = 2; // Green
title = "Tutorial";
799
@ -4746,7 +4746,7 @@ udmf
flickies
{
color = 10; // Green
color = 2; // Green
title = "Flickies";
width = 8;
height = 20;