Преглед на файлове

last mods before 1st residency

Etienne Landon преди 8 години
родител
ревизия
8a8cf6d9b9
променени са 4 файла, в които са добавени 176 реда и са изтрити 136 реда
  1. 16 12
      chat.pd
  2. 34 32
      chat.presets
  3. 125 91
      interface.pd
  4. 1 1
      kpof

+ 16 - 12
chat.pd

@@ -1,4 +1,4 @@
-#N canvas 473 171 1143 865 10;
+#N canvas 469 174 1143 865 10;
 #X declare -path kollabs;
 #X declare -path kollabs;
 #X declare -path pof-hdmi -lib pof -path kpof;
@@ -26,8 +26,8 @@
 #X obj 56 12 declare -path pof-hdmi -lib pof -path kpof;
 #X obj 583 288 r /osc/0/out;
 #X obj 583 380 netsend;
-#X msg 657 373 connect localhost 9000;
-#X obj 657 329 loadbang;
+#X msg 657 353 connect localhost 9000;
+#X obj 674 407 loadbang;
 #X obj 582 483 netreceive 9001;
 #X obj 792 681 s /osc/0/in;
 #X obj 583 310 list prepend send;
@@ -168,7 +168,7 @@
 #X connect 1 2 4 0;
 #X connect 5 0 1 0;
 #X restore 583 677 pd scene;
-#N canvas 1107 73 687 535 bullet-img 0;
+#N canvas 1103 81 687 535 bullet-img 0;
 #X obj 132 82 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
 #X obj 228 165 + 1;
@@ -196,10 +196,10 @@
 #X msg 83 58 0;
 #X obj 121 111 spigot;
 #X obj 180 39 r /gpio;
-#X obj 180 61 route 1;
+#X obj 180 81 route 1;
 #X obj 103 25 == 1;
 #X text 148 19 visible only on scene1;
-#X obj 137 52 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 137 52 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 32 447 dac~;
 #X obj 31 420 *~ 1;
@@ -211,6 +211,7 @@
 #X msg 27 331 open ../media/gun_fire.wav \, 1;
 #X obj 364 361 loadbang;
 #X msg 364 382 \; pd dsp 1;
+#X obj 180 61 change;
 #X connect 0 0 22 0;
 #X connect 1 0 2 1;
 #X connect 2 0 1 0;
@@ -239,7 +240,7 @@
 #X connect 21 0 2 0;
 #X connect 22 0 2 0;
 #X connect 22 0 34 0;
-#X connect 23 0 24 0;
+#X connect 23 0 37 0;
 #X connect 24 0 0 0;
 #X connect 25 0 22 1;
 #X connect 25 0 27 0;
@@ -252,6 +253,7 @@
 #X connect 33 0 30 1;
 #X connect 34 0 31 0;
 #X connect 35 0 36 0;
+#X connect 37 0 24 0;
 #X coords 0 -1 1 1 120 20 1 30 80;
 #X restore 299 531 pd bullet-img;
 #X obj 583 402 == 0;
@@ -272,8 +274,9 @@
 #X msg 479 41 \; /ds/0/loadfile ../../chat.presets \; /ds/0/scene/current
 0 \; /kpofwin/fullscreen 1 \; /kpofwin/cursor 0 \; /kpof/testquad/pins
 0;
-#X obj 657 351 delay 5000;
 #X obj 756 588 i;
+#X obj 674 429 delay 1000;
+#X msg 674 451 1;
 #X connect 2 0 28 0;
 #X connect 3 0 46 0;
 #X connect 5 0 4 0;
@@ -288,7 +291,7 @@
 #X connect 18 0 32 0;
 #X connect 18 0 34 0;
 #X connect 19 0 18 0;
-#X connect 20 0 47 0;
+#X connect 20 0 48 0;
 #X connect 21 0 41 0;
 #X connect 23 0 24 0;
 #X connect 24 0 18 0;
@@ -297,7 +300,7 @@
 #X connect 33 0 19 0;
 #X connect 38 0 37 0;
 #X connect 40 0 44 0;
-#X connect 40 0 48 0;
+#X connect 40 0 47 0;
 #X connect 41 0 30 0;
 #X connect 41 1 39 0;
 #X connect 41 2 27 0;
@@ -307,5 +310,6 @@
 #X connect 41 6 42 0;
 #X connect 43 0 40 1;
 #X connect 45 0 40 0;
-#X connect 47 0 19 0;
-#X connect 48 0 35 0;
+#X connect 47 0 35 0;
+#X connect 48 0 49 0;
+#X connect 49 0 33 0;

+ 34 - 32
chat.presets

@@ -56,25 +56,25 @@
 # SETTINGS
 # TABLES
 # DATA
-/kpof/film1/media /home/pi/media/fingers.mov
 /kpofwin/background/B 4.32203
 /kpofwin/background/G 0
 /kpofwin/background/R 0
-/kpof/testquad/corner/top/left/x -152
-/kpof/testquad/corner/top/left/y -57
-/kpof/testquad/corner/top/right/x 63
+/kpof/testquad/corner/top/left/x -210.385
+/kpof/testquad/corner/top/left/y -176.77
+/kpof/testquad/corner/top/right/x 146
 /kpof/testquad/state 1
-/kpof/testquad/corner/bottom/left/y 121
-/kpof/testquad/corner/bottom/left/x -161
-/kpof/testquad/corner/bottom/right/y 74
-/kpof/testquad/corner/bottom/right/x 63
-/kpof/testquad/corner/top/right/y -89
+/kpof/testquad/corner/bottom/left/y 146.965
+/kpof/testquad/corner/bottom/left/x -187.34
+/kpof/testquad/corner/bottom/right/y 83.21
+/kpof/testquad/corner/bottom/right/x 97.955
+/kpof/testquad/corner/top/right/y -124.39
 /kpof/img1/img/file bullet_hole_PNG6050 png
 /kpof/img1/alpha 1
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
+/kpof/film1/media /home/pi/media/o_V3etoilesloop.avi
 /kpof/film1/goto 0
-/kpof/film1/speed 1
+/kpof/film1/speed 0
 /kpof/film1/play 1
 /kpof/film1/alpha 1
 /kpof/film1/state 1
@@ -86,25 +86,25 @@
 # SETTINGS
 # TABLES
 # DATA
-/kpof/film1/media /home/pi/media/Orion_SM_MSavi.avi
 /kpofwin/background/B 4.32203
 /kpofwin/background/G 0
 /kpofwin/background/R 0
 /kpof/testquad/corner/top/left/x -136
 /kpof/testquad/corner/top/left/y -113
-/kpof/testquad/corner/top/right/x -9
+/kpof/testquad/corner/top/right/x 107
 /kpof/testquad/state 1
-/kpof/testquad/corner/bottom/left/y 29
-/kpof/testquad/corner/bottom/left/x -42
-/kpof/testquad/corner/bottom/right/y 13
-/kpof/testquad/corner/bottom/right/x 0
-/kpof/testquad/corner/top/right/y -42
+/kpof/testquad/corner/bottom/left/y 30
+/kpof/testquad/corner/bottom/left/x -53
+/kpof/testquad/corner/bottom/right/y 49
+/kpof/testquad/corner/bottom/right/x 110
+/kpof/testquad/corner/top/right/y -163
 /kpof/img1/img/file bullet_hole_PNG6050 png
 /kpof/img1/alpha 1
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
+/kpof/film1/media /home/pi/media/gun_fire.wav
 /kpof/film1/goto 0
-/kpof/film1/speed 1
+/kpof/film1/speed 0
 /kpof/film1/play 1
 /kpof/film1/alpha 1
 /kpof/film1/state 1
@@ -221,7 +221,7 @@
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
 /kpof/film1/goto 363
-/kpof/film1/play 0
+/kpof/film1/play 1
 /kpof/film1/alpha 1
 /kpof/film1/media/file Orion_SM_MSavi_320x240_sound avi
 /kpof/film1/state 1
@@ -236,23 +236,24 @@
 /kpofwin/background/B 4.32203
 /kpofwin/background/G 0
 /kpofwin/background/R 0
-/kpof/testquad/corner/top/left/x -128.025
-/kpof/testquad/corner/top/left/y -63.555
-/kpof/testquad/corner/top/right/x 92.9425
+/kpof/testquad/corner/top/left/x -212
+/kpof/testquad/corner/top/left/y -180
+/kpof/testquad/corner/top/right/x 181
 /kpof/testquad/state 1
-/kpof/testquad/corner/bottom/left/y 108.24
-/kpof/testquad/corner/bottom/left/x -101.985
-/kpof/testquad/corner/bottom/right/y 101.115
-/kpof/testquad/corner/bottom/right/x 91.71
-/kpof/testquad/corner/top/right/y -115.77
+/kpof/testquad/corner/bottom/left/y 166.345
+/kpof/testquad/corner/bottom/left/x -184.11
+/kpof/testquad/corner/bottom/right/y 142.12
+/kpof/testquad/corner/bottom/right/x 146.965
+/kpof/testquad/corner/top/right/y -179
 /kpof/img1/img/file bullet_hole_PNG6050 png
 /kpof/img1/alpha 0.484848
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
+/kpof/film1/media /home/pi/media/o_V2etoilesloop.avi
 /kpof/film1/goto 363
-/kpof/film1/play 0
+/kpof/film1/speed 1
+/kpof/film1/play 1
 /kpof/film1/alpha 1
-/kpof/film1/media/file Orion_SM_MSavi_320x240_sound avi
 /kpof/film1/state 1
 /kpof/film1/fadetime 0
 ======================== SCENE 8 ========================
@@ -279,7 +280,7 @@
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
 /kpof/film1/goto 363
-/kpof/film1/play 0
+/kpof/film1/play 1
 /kpof/film1/alpha 1
 /kpof/film1/media/file Orion_SM_MSavi_320x240_sound avi
 /kpof/film1/state 1
@@ -307,9 +308,10 @@
 /kpof/img1/alpha 0.484848
 /kpof/img1/state 1
 /kpof/img1/fadetime 0
+/kpof/film1/media /home/pi/media/fingers.mov
 /kpof/film1/goto 363
-/kpof/film1/play 0
+/kpof/film1/speed 0
+/kpof/film1/play 1
 /kpof/film1/alpha 1
-/kpof/film1/media/file Orion_SM_MSavi_320x240_sound avi
 /kpof/film1/state 1
 /kpof/film1/fadetime 0

+ 125 - 91
interface.pd

@@ -1,4 +1,4 @@
-#N canvas 633 129 1064 886 10;
+#N canvas 834 184 1064 886 10;
 #X declare -path kollabs;
 #X declare -path kollabs;
 #X declare -path kollabs;
@@ -159,7 +159,7 @@
 #X connect 12 0 5 0;
 #X coords 0 -1 1 1 86 35 1 100 100;
 #X restore 60 329 pd lightmask;
-#N canvas 933 52 819 453 transport 1;
+#N canvas 925 81 819 453 transport 0;
 #X obj 87 18 inlet;
 #X obj 87 40 kpoftransform tr-transf UI;
 #X obj 87 95 t a a a a a;
@@ -194,7 +194,6 @@
 #X obj 461 48 loadbang;
 #X obj 56 12 declare -path pof-lcd -lib pof -path kpof;
 #X obj 552 632 netsend;
-#X obj 581 568 loadbang;
 #X msg 581 610 connect localhost 9001;
 #X obj 554 719 netreceive 9000;
 #X obj 507 589 print;
@@ -288,7 +287,7 @@
 #X connect 40 0 41 0;
 #X connect 41 0 0 0;
 #X restore 534 441 pd OSC-patch;
-#N canvas 317 97 1144 908 scene-settings 0;
+#N canvas 303 115 1144 908 scene-settings 0;
 #X obj 50 132 t a a a a;
 #X text 128 135 SCENE SETTINGS;
 #X obj 129 157 kpofUIpad cornersPad UI;
@@ -322,48 +321,48 @@
 #X obj 933 324 t l l;
 #X obj 933 274 list append;
 #X obj 1018 274 makefilename %c;
-#X obj 1045 253 loadbang;
+#X obj 1045 252 loadbang;
 #X msg 1018 252 10;
 #X obj 838 249 list split 1;
 #X obj 815 191 t b a b;
 #X obj 815 341 list;
 #X obj 838 215 t a a;
-#X obj 360 704 poftouch;
-#X obj 476 613 route size;
-#X obj 452 770 div 36;
-#X floatatom 520 771 5 0 0 0 - - -, f 5;
-#X msg 452 748 \$2;
+#X obj 360 794 poftouch;
+#X obj 476 703 route size;
+#X obj 452 860 div 36;
+#X floatatom 520 861 5 0 0 0 - - -, f 5;
+#X msg 452 838 \$2;
 #X obj 360 222 t a a a a;
-#X obj 400 443 pofrect;
-#X obj 476 634 unpack f f f f;
-#X obj 507 695 /;
+#X obj 400 433 pofrect;
+#X obj 476 724 unpack f f f f;
+#X obj 507 785 /;
 #X msg 815 125 listdir \$1;
 #X obj 50 62 t a a;
-#X obj 412 726 rpi-touchFix;
+#X obj 412 816 rpi-touchFix;
 #X floatatom 228 674 5 0 0 0 - - -, f 5;
 #X msg 230 695 lineheight \$1;
 #X obj 50 109 pofscale 0.8 0.8;
-#X obj 380 554 pofrect;
-#X msg 370 638 draw 0;
-#X obj 505 515 *;
-#X obj 507 717 s /kpof/browser/lineheight;
-#X obj 491 748 r /kpof/browser/lineheight;
-#X obj 539 695 s /kpof/browser/numlines;
+#X obj 380 644 pofrect;
+#X msg 370 728 draw 0;
+#X obj 505 575 *;
+#X obj 507 807 s /kpof/browser/lineheight;
+#X obj 491 838 r /kpof/browser/lineheight;
+#X obj 539 785 s /kpof/browser/numlines;
 #X text 522 381 folder, f 10;
-#X text 526 532 selected;
-#X obj 523 490 r /kpof/browser/lineheight;
-#X obj 470 820 r /kpof/browser/numlines;
-#X obj 470 842 / 2;
-#X obj 452 862 +;
-#X obj 452 884 s /kpof/browser/line/selected;
-#X floatatom 483 865 5 0 0 0 - - -, f 5;
-#X obj 452 793 s /kpof/browser/line/selected/off;
-#X obj 504 450 r /kpof/browser/line/selected/off;
-#X obj 443 423 r /kpof/browser/lineheight;
-#X obj 477 654 s /kpof/browser/width;
-#X obj 507 674 s /kpof/browser/height;
-#X obj 423 403 r /kpof/browser/width;
-#X obj 400 381 poftranslate 0 0;
+#X text 526 622 selected;
+#X obj 523 554 r /kpof/browser/lineheight;
+#X obj 470 910 r /kpof/browser/numlines;
+#X obj 470 932 / 2;
+#X obj 452 952 +;
+#X obj 452 974 s /kpof/browser/line/selected;
+#X floatatom 483 955 5 0 0 0 - - -, f 5;
+#X obj 452 883 s /kpof/browser/line/selected/off;
+#X obj 504 436 r /kpof/browser/line/selected/off;
+#X obj 443 413 r /kpof/browser/lineheight;
+#X obj 477 744 s /kpof/browser/width;
+#X obj 507 764 s /kpof/browser/height;
+#X obj 423 393 r /kpof/browser/width;
+#X obj 400 371 poftranslate 0 0;
 #X obj 628 300 r /kpof/browser/height;
 #X obj 628 342 / -2;
 #X obj 628 364 +;
@@ -393,33 +392,44 @@
 #X obj 784 651 t a a;
 #X obj 794 801 print;
 #X msg 882 38 getdir \$1;
-#X obj 494 553 loadbang;
+#X obj 494 643 loadbang;
 #X obj 70 668 poftexts font1 20;
 #X obj 104 623 loadbang;
 #X msg 104 645 text sensivity;
 #X obj 941 77 loadbang;
 #X msg 941 99 listdir /home/pi/media;
-#X obj 360 592 poftexts font1 20;
+#X obj 360 682 poftexts font1 20;
 #X obj 420 313 pofrect;
 #X text 486 311 background;
 #X obj 443 273 r /kpof/browser/width;
 #X obj 466 293 r /kpof/browser/height;
 #X obj 420 253 pofcolor 0.3 0.3 0.3 1;
-#X obj 570 847 loadbang;
-#X msg 496 575 cliplines 12 0 \, lineheight 1.75;
-#X obj 505 470 + 0.5;
+#X obj 570 937 loadbang;
+#X msg 496 665 cliplines 12 0 \, lineheight 1.75;
 #X obj 50 84 poftranslate -100 -20;
 #X obj 360 200 poftranslate 200 -20;
 #X obj 49 718 kpofUIbutton save UI;
-#X obj 400 357 pofcolor 0.6 0.6 0.6 1;
-#X obj 380 507 pofcolor 0 0.4 0.6 0.6;
-#X obj 380 532 poftranslate 0 0.5;
+#X obj 400 347 pofcolor 0.6 0.6 0.6 1;
+#X obj 380 597 pofcolor 0 0.4 0.6 0.6;
+#X obj 380 622 poftranslate 0 0.5;
 #X obj 894 698 print path;
 #X obj 990 675 s /media/open;
 #X msg 918 652 symbol \$1/\$2;
 #X obj 70 548 kpofUIslider corner-gain UI;
-#X connect 0 0 118 0;
-#X connect 0 1 125 0;
+#X obj 1024 68 r /browser/refresh;
+#X obj 562 455 r /kpof/browser/numlines;
+#X floatatom 442 463 5 0 0 0 - - -, f 5;
+#X floatatom 434 567 5 0 0 0 - - -, f 5;
+#X obj 434 506 mod 2;
+#X obj 561 492 mod 2;
+#X obj 561 511 / 2;
+#X floatatom 609 511 5 0 0 0 - - -, f 5;
+#X obj 505 460 + 0.5;
+#X obj 561 533 t b f;
+#X floatatom 627 489 5 0 0 0 - - -, f 5;
+#X obj 562 477 - 1;
+#X connect 0 0 117 0;
+#X connect 0 1 124 0;
 #X connect 0 2 16 0;
 #X connect 0 3 2 0;
 #X connect 7 0 6 0;
@@ -461,8 +471,8 @@
 #X connect 40 0 67 0;
 #X connect 42 0 40 0;
 #X connect 43 0 107 0;
-#X connect 43 1 120 0;
-#X connect 43 2 119 0;
+#X connect 43 1 119 0;
+#X connect 43 2 118 0;
 #X connect 43 3 112 0;
 #X connect 45 0 38 1;
 #X connect 45 0 70 0;
@@ -473,22 +483,22 @@
 #X connect 45 2 58 0;
 #X connect 46 0 56 0;
 #X connect 47 0 17 0;
-#X connect 48 0 116 0;
-#X connect 48 1 117 0;
+#X connect 48 0 115 0;
+#X connect 48 1 116 0;
 #X connect 49 1 42 0;
 #X connect 49 2 38 0;
 #X connect 50 0 51 0;
 #X connect 51 0 107 0;
 #X connect 52 0 0 0;
 #X connect 54 0 38 0;
-#X connect 55 0 121 2;
+#X connect 55 0 120 2;
 #X connect 57 0 40 1;
 #X connect 61 0 55 1;
 #X connect 62 0 63 0;
 #X connect 63 0 64 1;
 #X connect 64 0 65 0;
 #X connect 64 0 66 0;
-#X connect 68 0 115 0;
+#X connect 68 0 133 0;
 #X connect 69 0 44 2;
 #X connect 69 0 53 2;
 #X connect 72 0 44 1;
@@ -506,8 +516,8 @@
 #X connect 82 1 86 0;
 #X connect 82 1 90 0;
 #X connect 83 0 98 0;
-#X connect 83 0 122 0;
-#X connect 83 0 124 0;
+#X connect 83 0 121 0;
+#X connect 83 0 123 0;
 #X connect 84 0 85 0;
 #X connect 85 0 92 0;
 #X connect 87 1 89 0;
@@ -535,16 +545,26 @@
 #X connect 111 0 108 2;
 #X connect 112 0 108 0;
 #X connect 114 0 107 0;
-#X connect 115 0 55 0;
-#X connect 116 0 52 0;
-#X connect 117 0 43 0;
-#X connect 119 0 73 0;
-#X connect 120 0 121 0;
-#X connect 121 0 53 0;
-#X connect 124 0 123 0;
-#X connect 125 0 102 0;
+#X connect 115 0 52 0;
+#X connect 116 0 43 0;
+#X connect 118 0 73 0;
+#X connect 119 0 120 0;
+#X connect 120 0 53 0;
+#X connect 123 0 122 0;
+#X connect 124 0 102 0;
+#X connect 125 0 106 0;
+#X connect 126 0 135 0;
+#X connect 126 0 136 0;
+#X connect 127 0 129 0;
+#X connect 129 0 128 0;
+#X connect 130 0 131 0;
+#X connect 131 0 132 0;
+#X connect 131 0 134 0;
+#X connect 133 0 55 0;
+#X connect 134 0 133 0;
+#X connect 134 1 133 1;
+#X connect 136 0 130 0;
 #X restore 83 680 pd scene-settings;
-#X obj 581 590 delay 5000;
 #X obj 60 244 kpofautoscalewin;
 #X obj 60 214 pofscale 0.5 0.625;
 #X text 198 212 fix late autoscale;
@@ -745,9 +765,9 @@
 #X connect 19 0 18 0;
 #X connect 20 0 5 0;
 #X restore 120 516 pd global-settings;
-#N canvas 363 99 540 249 gpio-button 0;
+#N canvas 357 101 540 249 gpio-button 0;
 #X msg 267 85 echo 17 >/sys/class/gpio/export;
-#X obj 272 35 loadbang;
+#X obj 272 15 loadbang;
 #X msg 108 110 open 1;
 #X obj 43 111 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
@@ -756,7 +776,7 @@
 #X obj 43 142 metro 20;
 #X msg 49 96 1;
 #X obj 108 199 s /gpio/state;
-#X obj 337 144 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+#X obj 360 164 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 214 203 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
@@ -764,21 +784,29 @@
 #X obj 267 109 ggee/shell;
 #X obj 272 57 delay 5000;
 #X obj 168 85 delay 500;
+#X msg 313 162 500;
+#X obj 50 74 delay 500;
+#X msg 175 64 2000;
+#X msg 272 37 5000;
 #X connect 0 0 12 0;
-#X connect 1 0 13 0;
+#X connect 1 0 18 0;
 #X connect 2 0 4 0;
 #X connect 3 0 6 0;
 #X connect 4 0 8 0;
 #X connect 4 0 10 0;
-#X connect 5 0 7 0;
+#X connect 5 0 16 0;
 #X connect 5 1 2 0;
 #X connect 6 0 4 0;
 #X connect 7 0 6 0;
 #X connect 12 0 11 0;
 #X connect 12 1 9 0;
-#X connect 12 1 14 0;
+#X connect 12 1 15 0;
 #X connect 13 0 0 0;
+#X connect 13 0 17 0;
 #X connect 14 0 5 0;
+#X connect 16 0 7 0;
+#X connect 17 0 14 0;
+#X connect 18 0 13 0;
 #X restore 519 239 pd gpio-button;
 #X obj 590 655 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
@@ -788,39 +816,45 @@
 #X msg 463 73 \; RPI-TOUCH 1 \; /ds/UI/loadfile ../../interface.presets
 \; /ds/UI/scene/current 0 \; /kpofwin/fullscreen 1 \; /kpofwin/cursor
 0 \; /kpof/np0/selected 1;
-#X connect 5 0 35 0;
+#X obj 637 631 loadbang;
+#X obj 637 653 delay 5000;
+#X msg 637 675 1;
+#X obj 557 312 bng 15 250 50 0 /browser/refresh empty REFRESH_MEDIA
+17 7 0 10 -262144 -1 -1;
+#X connect 5 0 33 0;
 #X connect 8 0 7 0;
 #X connect 8 1 4 0;
 #X connect 9 0 10 0;
 #X connect 11 0 6 0;
 #X connect 11 1 16 0;
-#X connect 11 2 38 0;
-#X connect 12 0 30 0;
+#X connect 11 2 36 0;
+#X connect 12 0 29 0;
 #X connect 12 1 8 0;
-#X connect 12 2 44 0;
+#X connect 12 2 42 0;
 #X connect 14 0 19 0;
 #X connect 15 0 18 0;
 #X connect 16 0 12 0;
 #X connect 17 0 16 1;
 #X connect 18 0 20 0;
-#X connect 19 0 43 0;
+#X connect 19 0 41 0;
 #X connect 20 0 17 0;
-#X connect 21 0 50 0;
-#X connect 21 0 39 0;
-#X connect 23 0 42 0;
-#X connect 23 0 46 0;
-#X connect 24 0 33 0;
-#X connect 25 0 23 0;
-#X connect 26 0 47 0;
-#X connect 28 0 29 0;
-#X connect 29 0 23 0;
-#X connect 30 0 32 0;
-#X connect 31 0 23 0;
-#X connect 33 0 25 0;
-#X connect 34 0 11 0;
-#X connect 35 0 34 0;
-#X connect 39 0 40 0;
-#X connect 41 0 25 0;
-#X connect 42 0 41 0;
-#X connect 47 0 48 0;
-#X connect 48 0 49 0;
+#X connect 21 0 48 0;
+#X connect 21 0 37 0;
+#X connect 23 0 40 0;
+#X connect 23 0 44 0;
+#X connect 24 0 23 0;
+#X connect 25 0 45 0;
+#X connect 27 0 28 0;
+#X connect 28 0 23 0;
+#X connect 29 0 31 0;
+#X connect 30 0 23 0;
+#X connect 32 0 11 0;
+#X connect 33 0 32 0;
+#X connect 37 0 38 0;
+#X connect 39 0 24 0;
+#X connect 40 0 39 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 49 0 50 0;
+#X connect 50 0 51 0;
+#X connect 51 0 39 0;

+ 1 - 1
kpof

@@ -1 +1 @@
-Subproject commit 62b5d4e5ed116d299d8da8387fb104c183a3df71
+Subproject commit e725c7d14338539dce94745998ee87335cfdd0fe