Skip to content

Commit a16e8e0

Browse files
Updating Pyrelight code with intent changes.
1 parent 89f8a95 commit a16e8e0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mods/content/anima/runestones.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
/obj/item/runestone/attackby(obj/item/W, mob/user)
4747

48-
if(W.get_attack_force() && user.a_intent == I_HURT)
48+
if(W.get_attack_force() && user.check_intent(I_FLAG_HARM))
4949
user.visible_message("\The [user] brings \the [W] down on \the [src]!")
5050
crack_runestone(user)
5151
return TRUE

mods/pyrelight/plants/_plants.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
harvest_timer -= harvest_time
5555

5656
/obj/structure/flora/growing/attackby(obj/item/O, mob/user)
57-
if(user.a_intent == I_HELP)
57+
if(user.check_intent(I_FLAG_HELP))
5858
if(!harvest_tool)
5959
to_chat(user, "You must use your hands to harvest from \the [src].")
6060
return TRUE
@@ -67,7 +67,7 @@
6767
return ..()
6868

6969
/obj/structure/flora/growing/attack_hand(mob/user)
70-
if(user.a_intent == I_HELP)
70+
if(user.check_intent(I_FLAG_HELP))
7171
if(harvest_tool)
7272
var/decl/tool_archetype/tool = GET_DECL(harvest_tool)
7373
to_chat(user, SPAN_WARNING("You must use \a [tool] to harvest from \the [src]."))

mods/pyrelight/plants/plants_fruit.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
to_chat(user, SPAN_NOTICE("With [comp_ind], you could harvest [english_list(comp_string_comps)]."))
6969

7070
/obj/item/food/fruit/attackby(obj/item/W, mob/living/user)
71-
if(user?.a_intent != I_HURT)
71+
if(!user?.check_intent(I_FLAG_HARM))
7272
var/list/fruit_comp = get_composition()
7373
for(var/datum/fruit_segment/comp as anything in fruit_comp)
7474
var/remaining = comp.dissect_amount - LAZYACCESS(removed_segments, comp)

0 commit comments

Comments
 (0)