summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/Global_Functions.txt55
-rw-r--r--npc/other/arena/arena_aco.txt7
-rw-r--r--npc/other/arena/arena_party.txt5
3 files changed, 61 insertions, 6 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 37a3c556c..cd18b3a22 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus, kobra_k88
//===== Current Version: =====================================
-//= 2.15
+//= 2.16
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -38,6 +38,7 @@
//= 2.13 Added more unused vars to F_ClearGarbage [Lupus]
//= 2.14 Added old novice variables to F_ClearGarbage. [L0ne_W0lf]
//= 2.15 Added no unused DTS variables to F_ClearGarbage. [L0ne_W0lf]
+//= 2.6 Added F_GetWeaponType, and F_GetArmorType. [L0ne_W0lf]
//============================================================
@@ -257,3 +258,55 @@ function script F_Load2Skills {
set ADV_QSK2,0; //Clear var
return;
}
+
+//////////////////////////////////////////////////////////////////////////////////
+// *** Function "F_GetWeaponType": Determine weapon type by view
+//////////////////////////////////////////////////////////////////////////////////
+function script F_GetWeaponType {
+ switch(getiteminfo(getarg(0),11)) {
+ case 1: return "Dagger"; break;
+ case 2: return "One-handed Sword"; break;
+ case 3: return "Two-handed Sword"; break;
+ case 4: return "One-handed Spear"; break;
+ case 5: return "Two-handed Spear"; break;
+ case 6: return "One-handed Axe"; break;
+ case 7: return "Two-handed Axe"; break;
+ case 8: return "Mace"; break;
+ //case 9: return "Unused"; break;
+ case 10: return "Staff"; break;
+ case 11: return "Bow"; break;
+ case 12: return "Knuckle"; break;
+ case 13: return "Instrument"; break;
+ case 14: return "Whip"; break;
+ case 15: return "Book"; break;
+ case 16: return "Katar"; break;
+ case 17: return "Revolver"; break;
+ case 18: return "Rifle"; break;
+ case 19: return "Gatling gun"; break;
+ case 20: return "Shotgun"; break;
+ case 21: return "Grenade Launcher"; break;
+ case 22: return "Shuriken"; break;
+ default: return "Unable to Determine Equip Type"; break;
+ }
+ end;
+}
+
+//////////////////////////////////////////////////////////////////////////////////
+// *** Function "F_GetArmorType": Determine equipment type by equip location
+//////////////////////////////////////////////////////////////////////////////////
+function script F_GetArmorType {
+ switch(getiteminfo(getarg(0),5)) {
+ case 001: return "Lower Headgear"; break;
+ case 2: return "Weapon"; break;
+ case 4: return "Garment"; break;
+ case 8: return "Accessory"; break;
+ case 16: return "Armor"; break;
+ case 32: return "Shield"; break;
+ case 64: return "Shoes"; break;
+ case 128: return "Accessory"; break;
+ case 256: return "Upper Headgear"; break;
+ case 512: return "Middle Headgear"; break;
+ default: return "Unable to Determine Equip Location"; break;
+ }
+ end;
+}
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index fe407b07c..4a81bd6b3 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Izlude Acolyte Battle Arena
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Corrected variable typos. (bugreport:4374) [L0ne_w0lf]
//============================================================
arena_room,114,102,0 script onlyaco#arena 45,1,1,{
@@ -1257,7 +1258,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "under the Time Force Battle";
mes "Arena - Acolyte Class Record!";
if (basejob == job_acolyte) {
- set $@arn_acotop,.@record_timeaco;
+ set $arn_acotop,.@record_timeaco;
set $arn_acotopn$, strcharinfo(0);
donpcevent "Vendigos::Onlinerec_aco";
}
@@ -1416,7 +1417,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "Acolyte Class Records.";
mes "Congratulations~";
if (basejob == job_acolyte) {
- set $@arn_acotop,.@record_timeaco;
+ set $arn_acotop,.@record_timeaco;
set $arn_acotopn$, strcharinfo(0);
donpcevent "#Vendigos::Onlinerec_aco";
}
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index ae92de3c5..b163a528d 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.0a Fixed a typo.
//= 1.1 Replaced effect numerics with constants. [Samuray22]
//= 1.2 Fixed "OnMobDeath" doesn't work sometime. [Inkfish]
+//= 1.3 Corrected donpcevent typo. (bugreport:4374) [L0ne_w0lf]
//============================================================
arena_room,162,88,3 script Ponox 124,{
@@ -27,7 +28,7 @@ OnStartArena:
donpcevent "toarena#party::OnInit";
donpcevent "toout#party::OnInit";
warpwaitingpc "prt_are_in",73,78;
- donpcevent "toout#party::OnTime";
+ donpcevent "toout#party::OnTimer";
donpcevent "Helper#party::OnEnter";
disablewaitingroomevent;
end;