summaryrefslogtreecommitdiff
path: root/npc/custom/etc
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-09-18 13:09:16 +0200
committerHaru <haru@dotalux.com>2015-09-25 12:55:36 +0200
commit1aea178ef7cdb76eda5600540b5fbd29fd54ff88 (patch)
tree855d4feafba212d7f36872c1b46814c1f1a85e75 /npc/custom/etc
parente99bf73af31a8b1f09b9ce033c16832ee5cac51d (diff)
downloadhercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.gz
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.bz2
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.tar.xz
hercules-1aea178ef7cdb76eda5600540b5fbd29fd54ff88.zip
More aggressive whitespace cleanup. Follow up to 51329e6
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/custom/etc')
-rw-r--r--npc/custom/etc/floating_rates.txt2
-rw-r--r--npc/custom/etc/marriage.txt38
-rw-r--r--npc/custom/etc/monster_arena.txt4
-rw-r--r--npc/custom/etc/penal_servitude.txt3
-rw-r--r--npc/custom/etc/quest_warper.txt21
-rw-r--r--npc/custom/etc/stock_market.txt3
6 files changed, 31 insertions, 40 deletions
diff --git a/npc/custom/etc/floating_rates.txt b/npc/custom/etc/floating_rates.txt
index ff3b6e8fa..c207c6275 100644
--- a/npc/custom/etc/floating_rates.txt
+++ b/npc/custom/etc/floating_rates.txt
@@ -35,7 +35,7 @@ OnHour18:
setbattleflag("item_rate_equip",$@drate);
//we don't change card drops rate, because these values won't change them anyway
atcommand "@reloadmobdb";
-
+
announce "Current Rune-Midgard rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060;
end;
}
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 0d25be9d5..ab1b48c30 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -65,7 +65,7 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{
function SF_RetrieveRingF;
function SF_RingsAccepted;
function SF_StartCeremony;
-
+
if (getpartnerid() > 0) {
mes "["+@name$+"]";
mes "You have my blessings, have a wonderful married life.";
@@ -81,7 +81,7 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{
mes "to prepare for marriage";
close;
} // End official iRO dialog
-
+
if (strcharinfo(0) == $wed_groom$) {
SF_Groom();
end;
@@ -278,7 +278,7 @@ function SF_RetrieveRingM {
mes "Here's the wedding ring for your bride.";
if ($@wed_ring) delitem $@wed_ring,1;
set $wed_groom_progress,4;
-
+
if ($wed_bride_progress == 4)
SF_StartCeremony();
else {
@@ -336,7 +336,7 @@ function SF_StartCeremony {
OnTimer1000:
npctalk "Ladies and Gentlemen, We will now join in holy matrimony these two lovers.";
end;
-
+
OnTimer5000:
npctalk "Now more than ever, will both of your lives be entwined together as so will be your souls.";
end;
@@ -344,31 +344,31 @@ OnTimer5000:
OnTimer10000:
npctalk "You will both honor and cherish each other through the best and worst of times.";
end;
-
+
OnTimer15000:
npctalk "The safety and well being of your other will now also be your responsibility.";
end;
-
+
OnTimer20000:
npctalk "May in sickness or good health, your love burn bright like no force can extinguish it.";
end;
-
+
OnTimer25000:
npctalk "Those here stand witness to these vows bestowed upon you, you must act accordingly to them.";
end;
-
+
OnTimer30000:
npctalk "Understanding that, we are nothing more but mortals on this earth, but this is our triumph.";
end;
-
+
OnTimer35000:
npctalk "We here will now join these two mortal entities, and create an immortal love.";
end;
-
+
OnTimer40000:
npctalk $wed_groom$+", you have accepted to take "+$wed_bride$+" as your lawfully wedded wife,";
end;
-
+
OnTimer45000:
npctalk "and you, "+$wed_bride$+", have accepted take "+$wed_groom$+" as your lawfully wedded husband.";
end;
@@ -440,7 +440,7 @@ prt_church,106,99,3 script Happy Marry 1_F_02,{
mes "Isn't marriage beautiful?";
close;
}
-
+
function SF_WedProgress;
function SF_Principles;
function SF_Procedure;
@@ -451,7 +451,7 @@ prt_church,106,99,3 script Happy Marry 1_F_02,{
SF_WedProgress();
end;
}
-
+
do {
mes "["+@name$+"]";
mes "Marriage... is such a beautiful thing.";
@@ -529,7 +529,7 @@ function SF_Register {
close;
}
}
-
+
function SF_WedProgress {
if (strcharinfo(0) == $wed_groom$) {
mes "["+@name$+"]";
@@ -658,7 +658,7 @@ OnTimer60000:
npctalk "Registration timed out. Is it that noone wants to marry "+$@msg$+"..?";
emotion e_hmm;
-
+
set $wed_groom$,"";
set $wed_groom_sex, 0;
set $wed_bride$,"";
@@ -675,7 +675,7 @@ function SF_TryRegister {
set @type$, "groom";
if (@bride)
set @type$, "bride";
-
+
mes "["+@name$+"]";
mes "Before registering as "+@type$+", let me check if you meet all the requirements...";
next;
@@ -689,7 +689,7 @@ function SF_TryRegister {
set @item, 7170;
else
set @item, 2338;
-
+
if (getequipid(2) != @item) {
mes "["+@name$+"]";
mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
@@ -814,12 +814,12 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
function SF_DivorceEnd;
function SF_InProgress;
-
+
if ($@divorce_progress==1) {
goto SF_InProgress;
end;
}
-
+
do {
mes "["+@name$+"]";
mes "Divorcing can be such a sad event...";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 82f764977..9c00b67a5 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -195,7 +195,6 @@ L_Exit:
}
gon_test,56,91,6 duplicate(monsterreferee) Referee#01 1_M_PUBMASTER
-
// Usher //
gon_test,58,94,6 script Usher 4_M_04,{
set @marena,1;
@@ -332,7 +331,6 @@ L_Sell:
mes "You earned ^0000FF" + @sellearn + "^000000z.";
close;
-
L_NoExp:
mes "[Monster Trainer]";
mes "You do not have enough experience.";
@@ -761,8 +759,6 @@ OnTouch:
gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 HIDDEN_NPC,2,2
gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 HIDDEN_NPC,2,2
-
-
// Skill Disabler //
gon_test mapflag noskill
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index b83bf3f83..30aaf17e2 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -134,7 +134,7 @@ sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{
delitem 4009,countitem(4009);//Items: Chonchon_Card,
delitem 4022,countitem(4022);//Items: Spore_Card,
delitem 4048,countitem(4048);//Items: Poison_Spore_Card,
-
+
if (PRISON_Q <= 0 ) goto L_GET_Q;
mes "I want you to gather ^FF0000"+PRISON_Q+" Orange Net Mushroom^000000.";
@@ -170,7 +170,6 @@ L_GET_Q:
close;
}
-
sec_in02 mapflag nomemo
sec_in02 mapflag nosave SavePoint
sec_in02 mapflag noteleport
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 3526cde5c..fd6865a54 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -71,10 +71,10 @@ function script Q_Warpra {
mes "Hello,";
mes "I can warp you to any town or dungeon, but you need to unlock them first by visiting us.";
mes "What do you need?";
-
+
if(getarg(0) == 0) callfunc "QWS_MMarray",0;
if(getarg(0) == 1) callfunc "QWS_MMarray",1;
-
+
set @MMenu,select(@Mmenulist$[0],@Mmenulist$[1],@Mmenulist$[2],@Mmenulist$[3],@Mmenulist$[4],@Mmenulist$[5],@Mmenulist$[6],@Mmenulist$[7],@Mmenulist$[8],@Mmenulist$[9],@Mmenulist$[10],@Mmenulist$[11]);
switch(@Mmenuref[@MMenu-1]+1){
@@ -167,7 +167,7 @@ Setprice:
if (!$QW_S_PRICE) mes "Storage = ^FF0000 Free ^000000";
if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
mes "Guild Storage = "+(($QW_GS_PRICE)?"^00FF00"+$QW_GS_PRICE:"^FF0000Free")+"^000000";
-
+
switch(select("Basic - Warps","Advanced - Warps","Overseas - Warps","Basic Dungeon warp fee","Advanced Dungeon warp fee","Overseas Dungeon warp fee","Full Healing","Part Healing","Storage","Guild Storage","Back","Exit")) {
case 1:
next;
@@ -388,7 +388,7 @@ L_heal_Part:
if (@healchoice == 2) callsub PHeal,1,0;
if (@healchoice == 3) callsub PHeal,0,1;
goto L_End;
-
+
PHeal:
next;
set @Hp, MaxHp-Hp;
@@ -499,7 +499,7 @@ L_GStorage:
close2;
guildopenstorage;
end;
-
+
L_End:
close;
end;
@@ -523,7 +523,7 @@ L_NoUnlock:
mes "I don't unlock this location, my assistant deeper in the dungeon will unlock this place.";
close;
end;
-
+
//=========================Short=On=Zeny===========================
L_Short_on_zeny:
next;
@@ -536,7 +536,7 @@ L_Short_on_zeny:
}
close;
end;
-
+
//===========================Stamp=Card============================
stampcard:
// Counting of the ammount of places you have unlocked
@@ -978,7 +978,6 @@ function script QWS_Tarray {
set @Tmenuref[@Tj],57005; // 57005='dead' in hex
return;
-
//----------------Make Town Menu Function
function QWS_Make_Town_Menu {
@@ -1450,7 +1449,6 @@ function script QWS_Darray {
set @Dmenuref[@Dj],57005; // 57005='dead' in hex
return;
-
//----------------Make Dungeon Menu Function
function QWS_Make_Dungeon_Menu {
@@ -1525,7 +1523,7 @@ function script QWS_DLarray {
function script QWS_Dungeon_Warpra {
function QWS_D_getbin;
function QWS_D_setbin;
-
+
if ((QWS_D_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
mes "[Warpra]";
mes getarg(1)+" unlocked!";
@@ -1538,7 +1536,6 @@ function script QWS_Dungeon_Warpra {
debugmes "QWS_Dungeon_Warpra error, improper syntax?";
return;
-
function QWS_D_setbin {
set @tempsetbindata,1;
if (getarg(0) == 0) goto binset;
@@ -1571,7 +1568,7 @@ binget:
function script QWS_Town_Warpra {
function QWS_T_getbin;
function QWS_T_setbin;
-
+
if ((QWS_T_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
mes "[Warpra]";
mes getarg(1)+" unlocked!";
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 060228317..078ce5137 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -431,7 +431,7 @@ S_Buy:
mes $S10N$;
next;
menu "Continue",-,"Cancel",S_Start;
-
+
mes "Enter the name of the share company";
mes "Transaction fee of ^FF0000" + $S_Trans + "z^000000 will apply.";
set @buyname$,"0";
@@ -645,7 +645,6 @@ ACCS11:
next;
goto S_Start;
-
// GM MENU //
GM_Menu:
mes "[Stock Market]";