From: Mario Date: Sun, 15 Nov 2015 17:36:57 +0000 (+1000) Subject: Clean up both levels a little X-Git-Tag: xonotic-v0.8.2~1654^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4865330e1ec323c2b36c713e44ce656004d5d1f3;p=xonotic%2Fxonotic-data.pk3dir.git Clean up both levels a little --- diff --git a/minigames/bulldozer/storage_level1.txt b/minigames/bulldozer/storage_level1.txt index b70b67122..35d48d696 100644 --- a/minigames/bulldozer/storage_level1.txt +++ b/minigames/bulldozer/storage_level1.txt @@ -1,5 +1,6 @@ -// bulldozer storage "level1" last updated 16-11-2015 03:09:03 -nextlevel=vel2 +// bulldozer storage "level1" last updated 16-11-2015 03:11:33 +nextlevel = "level2" +"k11" 1 "0 0 0" ; "a20" 6 "0 0 0" ; "a19" 6 "0 0 0" ; "a18" 6 "0 0 0" ; @@ -156,7 +157,6 @@ nextlevel=vel2 "p15" 6 "0 0 0" ; "p14" 6 "0 0 0" ; "l11" 5 "0 0 0" ; -"k11" 1 "0 0 0" ; "h11" 2 "0 0 0" ; "k9" 2 "0 0 0" ; "j14" 2 "0 0 0" ; diff --git a/minigames/bulldozer/storage_level2.txt b/minigames/bulldozer/storage_level2.txt index adec0fd24..8bf9d44cc 100644 --- a/minigames/bulldozer/storage_level2.txt +++ b/minigames/bulldozer/storage_level2.txt @@ -1,23 +1,37 @@ -// bulldozer storage "level2" last updated 16-11-2015 00:39:35 -nextlevel=level2 +// bulldozer storage "level2" last updated 16-11-2015 03:34:13 +nextlevel = "level2" "a20" 4 "0 0 0" ; "b20" 4 "0 0 0" ; "c20" 4 "0 0 0" ; "d20" 4 "0 0 0" ; "e20" 4 "0 0 0" ; +"r13" 5 "0 0 0" ; "f20" 4 "0 0 0" ; "g20" 4 "0 0 0" ; +"c12" 5 "0 0 0" ; "h20" 4 "0 0 0" ; +"c13" 5 "0 0 0" ; "i20" 4 "0 0 0" ; +"c14" 5 "0 0 0" ; "j20" 4 "0 0 0" ; +"c15" 5 "0 0 0" ; "k20" 4 "0 0 0" ; +"c16" 5 "0 0 0" ; "l20" 4 "0 0 0" ; +"c17" 5 "0 0 0" ; "m20" 4 "0 0 0" ; +"c18" 5 "0 0 0" ; "n20" 4 "0 0 0" ; +"c19" 5 "0 0 0" ; "o20" 4 "0 0 0" ; +"r18" 5 "0 0 0" ; "p20" 4 "0 0 0" ; +"r17" 5 "0 0 0" ; "q20" 4 "0 0 0" ; +"r12" 5 "0 0 0" ; "r20" 4 "0 0 0" ; +"r15" 5 "0 0 0" ; +"r14" 5 "0 0 0" ; "s20" 4 "0 0 0" ; "t20" 4 "0 0 0" ; "t19" 4 "0 0 0" ; @@ -66,19 +80,19 @@ nextlevel=level2 "t2" 4 "0 0 0" ; "l5" 4 "0 0 0" ; "j6" 4 "0 0 0" ; -"c19" 4 "0 0 0" ; +"r11" 5 "0 0 0" ; "r6" 4 "0 0 0" ; -"c18" 4 "0 0 0" ; -"c17" 4 "0 0 0" ; +"r10" 5 "0 0 0" ; +"b7" 5 "0 0 0" ; "i6" 4 "0 0 0" ; -"c7" 4 "0 0 0" ; -"c16" 4 "0 0 0" ; -"c15" 4 "0 0 0" ; -"c14" 4 "0 0 0" ; -"c13" 4 "0 0 0" ; +"a7" 5 "0 0 0" ; +"a2" 4 "0 0 0" ; +"c4" 5 "0 0 0" ; +"b8" 4 "0 0 0" ; +"a6" 5 "0 0 0" ; "o6" 4 "0 0 0" ; "p6" 4 "0 0 0" ; -"c12" 4 "0 0 0" ; +"a5" 5 "0 0 0" ; "l7" 4 "0 0 0" ; "l6" 4 "0 0 0" ; "t6" 4 "0 0 0" ; @@ -92,20 +106,20 @@ nextlevel=level2 "g16" 3 "0 0 0" ; "g12" 3 "0 0 0" ; "l3" 4 "0 0 0" ; -"b6" 4 "0 0 0" ; +"b3" 5 "0 0 0" ; "i5" 4 "0 0 0" ; -"b5" 4 "0 0 0" ; -"r10" 4 "0 0 0" ; -"b4" 4 "0 0 0" ; -"r12" 4 "0 0 0" ; -"r11" 4 "0 0 0" ; -"r13" 4 "0 0 0" ; +"c8" 4 "0 0 0" ; +"c5" 5 "0 0 0" ; +"c6" 5 "0 0 0" ; +"a4" 5 "0 0 0" ; +"a3" 5 "0 0 0" ; +"a8" 4 "0 0 0" ; "c3" 4 "0 0 0" ; -"r14" 4 "0 0 0" ; -"r15" 4 "0 0 0" ; +"c7" 4 "0 0 0" ; +"k6" 5 "0 0 0" ; "d6" 4 "0 0 0" ; -"r17" 4 "0 0 0" ; -"r18" 4 "0 0 0" ; +"e7" 5 "0 0 0" ; +"e6" 5 "0 0 0" ; "s10" 2 "0 0 0" ; "d5" 4 "0 0 0" ; "s11" 2 "0 0 0" ; @@ -128,7 +142,7 @@ nextlevel=level2 "d3" 4 "0 0 0" ; "o5" 4 "0 0 0" ; "n4" 4 "0 0 0" ; -"a2" 4 "0 0 0" ; +"e5" 5 "0 0 0" ; "b2" 4 "0 0 0" ; "c2" 4 "0 0 0" ; "d2" 4 "0 0 0" ; @@ -172,9 +186,9 @@ nextlevel=level2 "p7" 4 "0 0 0" ; "d7" 4 "0 0 0" ; "r3" 4 "0 0 0" ; -"c8" 4 "0 0 0" ; -"b8" 4 "0 0 0" ; -"a8" 4 "0 0 0" ; +"e4" 5 "0 0 0" ; +"e3" 5 "0 0 0" ; +"f3" 5 "0 0 0" ; "d8" 4 "0 0 0" ; "e8" 4 "0 0 0" ; "f8" 4 "0 0 0" ; @@ -192,3 +206,42 @@ nextlevel=level2 "r8" 4 "0 0 0" ; "s8" 4 "0 0 0" ; "t8" 4 "0 0 0" ; +"g3" 5 "0 0 0" ; +"g7" 5 "0 0 0" ; +"g4" 5 "0 0 0" ; +"g6" 5 "0 0 0" ; +"g5" 5 "0 0 0" ; +"f7" 5 "0 0 0" ; +"j5" 5 "0 0 0" ; +"i7" 5 "0 0 0" ; +"j7" 5 "0 0 0" ; +"k7" 5 "0 0 0" ; +"i4" 5 "0 0 0" ; +"i3" 5 "0 0 0" ; +"j3" 5 "0 0 0" ; +"k3" 5 "0 0 0" ; +"m7" 5 "0 0 0" ; +"m6" 5 "0 0 0" ; +"m4" 5 "0 0 0" ; +"m5" 5 "0 0 0" ; +"m3" 5 "0 0 0" ; +"n3" 5 "0 0 0" ; +"o3" 5 "0 0 0" ; +"n5" 5 "0 0 0" ; +"n7" 5 "0 0 0" ; +"o7" 5 "0 0 0" ; +"q7" 5 "0 0 0" ; +"q6" 5 "0 0 0" ; +"q4" 5 "0 0 0" ; +"q5" 5 "0 0 0" ; +"q3" 5 "0 0 0" ; +"r5" 5 "0 0 0" ; +"r4" 5 "0 0 0" ; +"s3" 5 "0 0 0" ; +"s5" 5 "0 0 0" ; +"s6" 5 "0 0 0" ; +"s7" 5 "0 0 0" ; +"r7" 5 "0 0 0" ; +"b6" 4 "0 0 0" ; +"b5" 4 "0 0 0" ; +"b4" 4 "0 0 0" ; diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc index c024654c3..3d36b492c 100644 --- a/qcsrc/common/minigames/minigame/bd.qc +++ b/qcsrc/common/minigames/minigame/bd.qc @@ -374,10 +374,10 @@ string bd_save_piece(entity minigame, entity e) void bd_set_nextlevel(entity minigame, string s) { - string blah = substring(s, 11, strlen(s)); + tokenize_console(s); if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); } - minigame.bd_nextlevel = strzone(blah); + minigame.bd_nextlevel = strzone(argv(2)); } entity bd_load_piece(entity minigame, string s) @@ -413,8 +413,8 @@ bool bd_save_level(entity minigame) file_get = fopen(file_name, FILE_WRITE); fputs(file_get, strcat("// bulldozer storage \"", minigame.bd_levelname, "\" last updated ", strftime(true, "%d-%m-%Y %H:%M:%S"), "\n")); - if(minigame.bd_nextlevel && minigame.bd_nextlevel != "" && fexists(strcat("minigames/bulldozer/storage_", minigame.bd_levelname, ".txt"))) - fputs(file_get, strcat("nextlevel=", minigame.bd_nextlevel, "\n")); + if(minigame.bd_nextlevel && minigame.bd_nextlevel != "" && fexists(strcat("minigames/bulldozer/storage_", minigame.bd_nextlevel, ".txt"))) + fputs(file_get, strcat("nextlevel = \"", minigame.bd_nextlevel, "\"\n")); entity e = world; while ( ( e = findentity(e,owner,minigame) ) ) @@ -454,7 +454,7 @@ void bd_load_level(entity minigame) continue; if(substring(file_read, 0, 1) == "#") continue; - if(substring(file_read, 0, 10) == "nextlevel=") + if(substring(file_read, 0, 9) == "nextlevel") { bd_set_nextlevel(minigame, file_read); continue;