summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-27 18:45:08 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-27 18:45:08 +0000
commit831b2af00700f9a957c46393d3cf476460f4ae0f (patch)
tree826dc2c632f8c0dd68de76cfd79f2016b9b51013 /npc
parent0c383f7dceb08793b79a7307351af2eaf55ba104 (diff)
downloadhercules-831b2af00700f9a957c46393d3cf476460f4ae0f.tar.gz
hercules-831b2af00700f9a957c46393d3cf476460f4ae0f.tar.bz2
hercules-831b2af00700f9a957c46393d3cf476460f4ae0f.tar.xz
hercules-831b2af00700f9a957c46393d3cf476460f4ae0f.zip
* Updated custom Stylist with 'getbattleflag', so no user configuration is required, credits to Saithis (custom\stylist.txt)
* Replaced effect numerics with constants in Ex. Super Novice script (re\jobs\novice\supernovice_ex.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16511 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/stylist.txt7
-rw-r--r--npc/re/jobs/novice/supernovice_ex.txt11
2 files changed, 10 insertions, 8 deletions
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 73c20a206..fa552ce6d 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -3,17 +3,18 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Changes your hair style, hair color, and cloth color.
+//===== Additional Comments: =================================
+//= 1.1 Switched to 'getbattleflag', credits to Saithis. [Euphy]
//============================================================
prontera,170,180,1 script Stylist#custom_stylist 122,{
- setarray .@Styles[1],553,37,250; // Maximum dye, hair style, and hair color
-
+ setarray .@Styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
setarray .@Look[1],7,1,6;
set .@s, select(" ~ Cloth color: ~ Hairstyle: ~ Hair color");
set .@Revert, getlook(.@Look[.@s]); set .@Style,1;
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index bfbacc05d..3abf8a669 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
-//= 1.1
+//= 1.1a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,6 +12,7 @@
//= 1.0 All dialogue is custom, contains some incorrect behaviors.
//= 1.1 Switched to a translated copy of the official script
//= by Gennosuke Kouga, but vastly edited its content. [Euphy]
+//= 1.1a Replaced effect numerics with constants. [Euphy]
//============================================================
function script Esseray_Ex {
@@ -466,9 +467,9 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "I can't make you stronger until you use those points.";
close;
}
- specialeffect2 90;
- specialeffect2 62;
- specialeffect2 89;
+ specialeffect2 EF_LORD;
+ specialeffect2 EF_SIGHTRASHER;
+ specialeffect2 EF_STORMGUST;
erasequest 5100;
mes "[Nodor]";
mes "Haha ------------- !!";
@@ -568,7 +569,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
mes "[Nodor]";
mes "Now I am going to say greetings again.";
next;
- specialeffect2 78;
+ specialeffect2 EF_RECOVERY;
mes "[Nodor]";
mes "Let Super Novice "+strcharinfo(0)+" be blessed with the Super Novice Guardian!";
set EXSUPNOV_Q,6;