kookroach/SemesterGameJam2022
1
0
Fork 0
mirror of https://github.com/PfandBoss/SemesterGameJam2022.git synced 2025-11-12 04:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022

Browse Source
This commit is contained in:
Arthur
2022-12-11 08:57:38 +01:00
parent d6665c4995 dec150a151
commit 44e18e0b55
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Nodes/UI.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="1_cb7ct"] [ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="1_cb7ct"]
[ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"] [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"]
[ext_resource type="PackedScene" path="res://menu/stats_player_1.tscn" id="3_yhsvf"] [ext_resource type="PackedScene" uid="uid://dgr3cta6n1tg3" path="res://menu/stats_player_1.tscn" id="3_yhsvf"]
[ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"] [ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_fir3c"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_fir3c"]
@@ -23,6 +23,7 @@ size_flags_horizontal = 4
[node name="Panel" type="Panel" parent="."] [node name="Panel" type="Panel" parent="."]
custom_minimum_size = Vector2(15, 0) custom_minimum_size = Vector2(15, 0)
layout_mode = 1
anchors_preset = 13 anchors_preset = 13
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
@@ -31,6 +32,7 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="VSlider" type="VSlider" parent="."] [node name="VSlider" type="VSlider" parent="."]
layout_mode = 1
anchors_preset = 13 anchors_preset = 13
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
@@ -48,6 +50,7 @@ editable = false
scrollable = false scrollable = false
[node name="VSlider2" type="VSlider" parent="."] [node name="VSlider2" type="VSlider" parent="."]
layout_mode = 1
anchors_preset = 13 anchors_preset = 13
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
@@ -65,18 +68,20 @@ editable = false
scrollable = false scrollable = false
[node name="Control" type="Control" parent="."] [node name="Control" type="Control" parent="."]
layout_mode = 3 layout_mode = 1
anchors_preset = 0 anchors_preset = 0
offset_left = -579.0 offset_left = -579.0
offset_right = 575.0 offset_right = 575.0
offset_bottom = 649.0 offset_bottom = 649.0
[node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")] [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")]
layout_mode = 1
offset_right = 345.0 offset_right = 345.0
offset_bottom = -288.0 offset_bottom = -288.0
scale = Vector2(0.6, 0.6) scale = Vector2(0.6, 0.6)
[node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")] [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")]
layout_mode = 1
offset_left = -187.0 offset_left = -187.0
offset_right = 125.0 offset_right = 125.0
scale = Vector2(0.6, 0.6) scale = Vector2(0.6, 0.6)

2
Nodes/game.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"]
[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"]
[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"]
[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"]
[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"]
[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"]

2
scripts/Modules/Cannon.gd
View File

@@ -60,7 +60,7 @@ func shoot():
print(bullet.position) print(bullet.position)
var tween = bullet.create_tween() var tween = bullet.create_tween()
tween.tween_property(bullet,"position",Vector3(70,0,0),0.5) tween.tween_property(bullet,"position",Vector3(70,0,0),0.5)
tween.tween_callback(queue_free) tween.tween_callback(bullet.queue_free)
$AudioStreamPlayer.play(0) $AudioStreamPlayer.play(0)
return true return true
if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1: if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1: