added other cannon ball sizes

This commit is contained in:
Arthur
2022-12-11 00:11:15 +01:00
parent e670293ee6
commit 1de684c5c1
21 changed files with 305 additions and 22 deletions

View File

@@ -13,6 +13,7 @@ grow_vertical = 2
script = ExtResource("1_hyw8p") script = ExtResource("1_hyw8p")
[node name="ColorRect" type="ColorRect" parent="."] [node name="ColorRect" type="ColorRect" parent="."]
layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@@ -21,6 +22,7 @@ grow_vertical = 2
color = Color(0.513726, 0.403922, 0.27451, 1) color = Color(0.513726, 0.403922, 0.27451, 1)
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 8 anchors_preset = 8
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@@ -34,42 +36,31 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="Start" type="Button" parent="VBoxContainer"] [node name="Start" type="Button" parent="VBoxContainer"]
offset_right = 87.0 layout_mode = 2
offset_bottom = 31.0
text = "Start text = "Start
" "
[node name="Tutorial" type="Button" parent="VBoxContainer"] [node name="Tutorial" type="Button" parent="VBoxContainer"]
offset_top = 35.0 layout_mode = 2
offset_right = 87.0
offset_bottom = 66.0
text = "Tutorial text = "Tutorial
" "
[node name="Settings" type="Button" parent="VBoxContainer"] [node name="Settings" type="Button" parent="VBoxContainer"]
offset_top = 70.0 layout_mode = 2
offset_right = 87.0
offset_bottom = 101.0
text = "Volume:" text = "Volume:"
[node name="VolSlider" type="HSlider" parent="VBoxContainer"] [node name="VolSlider" type="HSlider" parent="VBoxContainer"]
offset_top = 105.0 layout_mode = 2
offset_right = 87.0
offset_bottom = 121.0
min_value = -30.0 min_value = -30.0
max_value = 0.0 max_value = 0.0
script = ExtResource("2_h85ei") script = ExtResource("2_h85ei")
[node name="Quit" type="Button" parent="VBoxContainer"] [node name="Quit" type="Button" parent="VBoxContainer"]
offset_top = 125.0 layout_mode = 2
offset_right = 87.0
offset_bottom = 156.0
text = "Quit" text = "Quit"
[node name="FullScreen" type="Button" parent="VBoxContainer"] [node name="FullScreen" type="Button" parent="VBoxContainer"]
offset_top = 160.0 layout_mode = 2
offset_right = 87.0
offset_bottom = 191.0
text = "Fullscreen" text = "Fullscreen"
[connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"]

BIN
o_walking_giant1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://86mwqq8jadtj"
path.s3tc="res://.godot/imported/o_walking_giant1.png-f5c5fbe13e72291e0b2349fa626ea283.s3tc.ctex"
path.etc2="res://.godot/imported/o_walking_giant1.png-f5c5fbe13e72291e0b2349fa626ea283.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://o_walking_giant1.png"
dest_files=["res://.godot/imported/o_walking_giant1.png-f5c5fbe13e72291e0b2349fa626ea283.s3tc.ctex", "res://.godot/imported/o_walking_giant1.png-f5c5fbe13e72291e0b2349fa626ea283.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
o_walking_giant2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ce5imf2m4w5y2"
path.s3tc="res://.godot/imported/o_walking_giant2.png-e42e6598ca28e803848fdfab4d725c06.s3tc.ctex"
path.etc2="res://.godot/imported/o_walking_giant2.png-e42e6598ca28e803848fdfab4d725c06.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://o_walking_giant2.png"
dest_files=["res://.godot/imported/o_walking_giant2.png-e42e6598ca28e803848fdfab4d725c06.s3tc.ctex", "res://.godot/imported/o_walking_giant2.png-e42e6598ca28e803848fdfab4d725c06.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
o_walking_large1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ifauy3vee10v"
path.s3tc="res://.godot/imported/o_walking_large1.png-dbc9ff0db2eff4aeeff4bbcacfcce406.s3tc.ctex"
path.etc2="res://.godot/imported/o_walking_large1.png-dbc9ff0db2eff4aeeff4bbcacfcce406.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://o_walking_large1.png"
dest_files=["res://.godot/imported/o_walking_large1.png-dbc9ff0db2eff4aeeff4bbcacfcce406.s3tc.ctex", "res://.godot/imported/o_walking_large1.png-dbc9ff0db2eff4aeeff4bbcacfcce406.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
o_walking_large2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 KiB

View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b3pb0trgav15s"
path.s3tc="res://.godot/imported/o_walking_large2.png-48767a471cbbe14afc429d0fbfc69256.s3tc.ctex"
path.etc2="res://.godot/imported/o_walking_large2.png-48767a471cbbe14afc429d0fbfc69256.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://o_walking_large2.png"
dest_files=["res://.godot/imported/o_walking_large2.png-48767a471cbbe14afc429d0fbfc69256.s3tc.ctex", "res://.godot/imported/o_walking_large2.png-48767a471cbbe14afc429d0fbfc69256.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -29,7 +29,7 @@ _global_script_classes=[{
"language": &"GDScript", "language": &"GDScript",
"path": "res://scripts/Logic/MapNode.gd" "path": "res://scripts/Logic/MapNode.gd"
}, { }, {
"base": "Node", "base": "StaticBody3D",
"class": &"Module", "class": &"Module",
"language": &"GDScript", "language": &"GDScript",
"path": "res://scripts/Modules/Module.gd" "path": "res://scripts/Modules/Module.gd"

View File

@@ -3,8 +3,6 @@ extends Module
class_name Cannon class_name Cannon
enum STATE {INACTIVE, RELOADING, SHOOTING} enum STATE {INACTIVE, RELOADING, SHOOTING}
enum AMMO {NORMAL, HEAVY, LIGHT}
var currentAmmo: AMMO
var currentPowderStashValue = 0 var currentPowderStashValue = 0
var maxPowderStashValue = 3 var maxPowderStashValue = 3
var CAN_ENGAGE = false var CAN_ENGAGE = false

View File

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

View File

@@ -12,7 +12,7 @@ var is_alive = true
var walking var walking
var idle var idle
enum TYPE {AMMO, GUNPOWDER, FUEL} enum TYPE {AMMO, GUNPOWDER, FUEL, LARGE, GIANT}
var P1inMiniGame = 0 var P1inMiniGame = 0
var P2inMiniGame = 0 var P2inMiniGame = 0
@@ -172,6 +172,12 @@ func fill_inventory(type):
2: 2:
walking = "walking_coal" walking = "walking_coal"
idle = "idle_coal" idle = "idle_coal"
3:
walking = "walking_large"
idle = "idle_large"
4:
walking = "walking_giant"
idle = "idle_giant"
func getResource(): func getResource():

BIN
walking_giant1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

36
walking_giant1.png.import Normal file
View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b4yysvn1ibspa"
path.s3tc="res://.godot/imported/walking_giant1.png-7774153d7a9becc2ef10489a472f451a.s3tc.ctex"
path.etc2="res://.godot/imported/walking_giant1.png-7774153d7a9becc2ef10489a472f451a.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://walking_giant1.png"
dest_files=["res://.godot/imported/walking_giant1.png-7774153d7a9becc2ef10489a472f451a.s3tc.ctex", "res://.godot/imported/walking_giant1.png-7774153d7a9becc2ef10489a472f451a.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
walking_giant2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

36
walking_giant2.png.import Normal file
View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://4hcjvygte1em"
path.s3tc="res://.godot/imported/walking_giant2.png-fa1854ada89a6ce58312ab89aaf2c6f1.s3tc.ctex"
path.etc2="res://.godot/imported/walking_giant2.png-fa1854ada89a6ce58312ab89aaf2c6f1.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://walking_giant2.png"
dest_files=["res://.godot/imported/walking_giant2.png-fa1854ada89a6ce58312ab89aaf2c6f1.s3tc.ctex", "res://.godot/imported/walking_giant2.png-fa1854ada89a6ce58312ab89aaf2c6f1.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
walking_large1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

36
walking_large1.png.import Normal file
View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://nbfs0w8tpjt4"
path.s3tc="res://.godot/imported/walking_large1.png-25eed3ddeb4e6468661a17b2f7aabdd7.s3tc.ctex"
path.etc2="res://.godot/imported/walking_large1.png-25eed3ddeb4e6468661a17b2f7aabdd7.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://walking_large1.png"
dest_files=["res://.godot/imported/walking_large1.png-25eed3ddeb4e6468661a17b2f7aabdd7.s3tc.ctex", "res://.godot/imported/walking_large1.png-25eed3ddeb4e6468661a17b2f7aabdd7.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
walking_large2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 KiB

36
walking_large2.png.import Normal file
View File

@@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://clgd25fer2yka"
path.s3tc="res://.godot/imported/walking_large2.png-ece8d922902466340486fa8ae8c76a91.s3tc.ctex"
path.etc2="res://.godot/imported/walking_large2.png-ece8d922902466340486fa8ae8c76a91.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"vram_texture": true
}
[deps]
source_file="res://walking_large2.png"
dest_files=["res://.godot/imported/walking_large2.png-ece8d922902466340486fa8ae8c76a91.s3tc.ctex", "res://.godot/imported/walking_large2.png-ece8d922902466340486fa8ae8c76a91.etc2.ctex"]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0