Skip to content

Commit

Permalink
Simplify module model code, display correct module in blueprints.
Browse files Browse the repository at this point in the history 
The new module pie files will need cleaning up.

Fixes ticket:2954.
  • Loading branch information
@Cyp
Cyp committed Nov 30, 2011
1 parent 4b08dd0 commit e02cb38
Show file tree
Hide file tree
Showing 18 changed files with 814 additions and 199 deletions.
14 changes: 7 additions & 7 deletions data/base/stats/structures.txt
View file
Expand Up @@ -18,18 +18,18 @@ A0CommandCentreCO,HQ,Level Two,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,
A0CommandCentreNE,HQ,Level Three,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,1,ZNULLECM,CCSensor,0,blhq4.pie,blbhq.pie,1,0
A0CommandCentreNP,HQ,Level One,HARD,0,2,2,Concrete,500,3,10,500,10,100,30,300,1,1,ZNULLECM,CCSensor,0,blhq2.pie,blbhq.pie,1,0
A0CyborgFactory,CYBORG FACTORY,Level All,MEDIUM,1,1,2,Concrete,500,2,10,500,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blcfact1.pie,blbcfact.pie,1,0
A0FacMod1,FACTORY MODULE,Level All,MEDIUM,1,3,3,Concrete,250,2,10,250,100,100,25,150,255,30,ZNULLECM,DefaultSensor1Mk1,0,BLFACT1.PIE,0,1,0
A0FacMod1,FACTORY MODULE,Level All,MEDIUM,1,3,3,Concrete,250,2,10,250,100,100,25,150,255,30,ZNULLECM,DefaultSensor1Mk1,0,blfact1.pie@factory_module1.pie@factory_module2.pie,0,1,0
A0HardcreteMk1CWall,CORNER WALL,Level All,HARD,1,1,1,Concrete,125,2,15,250,10,25,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLWALLC1.pie,0,0,0
A0HardcreteMk1Wall,WALL,Level All,HARD,1,1,1,Concrete,125,2,15,250,10,25,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,BLWALLH.pie,0,1,0
A0LightFactory,FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,500,100,100,30,150,255,20,ZNULLECM,BaBaSensor,1,BLFACT0.pie,blbfact.pie,1,0
A0PowerGenerator,POWER GENERATOR,Level All,MEDIUM,1,2,2,Concrete,500,2,20,500,30,50,30,300,255,10,ZNULLECM,DefaultSensor1Mk1,0,BLPOWER0.PIE,blbpower.pie,1,0
A0PowMod1,POWER MODULE,Level All,MEDIUM,0,2,2,Concrete,250,2,10,500,0,0,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,BLPOWER4.PIE,0,1,0
A0LightFactory,FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,500,100,100,30,150,255,20,ZNULLECM,BaBaSensor,1,blfact0.pie@blfact1.pie@blfact2.pie,blbfact.pie,1,0
A0PowerGenerator,POWER GENERATOR,Level All,MEDIUM,1,2,2,Concrete,500,2,20,500,30,50,30,300,255,10,ZNULLECM,DefaultSensor1Mk1,0,blpower0.pie@blpower4.pie,blbpower.pie,1,0
A0PowMod1,POWER MODULE,Level All,MEDIUM,0,2,2,Concrete,250,2,10,500,0,0,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,blpower4.pie@power_module4.pie,0,1,0
A0RepairCentre3,REPAIR FACILITY,Level All,MEDIUM,0,1,1,Concrete,500,2,10,500,0,100,0,150,255,0,RepairCentre,DefaultSensor1Mk1,0,BLRPAIR3.PIE,BLBGEN.PIE,1,0
A0ResearchFacility,RESEARCH,Level All,MEDIUM,1,2,2,Concrete,500,2,10,400,100,100,30,150,255,10,ZNULLECM,DefaultSensor1Mk1,0,BLRESCH0.PIE,blbresch.pie,1,0
A0ResearchModule1,RESEARCH MODULE,Level All,MEDIUM,1,2,2,Concrete,250,2,10,400,50,100,5,150,255,5,ZNULLECM,DefaultSensor1Mk1,0,blresch4.PIE,0,1,0
A0ResearchFacility,RESEARCH,Level All,MEDIUM,1,2,2,Concrete,500,2,10,400,100,100,30,150,255,10,ZNULLECM,DefaultSensor1Mk1,0,blresch0.pie@blresch4.pie,blbresch.pie,1,0
A0ResearchModule1,RESEARCH MODULE,Level All,MEDIUM,1,2,2,Concrete,250,2,10,400,50,100,5,150,255,5,ZNULLECM,DefaultSensor1Mk1,0,blresch4.pie@research_module4.pie,0,1,0
A0ResourceExtractor,RESOURCE EXTRACTOR,Level All,MEDIUM,0,1,1,Concrete,100,1,5,300,10,0,2,150,255,1,ZNULLECM,DefaultSensor1Mk1,0,BLDERIK.PIE,0,1,0
A0TankTrap,WALL,Level All,HARD,1,1,1,Concrete,40,1,10,100,10,15,1,0,255,0,ZNULLECM,ZNULLSENSOR,0,MITRAP2.PIE,0,1,0
A0VTolFactory1,VTOL FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,250,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blvfact0.pie,blbfact.pie,1,0
A0VTolFactory1,VTOL FACTORY,Level All,MEDIUM,1,3,3,Concrete,500,3,10,250,100,100,30,150,255,20,ZNULLECM,DefaultSensor1Mk1,1,blvfact0.pie@blvfact1.pie@blvfact2.pie,blbfact.pie,1,0
A0VtolPad,REARM PAD,Level All,MEDIUM,0,1,1,Concrete,300,1,10,150,0,100,0,150,255,0,ZNULLECM,DefaultSensor1Mk1,0,blvtolpd.pie,blbgen.pie,1,0
AASite-QuadBof,DEFENSE,Level Two-Three,MEDIUM,0,1,1,Concrete,300,1,12,200,10,175,10,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,Blaamnt1.PIE,0,0,1
AASite-QuadMg1,DEFENSE,Level Two-Three,MEDIUM,0,1,1,Concrete,250,1,12,200,10,125,10,150,255,1,ZNULLECM,DefaultSensor1Mk1,1,Blaamnt1.PIE,0,0,1
Expand Down
126 changes: 126 additions & 0 deletions data/base/structs/factory_module1.pie
View file
@@ -0,0 +1,126 @@
PIE 2
TYPE 10200
TEXTURE 0 page-13-player-buildings.png 256 256
LEVELS 1
LEVEL 1
POINTS 57
-140 0 37
-170 0 24
-170 78 24
-140 78 37
-183 0 -5
-183 78 -5
-170 0 -36
-170 78 -36
-140 0 -49
-140 78 -49
-109 0 -36
-109 78 -36
-97 0 -5
-97 78 -5
-109 0 24
-109 78 24
-140 93 -3
-4 99 37
-4 0 57
-73 0 57
-73 99 37
-14 150 -114
-4 100 -136
-63 150 -114
-73 100 -136
-74 1 -185
-73 100 -185
-4 100 -185
54 150 -114
64 100 -136
64 99 37
5 150 -114
64 0 57
64 1 -185
64 100 -185
-73 1 -185
65 1 -185
65 100 -185
-87 0 165
-117 0 178
-117 78 178
-87 78 165
-148 0 165
-148 78 165
-161 0 135
-161 78 135
-148 0 104
-148 78 104
-117 0 91
-117 78 91
-87 0 104
-87 78 104
-74 0 135
-74 78 135
-116 93 136
-72 100 -136
-72 100 -185
POLYGONS 60
200 3 24 20 23 68 25 7 26 60 0
200 3 17 22 21 7 26 68 26 61 0
200 3 30 29 28 7 26 68 26 61 0
200 3 22 17 31 68 25 7 26 60 0
200 3 24 23 21 87 21 91 0 116 0
200 3 24 21 22 87 21 116 0 120 21
200 3 22 31 28 88 45 92 24 116 24
200 3 22 28 29 88 45 116 24 121 45
200 3 22 29 34 222 183 248 184 248 157
200 3 22 34 27 222 183 248 157 222 157
200 3 22 27 56 248 184 248 157 222 157
200 3 22 56 55 248 184 222 157 222 183
200 3 20 24 25 6 27 68 26 85 76
200 3 20 25 19 6 27 85 76 0 76
200 3 26 25 24 85 26 86 76 69 26
200 3 26 24 55 222 157 222 183 222 183
200 3 26 55 56 222 157 222 183 222 157
200 3 33 29 30 85 76 69 26 7 26
200 3 33 30 32 85 76 7 26 0 76
200 3 29 33 34 69 26 85 76 85 26
200 3 23 20 17 189 248 184 165 218 165
200 3 23 17 21 189 248 218 165 214 248
200 3 31 17 30 189 248 184 165 218 165
200 3 31 30 28 189 248 218 165 214 248
200 3 5 7 6 46 189 68 189 68 236
200 3 5 6 4 46 189 68 236 46 236
200 3 20 19 18 0 27 0 77 12 77
200 3 20 18 17 0 27 12 77 12 27
200 3 17 18 32 0 27 0 77 12 77
200 3 17 32 30 0 27 12 77 12 27
200 3 2 5 4 23 189 45 189 45 236
200 3 2 4 1 23 189 45 236 23 236
200 3 26 37 36 185 112 254 112 254 153
200 3 26 36 35 185 112 254 153 185 153
200 3 3 2 1 0 189 22 189 22 236
200 3 3 1 0 0 189 22 236 0 236
200 3 53 41 38 160 137 182 137 182 186
200 3 53 38 52 160 137 182 186 160 186
200 3 51 53 52 137 137 159 137 159 186
200 3 51 52 50 137 137 159 186 137 186
200 3 40 41 54 254 85 248 70 233 84
200 3 49 51 50 114 137 136 137 136 186
200 3 49 50 48 114 137 136 186 114 186
200 3 45 43 54 232 108 247 103 233 85
200 3 47 49 48 91 137 113 137 113 186
200 3 47 48 46 91 137 113 186 91 186
200 3 47 45 54 216 102 231 108 232 85
200 3 45 47 46 69 137 90 137 90 186
200 3 45 46 44 69 137 90 186 69 186
200 3 49 47 54 210 85 215 102 232 85
200 3 43 45 44 46 137 68 137 68 186
200 3 43 44 42 46 137 68 186 46 186
200 3 51 49 54 216 70 210 85 232 85
200 3 40 43 42 23 137 45 137 45 186
200 3 40 42 39 23 137 45 186 23 186
200 3 53 51 54 232 63 216 69 232 84
200 3 41 40 39 0 137 22 137 22 186
200 3 41 39 38 0 137 22 186 0 186
200 3 41 53 54 247 70 232 63 232 84
200 3 43 40 54 247 102 254 86 233 85
CONNECTORS 1
32 -65 136
160 changes: 160 additions & 0 deletions data/base/structs/factory_module2.pie
View file
@@ -0,0 +1,160 @@
PIE 2
TYPE 10200
TEXTURE 0 page-13-player-buildings.png 256 256
LEVELS 1
LEVEL 1
POINTS 79
-140 0 37
-170 0 24
-170 78 24
-140 78 37
-183 0 -5
-183 78 -5
-170 0 -36
-170 78 -36
-140 0 -49
-140 78 -49
-109 0 -36
-109 78 -36
-97 0 -5
-97 78 -5
-109 0 24
-109 78 24
-140 93 -3
-4 99 37
-4 0 57
-73 0 57
-73 99 37
-14 150 -114
-4 100 -136
-63 150 -114
-73 100 -136
-73 1 -185
-73 100 -185
-4 100 -185
54 150 -114
64 100 -136
64 99 37
5 150 -114
64 100 -185
64 0 57
133 1 -185
133 100 -185
-74 0 135
-87 0 165
-87 78 165
-74 78 135
-117 0 178
-117 78 178
-148 0 165
-148 78 165
-161 0 135
-161 78 135
-148 0 104
-148 78 104
-117 0 91
-117 78 91
-87 0 104
-87 78 104
-115 93 135
133 100 -136
123 150 -114
74 150 -114
133 99 37
134 100 -185
134 100 -136
133 0 57
138 93 126
145 78 85
173 78 103
180 78 135
162 78 163
130 78 171
102 78 153
95 78 120
113 78 93
145 0 85
173 0 103
180 0 135
162 0 163
130 0 171
102 0 153
95 0 120
113 0 93
-72 100 -136
-72 100 -185
POLYGONS 72
200 3 61 68 60 210 82 213 99 231 86
200 3 61 62 70 0 84 22 84 22 133
200 3 61 70 69 0 84 22 133 0 133
200 3 68 67 60 214 99 228 108 231 86
200 3 62 63 71 23 84 45 84 45 133
200 3 62 71 70 23 84 45 133 23 133
200 3 67 66 60 229 108 245 105 232 86
200 3 63 64 72 46 84 68 84 68 133
200 3 63 72 71 46 84 68 133 46 133
200 3 66 65 60 245 104 254 90 232 86
200 3 64 65 73 69 84 90 84 90 133
200 3 64 73 72 69 84 90 133 69 133
200 3 65 64 60 254 89 252 73 232 85
200 3 65 66 74 91 84 113 84 113 133
200 3 65 74 73 91 84 113 133 91 133
200 3 64 63 60 251 73 237 64 232 85
200 3 66 67 75 114 84 136 84 136 133
200 3 66 75 74 114 84 136 133 114 133
200 3 63 62 60 236 64 220 66 231 85
200 3 68 61 69 160 84 182 84 182 133
200 3 68 69 76 160 84 182 133 160 133
200 3 62 61 60 220 67 210 81 231 85
200 3 67 68 76 137 84 159 84 159 133
200 3 67 76 75 137 84 159 133 137 133
200 3 24 20 23 68 25 7 26 60 0
200 3 17 22 21 7 26 68 26 61 0
200 3 56 53 54 7 26 68 26 61 0
200 3 29 30 55 68 25 7 26 60 0
200 3 22 17 31 68 25 7 26 60 0
200 3 30 29 28 7 26 68 26 61 0
200 3 24 23 21 87 21 91 0 116 0
200 3 24 21 22 87 21 116 0 120 21
200 3 22 31 28 87 45 91 24 115 24
200 3 22 28 29 87 45 115 24 120 45
200 3 29 55 54 87 69 91 48 116 48
200 3 29 54 53 87 69 116 48 120 69
200 3 32 29 53 222 157 222 183 247 183
200 3 32 53 35 222 157 247 183 247 157
200 3 22 29 32 222 183 248 184 248 157
200 3 22 32 27 222 183 248 157 222 157
200 3 22 27 78 248 184 248 157 222 157
200 3 22 78 77 248 184 222 157 222 183
200 3 20 24 25 6 27 68 26 85 76
200 3 20 25 19 6 27 85 76 0 76
200 3 26 25 24 85 26 86 76 69 26
200 3 26 24 77 222 157 222 183 222 183
200 3 26 77 78 222 157 222 183 222 157
200 3 34 53 56 85 76 69 26 7 26
200 3 34 56 59 85 76 7 26 0 76
200 3 53 34 57 69 26 85 76 85 26
200 3 58 57 35 248 184 248 157 247 157
200 3 58 35 53 248 184 247 157 247 183
200 3 26 57 34 124 0 231 0 231 45
200 3 26 34 25 124 0 231 45 124 45
200 3 5 7 6 46 189 68 189 68 236
200 3 5 6 4 46 189 68 236 46 236
200 3 23 20 17 189 248 184 165 218 165
200 3 23 17 21 189 248 218 165 214 248
200 3 31 17 30 189 248 184 165 218 165
200 3 31 30 28 189 248 218 165 214 248
200 3 55 30 56 189 248 184 165 218 165
200 3 55 56 54 189 248 218 165 214 248
200 3 2 5 4 23 189 45 189 45 236
200 3 2 4 1 23 189 45 236 23 236
200 3 20 19 18 0 27 0 77 12 77
200 3 20 18 17 0 27 12 77 12 27
200 3 17 18 33 0 27 0 77 12 77
200 3 17 33 30 0 27 12 77 12 27
200 3 30 33 59 0 27 0 77 12 77
200 3 30 59 56 0 27 12 77 12 27
200 3 3 2 1 0 189 22 189 22 236
200 3 3 1 0 0 189 22 236 0 236
CONNECTORS 1
101 -63 136

0 comments on commit e02cb38

Please sign in to comment.