Now taking env variable RCADE_DATA and RCADE_SAVE. Default: data/ and save/ . also old saves are not compatibleHEADmaster

13 files changed, 366 insertions, 366 deletions

diff --git a/data/weapons/Ubeamer.txt b/data/weapons/Ubeamer.txt
new file mode 100644
index 0000000..dc89ba6
--- /dev/null
+++ b/data/weapons/Ubeamer.txt
@@ -0,0 +1,31 @@
+Ultimate Beamer
+images/beamer1.bmp
+1.25
+1
+0
+5
+0.3
+0
+projectiles/beam.txt
+0
+700
+0.3
+0.06
+projectiles/beam.txt
+200
+600
+0.3
+0.12
+projectiles/beam.txt
+-200
+600
+0.3
+0.18
+projectiles/beam.txt
+50
+675
+0.3
+0.24
+projectiles/beam.txt
+-50
+675
diff --git a/data/weapons/beamer1.txt b/data/weapons/beamer1.txt
index 0538fbc..5996b2e 100644
--- a/data/weapons/beamer1.txt
+++ b/data/weapons/beamer1.txt
@@ -1,11 +1,11 @@
 Beamer 1
-data/images/beamer1.bmp
+images/beamer1.bmp
 4
 1
 0
 1
 0.08
 0
-data/projectiles/beam.txt
+projectiles/beam.txt
 0
 1000
diff --git a/data/weapons/beamer2.txt b/data/weapons/beamer2.txt
index a28d8d6..da9bfbc 100644
--- a/data/weapons/beamer2.txt
+++ b/data/weapons/beamer2.txt
@@ -1,21 +1,21 @@
 Beamer 2
-data/images/beamer1.bmp
+images/beamer1.bmp
 6
 1
 0
 3
 0.15
 0
-data/projectiles/beam.txt
+projectiles/beam.txt
 0
 1000
 0.2
 0.02
-data/projectiles/beam.txt
+projectiles/beam.txt
 -50
 990
 0.2
 0.04
-data/projectiles/beam.txt
+projectiles/beam.txt
 50
 990
diff --git a/data/weapons/empty.txt b/data/weapons/empty.txt
index 6536e97..fbac9f8 100644
--- a/data/weapons/empty.txt
+++ b/data/weapons/empty.txt
@@ -1,5 +1,5 @@
 empty Slot
-data/images/empty.bmp
+images/empty.bmp
 0
 0
 0
diff --git a/data/weapons/fireball1.txt b/data/weapons/fireball1.txt
index 78d6f41..60ebfc4 100644
--- a/data/weapons/fireball1.txt
+++ b/data/weapons/fireball1.txt
@@ -1,11 +1,11 @@
 Fireball 1
-data/images/fire1.bmp
+images/fire1.bmp
 1
 1
 0
 1
 1.4
 0.6
-data/projectiles/fire1.txt
+projectiles/fire1.txt
 0
 135
diff --git a/data/weapons/inawaffe.txt b/data/weapons/inawaffe.txt
deleted file mode 100644
index 46c65ab..0000000
--- a/data/weapons/inawaffe.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Ina's OP-Waffe
-data/images/beamer1.bmp
-1.25
-1
-0
-5
-0.3
-0
-data/projectiles/beam.txt
-0
-700
-0.3
-0.06
-data/projectiles/beam.txt
-200
-600
-0.3
-0.12
-data/projectiles/beam.txt
--200
-600
-0.3
-0.18
-data/projectiles/beam.txt
-50
-675
-0.3
-0.24
-data/projectiles/beam.txt
--50
-675
diff --git a/data/weapons/nova1.txt b/data/weapons/nova1.txt
index 4dc8898..74f5a2f 100644
--- a/data/weapons/nova1.txt
+++ b/data/weapons/nova1.txt
@@ -1,1506 +1,1506 @@
 Nova 1
-data/images/empty.bmp
+images/empty.bmp
 25
 1
 0
 300
 10
 6.9999
-data/projectiles/psi.txt
+projectiles/psi.txt
 320
 0
 10
 6.9979
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 26.7769
 10
 6.9959
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 53.366
 10
 6.9939
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 79.5808
 10
 6.9919
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 105.237
 10
 6.9899
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 130.156
 10
 6.9879
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 154.161
 10
 6.9859
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 177.085
 10
 6.9839
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 198.767
 10
 6.9819
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 219.055
 10
 6.9799
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 237.806
 10
 6.9779
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 254.89
 10
 6.9759
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 270.185
 10
 6.9739
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 283.585
 10
 6.9719
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 294.996
 10
 6.9699
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 304.338
 10
 6.9679
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 311.545
 10
 6.9659
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 316.567
 10
 6.9639
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 319.369
 10
 6.9619
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 319.93
 10
 6.9599
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 318.247
 10
 6.9579
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 314.332
 10
 6.9559
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 308.212
 10
 6.9539
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 299.93
 10
 6.9519
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 289.545
 10
 6.9499
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 277.128
 10
 6.9479
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 262.768
 10
 6.9459
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 246.564
 10
 6.9439
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 228.631
 10
 6.9419
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 209.095
 10
 6.9399
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 188.091
 10
 6.9379
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 165.769
 10
 6.9359
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 142.283
 10
 6.9339
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 117.8
 10
 6.9319
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 92.4902
 10
 6.9299
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 66.5317
 10
 6.9279
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 40.1066
 10
 6.9259
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 13.4002
 10
 6.9239
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 -13.4002
 10
 6.9219
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 -40.1066
 10
 6.9199
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 -66.5317
 10
 6.9179
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 -92.4902
 10
 6.9159
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 -117.8
 10
 6.9139
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 -142.283
 10
 6.9119
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 -165.769
 10
 6.9099
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 -188.091
 10
 6.9079
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 -209.095
 10
 6.9059
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 -228.631
 10
 6.9039
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 -246.564
 10
 6.9019
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 -262.768
 10
 6.8999
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 -277.128
 10
 6.8979
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 -289.545
 10
 6.8959
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 -299.93
 10
 6.8939
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 -308.212
 10
 6.8919
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 -314.332
 10
 6.8899
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 -318.247
 10
 6.8879
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 -319.93
 10
 6.8859
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 -319.369
 10
 6.8839
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 -316.567
 10
 6.8819
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 -311.545
 10
 6.8799
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 -304.338
 10
 6.8779
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 -294.996
 10
 6.8759
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 -283.585
 10
 6.8739
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 -270.185
 10
 6.8719
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 -254.89
 10
 6.8699
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 -237.806
 10
 6.8679
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 -219.055
 10
 6.8659
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 -198.767
 10
 6.8639
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 -177.085
 10
 6.8619
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 -154.161
 10
 6.8599
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 -130.156
 10
 6.8579
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 -105.237
 10
 6.8559
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 -79.5808
 10
 6.8539
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 -53.366
 10
 6.8519
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 -26.7769
 10
 6.8499
-data/projectiles/psi.txt
+projectiles/psi.txt
 320
 -7.83774e-14
 10
 6.8479
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 26.7769
 10
 6.8459
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 53.366
 10
 6.8439
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 79.5808
 10
 6.8419
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 105.237
 10
 6.8399
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 130.156
 10
 6.8379
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 154.161
 10
 6.8359
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 177.085
 10
 6.8339
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 198.767
 10
 6.8319
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 219.055
 10
 6.8299
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 237.806
 10
 6.8279
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 254.89
 10
 6.8259
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 270.185
 10
 6.8239
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 283.585
 10
 6.8219
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 294.996
 10
 6.8199
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 304.338
 10
 6.8179
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 311.545
 10
 6.8159
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 316.567
 10
 6.8139
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 319.369
 10
 6.8119
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 319.93
 10
 6.8099
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 318.247
 10
 6.8079
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 314.332
 10
 6.8059
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 308.212
 10
 6.8039
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 299.93
 10
 6.8019
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 289.545
 10
 6.7999
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 277.128
 10
 6.7979
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 262.768
 10
 6.7959
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 246.564
 10
 6.7939
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 228.631
 10
 6.7919
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 209.095
 10
 6.7899
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 188.091
 10
 6.7879
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 165.769
 10
 6.7859
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 142.283
 10
 6.7839
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 117.8
 10
 6.7819
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 92.4902
 10
 6.7799
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 66.5317
 10
 6.7779
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 40.1066
 10
 6.7759
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 13.4002
 10
 6.7739
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 -13.4002
 10
 6.7719
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 -40.1066
 10
 6.7699
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 -66.5317
 10
 6.7679
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 -92.4902
 10
 6.7659
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 -117.8
 10
 6.7639
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 -142.283
 10
 6.7619
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 -165.769
 10
 6.7599
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 -188.091
 10
 6.7579
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 -209.095
 10
 6.7559
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 -228.631
 10
 6.7539
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 -246.564
 10
 6.7519
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 -262.768
 10
 6.7499
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 -277.128
 10
 6.7479
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 -289.545
 10
 6.7459
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 -299.93
 10
 6.7439
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 -308.212
 10
 6.7419
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 -314.332
 10
 6.7399
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 -318.247
 10
 6.7379
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 -319.93
 10
 6.7359
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 -319.369
 10
 6.7339
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 -316.567
 10
 6.7319
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 -311.545
 10
 6.7299
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 -304.338
 10
 6.7279
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 -294.996
 10
 6.7259
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 -283.585
 10
 6.7239
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 -270.185
 10
 6.7219
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 -254.89
 10
 6.7199
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 -237.806
 10
 6.7179
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 -219.055
 10
 6.7159
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 -198.767
 10
 6.7139
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 -177.085
 10
 6.7119
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 -154.161
 10
 6.7099
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 -130.156
 10
 6.7079
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 -105.237
 10
 6.7059
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 -79.5808
 10
 6.7039
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 -53.366
 10
 6.7019
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 -26.7769
 10
 6.6999
-data/projectiles/psi.txt
+projectiles/psi.txt
 320
 -1.56755e-13
 10
 6.6979
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 26.7769
 10
 6.6959
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 53.366
 10
 6.6939
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 79.5808
 10
 6.6919
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 105.237
 10
 6.6899
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 130.156
 10
 6.6879
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 154.161
 10
 6.6859
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 177.085
 10
 6.6839
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 198.767
 10
 6.6819
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 219.055
 10
 6.6799
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 237.806
 10
 6.6779
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 254.89
 10
 6.6759
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 270.185
 10
 6.6739
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 283.585
 10
 6.6719
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 294.996
 10
 6.6699
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 304.338
 10
 6.6679
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 311.545
 10
 6.6659
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 316.567
 10
 6.6639
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 319.369
 10
 6.6619
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 319.93
 10
 6.6599
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 318.247
 10
 6.6579
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 314.332
 10
 6.6559
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 308.212
 10
 6.6539
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 299.93
 10
 6.6519
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 289.545
 10
 6.6499
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 277.128
 10
 6.6479
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 262.768
 10
 6.6459
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 246.564
 10
 6.6439
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 228.631
 10
 6.6419
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 209.095
 10
 6.6399
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 188.091
 10
 6.6379
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 165.769
 10
 6.6359
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 142.283
 10
 6.6339
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 117.8
 10
 6.6319
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 92.4902
 10
 6.6299
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 66.5317
 10
 6.6279
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 40.1066
 10
 6.6259
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 13.4002
 10
 6.6239
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 -13.4002
 10
 6.6219
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 -40.1066
 10
 6.6199
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 -66.5317
 10
 6.6179
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 -92.4902
 10
 6.6159
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 -117.8
 10
 6.6139
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 -142.283
 10
 6.6119
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 -165.769
 10
 6.6099
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 -188.091
 10
 6.6079
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 -209.095
 10
 6.6059
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 -228.631
 10
 6.6039
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 -246.564
 10
 6.6019
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 -262.768
 10
 6.5999
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 -277.128
 10
 6.5979
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 -289.545
 10
 6.5959
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 -299.93
 10
 6.5939
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 -308.212
 10
 6.5919
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 -314.332
 10
 6.5899
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 -318.247
 10
 6.5879
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 -319.93
 10
 6.5859
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 -319.369
 10
 6.5839
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 -316.567
 10
 6.5819
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 -311.545
 10
 6.5799
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 -304.338
 10
 6.5779
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 -294.996
 10
 6.5759
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 -283.585
 10
 6.5739
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 -270.185
 10
 6.5719
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 -254.89
 10
 6.5699
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 -237.806
 10
 6.5679
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 -219.055
 10
 6.5659
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 -198.767
 10
 6.5639
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 -177.085
 10
 6.5619
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 -154.161
 10
 6.5599
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 -130.156
 10
 6.5579
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 -105.237
 10
 6.5559
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 -79.5808
 10
 6.5539
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 -53.366
 10
 6.5519
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 -26.7769
 10
 6.5499
-data/projectiles/psi.txt
+projectiles/psi.txt
 320
 -2.35132e-13
 10
 6.5479
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 26.7769
 10
 6.5459
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 53.366
 10
 6.5439
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 79.5808
 10
 6.5419
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 105.237
 10
 6.5399
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 130.156
 10
 6.5379
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 154.161
 10
 6.5359
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 177.085
 10
 6.5339
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 198.767
 10
 6.5319
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 219.055
 10
 6.5299
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 237.806
 10
 6.5279
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 254.89
 10
 6.5259
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 270.185
 10
 6.5239
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 283.585
 10
 6.5219
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 294.996
 10
 6.5199
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 304.338
 10
 6.5179
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 311.545
 10
 6.5159
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 316.567
 10
 6.5139
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 319.369
 10
 6.5119
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 319.93
 10
 6.5099
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 318.247
 10
 6.5079
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 314.332
 10
 6.5059
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 308.212
 10
 6.5039
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 299.93
 10
 6.5019
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 289.545
 10
 6.4999
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 277.128
 10
 6.4979
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 262.768
 10
 6.4959
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 246.564
 10
 6.4939
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 228.631
 10
 6.4919
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 209.095
 10
 6.4899
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 188.091
 10
 6.4879
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 165.769
 10
 6.4859
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 142.283
 10
 6.4839
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 117.8
 10
 6.4819
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 92.4902
 10
 6.4799
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 66.5317
 10
 6.4779
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 40.1066
 10
 6.4759
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 13.4002
 10
 6.4739
-data/projectiles/psi.txt
+projectiles/psi.txt
 -319.719
 -13.4002
 10
 6.4719
-data/projectiles/psi.txt
+projectiles/psi.txt
 -317.477
 -40.1066
 10
 6.4699
-data/projectiles/psi.txt
+projectiles/psi.txt
 -313.007
 -66.5317
 10
 6.4679
-data/projectiles/psi.txt
+projectiles/psi.txt
 -306.342
 -92.4902
 10
 6.4659
-data/projectiles/psi.txt
+projectiles/psi.txt
 -297.528
 -117.8
 10
 6.4639
-data/projectiles/psi.txt
+projectiles/psi.txt
 -286.628
 -142.283
 10
 6.4619
-data/projectiles/psi.txt
+projectiles/psi.txt
 -273.717
 -165.769
 10
 6.4599
-data/projectiles/psi.txt
+projectiles/psi.txt
 -258.885
 -188.091
 10
 6.4579
-data/projectiles/psi.txt
+projectiles/psi.txt
 -242.238
 -209.095
 10
 6.4559
-data/projectiles/psi.txt
+projectiles/psi.txt
 -223.892
 -228.631
 10
 6.4539
-data/projectiles/psi.txt
+projectiles/psi.txt
 -203.976
 -246.564
 10
 6.4519
-data/projectiles/psi.txt
+projectiles/psi.txt
 -182.628
 -262.768
 10
 6.4499
-data/projectiles/psi.txt
+projectiles/psi.txt
 -160
 -277.128
 10
 6.4479
-data/projectiles/psi.txt
+projectiles/psi.txt
 -136.249
 -289.545
 10
 6.4459
-data/projectiles/psi.txt
+projectiles/psi.txt
 -111.543
 -299.93
 10
 6.4439
-data/projectiles/psi.txt
+projectiles/psi.txt
 -86.0543
 -308.212
 10
 6.4419
-data/projectiles/psi.txt
+projectiles/psi.txt
 -59.962
 -314.332
 10
 6.4399
-data/projectiles/psi.txt
+projectiles/psi.txt
 -33.4491
 -318.247
 10
 6.4379
-data/projectiles/psi.txt
+projectiles/psi.txt
 -6.70157
 -319.93
 10
 6.4359
-data/projectiles/psi.txt
+projectiles/psi.txt
 20.093
 -319.369
 10
 6.4339
-data/projectiles/psi.txt
+projectiles/psi.txt
 46.7466
 -316.567
 10
 6.4319
-data/projectiles/psi.txt
+projectiles/psi.txt
 73.0723
 -311.545
 10
 6.4299
-data/projectiles/psi.txt
+projectiles/psi.txt
 98.8854
 -304.338
 10
 6.4279
-data/projectiles/psi.txt
+projectiles/psi.txt
 124.005
 -294.996
 10
 6.4259
-data/projectiles/psi.txt
+projectiles/psi.txt
 148.255
 -283.585
 10
 6.4239
-data/projectiles/psi.txt
+projectiles/psi.txt
 171.465
 -270.185
 10
 6.4219
-data/projectiles/psi.txt
+projectiles/psi.txt
 193.472
 -254.89
 10
 6.4199
-data/projectiles/psi.txt
+projectiles/psi.txt
 214.122
 -237.806
 10
 6.4179
-data/projectiles/psi.txt
+projectiles/psi.txt
 233.27
 -219.055
 10
 6.4159
-data/projectiles/psi.txt
+projectiles/psi.txt
 250.782
 -198.767
 10
 6.4139
-data/projectiles/psi.txt
+projectiles/psi.txt
 266.535
 -177.085
 10
 6.4119
-data/projectiles/psi.txt
+projectiles/psi.txt
 280.418
 -154.161
 10
 6.4099
-data/projectiles/psi.txt
+projectiles/psi.txt
 292.335
 -130.156
 10
 6.4079
-data/projectiles/psi.txt
+projectiles/psi.txt
 302.2
 -105.237
 10
 6.4059
-data/projectiles/psi.txt
+projectiles/psi.txt
 309.947
 -79.5808
 10
 6.4039
-data/projectiles/psi.txt
+projectiles/psi.txt
 315.519
 -53.366
 10
 6.4019
-data/projectiles/psi.txt
+projectiles/psi.txt
 318.878
 -26.7769
diff --git a/data/weapons/novaspitter1.txt b/data/weapons/novaspitter1.txt
index a9adbfa..4b71143 100644
--- a/data/weapons/novaspitter1.txt
+++ b/data/weapons/novaspitter1.txt
@@ -1,36 +1,36 @@
 Novaspitter 1
-data/images/empty.bmp
+images/empty.bmp
 8
 1
 0
 6
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 250
 0
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 125
 216.506
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 -125
 216.506
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 -250
 3.06162e-14
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 -125
 -216.506
 0.8
 0.0999
-data/projectiles/spit.txt
+projectiles/spit.txt
 125
 -216.506
diff --git a/data/weapons/spitter1.txt b/data/weapons/spitter1.txt
index 8866663..a73c3d2 100644
--- a/data/weapons/spitter1.txt
+++ b/data/weapons/spitter1.txt
@@ -1,11 +1,11 @@
 Spitter 1
-data/images/spitter1.bmp
+images/spitter1.bmp
 2
 1
 0
 1
 0.6
 0.55
-data/projectiles/spit.txt
+projectiles/spit.txt
 0
 250
diff --git a/data/weapons/spitter2.txt b/data/weapons/spitter2.txt
index be15295..7019a95 100644
--- a/data/weapons/spitter2.txt
+++ b/data/weapons/spitter2.txt
@@ -1,21 +1,21 @@
 Spitter 2
-data/images/spitter1.bmp
+images/spitter1.bmp
 7
 1
 0
 3
 0.6
 0
-data/projectiles/spit.txt
+projectiles/spit.txt
 0
 250
 0.6
 0.2
-data/projectiles/spit.txt
+projectiles/spit.txt
 40
 240
 0.6
 0.4
-data/projectiles/spit.txt
+projectiles/spit.txt
 -40
 240
diff --git a/data/weapons/spitter3.txt b/data/weapons/spitter3.txt
index cf7ee3c..54c7630 100644
--- a/data/weapons/spitter3.txt
+++ b/data/weapons/spitter3.txt
@@ -1,41 +1,41 @@
 Spitter 3
-data/images/spitter3.bmp
+images/spitter3.bmp
 15
 1
 0
 7
 2
 0
-data/projectiles/bigspit.txt
+projectiles/bigspit.txt
 0
 250
 0.8
 0
-data/projectiles/spit.txt
+projectiles/spit.txt
 10
 247
 0.8
 0
-data/projectiles/spit.txt
+projectiles/spit.txt
 -10
 247
 0.8
 0.16
-data/projectiles/spit.txt
+projectiles/spit.txt
 176.78
 176.78
 0.8
 0.32
-data/projectiles/spit.txt
+projectiles/spit.txt
 -176.78
 176.78
 0.8
 0.48
-data/projectiles/spit.txt
+projectiles/spit.txt
 176.78
 -176.78
 0.8
 0.64
-data/projectiles/spit.txt
+projectiles/spit.txt
 -176.78
 -176.78
diff --git a/data/weapons/weapon_template.txt b/data/weapons/weapon_template.txt
index b900b0c..c02b37a 100644
--- a/data/weapons/weapon_template.txt
+++ b/data/weapons/weapon_template.txt
@@ -1,16 +1,16 @@
 epic imbaweapon of massdestruction      #name
-data/weapon89.bmp                                       #filename of image of weapon
+images/weapon89.bmp                                     #filename of image of weapon
 0.5                                                                     #energyusage
 1                                                                       #sellable
 10000                                                           #cost (0 for auto (recommended))
 2                                                                       #number of distinguished Projectiles
 1                                                                       #cooldown
 0.5                                                                     #startTimer
-data/projectile11.txt                           #path
+projectiles/projectile11.txt                            #path
 0                                                                       #xSpeed
 700                                                                     #-ySpeed
 5                                                                       #cooldown
 0                                                                       #startTimer
-data/projectile14.txt                           #path
+projectiles/projectile14.txt                            #path
 0                                                                       #xSpeed
 500                                                                     #-ySpeed
diff --git a/data/weapons/weapons.txt b/data/weapons/weapons.txt
index 5c08b65..15f1cc6 100644
--- a/data/weapons/weapons.txt
+++ b/data/weapons/weapons.txt
@@ -6,5 +6,5 @@ novaspitter1.txt
 beamer1.txt
 beamer2.txt
 fireball1.txt
-inawaffe.txt
+Ubeamer.txt
 nova1.txt