Monolith update

Author: esthvan

code/__DEFINES/stalker.dm

@@ -12,11 +12,11 @@
 #define ROOKIE								0
 
 ///////////////ÐÅÏÓÒÀÖÈß
-#define AMAZING								2000
-#define VERYGOOD							1500
-#define GOOD								1100
-#define NEUTRAL								1000
-#define BAD									900
+#define AMAZING								3000
+#define VERYGOOD							2500
+#define GOOD								1750
+#define NEUTRAL								1500
+#define BAD									1250
 #define VERYBAD								500
 #define DISGUSTING							0
 
@@ -44,7 +44,8 @@
 
 ///////////////SIDORMAT
 #define SHOW_FACTION_EQUIPMENT				1
-#define SELL_UNBUYABLE						2
+#define BUY_STUFF							2
+#define SELL_UNBUYABLE						4
 
 ///////////////COLOR MATRIXES
 #define NIGHTVISION_MATRIX_I			list(0.1, 0.9, 0,\
@@ -64,4 +65,9 @@
 #define AMBIENT_CAMPFIRE_CHANNEL			712
 
 ///////////////GAMEMODES
-#define MONOLITH_REVENGER_HOLD_TIME			100
+#define MONOLITH_REVENGE_HOLD_TIME			600
+
+///////////////MIND STATE
+#define MENTAL_STABLE						0
+#define MENTAL_MONOLITH						1
+#define MENTAL_ZOMBIE						2

code/game/gamemodes/monolith/monolith_war.dm

@@ -23,6 +23,9 @@
 		if(cp.path_ending == "ranger")
 			cp.controlled_by = "Monolith"
 			cp.control_percent = 100
+	for(var/datum/job/J in SSjob.occupations)
+		if(J.faction_s == "Monolith")
+			J.activated = 1
 	return 1
 
 /datum/game_mode/monolith_revenge/post_setup()
@@ -53,21 +56,26 @@
 	if(antag_base_check)
 		if((control_table["Monolith"]/cps.len) >= 0.6)
 			if(winning_faction != "Monolith")
+				add_lenta_message(null, "0", "Sidorovich", "Loners", "[winning_faction] captured most part of Backwater, they should hold their points for next [round(MONOLITH_REVENGE_HOLD_TIME/600)] minutes!")
 				winning_faction = "Monolith"
 				start_hold_time = world.time
 		else
 			winning_faction = null
 			start_hold_time = world.time
 	else
 		if(winning_faction != "Stalkers")
+			add_lenta_message(null, "0", "Sidorovich", "Loners", "[winning_faction] captured most part of Backwater, they should hold their points for next [round(MONOLITH_REVENGE_HOLD_TIME/600)] minutes!")
 			winning_faction = "Stalkers"
 			start_hold_time = world.time
 
-	if(winning_faction && (start_hold_time + MONOLITH_REVENGER_HOLD_TIME <= world.time))
-		if(winning_faction == "Monolith")
-			finished = 1
-		else
-			finished = 2
+	if(winning_faction)
+		if(world.time >= (start_hold_time + MONOLITH_REVENGE_HOLD_TIME))
+			if(winning_faction == "Monolith")
+				finished = 1
+			else
+				finished = 2
+		else if(world.time in (start_hold_time + (MONOLITH_REVENGE_HOLD_TIME/2)) to (start_hold_time + (MONOLITH_REVENGE_HOLD_TIME/2) + world.tick_lag))
+			add_lenta_message(null, "0", "Sidorovich", "Loners", "[winning_faction] should hold for next [round(MONOLITH_REVENGE_HOLD_TIME/1200)] minutes.")
 
 //////////////////////////////////////
 //Checks if the revs have won or not//
@@ -100,6 +108,6 @@
 		world << "<span class='redtext'>Most of stalker bases were lost, stalkers retreat to the south of Zone.</span>"
 	else if(finished == 2)
 		feedback_set_details("round_end_result","is a failure.")
-		world << "<span class='redtext'>Monolith base lost!</span>"
+		world << "<span class='redtext'>Monolith base is lost! Monolith forces are leaving Backwater, stalkers reinforce their defences.</span>"
 	..()
 	return 1

code/game/stalker/machinery/sidormat.dm

@@ -121,7 +121,7 @@ var/list/global_sidormat_list = list(
 		new /datum/data/stalker_equipment("Berill-5M",					"Áåðèëë-5Ì",						/obj/item/clothing/suit/berill,								50000,	EXPERIENCED,faction = "Loners"),
 		new /datum/data/stalker_equipment("Wind of Freedom",	    	"Âåòåð Ñâîáîäû",					/obj/item/clothing/suit/hooded/kombez/veter,				25000,	ROOKIE,		faction = "Freedom"),
 		new /datum/data/stalker_equipment("Guardian of Freedom",		"Ñòðàæ Ñâîáîäû",					/obj/item/clothing/suit/strazh,								40000,	EXPERIENCED,faction = "Freedom"),
-		new /datum/data/stalker_equipment("PZ-1	",						"ÏÇ-1",								/obj/item/clothing/suit/hooded/kombez/monolith,				25000,	ROOKIE,		faction = "Monolith"),
+		new /datum/data/stalker_equipment("PZ-1	",						"ÏÇ-1",								/obj/item/clothing/suit/hooded/kombez/monolith,				25000,	ROOKIE,		faction = "Monolith", sale_price = 8000),
 		new /datum/data/stalker_equipment("Monolith scientific suit	",	"Íàó÷íûé êîìáèíåçîí ìîíîëèòà",		/obj/item/clothing/suit/hooded/sealed/monolith,				60000,	ROOKIE,		faction = "Monolith"),
 		new /datum/data/stalker_equipment("PS5-M",						"ÏÑ5-Ì",							/obj/item/clothing/suit/hooded/kombez/ps5m,					25000,	ROOKIE,		faction = "Duty"),
 		new /datum/data/stalker_equipment("Heavy merc armor",			"Òÿæåëàÿ áðîíÿ íà¸ìíèêîâ",			/obj/item/clothing/suit/assaultmerc,						50000,	EXPERIENCED,faction = "Mercenaries"),
@@ -175,6 +175,7 @@ var/list/global_sidormat_list = list(
 
 	"Misc" = list(
 		/////////////////////////////////	Äðóãîå	/////////////////////////////////////////////
+		new /datum/data/stalker_equipment/stalker_pda("PDA",					"ÊÏÊ",													/obj/item/device/stalker_pda,								4000,	ROOKIE),
 		new /datum/data/stalker_equipment("Repair-kit for suits and helmets",	"Ðåì. êîìïëåêò äëя áðîíåêîñòþìîâ è øëåìîâ",		/obj/item/device/repair_kit/clothing,						10000,	ROOKIE),
 		new /datum/data/stalker_equipment("Repair-kit for guns",				"Ðåì. êîìïëåêò äëя îãíåñòðåëüíîãî îðóæèя",	/obj/item/device/repair_kit/gun,							4000,	ROOKIE),
 		new /datum/data/stalker_equipment("Guitar",								"Ãèòàðà",												/obj/item/device/instrument/guitar,							3000,	ROOKIE),
@@ -258,15 +259,15 @@ var/list/global_sidormat_list = list(
 		new /datum/data/stalker_equipment("Ñëþäà",				"Ñëþäà",							/obj/item/weapon/artifact/mica,						30000,	ROOKIE,	sale_price = 15000),
 		new /datum/data/stalker_equipment("Ñâåòëяê",		"Ñâåòëяê",					/obj/item/weapon/artifact/firefly,					60000,	ROOKIE,	sale_price = 30000),
 		/////////////////////////////////	Ìóñîð	//////////////////////////////////////////////
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva,							400,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/MREkonserva1,				200,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/MREkonserva2,				200,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/MREkonserva3,				200,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/bobi,						400,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/fish,						500,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/govyadina,					400,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/shproti,					600,	ROOKIE),
-		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâåà",						/obj/item/trash/konserva/soup,						500,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva,							400,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/MREkonserva1,				200,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/MREkonserva2,				200,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/MREkonserva3,				200,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/bobi,						400,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/fish,						500,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/govyadina,					400,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/shproti,					600,	ROOKIE),
+		new /datum/data/stalker_equipment("Konserva",			"Êîíñåðâà",							/obj/item/trash/konserva/soup,						500,	ROOKIE),
 		///////////////////////////////////////////////////////////////////////////////////////////
 		new /datum/data/stalker_equipment("50 RU",				"50 RU",							/obj/item/stack/spacecash/c50,						50,		ROOKIE,	sale_price = 50),
 		new /datum/data/stalker_equipment("100 RU",				"100 RU",							/obj/item/stack/spacecash/c100,						100,	ROOKIE,	sale_price = 100),
@@ -289,7 +290,7 @@ var/list/global_sidormat_list = list(
 	var/itemloc2 = null
 	var/balance = 0
 	var/rating = 0
-	var/switches = 0
+	var/switches = BUY_STUFF
 	var/real_assorment = list()
 	var/list/special_factions = list("Loners", "Bandits")
 	var/path_ending = null
@@ -332,6 +333,34 @@ var/list/global_sidormat_list = list(
 			high_tier_sidormatitems += src
 	real_sidormat_items += src
 
+/datum/data/stalker_equipment/proc/GetCost()
+	return src.sale_price
+
+/datum/data/stalker_equipment/stalker_pda/GetCost(var/obj/item/device/stalker_pda/KPK)
+	var/cost_ = src.sale_price
+	if(KPK.owner && (KPK.owner.stat == DEAD))
+		var/rank_ = Clamp(KPK.profile.fields["rating"], ROOKIE, ZONE_LEGEND)
+		cost_ += GetCostBasedOnReputation(KPK.profile.fields["reputation"])
+		cost_ += rank_*2
+	return cost_
+
+/proc/GetCostBasedOnReputation(var/rep_)
+	switch(rep_)
+		if(AMAZING to INFINITY)
+			return ((NEUTRAL - rep_) * 20)
+		if(VERYGOOD to AMAZING)
+			return ((NEUTRAL - rep_) * 10)
+		if(GOOD to VERYGOOD)
+			return ((NEUTRAL - rep_) * 5)
+		if(BAD to GOOD)
+			return 0
+		if(VERYBAD to BAD)
+			return ((NEUTRAL - rep_) * 5)
+		if(DISGUSTING to VERYBAD)
+			return ((NEUTRAL - rep_) * 10)
+		if(-INFINITY to DISGUSTING)
+			return ((NEUTRAL - rep_) * 20)
+
 /obj/machinery/stalker/sidormat/New()
 	itemloc = locate(x - 1, y, z)
 	itemloc2 = locate(x + 1, y, z)
@@ -386,7 +415,7 @@ var/list/global_sidormat_list = list(
 		dat +="<div class='statusDisplay'>"
 		dat += "Balance: [num2text(balance, 8)] RU<br>"
 		dat += "<br><br>INSTRUCTION: Put habar for sale on the <b>left</b> table.<br>" // Çàáèðàòü äåíüãè è êóïëåííûå âåùè - íà <b>ïðàâîì</b>.
-		if(!(switches & SHOW_FACTION_EQUIPMENT))
+		if(!(switches & BUY_STUFF))
 			dat +="<A href='?src=\ref[src];choice=take'><b>Sell habar</b></A><br>"
 		if(door_device && sk.fields["degree"])
 			dat +="<A href='?src=\ref[src];basement_toggle=1'><b>Toggle basement door</b></A><br>"
@@ -398,7 +427,7 @@ var/list/global_sidormat_list = list(
 				continue
 			dat += "<tr><td><center><big><b>[L]</b></big></center></td><td></td><td></td></tr>"
 			for(var/datum/data/stalker_equipment/prize in global_sidormat_list[L])
-				if((KPK.eng_faction_s == prize.faction && (KPK.eng_faction_s in special_factions || (switches & SHOW_FACTION_EQUIPMENT))) || prize.faction == "Everyone")
+				if((sk.fields["faction_s"] == prize.faction && ((sk.fields["faction_s"] in special_factions) || (switches & SHOW_FACTION_EQUIPMENT))) || prize.faction == "Everyone")
 					//if(rating >= prize.rating)
 					if(get_assortment_level(H) >= prize.assortment_level)
 						dat += "<tr><td>[prize.name]</td><td>[prize.cost]</td><td><A href='?src=\ref[src];purchase=\ref[prize]'>Buy</A></td></tr>"
@@ -413,7 +442,7 @@ var/list/global_sidormat_list = list(
 		dat +="<div class='statusDisplay'>"
 		dat += "Íà ñ÷åòó: [num2text(balance, 8)] RU<br>"
 		dat += "<br><br>ÈÍÑÒÐÓÊÖÈß: Õàáàð ñêëàäûâàòü - íà <b>ëåâîì</b> ñòîëå.<br>" //Çàáèðàòü äåíüãè è êóïëåííûå âåùè - íà <b>ïðàâîì</b>.
-		if(!(switches & SHOW_FACTION_EQUIPMENT))
+		if(!(switches & BUY_STUFF))
 			dat +="<A href='?src=\ref[src];choice=take'><b>Ñáûòü õàáàð</b></A><br>"
 		if(door_device && sk.fields["degree"])
 			dat +="<A href='?src=\ref[src];basement_toggle=1'><b>Îòêðûòü/Çàêðûòü õðàíèëèùå</b></A><br>"
@@ -425,7 +454,7 @@ var/list/global_sidormat_list = list(
 				continue
 			dat += "<tr><td><center><b>[L]</b></center></td><td></td><td></td></tr>"
 			for(var/datum/data/stalker_equipment/prize in global_sidormat_list[L])
-				if((KPK.eng_faction_s == prize.faction && (KPK.eng_faction_s in special_factions || (switches & SHOW_FACTION_EQUIPMENT))) || prize.faction == "Everyone")
+				if((sk.fields["faction_s"] == prize.faction && ((sk.fields["faction_s"] in special_factions) || (switches & SHOW_FACTION_EQUIPMENT))) || prize.faction == "Everyone")
 					//if(rating >= prize.rating)
 					if(get_assortment_level(H) >= prize.assortment_level)
 						dat += "<tr><td>[prize.name_ru]</td><td>[prize.cost]</td><td><A href='?src=\ref[src];purchase=\ref[prize]'>Êóïèòü</A></td></tr>"
@@ -518,7 +547,7 @@ var/list/global_sidormat_list = list(
 		say("No access.")
 		return
 
-	var/list/ontable = GetItemsOnTable()
+	var/list/atom/movable/ontable = GetItemsOnTable()
 	var/total_cost = GetOnTableCost(ontable)
 
 	if(total_cost < 100)
@@ -528,10 +557,10 @@ var/list/global_sidormat_list = list(
 		if(I.loc != itemloc)
 			continue
 
-		sk.fields["money"] += GetCost(I.type)
+		sk.fields["money"] += GetCost(I)
 		balance = sk.fields["money"]
 
-		say("[I] was sold for [GetCost(I.type)].")
+		say("[I] was sold for [GetCost(I)].")
 
 		PlaceInPool(I)
 		CHECK_TICK
@@ -545,7 +574,7 @@ var/list/global_sidormat_list = list(
 /obj/machinery/stalker/sidormat/proc/GetItemsOnTable()
 	var/list/ontable = list()
 	for(var/atom/movable/AM in itemloc)
-		if(!GetCost(AM.type))
+		if(GetCost(AM) <= 0)
 			continue
 
 		if(istype(AM, /obj/item/clothing))
@@ -576,16 +605,16 @@ var/list/global_sidormat_list = list(
 	//var/list/ontable = GetItemsOnTable()
 	var/total_cost = 0
 
-	for(var/atom/item_on_table in ontable)
-		var/cost = GetCost(item_on_table.type)
+	for(var/atom/movable/item_on_table in ontable)
+		var/cost = GetCost(item_on_table)
 		if(cost)
 			total_cost += cost
 	return total_cost
 
-/obj/machinery/stalker/sidormat/proc/GetCost(itemtype)
+/obj/machinery/stalker/sidormat/proc/GetCost(var/obj/item/I)
 	for(var/datum/data/stalker_equipment/se in real_sidormat_items)
-		if(itemtype == se.equipment_path)
-			return se.sale_price
+		if(I.type == se.equipment_path)
+			return se.GetCost(I)
 	return 0
 
 /obj/machinery/stalker/sidormat/ex_act(severity, target)

code/game/stalker/mobs/hostiles/mutants/mutants.dm

@@ -15,17 +15,16 @@
 		spawn(300)
 			qdel(src)
 */
-
+/*
 /mob/living/simple_animal/hostile/mutant/Move(atom/NewLoc, direct)
-	var/area/B = get_area(NewLoc)
-	if(B.safezone)
+	if(get_area(NewLoc).safezone)
 		if(src.client && (src.client.prefs.chat_toggles & CHAT_LANGUAGE))
 			src << "<span class='warning'>You can't be here!</span>"
 		else
 			src << "<span class='warning'>Âû íå ìîæåòå íàõîäèòüc&#255; â ýòîé çîíå!</span>"
 		return 0
-	. = ..()
-
+	return ..()
+*/
 /mob/living/simple_animal/hostile/mutant/AttackingTarget()
 	..()
 	if(istype(target, /mob/living))
@@ -503,6 +502,14 @@
 	if(!.)
 		return 0
 	for(var/mob/living/carbon/human/H in view(15, src))
+		var/monol_ = 0
+		for(var/faction_ in faction)
+			if(faction_ in H.faction)
+				monol_ = 1
+
+		if(monol_)
+			continue
+
 		var/damage_ = 0
 		switch(get_dist(src, H))
 			if(0 to 2)
@@ -516,6 +523,8 @@
 			if(8 to INFINITY)
 				damage_ = 25 / get_dist(src, H)
 		H.apply_damage(damage_, PSY, null, blocked = getarmor("head", "psy", 0))
+		if(H.psyloss >= 200)
+			H.zombiefied = MENTAL_ZOMBIE
 
 /mob/living/simple_animal/hostile/mutant/controller/OpenFire(atom/A)
 	if(!istype(A, /mob/living/carbon/human))
@@ -555,7 +564,7 @@
 				visible_message("<span class='danger'><b>[src]</b> stares right into [A] eyes!</span>")
 				H.apply_damage(200, PSY, null, blocked = getarmor("head", "psy", 0))
 				if(H.psyloss >= 200)
-					H.zombiefied = 1
+					H.zombiefied = MENTAL_ZOMBIE
 
 			ranged_cooldown = max(0, ranged_cooldown_cap - attack_stage)
 			attack_stage = 0

code/game/stalker/mobs/mobspawners.dm

@@ -2,6 +2,7 @@
 	name = "mob spawner"
 	cooldown = 1000
 	var/sticky_mob = 0
+	var/monolith_controled = 0
 
 /obj/effect/spawner/lootdrop/stalker/mobspawner/SpawnLoot(enable_cooldown = 1)
 	sleep(rand(10, 100))
@@ -23,6 +24,12 @@
 
 		var/mob/living/M = new lootspawn(get_turf(src))
 
+		if(monolith_controled)
+			M.faction = list("monolith_forces")
+			if(istype(M, /mob/living/simple_animal))
+				var/mob/living/simple_animal/SA  = M
+				SA.loot = list()
+
 		if(sticky_mob && istype(M, /mob/living/simple_animal))
 			var/mob/living/simple_animal/SM = M
 			SM.return_to_spawnpoint = 1
@@ -84,11 +91,21 @@
 	cooldown = 15000
 	loot = list(/mob/living/simple_animal/hostile/mutant/bloodsucker = 100)
 	sticky_mob = 1
+	monolith_controled = 1
+
+/obj/effect/spawner/lootdrop/stalker/mobspawner/bloodsucker_spawner/monolith
+	name = "bloodsucker mutant (monolith)"
+	lootcount = 1
+	radius = 1
+	cooldown = 15000
+	loot = list(/mob/living/simple_animal/hostile/mutant/bloodsucker = 100)
+	sticky_mob = 1
 
-/obj/effect/spawner/lootdrop/stalker/mobspawner/controller_spawner
-	name = "controller mutant"
+/obj/effect/spawner/lootdrop/stalker/mobspawner/controller_spawner/monolith
+	name = "controller mutant (monolith)"
 	lootcount = 1
 	radius = 1
 	cooldown = 15000
 	loot = list(/mob/living/simple_animal/hostile/mutant/controller = 100)
-	sticky_mob = 1
+	sticky_mob = 1
+	monolith_controled = 1

code/game/stalker/modules/blowout.dm

@@ -221,6 +221,14 @@ var/global/isblowout = 0
 
 	add_lenta_message(null, "0", "Sidorovich", "Loners", "Blowout is over! Leave the shelter.")
 
+	for(var/datum/data/record/sk in data_core.stalkers)
+		if(sk.fields["reputation"] <= VERYBAD)
+			var/name_ = sk.fields["name"]
+			var/rep_ = sk.fields["reputation"]
+			add_lenta_message(null, "0", "Sidorovich", "Loners", "[name_]'s - for at least [GetCostBasedOnReputation(rep_)] RU.")
+	add_lenta_message(null, "0", "Sidorovich", "Loners", "Find, kill and sell PDAs of these stalker with bad reputation!")
+
+
 /datum/subsystem/blowout/proc/ProcessBlowout()
 	if(isblowout)
 		for(var/mob/living/carbon/human/H)