Merge pull request #325 from furrycactus/samurai-merc-class

The Cudao Update

Author: kyres1

code/game/objects/items/rogueweapons/melee/polearms.dm

@@ -257,6 +257,12 @@
 	smeltresult = /obj/item/ingot/iron
 	max_blade_int = 200
 
+/obj/item/rogueweapon/halberd/naginata
+	name = "naginata"
+	desc = "A Cudese polearm with a long bladed end."
+	icon_state = "naginata"
+	item_state = "naginata"
+
 /datum/intent/spear/cut/halberd
 	damfactor = 0.9
 	swingdelay = 10
@@ -397,6 +403,12 @@
 	smelt_bar_num = 3
 	sellprice = 300
 
+/obj/item/rogueweapon/greatsword/odachi
+	name = "odachi"
+	desc = "A long curved blade originating in Cudao, too unwieldly to be handled one-handed. Larger than its sibling, the Tachi."
+	icon_state = "odachi"
+	item_state = "odachi"
+
 /obj/item/rogueweapon/estoc
 	name = "estoc"
 	desc = "A sword possessed of a long and tapered blade that is intended to be thrust between the \

code/game/objects/items/rogueweapons/melee/swords.dm

@@ -114,6 +114,30 @@
 	is_silver = TRUE
 	icon_state = "silverswordshort"
 
+/obj/item/rogueweapon/sword/katana
+	name = "katana"
+	desc = "A slightly curved sword originating in Cudao, sharpened to a razor's edge."
+	force = 20
+	possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust)
+	gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust)
+	icon_state = "katana"
+	item_state = "katana"
+	minstr = 4
+	wdefense = 4
+
+/obj/item/rogueweapon/sword/tachi
+	icon_state = "tachi"
+	item_state = "tachi"
+	icon = 'icons/roguetown/weapons/32.dmi'
+	name = "tachi"
+	desc = "A slightly curved sword originating in Cudao, sharpened to a razor's edge. Longer than its sibling, the Katana."
+	force = 25
+	force_wielded = 30
+	possible_item_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike)
+	gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike, /datum/intent/sword/chop)
+	bigboy = 1
+	wlength = WLENGTH_LONG
+
 /obj/item/rogueweapon/sword/long
 	force = 25
 	force_wielded = 30
@@ -385,6 +409,7 @@
 			if("onbelt")
 				return list("shrink" = 0.5,"sx" = -4,"sy" = -6,"nx" = 5,"ny" = -6,"wx" = 0,"wy" = -6,"ex" = -1,"ey" = -6,"nturn" = 100,"sturn" = 156,"wturn" = 90,"eturn" = 180,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
 
+
 /datum/intent/sword/strike
 	name = "pommel strike"
 	icon_state = "instrike"

code/modules/clothing/rogueclothes/cloaks.dm

@@ -1363,3 +1363,13 @@
 	icon_state = "naledisash"
 	item_state = "naledisash"
 	desc = "A limp piece of fabric traditionally used to fasten bags that are too baggy, but in modern days has become more of a fashion statement than anything."
+
+/obj/item/clothing/cloak/straw
+	name = "straw cloak"
+	desc = "A lightweight and water-repellant cloak fashioned from woven rice straw, originating in Cudao."
+	icon_state = "straw_cloak"
+	alternate_worn_layer = TABARD_LAYER
+	mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi'
+	slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_SHIRT|ITEM_SLOT_CLOAK
+	r_sleeve_status = SLEEVE_NORMAL
+	l_sleeve_status = SLEEVE_NORMAL

code/modules/clothing/rogueclothes/gloves.dm

@@ -127,7 +127,7 @@
 
 /obj/item/clothing/gloves/roguetown/plate/iron
 	name = "iron plate gauntlets"
-	icon_state = "iron_gauntlets"
+	icon_state = "igauntlets"
 	max_integrity = 135
 	smeltresult = /obj/item/ingot/iron
 

code/modules/clothing/rogueclothes/hats.dm

@@ -746,6 +746,28 @@
 	smeltresult = /obj/item/ingot/steel
 	smelt_bar_num = 2
 
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai
+	name = "steel samurai helmet"
+	desc = "A steel Cudese helmet with a menacing visage, evocative of a demon, intended to strike terror into the foe beholding it."
+	icon_state = "samurai"
+	item_state = "samurai"
+	emote_environment = 3
+	flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
+	block2add = FOV_RIGHT|FOV_LEFT
+	smeltresult = /obj/item/ingot/steel
+	smelt_bar_num = 2
+
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron
+	name = "iron samurai helmet"
+	desc = "An iron Cudese helmet with a menacing visage, evocative of a demon, intended to strike terror into the foe beholding it."
+	icon_state = "iron_samurai"
+	item_state = "iron_samurai"
+	emote_environment = 3
+	flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
+	block2add = FOV_RIGHT|FOV_LEFT
+	smeltresult = /obj/item/ingot/iron
+	smelt_bar_num = 2
+
 /obj/item/clothing/head/roguetown/helmet/heavy/sheriff
 	name = "barred helmet"
 	desc = "A helmet which offers good protection to the face at the expense of vision."
@@ -1478,3 +1500,11 @@
 	desc = "A feathered leather hat, to show them all your superiority."
 	icon_state = "duelhat"
 	sewrepair = TRUE
+
+/obj/item/clothing/head/roguetown/cudese_straw_hat
+	name = "cudese straw hat"
+	desc = "A straw hat popular in Cudao, water-resistant and good at keeping the sun off."
+	icon_state = "cudese_straw_hat"
+	item_state = "cudese_straw_hat"
+	sewrepair = TRUE
+	color = "#fbc588"

code/modules/clothing/rogueclothes/shirts.dm

@@ -372,3 +372,39 @@
 	desc = "A billowing tunic made of the finest silks and softest fabrics. Inlaid with golden thread, this is the height of fashion for the wealthiest of wearers."
 	icon_state = "stewardtunic"
 	item_state = "stewardtunic"
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic
+	slot_flags = ITEM_SLOT_SHIRT|ITEM_SLOT_ARMOR
+	name = "cudese tunic"
+	desc = "A tunic originating from Cudao."
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS|VITALS
+	icon_state = "cudese_tunic"
+	boobed = FALSE
+	r_sleeve_status = SLEEVE_NORMAL
+	l_sleeve_status = SLEEVE_NORMAL
+	flags_inv = HIDECROTCH|HIDEBOOB
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/green
+	color = CLOTHING_GREEN
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/blue
+	color = CLOTHING_BLUE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/red
+	color = CLOTHING_RED
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/purple
+	color = CLOTHING_PURPLE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/white
+	color = CLOTHING_WHITE
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/black
+	color = CLOTHING_BLACK
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/ucolored
+	color = COLOR_GRAY
+
+/obj/item/clothing/suit/roguetown/shirt/cudese_tunic/random/Initialize()
+	color = pick(CLOTHING_PURPLE, CLOTHING_RED, CLOTHING_BLUE, CLOTHING_GREEN, CLOTHING_BLACK, CLOTHING_WHITE, COLOR_GRAY)
+	..()

code/modules/jobs/job_types/roguetown/adventurer/types/antag/ronin.dm

@@ -0,0 +1,82 @@
+/datum/advclass/ronin
+	name = "Ronin"
+	tutorial = "A disgraced Samurai of Cudao, fallen from grace. Perhaps you took too many contracts for unscrupulous buyers, perhaps you disgraced yourself thoroughly on a previous job, or perhaps you even killed your own master. Whatever led you down this path, the shame was too great to return to your old life."
+	allowed_sexes = list(MALE, FEMALE)
+	allowed_races = RACES_SHUNNED_UP
+	outfit = /datum/outfit/job/roguetown/bandit/ronin
+	category_tags = list(CTAG_BANDIT)
+	cmode_music = 'sound/music/combat_yinbladesmen.ogg'
+
+/datum/outfit/job/roguetown/bandit/ronin/pre_equip(mob/living/carbon/human/H)
+	..()
+	H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
+	H.change_stat("strength", 2)
+	H.change_stat("endurance", 3)
+	H.change_stat("constitution", 2)
+	H.change_stat("perception", 1)
+	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+	belt = /obj/item/storage/belt/rogue/leather/black
+	beltr = /obj/item/quiver/arrows
+	id = /obj/item/mattcoin
+	neck = /obj/item/clothing/neck/roguetown/chaincoif/iron/blk
+	cloak = /obj/item/clothing/cloak/straw
+	shirt = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/blk
+	head = /obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron/blk
+	armor = /obj/item/clothing/suit/roguetown/armor/brigandine/coatplates/iron/blk
+	pants = /obj/item/clothing/under/roguetown/platelegs/iron/blk
+	shoes = /obj/item/clothing/shoes/roguetown/boots/armor/iron/blk
+	gloves = /obj/item/clothing/gloves/roguetown/plate/iron/blk
+	backl = /obj/item/storage/backpack/rogue/satchel/black
+	backpack_contents = list(/obj/item/flashlight/flare/torch/lantern = 1, /obj/item/storage/belt/rogue/pouch/coins/poor = 1)
+
+	var/weapons = list("Katana & Recurve Bow","Tachi & Buckler","Odachi","Naginata")
+	var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
+	switch(weapon_choice)
+		if("Katana & Recurve Bow")
+			H.put_in_hands(new /obj/item/rogueweapon/sword/katana(H), TRUE)
+			H.put_in_hands(new /obj/item/gun/ballistic/revolver/grenadelauncher/bow/recurve(H), TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+		if("Tachi & Buckler")
+			H.put_in_hands(new /obj/item/rogueweapon/sword/tachi(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/shield/buckler(H), TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE)
+		if("Odachi")
+			H.put_in_hands(new /obj/item/rogueweapon/greatsword/odachi(H), TRUE)
+			H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+		if("Naginata")
+			H.put_in_hands(new /obj/item/rogueweapon/halberd/naginata(H), TRUE)
+			H.put_in_hands(new /obj/item/gwstrap(H), TRUE)
+			H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
+
+//Funny dye stuff
+/obj/item/clothing/neck/roguetown/chaincoif/iron/blk
+		color = CLOTHING_GREY
+
+/obj/item/clothing/head/roguetown/helmet/heavy/samurai/iron/blk
+		color = CLOTHING_GREY
+
+/obj/item/clothing/suit/roguetown/armor/brigandine/coatplates/iron/blk
+		color = CLOTHING_GREY
+
+/obj/item/clothing/under/roguetown/platelegs/iron/blk
+		color = CLOTHING_GREY
+
+/obj/item/clothing/gloves/roguetown/plate/iron/blk
+		color = CLOTHING_GREY