Skip to content

Commit

Permalink
Kandahar map update
Browse files Browse the repository at this point in the history
Updates vehicles to premades, adds technicals to the Mujahideeen, adds WIP dynamic area capture flags (based off those in Falcon, needs reworking)
  • Loading branch information
savethetreez committed May 26, 2024
1 parent 808b523 commit 9cfa74c
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 63 deletions.
57 changes: 56 additions & 1 deletion code/game/objects/map_metadata/kandahar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
grace_wall_timer = 4800
var/list/supply_points = list(
"Soviet Army" = 0,
"Mujahideen" = 0,)
"Mujahideen" = 0)

/obj/map_metadata/kandahar/New()
..()
Expand All @@ -51,6 +51,7 @@
custom_civs += newnameb
custom_civs += newnamec
custom_civs += newnamed
handle_flags() //Called once in the beginning to set up DRA flags
spawn(100)
load_new_recipes("config/crafting/material_recipes_sovafghan.txt")
override_global_recipes = "sovafghan"
Expand Down Expand Up @@ -327,6 +328,7 @@
if ("Mujahideen Group Leader")
sov_points += 2
world << "<font color='orange' size=2>A <b><font color='black'>Mujahideen Group Leader</font></b> is in captivity!</font>"
handle_flags()
spawn(600) // 1 minute
points_check()
spawn(300)
Expand Down Expand Up @@ -560,3 +562,56 @@
return
..()

/obj/map_metadata/kandahar/proc/handle_flags()
switch (a1_control)
if ("Soviets")
for (var/obj/structure/flag/objective/one/F in world)
F.icon_state = "soviet"
if ("Mujahideen")
for (var/obj/structure/flag/objective/one/F in world)
F.icon_state = "pirates"
if ("DRA")
for (var/obj/structure/flag/objective/one/F in world)
F.icon_state = "soviet"
else
for (var/obj/structure/flag/objective/one/F in world)
F.icon_state = "white"
switch (a2_control)
if ("Soviets")
for (var/obj/structure/flag/objective/two/F in world)
F.icon_state = "soviet"
if ("Mujahideen")
for (var/obj/structure/flag/objective/two/F in world)
F.icon_state = "pirates"
if ("DRA")
for (var/obj/structure/flag/objective/two/F in world)
F.icon_state = "soviet"
else
for (var/obj/structure/flag/objective/two/F in world)
F.icon_state = "white"
switch (a3_control)
if ("Soviets")
for (var/obj/structure/flag/objective/three/F in world)
F.icon_state = "soviet"
if ("Mujahideen")
for (var/obj/structure/flag/objective/three/F in world)
F.icon_state = "pirates"
if ("DRA")
for (var/obj/structure/flag/objective/three/F in world)
F.icon_state = "soviet"
else
for (var/obj/structure/flag/objective/three/F in world)
F.icon_state = "white"
switch (a4_control)
if ("Soviets")
for (var/obj/structure/flag/objective/four/F in world)
F.icon_state = "soviet"
if ("Mujahideen")
for (var/obj/structure/flag/objective/four/F in world)
F.icon_state = "pirates"
if ("DRA")
for (var/obj/structure/flag/objective/four/F in world)
F.icon_state = "soviet"
else
for (var/obj/structure/flag/objective/four/F in world)
F.icon_state = "white"
2 changes: 1 addition & 1 deletion code/modules/1713/jobs/sovafghan.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
var/obj/item/clothing/under/uniform = H.w_uniform
var/obj/item/clothing/accessory/holster/hip/holsterh = new /obj/item/clothing/accessory/holster/hip(null)
uniform.attackby(holsterh, H)
var/obj/item/clothing/accessory/armor/coldwar/plates/platecarriergreen/armour = new /obj/item/clothing/accessory/armor/coldwar/plates/platecarriergreen(null)
var/obj/item/clothing/accessory/armor/coldwar/plates/b5/armour = new /obj/item/clothing/accessory/armor/coldwar/plates/b5(null)
var/obj/item/weapon/armorplates/plates1 = new /obj/item/weapon/armorplates(null)
var/obj/item/weapon/armorplates/plates2 = new /obj/item/weapon/armorplates(null)
armour.attackby(plates1, H)
Expand Down
Loading

0 comments on commit 9cfa74c

Please sign in to comment.