summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-12-08 11:54:23 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-12-08 11:54:23 +0100
commit34a2dd53faf6c829fc25e3e7e96e55c789578f97 (patch)
tree11f292b19f1590c282b8a33e37e9eb9b118b7ef7
parente3a66514d57ff4acf2f02df7d86bd2cf8be0e730 (diff)
downloadRCade-34a2dd53faf6c829fc25e3e7e96e55c789578f97.tar
RCade-34a2dd53faf6c829fc25e3e7e96e55c789578f97.tar.gz
RCade-34a2dd53faf6c829fc25e3e7e96e55c789578f97.tar.bz2
RCade-34a2dd53faf6c829fc25e3e7e96e55c789578f97.tar.xz
RCade-34a2dd53faf6c829fc25e3e7e96e55c789578f97.zip
Cleanup
-rw-r--r--data/EnemyShip_template.txt~12
-rw-r--r--data/Level_template.txt~14
-rw-r--r--data/UserShip_template.txt~15
-rw-r--r--data/beam.txt~5
-rw-r--r--data/beamer1.txt~9
-rw-r--r--data/bigspit.txt~4
-rw-r--r--data/creator.cpp~32
-rw-r--r--data/fire1.txt~4
-rw-r--r--data/fireball1.txt~9
-rw-r--r--data/introlevel.txt~14
-rw-r--r--data/levels/Levels.txt~1
-rw-r--r--data/levels/insanelevel.txt~20
-rw-r--r--data/levels/introlevel.txt~14
-rw-r--r--data/levels/level2.txt~16
-rw-r--r--data/levels/level3.txt~20
-rw-r--r--data/levels/level4.txt~14
-rw-r--r--data/levels/levels.txt~4
-rw-r--r--data/nnova.txt~254
-rw-r--r--data/nova1.txt~1504
-rw-r--r--data/projectile_template.txt~4
-rw-r--r--data/projectiles/projectile_template.txt~4
-rw-r--r--data/projectiles/psi.txt~5
-rw-r--r--data/psi.txt~4
-rw-r--r--data/ships/tork/capsule.txt~10
-rw-r--r--data/ships/tork/cruiser.txt~14
-rw-r--r--data/ships/tork/interceptor.txt~16
-rw-r--r--data/ships/tork/spacerocket.txt~14
-rw-r--r--data/ships/tork/sting.txt~12
-rw-r--r--data/ships/tork/stinger.txt~12
-rw-r--r--data/ships/tork/tanker.txt~10
-rw-r--r--data/ships/tork/tork_interceptor.txt~16
-rw-r--r--data/ships/tork/tork_spacerocket.txt~14
-rw-r--r--data/ships/user/UserShip_template.txt~16
-rw-r--r--data/ships/user/hornet.txt~20
-rw-r--r--data/ships/user/small_fighter.txt~17
-rw-r--r--data/ships/user/userships.txt~1
-rw-r--r--data/small_fighter.txt~14
-rw-r--r--data/spit.txt~4
-rw-r--r--data/spitter1.txt~9
-rw-r--r--data/spitter2.txt~19
-rw-r--r--data/spitter3.txt~39
-rw-r--r--data/tork_capsule.txt~10
-rw-r--r--data/tork_interceptor.txt~16
-rw-r--r--data/tork_spacerocket.txt~14
-rw-r--r--data/weapon_template.txt~4
-rw-r--r--data/weapons.txt~0
-rw-r--r--data/weapons/beamer1.txt~11
-rw-r--r--data/weapons/beamer2.txt~21
-rw-r--r--data/weapons/creator.cpp~34
-rw-r--r--data/weapons/empty.txt~11
-rw-r--r--data/weapons/fireball1.txt~11
-rw-r--r--data/weapons/inawaffe.txt~31
-rw-r--r--data/weapons/nova1.txt~1506
-rw-r--r--data/weapons/novaspitter1.txt~36
-rw-r--r--data/weapons/spitter1.txt~11
-rw-r--r--data/weapons/spitter2.txt~21
-rw-r--r--data/weapons/spitter3.txt~41
-rw-r--r--data/weapons/weapon_template.txt~16
-rw-r--r--data/weapons/weapons.txt~10
59 files changed, 0 insertions, 4043 deletions
diff --git a/data/EnemyShip_template.txt~ b/data/EnemyShip_template.txt~
deleted file mode 100644
index 2fdb348..0000000
--- a/data/EnemyShip_template.txt~
+++ /dev/null
@@ -1,12 +0,0 @@
1Tork Spacerocket #name
2data/images/tork_spacerocket.bmp #path of imagefile
37 #maxhp
45 #armor
550 #moveSpeed
64 #collisionSize
73 #Gold
83 #exp
93 #score
101 #number of weapons
110 -1 #relative Position of weapon
12data/fireball.txt #path of weapon
diff --git a/data/Level_template.txt~ b/data/Level_template.txt~
deleted file mode 100644
index 5f56909..0000000
--- a/data/Level_template.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1IntroLevel #name
2data/images/bg_stars.bmp #path of background
330 #speed of background
41 #wether to randomize background position
560 #duration [s]
612346543 #seed
72 #number of Shiptypes
8data/tork_capsule.txt #path of Ship
950 #how many of them should spawn
10data/tork_spacerocket.txt #path of Ship
1112 #how many
121 #how many events shall happen
130.5 #percentage of completion the event happens
14****event***** #an event
diff --git a/data/UserShip_template.txt~ b/data/UserShip_template.txt~
deleted file mode 100644
index e526124..0000000
--- a/data/UserShip_template.txt~
+++ /dev/null
@@ -1,15 +0,0 @@
1small Fighter #name
2data/images/small_fighter.bmp #path of imagefile
37 #maxhp
450 #armor
5200 #moveSpeed
6100 #handling
710 #maxEnergy
82 #energyProduction
97 #collisionSize
102 #number of weapons
114 4 #relative Position of weapon
12data/fireball.txt #path of weapon
134 4 #relative Position of weapon
14data/fireball.txt #path of weapon
15
diff --git a/data/beam.txt~ b/data/beam.txt~
deleted file mode 100644
index 99001f3..0000000
--- a/data/beam.txt~
+++ /dev/null
@@ -1,5 +0,0 @@
1data/images/spit.bmp
2data/sounds/piu
30.4
410
51
diff --git a/data/beamer1.txt~ b/data/beamer1.txt~
deleted file mode 100644
index 31ffd79..0000000
--- a/data/beamer1.txt~
+++ /dev/null
@@ -1,9 +0,0 @@
1Beamer 1
2data/images/beamer1.bmp
33
41
50.1
60
7data/beam.txt
80
91000
diff --git a/data/bigspit.txt~ b/data/bigspit.txt~
deleted file mode 100644
index 00d3e4e..0000000
--- a/data/bigspit.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/bigspit.bmp
28
30
44
diff --git a/data/creator.cpp~ b/data/creator.cpp~
deleted file mode 100644
index 9abcdcf..0000000
--- a/data/creator.cpp~
+++ /dev/null
@@ -1,32 +0,0 @@
1#include <iostream>
2#include <fstream>
3#include <math.h>
4
5using namespace std;
6
7int main()
8{
9 ofstream o;
10 o.open("nnova1.txt");
11 o << "Nova 1\n";
12 o << "data/images/empty.bmp\n";
13 o << 2 << '\n';
14 int shots = 300;
15 double T = 10;
16 double duration = 0.6;
17 double start = 3;
18 double speed = 320;
19 int Ncircles = 4;
20 o << shots << endl;
21 for(int i = 0; i < shots; ++i)
22 {
23 o << T << '\n';
24 o << T - start - ((double) i)/((double) shots)*duration-0.0001 << '\n';
25 o << "data/psi.txt\n";
26 o << cos(Ncircles*2*M_PI*i/((double) shots))*speed << '\n';
27 o << sin(Ncircles*2*M_PI*i/((double) shots))*speed;
28 if(i != shots-1)
29 o << endl;
30 }
31 o.close();
32}
diff --git a/data/fire1.txt~ b/data/fire1.txt~
deleted file mode 100644
index 031e2c3..0000000
--- a/data/fire1.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/fire1.bmp
22
310
43.5
diff --git a/data/fireball1.txt~ b/data/fireball1.txt~
deleted file mode 100644
index 1400896..0000000
--- a/data/fireball1.txt~
+++ /dev/null
@@ -1,9 +0,0 @@
1Fireball 1
2data/images/fire1.bmp
31.5
41
53
62
7data/fire1.txt
80
9150
diff --git a/data/introlevel.txt~ b/data/introlevel.txt~
deleted file mode 100644
index 9f40e40..0000000
--- a/data/introlevel.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Introlevel
2data/images/bg_stars.bmp
360
41
590
61246435
73
8data/tork_capsule.txt
925
10data/tork_spacerocket.txt
115
12data/tork_interceptor.txt
132
140
diff --git a/data/levels/Levels.txt~ b/data/levels/Levels.txt~
deleted file mode 100644
index 561a6d1..0000000
--- a/data/levels/Levels.txt~
+++ /dev/null
@@ -1 +0,0 @@
1intro_level.txt
diff --git a/data/levels/insanelevel.txt~ b/data/levels/insanelevel.txt~
deleted file mode 100644
index eec3ac6..0000000
--- a/data/levels/insanelevel.txt~
+++ /dev/null
@@ -1,20 +0,0 @@
1Insane Level
2data/images/bg_stars.bmp
360
41
540
611374431
76
8data/ships/tork/capsule.txt
920
10data/ships/tork/spacerocket.txt
1125
12data/ships/tork/interceptor.txt
136
14data/ships/tork/cruiser.txt
1510
16data/ships/tork/tanker.txt
178
18data/ships/tork/sting.txt
1945
200
diff --git a/data/levels/introlevel.txt~ b/data/levels/introlevel.txt~
deleted file mode 100644
index a4731c7..0000000
--- a/data/levels/introlevel.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Introlevel
2data/images/bg_stars.bmp
360
41
550
61246436
73
8data/ships/tork/capsule.txt
935
10data/ships/tork/spacerocket.txt
115
12data/ships/tork/interceptor.txt
132
140
diff --git a/data/levels/level2.txt~ b/data/levels/level2.txt~
deleted file mode 100644
index e50a515..0000000
--- a/data/levels/level2.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1Level 2
2data/images/bg_stars.bmp
360
41
5105
611654436
74
8data/ships/tork/capsule.txt
940
10data/ships/tork/spacerocket.txt
1110
12data/ships/tork/interceptor.txt
136
14data/ships/tork/cruiser.txt
152
160
diff --git a/data/levels/level3.txt~ b/data/levels/level3.txt~
deleted file mode 100644
index 8c103eb..0000000
--- a/data/levels/level3.txt~
+++ /dev/null
@@ -1,20 +0,0 @@
1Level 3
2data/images/bg_stars.bmp
360
41
565
611374331
76
8data/ships/tork/capsule.txt
9120
10data/ships/tork/spacerocket.txt
1120
12data/ships/tork/interceptor.txt
138
14data/ships/tork/cruiser.txt
158
16data/ships/tork/tanker.txt
1740
18data/ships/tork/sting.txt
1980
200
diff --git a/data/levels/level4.txt~ b/data/levels/level4.txt~
deleted file mode 100644
index aba3a6f..0000000
--- a/data/levels/level4.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Level 4
2data/images/bg_stars.bmp
360
41
550
61246436
73
8data/ships/tork/sting.txt
935
10data/ships/tork/interceptor.txt
115
12data/ships/tork/cruiser.txt
132
140
diff --git a/data/levels/levels.txt~ b/data/levels/levels.txt~
deleted file mode 100644
index acc839a..0000000
--- a/data/levels/levels.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1introlevel.txt
2level2.txt
3level3.txt
4insanelevel.txt
diff --git a/data/nnova.txt~ b/data/nnova.txt~
deleted file mode 100644
index b15b226..0000000
--- a/data/nnova.txt~
+++ /dev/null
@@ -1,254 +0,0 @@
1Nova 1
2data/images/empty.bmp
320
450
510
63
7data/psi.txt
8350
90
1010
113.5
12data/psi.txt
13347.24
1443.8666
1510
164
17data/psi.txt
18339.004
1987.0415
2010
214.5
22data/psi.txt
23325.422
24128.844
2510
265
27data/psi.txt
28306.707
29168.614
3010
315.5
32data/psi.txt
33283.156
34205.725
3510
366
37data/psi.txt
38255.139
39239.591
4010
416.5
42data/psi.txt
43223.098
44269.68
4510
467
47data/psi.txt
48187.539
49295.515
5010
517.5
52data/psi.txt
53149.023
54316.689
5510
568
57data/psi.txt
58108.156
59332.87
6010
618.5
62data/psi.txt
6365.5835
64343.801
6510
669
67data/psi.txt
6821.9767
69349.309
7010
719.5
72data/psi.txt
73-21.9767
74349.309
7510
7610
77data/psi.txt
78-65.5835
79343.801
8010
8110.5
82data/psi.txt
83-108.156
84332.87
8510
8611
87data/psi.txt
88-149.023
89316.689
9010
9111.5
92data/psi.txt
93-187.539
94295.515
9510
9612
97data/psi.txt
98-223.098
99269.68
10010
10112.5
102data/psi.txt
103-255.139
104239.591
10510
10613
107data/psi.txt
108-283.156
109205.725
11010
11113.5
112data/psi.txt
113-306.707
114168.614
11510
11614
117data/psi.txt
118-325.422
119128.844
12010
12114.5
122data/psi.txt
123-339.004
12487.0415
12510
12615
127data/psi.txt
128-347.24
12943.8666
13010
13115.5
132data/psi.txt
133-350
1344.28626e-14
13510
13616
137data/psi.txt
138-347.24
139-43.8666
14010
14116.5
142data/psi.txt
143-339.004
144-87.0415
14510
14617
147data/psi.txt
148-325.422
149-128.844
15010
15117.5
152data/psi.txt
153-306.707
154-168.614
15510
15618
157data/psi.txt
158-283.156
159-205.725
16010
16118.5
162data/psi.txt
163-255.139
164-239.591
16510
16619
167data/psi.txt
168-223.098
169-269.68
17010
17119.5
172data/psi.txt
173-187.539
174-295.515
17510
17620
177data/psi.txt
178-149.023
179-316.689
18010
18120.5
182data/psi.txt
183-108.156
184-332.87
18510
18621
187data/psi.txt
188-65.5835
189-343.801
19010
19121.5
192data/psi.txt
193-21.9767
194-349.309
19510
19622
197data/psi.txt
19821.9767
199-349.309
20010
20122.5
202data/psi.txt
20365.5835
204-343.801
20510
20623
207data/psi.txt
208108.156
209-332.87
21010
21123.5
212data/psi.txt
213149.023
214-316.689
21510
21624
217data/psi.txt
218187.539
219-295.515
22010
22124.5
222data/psi.txt
223223.098
224-269.68
22510
22625
227data/psi.txt
228255.139
229-239.591
23010
23125.5
232data/psi.txt
233283.156
234-205.725
23510
23626
237data/psi.txt
238306.707
239-168.614
24010
24126.5
242data/psi.txt
243325.422
244-128.844
24510
24627
247data/psi.txt
248339.004
249-87.0415
25010
25127.5
252data/psi.txt
253347.24
254-43.8666
diff --git a/data/nova1.txt~ b/data/nova1.txt~
deleted file mode 100644
index 2fe20c5..0000000
--- a/data/nova1.txt~
+++ /dev/null
@@ -1,1504 +0,0 @@
1Nova 1
2data/images/empty.bmp
32
4300
510
66.9999
7data/psi.txt
8320
90
1010
116.9979
12data/psi.txt
13318.878
1426.7769
1510
166.9959
17data/psi.txt
18315.519
1953.366
2010
216.9939
22data/psi.txt
23309.947
2479.5808
2510
266.9919
27data/psi.txt
28302.2
29105.237
3010
316.9899
32data/psi.txt
33292.335
34130.156
3510
366.9879
37data/psi.txt
38280.418
39154.161
4010
416.9859
42data/psi.txt
43266.535
44177.085
4510
466.9839
47data/psi.txt
48250.782
49198.767
5010
516.9819
52data/psi.txt
53233.27
54219.055
5510
566.9799
57data/psi.txt
58214.122
59237.806
6010
616.9779
62data/psi.txt
63193.472
64254.89
6510
666.9759
67data/psi.txt
68171.465
69270.185
7010
716.9739
72data/psi.txt
73148.255
74283.585
7510
766.9719
77data/psi.txt
78124.005
79294.996
8010
816.9699
82data/psi.txt
8398.8854
84304.338
8510
866.9679
87data/psi.txt
8873.0723
89311.545
9010
916.9659
92data/psi.txt
9346.7466
94316.567
9510
966.9639
97data/psi.txt
9820.093
99319.369
10010
1016.9619
102data/psi.txt
103-6.70157
104319.93
10510
1066.9599
107data/psi.txt
108-33.4491
109318.247
11010
1116.9579
112data/psi.txt
113-59.962
114314.332
11510
1166.9559
117data/psi.txt
118-86.0543
119308.212
12010
1216.9539
122data/psi.txt
123-111.543
124299.93
12510
1266.9519
127data/psi.txt
128-136.249
129289.545
13010
1316.9499
132data/psi.txt
133-160
134277.128
13510
1366.9479
137data/psi.txt
138-182.628
139262.768
14010
1416.9459
142data/psi.txt
143-203.976
144246.564
14510
1466.9439
147data/psi.txt
148-223.892
149228.631
15010
1516.9419
152data/psi.txt
153-242.238
154209.095
15510
1566.9399
157data/psi.txt
158-258.885
159188.091
16010
1616.9379
162data/psi.txt
163-273.717
164165.769
16510
1666.9359
167data/psi.txt
168-286.628
169142.283
17010
1716.9339
172data/psi.txt
173-297.528
174117.8
17510
1766.9319
177data/psi.txt
178-306.342
17992.4902
18010
1816.9299
182data/psi.txt
183-313.007
18466.5317
18510
1866.9279
187data/psi.txt
188-317.477
18940.1066
19010
1916.9259
192data/psi.txt
193-319.719
19413.4002
19510
1966.9239
197data/psi.txt
198-319.719
199-13.4002
20010
2016.9219
202data/psi.txt
203-317.477
204-40.1066
20510
2066.9199
207data/psi.txt
208-313.007
209-66.5317
21010
2116.9179
212data/psi.txt
213-306.342
214-92.4902
21510
2166.9159
217data/psi.txt
218-297.528
219-117.8
22010
2216.9139
222data/psi.txt
223-286.628
224-142.283
22510
2266.9119
227data/psi.txt
228-273.717
229-165.769
23010
2316.9099
232data/psi.txt
233-258.885
234-188.091
23510
2366.9079
237data/psi.txt
238-242.238
239-209.095
24010
2416.9059
242data/psi.txt
243-223.892
244-228.631
24510
2466.9039
247data/psi.txt
248-203.976
249-246.564
25010
2516.9019
252data/psi.txt
253-182.628
254-262.768
25510
2566.8999
257data/psi.txt
258-160
259-277.128
26010
2616.8979
262data/psi.txt
263-136.249
264-289.545
26510
2666.8959
267data/psi.txt
268-111.543
269-299.93
27010
2716.8939
272data/psi.txt
273-86.0543
274-308.212
27510
2766.8919
277data/psi.txt
278-59.962
279-314.332
28010
2816.8899
282data/psi.txt
283-33.4491
284-318.247
28510
2866.8879
287data/psi.txt
288-6.70157
289-319.93
29010
2916.8859
292data/psi.txt
29320.093
294-319.369
29510
2966.8839
297data/psi.txt
29846.7466
299-316.567
30010
3016.8819
302data/psi.txt
30373.0723
304-311.545
30510
3066.8799
307data/psi.txt
30898.8854
309-304.338
31010
3116.8779
312data/psi.txt
313124.005
314-294.996
31510
3166.8759
317data/psi.txt
318148.255
319-283.585
32010
3216.8739
322data/psi.txt
323171.465
324-270.185
32510
3266.8719
327data/psi.txt
328193.472
329-254.89
33010
3316.8699
332data/psi.txt
333214.122
334-237.806
33510
3366.8679
337data/psi.txt
338233.27
339-219.055
34010
3416.8659
342data/psi.txt
343250.782
344-198.767
34510
3466.8639
347data/psi.txt
348266.535
349-177.085
35010
3516.8619
352data/psi.txt
353280.418
354-154.161
35510
3566.8599
357data/psi.txt
358292.335
359-130.156
36010
3616.8579
362data/psi.txt
363302.2
364-105.237
36510
3666.8559
367data/psi.txt
368309.947
369-79.5808
37010
3716.8539
372data/psi.txt
373315.519
374-53.366
37510
3766.8519
377data/psi.txt
378318.878
379-26.7769
38010
3816.8499
382data/psi.txt
383320
384-7.83774e-14
38510
3866.8479
387data/psi.txt
388318.878
38926.7769
39010
3916.8459
392data/psi.txt
393315.519
39453.366
39510
3966.8439
397data/psi.txt
398309.947
39979.5808
40010
4016.8419
402data/psi.txt
403302.2
404105.237
40510
4066.8399
407data/psi.txt
408292.335
409130.156
41010
4116.8379
412data/psi.txt
413280.418
414154.161
41510
4166.8359
417data/psi.txt
418266.535
419177.085
42010
4216.8339
422data/psi.txt
423250.782
424198.767
42510
4266.8319
427data/psi.txt
428233.27
429219.055
43010
4316.8299
432data/psi.txt
433214.122
434237.806
43510
4366.8279
437data/psi.txt
438193.472
439254.89
44010
4416.8259
442data/psi.txt
443171.465
444270.185
44510
4466.8239
447data/psi.txt
448148.255
449283.585
45010
4516.8219
452data/psi.txt
453124.005
454294.996
45510
4566.8199
457data/psi.txt
45898.8854
459304.338
46010
4616.8179
462data/psi.txt
46373.0723
464311.545
46510
4666.8159
467data/psi.txt
46846.7466
469316.567
47010
4716.8139
472data/psi.txt
47320.093
474319.369
47510
4766.8119
477data/psi.txt
478-6.70157
479319.93
48010
4816.8099
482data/psi.txt
483-33.4491
484318.247
48510
4866.8079
487data/psi.txt
488-59.962
489314.332
49010
4916.8059
492data/psi.txt
493-86.0543
494308.212
49510
4966.8039
497data/psi.txt
498-111.543
499299.93
50010
5016.8019
502data/psi.txt
503-136.249
504289.545
50510
5066.7999
507data/psi.txt
508-160
509277.128
51010
5116.7979
512data/psi.txt
513-182.628
514262.768
51510
5166.7959
517data/psi.txt
518-203.976
519246.564
52010
5216.7939
522data/psi.txt
523-223.892
524228.631
52510
5266.7919
527data/psi.txt
528-242.238
529209.095
53010
5316.7899
532data/psi.txt
533-258.885
534188.091
53510
5366.7879
537data/psi.txt
538-273.717
539165.769
54010
5416.7859
542data/psi.txt
543-286.628
544142.283
54510
5466.7839
547data/psi.txt
548-297.528
549117.8
55010
5516.7819
552data/psi.txt
553-306.342
55492.4902
55510
5566.7799
557data/psi.txt
558-313.007
55966.5317
56010
5616.7779
562data/psi.txt
563-317.477
56440.1066
56510
5666.7759
567data/psi.txt
568-319.719
56913.4002
57010
5716.7739
572data/psi.txt
573-319.719
574-13.4002
57510
5766.7719
577data/psi.txt
578-317.477
579-40.1066
58010
5816.7699
582data/psi.txt
583-313.007
584-66.5317
58510
5866.7679
587data/psi.txt
588-306.342
589-92.4902
59010
5916.7659
592data/psi.txt
593-297.528
594-117.8
59510
5966.7639
597data/psi.txt
598-286.628
599-142.283
60010
6016.7619
602data/psi.txt
603-273.717
604-165.769
60510
6066.7599
607data/psi.txt
608-258.885
609-188.091
61010
6116.7579
612data/psi.txt
613-242.238
614-209.095
61510
6166.7559
617data/psi.txt
618-223.892
619-228.631
62010
6216.7539
622data/psi.txt
623-203.976
624-246.564
62510
6266.7519
627data/psi.txt
628-182.628
629-262.768
63010
6316.7499
632data/psi.txt
633-160
634-277.128
63510
6366.7479
637data/psi.txt
638-136.249
639-289.545
64010
6416.7459
642data/psi.txt
643-111.543
644-299.93
64510
6466.7439
647data/psi.txt
648-86.0543
649-308.212
65010
6516.7419
652data/psi.txt
653-59.962
654-314.332
65510
6566.7399
657data/psi.txt
658-33.4491
659-318.247
66010
6616.7379
662data/psi.txt
663-6.70157
664-319.93
66510
6666.7359
667data/psi.txt
66820.093
669-319.369
67010
6716.7339
672data/psi.txt
67346.7466
674-316.567
67510
6766.7319
677data/psi.txt
67873.0723
679-311.545
68010
6816.7299
682data/psi.txt
68398.8854
684-304.338
68510
6866.7279
687data/psi.txt
688124.005
689-294.996
69010
6916.7259
692data/psi.txt
693148.255
694-283.585
69510
6966.7239
697data/psi.txt
698171.465
699-270.185
70010
7016.7219
702data/psi.txt
703193.472
704-254.89
70510
7066.7199
707data/psi.txt
708214.122
709-237.806
71010
7116.7179
712data/psi.txt
713233.27
714-219.055
71510
7166.7159
717data/psi.txt
718250.782
719-198.767
72010
7216.7139
722data/psi.txt
723266.535
724-177.085
72510
7266.7119
727data/psi.txt
728280.418
729-154.161
73010
7316.7099
732data/psi.txt
733292.335
734-130.156
73510
7366.7079
737data/psi.txt
738302.2
739-105.237
74010
7416.7059
742data/psi.txt
743309.947
744-79.5808
74510
7466.7039
747data/psi.txt
748315.519
749-53.366
75010
7516.7019
752data/psi.txt
753318.878
754-26.7769
75510
7566.6999
757data/psi.txt
758320
759-1.56755e-13
76010
7616.6979
762data/psi.txt
763318.878
76426.7769
76510
7666.6959
767data/psi.txt
768315.519
76953.366
77010
7716.6939
772data/psi.txt
773309.947
77479.5808
77510
7766.6919
777data/psi.txt
778302.2
779105.237
78010
7816.6899
782data/psi.txt
783292.335
784130.156
78510
7866.6879
787data/psi.txt
788280.418
789154.161
79010
7916.6859
792data/psi.txt
793266.535
794177.085
79510
7966.6839
797data/psi.txt
798250.782
799198.767
80010
8016.6819
802data/psi.txt
803233.27
804219.055
80510
8066.6799
807data/psi.txt
808214.122
809237.806
81010
8116.6779
812data/psi.txt
813193.472
814254.89
81510
8166.6759
817data/psi.txt
818171.465
819270.185
82010
8216.6739
822data/psi.txt
823148.255
824283.585
82510
8266.6719
827data/psi.txt
828124.005
829294.996
83010
8316.6699
832data/psi.txt
83398.8854
834304.338
83510
8366.6679
837data/psi.txt
83873.0723
839311.545
84010
8416.6659
842data/psi.txt
84346.7466
844316.567
84510
8466.6639
847data/psi.txt
84820.093
849319.369
85010
8516.6619
852data/psi.txt
853-6.70157
854319.93
85510
8566.6599
857data/psi.txt
858-33.4491
859318.247
86010
8616.6579
862data/psi.txt
863-59.962
864314.332
86510
8666.6559
867data/psi.txt
868-86.0543
869308.212
87010
8716.6539
872data/psi.txt
873-111.543
874299.93
87510
8766.6519
877data/psi.txt
878-136.249
879289.545
88010
8816.6499
882data/psi.txt
883-160
884277.128
88510
8866.6479
887data/psi.txt
888-182.628
889262.768
89010
8916.6459
892data/psi.txt
893-203.976
894246.564
89510
8966.6439
897data/psi.txt
898-223.892
899228.631
90010
9016.6419
902data/psi.txt
903-242.238
904209.095
90510
9066.6399
907data/psi.txt
908-258.885
909188.091
91010
9116.6379
912data/psi.txt
913-273.717
914165.769
91510
9166.6359
917data/psi.txt
918-286.628
919142.283
92010
9216.6339
922data/psi.txt
923-297.528
924117.8
92510
9266.6319
927data/psi.txt
928-306.342
92992.4902
93010
9316.6299
932data/psi.txt
933-313.007
93466.5317
93510
9366.6279
937data/psi.txt
938-317.477
93940.1066
94010
9416.6259
942data/psi.txt
943-319.719
94413.4002
94510
9466.6239
947data/psi.txt
948-319.719
949-13.4002
95010
9516.6219
952data/psi.txt
953-317.477
954-40.1066
95510
9566.6199
957data/psi.txt
958-313.007
959-66.5317
96010
9616.6179
962data/psi.txt
963-306.342
964-92.4902
96510
9666.6159
967data/psi.txt
968-297.528
969-117.8
97010
9716.6139
972data/psi.txt
973-286.628
974-142.283
97510
9766.6119
977data/psi.txt
978-273.717
979-165.769
98010
9816.6099
982data/psi.txt
983-258.885
984-188.091
98510
9866.6079
987data/psi.txt
988-242.238
989-209.095
99010
9916.6059
992data/psi.txt
993-223.892
994-228.631
99510
9966.6039
997data/psi.txt
998-203.976
999-246.564
100010
10016.6019
1002data/psi.txt
1003-182.628
1004-262.768
100510
10066.5999
1007data/psi.txt
1008-160
1009-277.128
101010
10116.5979
1012data/psi.txt
1013-136.249
1014-289.545
101510
10166.5959
1017data/psi.txt
1018-111.543
1019-299.93
102010
10216.5939
1022data/psi.txt
1023-86.0543
1024-308.212
102510
10266.5919
1027data/psi.txt
1028-59.962
1029-314.332
103010
10316.5899
1032data/psi.txt
1033-33.4491
1034-318.247
103510
10366.5879
1037data/psi.txt
1038-6.70157
1039-319.93
104010
10416.5859
1042data/psi.txt
104320.093
1044-319.369
104510
10466.5839
1047data/psi.txt
104846.7466
1049-316.567
105010
10516.5819
1052data/psi.txt
105373.0723
1054-311.545
105510
10566.5799
1057data/psi.txt
105898.8854
1059-304.338
106010
10616.5779
1062data/psi.txt
1063124.005
1064-294.996
106510
10666.5759
1067data/psi.txt
1068148.255
1069-283.585
107010
10716.5739
1072data/psi.txt
1073171.465
1074-270.185
107510
10766.5719
1077data/psi.txt
1078193.472
1079-254.89
108010
10816.5699
1082data/psi.txt
1083214.122
1084-237.806
108510
10866.5679
1087data/psi.txt
1088233.27
1089-219.055
109010
10916.5659
1092data/psi.txt
1093250.782
1094-198.767
109510
10966.5639
1097data/psi.txt
1098266.535
1099-177.085
110010
11016.5619
1102data/psi.txt
1103280.418
1104-154.161
110510
11066.5599
1107data/psi.txt
1108292.335
1109-130.156
111010
11116.5579
1112data/psi.txt
1113302.2
1114-105.237
111510
11166.5559
1117data/psi.txt
1118309.947
1119-79.5808
112010
11216.5539
1122data/psi.txt
1123315.519
1124-53.366
112510
11266.5519
1127data/psi.txt
1128318.878
1129-26.7769
113010
11316.5499
1132data/psi.txt
1133320
1134-2.35132e-13
113510
11366.5479
1137data/psi.txt
1138318.878
113926.7769
114010
11416.5459
1142data/psi.txt
1143315.519
114453.366
114510
11466.5439
1147data/psi.txt
1148309.947
114979.5808
115010
11516.5419
1152data/psi.txt
1153302.2
1154105.237
115510
11566.5399
1157data/psi.txt
1158292.335
1159130.156
116010
11616.5379
1162data/psi.txt
1163280.418
1164154.161
116510
11666.5359
1167data/psi.txt
1168266.535
1169177.085
117010
11716.5339
1172data/psi.txt
1173250.782
1174198.767
117510
11766.5319
1177data/psi.txt
1178233.27
1179219.055
118010
11816.5299
1182data/psi.txt
1183214.122
1184237.806
118510
11866.5279
1187data/psi.txt
1188193.472
1189254.89
119010
11916.5259
1192data/psi.txt
1193171.465
1194270.185
119510
11966.5239
1197data/psi.txt
1198148.255
1199283.585
120010
12016.5219
1202data/psi.txt
1203124.005
1204294.996
120510
12066.5199
1207data/psi.txt
120898.8854
1209304.338
121010
12116.5179
1212data/psi.txt
121373.0723
1214311.545
121510
12166.5159
1217data/psi.txt
121846.7466
1219316.567
122010
12216.5139
1222data/psi.txt
122320.093
1224319.369
122510
12266.5119
1227data/psi.txt
1228-6.70157
1229319.93
123010
12316.5099
1232data/psi.txt
1233-33.4491
1234318.247
123510
12366.5079
1237data/psi.txt
1238-59.962
1239314.332
124010
12416.5059
1242data/psi.txt
1243-86.0543
1244308.212
124510
12466.5039
1247data/psi.txt
1248-111.543
1249299.93
125010
12516.5019
1252data/psi.txt
1253-136.249
1254289.545
125510
12566.4999
1257data/psi.txt
1258-160
1259277.128
126010
12616.4979
1262data/psi.txt
1263-182.628
1264262.768
126510
12666.4959
1267data/psi.txt
1268-203.976
1269246.564
127010
12716.4939
1272data/psi.txt
1273-223.892
1274228.631
127510
12766.4919
1277data/psi.txt
1278-242.238
1279209.095
128010
12816.4899
1282data/psi.txt
1283-258.885
1284188.091
128510
12866.4879
1287data/psi.txt
1288-273.717
1289165.769
129010
12916.4859
1292data/psi.txt
1293-286.628
1294142.283
129510
12966.4839
1297data/psi.txt
1298-297.528
1299117.8
130010
13016.4819
1302data/psi.txt
1303-306.342
130492.4902
130510
13066.4799
1307data/psi.txt
1308-313.007
130966.5317
131010
13116.4779
1312data/psi.txt
1313-317.477
131440.1066
131510
13166.4759
1317data/psi.txt
1318-319.719
131913.4002
132010
13216.4739
1322data/psi.txt
1323-319.719
1324-13.4002
132510
13266.4719
1327data/psi.txt
1328-317.477
1329-40.1066
133010
13316.4699
1332data/psi.txt
1333-313.007
1334-66.5317
133510
13366.4679
1337data/psi.txt
1338-306.342
1339-92.4902
134010
13416.4659
1342data/psi.txt
1343-297.528
1344-117.8
134510
13466.4639
1347data/psi.txt
1348-286.628
1349-142.283
135010
13516.4619
1352data/psi.txt
1353-273.717
1354-165.769
135510
13566.4599
1357data/psi.txt
1358-258.885
1359-188.091
136010
13616.4579
1362data/psi.txt
1363-242.238
1364-209.095
136510
13666.4559
1367data/psi.txt
1368-223.892
1369-228.631
137010
13716.4539
1372data/psi.txt
1373-203.976
1374-246.564
137510
13766.4519
1377data/psi.txt
1378-182.628
1379-262.768
138010
13816.4499
1382data/psi.txt
1383-160
1384-277.128
138510
13866.4479
1387data/psi.txt
1388-136.249
1389-289.545
139010
13916.4459
1392data/psi.txt
1393-111.543
1394-299.93
139510
13966.4439
1397data/psi.txt
1398-86.0543
1399-308.212
140010
14016.4419
1402data/psi.txt
1403-59.962
1404-314.332
140510
14066.4399
1407data/psi.txt
1408-33.4491
1409-318.247
141010
14116.4379
1412data/psi.txt
1413-6.70157
1414-319.93
141510
14166.4359
1417data/psi.txt
141820.093
1419-319.369
142010
14216.4339
1422data/psi.txt
142346.7466
1424-316.567
142510
14266.4319
1427data/psi.txt
142873.0723
1429-311.545
143010
14316.4299
1432data/psi.txt
143398.8854
1434-304.338
143510
14366.4279
1437data/psi.txt
1438124.005
1439-294.996
144010
14416.4259
1442data/psi.txt
1443148.255
1444-283.585
144510
14466.4239
1447data/psi.txt
1448171.465
1449-270.185
145010
14516.4219
1452data/psi.txt
1453193.472
1454-254.89
145510
14566.4199
1457data/psi.txt
1458214.122
1459-237.806
146010
14616.4179
1462data/psi.txt
1463233.27
1464-219.055
146510
14666.4159
1467data/psi.txt
1468250.782
1469-198.767
147010
14716.4139
1472data/psi.txt
1473266.535
1474-177.085
147510
14766.4119
1477data/psi.txt
1478280.418
1479-154.161
148010
14816.4099
1482data/psi.txt
1483292.335
1484-130.156
148510
14866.4079
1487data/psi.txt
1488302.2
1489-105.237
149010
14916.4059
1492data/psi.txt
1493309.947
1494-79.5808
149510
14966.4039
1497data/psi.txt
1498315.519
1499-53.366
150010
15016.4019
1502data/psi.txt
1503318.878
1504-26.7769 \ No newline at end of file
diff --git a/data/projectile_template.txt~ b/data/projectile_template.txt~
deleted file mode 100644
index e660251..0000000
--- a/data/projectile_template.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/psi.bmp
21.5
310000
42.2
diff --git a/data/projectiles/projectile_template.txt~ b/data/projectiles/projectile_template.txt~
deleted file mode 100644
index 9ae6fa9..0000000
--- a/data/projectiles/projectile_template.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/projectile2.bmp #path of the imagefile
210 #damage
32 #armorPiercing
41.4142 #collisionSize
diff --git a/data/projectiles/psi.txt~ b/data/projectiles/psi.txt~
deleted file mode 100644
index ed05829..0000000
--- a/data/projectiles/psi.txt~
+++ /dev/null
@@ -1,5 +0,0 @@
1data/images/psi.bmp
2data/sounds/piu
31.5
410000
52.2
diff --git a/data/psi.txt~ b/data/psi.txt~
deleted file mode 100644
index d2a5be5..0000000
--- a/data/psi.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/psi.bmp
21
310000
42.2
diff --git a/data/ships/tork/capsule.txt~ b/data/ships/tork/capsule.txt~
deleted file mode 100644
index eeb2813..0000000
--- a/data/ships/tork/capsule.txt~
+++ /dev/null
@@ -1,10 +0,0 @@
1Tork Capsule
2data/images/ship1.bmp
30.6
410
5140
65.5
71
81
91
100
diff --git a/data/ships/tork/cruiser.txt~ b/data/ships/tork/cruiser.txt~
deleted file mode 100644
index 15e8459..0000000
--- a/data/ships/tork/cruiser.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Tork Cruiser
2data/images/tork_cruiser.bmp
39
425
530
611.5
79
820
914
102
110 3
12data/weapons/spitter1.txt
130 0
14data/weapons/novaspitter1.txt
diff --git a/data/ships/tork/interceptor.txt~ b/data/ships/tork/interceptor.txt~
deleted file mode 100644
index b28ea59..0000000
--- a/data/ships/tork/interceptor.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1Tork Interceptor
2data/images/tork_interceptor.bmp
38
415
555
69
77
815
98
103
115 6
12data/weapons/fireball1.txt
13-5 6
14data/weapons/fireball1.txt
150 2
16data/weapons/spitter2.txt
diff --git a/data/ships/tork/spacerocket.txt~ b/data/ships/tork/spacerocket.txt~
deleted file mode 100644
index ba1d457..0000000
--- a/data/ships/tork/spacerocket.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Tork Spacerocket
2data/images/ship2.bmp
33
410
530
68
73
84
93
102
114 4
12data/weapons/fireball1.txt
13-4 4
14data/weapons/fireball1.txt
diff --git a/data/ships/tork/sting.txt~ b/data/ships/tork/sting.txt~
deleted file mode 100644
index b17b4a6..0000000
--- a/data/ships/tork/sting.txt~
+++ /dev/null
@@ -1,12 +0,0 @@
1Tork Sting
2data/images/tork_sting.bmp
34
48
565
69
74
84
95
101
110 0
12data/weapons/fireball1.txt
diff --git a/data/ships/tork/stinger.txt~ b/data/ships/tork/stinger.txt~
deleted file mode 100644
index ee04032..0000000
--- a/data/ships/tork/stinger.txt~
+++ /dev/null
@@ -1,12 +0,0 @@
1Tork Stinger
2data/images/tork_stinger.bmp
34
48
565
69
74
84
94
101
110 0
12data/weapons/fireball1.txt
diff --git a/data/ships/tork/tanker.txt~ b/data/ships/tork/tanker.txt~
deleted file mode 100644
index e7d8cba..0000000
--- a/data/ships/tork/tanker.txt~
+++ /dev/null
@@ -1,10 +0,0 @@
1Tork Tanker
2data/images/tork_tanker.bmp
310
440
515
611
730
86
915
100
diff --git a/data/ships/tork/tork_interceptor.txt~ b/data/ships/tork/tork_interceptor.txt~
deleted file mode 100644
index 129b903..0000000
--- a/data/ships/tork/tork_interceptor.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1Tork Interceptor
2data/images/tork_interceptor.bmp
38
415
555
67
712
86
96
103
115 6
12data/fireball1.txt
13-5 6
14data/fireball1.txt
150 2
16data/spitter2.txt
diff --git a/data/ships/tork/tork_spacerocket.txt~ b/data/ships/tork/tork_spacerocket.txt~
deleted file mode 100644
index 22bcada..0000000
--- a/data/ships/tork/tork_spacerocket.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Tork Spacerocket
2data/images/ship2.bmp
33
410
530
68
75
82
93
102
114 4
12data/fireball1.txt
13-4 4
14data/fireball1.txt
diff --git a/data/ships/user/UserShip_template.txt~ b/data/ships/user/UserShip_template.txt~
deleted file mode 100644
index 8512129..0000000
--- a/data/ships/user/UserShip_template.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1small Fighter #name
2data/images/small_fighter.bmp #path of imagefile
310 #maxhp
450 #armor
5200 #moveSpeed
6200 #handling
710 #maxEnergy
82 #energyProduction
95 #collisionSize
102 #number of weapons
114 4 #relative Position of weapon
123 #maxSize of attached weapon
13data/fireball.txt #path of weapon
144 4 #relative Position of weapon
153 #maxSize of attached weapon
16data/fireball.txt #path of weapon
diff --git a/data/ships/user/hornet.txt~ b/data/ships/user/hornet.txt~
deleted file mode 100644
index c427bb2..0000000
--- a/data/ships/user/hornet.txt~
+++ /dev/null
@@ -1,20 +0,0 @@
1Hornet
2data/images/hornet.bmp
30
423
525
6270
7250
840
94.5
106
113
126 -6
133
14data/weapons/empty.txt
15-6 -6
163
17data/weapons/empty.txt
180 -3
193
20data/weapons/empty.txt
diff --git a/data/ships/user/small_fighter.txt~ b/data/ships/user/small_fighter.txt~
deleted file mode 100644
index 0501c22..0000000
--- a/data/ships/user/small_fighter.txt~
+++ /dev/null
@@ -1,17 +0,0 @@
1Small Fighter
2data/images/small_fighter.bmp
30
415
510
6190
7300
810
93
105
112
124 -2
133
14data/weapons/beamer2.txt
15-4 -2
163
17data/weapons/empty.txt
diff --git a/data/ships/user/userships.txt~ b/data/ships/user/userships.txt~
deleted file mode 100644
index d44c218..0000000
--- a/data/ships/user/userships.txt~
+++ /dev/null
@@ -1 +0,0 @@
1small_fighter.txt
diff --git a/data/small_fighter.txt~ b/data/small_fighter.txt~
deleted file mode 100644
index f464e1a..0000000
--- a/data/small_fighter.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Small Fighter
2data/images/small_fighter.bmp
310
450
5200
6200
710
82
95
102
114 -2
12data/spitter1.txt
13-4 -2
14data/spitter1.txt
diff --git a/data/spit.txt~ b/data/spit.txt~
deleted file mode 100644
index cf073dc..0000000
--- a/data/spit.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/spit.bmp
21
30
41.4142
diff --git a/data/spitter1.txt~ b/data/spitter1.txt~
deleted file mode 100644
index 9715239..0000000
--- a/data/spitter1.txt~
+++ /dev/null
@@ -1,9 +0,0 @@
1Spitter 1
2data/images/spitter1.bmp
32
41
50.6
60.5
7data/spit.txt
80
9250
diff --git a/data/spitter2.txt~ b/data/spitter2.txt~
deleted file mode 100644
index 777b944..0000000
--- a/data/spitter2.txt~
+++ /dev/null
@@ -1,19 +0,0 @@
1Spitter 2
2data/images/spitter2.bmp
37
43
50.6
60
7data/spit.txt
80
9250
100.6
110.2
12data/spit.txt
1340
14240
150.6
160.4
17data/spit.txt
18-40
19240
diff --git a/data/spitter3.txt~ b/data/spitter3.txt~
deleted file mode 100644
index 06a1d35..0000000
--- a/data/spitter3.txt~
+++ /dev/null
@@ -1,39 +0,0 @@
1Spitter 3
2data/images/spitter3.bmp
315
47
52
60
7data/bigspit.txt
80
9250
100.8
110
12data/spit.txt
1310
14247
150.8
160
17data/spit.txt
18-10
19247
200.8
210.16
22data/spit.txt
23176.78
24176.78
250.8
260.32
27data/spit.txt
28-176.78
29176.78
300.8
310.48
32data/spit.txt
33176.78
34-176.78
350.8
360.64
37data/spit.txt
38-176.78
39-176.78
diff --git a/data/tork_capsule.txt~ b/data/tork_capsule.txt~
deleted file mode 100644
index 467320d..0000000
--- a/data/tork_capsule.txt~
+++ /dev/null
@@ -1,10 +0,0 @@
1Tork Capsule
2data/images/ship1.bmp
32
45
540
66
71
81
91
100
diff --git a/data/tork_interceptor.txt~ b/data/tork_interceptor.txt~
deleted file mode 100644
index 129b903..0000000
--- a/data/tork_interceptor.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1Tork Interceptor
2data/images/tork_interceptor.bmp
38
415
555
67
712
86
96
103
115 6
12data/fireball1.txt
13-5 6
14data/fireball1.txt
150 2
16data/spitter2.txt
diff --git a/data/tork_spacerocket.txt~ b/data/tork_spacerocket.txt~
deleted file mode 100644
index c4840ce..0000000
--- a/data/tork_spacerocket.txt~
+++ /dev/null
@@ -1,14 +0,0 @@
1Tork Spacerocket
2data/images/ship2.bmp
35
410
530
68
75
82
93
102
114 4
12data/fireball1.txt
13-4 4
14data/fireball1.txt
diff --git a/data/weapon_template.txt~ b/data/weapon_template.txt~
deleted file mode 100644
index cf073dc..0000000
--- a/data/weapon_template.txt~
+++ /dev/null
@@ -1,4 +0,0 @@
1data/images/spit.bmp
21
30
41.4142
diff --git a/data/weapons.txt~ b/data/weapons.txt~
deleted file mode 100644
index e69de29..0000000
--- a/data/weapons.txt~
+++ /dev/null
diff --git a/data/weapons/beamer1.txt~ b/data/weapons/beamer1.txt~
deleted file mode 100644
index 1f031fd..0000000
--- a/data/weapons/beamer1.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
1Beamer 1
2data/images/beamer1.bmp
34
41
512
61
70.08
80
9data/projectiles/beam.txt
100
111000
diff --git a/data/weapons/beamer2.txt~ b/data/weapons/beamer2.txt~
deleted file mode 100644
index 1b5ae42..0000000
--- a/data/weapons/beamer2.txt~
+++ /dev/null
@@ -1,21 +0,0 @@
1Beamer 2
2data/images/beamer1.bmp
36
41
535
63
70.15
80
9data/projectiles/beam.txt
100
111000
120.2
130.02
14data/projectiles/beam.txt
15-50
16990
170.2
180.04
19data/projectiles/beam.txt
2050
21990
diff --git a/data/weapons/creator.cpp~ b/data/weapons/creator.cpp~
deleted file mode 100644
index 796d095..0000000
--- a/data/weapons/creator.cpp~
+++ /dev/null
@@ -1,34 +0,0 @@
1#include <iostream>
2#include <fstream>
3#include <math.h>
4
5using namespace std;
6
7int main()
8{
9 ofstream o;
10 o.open("novaspitter1.txt");
11 o << "Novaspitter 1\n";
12 o << "data/images/empty.bmp\n";
13 o << 8 << '\n';
14 o << 1 << '\n';
15 o << 30 << '\n';
16 int shots = 6;
17 double T = 0.8;
18 double duration = 0.0;
19 double start = 0.7;
20 double speed = 250;
21 int Ncircles = 1;
22 o << shots << endl;
23 for(int i = 0; i < shots; ++i)
24 {
25 o << T << '\n';
26 o << T - start - ((double) i)/((double) shots)*duration-0.0001 << '\n';
27 o << "data/projectiles/psi.txt\n";
28 o << cos(Ncircles*2*M_PI*i/((double) shots))*speed << '\n';
29 o << sin(Ncircles*2*M_PI*i/((double) shots))*speed;
30 if(i != shots-1)
31 o << endl;
32 }
33 o.close();
34}
diff --git a/data/weapons/empty.txt~ b/data/weapons/empty.txt~
deleted file mode 100644
index 7b5e1a8..0000000
--- a/data/weapons/empty.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
1empty Slot
2data/images/empty.bmp
32
41
55
61
70.6
80.55
9data/projectiles/spit.txt
100
11250
diff --git a/data/weapons/fireball1.txt~ b/data/weapons/fireball1.txt~
deleted file mode 100644
index 56eb516..0000000
--- a/data/weapons/fireball1.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
1Fireball 1
2data/images/fire1.bmp
31
41
55
61
71.4
80.6
9data/projectiles/fire1.txt
100
11135
diff --git a/data/weapons/inawaffe.txt~ b/data/weapons/inawaffe.txt~
deleted file mode 100644
index ae3eef7..0000000
--- a/data/weapons/inawaffe.txt~
+++ /dev/null
@@ -1,31 +0,0 @@
1Ina's OP-Waffe
2data/images/beamer1.bmp
31.25
41
5100
65
70.3
80
9data/projectiles/beam.txt
100
11700
120.3
130.06
14data/projectiles/beam.txt
15200
16600
170.3
180.12
19data/projectiles/beam.txt
20-200
21600
220.3
230.18
24data/projectiles/beam.txt
2550
26675
270.3
280.24
29data/projectiles/beam.txt
30-50
31675
diff --git a/data/weapons/nova1.txt~ b/data/weapons/nova1.txt~
deleted file mode 100644
index 66fe28d..0000000
--- a/data/weapons/nova1.txt~
+++ /dev/null
@@ -1,1506 +0,0 @@
1Nova 1
2data/images/empty.bmp
325
40
55000
6300
710
86.9999
9data/projectiles/psi.txt
10320
110
1210
136.9979
14data/projectiles/psi.txt
15318.878
1626.7769
1710
186.9959
19data/projectiles/psi.txt
20315.519
2153.366
2210
236.9939
24data/projectiles/psi.txt
25309.947
2679.5808
2710
286.9919
29data/projectiles/psi.txt
30302.2
31105.237
3210
336.9899
34data/projectiles/psi.txt
35292.335
36130.156
3710
386.9879
39data/projectiles/psi.txt
40280.418
41154.161
4210
436.9859
44data/projectiles/psi.txt
45266.535
46177.085
4710
486.9839
49data/projectiles/psi.txt
50250.782
51198.767
5210
536.9819
54data/projectiles/psi.txt
55233.27
56219.055
5710
586.9799
59data/projectiles/psi.txt
60214.122
61237.806
6210
636.9779
64data/projectiles/psi.txt
65193.472
66254.89
6710
686.9759
69data/projectiles/psi.txt
70171.465
71270.185
7210
736.9739
74data/projectiles/psi.txt
75148.255
76283.585
7710
786.9719
79data/projectiles/psi.txt
80124.005
81294.996
8210
836.9699
84data/projectiles/psi.txt
8598.8854
86304.338
8710
886.9679
89data/projectiles/psi.txt
9073.0723
91311.545
9210
936.9659
94data/projectiles/psi.txt
9546.7466
96316.567
9710
986.9639
99data/projectiles/psi.txt
10020.093
101319.369
10210
1036.9619
104data/projectiles/psi.txt
105-6.70157
106319.93
10710
1086.9599
109data/projectiles/psi.txt
110-33.4491
111318.247
11210
1136.9579
114data/projectiles/psi.txt
115-59.962
116314.332
11710
1186.9559
119data/projectiles/psi.txt
120-86.0543
121308.212
12210
1236.9539
124data/projectiles/psi.txt
125-111.543
126299.93
12710
1286.9519
129data/projectiles/psi.txt
130-136.249
131289.545
13210
1336.9499
134data/projectiles/psi.txt
135-160
136277.128
13710
1386.9479
139data/projectiles/psi.txt
140-182.628
141262.768
14210
1436.9459
144data/projectiles/psi.txt
145-203.976
146246.564
14710
1486.9439
149data/projectiles/psi.txt
150-223.892
151228.631
15210
1536.9419
154data/projectiles/psi.txt
155-242.238
156209.095
15710
1586.9399
159data/projectiles/psi.txt
160-258.885
161188.091
16210
1636.9379
164data/projectiles/psi.txt
165-273.717
166165.769
16710
1686.9359
169data/projectiles/psi.txt
170-286.628
171142.283
17210
1736.9339
174data/projectiles/psi.txt
175-297.528
176117.8
17710
1786.9319
179data/projectiles/psi.txt
180-306.342
18192.4902
18210
1836.9299
184data/projectiles/psi.txt
185-313.007
18666.5317
18710
1886.9279
189data/projectiles/psi.txt
190-317.477
19140.1066
19210
1936.9259
194data/projectiles/psi.txt
195-319.719
19613.4002
19710
1986.9239
199data/projectiles/psi.txt
200-319.719
201-13.4002
20210
2036.9219
204data/projectiles/psi.txt
205-317.477
206-40.1066
20710
2086.9199
209data/projectiles/psi.txt
210-313.007
211-66.5317
21210
2136.9179
214data/projectiles/psi.txt
215-306.342
216-92.4902
21710
2186.9159
219data/projectiles/psi.txt
220-297.528
221-117.8
22210
2236.9139
224data/projectiles/psi.txt
225-286.628
226-142.283
22710
2286.9119
229data/projectiles/psi.txt
230-273.717
231-165.769
23210
2336.9099
234data/projectiles/psi.txt
235-258.885
236-188.091
23710
2386.9079
239data/projectiles/psi.txt
240-242.238
241-209.095
24210
2436.9059
244data/projectiles/psi.txt
245-223.892
246-228.631
24710
2486.9039
249data/projectiles/psi.txt
250-203.976
251-246.564
25210
2536.9019
254data/projectiles/psi.txt
255-182.628
256-262.768
25710
2586.8999
259data/projectiles/psi.txt
260-160
261-277.128
26210
2636.8979
264data/projectiles/psi.txt
265-136.249
266-289.545
26710
2686.8959
269data/projectiles/psi.txt
270-111.543
271-299.93
27210
2736.8939
274data/projectiles/psi.txt
275-86.0543
276-308.212
27710
2786.8919
279data/projectiles/psi.txt
280-59.962
281-314.332
28210
2836.8899
284data/projectiles/psi.txt
285-33.4491
286-318.247
28710
2886.8879
289data/projectiles/psi.txt
290-6.70157
291-319.93
29210
2936.8859
294data/projectiles/psi.txt
29520.093
296-319.369
29710
2986.8839
299data/projectiles/psi.txt
30046.7466
301-316.567
30210
3036.8819
304data/projectiles/psi.txt
30573.0723
306-311.545
30710
3086.8799
309data/projectiles/psi.txt
31098.8854
311-304.338
31210
3136.8779
314data/projectiles/psi.txt
315124.005
316-294.996
31710
3186.8759
319data/projectiles/psi.txt
320148.255
321-283.585
32210
3236.8739
324data/projectiles/psi.txt
325171.465
326-270.185
32710
3286.8719
329data/projectiles/psi.txt
330193.472
331-254.89
33210
3336.8699
334data/projectiles/psi.txt
335214.122
336-237.806
33710
3386.8679
339data/projectiles/psi.txt
340233.27
341-219.055
34210
3436.8659
344data/projectiles/psi.txt
345250.782
346-198.767
34710
3486.8639
349data/projectiles/psi.txt
350266.535
351-177.085
35210
3536.8619
354data/projectiles/psi.txt
355280.418
356-154.161
35710
3586.8599
359data/projectiles/psi.txt
360292.335
361-130.156
36210
3636.8579
364data/projectiles/psi.txt
365302.2
366-105.237
36710
3686.8559
369data/projectiles/psi.txt
370309.947
371-79.5808
37210
3736.8539
374data/projectiles/psi.txt
375315.519
376-53.366
37710
3786.8519
379data/projectiles/psi.txt
380318.878
381-26.7769
38210
3836.8499
384data/projectiles/psi.txt
385320
386-7.83774e-14
38710
3886.8479
389data/projectiles/psi.txt
390318.878
39126.7769
39210
3936.8459
394data/projectiles/psi.txt
395315.519
39653.366
39710
3986.8439
399data/projectiles/psi.txt
400309.947
40179.5808
40210
4036.8419
404data/projectiles/psi.txt
405302.2
406105.237
40710
4086.8399
409data/projectiles/psi.txt
410292.335
411130.156
41210
4136.8379
414data/projectiles/psi.txt
415280.418
416154.161
41710
4186.8359
419data/projectiles/psi.txt
420266.535
421177.085
42210
4236.8339
424data/projectiles/psi.txt
425250.782
426198.767
42710
4286.8319
429data/projectiles/psi.txt
430233.27
431219.055
43210
4336.8299
434data/projectiles/psi.txt
435214.122
436237.806
43710
4386.8279
439data/projectiles/psi.txt
440193.472
441254.89
44210
4436.8259
444data/projectiles/psi.txt
445171.465
446270.185
44710
4486.8239
449data/projectiles/psi.txt
450148.255
451283.585
45210
4536.8219
454data/projectiles/psi.txt
455124.005
456294.996
45710
4586.8199
459data/projectiles/psi.txt
46098.8854
461304.338
46210
4636.8179
464data/projectiles/psi.txt
46573.0723
466311.545
46710
4686.8159
469data/projectiles/psi.txt
47046.7466
471316.567
47210
4736.8139
474data/projectiles/psi.txt
47520.093
476319.369
47710
4786.8119
479data/projectiles/psi.txt
480-6.70157
481319.93
48210
4836.8099
484data/projectiles/psi.txt
485-33.4491
486318.247
48710
4886.8079
489data/projectiles/psi.txt
490-59.962
491314.332
49210
4936.8059
494data/projectiles/psi.txt
495-86.0543
496308.212
49710
4986.8039
499data/projectiles/psi.txt
500-111.543
501299.93
50210
5036.8019
504data/projectiles/psi.txt
505-136.249
506289.545
50710
5086.7999
509data/projectiles/psi.txt
510-160
511277.128
51210
5136.7979
514data/projectiles/psi.txt
515-182.628
516262.768
51710
5186.7959
519data/projectiles/psi.txt
520-203.976
521246.564
52210
5236.7939
524data/projectiles/psi.txt
525-223.892
526228.631
52710
5286.7919
529data/projectiles/psi.txt
530-242.238
531209.095
53210
5336.7899
534data/projectiles/psi.txt
535-258.885
536188.091
53710
5386.7879
539data/projectiles/psi.txt
540-273.717
541165.769
54210
5436.7859
544data/projectiles/psi.txt
545-286.628
546142.283
54710
5486.7839
549data/projectiles/psi.txt
550-297.528
551117.8
55210
5536.7819
554data/projectiles/psi.txt
555-306.342
55692.4902
55710
5586.7799
559data/projectiles/psi.txt
560-313.007
56166.5317
56210
5636.7779
564data/projectiles/psi.txt
565-317.477
56640.1066
56710
5686.7759
569data/projectiles/psi.txt
570-319.719
57113.4002
57210
5736.7739
574data/projectiles/psi.txt
575-319.719
576-13.4002
57710
5786.7719
579data/projectiles/psi.txt
580-317.477
581-40.1066
58210
5836.7699
584data/projectiles/psi.txt
585-313.007
586-66.5317
58710
5886.7679
589data/projectiles/psi.txt
590-306.342
591-92.4902
59210
5936.7659
594data/projectiles/psi.txt
595-297.528
596-117.8
59710
5986.7639
599data/projectiles/psi.txt
600-286.628
601-142.283
60210
6036.7619
604data/projectiles/psi.txt
605-273.717
606-165.769
60710
6086.7599
609data/projectiles/psi.txt
610-258.885
611-188.091
61210
6136.7579
614data/projectiles/psi.txt
615-242.238
616-209.095
61710
6186.7559
619data/projectiles/psi.txt
620-223.892
621-228.631
62210
6236.7539
624data/projectiles/psi.txt
625-203.976
626-246.564
62710
6286.7519
629data/projectiles/psi.txt
630-182.628
631-262.768
63210
6336.7499
634data/projectiles/psi.txt
635-160
636-277.128
63710
6386.7479
639data/projectiles/psi.txt
640-136.249
641-289.545
64210
6436.7459
644data/projectiles/psi.txt
645-111.543
646-299.93
64710
6486.7439
649data/projectiles/psi.txt
650-86.0543
651-308.212
65210
6536.7419
654data/projectiles/psi.txt
655-59.962
656-314.332
65710
6586.7399
659data/projectiles/psi.txt
660-33.4491
661-318.247
66210
6636.7379
664data/projectiles/psi.txt
665-6.70157
666-319.93
66710
6686.7359
669data/projectiles/psi.txt
67020.093
671-319.369
67210
6736.7339
674data/projectiles/psi.txt
67546.7466
676-316.567
67710
6786.7319
679data/projectiles/psi.txt
68073.0723
681-311.545
68210
6836.7299
684data/projectiles/psi.txt
68598.8854
686-304.338
68710
6886.7279
689data/projectiles/psi.txt
690124.005
691-294.996
69210
6936.7259
694data/projectiles/psi.txt
695148.255
696-283.585
69710
6986.7239
699data/projectiles/psi.txt
700171.465
701-270.185
70210
7036.7219
704data/projectiles/psi.txt
705193.472
706-254.89
70710
7086.7199
709data/projectiles/psi.txt
710214.122
711-237.806
71210
7136.7179
714data/projectiles/psi.txt
715233.27
716-219.055
71710
7186.7159
719data/projectiles/psi.txt
720250.782
721-198.767
72210
7236.7139
724data/projectiles/psi.txt
725266.535
726-177.085
72710
7286.7119
729data/projectiles/psi.txt
730280.418
731-154.161
73210
7336.7099
734data/projectiles/psi.txt
735292.335
736-130.156
73710
7386.7079
739data/projectiles/psi.txt
740302.2
741-105.237
74210
7436.7059
744data/projectiles/psi.txt
745309.947
746-79.5808
74710
7486.7039
749data/projectiles/psi.txt
750315.519
751-53.366
75210
7536.7019
754data/projectiles/psi.txt
755318.878
756-26.7769
75710
7586.6999
759data/projectiles/psi.txt
760320
761-1.56755e-13
76210
7636.6979
764data/projectiles/psi.txt
765318.878
76626.7769
76710
7686.6959
769data/projectiles/psi.txt
770315.519
77153.366
77210
7736.6939
774data/projectiles/psi.txt
775309.947
77679.5808
77710
7786.6919
779data/projectiles/psi.txt
780302.2
781105.237
78210
7836.6899
784data/projectiles/psi.txt
785292.335
786130.156
78710
7886.6879
789data/projectiles/psi.txt
790280.418
791154.161
79210
7936.6859
794data/projectiles/psi.txt
795266.535
796177.085
79710
7986.6839
799data/projectiles/psi.txt
800250.782
801198.767
80210
8036.6819
804data/projectiles/psi.txt
805233.27
806219.055
80710
8086.6799
809data/projectiles/psi.txt
810214.122
811237.806
81210
8136.6779
814data/projectiles/psi.txt
815193.472
816254.89
81710
8186.6759
819data/projectiles/psi.txt
820171.465
821270.185
82210
8236.6739
824data/projectiles/psi.txt
825148.255
826283.585
82710
8286.6719
829data/projectiles/psi.txt
830124.005
831294.996
83210
8336.6699
834data/projectiles/psi.txt
83598.8854
836304.338
83710
8386.6679
839data/projectiles/psi.txt
84073.0723
841311.545
84210
8436.6659
844data/projectiles/psi.txt
84546.7466
846316.567
84710
8486.6639
849data/projectiles/psi.txt
85020.093
851319.369
85210
8536.6619
854data/projectiles/psi.txt
855-6.70157
856319.93
85710
8586.6599
859data/projectiles/psi.txt
860-33.4491
861318.247
86210
8636.6579
864data/projectiles/psi.txt
865-59.962
866314.332
86710
8686.6559
869data/projectiles/psi.txt
870-86.0543
871308.212
87210
8736.6539
874data/projectiles/psi.txt
875-111.543
876299.93
87710
8786.6519
879data/projectiles/psi.txt
880-136.249
881289.545
88210
8836.6499
884data/projectiles/psi.txt
885-160
886277.128
88710
8886.6479
889data/projectiles/psi.txt
890-182.628
891262.768
89210
8936.6459
894data/projectiles/psi.txt
895-203.976
896246.564
89710
8986.6439
899data/projectiles/psi.txt
900-223.892
901228.631
90210
9036.6419
904data/projectiles/psi.txt
905-242.238
906209.095
90710
9086.6399
909data/projectiles/psi.txt
910-258.885
911188.091
91210
9136.6379
914data/projectiles/psi.txt
915-273.717
916165.769
91710
9186.6359
919data/projectiles/psi.txt
920-286.628
921142.283
92210
9236.6339
924data/projectiles/psi.txt
925-297.528
926117.8
92710
9286.6319
929data/projectiles/psi.txt
930-306.342
93192.4902
93210
9336.6299
934data/projectiles/psi.txt
935-313.007
93666.5317
93710
9386.6279
939data/projectiles/psi.txt
940-317.477
94140.1066
94210
9436.6259
944data/projectiles/psi.txt
945-319.719
94613.4002
94710
9486.6239
949data/projectiles/psi.txt
950-319.719
951-13.4002
95210
9536.6219
954data/projectiles/psi.txt
955-317.477
956-40.1066
95710
9586.6199
959data/projectiles/psi.txt
960-313.007
961-66.5317
96210
9636.6179
964data/projectiles/psi.txt
965-306.342
966-92.4902
96710
9686.6159
969data/projectiles/psi.txt
970-297.528
971-117.8
97210
9736.6139
974data/projectiles/psi.txt
975-286.628
976-142.283
97710
9786.6119
979data/projectiles/psi.txt
980-273.717
981-165.769
98210
9836.6099
984data/projectiles/psi.txt
985-258.885
986-188.091
98710
9886.6079
989data/projectiles/psi.txt
990-242.238
991-209.095
99210
9936.6059
994data/projectiles/psi.txt
995-223.892
996-228.631
99710
9986.6039
999data/projectiles/psi.txt
1000-203.976
1001-246.564
100210
10036.6019
1004data/projectiles/psi.txt
1005-182.628
1006-262.768
100710
10086.5999
1009data/projectiles/psi.txt
1010-160
1011-277.128
101210
10136.5979
1014data/projectiles/psi.txt
1015-136.249
1016-289.545
101710
10186.5959
1019data/projectiles/psi.txt
1020-111.543
1021-299.93
102210
10236.5939
1024data/projectiles/psi.txt
1025-86.0543
1026-308.212
102710
10286.5919
1029data/projectiles/psi.txt
1030-59.962
1031-314.332
103210
10336.5899
1034data/projectiles/psi.txt
1035-33.4491
1036-318.247
103710
10386.5879
1039data/projectiles/psi.txt
1040-6.70157
1041-319.93
104210
10436.5859
1044data/projectiles/psi.txt
104520.093
1046-319.369
104710
10486.5839
1049data/projectiles/psi.txt
105046.7466
1051-316.567
105210
10536.5819
1054data/projectiles/psi.txt
105573.0723
1056-311.545
105710
10586.5799
1059data/projectiles/psi.txt
106098.8854
1061-304.338
106210
10636.5779
1064data/projectiles/psi.txt
1065124.005
1066-294.996
106710
10686.5759
1069data/projectiles/psi.txt
1070148.255
1071-283.585
107210
10736.5739
1074data/projectiles/psi.txt
1075171.465
1076-270.185
107710
10786.5719
1079data/projectiles/psi.txt
1080193.472
1081-254.89
108210
10836.5699
1084data/projectiles/psi.txt
1085214.122
1086-237.806
108710
10886.5679
1089data/projectiles/psi.txt
1090233.27
1091-219.055
109210
10936.5659
1094data/projectiles/psi.txt
1095250.782
1096-198.767
109710
10986.5639
1099data/projectiles/psi.txt
1100266.535
1101-177.085
110210
11036.5619
1104data/projectiles/psi.txt
1105280.418
1106-154.161
110710
11086.5599
1109data/projectiles/psi.txt
1110292.335
1111-130.156
111210
11136.5579
1114data/projectiles/psi.txt
1115302.2
1116-105.237
111710
11186.5559
1119data/projectiles/psi.txt
1120309.947
1121-79.5808
112210
11236.5539
1124data/projectiles/psi.txt
1125315.519
1126-53.366
112710
11286.5519
1129data/projectiles/psi.txt
1130318.878
1131-26.7769
113210
11336.5499
1134data/projectiles/psi.txt
1135320
1136-2.35132e-13
113710
11386.5479
1139data/projectiles/psi.txt
1140318.878
114126.7769
114210
11436.5459
1144data/projectiles/psi.txt
1145315.519
114653.366
114710
11486.5439
1149data/projectiles/psi.txt
1150309.947
115179.5808
115210
11536.5419
1154data/projectiles/psi.txt
1155302.2
1156105.237
115710
11586.5399
1159data/projectiles/psi.txt
1160292.335
1161130.156
116210
11636.5379
1164data/projectiles/psi.txt
1165280.418
1166154.161
116710
11686.5359
1169data/projectiles/psi.txt
1170266.535
1171177.085
117210
11736.5339
1174data/projectiles/psi.txt
1175250.782
1176198.767
117710
11786.5319
1179data/projectiles/psi.txt
1180233.27
1181219.055
118210
11836.5299
1184data/projectiles/psi.txt
1185214.122
1186237.806
118710
11886.5279
1189data/projectiles/psi.txt
1190193.472
1191254.89
119210
11936.5259
1194data/projectiles/psi.txt
1195171.465
1196270.185
119710
11986.5239
1199data/projectiles/psi.txt
1200148.255
1201283.585
120210
12036.5219
1204data/projectiles/psi.txt
1205124.005
1206294.996
120710
12086.5199
1209data/projectiles/psi.txt
121098.8854
1211304.338
121210
12136.5179
1214data/projectiles/psi.txt
121573.0723
1216311.545
121710
12186.5159
1219data/projectiles/psi.txt
122046.7466
1221316.567
122210
12236.5139
1224data/projectiles/psi.txt
122520.093
1226319.369
122710
12286.5119
1229data/projectiles/psi.txt
1230-6.70157
1231319.93
123210
12336.5099
1234data/projectiles/psi.txt
1235-33.4491
1236318.247
123710
12386.5079
1239data/projectiles/psi.txt
1240-59.962
1241314.332
124210
12436.5059
1244data/projectiles/psi.txt
1245-86.0543
1246308.212
124710
12486.5039
1249data/projectiles/psi.txt
1250-111.543
1251299.93
125210
12536.5019
1254data/projectiles/psi.txt
1255-136.249
1256289.545
125710
12586.4999
1259data/projectiles/psi.txt
1260-160
1261277.128
126210
12636.4979
1264data/projectiles/psi.txt
1265-182.628
1266262.768
126710
12686.4959
1269data/projectiles/psi.txt
1270-203.976
1271246.564
127210
12736.4939
1274data/projectiles/psi.txt
1275-223.892
1276228.631
127710
12786.4919
1279data/projectiles/psi.txt
1280-242.238
1281209.095
128210
12836.4899
1284data/projectiles/psi.txt
1285-258.885
1286188.091
128710
12886.4879
1289data/projectiles/psi.txt
1290-273.717
1291165.769
129210
12936.4859
1294data/projectiles/psi.txt
1295-286.628
1296142.283
129710
12986.4839
1299data/projectiles/psi.txt
1300-297.528
1301117.8
130210
13036.4819
1304data/projectiles/psi.txt
1305-306.342
130692.4902
130710
13086.4799
1309data/projectiles/psi.txt
1310-313.007
131166.5317
131210
13136.4779
1314data/projectiles/psi.txt
1315-317.477
131640.1066
131710
13186.4759
1319data/projectiles/psi.txt
1320-319.719
132113.4002
132210
13236.4739
1324data/projectiles/psi.txt
1325-319.719
1326-13.4002
132710
13286.4719
1329data/projectiles/psi.txt
1330-317.477
1331-40.1066
133210
13336.4699
1334data/projectiles/psi.txt
1335-313.007
1336-66.5317
133710
13386.4679
1339data/projectiles/psi.txt
1340-306.342
1341-92.4902
134210
13436.4659
1344data/projectiles/psi.txt
1345-297.528
1346-117.8
134710
13486.4639
1349data/projectiles/psi.txt
1350-286.628
1351-142.283
135210
13536.4619
1354data/projectiles/psi.txt
1355-273.717
1356-165.769
135710
13586.4599
1359data/projectiles/psi.txt
1360-258.885
1361-188.091
136210
13636.4579
1364data/projectiles/psi.txt
1365-242.238
1366-209.095
136710
13686.4559
1369data/projectiles/psi.txt
1370-223.892
1371-228.631
137210
13736.4539
1374data/projectiles/psi.txt
1375-203.976
1376-246.564
137710
13786.4519
1379data/projectiles/psi.txt
1380-182.628
1381-262.768
138210
13836.4499
1384data/projectiles/psi.txt
1385-160
1386-277.128
138710
13886.4479
1389data/projectiles/psi.txt
1390-136.249
1391-289.545
139210
13936.4459
1394data/projectiles/psi.txt
1395-111.543
1396-299.93
139710
13986.4439
1399data/projectiles/psi.txt
1400-86.0543
1401-308.212
140210
14036.4419
1404data/projectiles/psi.txt
1405-59.962
1406-314.332
140710
14086.4399
1409data/projectiles/psi.txt
1410-33.4491
1411-318.247
141210
14136.4379
1414data/projectiles/psi.txt
1415-6.70157
1416-319.93
141710
14186.4359
1419data/projectiles/psi.txt
142020.093
1421-319.369
142210
14236.4339
1424data/projectiles/psi.txt
142546.7466
1426-316.567
142710
14286.4319
1429data/projectiles/psi.txt
143073.0723
1431-311.545
143210
14336.4299
1434data/projectiles/psi.txt
143598.8854
1436-304.338
143710
14386.4279
1439data/projectiles/psi.txt
1440124.005
1441-294.996
144210
14436.4259
1444data/projectiles/psi.txt
1445148.255
1446-283.585
144710
14486.4239
1449data/projectiles/psi.txt
1450171.465
1451-270.185
145210
14536.4219
1454data/projectiles/psi.txt
1455193.472
1456-254.89
145710
14586.4199
1459data/projectiles/psi.txt
1460214.122
1461-237.806
146210
14636.4179
1464data/projectiles/psi.txt
1465233.27
1466-219.055
146710
14686.4159
1469data/projectiles/psi.txt
1470250.782
1471-198.767
147210
14736.4139
1474data/projectiles/psi.txt
1475266.535
1476-177.085
147710
14786.4119
1479data/projectiles/psi.txt
1480280.418
1481-154.161
148210
14836.4099
1484data/projectiles/psi.txt
1485292.335
1486-130.156
148710
14886.4079
1489data/projectiles/psi.txt
1490302.2
1491-105.237
149210
14936.4059
1494data/projectiles/psi.txt
1495309.947
1496-79.5808
149710
14986.4039
1499data/projectiles/psi.txt
1500315.519
1501-53.366
150210
15036.4019
1504data/projectiles/psi.txt
1505318.878
1506-26.7769 \ No newline at end of file
diff --git a/data/weapons/novaspitter1.txt~ b/data/weapons/novaspitter1.txt~
deleted file mode 100644
index 99c3869..0000000
--- a/data/weapons/novaspitter1.txt~
+++ /dev/null
@@ -1,36 +0,0 @@
1Novaspitter 1
2data/images/empty.bmp
38
41
530
66
70.8
80.0999
9data/projectiles/spit.txt
10250
110
120.8
130.0999
14data/projectiles/spit.txt
15125
16216.506
170.8
180.0999
19data/projectiles/spit.txt
20-125
21216.506
220.8
230.0999
24data/projectiles/spit.txt
25-250
263.06162e-14
270.8
280.0999
29data/projectiles/spit.txt
30-125
31-216.506
320.8
330.0999
34data/projectiles/spit.txt
35125
36-216.506 \ No newline at end of file
diff --git a/data/weapons/spitter1.txt~ b/data/weapons/spitter1.txt~
deleted file mode 100644
index 4089011..0000000
--- a/data/weapons/spitter1.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
1Spitter 1
2data/images/spitter1.bmp
32
41
55
61
70.6
80.55
9data/projectiles/spit.txt
100
11250
diff --git a/data/weapons/spitter2.txt~ b/data/weapons/spitter2.txt~
deleted file mode 100644
index ab3cf1a..0000000
--- a/data/weapons/spitter2.txt~
+++ /dev/null
@@ -1,21 +0,0 @@
1Spitter 2
2data/images/spitter1.bmp
37
41
525
63
70.6
80
9data/projectiles/spit.txt
100
11250
120.6
130.2
14data/projectiles/spit.txt
1540
16240
170.6
180.4
19data/projectiles/spit.txt
20-40
21240
diff --git a/data/weapons/spitter3.txt~ b/data/weapons/spitter3.txt~
deleted file mode 100644
index ae9ad73..0000000
--- a/data/weapons/spitter3.txt~
+++ /dev/null
@@ -1,41 +0,0 @@
1Spitter 3
2data/images/spitter3.bmp
315
41
575
67
72
80
9data/projectiles/bigspit.txt
100
11250
120.8
130
14data/projectiles/spit.txt
1510
16247
170.8
180
19data/projectiles/spit.txt
20-10
21247
220.8
230.16
24data/projectiles/spit.txt
25176.78
26176.78
270.8
280.32
29data/projectiles/spit.txt
30-176.78
31176.78
320.8
330.48
34data/projectiles/spit.txt
35176.78
36-176.78
370.8
380.64
39data/projectiles/spit.txt
40-176.78
41-176.78
diff --git a/data/weapons/weapon_template.txt~ b/data/weapons/weapon_template.txt~
deleted file mode 100644
index 4c8a787..0000000
--- a/data/weapons/weapon_template.txt~
+++ /dev/null
@@ -1,16 +0,0 @@
1epic imbaweapon of massdestruction #name
2data/weapon89.bmp #filename of image of weapon
30.5 #energyusage
41 #sellable
510000 #value (0 for auto (recommended))
62 #number of distinguished Projectiles
71 #cooldown
80.5 #startTimer
9data/projectile11.txt #path
100 #xSpeed
11700 #-ySpeed
125 #cooldown
130 #startTimer
14data/projectile14.txt #path
150 #xSpeed
16500 #-ySpeed
diff --git a/data/weapons/weapons.txt~ b/data/weapons/weapons.txt~
deleted file mode 100644
index 5c08b65..0000000
--- a/data/weapons/weapons.txt~
+++ /dev/null
@@ -1,10 +0,0 @@
1empty.txt
2spitter1.txt
3spitter2.txt
4spitter3.txt
5novaspitter1.txt
6beamer1.txt
7beamer2.txt
8fireball1.txt
9inawaffe.txt
10nova1.txt