Added Suebi level 2 and 3 infantry units, the Veteran Kregar and the …

…Truhtin
Andrettin · Jul 15, 2022 · aedd649 · aedd649
1 parent 88e76cc
commit aedd649
Show file tree

Hide file tree

Showing 27 changed files with 328 additions and 118 deletions.
diff --git a/data/buttons/abilities/abilities.txt b/data/buttons/abilities/abilities.txt
@@ -122,6 +122,7 @@ cast_puncture = {
 		unit_goblin_warlord
 		unit_latin_centurion
 		unit_norse_heroic_swordsman
+		unit_suebi_chieftain
 		unit_teuton_heroic_swordsman
 		unit_teuton_spearman
 		unit_western_footman

diff --git a/data/buttons/ability_learning.txt b/data/buttons/ability_learning.txt
@@ -62,6 +62,7 @@ learn_sword_mastery_bronze = {
 		unit_kobold_champion
 		unit_latin_centurion
 		unit_norse_heroic_swordsman
+		unit_suebi_chieftain
 		unit_teuton_heroic_swordsman
 		unit_teuton_knight_lord
 		unit_western_footman
@@ -95,6 +96,7 @@ learn_sword_mastery = {
 		unit_kobold_champion
 		unit_latin_centurion
 		unit_norse_heroic_swordsman
+		unit_suebi_chieftain
 		unit_teuton_heroic_swordsman
 		unit_teuton_knight_lord
 		unit_western_footman
@@ -349,6 +351,7 @@ learn_puncture = {
 		unit_goblin_warlord
 		unit_latin_centurion
 		unit_norse_heroic_swordsman
+		unit_suebi_chieftain
 		unit_teuton_heroic_swordsman
 		unit_teuton_spearman
 		unit_western_footman

diff --git a/data/buttons/units/suebi_experience_upgrades.txt b/data/buttons/units/suebi_experience_upgrades.txt
@@ -0,0 +1,25 @@
+upgrade_to_suebi_veteran_swordsman = {
+	pos = 1
+	level = choose_individual_upgrade_level
+	action = experience_upgrade_to
+	value = unit_suebi_veteran_swordsman
+	key = k
+	hint = "Upgrade to Veteran ~!Kregar"
+	popup = popup_unit
+	unit_types = {
+		unit_suebi_swordsman
+	}
+}
+
+upgrade_to_suebi_chieftain = {
+	pos = 1
+	level = choose_individual_upgrade_level
+	action = experience_upgrade_to
+	value = unit_suebi_chieftain
+	key = t
+	hint = "Upgrade to ~!Truhtin"
+	popup = popup_unit
+	unit_types = {
+		unit_suebi_veteran_swordsman
+	}
+}
diff --git a/data/characters/suebi/ariovistus.txt b/data/characters/suebi/ariovistus.txt
@@ -1,6 +1,6 @@
 ariovistus = {
 	name = "Ariovistus"
-	unit_type = unit_teuton_heroic_swordsman #chieftain
+	unit_type = unit_suebi_chieftain #chieftain
 	civilization = suebi
 	default_faction = suebia
 	gender = male

diff --git a/data/unit_types/units/suebi/chieftain.txt b/data/unit_types/units/suebi/chieftain.txt
@@ -0,0 +1,79 @@
+unit_suebi_chieftain = {
+	name = "Truhtin"
+	parent = unit_template_heroic_infantry
+	civilization = suebi
+	description = "Suebi chieftains are renowned for their fearlessness in battle."
+	background = "\"Truhtîn\" is an Old High German word for \"lord\" or \"warlord\"."
+	image_file = "units/suebi/swordsman.png"
+	frame_size = { 72 72 }
+	animation_set = animations_melee_unit
+	icon = suebi_chieftain
+	corpse_type = unit_human_dead_body
+	armor = 0 #-2 armor
+	basic_damage = 14 #+2 damage
+	accuracy = 12 #+2 accuracy
+	day_sight_range_bonus = 1
+	night_sight_range_bonus = -1
+	points = 110 #+10 points
+	weapon_classes = {
+		sword
+		thrusting_sword
+	}
+	hack_damage = true
+	ai_drops = {
+		unit_short_sword
+		unit_broad_sword
+		unit_spatha
+		unit_wooden_shield
+		unit_bronze_shield
+		unit_iron_shield
+		unit_kite_shield
+		unit_boots
+		unit_carrots
+		unit_cheese
+		unit_meat
+		unit_potion_of_healing
+	}
+	default_equipment = {
+		weapon = unit_short_sword
+		shield = unit_wooden_shield
+		boots = unit_boots
+	}
+	variations = {
+		blond_hair = {
+			name = "Blond Hair"
+			tags = { blond_hair }
+			conditions = {
+				not = {
+					upgrade = upgrade_teuton_iron_shield
+					equipment = unit_heater_shield
+					equipment = unit_iron_shield
+					equipment = unit_kite_shield
+					equipment = unit_thrymgjol_shield
+				}
+			}
+		}
+		blond_hair_with_shield = {
+			image_file = "units/suebi/swordsman_with_shield.png"
+			tags = { blond_hair }
+			conditions = {
+				or = {
+					upgrade = upgrade_teuton_iron_shield
+					equipment = unit_heater_shield
+					equipment = unit_iron_shield
+					equipment = unit_kite_shield
+					equipment = unit_thrymgjol_shield
+				}
+			}
+		}
+	}
+	sounds = {
+		selected = basic_teuton_voices_selected_group
+		acknowledge = basic_teuton_voices_acknowledge
+		ready = basic_teuton_voices_ready
+		help = basic_teuton_voices_help
+		dead = basic_human_voices_dead
+		hit = sword_attack
+		miss = attack_miss
+	}
+}
diff --git a/data/unit_types/units/suebi/veteran_swordsman.txt b/data/unit_types/units/suebi/veteran_swordsman.txt
@@ -0,0 +1,79 @@
+unit_suebi_veteran_swordsman = {
+	name = "Veteran Kregar"
+	parent = unit_template_veteran_infantry
+	civilization = suebi
+	description = "These high-ranking swordsmen have honed their combat skills to a greater degree than many of their counterparts."
+	background = "\"Krêg\" is the Old High German word for \"tenacity\", and possibly \"war\"."
+	image_file = "units/suebi/swordsman.png"
+	frame_size = { 72 72 }
+	animation_set = animations_melee_unit
+	icon = suebi_veteran_swordsman
+	corpse_type = unit_human_dead_body
+	armor = 0 #-2 armor
+	basic_damage = 12 #+2 damage
+	accuracy = 12 #+2 accuracy
+	day_sight_range_bonus = 1
+	night_sight_range_bonus = -1
+	points = 85 #+10 points
+	weapon_classes = {
+		sword
+		thrusting_sword
+	}
+	hack_damage = true
+	ai_drops = {
+		unit_short_sword
+		unit_broad_sword
+		unit_spatha
+		unit_wooden_shield
+		unit_bronze_shield
+		unit_iron_shield
+		unit_kite_shield
+		unit_boots
+		unit_carrots
+		unit_cheese
+		unit_meat
+		unit_potion_of_healing
+	}
+	default_equipment = {
+		weapon = unit_short_sword
+		shield = unit_wooden_shield
+		boots = unit_boots
+	}
+	variations = {
+		blond_hair = {
+			name = "Blond Hair"
+			tags = { blond_hair }
+			conditions = {
+				not = {
+					upgrade = upgrade_teuton_iron_shield
+					equipment = unit_heater_shield
+					equipment = unit_iron_shield
+					equipment = unit_kite_shield
+					equipment = unit_thrymgjol_shield
+				}
+			}
+		}
+		blond_hair_with_shield = {
+			image_file = "units/suebi/swordsman_with_shield.png"
+			tags = { blond_hair }
+			conditions = {
+				or = {
+					upgrade = upgrade_teuton_iron_shield
+					equipment = unit_heater_shield
+					equipment = unit_iron_shield
+					equipment = unit_kite_shield
+					equipment = unit_thrymgjol_shield
+				}
+			}
+		}
+	}
+	sounds = {
+		selected = basic_teuton_voices_selected_group
+		acknowledge = basic_teuton_voices_acknowledge
+		ready = basic_teuton_voices_ready
+		help = basic_teuton_voices_help
+		dead = basic_human_voices_dead
+		hit = sword_attack
+		miss = attack_miss
+	}
+}
diff --git a/data/upgrades/factions/suebi_faction_upgrades.txt b/data/upgrades/factions/suebi_faction_upgrades.txt
@@ -31,8 +31,8 @@ upgrade_faction_marcomannia = {
 		points = 10
 		unit_types = {
 			unit_suebi_swordsman
-			unit_teuton_veteran_swordsman
-			unit_teuton_heroic_swordsman
+			unit_suebi_veteran_swordsman
+			unit_suebi_chieftain
 		}
 	}
 }
@@ -46,8 +46,8 @@ upgrade_faction_semnonia = {
 		points = 10
 		unit_types = {
 			unit_suebi_swordsman
-			unit_teuton_veteran_swordsman
-			unit_teuton_heroic_swordsman
+			unit_suebi_veteran_swordsman
+			unit_suebi_chieftain
 		}
 	}
 }
@@ -60,8 +60,8 @@ upgrade_faction_suebia = {
 		points = 10
 		unit_types = {
 			unit_suebi_swordsman
-			unit_teuton_veteran_swordsman
-			unit_teuton_heroic_swordsman
+			unit_suebi_veteran_swordsman
+			unit_suebi_chieftain
 		}
 	}
 }
diff --git a/readme.txt b/readme.txt
@@ -82,6 +82,8 @@ https://github.com/Andrettin/Wyrmsun
 
 * Units
 - Increased the charge bonus of Gothic cavalry from 7% to 10%.
+- Made it so the Suebi Kregar uses a single-layer image once again (with two variations, one with the Suebi shield and one without), both for the sake of memory efficiency, and because the layered version had some minor graphical issues.
+- Added Suebi level 2 and 3 infantry units, the Veteran Kregar and the Truhtin.
 
 * Upgrades
 - Added Lipizzaner Horse upgrade (icon by Jinn) for the Teutonic civilization (researchable at the Stables). This upgrade increases cavalry HP.

diff --git a/scripts/buttons.lua b/scripts/buttons.lua
@@ -180,7 +180,7 @@ DefineButton( { Pos = 10, Level = "choose-individual-upgrade-level", Icon = "ico
 		"unit-latin-centurion", "unit-latin-javelineer",
 		"unit-norse-heroic-swordsman",
 		"unit-orc-spearthrower",
---		"unit-teuton-heroic-swordsman", "unit-frank-heroic-swordsman",
+--		"unit-teuton-heroic-swordsman", "unit_suebi_chieftain", "unit-frank-heroic-swordsman",
 --		"unit-teuton-spearman", "unit-frank-spearman",
 --		"unit-teuton-archer",
 		"unit-teuton-gunpowder-infantry",