From c4f0d39319ffac5a5eee9a3c7c703d86de982e46 Mon Sep 17 00:00:00 2001 From: Allanis Date: Sun, 16 Jun 2013 17:11:55 +0100 Subject: [PATCH] [Add] Now see the fleets ance chance each system has to generate fleet. --- utils/resedit/data.pyc | Bin 3533 -> 3567 bytes utils/resedit/faction.py | 2 +- utils/resedit/faction.pyc | Bin 3814 -> 3817 bytes utils/resedit/factions.glade | 97 +++++ utils/resedit/planets.glade | 541 ++++++++++++++++++++++++ utils/resedit/space.glade | 779 +++++------------------------------ utils/resedit/space.py | 47 ++- utils/resedit/space.pyc | Bin 20716 -> 21797 bytes 8 files changed, 790 insertions(+), 676 deletions(-) create mode 100644 utils/resedit/factions.glade create mode 100644 utils/resedit/planets.glade diff --git a/utils/resedit/data.pyc b/utils/resedit/data.pyc index 8e00a9b7eaf02fb2a9f727b5ee3e74be1201da8b..20a6c5aee8ef99f8997a695d1aea303d35f79209 100644 GIT binary patch delta 513 zcmY+Ay)Oh&6vfY-?-{cc;$wFjK|)7EA|V8gX2Uib9}%+=v&^zaqIes{ZYd#Np|XF1 zM6@FQ07NHID77M+NOayEL=^Aj-TU4-_xIj?@D|v5GvmFEHZJXBMSYs2WH#R87P_HdSdM(YZW$M`9qUh@}EL*${R zm=&aIDnkoj`-abEBmXx&%^8n}ARLA&8K|_;=>O^Me-r0m-?OE0u~u>O5T~b zu6i<%FULiBWX;JJ>xKe(ZjaHUe6p`w{S+G@M)KsDvqCNM!`TlKQ`y$H%6r8^huRHh zloUEy2BdHsl#_v%)5yCT@g9i!q~Xu^OsHe^g}}~Qr5GoL0luDP$+1kz#II8*KmCP{ Tes1)!^s=Y6r8>9JMRz)F(zq5C9$)yPz*v;1RK#bX;cs+;ssB0o?x*dNP?CM3sxd% zXJH|>7J^`>wb+VSiueb7dm)O&4(z;n^X9$J>{HfMzdfgTRJ$>cwT2F0n%?dd11b!4 z6&&yZ&QLWF4q*eRYlx_%BXF@vUjvaMzx!W^R8$nSNKaiFnhIu?Ur{$>FAI?lZb~n% zps8Ys+HBMiw`JIk%OlAM4Ct`zG`Im{)k}6Vko7ybOGTx|o(eK5D zF{jOM2kYY9cwpV)${c5p;?2C%sNWXX)(UfkYwz`xl62u=kD$~mAt%o4bJiy&oXl<6 zd1fpxa_&NZfohRKu(KMj2T>^}wP^_%36tW~ZLu|x^%j$ZlE_OKkdTm26bIfGOZ@<> Cb6^nw diff --git a/utils/resedit/faction.py b/utils/resedit/faction.py index e5b644d..591be51 100644 --- a/utils/resedit/faction.py +++ b/utils/resedit/faction.py @@ -9,7 +9,7 @@ class Factions: def __init__(self): self.faction = {} self.factionsXML = "../../dat/faction.xml" - self.glade = "space.glade" + self.glade = "factions.glade" self.cur_faction = "" def loadFactions(self, xmlfile=None): diff --git a/utils/resedit/faction.pyc b/utils/resedit/faction.pyc index 42bf0389df3f6691f56e79cd38c130815a85b52a..950f52a7aff33335ca84ca85a4ecb7179ad831c1 100644 GIT binary patch delta 34 qcmaDR`%;#j`7~V~o+zbp1#RZAUshbNKD|i8*RS8`H diff --git a/utils/resedit/factions.glade b/utils/resedit/factions.glade new file mode 100644 index 0000000..93e5310 --- /dev/null +++ b/utils/resedit/factions.glade @@ -0,0 +1,97 @@ + + + + + 400 + 150 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 72 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Name + + + 34 + 17 + + + + + 100 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 108 + 17 + + + + + 62 + 37 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Save + 0 + + + 105 + 46 + + + + + 68 + 37 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + New + 0 + + + 13 + 45 + + + + + True + True + + + + + + diff --git a/utils/resedit/planets.glade b/utils/resedit/planets.glade new file mode 100644 index 0000000..e927270 --- /dev/null +++ b/utils/resedit/planets.glade @@ -0,0 +1,541 @@ + + + + + 600 + 500 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Planet Editor + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 150 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 70 + 37 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + New + 0 + + + 17 + 12 + + + + + 80 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Name: + + + 94 + 21 + + + + + 121 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 160 + 19 + + + + + 182 + 24 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 80 + 58 + + + + + 88 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Faction + + + 62 + + + + + 404 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 12 + 173 + + + + + 188 + 149 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 17 + 196 + + + + + 189 + 24 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 15 + 350 + + + + + 86 + 38 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add + 0 + + + 16 + 380 + + + + + 88 + 40 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Remove + 0 + + + 115 + 380 + + + + + 20 + 171 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 209 + 194 + + + + + 408 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 6 + 419 + + + + + 100 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Services + + + 254 + 194 + + + + + 73 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Land + 0 + True + + + 240 + 215 + + + + + 70 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Basic + 0 + True + + + 320 + 215 + + + + + 112 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Commodity + 0 + True + + + 240 + 235 + + + + + 80 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Outfits + 0 + True + + + 240 + 255 + + + + + 100 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Shipyard + 0 + True + + + 320 + 255 + + + + + 191 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 219 + 274 + + + + + 57 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Tech + + + 260 + 293 + + + + + 63 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Main + + + 222 + 320 + + + + + 58 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 300 + 320 + + + + + 67 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Special + + + 224 + 345 + + + + + 60 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 235 + 365 + + + + + 60 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 300 + 365 + + + + + 60 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100000 1 10 10 + + + 235 + 390 + + + + + 60 + 20 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 0 100 1 10 10 + + + 300 + 390 + + + + + 160 + 23 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 12 + 465 + + + + + 100 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + System + + + 440 + + + + + 100 + 50 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Save + 0 + + + 189 + 438 + + + + + 62 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Class + + + 289 + 20 + + + + + 152 + 122 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-missing-image + + + 260 + 48 + + + + + 79 + 33 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 341 + 9 + + + + + 101 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GFX Space + + + 92 + + + + + 163 + 24 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 96 + 89 + + + + + 98 + 20 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GFX Exterior + + + 10 + 123 + + + + + 154 + 22 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 106 + 120 + + + + + True + True + + + + + + diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade index 00a132e..9b30dcf 100644 --- a/utils/resedit/space.glade +++ b/utils/resedit/space.glade @@ -3,7 +3,7 @@ 750 - 450 + 675 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK System Editor GDK_WINDOW_TYPE_HINT_DIALOG @@ -169,7 +169,7 @@ 20 - 322 + 323 True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -205,7 +205,7 @@ 193 - 110 + 170 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -216,22 +216,6 @@ 180 - - - 70 - 27 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Add - 0 - - - 20 - 296 - - 70 @@ -244,8 +228,8 @@ 0 - 112 - 295 + 110 + 360 @@ -273,8 +257,8 @@ 0 - 14 - 350 + 328 + 577 @@ -289,8 +273,8 @@ 0 - 115 - 350 + 422 + 578 @@ -322,18 +306,6 @@ 17 - - - 202 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 5 - 326 - - 35 @@ -398,6 +370,109 @@ 350 + + + 20 + 376 + True + + + 530 + 11 + + + + + 250 + 212 + True + True + True + + + 10 + 420 + + + + + 70 + 27 + True + True + True + Add + 0 + + + 270 + 460 + + + + + 70 + 27 + True + True + True + Remove + 0 + + + 360 + 460 + + + + + 70 + 27 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add + 0 + + + 20 + 360 + + + + + 183 + 20 + True + + + 270 + 425 + + + + + 513 + 20 + True + + + 4 + 393 + + + + + 228 + 20 + True + + + 289 + 556 + + True @@ -420,634 +495,4 @@ - - 600 - 500 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Planet Editor - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 70 - 37 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - New - 0 - - - 17 - 12 - - - - - 80 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Name: - - - 94 - 21 - - - - - 121 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 160 - 19 - - - - - 182 - 24 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 80 - 58 - - - - - 88 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Faction - - - 62 - - - - - 404 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 12 - 173 - - - - - 188 - 149 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 17 - 196 - - - - - 189 - 24 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 15 - 350 - - - - - 86 - 38 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Add - 0 - - - 16 - 380 - - - - - 88 - 40 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove - 0 - - - 115 - 380 - - - - - 20 - 171 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 209 - 194 - - - - - 408 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 6 - 419 - - - - - 100 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Services - - - 254 - 194 - - - - - 73 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Land - 0 - True - - - 240 - 215 - - - - - 70 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Basic - 0 - True - - - 320 - 215 - - - - - 112 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Commodity - 0 - True - - - 240 - 235 - - - - - 80 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Outfits - 0 - True - - - 240 - 255 - - - - - 100 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Shipyard - 0 - True - - - 320 - 255 - - - - - 191 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 219 - 274 - - - - - 57 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Tech - - - 260 - 293 - - - - - 63 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Main - - - 222 - 320 - - - - - 58 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100000 1 10 10 - - - 300 - 320 - - - - - 67 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Special - - - 224 - 345 - - - - - 60 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100000 1 10 10 - - - 235 - 365 - - - - - 60 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100000 1 10 10 - - - 300 - 365 - - - - - 60 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100000 1 10 10 - - - 235 - 390 - - - - - 60 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100 1 10 10 - - - 300 - 390 - - - - - 160 - 23 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 12 - 465 - - - - - 100 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - System - - - 440 - - - - - 100 - 50 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Save - 0 - - - 189 - 438 - - - - - 62 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Class - - - 289 - 20 - - - - - 152 - 122 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-missing-image - - - 260 - 48 - - - - - 79 - 33 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 341 - 9 - - - - - 101 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GFX Space - - - 92 - - - - - 163 - 24 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 96 - 89 - - - - - 98 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GFX Exterior - - - 10 - 123 - - - - - 154 - 22 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 106 - 120 - - - - - True - True - - - - - - - 400 - 150 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 150 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 72 - 20 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Name - - - 34 - 17 - - - - - 100 - 20 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 108 - 17 - - - - - 62 - 37 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Save - 0 - - - 105 - 46 - - - - - 68 - 37 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - New - 0 - - - 13 - 45 - - - - - True - True - - - - - diff --git a/utils/resedit/space.py b/utils/resedit/space.py index c724e4e..da9c403 100644 --- a/utils/resedit/space.py +++ b/utils/resedit/space.py @@ -7,17 +7,21 @@ import data class Space: - def __init__(self, factions=None): - self.glade = "space.glade" - self.systemsXML = "../../dat/ssys.xml" - self.planetsXML = "../../dat/planet.xml" - self.planet_gfx = "../../gfx/planet/" + def __init__(self, factions=None, fleets=None): + self.space_glade = "space.glade" + self.planet_glade = "planets.glade" + self.systemsXML = "../../dat/ssys.xml" + self.planetsXML = "../../dat/planet.xml" + self.planet_gfx = "../../gfx/planet/" self.loadSystems(self.systemsXML) self.loadPlanets(self.planetsXML) if factions==None: self.factions = {} else: self.factions = factions + if fleets==None: + self.fleets = {} + self.fleets = fleets def loadSystems(self, xmlfile): self.systems = data.load(xmlfile, "ssys", True, @@ -51,7 +55,7 @@ class Space: create the window """ # --------------- SYSTEMS -------------------- - self.swtree = gtk.glade.XML(self.glade, "winSystems") + self.swtree = gtk.glade.XML(self.space_glade, "winSystems") # Hook events and stuff. hooks = { @@ -65,7 +69,9 @@ class Space: "butReset":["clicked", self.__space_reset], "butAddJump":["clicked", self.__jump_add], "butRmJump":["clicked", self.__jump_rm], - "butNew":["clicked", self.__snew] + "butNew":["clicked", self.__snew], + "butFleetAdd":["clicked", self.__fleet_add], + "butFleetRemove":["clicked", self.__fleet_rm] } for key, val in hooks.items(): self.__swidget(key).connect(val[0], val[1]) @@ -94,7 +100,7 @@ class Space: # ---------------- PLANETS -------------------- - self.pwtree = gtk.glade.XML(self.glade, "winPlanets") + self.pwtree = gtk.glade.XML(self.planet_glade, "winPlanets") self.__pwidget("winPlanets").show_all() self.cur_planet = "" @@ -218,6 +224,25 @@ class Space: col.add_attribute(cell, 'text', 0) wgt.set_model(jumps) + # Load fleets. + fleets = gtk.ListStore(str, int) + for fleet, chance in system["fleets"].items(): + treenode = fleets.append([fleet, int(chance)]) + wgt = self.__swidget("treFleets") + if wgt.get_column(0): + wgt.remove_column(wgt.get_column(0)) + wgt.remove_column(wgt.get_column(0)) + columns = [None]*2 + columns[0] = gtk.TreeViewColumn('Fleet') + columns[1] = gtk.TreeViewColumn('Chance') + for n in range(2): + wgt.append_column(columns[n]) + columns[n].cell = gtk.CellRendererText() + columns[n].pack_start(columns[n].cell, True) + columns[n].set_attributes(columns[n].cell, text = n) + + wgt.set_model(fleets) + self.__space_draw() def __pupdate(self, wgt=None, event=None): @@ -599,6 +624,12 @@ class Space: self.__supdate() self.__space_draw() + def __fleet_add(self, wgt=None, event=None): + return + + def __fleet_rm(self, wgt=None, event=None): + reutrn + def __snew(self, wgt=None, event=None): name = "new system" gen = { "asteroids":0, "interference":0, "stars":100 } diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc index 5fbc6f21f9a2adf8b970d29a73d3a66bc31bcf95..d9ca801a75fc31f1c77824d44fb31251cd293611 100644 GIT binary patch delta 6633 zcmbtY4RG8=72mzPTypumB+b_~UrkbS{R)J(Y12>I21;og>ZY`|P|oZ9|4r|jT#~zg z(uO7;B?XmX%9I5JWQ2|&3U)?087(Lk1OXA~C@_eCqd3esqs6K?>Y(_3Z*!M4ATy4W zp>E@k+Y%&*Bvt70;c zA*-33ogr(Otj&-CChIcfY$oe7WG#~o8M2Pa#td1%o9Q{iYG8Gngw@D{=FEyYydZ0K z6O(g=)y&H-5UM9QR|pYt6X4H9e;ep8sdcBTHD%?9F(E=8V2sBxmza=3g7z}kZD?|} z5C>c$VT-8XO?e{j6Jv66Jm$(QxHYqYW?ek%6LEpro}ibG?oJj!fx&RZE^F)U3tM)w zh!}%?;kfN2^<%EBjrl}7*;OH4

HXg>->?f1?9o`}%C!6ohGxhahS9?NdG)sC<1Q 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