summaryrefslogtreecommitdiff
path: root/src/map/battle.c
AgeCommit message (Collapse)AuthorFilesLines
2006-06-17- Fixed the party HP packets to send max HP 10000 and scale HP accordingly ↵skotlex1-1/+1
when the player's HP doesn't fits in the packet's field. Fixes HP bars not correctly displaying the % of life when max HP is above 32k. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7218 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-16- Modified the bNoMagicDamage/bNoWeaponDamage bonuses to be a 0-100 setting. ↵skotlex1-14/+14
Meaning you can do bonus bNoMagicDamage,50; To make all magic damage be reduced by half. This bonus stack, so two cards with bNoMagicDamage,50 will give magic immunity. - Removed setting gtb_pvp_only and replaced it with gtb_sc_immunity which specifies the threshold before the bNoMagicDamage starts blocking support statuses as well. ie: gtb_sc_imunity: 75 will mean that "bonus bNoMagicDamage,70;" reduces magic damage by 70%, but does not blocks heal or support status, while "bonus bNoMagicDamage,80;" does. - Updated GTB's card script to be "bonus bNoMagicDamage,100;" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7212 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-14- Modified how luk reduces status changes by reducing the gap. Eg: resist = ↵skotlex1-4/+9
vit; resist += (max - resist)*luk/300; - Added battle settings pc_max_sc_luk/mob_max_sc_luk to handle which is the luk threshold at which you gain inmunity (defaults to 300). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7168 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-09- Fixed @mapinfo displaying incorrectly maps with nosave which send you back ↵skotlex1-2/+0
to your last savepoint. - Moved guild_exp_rate from a mapserver battle config setting to a char server config. It no longer modifies the total taxed exp as seen on the guild information window, but directly modifies the exp that the guild earns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7074 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-07- Added config setting mob_npc_warp, when set to yes, enables mobs to be ↵skotlex1-0/+2
warped between maps when stepping on a npc-warp. - Added monster_ai setting &64, when enabled makes a mob run to any nearby npc-warp when their current target has switched maps. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7039 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-05- Corrected cloaking not ending on attack if you are near a wall.skotlex1-3/+3
- Moved define cap_value to map.h as it's quite handy. - Updated pc_bonus to use cap_value on all status_data modifiers to prevent overflows/underflows. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6979 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-02Updated offensive use of Sanctuary to function like on the official servers.MasterOfMuppets1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6946 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-06-02Removed the walk delay from firewall and changed its knockback to 1 tile to ↵MasterOfMuppets1-3/+3
make it act more like in the official servers. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6941 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Call Slave now invokes slaves on a 5x5 area around master.skotlex1-0/+2
- AL_TELEPORT will fail when used by slave mobs. - Added NPC_ENERGYDRAIN, NPC_MENTALBREAKER to the list of undodgeable attacks. - slaves inherit speed setting will now work regardless of whether the slave or master has the MD_CANMOVE mode bit. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6865 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Fixed Absorb Spirit Spheresskotlex1-0/+2
- Added battle_config min_chat_delay (default 0) specifies in ms what is the min delay between player sent chats (whisper/global/party/guild). Messages that exceed this threshold are silently ignored for now (perhaps need to add a "DON'T SPAM" reply to the player?) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6859 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Updated attr_fix_table reading code to account for ELE_MAX (will correctly ↵skotlex1-34/+1
read bigger elemental tables if ELE_MAX is changed) - Aggressive mobs will now use battle_check_range rather than mob_can_reach to decide whether to lock-on or not to a target within sight-range. - Added warnings in mob_readdb when the mob's element is invalid. - Updated the corresponding entries in map.h to use ELE_MAX - Added error messages in pc_bonus* functions when an invalid element is passed to the relevant bonuses. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6856 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Small optimization in battle_check_targetskotlex1-5/+5
- Disabled ontouch npcs triggering on hidden/chase-walk characters. - Added the SC* code blocks relevant to SC_AVOID, SC_CHANGE, SC_BLOODLUST, SC_FLEET - Added structure status_data to homun_data - Added handling of BL_HOMUNCULUS in status_heal, status_damage. - Cleaned up the homun-submitted code, moved the relevant code to status_calc_homunculus. - Updated map-server Makefile to compile mercenary.* files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6847 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Fixed battle_calc_weapon_attack damage capping damage to a minimum of 0 ↵skotlex1-6/+6
(negative values should be allowed when attack is absorbed by target's element) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6840 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30[Fixed] Lance1-3/+3
- Battle mechanics in battle_check_target git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6836 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30- Changed status_heal and status_damage to receive signed int values. They ↵skotlex1-13/+8
will invoke each other as needed when the passed values are negative. - Updated battle_calc_attack to set atk type to ATK_FLEE and dmotion to 0 when the damage is less than 1 (missed or absorbed) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6832 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29- Updated max_def parameter to not apply to mdef if magic_defense_type is ↵skotlex1-5/+3
set (rather than weapon_defense_type) - Updated comment description for config setting max_def - Fixed battle_check_target check on BCT_ALL to check versus BL_CHAR instead of BL_PC and BL_MOB git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6826 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29- Cleaned up some status_get functions.skotlex1-1/+15
- Optimized a bit the SC_PROVOKE code (to use val3/val4) - Fixed draining when the amount drained is negative (invoke zap rather than heal) - Implemented GS_FLING as per the current skill description. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6819 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29[Optimized] Lance1-1/+1
- Removed unused checks for unsigned data type and possible logic error for char type (gcc treats char as unsigned). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6814 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-28- Suppressed compilation warnings (unsigned and signed mismatches)Lance1-1/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6793 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-27- Addded missing include of limits.h to battle.cskotlex1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6792 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-27- Added structure status_data which holds status-related information (str, ↵skotlex1-4621/+4265
agi, etc, speed, amotion, adelay, dmotion, weapon-damage, race, size, etc) and weapon_atk structure with the weapon specific info (atk, atk2, element) to be used by all combat structures (TODO: Homun needs to be updated to use it) - Cleaned up TBL_PC, TBL_MOB, TBL_PC and mob_db structures to use status_data. - Set the NPC-Change Attribute duration on Time1, updated their max to 1 in the db. - Berserk's HP cost interval is now defined as time2. - Split damage received functions into pc_damage/pc_dead and mob_damage/mob_dead - Rewrote the @heal related functions to use the new status_* healing functions. - Added status functions to deal with damage and healing (status_damage, status_heal, status_percent_change) and a bunch of defines for easier handling of them (status_percent_heal, status_percent_damage, status_fix_damage, status_kill, etc) - Splitted mob_once_spawn into two. mob_once_spawn_sub creates the mob instance without spawning it. - Added defines for Elements (ELE_*) - Modified battle_calc_(weapon/magic/misc)_attack to use the status data structure. - Rewrote and cleaned up battle_calc_misc_attack - Merged config options pc_attack_attr_none, mob_attack_attr_none, pet_attack_attr_none into attack_attr_none (type 4) - Removed config options player_defense_type, monster_defense_type, pet_defense_type in favor of weapon_defense_type - Cleaned up pet.c to stop invoking status_calc_pc when unnecessary - Modified skill_calc_heal to take into account the MEDITATION bonus. - Cleaned up code of Adjustment, Madness Cancel and other GS/NJ skills inside skill_check_condition - Added status change SC_MODECHANGE which handles mob state changes (this SC is continous until manually ended, eg: like Weight50) - Modified Slim Pitcher so it will work when casted by non-players. Will now also work with SP-healing items. - Rewrote Freedom of Cast code to use function status_freecast_switch to switch adelay/speed when cast begins/ends. - Modified Magic Power to store amplified MATK/MATK2 in val3/val4 for easier updating when used in conjunction with ground skills. - Fixed Asura Strike being usable from within a combo regardless of combo skill. - Modifed SC_DANCING to store speed-change in val3 (it is shared with skill duration...) - Added StatusChangeFlagTable to store which statuses are changed by each SC - Added SCB_* constants to specify the different stats that each sc changes. SCB_PC is the only one that means a change hardcoded in status_calc_pc, the rest are handled by status_calc_bl - Added some helper functions to simplify with basic status calculations (status_base_atk, status_calc_misc, status_base_pc_maxhp, status_base_pc_maxsp) - Added status_calc_mob which calculates initial status and special base status alterations (HP changes, stat changes due to big/small mobs, etc) - Made all the status_calc functions static. - Added status_calc_bl_sub_pc for PC related calculations that must happen after status-change adjustments. - Added status_calc_bl which does status-change related calculations using as base the base_status of the bl object and the SCB_* flag passed. - Added status_get_status_data and status_get_base_status to retrieve the bl objects current status_data and basic status_data (current never returns null, instead it returns a dummy structure with basic data) - The main switch in status_change_start now only sets the tick and val values, therefore it is skipped when loading (flag&4) - Cleaned up status_change_start and replaced many of the ex-japanese comments for english ones. - Changed Hiding to store the speed penalty on val3. val4 stores interval SP cost. - Changed Chase Walk to store Speed adjustment on val3, sp cost in val4 - Changed Cloaking to store speed penalty on val3, val4&2 signals wall-present, val4&1 is infinite cloaking. - Changed Wind walk to store speed bonus on val3 - Rewrote Marionette Control to store the status to add/substract in val3/val4, it now works on anyone (players/mobs) - Changed Improve concentration to store Card bonuses (which are not counted for total % increase) on val3/val4 - Changed SC_ADRENALINE, SC_CONCENTRATION, SC_ANGELUS, SC_IMPOSITIO, SC_MELTDOWN, SC_TRUESIGHT, SC_SUN_COMFORT, SC_MOON_COMFORT, SC_STAR_COMFORT, SC_QUAGMIRE, SC_GATLINGFEVER to store the bonus modifiers in their val values rather than calculate them in status_calc_* - Status_change_start/end will use clif_status_load rather than clif_status_change when related bl is not on a map. - Modified status_change_timer to use the status_charge function rather than directly substracting SP - Added SC_ELEMENTALCHANGE to modify someone's base defense element. - pc_clean_skilltree will now also remove item-granted skills. - Learning skills will now only invoke status_calc_pc when the skill is passive. - Cleaned up pc_steal_coin - Cleaned up pc_check_base/job_lvup to only invoke the lv-up related packets and functions ONCE regardless of skill-levls earned. - Cleaned up pc_ regen related functions. - Made player-sprite mobs have item pickup animation and walkdelay when taking items. - Cleaned up mob_dead code. - Removed paramb, parame from struct map_session_data, replaced them by param_bonus[6],param_equip[6] - mob special ai state 3 signals summon flora. - Moved petDB pet_hungry_timer vars from TBL_PC to TBL_PET - Cleaned up some pet functions, made the menu functions receive as argument both pet and master. - Clones will copy a player's base status rather than battle status (so status-change alterations are not cloned) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6791 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-27Fix possible compile mistakes in there. >_>blackhole891-6/+30
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6790 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-26git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6773 ↵Lance1-0/+3
54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-26git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6771 ↵Lance1-0/+4
54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-26* Mob control engine tested 99% working so far.Lance1-1/+17
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6770 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-26* Change scripting engine's NPC scope vars to dot (.) style.Lance1-1/+3
* Improved and (should be fully) fixed the mob control engine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6769 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-25- Simplified ASC_BREAKER by making it a BF_WEAPON attack with an additional ↵skotlex1-11/+6
int-based damage component (which is added right before elemental modifiers). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6760 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-25* Fixed mob control commands.Lance1-1/+1
* Fixed memory leak in scripts (again). Still have a few lying. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6749 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-23- Modified battle_calc_weapon_attack to use new flags pdef/pdef (pierce ↵skotlex1-13/+19
defense), Investigate and Icepick will now use the final def/vit-def values rather than the base ones. - The move-enable condition checks for skills are now checked for only when on skill use, not at cast-end time. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6714 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-22- Fixed a possible null pointer in script command misc_effectskotlex1-7/+12
- Modified Investigate to take into consideration final def/vit-def rather than base values for damage adjustment. - Added missing include unit.h in pet.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6695 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-18- Added 5 config settings to adjust damage in pk-mode servers (misc.conf)skotlex1-8/+24
- Corrected LoV's effect range for levels 11+ to range 8. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6646 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-18- Fixed mob_max_skilllvl being capped to 11!skotlex1-2/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6643 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-16- Modified "hide woe damage" to send the number of hits rather than 1 as ↵skotlex1-1/+1
damage Because when the damage is less than the number of hits, the client will display MISS. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6624 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-16- Fire Pillar will now do 200%MATK damage per hit when level is >10.skotlex1-1/+4
- Blood Drain always hits now. - Fixed Mob Area Skills not updating their use-time (rendering their skill delay useless) - Search free cell will now skip picking the center-tile as target location. Will prevent slaves from walking on top of their master, or mobs placing stuff right under themselves with the "around" target conditions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-15- Firepillar's damage per hit is now 100% MATK (rather than 20%) when the ↵skotlex1-1/+2
skill level is above 10. - Sorted out the item_data structure, getiteminfo should work correctly now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6608 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-12- Updated cast times of Kaupe and Kaahi.skotlex1-1/+0
- Some small code cleanups. - Sma has cast-dex reducable now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6564 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-11- Added the missing semi-comma from the upgrade_svn6533.sql file. Thanks to ↵skotlex1-5/+8
Tanaous - Added back the missing code that substracts arrows when normal-attacking. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6554 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-09- Reduced drop slots from 15 to 10.skotlex1-3/+0
- Updated mob_db.sql with the current data. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6539 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-09- Fixed Fog of Wall's symmetry in respect to Misc attacks, they no longer ↵skotlex1-1/+1
get reduced by 50% regardless of who is standing on the fog. - monster_ai&2 will now trigger the rude-attacked skill when the mob can't move and the attacker is out of it's attack range. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6536 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-09- Cleaned up somewhat the implementation of BladeStop.skotlex1-6/+7
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6531 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-09- Script commands sc_start, sc_start2 and sc_start4 will now start ↵skotlex1-4/+5
regardless of sc defense of the target player (that is, they cannot be avoided) - Fixed a possible counter overflow in attacked_count, changed the var size to unsigned char since the code can handle the overflow now. - Multiple targets again reduces armor defense, as reported by Tharis. - Increased dex increase of NPC_POWERUP to +20 per level. - Fog of Wall's -50 hit reduction is now only for ranged attacks. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6528 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-06- Corrected the max level of NPC_DARKBREATH 10->5 (don't ask, I need these ↵skotlex1-1/+0
things right :P) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6497 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- Fixed Kaupe always triggering when the one who was under Kaupe was a ↵skotlex1-1/+1
player rather than the one attacking... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6492 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- /doridori now won't double the HP/SP regen of TKs, it only activates their ↵skotlex1-1/+4
"happy" state. - Added the -50 hit penalty when standing on Wall of Fog. - Cleaned up status_calc_mdef2 - Uncommented the status_calc_mdef2 call in status_calc_pc. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6491 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- Being in Enjoyable Rest state will now also trigger the HP/SP Time skills ↵skotlex1-0/+4
(even if there's no other TK around). - Renamed SC_TKDORI to SC_TKREST (makes more sense if you ask me) - Added battle config settings view_range_rate and chase_range_rate to adjust the view-range and chase-range (range2/range3) of the mob_db without having to manually change them. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6490 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- Kaupe now will only block all skills of players, for non-players, only ↵skotlex1-2/+4
normal attacks can be missed. - Moved the Kaite spell-reflect code after the damage calculation function, so the reflected damage is exactly the damage the original target would have received. Will only trigger if the damage to be reflected is above 0. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6489 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-05- OnEquip scripts will be trigger on log-on now.skotlex1-2/+2
- Infinite Endure will no longer give mdef bonus. - Removed bInfiniteEndure bonus, Eddga card now uses onequip/onunequip to start/end infinite endure. - Hammer fall's stun duration is now 1+lv seconds. - Fixed Kaahi's SP cost per heal. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6487 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-03- Kaite, Kaute will now show a skill effect when they trigger.skotlex1-1/+1
- Fusion's cast time reduced to 0. - Knowledge will now only trigger if you logon to the memorized map, not walk into it. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6462 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-03- Fixed standing up not really standing you up.skotlex1-48/+16
- Moved battle_consume_ammo to the end of skill_castend_damage_id, skill_castend_nodamage_id and skill_castend_pos2 rather than battle_calc_weapon_attack. They will trigger when the player's arrow_atk state is active and a ground skill was not invoked. It should fix all issues with splash/ground skills consuming ammo per target rather than once per skill use. - Added structure state to the ground skills, their fields are magic_power, into_abyss and ammo_consume to indicate the states that were previously stored in val3. - Corrected Desperado ammo consumption (should be 10) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6455 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-02- Kaite now works against all types of spells.skotlex1-6/+9
- Kaupe now works against all skills. - Sanctuary now won't damage non-enemies. - Blessing now will always give you bonus stats even if you are wearing undead armor. - Linking skills now have their cast-time reduced by dex. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6447 54d463be-8e91-2dee-dedb-b68131a5f0ec