From abd1e893903fdae072dc21756d9e56e4393d04c7 Mon Sep 17 00:00:00 2001 From: EamonnMR Date: Fri, 21 Jul 2023 21:53:38 -0400 Subject: [PATCH] moves railgun proj around --- data/items.csv | 3 +++ data/weapons.csv | 12 ++++++++---- .../Railgun.tscn} | 4 ++-- entities/ship/Spaceship.tscn | 3 --- 4 files changed, 13 insertions(+), 9 deletions(-) rename entities/{RailgunProjectile.tscn => projectiles/Railgun.tscn} (84%) diff --git a/data/items.csv b/data/items.csv index 974e51f..6e5ab1b 100644 --- a/data/items.csv +++ b/data/items.csv @@ -11,3 +11,6 @@ equip,Equipment,,,,res://assets/FontAwesome/32px-Cogs_font_awesome.png,"Commodit lux,Luxury,,,,res://assets//FontAwesome/Gift-solid.svg.png,"Commodity, only used for trade",,TRUE,TRUE,200 med,Medical,,,,res://assets/FontAwesome/Font_Awesome_5_solid_syringe.svg.png,"Commodity, only used for trade",,TRUE,TRUE,120 blue,Lutetium,,,,res://assets/CraftPix_dot_net_oga_by/PNG/Transperent/Icon33.png,used for room temprature superconductors (crafting ingredient),,TRUE,FALSE,250 +flak,,,,,,,,,, +guided_launcher,,,,,,,,,, +beam,,,,,,,,,, diff --git a/data/weapons.csv b/data/weapons.csv index cd216b4..d0e3756 100644 --- a/data/weapons.csv +++ b/data/weapons.csv @@ -1,4 +1,8 @@ -id,scene,projectile_scene,burst_count,cooldown,dupe_count,spread,world_projectile,vary_pitch,ammo_item,primary,projectile_velocity,damage -plasma,res://component/Weapon.tscn,res://entities/Projectile.tscn,0,0.5,1,0.4,TRUE,0,,TRUE,6,1 -missile_launcher,res://component/RocketLauncher.tscn,res://entities/projectiles/Missile.tscn,0,1,1,0,TRUE,0,missile,FALSE,10,10 -railgun,res://component/Weapon.tscn,res://entities/RailgunProjectile.tscn,0,0.8,1,0.2,TRUE,0,railgun_ammo,TRUE,15,1 +id,scene,projectile_scene,burst_count,cooldown,dupe_count,spread,world_projectile,vary_pitch,ammo_item,primary,projectile_velocity,damage,turreted +plasma,res://component/Weapon.tscn,res://entities/Projectile.tscn,0,0.5,1,0.4,TRUE,0,,TRUE,6,1,FALSE +missile_launcher,res://component/RocketLauncher.tscn,res://entities/projectiles/Missile.tscn,0,1,1,0,TRUE,0,missile,FALSE,10,10,FALSE +railgun,res://component/Weapon.tscn,res://entities/projectiles/Railgun.tscn,0,0.8,1,0.2,TRUE,0,railgun_ammo,TRUE,15,1,FALSE +flak,res://component/Weapon.tscn,,,,,,,,,,,,FALSE +guided_launcher,res://component/Weapon.tscn,,,,,,,,,,,,FALSE +jackknife,res://component/Weapon.tscn,,,,,,,,,,,,FALSE +plasma_turret,,,,,,,,,,,,,TRUE diff --git a/entities/RailgunProjectile.tscn b/entities/projectiles/Railgun.tscn similarity index 84% rename from entities/RailgunProjectile.tscn rename to entities/projectiles/Railgun.tscn index f445785..2f080e3 100644 --- a/entities/RailgunProjectile.tscn +++ b/entities/projectiles/Railgun.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://83ta5dy8fpdd"] -[ext_resource type="PackedScene" uid="uid://djxaf48l2mu8l" path="res://entities/Projectile.tscn" id="1_e0bnj"] +[ext_resource type="PackedScene" uid="uid://djxaf48l2mu8l" path="res://entities/Projectile.tscn" id="1_o70re"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_78lxl"] albedo_color = Color(0.341176, 0.517647, 0.898039, 1) @@ -14,7 +14,7 @@ height = 0.05 radial_segments = 6 rings = 5 -[node name="Projectile" instance=ExtResource("1_e0bnj")] +[node name="Projectile" instance=ExtResource("1_o70re")] [node name="MeshInstance3D" parent="." index="0"] mesh = SubResource("SphereMesh_mo2ov") diff --git a/entities/ship/Spaceship.tscn b/entities/ship/Spaceship.tscn index b921c4a..a32206c 100644 --- a/entities/ship/Spaceship.tscn +++ b/entities/ship/Spaceship.tscn @@ -19,9 +19,6 @@ update_scale = false [node name="Inventory" parent="." instance=ExtResource("4_4rw1x")] default_contents = { -"metal": 100, -"missile": 2, -"missile_launcher": 1, "plasma": 1 }