Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arbiter pillar spell #683

Merged
merged 8 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions burgerstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@
#include "code\_core\datum\damagetype\ranged\magic\inferno.dm"
#include "code\_core\datum\damagetype\ranged\magic\lightning.dm"
#include "code\_core\datum\damagetype\ranged\magic\magic_missile.dm"
#include "code\_core\datum\damagetype\ranged\magic\pillar.dm"
#include "code\_core\datum\damagetype\ranged\magic\shock.dm"
#include "code\_core\datum\damagetype\ranged\magic\spellblade.dm"
#include "code\_core\datum\damagetype\ranged\magic\tesla.dm"
Expand Down Expand Up @@ -1975,6 +1976,7 @@
#include "code\_core\obj\item\weapon\ranged\spellgem\lightning.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\magic_missile.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\oozey.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\pillar.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\shock.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\tesla.dm"
#include "code\_core\obj\item\weapon\ranged\spellgem\unholy_skull.dm"
Expand Down
26 changes: 26 additions & 0 deletions code/_core/datum/damagetype/ranged/magic/pillar.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/damagetype/ranged/magic/pillar
attack_damage_base = list(
BLUNT = 100,
HEAT = 100,
ARCANE = 100,
DARK = 100
)
Litberries marked this conversation as resolved.
Show resolved Hide resolved

attribute_stats = list(
ATTRIBUTE_INTELLIGENCE = 60,
ATTRIBUTE_WISDOM = 60,
)

attribute_damage = list(
ATTRIBUTE_INTELLIGENCE = list(BLUNT,HEAT,ARCANE,DARK)
)

skill_stats = list(
SKILL_MAGIC = 60,
)

skill_damage = list(
SKILL_MAGIC = list(BLUNT,HEAT,ARCANE,DARK)
)

force_attacker_armor_calculations_with = DARK
3 changes: 2 additions & 1 deletion code/_core/datum/loot/faction_boss.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
loot_table = list(
/obj/item/clothing/back/wings/angel = 3,
/obj/item/weapon/melee/staff_of_healing = 1
/obj/item/weapon/ranged/spellgem/pillar = 0.1
Litberries marked this conversation as resolved.
Show resolved Hide resolved
)

/loot/lavaland/slime_king
Expand All @@ -74,4 +75,4 @@
/loot/lavaland/ai_core
loot_table = list(
/obj/item/weapon/ranged/energy/gatling = 3
)
)
2 changes: 1 addition & 1 deletion code/_core/obj/item/weapon/ranged/spellgem/fractal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
color_2 = "#303030"
color_3 = "#FFFFFF"

value = 800
value = 800
20 changes: 20 additions & 0 deletions code/_core/obj/item/weapon/ranged/spellgem/pillar.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/obj/item/weapon/ranged/spellgem/pillar
name = "pillar spell gem"
desc = "The source of all... taxes?"
icon_state = "damage"

shoot_delay = 8

bullet_count = 1
projectile_speed = TILE_SIZE + 1

projectile = /obj/projectile/magic/pillar
ranged_damage_type = /damagetype/ranged/magic/pillar

shoot_sounds = list('sound/weapons/magic/magic.ogg')

color = "#ebbd27"
color_2 = "#000000"


value = 8000
11 changes: 11 additions & 0 deletions code/_core/obj/projectile/magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,17 @@
ricochet_angle = 90
homing_angle_limit = 80

/obj/projectile/magic/pillar
name = "pillar"
icon_state = "arbiterpillar"
penetrations_left = 6
collision_bullet_flags = FLAG_COLLISION_BULLET_XRAY
homing = TRUE
homing_speed = TILE_SIZE*1.5
homing_mod = 0.5
ricochet_angle = 90
homing_angle_limit = 180

/*
/obj/projectile/magic/fractal/on_projectile_hit(atom/hit_atom)

Expand Down
Binary file added icons/obj/projectiles/pillar.dmi
Binary file not shown.
Binary file added sound/weapons/magic/magic.ogg
Binary file not shown.
Loading