diff --git a/menu/main_menu.tscn b/menu/main_menu.tscn index 0c6fa65..5ea61d5 100644 --- a/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -13,6 +13,7 @@ grow_vertical = 2 script = ExtResource("1_hyw8p") [node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -21,6 +22,7 @@ grow_vertical = 2 color = Color(0.513726, 0.403922, 0.27451, 1) [node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -34,42 +36,31 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Start" type="Button" parent="VBoxContainer"] -offset_right = 87.0 -offset_bottom = 31.0 +layout_mode = 2 text = "Start " [node name="Tutorial" type="Button" parent="VBoxContainer"] -offset_top = 35.0 -offset_right = 87.0 -offset_bottom = 66.0 +layout_mode = 2 text = "Tutorial " [node name="Settings" type="Button" parent="VBoxContainer"] -offset_top = 70.0 -offset_right = 87.0 -offset_bottom = 101.0 +layout_mode = 2 text = "Volume:" [node name="VolSlider" type="HSlider" parent="VBoxContainer"] -offset_top = 105.0 -offset_right = 87.0 -offset_bottom = 121.0 +layout_mode = 2 min_value = -30.0 max_value = 0.0 script = ExtResource("2_h85ei") [node name="Quit" type="Button" parent="VBoxContainer"] -offset_top = 125.0 -offset_right = 87.0 -offset_bottom = 156.0 +layout_mode = 2 text = "Quit" [node name="FullScreen" type="Button" parent="VBoxContainer"] -offset_top = 160.0 -offset_right = 87.0 -offset_bottom = 191.0 +layout_mode = 2 text = "Fullscreen" [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"] diff --git a/o_walking_giant1.png b/o_walking_giant1.png new file mode 100644 index 0000000..71b5e98 Binary files /dev/null and b/o_walking_giant1.png differ diff --git a/o_walking_giant1.png.import b/o_walking_giant1.png.import new file mode 100644 index 0000000..ad36cc0 --- /dev/null +++ b/o_walking_giant1.png.import @@ -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 diff --git a/o_walking_giant2.png b/o_walking_giant2.png new file mode 100644 index 0000000..07fc03b Binary files /dev/null and b/o_walking_giant2.png differ diff --git a/o_walking_giant2.png.import b/o_walking_giant2.png.import new file mode 100644 index 0000000..5eb3b67 --- /dev/null +++ b/o_walking_giant2.png.import @@ -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 diff --git a/o_walking_large1.png b/o_walking_large1.png new file mode 100644 index 0000000..1b41d1e Binary files /dev/null and b/o_walking_large1.png differ diff --git a/o_walking_large1.png.import b/o_walking_large1.png.import new file mode 100644 index 0000000..87ba894 --- /dev/null +++ b/o_walking_large1.png.import @@ -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 diff --git a/o_walking_large2.png b/o_walking_large2.png new file mode 100644 index 0000000..54b9add Binary files /dev/null and b/o_walking_large2.png differ diff --git a/o_walking_large2.png.import b/o_walking_large2.png.import new file mode 100644 index 0000000..4091910 --- /dev/null +++ b/o_walking_large2.png.import @@ -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 diff --git a/project.godot b/project.godot index d79b725..4ef7386 100644 --- a/project.godot +++ b/project.godot @@ -29,7 +29,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "Node", +"base": "StaticBody3D", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd" diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index 5e1bde1..b090023 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -3,8 +3,6 @@ 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 diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index 92ffa01..b6acf71 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -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 diff --git a/scripts/Player.gd b/scripts/Player.gd index d05b552..b8aabc2 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -12,7 +12,7 @@ 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 @@ -172,6 +172,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(): diff --git a/walking_giant1.png b/walking_giant1.png new file mode 100644 index 0000000..2f5b1bf Binary files /dev/null and b/walking_giant1.png differ diff --git a/walking_giant1.png.import b/walking_giant1.png.import new file mode 100644 index 0000000..099d246 --- /dev/null +++ b/walking_giant1.png.import @@ -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 diff --git a/walking_giant2.png b/walking_giant2.png new file mode 100644 index 0000000..c26e41e Binary files /dev/null and b/walking_giant2.png differ diff --git a/walking_giant2.png.import b/walking_giant2.png.import new file mode 100644 index 0000000..00889c3 --- /dev/null +++ b/walking_giant2.png.import @@ -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 diff --git a/walking_large1.png b/walking_large1.png new file mode 100644 index 0000000..8e75665 Binary files /dev/null and b/walking_large1.png differ diff --git a/walking_large1.png.import b/walking_large1.png.import new file mode 100644 index 0000000..3d8db69 --- /dev/null +++ b/walking_large1.png.import @@ -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 diff --git a/walking_large2.png b/walking_large2.png new file mode 100644 index 0000000..820c0fe Binary files /dev/null and b/walking_large2.png differ diff --git a/walking_large2.png.import b/walking_large2.png.import new file mode 100644 index 0000000..052d091 --- /dev/null +++ b/walking_large2.png.import @@ -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