summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-03 04:30:20 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-03 04:30:20 +0000
commit2875015cd6264e6e65f39bd805eef0f913eaebac (patch)
tree485493488bd2ad978014f1648fc82db8388bba41
parentef08f4141b514acd0a78af87efe7eabe700571d1 (diff)
downloadhercules-2875015cd6264e6e65f39bd805eef0f913eaebac.tar.gz
hercules-2875015cd6264e6e65f39bd805eef0f913eaebac.tar.bz2
hercules-2875015cd6264e6e65f39bd805eef0f913eaebac.tar.xz
hercules-2875015cd6264e6e65f39bd805eef0f913eaebac.zip
* Removed the obfuscation of the #kafra_code password. (bugreport:2323)
TODO: add a 'md5()' script command and use that instead. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13719 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/custom/eAAC_Scripts/quest_warper.txt9
-rw-r--r--npc/kafras/functions_kafras.txt12
-rw-r--r--sql-files/upgrade_svn13719.sql1
4 files changed, 15 insertions, 12 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 679b7d650..d8896b953 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,11 @@
Date Added
======
+2009/05/03
+ * Removed the obfuscation of the #kafra_code password, following ultramage's suggestion. [brianluau]
2009/05/02
+ - Changed a misleading message in the custom Job Changer. (bugreport:682) [brianluau]
+ - Updated some NPC's facing directions. (bugreport:3030)
+ - Fixed a grammar typo in the Assassin skill quest.
* Applied timexy's pvp warp name fix (bugreport:2938) [Playtester]
2009/04/30
* Fixed various typos in the Moscovia quests thanks to Ihades (bugreport:3036) [Playtester]
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index c61b46417..7ff06cd2e 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -4,14 +4,11 @@
//= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
//= Huge Rewrite by Neouni
//===== Current Version: ==========================================
-//= 2.1
+//= 2.2
//===== Compatible With: ==========================================
//= Any eAthena Version
//===== Description: ==============================================
//= Warper that works only after locations are unlocked
-//===== Warning: ==================================================
-// you have to set the securitycode value [1337] the same as in
-// functions_kafras.txt if you changed it !!
//===== Additional Comments: ======================================
//= 1.0 - NPCs created
//= 1.1 - Add Dungeons by sturm
@@ -73,6 +70,7 @@
//-2.0b
// - Special warpname menu option name bug fixed
//-2.1 Updated names to fall within retrictions. [L0ne_W0lf]
+//-2.2 #kafra_code is now stored as is. [brianluau]
//=================================================================
//========================Function=&=Script========================
@@ -599,12 +597,11 @@ L_Storage:
end;
F_CheckKafCode:
-// you have to set the 1337 value the same as in functions_kafras.txt if you changed it !!
if(#kafra_code==0) return;
mes "Enter your storage password:";
set @code_,0;
input @code_;
- if(@code_ != #kafra_code-getcharid(3)-1337) {
+ if(@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
close;
}
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 2e7963588..4b65bbc9a 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -5,7 +5,7 @@
//= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 6.2
+//= 6.3
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -33,7 +33,6 @@
//= 3.2 Fixed an exploit [Lupus]
//= 4.0 Added Kafra storage password protection. [Lupus]
//= to block Kafra Password, read comments at 350 line
-//= Note: You can change '1337' value to another to raise password protection
//= 5.0 Fixed the close2;....close; end; lines. Who let them slip away? =/ [erKURITA]
//= Also, the kafra upon warp was giving back the zeny. Removed. [erKURITA]
//= 5.1 Optimized a little, added no tele/save arg's [Evera]
@@ -58,6 +57,7 @@
//= Added 2 args into F_SetKafCode to fit it in Cool Evnt Co. NPC [Lupus]
//= 6.1 Added menu for Turbo Track Kafra Staff. [L0ne_W0lf]
//= 6.2 Updated/Fixed warp cords. [Kisuka]
+//= 6.3 #kafra_code is now stored as is. [brianluau]
//============================================================
@@ -561,7 +561,7 @@ function script F_CheckKafCode {
mes "Enter your storage password:";
set @code_,0;
input @code_;
- if(@code_ != #kafra_code-getcharid(3)-1337) {
+ if(@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
close2;
cutin "",255;
@@ -593,7 +593,7 @@ function script F_SetKafCode {
mes getarg(0);
mes "At first, please enter your ^0000FFold password^000000.";
set @code,callfunc("F_EntKafCode");
- if(@code==0 || @code != #kafra_code-getcharid(3)-1337) {
+ if(@code==0 || @code != #kafra_code) {
mes "Wrong password. You can't set a new password.";
emotion e_hmm;
goto M_END;
@@ -615,7 +615,7 @@ M_SET:
set Zeny,Zeny-5000;
//set RESRVPTS, RESRVPTS + (5000/50); //hardcoded password doesn't add pts
- set #kafra_code,@code+getcharid(3)+1337;
+ set #kafra_code,@code;
mes "You've protected your storage with a secret password.";
mes "Thank you for using "+getarg(1)+".";
emotion e_thx;
@@ -635,7 +635,7 @@ M_CLEAR:
if(Zeny < 1000) goto L_ZENY;
set Zeny,Zeny-1000;
//set RESRVPTS, RESRVPTS + (1000/50); //hardcoded password doesn't add pts
- if(@code == #kafra_code-getcharid(3)-1337) {
+ if(@code == #kafra_code) {
set #kafra_code,0;
mes "You've successfully cleared your storage password.";
mes "Thank you for using "+getarg(1)+".";
diff --git a/sql-files/upgrade_svn13719.sql b/sql-files/upgrade_svn13719.sql
new file mode 100644
index 000000000..5039ece6c
--- /dev/null
+++ b/sql-files/upgrade_svn13719.sql
@@ -0,0 +1 @@
+UPDATE `global_reg_value` SET `value` = (`value` - `account_id` - 1337) WHERE `str` = '#kafra_code';