Рефактор ксен v2

ColonialMarinesALPHA.dme

@@ -1133,6 +1133,7 @@
 #include "code\modules\mob\living\carbon\monkey\yiren.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\attack_alien.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castedatum.dm"
 #include "code\modules\mob\living\carbon\xenomorph\damage_procs.dm"
 #include "code\modules\mob\living\carbon\xenomorph\death.dm"
 #include "code\modules\mob\living\carbon\xenomorph\egg_item.dm"
@@ -1155,35 +1156,49 @@
 #include "code\modules\mob\living\carbon\xenomorph\XenoUpgrades.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Boiler\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Boiler\Boiler.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Boiler\Boiler_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Carrier\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Carrier\Carrier.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Carrier\Carrier_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Crusher\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Crusher\Crusher.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Crusher\Crusher_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Defender\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Defender\Defender.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Defender\Defender_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Drone\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Drone\Drone.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Drone\Drone_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Hivelord\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Hivelord\Hivelord.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Hivelord\Hivelord_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Larva\Larva.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Lurker\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Lurker\Lurker.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Lurker\Lurker_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Praetorian\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Praetorian\Praetorian.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Praetorian\Pratetorian_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Predalien\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Predalien\Predalien.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Queen\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Queen\Queen.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Queen\Queen_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Ravager\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Ravager\Ravager.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Ravager\Ravager_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Runner\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Runner\Runner.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Runner\Runner_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Sentinel\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Sentinel\Sentinel.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Sentinel\Sentinel_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Spitter\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Spitter\Spitter.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Spitter\Spitter_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Warrior\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Warrior\Warrior.dm"
+#include "code\modules\mob\living\carbon\xenomorph\Castes\Warrior\Warrior_Caste.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Xenoborg\Abilities.dm"
 #include "code\modules\mob\living\carbon\xenomorph\Castes\Xenoborg\Xenoborg.dm"
 #include "code\modules\mob\living\silicon\alarm.dm"
@@ -1468,20 +1483,19 @@
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\misc_helpers.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
-#include "code\WorkInProgress\carrotman2013\marines\kit_guns.dm"
-#include "code\WorkInProgress\carrotman2013\marines\kits.dm"
-#include "code\WorkInProgress\carrotman2013\yautja\spinal_cords.dm"
-#include "code\WorkInProgress\carrotman2013\marines\PO_supply.dm"
-#include "code\WorkInProgress\carrotman2013\yautja\scope.dm"
-#include "code\WorkInProgress\carrotman2013\yautja\rnd.dm"
 #include "code\WorkInProgress\carrotman2013\aliens\misc.dm"
+#include "code\WorkInProgress\carrotman2013\aliens\facehuggers\facehuggers.dm"
 #include "code\WorkInProgress\carrotman2013\marines\attachables.dm"
 #include "code\WorkInProgress\carrotman2013\marines\heartbeat.dm"
-#include "code\WorkInProgress\carrotman2013\other\profpref.dm"
-#include "code\WorkInProgress\carrotman2013\other\ambience.dm"
-#include "code\WorkInProgress\carrotman2013\aliens\facehuggers\facehuggers.dm"
-#include "code\WorkInProgress\carrotman2013\marines\motiondetector\pools.dm"
+#include "code\WorkInProgress\carrotman2013\marines\kit_guns.dm"
+#include "code\WorkInProgress\carrotman2013\marines\kits.dm"
+#include "code\WorkInProgress\carrotman2013\marines\PO_supply.dm"
 #include "code\WorkInProgress\carrotman2013\marines\motiondetector\motiondetector.dm"
+#include "code\WorkInProgress\carrotman2013\marines\motiondetector\pools.dm"
+#include "code\WorkInProgress\carrotman2013\other\profpref.dm"
+#include "code\WorkInProgress\carrotman2013\yautja\rnd.dm"
+#include "code\WorkInProgress\carrotman2013\yautja\scope.dm"
+#include "code\WorkInProgress\carrotman2013\yautja\spinal_cords.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
 #include "code\WorkInProgress\computer3\bios.dm"
 #include "code\WorkInProgress\computer3\buildandrepair.dm"

code/modules/mob/living/carbon/xenomorph/Castedatum.dm

@@ -0,0 +1,51 @@
+/datum/xeno_caste
+	var/name = "Xenomorph"
+	var/desc = "The workhorse of the hive."
+	var/eldery = "Young"
+	var/caste_type = /mob/living/carbon/Xenomorph/Drone
+	var/next_upgrade = null
+
+	var/melee_damage_lower = 12
+	var/melee_damage_upper = 16
+	var/health = 120
+	var/maxHealth = 120
+	var/plasma_max = 800
+	var/plasma_gain = 20
+	var/upgrade_threshold = 400
+	var/caste_desc = ""						//flavor desc
+	var/armor_deflection = 5
+	var/tacklemin = 3
+	var/tacklemax = 5
+	var/tackle_chance = 60
+	var/speed = -0.9
+	var/aura_strength = 0
+	var/spit_delay = 0
+	var/bomb_strength = 0
+	var/pounce_delay = 40
+	var/attack_delay = 0
+	var/queen_leader_limit = 0
+
+	var/evolution_allowed = TRUE
+
+/datum/xeno_caste/proc/apply_caste(mob/living/carbon/Xenomorph/X)
+	X.caste = src
+	X.caste_desc = caste_desc
+	X.caste_path = next_upgrade
+
+	X.melee_damage_lower = melee_damage_lower
+	X.melee_damage_upper = melee_damage_upper
+	X.health = health
+	X.maxHealth = maxHealth
+	X.plasma_max = plasma_max
+	X.plasma_gain = plasma_gain
+	X.upgrade_threshold = upgrade_threshold
+	X.armor_deflection = armor_deflection
+	X.tacklemin = tacklemin
+	X.tacklemax = tacklemax
+	X.tackle_chance = tackle_chance
+	X.speed = speed
+	X.aura_strength = aura_strength
+	X.bomb_strength = bomb_strength
+	X.pounce_delay = pounce_delay
+	X.attack_delay = attack_delay
+	X.queen_leader_limit = queen_leader_limit

code/modules/mob/living/carbon/xenomorph/Castes/Boiler/Boiler.dm

@@ -6,6 +6,7 @@
 	desc = "A huge, grotesque xenomorph covered in glowing, oozing acid slime."
 	icon = 'icons/Xeno/xenomorph_64x64.dmi'
 	icon_state = "Boiler Walking"
+	caste_path = /datum/xeno_caste/Boiler
 	melee_damage_lower = 12
 	melee_damage_upper = 15
 	tacklemin = 2

code/modules/mob/living/carbon/xenomorph/Castes/Boiler/Boiler_Caste.dm

@@ -0,0 +1,83 @@
+/datum/xeno_caste/Boiler
+	name = "Boiler"
+	eldery = "Young"
+	desc = "A huge, grotesque xenomorph covered in glowing, oozing acid slime."
+	caste_type = /mob/living/carbon/Xenomorph/Boiler
+	next_upgrade = /datum/xeno_caste/Boiler/mature
+
+	melee_damage_lower = 12
+	melee_damage_upper = 15
+	tacklemin = 2
+	tacklemax = 4
+	tackle_chance = 60
+	health = 180
+	maxHealth = 180
+	plasma_gain = 30
+	plasma_max = 800
+	upgrade_threshold = 400
+	evolution_allowed = FALSE
+	spit_delay = 40
+	speed = 0.7
+	armor_deflection = 20
+	bomb_strength = 1.0
+
+	evolution_allowed = FALSE
+
+/datum/xeno_caste/Boiler/mature
+	eldery = "Mature"
+	next_upgrade = /datum/xeno_caste/Boiler/elder
+
+	melee_damage_lower = 20
+	melee_damage_upper = 25
+	health = 200
+	maxHealth = 200
+	plasma_gain = 35
+	plasma_max = 900
+	upgrade_threshold = 600
+	spit_delay = 30
+	bomb_strength = 1.5
+	caste_desc = "It looks a little more dangerous."
+	armor_deflection = 30
+	tacklemin = 3
+	tacklemax = 5
+	tackle_chance = 65
+	speed = 0.6
+
+/datum/xeno_caste/Boiler/elder
+	eldery = "Elder"
+	next_upgrade = /datum/xeno_caste/Boiler/ancient
+
+	melee_damage_lower = 30
+	melee_damage_upper = 35
+	health = 220
+	maxHealth = 220
+	plasma_gain = 40
+	plasma_max = 1000
+	upgrade_threshold = 1200
+	spit_delay = 20
+	bomb_strength = 2
+	caste_desc = "It looks pretty strong."
+	armor_deflection = 35
+	tacklemin = 3
+	tacklemax = 5
+	tackle_chance = 70
+	speed = 0.5
+
+/datum/xeno_caste/Boiler/ancient
+	eldery = "Ancient"
+	next_upgrade = null
+
+	melee_damage_lower = 35
+	melee_damage_upper = 45
+	health = 250
+	maxHealth = 250
+	plasma_gain = 50
+	plasma_max = 1000
+	spit_delay = 10
+	bomb_strength = 2.5
+	caste_desc = "A devestating piece of alien artillery."
+	armor_deflection = 35
+	tacklemin = 4
+	tacklemax = 6
+	tackle_chance = 80
+	speed = 0.4

code/modules/mob/living/carbon/xenomorph/Castes/Carrier/Carrier.dm

@@ -6,6 +6,7 @@
 	desc = "A strange-looking alien creature. It carries a number of scuttling jointed crablike creatures."
 	icon = 'icons/Xeno/xenomorph_64x64.dmi' //They are now like, 2x2
 	icon_state = "Carrier Walking"
+	caste_path = /datum/xeno_caste/Carrier
 	melee_damage_lower = 20
 	melee_damage_upper = 30
 	tacklemin = 2

code/modules/mob/living/carbon/xenomorph/Castes/Carrier/Carrier_Caste.dm

@@ -0,0 +1,98 @@
+/datum/xeno_caste/Carrier
+	name = "Carrier"
+	eldery = "Young"
+	caste_type = /mob/living/carbon/Xenomorph/Carrier
+	next_upgrade = /datum/xeno_caste/Carrier/mature
+
+	melee_damage_lower = 20
+	melee_damage_upper = 30
+	tacklemin = 2
+	tacklemax = 3
+	tackle_chance = 60
+	health = 175
+	maxHealth = 175
+	plasma_max = 250
+	upgrade_threshold = 400
+	evolution_allowed = FALSE
+	plasma_gain = 8
+	caste_desc = "A carrier of huggies."
+	aura_strength = 1 //Carrier's pheromones are equivalent to Hivelord. Climbs 0.5 up to 2.5
+	speed = 0
+
+	var/huggers_max = 0
+	var/throwspeed = 1
+	var/hugger_delay = 30
+	var/eggs_max = 3
+
+/datum/xeno_caste/Carrier/apply_caste(mob/living/carbon/Xenomorph/X)
+	. = ..()
+	var/mob/living/carbon/Xenomorph/Carrier/C = X
+	C.huggers_max = huggers_max
+	C.throwspeed = throwspeed
+	C.hugger_delay = hugger_delay
+	C.eggs_max = eggs_max
+
+/datum/xeno_caste/Carrier/mature
+	eldery = "Mature"
+	next_upgrade = /datum/xeno_caste/Carrier/elder
+
+	melee_damage_lower = 25
+	melee_damage_upper = 35
+	health = 200
+	maxHealth = 200
+	plasma_max = 300
+	plasma_gain = 10
+	upgrade_threshold = 600
+	caste_desc = "A portable Love transport. It looks a little more dangerous."
+	armor_deflection = 10
+	tacklemin = 3
+	tacklemax = 4
+	tackle_chance = 60
+	speed = -0.1
+	aura_strength = 1.5
+	huggers_max = 9
+	hugger_delay = 30
+	eggs_max = 4
+
+/datum/xeno_caste/Carrier/elder
+	eldery = "Elder"
+	next_upgrade = /datum/xeno_caste/Carrier/ancient
+
+	melee_damage_lower = 30
+	melee_damage_upper = 40
+	health = 220
+	maxHealth = 220
+	plasma_max = 350
+	plasma_gain = 12
+	upgrade_threshold = 1200
+	caste_desc = "It looks pretty strong."
+	armor_deflection = 10
+	tacklemin = 4
+	tacklemax = 5
+	tackle_chance = 70
+	speed = -0.2
+	aura_strength = 2
+	huggers_max = 10
+	hugger_delay = 20
+	eggs_max = 5
+
+/datum/xeno_caste/Carrier/ancient
+	eldery = "Ancient"
+	next_upgrade = null
+
+	melee_damage_lower = 35
+	melee_damage_upper = 45
+	health = 250
+	maxHealth = 250
+	plasma_max = 400
+	plasma_gain = 15
+	caste_desc = "It's literally crawling with 10 huggers."
+	armor_deflection = 15
+	tacklemin = 5
+	tacklemax = 6
+	tackle_chance = 75
+	speed = -0.3
+	aura_strength = 2.5
+	huggers_max = 11
+	hugger_delay = 10
+	eggs_max = 6

code/modules/mob/living/carbon/xenomorph/Castes/Crusher/Crusher.dm

@@ -4,6 +4,7 @@
 	desc = "A huge alien with an enormous armored head crest."
 	icon = 'icons/Xeno/2x2_Xenos.dmi'
 	icon_state = "Crusher Walking"
+	caste_path = /datum/xeno_caste/Crusher
 	melee_damage_lower = 15
 	melee_damage_upper = 30
 	tacklemin = 3