From 46a13575250af649020d739c1f9baa04025344c5 Mon Sep 17 00:00:00 2001 From: b3yond Date: Wed, 21 Dec 2016 14:23:21 +0100 Subject: [PATCH] major changes, not sure about all... --- .idea/vcs.xml | 6 + code/augmentations.pyc | Bin 3376 -> 3373 bytes code/editor.py | 21 +- code/editor.pyc | Bin 29356 -> 29479 bytes code/enemies.pyc | Bin 2461 -> 2454 bytes code/game.py | 1 + code/game.pyc | Bin 43340 -> 43340 bytes code/items.pyc | Bin 3809 -> 3802 bytes missions/H14 | 1661 ---------------------------------------- missions/escape | 1661 ---------------------------------------- notes/Notizen.txt | 3 +- saves/b3yond | 170 ++-- 12 files changed, 110 insertions(+), 3413 deletions(-) create mode 100644 .idea/vcs.xml delete mode 100644 missions/H14 delete mode 100644 missions/escape diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/code/augmentations.pyc b/code/augmentations.pyc index 35ef8999dd978514c78b18fd3bd9dcaff0f27543..8da1be1195eaf8568a908d7da05d3212e91db1aa 100644 GIT binary patch delta 102 zcmdlWwN{FQ`7ujT}o^Ma&r(81yspb5r$`j4Si=QuNa^OD13E(b)WobviR{ L*?pWWIAtRNV(=h= delta 105 zcmZ20wLyx5`7.< weird bug: Save&Quit doesnt close the window, but still returns a room object. + + :todo übergebe room, nicht fields """ - def __init__(self): + def __init__(self, fields=0): + """ + :param fields: lists of lists 30x52 + """ self.chosen = "W" self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window.connect("delete_event", self.delete_event) @@ -55,12 +60,14 @@ class RoomEditor(object): self.box2 = gtk.HBox(False, 0) self.menubox = gtk.VBox(False, 0) - # initialise list of lists: fields, later argument to Room() - self.fields = [] - for i in range(30): - self.fields.append([]) - for j in range(52): - self.fields[i].append("O") + if fields != 0: + self.fields = fields + # if no fields given, initialise list of lists: fields, later argument to Room() + else: + for i in range(30): + self.fields.append([]) + for j in range(52): + self.fields[i].append("O") # initialize dictionary: fielddata, later argument to Room() self.fielddata = {} self.show_fields() diff --git a/code/editor.pyc b/code/editor.pyc index 9405ad683e916195e60a381fddd39ccb3a5dc698..806165116cac160dcda33963c05ad8f9d2bba444 100644 GIT binary patch delta 894 zcmXX?ZD^BM6h6;=(==(*ScB1JYwg?8xms(L+H7l(X=$-FYGbX^QYn@8O>A6jnkKL^ zItRAXF~J|6ADds3p{T3dx_a0qR2iZUL=h3jK=2DxsQ5z>QPdya_jUJj9-e#7dG2}c z{pA5pJcQeLR#Y(a`;_}{wEaLtaiVUJrBRWkiK1~(w?URc<2vagYZh59C+T*0p2PE< zW?gdAxT0>4K60_zhyjVK6=*In^@`-uR@%I9wl6-sHQpCDhtuipHRfQle;{WjlJS(4 zb=s2J1@$WpE*%~nO**podD_@rJ*q9`(dPyYA0o|1iF*AsxPeAulyjz!ftq_7=_|!O zu8I=F?%3w1QAMF`#bkL%*O9qOotdBIpzAq`W>ZI1z`j4Mfy-x?gtBHjVWyJVT-IE+ zbR=Bon6mxze)l-qq%{8&0=BiB4cT}qv0=SOpPOKKKl7 z^GJrM0n_qzIbU^AA;!BFO~ZPpA8_)X$3C&tX`AkY@aU(vG0B@7 z{={D#h#b&A`fH@ph0A>7vp;a_-H?0EkQs?JZdZ6L=bGG5r1(|TGfR@ zncvb2yvI9Q86gMX=i{pF7T`MX9Ik!~lFI-B delta 784 zcmXAnTS!z<6o&V|&p3KS$6G4mL~5y{m_{XPNjjxi<7Kq0M6ppD%@LJMp$LP}>7G5f zC`l9%1Ve?Al@L@!IzdJGR?$2Z1r}jYA<~Vab547+e!j)xU;oRR{D7Gyn3a{#;FHC( z<_Ex4YTce>3lnZdcp+-d!mY8%;6ULHFj}+lN>Ll6wG<_*QOK>b0I><$I}9O&qE(Pq zyR_m~^Py=#FMqa_ z0$$DyAD6hq{zye)oZqZ*0JEGHQ={Mk_r>K&yykoH>A)xYXnhqBXqIXgFRY!CSf$Q{ zX@Ku%*nj}au#X~?-zA-p2?4$|X5WaGLnonXkA>%IU z|N9#azlXh<`6jgU!_6CkLHe@gH->n5Yb)d^c(}w2s>^AYQ=lt*vgvP*TTbgZh#C5x z`$paXJ$IDR`fVQEqJeG0C}G?74JOP}dBGfB{!j87N$>foy+dM&bBoN7KS71XtN5!$ z1#4JR0~22_aRCuDu!j(7XcQ$nrVvKYG>xU>rDK?**s>o;pvJ0da+jY$szEy{E+Eq& ztMfdv4f^T4NE6QeWOZ7|lDCF_Rkl!n<$jv0ItvHq?_C0_IH@{IqJf%g61n@pH{d8Y z*W@WU&0}>Qi4j&0`GDKJ=vtKU@o1AO@s=mueibX+*BPg1=R4BX06d{T$I|}+?Q`oz diff --git a/code/enemies.pyc b/code/enemies.pyc index b28d190af66ea3420e74320880fd79c5fa2c98b4..89b12c0ba91b712cab74d731dd75d2e23ab10152 100644 GIT binary patch delta 217 zcmbO$JWZH``7ujT}1}MGP4j81yspb5r$`j4Si=QuNa^OD137P~7~TF_syp l?Bp)iD%_G*Y^QKZDowU#zmHookRuD1WH~Mg#mTjt3IN5EL}~y4 delta 220 zcmbOxJXe^5`70NMY{(gMuV0tW;04GI{BF|h}mpaBE3qoC3S0phcErqKcg8VNuQ0Vz%m;s5{u delta 38 wcmV+>0NMY{(gMuV0tW;04GM=z3$X{ApaBB2qoC3S0pYWDrqKcg83{lP0V?+m>i_@% diff --git a/code/items.pyc b/code/items.pyc index e0f7d93334468212f5e73ef44f110f01cfd16751..d74663cc8d163062b16814dbb61a28a5e91e446d 100644 GIT binary patch delta 219 zcmaDTdrOvs`7ujU3`EBKiyr4Eh=QxvBa|#+CVbDf;P|C6jk^$WIPtiNhtS ru=yE_1tU(`$-!(6I3+iqU`xfLHHpIotJclCITo>El>s|;B3}RiekDVB delta 226 zcmca5`%spH`7