Jump to content

Tokei

Members
  • Posts

    696
  • Joined

  • Last visited

  • Days Won

    102

Everything posted by Tokei

  1. Hello, The easiest way to add new maps is the following: Make sure to update GRF Editor to its latest version (currently on 1.8.9.7, you can use the rAthena page and follow the mediafire link or here: https://www.mediafire.com/file/aflylbhblrzpz0h/ ) Find the new maps in your GRF and then extract the RSW, GND and GAT files. Preferably, use an official GRF since your server's GRF may be encrypted. You can easily test that out by trying to preview the map in GRF Editor. If it doesn't want to load or it throws errors, then the map is encrypted. Open the flat maps maker tool and open the input maps folder by clicking the green arrow: Put the map files you previously extracted in that folder, make sure "Use currently opened GRF" is not checked. If you're using the latest GRF Editor version, you'll get a preview on the right side. You can customize the output rather easily in the options, that part is entirely up to you. Optional. The textures will overwrite the original ones; if that's a concern for you, you can set a unique set of textures for your own map in Options > Maps unique ID (set it to "mine_"). Now generate the gray maps, and you'll get a maps.grf file. You can either add an extra entry in your data.ini file with your new GRF name, or you can merge the two gray map GRFs with the Edit > Merge option. If any error shows up, it will be displayed in the console in the "Generate maps" tab. Now, the reason for your crash is a bit vague. Here are a few possible reasons: You used an old version of GRF Editor or your maps were too recent (kRO released a new map version a while back). Either way, updating GRF Editor will fix that issue. Your GRF priority is wrong in your data.ini. Your maps.grf should have one of the highest priority, so something like: [Data] 0=gepard.grf 1=maps.grf 2=yourserver.grf 3=data.grf You may not have merged the GRF correctly? Not sure how that would crash you though... I can't think of another reason. If the issue persists, can you tell me the map name? I'll just test it on my end to make sure.
  2. This was resolved through PMs a while back; here was the final script for anyone interested: // Act Editor Script - v1.0.5.1 // By Tokeiburu GrfColor textForeground = "0xffffff"; var fontType = "Minecraftia"; var fontSize = 14; var fontBold = true; var dataGrfName = @"C:\mobWithNames\data.grf"; var newGrfName = @"C:\mobWithNames\mobsWithName.grf"; var mobDbPath = @"C:\mobWithNames\mob_db.yml"; var attrFixDbPath = @"C:\mobWithNames\attr_fix.yml"; var jobnamePath = @"C:\mobWithNames\jobname.lub"; var npcIdentityPath = @"C:\mobWithNames\npcidentity.lub"; var oldEncoding = EncodingService.DisplayEncoding; var displayMobNames = false; var maxElementShown = 3; var showFirstElementDamage = true; //var elementTextColors = false; // Fixed settings var mobFolder = @"data\sprite\¸ó½ºÅÍ\"; //jobnamePath = @"C:\Gravity Ragnarok - Copy\data\luafiles514\lua files\datainfo\jobname.lub"; //npcIdentityPath = @"C:\Gravity Ragnarok - Copy\data\luafiles514\lua files\datainfo\npcidentity.lub"; //dataGrfName = @"C:\Gravity Ragnarok - Copy\data.grf"; //newGrfName = @"C:\test\mobsWithName.grf"; //mobDbPath = @"C:\Users\Tokei\Desktop\SVN\rathena4\db\re\mob_db.yml"; //attrFixDbPath = @"C:\Users\Tokei\Desktop\SVN\rathena4\db\re\attr_fix.yml"; var jobname = new JobnameLubData(jobnamePath, npcIdentityPath); int[,,] attr_fix = new int[4, 10, 10]; StringBuilder b = new StringBuilder(); var ele2id = new Dictionary<string, int>(); ele2id["Neutral"] = 0; ele2id["Water"] = 1; ele2id["Earth"] = 2; ele2id["Fire"] = 3; ele2id["Wind"] = 4; ele2id["Poison"] = 5; ele2id["Holy"] = 6; ele2id["Dark"] = 7; ele2id["Ghost"] = 8; ele2id["Undead"] = 9; var id2ele = new Dictionary<int, string>(); foreach (var entry in ele2id) id2ele[entry.Value] = entry.Key; try { EncodingService.DisplayEncoding = EncodingService.ANSI; int ival; string[] values; var mobId2ServerName = new Dictionary<int, string>(); var mobId2ServerElement = new Dictionary<int, int>(); var mobId2ServerElementLevel = new Dictionary<int, int>(); { // Load the attr_fix file var parser = new YamlParser(attrFixDbPath); var body = parser.Output["Body"]; foreach (var entry in body) { int level = Int32.Parse(entry["Level"]) - 1; foreach (var ele2id_entry in ele2id) { var element_name = ele2id_entry.Key; var element_id = ele2id_entry.Value; var def_elements = entry[element_name]; foreach (ParserKeyValue def_ele in def_elements) { attr_fix[level, element_id, ele2id[def_ele.Key]] = Int32.Parse(def_ele.Value); } } } } { // Load the mob_db file var parser = new YamlParser(mobDbPath); var body = parser.Output["Body"]; foreach (var entry in body) { int mobId = Int32.Parse(entry["Id"]); mobId2ServerName[mobId] = entry["Name"]; int eleId = 0; int eleLevel = 0; if (entry["Element"] != null) { eleId = ele2id[entry["Element"]]; } if (entry["ElementLevel"] != null) { eleLevel = Int32.Parse(entry["ElementLevel"]) - 1; } mobId2ServerElement[mobId] = eleId; mobId2ServerElementLevel[mobId] = eleLevel; } } Func<Act, string, int, Act> addNameAbove = (actI, display, offset) => { var pixels = new byte[256 * 20 * 4]; BitmapSource bitmapSource = BitmapSource.Create(256, 20, 96, 96, PixelFormats.Bgra32, null, pixels, 256 * 4); var visual = new DrawingVisual(); using (DrawingContext drawingContext = visual.RenderOpen()) { var ft = new FormattedText(display, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, new Typeface(fontType), fontSize, new SolidColorBrush(textForeground.ToColor())); if (fontBold) ft.SetFontWeight(FontWeights.Bold); drawingContext.DrawImage(bitmapSource, new Rect(0, 0, 256, 20)); drawingContext.DrawText(ft, new Point(2, 2)); } var image = new DrawingImage(visual.Drawing); var im = new Image { Source = image }; im.Measure(new Size(image.Width, image.Height)); im.Arrange(new Rect(0.0, 0.0, image.Width, image.Height)); im.UpdateLayout(); var grfImage = GrfToWpfBridge.Imaging.ConvertToBitmapSource(im); var transparent = new GrfColor(0, 0, 0, 0); for (int i = 0; i < grfImage.NumberOfPixels; i++) { Buffer.BlockCopy((grfImage.Pixels[4 * i + 3] > 0x80 ? textForeground : transparent).ToBgraBytes(), 0, grfImage.Pixels, 4 * i, 4); } grfImage.Convert(GrfImageType.Indexed8); grfImage.Trim(); grfImage.Margin(2); Buffer.BlockCopy(GrfColor.Black.ToBgraBytes(), 0, grfImage.Palette, 2 * 4, 4); for (int y = 1; y < grfImage.Height - 1; y++) { for (int x = 1; x < grfImage.Width - 1; x++) { if (grfImage.Pixels[y * grfImage.Width + x] == 1) continue; if (grfImage.Pixels[(y - 1) * grfImage.Width + (x)] == 1 || grfImage.Pixels[(y + 1) * grfImage.Width + (x)] == 1 || grfImage.Pixels[(y) * grfImage.Width + (x - 1)] == 1 || grfImage.Pixels[(y) * grfImage.Width + (x + 1)] == 1) grfImage.Pixels[y * grfImage.Width + x] = 2; } } act = actI; // Doesn't support Bgra32 only sprites if (act.Sprite.Palette == null) return act; var unused = act.Sprite.GetUnusedPaletteIndexes().ToList(); if (unused.Count <= 1) return act; if (!act.Sprite.Palette.Contains(textForeground)) Buffer.BlockCopy(textForeground.ToBgraBytes(), 0, act.Sprite.Palette.BytePalette, 4 * unused[0], 4); if (!act.Sprite.Palette.Contains(GrfColor.Black)) Buffer.BlockCopy(GrfColor.Black.ToBgraBytes(), 0, act.Sprite.Palette.BytePalette, 4 * unused[1], 4); var colors = act.Sprite.Palette.Colors.ToList(); var whiteIndex = (byte)colors.IndexOf(textForeground); var blackIndex = (byte)colors.IndexOf(GrfColor.Black); for (int i = 0; i < grfImage.NumberOfPixels; i++) { if (grfImage.Pixels[i] == 1) grfImage.Pixels[i] = whiteIndex; else if (grfImage.Pixels[i] == 2) grfImage.Pixels[i] = blackIndex; } var index = act.Sprite.InsertAny(grfImage); var max = 0; act.AnimationExecute(0, a => a.AllLayers(p => { if ((ival = ((int)(p.ScaleY * p.Height) / 2 - p.OffsetY)) > max) max = ival; })); max += 15; var layer = new Layer(index, grfImage) { OffsetY = -(max + fontSize / 2) + offset }; ival = 0; foreach (var action in act) { // Don't show for the death animation if (ival >= 32 && ival < 40) continue; foreach (var frame in action) { frame.Layers.Add(layer); } ival++; } return act; }; string displayName; int from = -1; var processed = new HashSet<string>(StringComparer.OrdinalIgnoreCase); using (var dataGrf = new GrfHolder(dataGrfName)) using (var outputGrf = new GrfHolder(newGrfName, GrfLoadOptions.New)) { int count = jobname.Id2Sprite.Count; TaskManager.DisplayTaskC("Adding text label", "Processing...", () => from / (float) count * 100f, isCancelling => { try { foreach (var mobEntry in jobname.Id2Sprite.OrderBy(p => p.Key)) { if (isCancelling()) return; var mobResourceName = mobEntry.Value; var mobId = mobEntry.Key; //b.AppendLine(mobId + "\t" + mobResourceName + "\t" + processed.Contains(mobResourceName)); if (processed.Contains(mobResourceName)) { from++; continue; } if (mobId2ServerName.ContainsKey(mobId)) { displayName = mobId2ServerName[mobId];//.ToUpper(); processed.Add(mobResourceName); } else { displayName = jobname.Id2Job[mobId].Replace("JT_", "").Replace("_", " ");//.ToUpper(); } var actEntry = dataGrf.FileTable.TryGet(GrfPath.Combine(mobFolder, mobResourceName + ".act")); var sprEntry = dataGrf.FileTable.TryGet(GrfPath.Combine(mobFolder, mobResourceName + ".spr")); if (actEntry == null || sprEntry == null) { from++; continue; } var mobAct = new Act(actEntry, new Spr(sprEntry)); StringBuilder e_builder = new StringBuilder(); if (mobId2ServerName.ContainsKey(mobId)) { int eleLevel = mobId2ServerElementLevel[mobId]; int eleId = mobId2ServerElement[mobId]; var dmgElements = new Dictionary<int, int>(); for (int i = 0; i < 9; i++) { dmgElements[i] = attr_fix[eleLevel, i, eleId]; } int highest = -1; int max = maxElementShown; foreach (var dmgElement in dmgElements.OrderByDescending(p => p.Value)) { if (dmgElement.Value < highest) break; max--; if (max < 0) { e_builder.Append("..."); break; } highest = dmgElement.Value; if (e_builder.Length == 0) e_builder.Append(id2ele[dmgElement.Key] + (showFirstElementDamage ? " (" + dmgElement.Value + "%)" : "")); else e_builder.Append(" - " + id2ele[dmgElement.Key]); } mobAct = addNameAbove(mobAct, e_builder.ToString(), 0); if (displayMobNames) mobAct = addNameAbove(mobAct, displayName, 15); } else { if (!displayMobNames) { from++; continue; } mobAct = addNameAbove(mobAct, displayName, 0); } MemoryStream actStream = new MemoryStream(); MemoryStream sprStream = new MemoryStream(); try { mobAct.SaveWithSprite(actStream, sprStream); } catch { from++; continue; } outputGrf.Commands.AddFile(actEntry.RelativePath, actStream); outputGrf.Commands.AddFile(sprEntry.RelativePath, sprStream); if (from % 200 == 0) { GC.Collect(); outputGrf.QuickSave(); outputGrf.Reload(); } from++; } } catch (Exception err) { ErrorHandler.HandleException(err); } finally { outputGrf.QuickSave(); from = count; } }); //ErrorHandler.HandleException(b.ToString()); } } catch (Exception err) { ErrorHandler.HandleException(err); } finally { EncodingService.DisplayEncoding = oldEncoding; }
  3. There are no versions that allow you to make a quadtree. You'll need BrowEdit 3 for map edits. Though, if you... really want to try older versions, you can do so from the rAthena download page at the bottom (here (Version 1.0.1 is quite catchy... ahem!)
  4. You don't need to close grf2, but grf1 will be used and overwritten, so yes it needs to be closed. You don't have to do that if it's currently opened by GRF Editor, it will close and reopen it automatically.
  5. This isn't a GRF, or it's encrypted from a third party tool. So there's not much to do here. Changing the header won't do much.
  6. I'll be looking into this one. Though I need to remake the lub decompiler, it's... a bit nasty. Well, as it says, you're run out of memory. This is hard to reach however, especially GRF Editor is released in x64 and there's practically no memory limit. Make sure you've updated to 1.8.8.8 and see if that resolved your issue.
  7. Hmm, is that even a GRF...? You'd have to show me the first ~50 bytes of the GRF (or upload the GRF somewhere) to have a look. If you have to manually change the header, something's definitely not right here. The magic header is always Master of Magic. (Also, that color theme is quite broken. That's not how it's supposed to look at all.)
  8. That's normal. It doesn't really make sense to send a new walking packet for your own character after using @refresh. But you can forcefully send it again in the clif_refresh function (in clif.cpp). Just add the following at the end of the function. struct unit_data* ud = unit_bl2ud(&sd->bl); if (ud && ud->walktimer != INVALID_TIMER) { unit_walktoxy(&sd->bl, ud->to_x, ud->to_y, 4); } Though, it will look a tad weird because the character has to walk from a center cell, so it will "walk back" when using @refresh. You could also send a "unit_stop_walking(&sd->bl, USW_NONE);" if you want the character to stop moving instead. Whichever you prefer.
  9. Hello, I'll be adding a better guideline on the encryption window as I can understand the confusion there. You are correct, the GRF Encryption tool window is only meant to create the client files (client.exe + cps.dll). The "Encrypt GRF" option was removed from that window because it was redundant. To encrypt your GRF, you have to right-click a folder and select encrypt: This does the same thing as the previously removed option. That is also how you're supposed to encrypt your Thor patches when you want to patch encrypted content. As for the password prompt when opening the GRF, that is mostly for visual effect in the first place. An encrypted GRF may not have this prompt. Also, the GRFs can be partially encrypted, so if you choose "Cancel" when this prompt shows up, you can still browse the GRF depending on what you did.
  10. Updated to 1.8.8.4 to fix this issue. The flat maps tool has been updated as well. Hello, Which client version are you using? Which version of GRF Editor are you using? Which Visual C++ redistributables version did you install?
  11. The emblem issue should be fixed in 1.8.8.2.
  12. Hmm, alright, since I'm unable to reproduce this issue on my end, I can only go with a trial and error approach. @Mister Noob @LearningRO @Vashtido Please PM me on Discord (tokei / 95599057182920704) if you're willing to help figure out the issue. I'll be sending you unprotected debug versions of the encryption tool.
  13. I was unable to reproduce the issue. Can you show me what the emblem received by the emulator was? It will be stored in your SQL database in the "guild" table under the "emblem_data" field. (You should check the previous field first of course.)
  14. Heya, This tool is no longer supported and will not work with recent rAthena versions.
  15. If you're asking how to make a similar GRF, that is from File > Save advanced > Encrypt File Table. If you're asking how to read a similar GRF, that is not made available.
  16. Updated to 1.8.7.7: Updated the encryption library for added security. This new version may not work in older clients (hard to test on my end, do let me know). This version requires Microsoft Visual C++ 2022 (x86): https://aka.ms/vs/17/release/vc_redist.x86.exe This is also required for your players. It is usually already installed for most, but some may not have it. The previous version of the encryption required VC++ 2010 (x86). A custom approach as mentioned in the above post (https://rathena.org/board/topic/77080-grf-grf-editor/?do=findComment&comment=432591) will always be more secure. If you do decide to rename cps.dll to something else, then you'll have to ensure your previous encryption cps.dll no longer exists. Otherwise, this will be pointless. You can leave the regular cps.dll from Gravity, that will not conflict.
  17. Updated to 1.8.7.6: Added support for using different GRF magic headers (Master of Magic). It can be modified via Container options > Grf type properties > Magic header (This also means that modifying your GRF header now has no real purpose.) Added support for GRF version 0x300 (from jRO). You can refer to this post: Look at the compress/uncompress methods. The project files are mostly about encryption, but if you ignore that part, the compress/uncompress methods are still going to be used by the client. Just copy the method signatures and make a new project from scratch, or copy this one. uncompress is meant for decompressing the GRF entry. compress is meant for compressing emblems (it is used by the emulator, so leave zlib compression for this; unless you want to change the compression server-side as well). compress2 is where you'd define your own compression method (this is a custom exported method used for GRF Editor, to not conflict with the default compress method; if not defined, it will load compress instead).
  18. It took me some time to figure out what the concern was, but I think I got it. This comes from a confusion on what the while-loop condition means and the misconception of how timers work in the emulator. First thing first, sleep_db is a linked list, each node is connected to the next node, and the final node is connected to a null pointer. So eventually, node->next will return a null pointer, and it will break out of the while-loop. This is your typical way of going through a linked list and this is what we're doing here. We're just going through a linked list, nothing more. As for the "while (node && st->sleep.timer != INVALID_TIMER)" condition, think of it more like this: if (st->sleep.timer != INVALID_TIMER) { while (node) { if (something) { ... break; } node = node->next; } } It simply combines the condition for simplicity. If the timer is already marked as INVALID_TIMER, then it doesn't need to remove the linked node nor does it need to delete the timer. This has nothing to do with "waiting for the timer to finish", it doesn't do that at all. It's a condition check for whether or not it should bother deleting the timer. As you've said before, rAthena is indeed a single threaded application, so waiting for a timer to finish directly doesn't make sense and I want to reiterate that this isn't what this code does. Also, I said this previously, but this code is copied from run_script_timer. The code you're worried about is already currently running on your server, so if there was a problem with it, you'd have known by now (it's being executed dozens of time every second as well). __ Quick note on timers: after using add_timer, no threads are created. Your timer tick is added to a static list and then checked constantly through the core loop of the emulator in core.cpp (via do_timer): #ifndef MINICORE if( !this->m_run_once ){ // Main runtime cycle while( this->get_status() == e_core_status::RUNNING ){ t_tick next = do_timer( gettick_nocache() ); this->handle_main( next ); } } #endif Once the your timer tick is expired, the code will be executed and the timer will be removed. It's rather simple in the end Though on that note... That's also why you'll notice that using small sleep timers (like "sleep 100;" in a script) is often not recommend if you rely on these small amounts. The timers are always delayed by 0~20 ms because the core loop for timers only check at a minimum interval to not overload the emulator. So in such a scenario, you'll notice that doing "sleep 100;" 50 times in a row will take roughly 6 seconds rather than 5 seconds. It's quite noticeable after a while, and that's why you should rely more on OnTimer labels instead (those are still delayed by that 0~20 ms, but the delays don't stack up, so they end up being more accurate). Anyhow, hopefully this helps some people deal with timers both in the source and in scripts. (So yes, this while-loop is safe!)
  19. You mean the loop in script_sleep_resume? It will leave the loop once the timer is found in sleep_db. Then it's erased/deleted and set to INVALID_TIMER. There is nothing blocking as far as I can tell. This code is copied from the run_script_timer timer function, which resumes a script after sleep/sleep2 is executed. Or are you talking about another loop or am I missing something here?
  20. Heya, Personally, I always disliked that command because it's awkward to use. The answer from Winterfox probably works, but if you want to have more "freedom" when using the command, you can instead my custom command "unitwalk_wait" (you'll have to apply the diff file yourself, of course). /// Makes the unit walk to target position. /// Returns if it was successful. /// /// unitwalk_wait(<unit_id>,<x>,<y>{,<timeout>}) -> <bool> Basically, the script will pause until the unit has reached its destination (or until it times out). Here is a script example: prontera,150,186,4 script test_walk 77,{ mes "Move the NPC."; L_Again: getmapxy(.@m$, .@npc_x, .@npc_y, BL_NPC, getnpcid(0)); switch(select("Left:Right:Scripted path")) { case 1: unitwalk_wait getnpcid(0), .@npc_x - 3, .@npc_y; break; case 2: unitwalk_wait getnpcid(0), .@npc_x + 3, .@npc_y; break; case 3: clear; mes "Give me a moment...!"; close2; donpcevent strnpcinfo(0) + "::OnWalk"; end; } goto L_Again; end; OnWalk: .@npcid = getnpcid(0); unitwalk_wait .@npcid, 150, 187; misceffect 150; npctalk "Here I go!"; sleep 1500; unitwalk_wait .@npcid, 155, 187; unitwalk_wait .@npcid, 160, 187; emotion E_GASP; npctalk "What a rough corner..."; sleep 1500; unitwalk_wait .@npcid, 160, 180; npctalk "I have walked plenty, no more sir."; end; } Source changes: diff --git a/src/map/script.cpp b/src/map/script.cpp index 8fdc6fabc..16a54d81b 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -4256,6 +4256,24 @@ TIMER_FUNC(run_script_timer){ return 0; } +int script_sleep_resume(struct script_state* st) { + struct linkdb_node* node = (struct linkdb_node*)sleep_db; + + while (node && st->sleep.timer != INVALID_TIMER) { + if ((int)__64BPRTSIZE(node->key) == st->oid && ((struct script_state*)node->data)->sleep.timer == st->sleep.timer) { + script_erase_sleepdb(node); + delete_timer(st->sleep.timer, run_script_timer); + st->sleep.timer = INVALID_TIMER; + break; + } + node = node->next; + } + if (st->state != RERUNLINE) + st->sleep.tick = 0; + run_script_main(st); + return 0; +} + /** * Remove sleep timers from the NPC * @param id: NPC ID @@ -19782,6 +19800,66 @@ BUILDIN_FUNC(unitwalk) return SCRIPT_CMD_SUCCESS; } +/// Makes the unit walk to target position. +/// Returns if it was successful. +/// +/// unitwalk_wait(<unit_id>,<x>,<y>{,<timeout>}) -> <bool> +BUILDIN_FUNC(unitwalk_wait) +{ + struct block_list* bl; + struct unit_data* ud = NULL; + const char* cmd = script_getfuncname(st); + + if (!script_rid2bl(2, bl)) + { + script_pushint(st, 0); + return SCRIPT_CMD_FAILURE; + } + + ud = unit_bl2ud(bl); + + // Timeout reached, the unit didn't walk to the destination... just ignore and move to the next script command. + if (st->sleep.tick != 0) { + st->state = RUN; + st->sleep.tick = 0; + return SCRIPT_CMD_SUCCESS; + } + + // Unit was already forced to walk. + if (ud != nullptr && ud->state.force_walk) { + script_pushint(st, 0); + ShowWarning("buildin_%s: Unit has already been forced to walk and not reached it's destination yet.\n", cmd); + return SCRIPT_CMD_FAILURE; + } + + if (bl->type == BL_NPC) { + if (!((TBL_NPC*)bl)->status.hp) + status_calc_npc(((TBL_NPC*)bl), SCO_FIRST); + else + status_calc_npc(((TBL_NPC*)bl), SCO_NONE); + } + + int x = script_getnum(st, 3); + int y = script_getnum(st, 4); + int timeout = script_hasdata(st, 5) ? script_getnum(st, 5) : 5000; + + if (script_pushint(st, unit_can_reach_pos(bl, x, y, 0))) { + if (ud != nullptr) + ud->state.force_walk = true; + add_timer(gettick() + 50, unit_delay_walktoxy_timer, bl->id, (x << 16) | (y & 0xFFFF)); // Need timer to avoid mismatches + } + + struct npc_data* nd = map_id2nd(st->oid); + + if (ud && nd) { + st->state = RERUNLINE; + st->sleep.tick = timeout; + ud->walk_done_script = st->id; + } + + return SCRIPT_CMD_SUCCESS; +} + /// Kills the unit. /// /// unitkill <unit_id>; @@ -27693,6 +27771,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(setunitdata,"iii"), BUILDIN_DEF(unitwalk,"iii?"), BUILDIN_DEF2(unitwalk,"unitwalkto","ii?"), + BUILDIN_DEF(unitwalk_wait,"iii?"), BUILDIN_DEF(unitkill,"i"), BUILDIN_DEF(unitwarp,"isii"), BUILDIN_DEF(unitattack,"iv?"), diff --git a/src/map/script.hpp b/src/map/script.hpp index b7beb8483..4c499359a 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -2231,6 +2231,7 @@ int conv_num(struct script_state *st, struct script_data *data); const char* conv_str(struct script_state *st,struct script_data *data); void pop_stack(struct script_state* st, int start, int end); TIMER_FUNC(run_script_timer); +int script_sleep_resume(struct script_state* st); void script_stop_sleeptimers(int id); struct linkdb_node *script_erase_sleepdb(struct linkdb_node *n); void script_attach_state(struct script_state* st); diff --git a/src/map/unit.cpp b/src/map/unit.cpp index a643967a0..339a025a1 100644 --- a/src/map/unit.cpp +++ b/src/map/unit.cpp @@ -488,6 +488,15 @@ static TIMER_FUNC(unit_walktoxy_timer) ud->state.force_walk = false; + if (ud->walk_done_script) { + ud->state.walk_script = false; + struct script_state*st = (struct script_state* )idb_get(st_db, ud->walk_done_script); + + if (st) { + script_sleep_resume(st); + } + } + if (ud->walk_done_event[0]){ char walk_done_event[EVENT_NAME_LENGTH]; diff --git a/src/map/unit.hpp b/src/map/unit.hpp index cfd932615..76ccc0c8f 100644 --- a/src/map/unit.hpp +++ b/src/map/unit.hpp @@ -61,6 +61,7 @@ struct unit_data { bool force_walk; ///< Used with script commands unitwalk/unitwalkto. Disables monster idle and random walk. } state; char walk_done_event[EVENT_NAME_LENGTH]; + int walk_done_script; ///Script OID to run after a walking event is over char title[NAME_LENGTH]; int32 group_id; I find this command much easier to use. You can also mix it up with the original "unitwalk" when multiple NPCs walk at the same time, as long as unitwalk_wait is the last one. Anyhow, you'll figure it out if you do end up using this command (or whoever else does). unitwalk_wait.diff
  21. Heya, There hasn't been a whole lot of changes in the map format. So... just open up BrowEdit 3 > load the map > data\map.rsw > Edit ... > Change the rsw version from 0x206 to... 0x204 would be good enough. Or you could also just lower the build number from 214 to 185. You could lower it all the way down to 0x201 and it wouldn't change much at all (0x201 is the most common map format, practically any client can read this one). Then just save the map. (Edit: Updating your client is the proper way obviously, but if you're not ready to update yet, then the above will work just fine.)
  22. Long story short, you need to use this: As for why, palette 0 uses the palette provided in the sprite file. That's why it shows up properly in Act Editor. Custom palettes, which is probably what you're using like everyone else, uses a different placement for the gradients. They do that because that way, they're compatible with 3rd classes (plus it's better organized than whatever mess Gravity did). The mount is transparent because the mount gradients redirect to the pink lines, which is wrong. Using the corrected version from Haziel should fix that.
  23. Care to elaborate on that? I'm always up for improving GRF Editor, but without any information, this doesn't really mean anything for me.
  24. Heya, I've been receiving a lot of messages regarding encryption (again), so I wanted to clarify a few things: Your PMs regarding encryption matters will be redirected to this post. I will not be making a paid version of GRF Editor for encryption. Yes, I am aware there is someone selling a decryption tool. No, this has nothing to do with GRF Editor being open source. GRF Editor has been open source for a very long time. No, I will not be updating the encryption DLL for the foreseeable future. GRF Editor now has an updated encryption tool to block this decryption tool. GRF Editor is open source (https://github.com/Tokeiburu/GRFEditor), there's no need to pay to see the source (a few people made this request already...). As of GRF Editor 1.8.7.2 and above, it is now possible to make your own custom encryption library and link it with GRF Editor (this is meant for developers). Here is the project file: comp_x86.rar This is a C++ project made for Visual Studio 2022. You can use a lower toolset for older clients as it was originally made using Visual Studio 2010, which should be more than enough. The respective Visual C++ Redistributables should be installed (x86 for the client and x64 for GRF Editor). When making the encrypt.dll for GRF Editor: Use "Release" and "x64". The DLL will be compiled at comp_x86\Release\x64_GrfEditor\encrypt.dll "#define GRF_EDITOR" in cps.h must be defined in cps.h. This exposes the encrypt/decrypt functions for GRF Editor. The DLL can then be loaded in GRF Editor from Tools > Settings > Application > Encryption method... GRF Editor uses these methods for encryption/decryption: DLL int encrypt(BYTE* key, UInt32 key_len, BYTE* compressed_data, UInt32 compressed_len, UInt32 uncompressed_len); DLL int decrypt(BYTE* key, UInt32 key_len, BYTE* compressed_data, UInt32 compressed_len, UInt32 uncompressed_len); The compressed_data length cannot be modified. The uncompressed_len can be used for your encryption algorithm, but otherwise it isn't useful for anything. The encryption happens after the compression (raw data > zlib/lzma compression > encryption). It is the final method applied on the data. You can make a custom compression library to change the compression data length. The "key" parameter is the one used by GRF Editor when loading an encryption key from the software. You're free to ignore this parameter if you're not going to use this. The key from GRF Editor is 256 bytes in length. When making the cps.dll for your client: Use "Release" and "Win32". The DLL will be compiled at comp_x86\Release\x86_Client\cps.dll "#define GRF_EDITOR" in cps.h must NOT be defined. Comment it out if it isn't automatically undefined (using Win32 should undefine it by default). The most important function is "void decryptSub(BYTE* key, UInt32 key_len, BYTE* data, UInt32 data_len, UInt32 seed)" in cps.cpp. The function decrypts the data in the GRF using the key provided by GetGrfEncryptionKey(). This part needs to be defined on your end as the key provided is just a dummy one. Hide it, do whatever you want. By default, the encryption uses an RSA encryption method. This project has no protection on the DLL whatsoever. That part is entirely up to you. Make sure the client-side version of your cps.dll cannot be loaded in GRF Editor directly as a custom compression library as this would... make the whole thing rather pointless. The methods of interest for the client side would be: DLL int uncompress(BYTE* output_data, UInt32* output_len, const BYTE* compressed_data, UInt32 compressed_len) int _encryptedUncompress(BYTE* uncomp, UInt32* uncompLength, const BYTE* comp, UInt32 compLength) If you're a developer and you think your version is better than the one provided by GRF Editor, feel free to PM me as I'll make it as a default option (I will request to see the source however). Likewise, you're also free to sell those encryption DLLs if you want to, that's entirely up to you (I will not be responsible for issues related to third party encryption libraries).
  25. You're trying to define a function within a script; those two should be separated. Usually you'd put functions in a different script file, but that's me nitpicking a little. Your script would look like this: script function F_res... NPC scripts below You have to put the script functions before the NPC scripts otherwise they won't be recognized while parsing the script. But... clearly, you wanted to use callsub rather than callfunc, which is slightly different. "callfunc" functions are global and can be used by all scripts, in different files, while "callsub" are functions that can be used within the current script only. A callsub would look like this: //============================ // functions //============================ // F_restore F_res: .@rental_item = getarg(0); .@item_1 = getarg(1); .@item_2 = getarg(2); .@item_3 = getarg(3); if(rentalcountitem(.@rental_item) < 1){ //... return; // Then you call the function with: callsub "F_res",40081,40225,40016,40082; Your script also relies way too much on gotos. If the goto isn't used more than once, then it has no reason to be. It's harder to follow your script the way it is now than simply putting the code in the right place it belongs to. Well, not that it matters too much, just a general suggestion. Anyway, using callsub, your script would look like this: moc_para01,46,36,4 script Guild Blacksmith 826,{ if(countitem(40056) < 1){ goto notmember; } // Text //============================= soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Oh hello there, how can I help you ?"; switch(select("- Restore:- Upgrade Item Grade:- Cancel")){ case 1: goto restore1; case 2: goto upgradeclass; case 3: end; } end; // Restore //============================= restore1: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Oh, you need restore?"; switch(select("- Restore Information:- Restore Item:- Cancel")){ case 1: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Well, your item usually comes"; mes "with a 7-day rental period,"; mes "but if you wish to extend"; mes "that rental period,"; mes "you can come to me"; mes "for a complete restore."; next; clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "To restore weapons or armor, I will need"; mes "- 1 Restore Token"; mes "- 10 Durengo Coins"; next; clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Just for the record, I will only"; mes "restore Tier 2 and above items."; next; clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "For tools, I will just need"; mes "- 1 Restore Token"; mes "- 5 Durengo Coins"; close; case 2: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Ok then, what item do you need to restore?"; switch(select("- Weapon:- Armor:- Tools:- Cancel")){ case 1: goto wep_restore; case 2: goto armor_restore; case 3: goto tool_restore; case 4: end; } case 3: end; } wep_restore: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Select Weapon Tier"; switch(select("- Tier 2:- Cancel")){ case 1: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Select the weapon you wish to restore"; switch(select("- Improvise Dagger:- Cancel")){ case 1: goto improdaggres; case 2: end; } case 2: end; } end; //============================ // functions //============================ // F_restore F_res: .@rental_item = getarg(0); .@item_1 = getarg(1); .@item_2 = getarg(2); .@item_3 = getarg(3); if(rentalcountitem(.@rental_item) < 1){ clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "You don't have a "; mes ""+ getitemname(.@rental_item) +"."; close; } if(countitem(.@item_1) < 1){ clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "You don't have a "+ getitemname(.@item_1) +"."; close; } if(countitem(.@item_2) < 10){ clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "You don't have 10 "+ getitemname(.@item_2) +"."; close; } clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Great, here is your new "+ getitemname(.@item_3) +"."; delitem (.@rental_item, 1); delitem (.@item_1, 1); delitem (.@item_2, 10); getitem (.@item_3, 1); close; improdaggres: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Select Dagger Grade"; switch(select("- Grade A:- Grade B:- Grade C:- Grade D:- Grade E:- Cancel")){ case 1: callsub "F_res",40081,40225,40016,40082; break; case 2: end; case 3: end; case 4: end; case 5: end; case 6: end; } armor_restore: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Work In Progress"; close; tool_restore: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Work In Progress"; close; // Upgrade //============================= upgradeclass: clear; soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "Work In Progress"; close; // Members //============================= notmember: soundeffect "menu.wav",0; mes "^ce7e00 === Hafiz === ^000000"; mes "You need to be a member before I can assist you."; close; }
×
×
  • Create New...