From 481cc07dcf69a963bfdcf6bc7901c3b4408dfaa6 Mon Sep 17 00:00:00 2001 From: Mervill Date: Sat, 3 Dec 2016 00:25:44 -0800 Subject: [PATCH] m_intent now uses defines --- code/__DEFINES/misc.dm | 4 ++++ code/_onclick/hud/human.dm | 2 +- code/_onclick/hud/monkey.dm | 2 +- code/_onclick/hud/screen_objects.dm | 5 ++--- .../clock_cult/clock_scriptures/scripture_drivers.dm | 2 +- code/game/machinery/flasher.dm | 4 ++-- code/game/objects/effects/alien_acid.dm | 4 ++-- code/game/objects/items/toys.dm | 2 +- code/game/objects/structures/holosign.dm | 4 ++-- code/game/turfs/open.dm | 3 +-- code/modules/assembly/mousetrap.dm | 2 +- code/modules/mob/living/carbon/carbon_movement.dm | 4 ++-- code/modules/mob/living/living.dm | 4 ++-- code/modules/mob/mob_defines.dm | 4 ++-- 14 files changed, 24 insertions(+), 22 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 56e5a52475a..fab0cc3577b 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -577,6 +577,10 @@ var/global/list/ghost_others_options = list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE // Examples of huge items: Shotgun, Two Handed Melee Weapons // Examples of gigantic items: Mech Parts, Safe +// m_intent +#define MOVE_INTENT_WALK "walk" +#define MOVE_INTENT_RUN "run" + //Endgame Results #define NUKE_NEAR_MISS 1 diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 9223a36b13d..4b34e516c03 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -110,7 +110,7 @@ using = new /obj/screen/mov_intent() using.icon = ui_style - using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") + using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi static_inventory += using diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 2c14025f201..2d8e3a08e1e 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -12,7 +12,7 @@ using = new /obj/screen/mov_intent() using.icon = ui_style - using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") + using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi static_inventory += using diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 6c0d6eb5e01..b463ddbcb21 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -284,10 +284,10 @@ return switch(user.m_intent) if("run") - user.m_intent = "walk" + user.m_intent = MOVE_INTENT_WALK icon_state = "walking" if("walk") - user.m_intent = "run" + user.m_intent = MOVE_INTENT_RUN icon_state = "running" user.update_icons() @@ -649,4 +649,3 @@ if(word_messages.len && talk_cooldown < world.time) talk_cooldown = world.time + 10 L.say(pick(word_messages)) - diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm index 53076f4671b..e239ac4752e 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm @@ -27,7 +27,7 @@ if(!is_servant_of_ratvar(C) && !C.null_rod_check() && number_legs) //you have legs right C.apply_damage(noncultist_damage * 0.5, BURN, "l_leg") C.apply_damage(noncultist_damage * 0.5, BURN, "r_leg") - if(C.m_intent != "walk") + if(C.m_intent != MOVE_INTENT_WALK) if(!iscultist(C)) C << "Your leg[number_legs > 1 ? "s shiver":" shivers"] with pain!" else //Cultists take extra burn damage diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 99de5c77edc..4e9b7c2d363 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -168,7 +168,7 @@ if(istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - if (M.m_intent != "walk" && anchored) + if (M.m_intent != MOVE_INTENT_WALK && anchored) flash() /obj/machinery/flasher/portable/attackby(obj/item/weapon/W, mob/user, params) @@ -207,4 +207,4 @@ /obj/item/wallframe/flasher/after_attach(var/obj/O) ..() var/obj/machinery/flasher/F = O - F.id = id \ No newline at end of file + F.id = id diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm index 650c684e5ce..b5bc101b9ec 100644 --- a/code/game/objects/effects/alien_acid.dm +++ b/code/game/objects/effects/alien_acid.dm @@ -66,7 +66,7 @@ var/mob/living/L = AM if(L.movement_type & FLYING) return - if(L.m_intent != "walk" && prob(40)) + if(L.m_intent != MOVE_INTENT_WALK && prob(40)) var/acid_used = min(acid_level*0.05, 20) if(L.acid_act(10, acid_used, "feet")) acid_level = max(0, acid_level - acid_used*10) @@ -98,4 +98,4 @@ if(8) visible_message("[target] is struggling to withstand the acid!") if(4) - visible_message("[target] begins to crumble under the acid!") \ No newline at end of file + visible_message("[target] begins to crumble under the acid!") diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ff8f3c458ba..884669d0965 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -347,7 +347,7 @@ /obj/item/toy/snappop/Crossed(H as mob|obj) if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H - if(issilicon(H) || M.m_intent == "run") + if(issilicon(H) || M.m_intent == MOVE_INTENT_RUN) M << "You step on the snap pop!" pop_burst(2, 0) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index ce60db2632e..a210033ca90 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -49,7 +49,7 @@ obj_integrity = 20 max_integrity = 20 var/allow_walk = 1 //can we pass through it on walk intent - + /obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(!density) return 1 @@ -59,7 +59,7 @@ return 1 if(iscarbon(mover)) var/mob/living/carbon/C = mover - if(allow_walk && C.m_intent == "walk") + if(allow_walk && C.m_intent == MOVE_INTENT_WALK) return 1 /obj/structure/holosign/barrier/engineering diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 25bea0d7e06..4c2af23b3bf 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -132,7 +132,7 @@ else if(C.lying || !(C.status_flags & CANWEAKEN)) // can't slip unbuckled mob if they're lying or can't fall. return 0 - if(C.m_intent=="walk" && (lube&NO_SLIP_WHEN_WALKING)) + if(C.m_intent == MOVE_INTENT_WALK && (lube&NO_SLIP_WHEN_WALKING)) return 0 if(!(lube&SLIDE_ICE)) C << "You slipped[ O ? " on the [O.name]" : ""]!" @@ -236,4 +236,3 @@ wet_time = 0 if(wet) addtimer(src, "HandleWet", 15) - diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 57a1249ce6c..70612872db3 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -109,7 +109,7 @@ if(!(MM.movement_type & FLYING)) if(ishuman(AM)) var/mob/living/carbon/H = AM - if(H.m_intent == "run") + if(H.m_intent == MOVE_INTENT_RUN) triggered(H) H.visible_message("[H] accidentally steps on [src].", \ "You accidentally step on [src]") diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 342b9ed7a0e..e6fd8c5be65 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -59,7 +59,7 @@ var/const/SLIDE_ICE = 8 nutrition = NUTRITION_LEVEL_FED - 1 //just less than feeling vigorous else if(nutrition && stat != DEAD) nutrition -= HUNGER_FACTOR/10 - if(m_intent == "run") + if(m_intent == MOVE_INTENT_RUN) nutrition -= HUNGER_FACTOR/10 - if((disabilities & FAT) && m_intent == "run" && bodytemperature <= 360) + if((disabilities & FAT) && m_intent == MOVE_INTENT_RUN && bodytemperature <= 360) bodytemperature += 2 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 58feb7ce22d..ffbf0c43505 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -447,11 +447,11 @@ . += config.run_speed else switch(m_intent) - if("run") + if(MOVE_INTENT_RUN) if(drowsyness > 0) . += 6 . += config.run_speed - if("walk") + if(MOVE_INTENT_WALK) . += config.walk_speed /mob/living/proc/makeTrail(turf/T) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9bf23945106..a28820fe7e1 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -73,7 +73,7 @@ var/weakened = 0 var/losebreath = 0//Carbon var/a_intent = "help"//Living - var/m_intent = "run"//Living + var/m_intent = MOVE_INTENT_RUN//Living var/lastKnownIP = null var/atom/movable/buckled = null//Living @@ -144,4 +144,4 @@ var/resize = 1 //Badminnery resize - var/list/observers = null //The list of people observing this mob. \ No newline at end of file + var/list/observers = null //The list of people observing this mob.