lots of balancing for Mobs and Wavespawns

fixed the typo in the tutorial
benitsch · Apr 17, 2024 · 53230c2 · 53230c2
1 parent deb3bb8
commit 53230c2
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 25 deletions.
diff --git a/assets/screenshots/gameplay2.png.import b/assets/screenshots/gameplay2.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dw7b752fxsdim"
+path="res://.godot/imported/gameplay2.png-26dea68a4220b2f1b9ed6dce2a36593c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/screenshots/gameplay2.png"
+dest_files=["res://.godot/imported/gameplay2.png-26dea68a4220b2f1b9ed6dce2a36593c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+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=1
diff --git a/assets/screenshots/menu.png.import b/assets/screenshots/menu.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://disa41vwqjk1o"
+path="res://.godot/imported/menu.png-23702540d0bc87d6088c0a8b620e9029.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/screenshots/menu.png"
+dest_files=["res://.godot/imported/menu.png-23702540d0bc87d6088c0a8b620e9029.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+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=1
diff --git a/scenes/main/enemy_spawner.gd b/scenes/main/enemy_spawner.gd
@@ -8,9 +8,9 @@ extends Node2D
 var success_wave_sound = preload("res://assets/sfx/yeah.mp3")
 
 var wave_spawn_delay: int = 10
-var baseWeakEnemiesPerWave = 4
-var baseMediumEnemiesPerWave = 2
-var baseStrongEnemiesPerWave = 1
+var baseWeakEnemiesPerWave = 2.5
+var baseMediumEnemiesPerWave = 1.5
+var baseStrongEnemiesPerWave = 0.2
 
 var player = null
 var weakEnemiesList = []
@@ -37,9 +37,9 @@ func spawn_wave(waveNumber, defer = false):
 	var baseStrongCount = waveNumber * baseStrongEnemiesPerWave
 
 	# Wende den Zufallsfaktor auf jede Basisanzahl an
-	var weakCount = int((baseWeakCount * (1.0 + randf() * difficultyRandomFactor)) / 2)
-	var mediumCount = int((baseMediumCount * (1.0 + randf() * difficultyRandomFactor)) / 2)
-	var strongCount = int((baseStrongCount * (1.0 + randf() * difficultyRandomFactor)) / 2)
+	var weakCount = 1 + int((baseWeakCount * (1.0 + randf() * difficultyRandomFactor)) / 1.2)
+	var mediumCount = int((baseMediumCount * (1.0 + randf() * difficultyRandomFactor)) / 1.5)
+	var strongCount = int((baseStrongCount * (1.0 + randf() * difficultyRandomFactor)) / 0.9)
 
 	# Feinde spawnen
 	spawnEnemies(weakEnemies, round(weakCount), defer)
@@ -74,9 +74,9 @@ func spawnEnemy(enemyType, defer):
 func _on_timer_timeout():
 	Autoload.current_wave += 1
 	AutoloadAudioStreamPlayer.play_SFX(success_wave_sound)
-	if Autoload.current_wave > 5:
+	if Autoload.current_wave > 8:
 		$Timer.wait_time = 30
-	elif Autoload.current_wave > 3:
+	elif Autoload.current_wave > 5:
 		$Timer.wait_time = 20
 	elif Autoload.current_wave > 1:
 		$Timer.wait_time = 15

diff --git a/scenes/main/tutorial.tscn b/scenes/main/tutorial.tscn
@@ -9,7 +9,7 @@
 [ext_resource type="Texture2D" uid="uid://q07rcflaoqt6" path="res://assets/sprites/ui/WASDButtons.png" id="4_1a6if"]
 [ext_resource type="Texture2D" uid="uid://c3pned356mea" path="res://assets/sprites/ui/Souls.png" id="4_7f4p3"]
 [ext_resource type="Texture2D" uid="uid://vnoy8468nxip" path="res://assets/sprites/enemy/Enemy01.png" id="5_hotyn"]
-[ext_resource type="Texture2D" uid="uid://d0d4yjs6w34yj" path="res://assets/sprites/ui/Crosshairs.png" id="7_e5k8x"]
+[ext_resource type="Texture2D" uid="uid://dsryrmul2820c" path="res://assets/sprites/ui/Crosshairs.png" id="7_e5k8x"]
 [ext_resource type="Texture2D" uid="uid://fdwgaj6fb33w" path="res://assets/sprites/ui/LeftMouseButton.png" id="8_g5poa"]
 [ext_resource type="Texture2D" uid="uid://0k7pk3xi4w8" path="res://assets/sprites/enemy/Enemy02.png" id="9_g3gfg"]
 [ext_resource type="Texture2D" uid="uid://txibeupndrj4" path="res://assets/sprites/enemy/Enemy03.png" id="10_b6joc"]
@@ -838,7 +838,7 @@ offset_right = -212.0
 offset_bottom = -399.0
 theme_override_colors/font_color = Color(0.266667, 0.266667, 0.266667, 1)
 theme_override_font_sizes/font_size = 50
-text = "Use the are ahead to train your fighting and summoning."
+text = "Use the area ahead to train your fighting and summoning."
 autowrap_mode = 2
 clip_text = true
 text_overrun_behavior = 2

diff --git a/scenes/mob/enemies/boulder.gd b/scenes/mob/enemies/boulder.gd
@@ -2,10 +2,10 @@ extends "res://scenes/mob/enemies/enemy.gd"
 
 func _init():
 	super()
-	health = 350
-	damage = 45
+	health = 250
+	damage = 40
 	speed = 300
-	attack_speed = 3.5
+	attack_speed = 4.0
 
 func _process(_delta):
 	check_animation()

diff --git a/scenes/mob/enemies/pebble.gd b/scenes/mob/enemies/pebble.gd
@@ -2,10 +2,10 @@ extends "res://scenes/mob/enemies/enemy.gd"
 
 func _init():
 	super()
-	health = 50
-	damage = 5
+	health = 30
+	damage = 10
 	speed = 450
-	attack_speed = 1.0
+	attack_speed = 1.2
 
 func _process(_delta):
 	check_animation()

diff --git a/scenes/mob/enemies/stone.gd b/scenes/mob/enemies/stone.gd
@@ -3,9 +3,9 @@ extends "res://scenes/mob/enemies/enemy.gd"
 func _init():
 	super()
 	health = 125
-	damage = 25
+	damage = 20
 	speed = 375
-	attack_speed = 2.0
+	attack_speed = 2.2
 
 
 func _process(_delta):

diff --git a/scenes/mob/friends/friend.gd b/scenes/mob/friends/friend.gd
@@ -69,9 +69,8 @@ func increase_stats(aspects: Array[int]):
 		return
 
 	damage = damage + damage * aspects[1] 
-	@warning_ignore("integer_division")
 	max_health = max_health + 50 * aspects[2]
 	health = max_health
 	speed = speed + 25 * aspects[3]
-	attack_speed = max(attack_speed - (attack_speed * aspects[3] * 20)/100, 0.1)
+	attack_speed = max(attack_speed - (0.35 * aspects[3]), 0.1)
 	regeneration = regeneration + 1 * aspects[4]
diff --git a/scenes/mob/friends/friendly_boulder.gd b/scenes/mob/friends/friendly_boulder.gd
@@ -2,12 +2,12 @@ extends "res://scenes/mob/friends/friend.gd"
 
 func _init():	
 	super()
-	max_health = 400
+	max_health = 300
 	health = max_health
 	damage = 45
 	speed = 350
 	attack_speed = 3.5
-	regeneration = 1
+	regeneration = 2
 
 func _process(_delta):
 	check_animation()

diff --git a/scenes/mob/friends/friendly_pebble.gd b/scenes/mob/friends/friendly_pebble.gd
@@ -4,7 +4,7 @@ func _init():
 	super()
 	max_health = 75
 	health = max_health
-	damage = 5
+	damage = 10
 	speed = 450
 	attack_speed = 1.0
 	regeneration = 0

diff --git a/scenes/mob/friends/friendly_stone.gd b/scenes/mob/friends/friendly_stone.gd
@@ -4,8 +4,8 @@ func _init():
 	super()
 	max_health = 150
 	health = max_health
-	damage = 20
-	speed = 450
+	damage = 25
+	speed = 400
 	attack_speed = 2.0
 	regeneration = 1