Merge branch 'main' of https://github.com/MarcEricMartel/GameJam-Vanier

GameJam-Vanier.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.0.0-beta.12">
+<Project Sdk="Godot.NET.Sdk/4.0.0-beta">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

GameJam-Vanier.csproj.old.1

@@ -0,0 +1,7 @@
+<Project Sdk="Godot.NET.Sdk/4.0.0-beta.12">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <RootNamespace>GameJamVanier</RootNamespace>
+  </PropertyGroup>
+</Project>

Music/School_BDClave.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://8rvenjs3qb48"
-path="res://.godot/imported/School_BDClave.ogg-ec010fc0070e357306eea1b10528d28c.oggvorbisstr"
-
-[deps]
-
-source_file="res://Music/School_BDClave.ogg"
-dest_files=["res://.godot/imported/School_BDClave.ogg-ec010fc0070e357306eea1b10528d28c.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Music/School_Bass.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dq1swoy3ttnef"
-path="res://.godot/imported/School_Bass.ogg-d2ba97d726732fd56f68d3f2557bc659.oggvorbisstr"
-
-[deps]
-
-source_file="res://Music/School_Bass.ogg"
-dest_files=["res://.godot/imported/School_Bass.ogg-d2ba97d726732fd56f68d3f2557bc659.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Music/School_Brass.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dsai55yg5k0pn"
-path="res://.godot/imported/School_Brass.ogg-41cf87c359686987962e8c7f81b780a9.oggvorbisstr"
-
-[deps]
-
-source_file="res://Music/School_Brass.ogg"
-dest_files=["res://.godot/imported/School_Brass.ogg-41cf87c359686987962e8c7f81b780a9.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Music/School_Flute.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cs6jdh2tnho0d"
-path="res://.godot/imported/School_Flute.ogg-d79693f84c1747de2572ca8532fdf952.oggvorbisstr"
-
-[deps]
-
-source_file="res://Music/School_Flute.ogg"
-dest_files=["res://.godot/imported/School_Flute.ogg-d79693f84c1747de2572ca8532fdf952.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Music/School_Snare.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://c3mxst2bq3cxp"
-path="res://.godot/imported/School_Snare.ogg-5a6379028c8b900f1cf7fd9810b8103e.oggvorbisstr"
-
-[deps]
-
-source_file="res://Music/School_Snare.ogg"
-dest_files=["res://.godot/imported/School_Snare.ogg-5a6379028c8b900f1cf7fd9810b8103e.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Music/intro.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://c3pq4sjcj3cra"
+path="res://.godot/imported/intro.ogg-81dbd230ff85a4853efc0d8076645d40.oggvorbisstr"
+
+[deps]
+
+source_file="res://Music/intro.ogg"
+dest_files=["res://.godot/imported/intro.ogg-81dbd230ff85a4853efc0d8076645d40.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Music/school.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dhuxf2eklsha5"
+path="res://.godot/imported/school.ogg-95ee42b42281320ce75ef65f2b1bf874.oggvorbisstr"
+
+[deps]
+
+source_file="res://Music/school.ogg"
+dest_files=["res://.godot/imported/school.ogg-95ee42b42281320ce75ef65f2b1bf874.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Player/player.gd

@@ -36,7 +36,8 @@ func change_weapon(position):
 		raycast.add_child(current_weapon);
 
 func attack():
-	if current_weapon: current_weapon.fire(velocity);
+	if current_weapon: 
+		current_weapon.fire(velocity);
 
 func take_damage(damage):
 	HP = HP - damage;

Sounds/boompow.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dqnk7r4ixnewn"
+path="res://.godot/imported/boompow.wav-1600690b6affb78ec969599a79f40be9.sample"
+
+[deps]
+
+source_file="res://Sounds/boompow.wav"
+dest_files=["res://.godot/imported/boompow.wav-1600690b6affb78ec969599a79f40be9.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Sounds/laugh1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dyvkiwvv0hv0a"
+path="res://.godot/imported/laugh1.wav-6373fdf00ab24ee2ae64cdbdb467d7c8.sample"
+
+[deps]
+
+source_file="res://Sounds/laugh1.wav"
+dest_files=["res://.godot/imported/laugh1.wav-6373fdf00ab24ee2ae64cdbdb467d7c8.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Sounds/sand1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dhs8p6vqxm5qo"
+path="res://.godot/imported/sand1.wav-64c49deb7e6d29d2c73b2d2220e8977e.sample"
+
+[deps]
+
+source_file="res://Sounds/sand1.wav"
+dest_files=["res://.godot/imported/sand1.wav-64c49deb7e6d29d2c73b2d2220e8977e.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Sounds/shirt1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dry23pt0f5cc5"
+path="res://.godot/imported/shirt1.wav-e8a2c05fd2a2b5663d7aba50d8883039.sample"
+
+[deps]
+
+source_file="res://Sounds/shirt1.wav"
+dest_files=["res://.godot/imported/shirt1.wav-e8a2c05fd2a2b5663d7aba50d8883039.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

TileSets/tiles.tres

@@ -29,9 +29,14 @@ texture_region_size = Vector2i(64, 64)
 3:0/0 = 0
 3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 3:0/0/physics_layer_0/angular_velocity = 0.0
+4:0/next_alternative_id = 2
 4:0/0 = 0
 4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 4:0/0/physics_layer_0/angular_velocity = 0.0
+4:0/1 = 1
+4:0/1/transpose = true
+4:0/1/physics_layer_0/linear_velocity = Vector2(0, 0)
+4:0/1/physics_layer_0/angular_velocity = 0.0
 5:0/next_alternative_id = 5
 5:0/0 = 0
 5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@@ -290,9 +295,14 @@ texture_region_size = Vector2i(64, 64)
 5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 5:3/0/physics_layer_0/angular_velocity = 0.0
 5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32)
+6:3/next_alternative_id = 2
 6:3/0 = 0
 6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 6:3/0/physics_layer_0/angular_velocity = 0.0
+6:3/1 = 1
+6:3/1/flip_v = true
+6:3/1/physics_layer_0/linear_velocity = Vector2(0, 0)
+6:3/1/physics_layer_0/angular_velocity = 0.0
 7:3/0 = 0
 7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
 7:3/0/physics_layer_0/angular_velocity = 0.0