fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Headers update

Browse Source 
- Synced a small number of defines from RPU headers
- Removed duplicate defines from define_lite
This commit is contained in:
phobos2077
2023-07-30 22:24:44 +02:00
parent f0ec82923d
commit 5d7015bbb5
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/command_lite.h
+10 -5
View File
@@ -186,14 +186,17 @@
// visibility
#define self_visible obj_is_visible_flag(self_obj)
#define set_obj_invisible(cr) set_obj_visibility(cr,true)
#define set_obj_visible(cr) set_obj_visibility(cr,false)
#define set_self_invisible set_obj_visibility(self_obj,true)
#define set_self_visible set_obj_visibility(self_obj,false)
#define set_obj_invisible(cr) set_obj_visibility(cr, true)
#define set_obj_visible(cr) set_obj_visibility(cr, false)
#define set_self_invisible set_obj_visibility(self_obj, true)
#define set_self_visible set_obj_visibility(self_obj, false)
#define is_visible(cr) has_trait(TRAIT_OBJECT,cr,OBJECT_VISIBILITY) // aka obj_is_visible_flag(x)
// hp
#define self_cur_hits (get_critter_stat(self_obj,STAT_current_hp))
#define self_max_hits (get_critter_stat(self_obj,STAT_max_hp))
#define get_cur_hits(cr) get_critter_stat(cr,STAT_current_hp)
#define get_max_hits(cr) get_critter_stat(cr,STAT_max_hp)
#define self_mental_block (has_trait(TRAIT_PERK,self_obj,PERK_mental_block))
#define self_presence (has_trait(TRAIT_PERK,self_obj,PERK_presence))
@@ -207,12 +210,14 @@
#define stat_success(x,y,z) (is_success(do_check(x,y,z)))
#define self_can_see_dude obj_can_see_obj(self_obj,dude_obj)
#define self_can_hear_dude obj_can_hear_obj(self_obj,dude_obj)
#define self_distance_from_dude tile_distance(self_tile, dude_tile)
#define self_is_high drug_influence(self_obj)
#define self_item(x) obj_carrying_pid_obj(self_obj, x)
#define self_item_count(x) obj_is_carrying_obj_pid(self_obj, x)
#define get_item(cr,pid) obj_carrying_pid_obj(cr,pid)
#define get_item_count(cr,pid) obj_is_carrying_obj_pid(cr,pid)
// some timer event macros
#define check_set_obj_visiblility(the_obj, x) if (obj_is_visible_flag(the_obj) == x) then set_obj_visibility(the_obj, x)
artifacts/scripting/headers/define_lite.h
+1 -9
View File
@@ -395,6 +395,7 @@
#define SKILL_TRAPS (11)
#define SKILL_SCIENCE (12)
#define SKILL_REPAIR (13)
#define SKILL_SPEECH (14)
#define SKILL_CONVERSANT (14)
#define SKILL_BARTER (15)
#define SKILL_GAMBLING (16)
@@ -815,15 +816,6 @@
//Misc commands
#define obj_get_rot(obj) (has_trait(TRAIT_OBJECT, obj, OBJECT_CUR_ROT))
#define obj_in_party(x) (party_member_obj(obj_pid(x)) != 0)
#define dude_tile (tile_num(dude_obj))
#define dude_elevation (elevation(dude_obj))
#define dude_skill(x) (has_skill(dude_obj, x))
// some commands
#define mstr(x) message_str(NAME,x)
#define display_mstr(x) display_msg(mstr(x))
#define g_mstr(x) message_str(SCRIPT_GENERIC,x)
#endif // DEFINE_H
artifacts/scripting/headers/lib.obj.h
+2 -1
View File
@@ -6,6 +6,7 @@
#define obj_name_safe(obj) (obj_name(obj) if obj else "(null)")
#define get_active_weapon(critter) critter_inven_obj(critter, (2 - active_hand) if critter == dude_obj else INVEN_TYPE_RIGHT_HAND)
#define obj_can_hear_and_shoot_obj(critter, target) (obj_can_hear_obj(critter, target) and obj_blocking_line(critter, tile_num(target), BLOCKING_TYPE_SHOOT) == target)
#define obj_has_lof_to_obj(critter, target) (obj_blocking_line(critter, tile_num(target), BLOCKING_TYPE_SHOOT) == target)
#define obj_can_hear_and_shoot_obj(critter, target) (obj_can_hear_obj(critter, target) and obj_has_lof_to_obj(critter, target))
#endif