summaryrefslogtreecommitdiff
path: root/npc/Changelog.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-08-10- Commiting a bunch of cleanups piled up from the past few weeks/months/years.Skotlex1-0/+2
- Updated unitwarp so that an id of "0" causes the script's rid to be warped. - Updated the Brasilis ontouchNPC warp command to use unitwarp instead. - Signum Crucis's duration is now specified in the skill_cast_db file - Updated @warp/@jump commands so that when an invalid tile is specified, a nearby cell is chosen (rather than using a map-wide random value) - The if(req.weapon) code was broken, since req.weapon is never "0" for a skill. Updated the code so that the requirement of '99' (any weapon) is stored as 0, in order to make the checks effective. - Cleaned up the code for script command warpparty - Fixed the define itemdb_canrefine() - Cleaned up some the status_damage() function - Fixed map_random_dir(), which at times would pick cells that didn't preserve the required distance. - Some aesthetic code cleanups. - Fixed some possible crashes for skills where the code assumes the caster is a player. - Fixed a bunch of idiotic code-snippets that should have embarrassed whoever was responsible for them. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14929 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-09* Implemented remaining Brasilis NPCs.L0ne_W0lf1-0/+2
* Added remaining database modifications for Brasilis. - Added the skills for the Brasilis monsters. - Added remaining entries for Bathroom Ghost quest. - Added stats for the Suspicious Hydra monsters. - Corrected the capture rate for Suspicious Hydra. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14928 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-18Updated dialog in monster_race.txtL0ne_W0lf1-0/+2
Minor dialog updates to Nidhoggr's Nest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14912 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-16* Have been working on this for months: Added Nidhoggr's Nest instance.L0ne_W0lf1-0/+3
* Tweaks to how checkquest is used in orc's memory and sealed shrine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14909 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-13Tweaked the sealed shrine entrance NPCs. Hopefully the damn thing works now.L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-24- Fixed a possible exploit in guild castle investment. (bugreport:4929, ↵brianluau1-0/+2
topic:272783) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14833 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-08* Added missing Hair Dressers and Hair Dyer to Lighthalzen.L0ne_W0lf1-0/+6
- Hair Dresser will change hair styles ranging between 20 to 27 - Assistant Beautician changes to a random style and colour between 1-23. * Updated the Cursed Spirit quest, and added some more town NPCs. * Added more town NPCs to Splendide and Manuk. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14780 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-06Added two new quests, Alberta Boy and Secret Note of Bazett.L0ne_W0lf1-0/+3
Implemented 13.2 update to Report to the New World quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14775 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-20* Fixed and commented out old Anthell entrance warps (bugreport:3589).Gepard1-0/+4
- Moved entrance to cmd_fild08 to match mapcache updates. * Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation could prevent summoning of Satan Morroc until server reboot (bugreport:3437). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14753 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-17* Endless Tower fixes:Gepard1-0/+5
- Added missing end's to prevent accidental disabling of warps between floors. (bugreport:4623) - Added missing end's to prevent infinite mobspawn (bugreport:4540) - Commented out remaining GM-only NPCs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14747 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-06- Changed some duplicates so they use a floating NPC as their original. ↵L0ne_W0lf1-0/+12
(bugreport:1395) - Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654) - Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677) - Removed level requirement for the Viens Stone gathering quest. (bugreport:4678) - Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707) It's worth noting how much I hate the system for restricting skills per zone. - Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709) - Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711) - Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719) - Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-16* Various fixes for scripts that are disabled by default.ai4rei1-0/+5
- Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt - Fixed name collision in THQS_Quests (custom) with 'Little Girl' in cities/lutie.txt - Fixed outdated reference to npc_dynamic_shop sample (follow up to r14277). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14676 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. ↵L0ne_W0lf1-0/+2
(burgerport:4569) Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates. As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate. Updated instances with more proper English, care of Resplendent. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14555 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-03Updated some more cash shop boxes to use rentitem instead of getitem.L0ne_W0lf1-0/+7
Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555) Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586) Corrected a typo in the christmas_2008 event. (bugreport:4600) Changed which White Lady spawns in endless tower. (bugreport:4601) Also added Quest Log Entries to Endless Tower, please test. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14552 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-23* Added quest log support for the following quests.L0ne_W0lf1-0/+6
- Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, and the Z-Gang Quest git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14490 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-05* Just a couple Bug fixes. :PL0ne_W0lf1-0/+4
- Added a missing close in quests_13_2.txt. (bugreport:4520) - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14448 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-18* Added bard/dancer songs and duets to the nodispell list. (bugreport:4411)L0ne_W0lf1-0/+7
* Applied Ai4rei's patch for the skill WE_CALLPARTNER (bugreport:4437) * Lots of updates to monster stats/drops, all fairly minor. * Updated the price and weight of a handful of etc items. * Removed drops for quest-spawned Satan Morroc. (bugreport:4425) * Changed weight on novice consumable items to 0 (bugreport:4442) * Updated Sage quest skill quest with the file curtosy of 5511. * Fixed the Pink Crystal being named Blue Crystal in Flavius. * Touched up the archer tutorial, and phantasmic arrow quests. * Fixed Turbo Track records for 8 and 16 normal saving as expert. (bugreport:4433) * Corrected the positions for the arug castle 04 exterior flags. (bugreport:4436) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14409 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-13* Some more Endless tower bugfixes.L0ne_W0lf1-0/+4
- Fixed some copy/paste errors (1@orc -> 1@tower) - No longer resets entrance time when re-entering. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14407 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-09-06* Implemented Icescope's fix for devotion, reflect damage is no longer ↵L0ne_W0lf1-0/+4
absorbed by the devoter. (bugreport:3189) * As a folow up to r14301, increased MAX_REG_NUM to 256, to prevent possible data loss. * Touched up the endless tower script slightly. - Added ends to several NPCs which would allow you to restart timers. - Added some missing stopnpctimers to npcs. (bugreport:4418) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-28Removed a disablenpc from #102FShadowDust1. (bugreport:4415)L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14397 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-26* instance_npcname will now error if the NPC being looked up is not found, ↵L0ne_W0lf1-0/+3
care of ramsey. * delitem/2 will now send the close button when failing to find all neccecary items to delete. - Still do to, items should not be deleted as-found, and should be deleted once counted and in the event of delitem failure, nothing should be consumed. This is a design flaw in eathena, and should be fixed as soon as possible. * Implemented the Endless Tower instance. * Updated announces and dialogs in KVM. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14395 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-22Mob chat now strips "#unique" names off monsters, curtosy of Daegaladh.L0ne_W0lf1-0/+1
Touched up the Airship scripts. Fixed up some content based on official files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14392 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-21Fixed silly copy paste errors in Tierra Gorge entrance npcs. (bugreport:4401)L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14391 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-20* Fixed wrong events being called for flavius02 BG waiting rooms. ↵L0ne_W0lf1-0/+4
(bugreport:4395) * Fixed the setwalls in Tierra gorge, again. Removed extra mapflags. * Moved overlapping guild flags outside arug_cas05 to proper points. * Fixed kRO Name for Women's Bundle. (bugreport:4398) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14385 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-18Fixed level 4 weapon quest deleting wrong items. (bugreport:4390)L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14380 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-16* Fixed Flavius only needing 1 person on either side to start.L0ne_W0lf1-1/+9
* Updated the level 4 weapon quest to aegis conversion. * Corrected a variable typo in the dts_warper script. * Fixed a script hang in Hugel Temple Excavation quest. * Fixed Cat Hand Agent checks, and mysterious rock#31. * Corrected the two hour time limit for Sealed Shrine. * Corrected a few other minor issues in Sealed Shrine. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14* Fixed error in bg_common, and duplicate warp names.L0ne_W0lf1-0/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14375 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-14* Quest log kill count now updated properly. (Added from topic 253813)L0ne_W0lf1-1/+14
* More battleground editing, and some bug fixes. - * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING * - Rewrote the Badge Exchange NPC in bg_common.txt, is official now. - Other changes to the bg_common folder, including disabled GM NPC. - Completely rewrote Flavius for the most part, from ground up. - Moved old Flavius battlegrounds to /custom/battleground folder. - Restored original bg_common, and KVM to /custom/battleground - Fixed wall bugs in Tierra Gorge, and added an oninit to the timers. - Other minor tweaks to both Tierra Gorge and KVM scripts. - Fixed the pseudo-cooldown on KVM not working properly, I hope. - Added global time2str function which will be used later in Endless tower. * Applied Epoque's mapflag clean up, which removes flags from scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14374 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-11* Documented Battleground commands with as much information as I've got.L0ne_W0lf1-0/+10
* Another rather large overhaul of the battlegrounds. - in bg_common.txt, stripped out several more NPCs, split them off. - Most of the NPCs in bg_common.txt are now official Aegis versions. - Completely rewrote Tierra Gorge for the most part, from ground up. - Moved old Tierra Valley battlegrounds to /custom/battleground. - Added Tierra scripts, Flavius, and bg_common to scripts_athena. - Tierra, KvM, and bg_common scripts are now enabled by default. - To use custom Flavius, you must enable /flavius/flavius_enter.txt - * TIERRA GORGE AND KVM BOTH REQUIRE TESTING * git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14373 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-03* A rather large overhaul of the battlegrounds.L0ne_W0lf1-0/+13
- in bg_common.txt, stripped out KvM npcs, fixed coordinates. - Needs to be tested, none of the BG files are on by default. - Created subfolder battleground/KvM/ which now holds KVM files. - Added kvm_enter.txt, which warps players to the waiting rooms. - Added kvm_item_pay.txt, which holds the point redemption NPC. - Made the KvM battlegrounds work closer to official, needs work. * Corrected variable typos in the acolyte arena. (bugreport:4374) * Corrected donpcevent typo in the party arena. (bugreport:4374) * Added two global functions which will return equip data as strings. - F_GetWeaponType: returns the type of weapon by 'look', (ie "Dagger") - F_GetArmorType: returns the kind of armor via 'equip loc'. (ie "Armor") * Fixed duplicate documentation for getitemslot. (bugreport:4362) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14369 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-30Added the acolyte-specific arena to the Izlude arena.L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14366 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-07-07* Official Lighthalzen Gangster Alert script.Gepard1-0/+10
* Fixed typo in Amatsu Dungeon Entrance Quest. * Removed duplicate nomemo mapflag entries. - added changelog entries for my previous commit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14362 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-30Corrected some MVP spawn variances (Guild Dungeon & Veins Fields). Follow-up ↵Gepard1-0/+2
to r13673. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14359 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-28* Follow up to r13895, added a battle.conf setting to control if ranges ↵L0ne_W0lf1-0/+2
should be checked with autocasts. 'autospell_check_range', by default is set to no, as this is official behavior. This does not affect autospellwhenhit. * Sonic Blow autocast now stops players attacking when it triggers. It's possible there is more depth to this on official servers, and should 'stop' attacking on regular casts as well. It appears so far that this is the only skill that behaves this way. * Modified the default value for homunculus_auto_vapor in source to 1. * pvp_points are no longer calculated in the gvg_dungeon flagged maps. * Corrected a view ID and an equip location in the item database. (bugreport:4330) * Corrected a typo in the DTS_Warper script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14356 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-22* Added support for NPC names in the 'specialeffect' script command, go go ↵L0ne_W0lf1-0/+2
copy/paste! * Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-21* Fixed setcell in arug_cas04 and 5 extending past what it should. ↵L0ne_W0lf1-0/+1
(bugreport:4323) * Minor item database bug fixes! - Corrected some lower headgears being able to be refined. (bugreport:4328) - Fixed wrong view ids for crown of deceit and musical note headband. (bugreport:4328) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14352 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-21* Removed usage of the 'goto' command from job quests.L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14351 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-20Corrected Einbech Mine warps.Gepard1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14350 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-18Applied patch from Dani to change NPC emotion events to use the updated ↵L0ne_W0lf1-0/+2
emotion command. (bugreport:4318) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-12* Reduced Robo_Eye bonus from 3 -> 2 (bugreport:4288)L0ne_W0lf1-1/+2
* Disabled the Peco Peco repeatable quest, see comment in conf as to why. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14340 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-12* Implemented repeatable EXP quests (with kill count and item gathering ↵L0ne_W0lf1-0/+2
options) removed iRO_Exp.txt. * Fixed missing slot on Power_of_Thor. (bugreport:4168) * Fixed size for HELL_APOCALIPS and ZUKADAM. (bugreport:4293) * Fixed mob modes on ANCIENT_TREE and RYNCHO. (bugreport:4294) * Fixed HP and INT bonuses on the Kronos staff. (bugreport:4297) * Fixed equip location and more on the Ruber sword. (bugreport:4298) * Fixed typo in the Icecream_Hat giving the wrong skill. (bugreport:4299) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14339 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-10* Adjusted the cooldowns on the "Rough Mineral" and "Helping Grenouille" quests.L0ne_W0lf1-0/+2
* Removed a 'close' in a 13.1 quest which should have been 'close2'. (bugreport:4276) * Added three 13.2 quests: Monster Suppression, Bradium Collection, and Laphine Craftsman. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14338 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-10* Touched up the WoESE Guild Dungeon monster stats and added drops.L0ne_W0lf1-0/+2
* Enabled the WoESE Guild Dungeon warper and spawns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14337 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-05* Corrected Brasilis Fruit Merchant. (bugreport:4278)L0ne_W0lf1-0/+2
* Implemented some new items, most 13.2 equipment. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14331 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02* Actually applied the right update to the comodo weapon shop.L0ne_W0lf1-1/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14330 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02* Corrected warnings (and errors on some compilers) from r14327.L0ne_W0lf1-0/+1
* Actually added Manul/Splendide shop files from r14327. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14329 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-01* Implemented the Manuk and Splendide item status effects, thanks to Epoque.L0ne_W0lf1-0/+3
* Implemented Manuk and Splendide consumable items. * Added Splendide and Manuk merchants. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14327 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-30* Shop update, and added Wanderer pet food maker NPC.L0ne_W0lf1-0/+6
- Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. - Made Brasilis shop names unique, and uncommented. - Changed the whip sold in comodo weapon shop. (1956 ->1960) - Added Fire and Silver arrow to Einbroch tool dealer. - Re-added Bill of Birds to Morroc Item Collectors. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14315 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-29Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, ↵L0ne_W0lf1-0/+4
warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps. Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out. Fixed an error in the monster race npcs calling a nonexistant OnEnable. Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14313 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-05-27Added 13.2 daily quest 'Dragon Egg collection.'L0ne_W0lf1-0/+2
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14308 54d463be-8e91-2dee-dedb-b68131a5f0ec