map and code changes

This commit is contained in:
q3rally 2020-07-11 21:34:27 +00:00
parent 870aa81d53
commit a1f51691c2
6 changed files with 87 additions and 79 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -5,12 +5,12 @@
"ambient" "300"
// brush 0
{
( 5760 788 -28 ) ( 5760 788 -32 ) ( 5760 692 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5248 668 -28 ) ( 5248 668 -32 ) ( 5248 764 -32 ) base_wall/basewall03 256 128 -0 0.5 0.5 0 0 0
( 5288 1060 -28 ) ( 5288 1060 -32 ) ( 5384 1060 -32 ) base_wall/basewall03 128 128 -0 0.5 0.5 0 0 0
( 5440 548 -28 ) ( 5440 548 -32 ) ( 5344 548 -32 ) base_wall/basewall03 192 128 0 0.5 0.5 0 0 0
( 5408 676 -32 ) ( 5408 772 -32 ) ( 5312 772 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0
( 5408 768 32 ) ( 5408 672 32 ) ( 5312 672 32 ) base_wall2/techfloor_kc_blue 384 36 0 1 1 0 0 0
( 4608 752 -28 ) ( 4608 752 -32 ) ( 4608 656 -32 ) base_trim/yellow_rustb 36 32 0 1 1 0 0 0
( 4096 632 -28 ) ( 4096 632 -32 ) ( 4096 728 -32 ) base_wall/basewall03 328 128 0 0.5 0.5 0 0 0
( 4136 1024 -28 ) ( 4136 1024 -32 ) ( 4232 1024 -32 ) base_wall/basewall03 384 128 0 0.5 0.5 0 0 0
( 4288 512 -28 ) ( 4288 512 -32 ) ( 4192 512 -32 ) base_wall/basewall03 448 128 0 0.5 0.5 0 0 0
( 4256 640 -32 ) ( 4256 736 -32 ) ( 4160 736 -32 ) common/WTF 0 48 0 0.25 0.25 0 0 0
( 4256 732 32 ) ( 4256 636 32 ) ( 4160 636 32 ) base_wall2/techfloor_kc_blue 0 0 0 1 1 0 0 0
}
// brush 1
{
@ -158,44 +158,44 @@
}
// brush 17
{
( 5760 548 32 ) ( 5248 36 -32 ) ( 5248 548 32 ) q3r_metals/rustblumet01 192 18 0 2 2 0 0 0
( 5760 32 32 ) ( 5760 496 32 ) ( 5760 32 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5562 500 -32 ) ( 5562 36 -32 ) ( 5686 500 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 5248 548 32 ) ( 5248 36 -32 ) ( 5248 548 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5556 548 -32 ) ( 5680 548 -32 ) ( 5556 548 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 4608 512 32 ) ( 4096 0 -32 ) ( 4096 512 32 ) q3r_metals/rustblumet01 0 0 0 2 2 0 0 0
( 4608 -4 32 ) ( 4608 460 32 ) ( 4608 -4 -32 ) base_trim/yellow_rustb 36 32 0 1 1 0 0 0
( 4410 464 -32 ) ( 4410 0 -32 ) ( 4534 464 -32 ) q3r_metals/Rost 0 184 0 0.5 0.5 0 0 0
( 4096 512 32 ) ( 4096 0 -32 ) ( 4096 512 -32 ) base_trim/yellow_rustb 36 32 0 1 1 0 0 0
( 4404 512 -32 ) ( 4528 512 -32 ) ( 4404 512 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
}
// brush 18
{
( 5248 548 32 ) ( 4736 1060 -32 ) ( 5248 1060 32 ) q3r_metals/rustblumet01 192 18 0 2 2 0 0 0
( 4732 548 32 ) ( 5196 548 32 ) ( 4732 548 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5200 746 -32 ) ( 4736 746 -32 ) ( 5200 622 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 5248 1060 32 ) ( 4736 1060 -32 ) ( 5248 1060 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5248 752 -32 ) ( 5248 628 -32 ) ( 5248 752 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 4096 512 32 ) ( 3584 1024 -32 ) ( 4096 1024 32 ) q3r_metals/rustblumet01 0 0 0 2 2 0 0 0
( 3580 512 32 ) ( 4044 512 32 ) ( 3580 512 -32 ) base_trim/yellow_rustb 128 32 0 1 1 0 0 0
( 4048 710 -32 ) ( 3584 710 -32 ) ( 4048 586 -32 ) q3r_metals/Rost 0 184 0 0.5 0.5 0 0 0
( 4096 1024 32 ) ( 3584 1024 -32 ) ( 4096 1024 -32 ) base_trim/yellow_rustb 128 32 0 1 1 0 0 0
( 4096 716 -32 ) ( 4096 592 -32 ) ( 4096 716 32 ) q3r_metals/Rost 72 0 0 0.5 0.5 0 0 0
}
// brush 19
{
( 5248 1060 32 ) ( 5760 1572 -32 ) ( 5760 1060 32 ) q3r_metals/rustblumet01 192 18 0 2 2 0 0 0
( 5248 1576 32 ) ( 5248 1112 32 ) ( 5248 1576 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5446 1108 -32 ) ( 5446 1572 -32 ) ( 5322 1108 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 5760 1060 32 ) ( 5760 1572 -32 ) ( 5760 1060 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( 5452 1060 -32 ) ( 5328 1060 -32 ) ( 5452 1060 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( 4096 1024 32 ) ( 4608 1536 -32 ) ( 4608 1024 32 ) q3r_metals/rustblumet01 0 0 0 2 2 0 0 0
( 4096 1540 32 ) ( 4096 1076 32 ) ( 4096 1540 -32 ) base_trim/yellow_rustb 36 32 0 1 1 0 0 0
( 4294 1072 -32 ) ( 4294 1536 -32 ) ( 4170 1072 -32 ) q3r_metals/Rost 0 184 0 0.5 0.5 0 0 0
( 4608 1024 32 ) ( 4608 1536 -32 ) ( 4608 1024 -32 ) base_trim/yellow_rustb 36 32 0 1 1 0 0 0
( 4300 1024 -32 ) ( 4176 1024 -32 ) ( 4300 1024 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
}
// brush 20
{
( -2048 784 -28 ) ( -2048 784 -32 ) ( -2048 880 -32 ) base_trim/yellow_rustb -0 32 0 1 1 0 0 0
( -1536 904 -28 ) ( -1536 904 -32 ) ( -1536 808 -32 ) base_wall/basewall03 256 128 -0 0.5 0.5 0 0 0
( -1576 512 -28 ) ( -1576 512 -32 ) ( -1672 512 -32 ) base_wall/basewall03 128 128 -0 0.5 0.5 0 0 0
( -1728 1024 -28 ) ( -1728 1024 -32 ) ( -1632 1024 -32 ) base_wall/basewall03 192 128 0 0.5 0.5 0 0 0
( -1696 896 -32 ) ( -1696 800 -32 ) ( -1600 800 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0
( -1696 804 32 ) ( -1696 900 32 ) ( -1600 900 32 ) base_wall2/techfloor_kc 0 0 0 1 1 0 0 0
( -1024 784 -28 ) ( -1024 784 -32 ) ( -1024 880 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -512 904 -28 ) ( -512 904 -32 ) ( -512 808 -32 ) base_wall/basewall03 256 128 0 0.5 0.5 0 0 0
( -552 512 -28 ) ( -552 512 -32 ) ( -648 512 -32 ) base_wall/basewall03 128 128 0 0.5 0.5 0 0 0
( -704 1024 -28 ) ( -704 1024 -32 ) ( -608 1024 -32 ) base_wall/basewall03 192 128 0 0.5 0.5 0 0 0
( -672 896 -32 ) ( -672 800 -32 ) ( -576 800 -32 ) common/WTF -0 0 0 0.25 0.25 0 0 0
( -672 804 32 ) ( -672 900 32 ) ( -576 900 32 ) base_wall2/techfloor_kc -0 0 0 1 1 0 0 0
}
// brush 21
{
( -2048 1024 32 ) ( -1536 1536 -32 ) ( -1536 1024 32 ) q3r_metals/Rost 0 0 0 2 2 0 0 0
( -2048 1540 32 ) ( -2048 1076 32 ) ( -2048 1540 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1850 1072 -32 ) ( -1850 1536 -32 ) ( -1974 1072 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -1536 1024 32 ) ( -1536 1536 -32 ) ( -1536 1024 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1844 1024 -32 ) ( -1968 1024 -32 ) ( -1844 1024 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -1024 1024 32 ) ( -512 1536 -32 ) ( -512 1024 32 ) q3r_metals/Rost -0 0 0 2 2 0 0 0
( -1024 1540 32 ) ( -1024 1076 32 ) ( -1024 1540 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -826 1072 -32 ) ( -826 1536 -32 ) ( -950 1072 -32 ) q3r_metals/Rost -0 0 0 0.5 0.5 0 0 0
( -512 1024 32 ) ( -512 1536 -32 ) ( -512 1024 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -820 1024 -32 ) ( -944 1024 -32 ) ( -820 1024 32 ) q3r_metals/Rost -0 0 0 0.5 0.5 0 0 0
}
// brush 22
{
@ -280,19 +280,19 @@
}
// brush 31
{
( -1536 512 32 ) ( -2048 0 -32 ) ( -2048 512 32 ) q3r_metals/Rost 0 0 0 2 2 0 0 0
( -1536 -4 32 ) ( -1536 460 32 ) ( -1536 -4 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1734 464 -32 ) ( -1734 0 -32 ) ( -1610 464 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -2048 512 32 ) ( -2048 0 -32 ) ( -2048 512 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1740 512 -32 ) ( -1616 512 -32 ) ( -1740 512 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -512 512 32 ) ( -1024 0 -32 ) ( -1024 512 32 ) q3r_metals/Rost -0 0 0 2 2 0 0 0
( -512 -4 32 ) ( -512 460 32 ) ( -512 -4 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -710 464 -32 ) ( -710 0 -32 ) ( -586 464 -32 ) q3r_metals/Rost -0 0 0 0.5 0.5 0 0 0
( -1024 512 32 ) ( -1024 0 -32 ) ( -1024 512 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -716 512 -32 ) ( -592 512 -32 ) ( -716 512 32 ) q3r_metals/Rost -0 0 0 0.5 0.5 0 0 0
}
// brush 32
{
( -1536 1024 32 ) ( -1024 512 -32 ) ( -1536 512 32 ) q3r_metals/Rost 0 0 0 2 2 0 0 0
( -1020 1024 32 ) ( -1484 1024 32 ) ( -1020 1024 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1488 826 -32 ) ( -1024 826 -32 ) ( -1488 950 -32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -1536 512 32 ) ( -1024 512 -32 ) ( -1536 512 -32 ) base_trim/yellow_rustb 0 32 0 1 1 0 0 0
( -1536 820 -32 ) ( -1536 944 -32 ) ( -1536 820 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
( -512 1024 32 ) ( 0 512 -32 ) ( -512 512 32 ) q3r_metals/Rost -0 0 0 2 2 0 0 0
( 4 1024 32 ) ( -460 1024 32 ) ( 4 1024 -32 ) base_trim/yellow_rustb -0 32 0 1 1 0 0 0
( -464 826 -32 ) ( 0 826 -32 ) ( -464 950 -32 ) q3r_metals/Rost -0 0 0 0.5 0.5 0 0 0
( -512 512 32 ) ( 0 512 -32 ) ( -512 512 -32 ) base_trim/yellow_rustb -0 32 0 1 1 0 0 0
( -512 820 -32 ) ( -512 944 -32 ) ( -512 820 32 ) q3r_metals/Rost 0 0 0 0.5 0.5 0 0 0
}
// brush 33
{
@ -891,6 +891,22 @@ base_trim/rusty_pewter_big
( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0
( -2100 -1016 -528 ) ( -2448 -1016 864 ) ( -2100 -1016 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0
}
// brush 82
{
( -1024 512 32 ) ( -1536 1024 -32 ) ( -1024 1024 32 ) q3r_metals/Rost 0 0 180 2 2 0 0 0
( -1540 512 32 ) ( -1076 512 32 ) ( -1540 512 -32 ) base_trim/yellow_rustb 0 32 0 -1 1 0 0 0
( -1072 710 -32 ) ( -1536 710 -32 ) ( -1072 586 -32 ) q3r_metals/Rost 0 0 180 0.5 0.5 0 0 0
( -1024 1024 32 ) ( -1536 1024 -32 ) ( -1024 1024 -32 ) base_trim/yellow_rustb 0 32 0 -1 1 0 0 0
( -1024 716 -32 ) ( -1024 592 -32 ) ( -1024 716 32 ) q3r_metals/Rost 0 0 0 -0.5 0.5 0 0 0
}
// brush 83
{
( 4608 1024 32 ) ( 5120 512 -32 ) ( 4608 512 32 ) q3r_metals/rustblumet01 0 -0 180 2 2 0 0 0
( 5124 1024 32 ) ( 4660 1024 32 ) ( 5124 1024 -32 ) base_trim/yellow_rustb 128 32 0 -1 1 0 0 0
( 4656 826 -32 ) ( 5120 826 -32 ) ( 4656 950 -32 ) q3r_metals/Rost 0 184 180 0.5 0.5 0 0 0
( 4608 512 32 ) ( 5120 512 -32 ) ( 4608 512 -32 ) base_trim/yellow_rustb 128 32 0 -1 1 0 0 0
( 4608 820 -32 ) ( 4608 944 -32 ) ( 4608 820 32 ) q3r_metals/Rost 72 0 0 -0.5 0.5 0 0 0
}
}
// entity 1
{
@ -967,49 +983,42 @@ base_trim/rusty_pewter_big
// entity 13
{
"classname" "team_CTF_redflag"
"origin" "-1792 768 52"
"angle" "360"
"origin" "-768.000000 768.000000 52.000000"
}
// entity 14
{
"classname" "team_CTF_redplayer"
"origin" "-1792 196 26"
"angle" "360"
"origin" "-768.000000 196.000000 26.000000"
}
// entity 15
{
"classname" "team_CTF_redplayer"
"origin" "-1792 -92 -4"
"angle" "360"
"origin" "-768.000000 -92.000000 -4.000000"
}
// entity 16
{
"classname" "team_CTF_redplayer"
"origin" "-1792 -448 -4"
"angle" "360"
"origin" "-768.000000 -448.000000 -4.000000"
}
// entity 17
{
"classname" "team_CTF_redplayer"
"origin" "-1664 768 72"
"angle" "360"
"origin" "-944.000000 768.000000 72.000000"
}
// entity 18
{
"classname" "team_CTF_redplayer"
"origin" "-1792 1700 -4"
"angle" "360"
"origin" "-768.000000 1700.000000 -4.000000"
}
// entity 19
{
"classname" "team_CTF_redplayer"
"origin" "-1792 1984 -4"
"angle" "360"
"origin" "-768.000000 1984.000000 -4.000000"
}
// entity 20
{
"classname" "light"
"origin" "-1644 640 64"
"origin" "-620.000000 640.000000 64.000000"
"light" "300"
"_color" "1 0 0"
}
@ -1022,8 +1031,7 @@ base_trim/rusty_pewter_big
// entity 22
{
"classname" "team_CTF_redplayer"
"origin" "-1792 1348 26"
"angle" "360"
"origin" "-768.000000 1348.000000 26.000000"
}
// entity 23
{
@ -1070,7 +1078,7 @@ base_trim/rusty_pewter_big
// entity 30
{
"classname" "light"
"origin" "-1644 896 64"
"origin" "-620.000000 896.000000 64.000000"
"light" "300"
"_color" "1 0 0"
}
@ -1185,50 +1193,50 @@ base_trim/rusty_pewter_big
// entity 51
{
"classname" "team_CTF_blueplayer"
"origin" "5504 1376 26"
"angle" "180"
"origin" "4352.000000 1340.000000 26.000000"
"angle" "-179.999985"
}
// entity 52
{
"classname" "team_CTF_blueplayer"
"origin" "5504 1664 -4"
"angle" "180"
"origin" "4352.000000 1628.000000 -4.000000"
"angle" "-179.999985"
}
// entity 53
{
"classname" "team_CTF_blueplayer"
"origin" "5504 2020 -4"
"angle" "180"
"origin" "4352.000000 1984.000000 -4.000000"
"angle" "-179.999985"
}
// entity 54
{
"classname" "team_CTF_blueplayer"
"origin" "5376 804 72"
"angle" "180"
"origin" "4544.000000 768.000000 72.000000"
"angle" "-179.999985"
}
// entity 55
{
"classname" "team_CTF_blueplayer"
"origin" "5504 -128 -4"
"angle" "180"
"origin" "4352.000000 -164.000000 -4.000000"
"angle" "-179.999985"
}
// entity 56
{
"classname" "team_CTF_blueplayer"
"origin" "5504 -412 -4"
"angle" "180"
"origin" "4352.000000 -448.000000 -4.000000"
"angle" "-179.999985"
}
// entity 57
{
"classname" "team_CTF_blueplayer"
"origin" "5504 224 26"
"angle" "180"
"origin" "4352.000000 188.000000 26.000000"
"angle" "-179.999985"
}
// entity 58
{
"classname" "team_CTF_blueflag"
"origin" "5504 804 52"
"angle" "180"
"origin" "4352.000000 768.000000 52.000000"
"angle" "180.000000"
}
// entity 59
{

View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack"
#ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.2.8_r274"
#define PRODUCT_VERSION "v0.0.2.9_r280"
#endif

View file

@ -875,7 +875,7 @@ q3rallycode
14=engine\code\q3_ui\ui_rally_credits.c
[Selected Project Files]
Main=
Selected=engine\Makefile
Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\files.c]
TopLine=183
Caret=129,192
@ -886,7 +886,7 @@ Caret=39,70
TopLine=100
Caret=17,114
[engine\code\q3_ui\ui_rally_startserver.c]
TopLine=1250
TopLine=1224
Caret=22,1254
[engine\code\cgame\cg_local.h]
TopLine=2061