diff --git a/Assets/Model/Objects/CanonBall.glb b/Assets/Model/Objects/CanonBall.glb new file mode 100644 index 0000000..0d761fa Binary files /dev/null and b/Assets/Model/Objects/CanonBall.glb differ diff --git a/Assets/Model/Objects/CanonBall.glb.import b/Assets/Model/Objects/CanonBall.glb.import new file mode 100644 index 0000000..addc19e --- /dev/null +++ b/Assets/Model/Objects/CanonBall.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bj6bw54a873im" +path="res://.godot/imported/CanonBall.glb-25fc6e5a955b47ce4d7da1455a2df75d.scn" + +[deps] + +source_file="res://Assets/Model/Objects/CanonBall.glb" +dest_files=["res://.godot/imported/CanonBall.glb-25fc6e5a955b47ce4d7da1455a2df75d.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +} +} +} diff --git a/Assets/Model/Objects/Lamp.glb b/Assets/Model/Objects/Lamp.glb new file mode 100644 index 0000000..51d48f6 Binary files /dev/null and b/Assets/Model/Objects/Lamp.glb differ diff --git a/Assets/Model/Objects/Lamp.glb.import b/Assets/Model/Objects/Lamp.glb.import new file mode 100644 index 0000000..7c6bc62 --- /dev/null +++ b/Assets/Model/Objects/Lamp.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b50i4le1br8sf" +path="res://.godot/imported/Lamp.glb-3963b3d2a59d60aef8508152ba779472.scn" + +[deps] + +source_file="res://Assets/Model/Objects/Lamp.glb" +dest_files=["res://.godot/imported/Lamp.glb-3963b3d2a59d60aef8508152ba779472.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Lamp": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +} +} +} diff --git a/Assets/Model/Pipes/Pipe.glb b/Assets/Model/Pipes/Pipe.glb new file mode 100644 index 0000000..a677317 Binary files /dev/null and b/Assets/Model/Pipes/Pipe.glb differ diff --git a/Assets/Model/Pipes/Pipe.glb.import b/Assets/Model/Pipes/Pipe.glb.import new file mode 100644 index 0000000..ad52d05 --- /dev/null +++ b/Assets/Model/Pipes/Pipe.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://hc684kkimahs" +path="res://.godot/imported/Pipe.glb-f4c646ae8decc77ba3febc11df699d59.scn" + +[deps] + +source_file="res://Assets/Model/Pipes/Pipe.glb" +dest_files=["res://.godot/imported/Pipe.glb-f4c646ae8decc77ba3febc11df699d59.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material.001": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +} +} +} diff --git a/Assets/Model/Pipes/PipeConnector.glb b/Assets/Model/Pipes/PipeConnector.glb new file mode 100644 index 0000000..f0e6ddb Binary files /dev/null and b/Assets/Model/Pipes/PipeConnector.glb differ diff --git a/Assets/Model/Pipes/PipeConnector.glb.import b/Assets/Model/Pipes/PipeConnector.glb.import new file mode 100644 index 0000000..c9d7e01 --- /dev/null +++ b/Assets/Model/Pipes/PipeConnector.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c8lfaa7u7l3dy" +path="res://.godot/imported/PipeConnector.glb-7cd1cfd2fd5648ec0eb4608e39f01ccd.scn" + +[deps] + +source_file="res://Assets/Model/Pipes/PipeConnector.glb" +dest_files=["res://.godot/imported/PipeConnector.glb-7cd1cfd2fd5648ec0eb4608e39f01ccd.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material.001": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +} +} +} diff --git a/Assets/Model/Pipes/PipeEdge.glb b/Assets/Model/Pipes/PipeEdge.glb new file mode 100644 index 0000000..7cf2e4f Binary files /dev/null and b/Assets/Model/Pipes/PipeEdge.glb differ diff --git a/Assets/Model/Pipes/PipeEdge.glb.import b/Assets/Model/Pipes/PipeEdge.glb.import new file mode 100644 index 0000000..2d60391 --- /dev/null +++ b/Assets/Model/Pipes/PipeEdge.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://r6wpgp3plg3j" +path="res://.godot/imported/PipeEdge.glb-a2e71330898c301960491b3f97878163.scn" + +[deps] + +source_file="res://Assets/Model/Pipes/PipeEdge.glb" +dest_files=["res://.godot/imported/PipeEdge.glb-a2e71330898c301960491b3f97878163.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material.001": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres" +} +} +} diff --git a/Assets/Textures/CopperNew/CleanIronDark.tres b/Assets/Textures/CopperNew/CleanIronDark.tres new file mode 100644 index 0000000..d2276d3 --- /dev/null +++ b/Assets/Textures/CopperNew/CleanIronDark.tres @@ -0,0 +1,13 @@ +[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://no7tcvsvbrhe"] + +[ext_resource type="Texture2D" uid="uid://dbjxy01lkuvle" path="res://Assets/Textures/CopperNew/copper_Metallic.png" id="1_x5t0h"] +[ext_resource type="Texture2D" uid="uid://bh776vcqbunoi" path="res://Assets/Textures/CopperNew/copper_Normal.png" id="2_ump4f"] +[ext_resource type="Texture2D" uid="uid://dwlxmetf7l5gf" path="res://Assets/Textures/CopperNew/copper_Rougness.png" id="3_hc3no"] + +[resource] +albedo_color = Color(0.52549, 0.509804, 0.54902, 1) +metallic = 1.0 +metallic_texture = ExtResource("1_x5t0h") +roughness_texture = ExtResource("3_hc3no") +normal_enabled = true +normal_texture = ExtResource("2_ump4f") diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 2a43a2b..2047355 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://bikdn7ep2vpxw"] +[gd_scene load_steps=23 format=3 uid="uid://bikdn7ep2vpxw"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"] [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"] @@ -13,6 +13,10 @@ [ext_resource type="Texture2D" uid="uid://djsergj3l4t2c" path="res://o_walking_ball2.png" id="9_rt6ws"] [ext_resource type="Texture2D" uid="uid://ctssikrodjqvc" path="res://o_walking_powder2.png" id="11_eefgn"] [ext_resource type="Texture2D" uid="uid://nctqw3vt5q0y" path="res://o_walking_coal2.png" id="12_581v4"] +[ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="14_n2rwc"] +[ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"] +[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"] +[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="17_regf7"] [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"] size = Vector3(1, 3.77669, 24) @@ -112,3 +116,26 @@ frames = SubResource("SpriteFrames_ltjyh") animation = &"walking_coal" speed_scale = 2.0 playing = true + +[node name="Bin" parent="." instance=ExtResource("14_n2rwc")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544) + +[node name="Cannon" parent="." instance=ExtResource("15_sof53")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, 0.245877) + +[node name="Cannon2" parent="." instance=ExtResource("15_sof53")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, -5.83086) + +[node name="Storage" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.30738, 0.293261, -10.1586) + +[node name="Storage2" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.67656, 0.293261, -1.79235) +currentType = 1 + +[node name="Storage3" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.79878, 0.293261, 6.13508) +currentType = 2 + +[node name="Engine" parent="." instance=ExtResource("17_regf7")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 2.86451, 1.17834, 10.1923) diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 08ea30d..90daea5 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -38,7 +38,8 @@ func _ready(): p2_train.is_P1 = false p1_train.hit.connect(_on_hit_player) p2_train.hit.connect(_on_hit_player) - p1_train.current_speed = 3 + p1_train.current_speed = 6 + p2_train.current_speed = 6 func getMapSize(node, is_start): if node == StartNode && not is_start: @@ -101,6 +102,10 @@ func mapSimulation(delta): func fightSimulation(): #FIGHT SIMULATION +<<<<<<< HEAD +======= + #print(p1_train.current_distance - p2_train.current_distance) +>>>>>>> 001f29cb394b200e67b451ba675fe20c2d780623 if(p1_node == p2_node && abs(p1_train.current_distance - p2_train.current_distance) < 0.5): if(fight_state == CHILL): fight_state = FIGHTING diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index bf1c99d..a93d7c9 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -38,5 +38,6 @@ func shoot(): currentStashValue -= 1 currentPowderStashValue = 0 currentState = STATE.INACTIVE + print("pew") return true return false diff --git a/scripts/Modules/Engine.gd b/scripts/Modules/Engine.gd index e75716f..58f4958 100644 --- a/scripts/Modules/Engine.gd +++ b/scripts/Modules/Engine.gd @@ -3,7 +3,7 @@ class_name TrainEngine enum STATE {RUNNING, DEAD} -const maxSpeed = 6 +const maxSpeed = 10 const refuelRate = 0.5 @onready var train = get_parent() as Train @@ -32,8 +32,8 @@ func interact(player): func _process(delta): if not train.is_dead(): - train.current_speed -= 0.1 * delta - print(train.current_speed) + train.current_speed -= 0.1 * delta * 0.25 + print("Player ",train.is_P1,train.current_speed) diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index ddd98e1..74fd898 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -13,8 +13,8 @@ enum TYPE {AMMO, GUNPOWDER, COAL} func _ready(): var root = get_tree().root.get_child(0) #root.ammo_pickup.connect(_on_signal_storing) - maxStashValue = 5 - currentStashValue = 5 + maxStashValue = 10 + currentStashValue = 10 func interact(player): if currentStashValue >= 1: