diff options
| author | Jesusaves <cpntb1@ymail.com> | 2024-07-27 20:36:50 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2024-07-27 20:36:50 -0300 |
| commit | 2fa9b5054bf26b79b158a1dd89517559929fae37 (patch) | |
| tree | ed708330325cd7c3357ceef1fd741c5407fbfd84 | |
| parent | 22c20a9763dc60d73990ac2e99e45c31c9677cc4 (diff) | |
| download | serverdata-2fa9b5054bf26b79b158a1dd89517559929fae37.tar.gz serverdata-2fa9b5054bf26b79b158a1dd89517559929fae37.tar.bz2 serverdata-2fa9b5054bf26b79b158a1dd89517559929fae37.tar.xz serverdata-2fa9b5054bf26b79b158a1dd89517559929fae37.zip | |
031-4 Aethyr Casino
| -rw-r--r-- | maps/re/029-8.mcache | bin | 5338 -> 5315 bytes | |||
| -rw-r--r-- | maps/re/031-4.mcache | bin | 100 -> 107 bytes | |||
| -rw-r--r-- | npc/003-1/aahna.txt | 36 | ||||
| -rw-r--r-- | npc/031-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/031-4/_import.txt | 1 | ||||
| -rw-r--r-- | npc/031-4/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/commands/kami.txt | 12 |
7 files changed, 50 insertions, 3 deletions
diff --git a/maps/re/029-8.mcache b/maps/re/029-8.mcache Binary files differindex 37f24b1fa..8d6481523 100644 --- a/maps/re/029-8.mcache +++ b/maps/re/029-8.mcache diff --git a/maps/re/031-4.mcache b/maps/re/031-4.mcache Binary files differindex aa367045c..a6a3d0e2e 100644 --- a/maps/re/031-4.mcache +++ b/maps/re/031-4.mcache diff --git a/npc/003-1/aahna.txt b/npc/003-1/aahna.txt index ea642f3ec..b045ebfca 100644 --- a/npc/003-1/aahna.txt +++ b/npc/003-1/aahna.txt @@ -8,6 +8,7 @@ // TODO: During rainy days, she could ask for an Umbrella 003-1,53,128,0 script Aahna NPC_ELVEN_FEMALE,{ + if (is_admin()) goto L_HDebug; mesn; // Comment on the current weather .@mk = getmapmask("003-1"); @@ -31,6 +32,41 @@ OnInit: .distance = 5; end; +L_HDebug: + if (!gethominfo(0)) { + mesc l("You do not own an Homunculus."), 1; + close; + } + if (homstatus()) { + mesc l("Homunculus is busy."), 1; + close; + } + mesn; + mesq l("Oh, what lovely Lv %d Type %d Homunculus \"%s\" you have here! I see it's loyalty is %d, too!", gethominfo(6), gethominfo(1), gethominfo(2), gethominfo(3)); + if (!gethominfo(5)) + mesc l("Although I must say you must be too lazy if you haven't even gave it a name yet!"); + next; + mesn; + mesq l("Do you want me to change its class or level? Free of charge for debug purposes."); + next; + select + l("Change to [Elli]"), + l("Change to [Piou]"), + l("Set level to 30"), + l("Reset level to 3"), + l("Add +100 intimacy"); + switch (@menu) { + case 1: debugmes sethomunclass(6010); break; + case 2: debugmes sethomunclass(6006); break; + case 3: sethomunlevel(30); break; + case 4: sethomunlevel(3); break; + case 5: atcommand("@homfriendly "+(gethominfo(3)/100+100)); break; + } + atcommand("@refresh"); + atcommand("@hominfo"); + next; + goto L_HDebug; + // Server Happy Hour // Used to be Sunday 18:00~20:00 // Then it is Sunday 16:00~20:00 diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt index 816af5326..dccbefe51 100644 --- a/npc/031-1/_warps.txt +++ b/npc/031-1/_warps.txt @@ -7,3 +7,4 @@ 031-1,84,58,0 warp #031-1_84_58 0,0,031-5,95,48 031-1,74,85,0 warp #031-1_74_85 0,0,031-2,74,88 031-1,92,73,0 warp #031-1_92_73 0,0,031-3,38,64 +031-1,92,86,0 warp #031-1_92_86 0,0,031-4,91,89 diff --git a/npc/031-4/_import.txt b/npc/031-4/_import.txt index dd3355e93..16d63bfb5 100644 --- a/npc/031-4/_import.txt +++ b/npc/031-4/_import.txt @@ -1,2 +1,3 @@ // Map 031-4: Aethyr Indoors // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/031-4/_warps.txt", diff --git a/npc/031-4/_warps.txt b/npc/031-4/_warps.txt new file mode 100644 index 000000000..399e582da --- /dev/null +++ b/npc/031-4/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 031-4: Aethyr Indoors warps +031-4,91,90,0 warp #031-4_91_90 1,0,031-1,92,88 diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt index ff1fb623e..0dc808bb3 100644 --- a/npc/commands/kami.txt +++ b/npc/commands/kami.txt @@ -69,9 +69,7 @@ OnPurify: end; OnHarm: - //harm(getcharid(3), 500, HARM_PHYS); - .@hp = getunitdata(gethomunid(), UDT_MAXHP) - 1; - harm(gethomunid(), .@hp, HARM_MISC); + harm(getcharid(3), 500, HARM_PHYS); end; OnHarm2: @@ -106,6 +104,13 @@ OnLagDebug: //debugmes getmapinfo(MAPINFO_ID, "032-1"); end; +OnHSwap: + .@request = implode(.@atcmd_parameters$, " "); + if (.@request != 0) + debugmes sethomunclass(.@request); + atcommand("@refresh"); + end; + OnInit: bindatcmd "k", "@k::OnCall", 60, 80, 1; bindatcmd "servmsg", "@k::OnServMsg", 80, 99, 1; @@ -117,6 +122,7 @@ OnInit: bindatcmd "instcheck", "@k::OnInstCheck", 99, 100, 1; bindatcmd "instdestr", "@k::OnInstDestroy", 99, 100, 1; bindatcmd "burnlivio", "@k::OnPurify", 99, 100, 1; + bindatcmd "hswap", "@k::OnHSwap", 80, 80, 1; end; } |