summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-29 03:33:58 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-29 03:33:58 +0000
commit2b98ec2f544e58ea9a6522923590ed9aa0053f50 (patch)
tree2d7631c578a0d7443fe0d13fccfb25e6c0abb1d2
parent21b797be5ca7c64dd40f1cb250e9d692f6a56c8f (diff)
downloadhercules-2b98ec2f544e58ea9a6522923590ed9aa0053f50.tar.gz
hercules-2b98ec2f544e58ea9a6522923590ed9aa0053f50.tar.bz2
hercules-2b98ec2f544e58ea9a6522923590ed9aa0053f50.tar.xz
hercules-2b98ec2f544e58ea9a6522923590ed9aa0053f50.zip
updated penal servitude, nguild warper
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7385 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt9
-rw-r--r--npc/custom/penal_servitude.txt24
-rw-r--r--npc/guild/nguild/nguild_warper.txt8
3 files changed, 30 insertions, 11 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 60374c1f9..aefa1bcb0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -4,7 +4,6 @@ Lupus
* Looking for exploits, optimization, bugs hunt
* Adding new cards, checking/adding mobs/items
* EXP quests for Blacksmith, Merchant, Alchemist
- * Vassakh Ghoul global quest (custom) ^_-
Mass Zero
* Fixing grammatical errors.
* Fixing small bugs.
@@ -22,20 +21,26 @@ MasterOfMuppets
* Updating Items / Scripts
Nexon
* Adding in the new Abyss/Thanatos/Lighthalzen NPC's and optimizing them.
+erKURITA
+ * Warps maintainment
Evera
* Everything.
* Dungeon Teleport System NPCs
* iRO information gathering.
* Kafra maintainment.
-
Musashiden
*Scripting iRO latest towns (warps, NPCs, ect.)
*iRO information gathering.
+Playtester
+ * Monsters spawn, warps maintainment
== Changelog ==
Date Added
======
+06/29
+ * Stricted up penal servitude conditions [Lupus]
+ - Restricted Novices Castles entrance of TK/Highs to 80 BaseLevel
06/28
* Updated yuno_fild03 spawns [Playtester]
06/27
diff --git a/npc/custom/penal_servitude.txt b/npc/custom/penal_servitude.txt
index 343e9d983..75ae8f726 100644
--- a/npc/custom/penal_servitude.txt
+++ b/npc/custom/penal_servitude.txt
@@ -3,7 +3,7 @@
//===== By ================================================
//= Lupus
//===== Version ===========================================
-//= 1.1
+//= 1.2
//===== Compatible With ===================================
//= eAthena Final (SVN)
//===== Description =======================================
@@ -13,13 +13,17 @@
// This script uses CHEQUES of the 2nd KAFRA_BANK.TXT
// var PRISON - it counts number of your imprisonments.
// 1.1 English translation
+// 1.2 Stricted the conditions a bit
//=========================================================
sec_pri.gat,36,58,1 script Chief Warder 105,{
mes "[Saddeus]";
emotion 1;
- if (sex) mes "Mr. Prisoner #"+BaseLevel+JobLevel+",";
- if (!sex) mes "Ms. Prisoner #"+BaseLevel+JobLevel+",";
+ if(sex) {
+ mes "Mr. Prisoner #"+BaseLevel+JobLevel+",";
+ } else {
+ mes "Ms. Prisoner #"+BaseLevel+JobLevel+",";
+ }
mes "what's the noise over there?";
next;
menu "Let me free, I'll pay!",-, "Let me to work off my freedom!",M_Q1, "Nothing",M_NO_THANKS;
@@ -66,7 +70,7 @@ L_NOBANK:
close;
L_RELEASE:
- set PRISON,PRISON+1; //�E�����E�E�E���E...
+ set PRISON,PRISON+1;
next;
mes "[Saddeus]";
mes "You are free now!";
@@ -83,6 +87,11 @@ M_Q1:
menu "OK, I'll work off!",-, "I love this prison!",M_NO_THANKS;
mes "[Saddeus]";
+ if(checkcart(0) || checkfalcon(0) || checkriding(0)){
+ emotion e_hmm;
+ mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!";
+ close;
+ }
mes "Talk to our overseer, Oliver.";
next;
@@ -148,7 +157,7 @@ sec_in02.gat,137,57,1 script Overseer 708,{
close;
L_GET_Q:
- set PRISON,PRISON+1; //�E�����E�E�E���E...
+ set PRISON,PRISON+1;
if (PRISON > 1) mes "Hmm... You've been here already... Well-well...";
if ( countitem(1069) || countitem(1070) ) mes "Drop these mushrooms!! They are poisonous!";//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
@@ -170,8 +179,11 @@ sec_in02.gat mapflag nosave SavePoint
sec_in02.gat mapflag noteleport
sec_in02.gat mapflag nobranch
sec_in02.gat mapflag nowarp
+sec_in02.gat mapflag nowarpto
+sec_in02.gat mapflag noexp
+sec_in02.gat mapflag noskill
//sec_in02.gat mapflag pvp
-sec_in02.gat mapflag pvp_noparty
+//sec_in02.gat mapflag pvp_noparty
//sec_in02.gat mapflag gvg
sec_in02.gat mapflag pvp_nightmaredrop random,all,300
diff --git a/npc/guild/nguild/nguild_warper.txt b/npc/guild/nguild/nguild_warper.txt
index 0c6c5b41a..e39f62d3d 100644
--- a/npc/guild/nguild/nguild_warper.txt
+++ b/npc/guild/nguild/nguild_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 1+; RO Episode 4+
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= unallowed buffs [Lupus]
//= 1.3 Restricted TK,High classes >=90 BaseLevel,
//= updated list of unallowed buffs [Lupus]
+//= 1.4 Restricted it to 80 Base Level [Lupus]
//============================================================
@@ -28,13 +29,14 @@ prontera.gat,146,163,6 script Novice Castles 729,{
mes "Hey! I'm a new usher of Novice Castles.";
next;
if( (Class>=Job_Novice && Class<=Job_Thief)
- || (Class==Job_Taekwon && BaseLevel<90) || Class==Job_SuperNovice || Class==Job_Super_Baby
+ || (Class==Job_Taekwon && BaseLevel<80) || Class==Job_SuperNovice || Class==Job_Super_Baby
|| (Class>=Job_Baby && Class<=Job_Baby_Thief)
- || (Class>=Job_Novice_High && Class<=Job_Thief_High && BaseLevel<90)
+ || (Class>=Job_Novice_High && Class<=Job_Thief_High && BaseLevel<80)
) menu "Warp me to Novice Castles",M_WARP,"Cancel",-;
mes "[Cita]";
mes "All the 2nd classes aren't allowed to enter the sacred Novice Castles place.";
+ mes "As well as Teakwons and High Classes from 80 Base Level.";
emotion 0;
close;