Additions and Changes to Combat Tracks

COMMIT TO MAIN IMMEDIATELY
russ-money · Sep 6, 2024 · c8d986a · c8d986a
1 parent efd8408
commit c8d986a
Show file tree

Hide file tree

Showing 54 changed files with 34 additions and 13 deletions.
diff --git a/code/modules/antagonists/roguetown/villain/maniac/maniac.dm b/code/modules/antagonists/roguetown/villain/maniac/maniac.dm
@@ -91,7 +91,7 @@
 	if(owner.current)
 		if(ishuman(owner.current))
 			var/mob/living/carbon/human/dreamer = owner.current
-			dreamer.cmode_music = 'sound/music/combat_maniac2.ogg'
+			dreamer.cmode_music = 'sound/music/combatmusic/CombatManiac.ogg'
 			owner.adjust_skillrank(/datum/skill/combat/knives, 6, TRUE)
 			owner.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE)
 			owner.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE)

diff --git a/code/modules/antagonists/roguetown/villain/vampire.dm b/code/modules/antagonists/roguetown/villain/vampire.dm
@@ -67,7 +67,7 @@
 	ADD_TRAIT(owner.current, TRAIT_TOXIMMUNE, TRAIT_GENERIC)
 	ADD_TRAIT(owner.current, TRAIT_STEELHEARTED, TRAIT_GENERIC)
 	ADD_TRAIT(owner.current, TRAIT_LIMPDICK, TRAIT_GENERIC)
-	owner.current.cmode_music = 'sound/music/combat_vamp2.ogg'
+	owner.current.cmode_music = 'sound/music/combatmusic/CombatVampireThrall.ogg' // YEAH WHADDUP BABY
 	var/obj/item/organ/eyes/eyes = owner.current.getorganslot(ORGAN_SLOT_EYES)
 	if(eyes)
 		eyes.Remove(owner.current,1)

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm
@@ -15,6 +15,7 @@
 	)
 	outfit = /datum/outfit/job/roguetown/adventurer/monk
 	traits_applied = list(TRAIT_DODGEEXPERT)
+	cmode_music = 'sound/music/combatmusic/CombatMonk.ogg'
 
 	vampcompat = FALSE
 

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm
@@ -13,6 +13,7 @@
 	)
 	outfit = /datum/outfit/job/roguetown/adventurer/ranger
 	traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_DODGEEXPERT)
+	cmode_music = 'sound/music/combatmusic/CombatRanger.ogg'
 	category_tags = list(CTAG_ADVENTURER)
 
 /datum/outfit/job/roguetown/adventurer/ranger/pre_equip(mob/living/carbon/human/H)

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm
@@ -10,6 +10,7 @@
 	pickprob = 11
 	traits_applied = list(TRAIT_MEDIUMARMOR)
 	category_tags = list(CTAG_ADVENTURER)
+	cmode_music = 'sound/music/combatmusic/CombatWitchHunter.ogg'
 
 /datum/outfit/job/roguetown/adventurer/puritan
 	allowed_patrons = list(/datum/patron/old_god)

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
@@ -15,6 +15,7 @@
 	)
 	outfit = /datum/outfit/job/roguetown/adventurer/rogue
 	traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_DODGEEXPERT)
+	cmode_music = 'sound/music/combatmusic/CombatThief.ogg'
 	category_tags = list(CTAG_ADVENTURER)
 
 /datum/outfit/job/roguetown/adventurer/rogue

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm
@@ -16,6 +16,7 @@
 	)
 	outfit = /datum/outfit/job/roguetown/adventurer/sfighter
 	traits_applied = list(TRAIT_HEAVYARMOR)
+	cmode_music = 'sound/music/combatmusic/CombatWarrior.ogg'
 
 	category_tags = list(CTAG_ADVENTURER)
 

diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm
@@ -21,6 +21,7 @@
 	give_bank_account = TRUE
 	min_pq = 0
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatAcolyte.ogg'
 
 /datum/outfit/job/roguetown/monk
 	name = "Acolyte"

diff --git a/code/modules/jobs/job_types/roguetown/church/mortician.dm b/code/modules/jobs/job_types/roguetown/church/mortician.dm
@@ -25,6 +25,7 @@
 	give_bank_account = TRUE
 	min_pq = -5
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatMortician.ogg'
 
 /datum/outfit/job/roguetown/undertaker
 	allowed_patrons = list(/datum/patron/divine/necra)

diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm
@@ -22,6 +22,7 @@
 	give_bank_account = 115
 	min_pq = 2
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatPriest.ogg'
 
 /datum/outfit/job/roguetown/priest
 	allowed_patrons = list(/datum/patron/divine/astrata)

diff --git a/code/modules/jobs/job_types/roguetown/church/puritan.dm b/code/modules/jobs/job_types/roguetown/church/puritan.dm
@@ -29,6 +29,7 @@
 	give_bank_account = 36
 	min_pq = 5
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatInquisitor.ogg'
 
 /datum/job/roguetown/puritan/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/courtier/butler.dm b/code/modules/jobs/job_types/roguetown/courtier/butler.dm
@@ -26,6 +26,7 @@
 	give_bank_account = 5
 	min_pq = -10
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatButler.ogg'
 
 /datum/outfit/job/roguetown/butler/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/courtier/jester.dm b/code/modules/jobs/job_types/roguetown/courtier/jester.dm
@@ -56,7 +56,14 @@
 		H.STASTR = rand(1, 20)
 		H.STAINT = rand(1, 20)
 		H.STALUC = rand(1, 20)
-		H.cmode_music = 'sound/music/combat_jester.ogg'
+		H.cmode_music = pick(
+			prob(50)
+				"sound/music/combatmusic/CombatJester1.ogg",
+			prob(45)
+				"sound/music/combatmusic/CombatJester2.ogg",
+			prob(5)
+				"sound/music/combatmusic/CombatJester3.ogg"
+		)
 /*
 		if(H.gender == MALE)
 			if(H.dna?.species)

diff --git a/code/modules/jobs/job_types/roguetown/courtier/magician.dm b/code/modules/jobs/job_types/roguetown/courtier/magician.dm
@@ -23,6 +23,7 @@
 	give_bank_account = 47
 	min_pq = 2
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatCourtMage.ogg'
 
 /datum/outfit/job/roguetown/magician
 	allowed_patrons = list(/datum/patron/divine/noc)

diff --git a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm
@@ -24,7 +24,7 @@
 	min_pq = 2
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_weird.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatDungeoneer.ogg'
 
 /datum/outfit/job/roguetown/dungeoneer/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm b/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm
@@ -15,7 +15,7 @@
 	min_pq = 4
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_guard2.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatGatemaster.ogg'
 
 /datum/job/roguetown/gatemaster/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm
@@ -16,7 +16,7 @@
 	min_pq = 2
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_guard2.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatManorGuard.ogg'
 
 /datum/job/roguetown/manorguard/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm
@@ -22,7 +22,7 @@
 	min_pq = 4
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_guard.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatVeteran.ogg'
 
 /datum/job/roguetown/veteran/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	. = ..()

diff --git a/code/modules/jobs/job_types/roguetown/nobility/hand.dm b/code/modules/jobs/job_types/roguetown/nobility/hand.dm
@@ -14,6 +14,7 @@
 	give_bank_account = 44
 	min_pq = 3
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatHand.ogg'
 
 /*
 /datum/job/roguetown/hand/special_job_check(mob/dead/new_player/player)

diff --git a/code/modules/jobs/job_types/roguetown/nobility/knight.dm b/code/modules/jobs/job_types/roguetown/nobility/knight.dm
@@ -16,7 +16,7 @@
 	min_pq = 4
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_guard2.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatKnight.ogg'
 
 /datum/job/roguetown/knight/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm b/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm
@@ -21,7 +21,7 @@
 	min_pq = 4
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_guard2.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatSheriff.ogg'
 
 /datum/job/roguetown/sheriff/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	. = ..()

diff --git a/code/modules/jobs/job_types/roguetown/nobility/steward.dm b/code/modules/jobs/job_types/roguetown/nobility/steward.dm
@@ -18,6 +18,7 @@
 	give_bank_account = 17
 	min_pq = 2
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatButler.ogg'
 
 /datum/outfit/job/roguetown/steward/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm b/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm
@@ -24,7 +24,7 @@
 	tutorial = "The Lunatic, shunned by society and a magnet for misfortune. Your task is simple yet perilous: survive by any means, though your very existence invites danger from every corner. Seek redemption through kindness and camaraderie; it's your quickest escape from this cursed plight. Tread carefully, for trust is hard-won and easily lost."
 	display_order = JDO_LUNATIC
 
-	cmode_music = 'sound/music/combat_bum.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatLunatic.ogg'
 
 /datum/outfit/job/roguetown/lunatic/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm b/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm
@@ -22,7 +22,7 @@
 	max_pq = null
 	required = TRUE
 
-	cmode_music = 'sound/music/combat_giza.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatMerchant.ogg'
 
 /datum/outfit/job/roguetown/merchant/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm b/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm
@@ -27,7 +27,7 @@
 	min_pq = -30
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_bum.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatOrphan.ogg'
 
 /datum/job/roguetown/orphan/New()
 	. = ..()

diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm b/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm
@@ -22,6 +22,7 @@
 	give_bank_account = TRUE
 	min_pq = -10
 	max_pq = null
+	cmode_music = 'sound/music/combatmusic/CombatButler.ogg'
 
 /datum/outfit/job/roguetown/servant/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm b/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm
@@ -27,7 +27,7 @@
 	min_pq = -10
 	max_pq = null
 
-	cmode_music = 'sound/music/combat_giza.ogg'
+	cmode_music = 'sound/music/combatmusic/CombatMerchant.ogg'
 
 /datum/outfit/job/roguetown/shophand/pre_equip(mob/living/carbon/human/H)
 	..()

diff --git a/sound/music/combatmusic/CombatAcolyte.ogg b/sound/music/combatmusic/CombatAcolyte.ogg
diff --git a/sound/music/combatmusic/CombatButler.ogg b/sound/music/combatmusic/CombatButler.ogg
diff --git a/sound/music/combatmusic/CombatCourtMage.ogg b/sound/music/combatmusic/CombatCourtMage.ogg
diff --git a/sound/music/combatmusic/CombatDungeoneer.ogg b/sound/music/combatmusic/CombatDungeoneer.ogg
diff --git a/sound/music/combatmusic/CombatGatemaster.ogg b/sound/music/combatmusic/CombatGatemaster.ogg
diff --git a/sound/music/combatmusic/CombatHand.ogg b/sound/music/combatmusic/CombatHand.ogg
diff --git a/sound/music/combatmusic/CombatInquisitor.ogg b/sound/music/combatmusic/CombatInquisitor.ogg
diff --git a/sound/music/combatmusic/CombatJester1.ogg b/sound/music/combatmusic/CombatJester1.ogg
diff --git a/sound/music/combatmusic/CombatJester2.ogg b/sound/music/combatmusic/CombatJester2.ogg
diff --git a/sound/music/combatmusic/CombatJester3.ogg b/sound/music/combatmusic/CombatJester3.ogg
diff --git a/sound/music/combatmusic/CombatKnight.ogg b/sound/music/combatmusic/CombatKnight.ogg
diff --git a/sound/music/combatmusic/CombatLunatic.ogg b/sound/music/combatmusic/CombatLunatic.ogg
diff --git a/sound/music/combatmusic/CombatManiac.ogg b/sound/music/combatmusic/CombatManiac.ogg
diff --git a/sound/music/combatmusic/CombatManorGuard.ogg b/sound/music/combatmusic/CombatManorGuard.ogg
diff --git a/sound/music/combatmusic/CombatMerchant.ogg b/sound/music/combatmusic/CombatMerchant.ogg
diff --git a/sound/music/combatmusic/CombatMonk.ogg b/sound/music/combatmusic/CombatMonk.ogg
diff --git a/sound/music/combatmusic/CombatMortician.ogg b/sound/music/combatmusic/CombatMortician.ogg
diff --git a/sound/music/combatmusic/CombatOrphan.ogg b/sound/music/combatmusic/CombatOrphan.ogg
diff --git a/sound/music/combatmusic/CombatPriest.ogg b/sound/music/combatmusic/CombatPriest.ogg
diff --git a/sound/music/combatmusic/CombatRanger.ogg b/sound/music/combatmusic/CombatRanger.ogg
diff --git a/sound/music/combatmusic/CombatRogue.ogg b/sound/music/combatmusic/CombatRogue.ogg
diff --git a/sound/music/combatmusic/CombatSheriff.ogg b/sound/music/combatmusic/CombatSheriff.ogg
diff --git a/sound/music/combatmusic/CombatThief.ogg b/sound/music/combatmusic/CombatThief.ogg
diff --git a/sound/music/combatmusic/CombatVampireThrall.ogg b/sound/music/combatmusic/CombatVampireThrall.ogg
diff --git a/sound/music/combatmusic/CombatVeteran.ogg b/sound/music/combatmusic/CombatVeteran.ogg
diff --git a/sound/music/combatmusic/CombatWarrior.ogg b/sound/music/combatmusic/CombatWarrior.ogg
diff --git a/sound/music/combatmusic/CombatWitchHunter.ogg b/sound/music/combatmusic/CombatWitchHunter.ogg