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:
PfandBoss
2022-12-11 00:30:56 +01:00
parent 8eab12a0cd 9d4f13c6f1
commit 957e03d118
25 changed files with 576 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/Modules/Cannon.gd
View File

@@ -3,12 +3,11 @@ extends Module
class_name Cannon
enum STATE {INACTIVE, RELOADING, SHOOTING}
enum AMMO {NORMAL, HEAVY, LIGHT}
var currentAmmo: AMMO
var currentPowderStashValue = 0
var maxPowderStashValue = 3
var CAN_ENGAGE = false
var DAMAGE = 5
var ammoType = -1
@onready var train = get_parent() as Train
#------------Methods-------------#
@@ -22,6 +21,7 @@ func interact(player):
if player.getResource() == 0:
if currentStashValue < maxStashValue:
currentStashValue += 1
ammoType = 0
player.clearInventory()
$AudioStreamPlayer2.play()
return
@@ -32,10 +32,41 @@ func interact(player):
player.clearInventory()
$AudioStreamPlayer2.play()
return
return
if player.getResource() == 3:
if currentStashValue < maxStashValue:
currentStashValue += 1
ammoType = 1
player.clearInventory()
$AudioStreamPlayer2.play()
return
if player.getResource() == 4:
if currentStashValue < maxStashValue:
currentStashValue += 1
ammoType = 2
player.clearInventory()
$AudioStreamPlayer2.play()
return
func shoot():
if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE:
if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE and ammoType == 0:
currentState = STATE.SHOOTING
currentStashValue -= 1
currentPowderStashValue = 0
currentState = STATE.INACTIVE
$AudioStreamPlayer.play(0)
return true
if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1:
currentState = STATE.SHOOTING
currentStashValue -= 1
currentPowderStashValue = 0
currentState = STATE.INACTIVE
$AudioStreamPlayer.play(0)
return true
if currentStashValue >= 1 and currentPowderStashValue >= 3 and currentState == STATE.INACTIVE and ammoType == 2:
currentState = STATE.SHOOTING
currentStashValue -= 1
currentPowderStashValue = 0

2
scripts/Modules/Storage.gd
View File

@@ -2,7 +2,7 @@ extends Module
class_name Storage
enum TYPE {AMMO, GUNPOWDER, COAL}
enum TYPE {AMMO, GUNPOWDER, COAL, LARGE, GIANT}
@export var currentType: TYPE

102
scripts/Player.gd
View File

@@ -13,11 +13,11 @@ var is_alive = true
var walking
var idle
enum TYPE {AMMO, GUNPOWDER, FUEL}
enum TYPE {AMMO, GUNPOWDER, FUEL, LARGE, GIANT}
var P1inMiniGame = 0
var P2inMiniGame = 0
var MiniGame = [-1, -1, -1]
var MiniGame = [0, 0, 0]
var MiniGamePos = 0
var rng = RandomNumberGenerator.new()
#---------------Methods--------------#
@@ -27,6 +27,12 @@ func _ready():
$MiniGameButton0.hide()
$MiniGameButton1.hide()
$MiniGameButton2.hide()
$MiniGameButton3.hide()
$MiniGameButton4.hide()
$MiniGameButton5.hide()
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide()
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide()
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()
func miniGameColor(input: int, red: int):
if(input == 0):
@@ -35,18 +41,35 @@ func miniGameColor(input: int, red: int):
$MiniGameButton1.modulate = Color(1,1,red)
if(input == 2):
$MiniGameButton2.modulate = Color(1,1,red)
if(input == 3):
$MiniGameButton3.modulate = Color(1,1,red)
if(input == 4):
$MiniGameButton4.modulate = Color(1,1,red)
if(input == 5):
$MiniGameButton5.modulate = Color(1,1,red)
func miniGameReset():
MiniGamePos = 0
miniGameColor(0,1)
miniGameColor(1,1)
miniGameColor(2,1)
MiniGame[0] = rng.randi_range(0, 3)
miniGameSetArrow(0)
MiniGame[1] = rng.randi_range(0, 3)
miniGameSetArrow(1)
MiniGame[2] = rng.randi_range(0, 3)
miniGameSetArrow(2)
if(is_player1):
miniGameColor(0,1)
miniGameColor(1,1)
miniGameColor(2,1)
MiniGame[0] = rng.randi_range(0, 3)
miniGameSetArrow(0)
MiniGame[1] = rng.randi_range(0, 3)
miniGameSetArrow(1)
MiniGame[2] = rng.randi_range(0, 3)
miniGameSetArrow(2)
else:
miniGameColor(3,1)
miniGameColor(4,1)
miniGameColor(5,1)
MiniGame[0] = rng.randi_range(0, 3)
miniGameSetArrow(3)
MiniGame[1] = rng.randi_range(0, 3)
miniGameSetArrow(4)
MiniGame[2] = rng.randi_range(0, 3)
miniGameSetArrow(5)
func miniGameSetArrow(buttonNr: int):
if(buttonNr == 0):
@@ -55,21 +78,41 @@ func miniGameSetArrow(buttonNr: int):
$MiniGameButton1.frame = 26 + MiniGame[1]
if(buttonNr == 2):
$MiniGameButton2.frame = 26 + MiniGame[2]
if(buttonNr == 3):
$MiniGameButton3.frame = 26 + MiniGame[0]
if(buttonNr == 4):
$MiniGameButton4.frame = 26 + MiniGame[1]
if(buttonNr == 5):
$MiniGameButton5.frame = 26 + MiniGame[2]
func miniGameCheck(input : int):
if(input == MiniGame[MiniGamePos]):
miniGameColor(MiniGamePos, 0)
MiniGamePos = MiniGamePos +1
if(is_player1):
if(input == MiniGame[MiniGamePos]):
miniGameColor(MiniGamePos, 0)
MiniGamePos = MiniGamePos +1
else:
miniGameReset()
if(MiniGamePos >= 3):
$MiniGameButton0.hide()
$MiniGameButton1.hide()
$MiniGameButton2.hide()
P1inMiniGame = 0
miniGameReset()
else:
miniGameReset()
if(MiniGamePos >= 3):
$MiniGameButton0.hide()
$MiniGameButton1.hide()
$MiniGameButton2.hide()
P1inMiniGame = 0
miniGameReset()
if(input == MiniGame[MiniGamePos]):
miniGameColor(MiniGamePos+3, 0)
MiniGamePos = MiniGamePos +1
else:
miniGameReset()
if(MiniGamePos >= 3):
$MiniGameButton3.hide()
$MiniGameButton4.hide()
$MiniGameButton5.hide()
P2inMiniGame = 0
miniGameReset()
func _process(delta):
if Input.is_action_just_pressed("p1_extra"):
if(P1inMiniGame == 0):
@@ -77,6 +120,13 @@ func _process(delta):
$MiniGameButton0.show()
$MiniGameButton1.show()
$MiniGameButton2.show()
if Input.is_action_just_pressed("p2_extra"):
if(P2inMiniGame == 0):
P2inMiniGame = 1
$MiniGameButton3.show()
$MiniGameButton4.show()
$MiniGameButton5.show()
func _physics_process(delta):
if(velocity.length() > 0):
@@ -167,6 +217,12 @@ func fill_inventory(type):
2:
walking = "walking_coal"
idle = "idle_coal"
3:
walking = "walking_large"
idle = "idle_large"
4:
walking = "walking_giant"
idle = "idle_giant"
func getResource():