diff --git a/utils/resedit/data.pyc b/utils/resedit/data.pyc
index 8e00a9b..20a6c5a 100644
Binary files a/utils/resedit/data.pyc and b/utils/resedit/data.pyc differ
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 42bf038..950f52a 100644
Binary files a/utils/resedit/faction.pyc and b/utils/resedit/faction.pyc differ
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 5fbc6f2..d9ca801 100644
Binary files a/utils/resedit/space.pyc and b/utils/resedit/space.pyc differ