summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/login_athena.conf1
-rw-r--r--doc/effect_list.txt31
-rw-r--r--src/map/script.c28
-rw-r--r--vcproj-9/dbghelpplug.vcproj13
4 files changed, 47 insertions, 26 deletions
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 6026b7670..843486ec0 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -100,6 +100,7 @@ ipban.enable: yes
//ipban.sql.db_username: ragnarok
//ipban.sql.db_password: ragnarok
//ipban.sql.db_database: ragnarok
+//ipban.sql.codepage:
//ipban.sql.ipban_table: ipbanlist
// Dynamic password failure ipban system
ipban.dynamic_pass_failure_ban: yes
diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index fa9d5eb29..15c001c19 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -3,7 +3,7 @@
//===== By ================================================
//= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon
//===== Version ===========================================
-//= 2.1
+//= 2.2
//=========================================================
//= 1.0 - Formatted to the standard
//= 1.1 - New Effects, up to 2007/05/07 Sakexe. [Au{R}oN]
@@ -17,6 +17,7 @@
//= 1.9 - New Effects, up to 2008/05/28 Sakexe. [Au{R}oN]
//= 2.0 - New Effects, up to 2008/07/15 Sakexe. [Au{R}oN]
//= 2.1 - New Effects, up to 2008/08/06a Sakexe. [Au{R}oN]
+//= 2.2 - New Effects, up to 2009/01/21a Sakexe. [Au{R}oN]
//===== Description =======================================
//= A list of client-side effects sorted by their ID
//=========================================================
@@ -730,9 +731,9 @@ number description
698. (Nothing)
699. Fall of powder from the sky and raise of some leaf
700. Big Colored Green Sphere.
-701. Little Colored Violet Sphere
-702. Light Infltrarion from and Fall of powder from the sky
-703. (Nothing)
+701. Huge Blue Sphere
+702. Little Colored Violet Sphere
+703. Light Infiltration with fall of pownder
704. (Nothing)
705. (Nothing)
706. (Nothing)
@@ -741,4 +742,24 @@ number description
709. A Firework that split in 4 mini fireworks
710. A Sphere like Effect 701 but Green, and a bit more larger
711. A big violet wall
-712. No More Effects From 2008/08/06a Sakexe. \ No newline at end of file
+712. A Little Flame Sphere
+713. A lot of Very Small and Yellow Sphere
+714. (Nothing)
+715. Something Like a Little Blue Basilica (Probably something related Arch Bishop)
+716. The same of 715 (Probably something related Arch Bishop)
+717. Something like Angelus (Probably something related Arch Bishop)
+718. Another Fire Pillar Effect (Probably something related Warlock)
+719. Light Infiltration from the Sky (Probably something related Warlock)
+720. Some sound and effect of Soul Destroyer but Yellow (Probably something related Warlock)
+721. Big Lightning from the SKy (Probably something related Warlock)
+722. Bug Fire Explosion (Probably something related Warlock)
+723. Noise Sound (Probably something related Warlock)
+724. Client Crash :P
+725. Status Recovery Sound and Wind movement on the ground (Probably something related Arch Bishop)
+726. Big Blue Vapor Area (Probably something related Warlock)
+727. A Comet from the SKy (Probably something related Warlock)
+728. A Little Flare that Remain on the Player for some second (Probably something related Warlock)
+729. Effect like Close Confine (Probably something related Warlock)
+730. Little Explosion (Probably something related Warlock)
+731. An effect like Mob's Skill Scream (Probably something related a 3th classes)
+732+. No More Effects From 2009/01/21a Sakexe.
diff --git a/src/map/script.c b/src/map/script.c
index 5ce0c3409..6a008c20f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2110,7 +2110,7 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
default:
ShowMessage("unknown");
}
- ShowMessage("\n");
+ ShowMessage(CL_CLL "\n");
}
}
#endif
@@ -5208,10 +5208,10 @@ BUILDIN_FUNC(getitem2)
iden=script_getnum(st,4);
ref=script_getnum(st,5);
attr=script_getnum(st,6);
- c1=script_getnum(st,7);
- c2=script_getnum(st,8);
- c3=script_getnum(st,9);
- c4=script_getnum(st,10);
+ c1=(short)script_getnum(st,7);
+ c2=(short)script_getnum(st,8);
+ c3=(short)script_getnum(st,9);
+ c4=(short)script_getnum(st,10);
if(nameid<0) { // ƒ‰ƒ“ƒ_ƒ€
nameid=itemdb_searchrandomid(-nameid);
@@ -5242,10 +5242,10 @@ BUILDIN_FUNC(getitem2)
item_tmp.identify=0;
item_tmp.refine=ref;
item_tmp.attribute=attr;
- item_tmp.card[0]=c1;
- item_tmp.card[1]=c2;
- item_tmp.card[2]=c3;
- item_tmp.card[3]=c4;
+ item_tmp.card[0]=(short)c1;
+ item_tmp.card[1]=(short)c2;
+ item_tmp.card[2]=(short)c3;
+ item_tmp.card[3]=(short)c4;
//Check if it's stackable.
if (!itemdb_isstackable(nameid))
@@ -5666,10 +5666,10 @@ BUILDIN_FUNC(delitem2)
iden=script_getnum(st,4);
ref=script_getnum(st,5);
attr=script_getnum(st,6);
- c1=script_getnum(st,7);
- c2=script_getnum(st,8);
- c3=script_getnum(st,9);
- c4=script_getnum(st,10);
+ c1=(short)script_getnum(st,7);
+ c2=(short)script_getnum(st,8);
+ c3=(short)script_getnum(st,9);
+ c4=(short)script_getnum(st,10);
if( amount <= 0 )
return 0;// nothing to do
@@ -5709,7 +5709,7 @@ BUILDIN_FUNC(delitem2)
}
}
- ShowError("script:delitem: failed to delete %d items (AID=%d item_id=%d).\n", amount, sd->status.account_id, nameid);
+ ShowError("script:delitem2: failed to delete %d items (AID=%d item_id=%d).\n", amount, sd->status.account_id, nameid);
st->state = END;
return 1;
}
diff --git a/vcproj-9/dbghelpplug.vcproj b/vcproj-9/dbghelpplug.vcproj
index 59d53f5c5..ea13e2f00 100644
--- a/vcproj-9/dbghelpplug.vcproj
+++ b/vcproj-9/dbghelpplug.vcproj
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="dbghelpplug"
ProjectGUID="{334742E0-7790-4857-A794-A54625D93487}"
RootNamespace="dbghelpplug"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -73,6 +74,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\plugins\$(ProjectName).pdb"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -94,9 +97,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -161,6 +161,8 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -182,9 +184,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>