From 37c603ec06e864e0daff41ac5fe67fc005561d70 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 4 May 2009 12:29:54 +0000
Subject: Reverted the "The md5() of their kafra code is now stored in
#kafra_code$" change from r13728. Added md5calc to vs8/vs7/vs6 project files.
Applied svn:eol-style to the new sql upgrade file.
Note that if you already applied the sql upgrade, your kafra passwords are lost.
Also note that txt users will still have to implement their own migration code into the kafra scripts since it was omitted in the previous commits.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13729 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
npc/Changelog.txt | 1 -
npc/custom/eAAC_Scripts/quest_warper.txt | 5 ++---
npc/kafras/functions_kafras.txt | 15 +++++++--------
3 files changed, 9 insertions(+), 12 deletions(-)
(limited to 'npc')
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b79a4ee6b..0bd383e2e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,7 +1,6 @@
Date Added
======
2009/05/04
- - The md5 checksum of the kafra code is now stored in #kafra_code$ [brianluau]
- Added a missing zeny check in the Jawaii Bartender. (bugreport:2897) [brianluau]
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873)
2009/05/03
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index 650ee3a6e..7ff06cd2e 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -71,7 +71,6 @@
// - 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]
-//-2.2b The md5() of their kafra code is now stored in #kafra_code$ [brianluau]
//=================================================================
//========================Function=&=Script========================
@@ -598,11 +597,11 @@ L_Storage:
end;
F_CheckKafCode:
- if(#kafra_code$=="") return;
+ if(#kafra_code==0) return;
mes "Enter your storage password:";
set @code_,0;
input @code_;
- if(md5(@code_) != #kafra_code$) {
+ if(@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
close;
}
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 56382a31f..4b65bbc9a 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -58,7 +58,6 @@
//= 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]
-//= 6.3b The md5() of their kafra code is now stored in #kafra_code$ [brianluau]
//============================================================
@@ -558,11 +557,11 @@ function script F_KafEnd {
// Check Storage Password Function ====================
function script F_CheckKafCode {
- if(#kafra_code$=="") return;
+ if(#kafra_code==0) return;
mes "Enter your storage password:";
set @code_,0;
input @code_;
- if(md5(@code_) != #kafra_code$) {
+ if(@code_ != #kafra_code) {
dispbottom "Wrong storage password.";
close2;
cutin "",255;
@@ -577,7 +576,7 @@ function script F_CheckKafCode {
// getarg(0) = NPC Name, getarg(1) = Company Name
function script F_SetKafCode {
mes getarg(0);
- if(#kafra_code$) {
+ if(#kafra_code) {
mes "Your storage is protected with a password. What would you do now?";
next;
menu "Change old password -> 5000z",-,
@@ -594,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 || md5(@code) != #kafra_code$) {
+ if(@code==0 || @code != #kafra_code) {
mes "Wrong password. You can't set a new password.";
emotion e_hmm;
goto M_END;
@@ -616,7 +615,7 @@ M_SET:
set Zeny,Zeny-5000;
//set RESRVPTS, RESRVPTS + (5000/50); //hardcoded password doesn't add pts
- set #kafra_code$,md5(@code);
+ set #kafra_code,@code;
mes "You've protected your storage with a secret password.";
mes "Thank you for using "+getarg(1)+".";
emotion e_thx;
@@ -636,8 +635,8 @@ M_CLEAR:
if(Zeny < 1000) goto L_ZENY;
set Zeny,Zeny-1000;
//set RESRVPTS, RESRVPTS + (1000/50); //hardcoded password doesn't add pts
- if(md5(@code) == #kafra_code$) {
- set #kafra_code$,"";
+ if(@code == #kafra_code) {
+ set #kafra_code,0;
mes "You've successfully cleared your storage password.";
mes "Thank you for using "+getarg(1)+".";
emotion e_thx;
--
cgit v1.2.3-70-g09d2