Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed battleground kvm02 and kvm03 scripts referring to NPCs in the custom battleground kvm (bugreport:4812, since r14369).

Browse Source 
- Fixed kvm02 printing different amount of points, than it actually gives.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14750 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-03-20 20:10:33 +00:00
parent 851de7e0e7
commit d94a5ff6d0
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -1,6 +1,8 @@
Date Added Date Added
2011/03/20 2011/03/20
* Fixed battleground kvm02 and kvm03 scripts referring to NPCs in the custom battleground kvm (bugreport:4812, since r14369). [Ai4rei]
- Fixed kvm02 printing different amount of points, than it actually gives.
* Updates the to configure script. [Ai4rei] * Updates the to configure script. [Ai4rei]
- Added check, whether or not '-Wno-pointer-sign' can actually be used (caused warnings with g++). - Added check, whether or not '-Wno-pointer-sign' can actually be used (caused warnings with g++).
- Math library is no longer considered required, when math functions are available without it (made configure fail on platforms, where no separate math library is present). - Math library is no longer considered required, when math functions are available without it (made configure fail on platforms, where no separate math library is present).

18
npc/battleground/kvm/kvm02.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= ???, L0ne_W0lf //= ???, L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description: ========================================= //===== Description: =========================================
@ -17,6 +17,8 @@
//= 1.2 Upated some announces and dialogs from iRO. //= 1.2 Upated some announces and dialogs from iRO.
//= Changed how the scoreboard works slightly. //= Changed how the scoreboard works slightly.
//= Removed the areapercentheals, and minor things. //= Removed the areapercentheals, and minor things.
//= 1.3 Fixed wrong names for disablenpc/enablenpc. [Ai4rei]
//= Fixed points in text and actual points differing.
//============================================================ //============================================================
// Waiting Room NPCs // Waiting Room NPCs
@ -131,8 +133,8 @@ OnInit:
setwall "bat_c02",55,122,5,7,0,"batc02wall_b"; setwall "bat_c02",55,122,5,7,0,"batc02wall_b";
setwall "bat_c02",140,56,6,7,0,"batc02wall_c"; setwall "bat_c02",140,56,6,7,0,"batc02wall_c";
setwall "bat_c02",140,57,5,7,0,"batc02wall_d"; setwall "bat_c02",140,57,5,7,0,"batc02wall_d";
disablenpc "VintenarKvM02a"; disablenpc "KVM Officer#KVM02A";
disablenpc "VintenarKvM02b"; disablenpc "KVM Officer#KVM02B";
end; end;
OnGuillaumeJoin: OnGuillaumeJoin:
@ -186,8 +188,8 @@ OnReadyCheck:
end; end;
OnStart: OnStart:
disablenpc "VintenarKvM02a"; disablenpc "KVM Officer#KVM02A";
disablenpc "VintenarKvM02b"; disablenpc "KVM Officer#KVM02B";
set $@KvM02BG_Victory, 0; set $@KvM02BG_Victory, 0;
// Warp Teams // Warp Teams
bg_warp $@KvM02BG_id1,"bat_c02",53,128; bg_warp $@KvM02BG_id1,"bat_c02",53,128;
@ -314,8 +316,8 @@ OnCroixWin:
OnStop: OnStop:
stopnpctimer; stopnpctimer;
enablenpc "VintenarKvM02a"; enablenpc "KVM Officer#KVM02A";
enablenpc "VintenarKvM02b"; enablenpc "KVM Officer#KVM02B";
// Warp Teams // Warp Teams
bg_warp $@KvM02BG_id1,"bat_c02",53,128; bg_warp $@KvM02BG_id1,"bat_c02",53,128;
bg_warp $@KvM02BG_id2,"bat_c02",146,55; bg_warp $@KvM02BG_id2,"bat_c02",146,55;
@ -380,7 +382,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
mes "[KVM Officer]"; mes "[KVM Officer]";
mes "Good Game."; mes "Good Game.";
mes "May the glory of KVM be with you."; mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 5"; mes "You aquire the winning points: 1";
close2; close2;
} }
else else

11
npc/battleground/kvm/kvm03.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= ???, L0ne_W0lf //= ???, L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description: ========================================= //===== Description: =========================================
@ -17,6 +17,7 @@
//= 1.2 Upated some announces and dialogs from iRO. //= 1.2 Upated some announces and dialogs from iRO.
//= Changed how the scoreboard works slightly. //= Changed how the scoreboard works slightly.
//= Removed the areapercentheals, and minor things. //= Removed the areapercentheals, and minor things.
//= 1.3 Fixed wrong names for disablenpc/enablenpc. [Ai4rei]
//============================================================ //============================================================
// Waiting Room NPCs // Waiting Room NPCs
@ -131,8 +132,8 @@ OnInit:
setwall "bat_c03",55,122,5,7,0,"batc03wall_b"; setwall "bat_c03",55,122,5,7,0,"batc03wall_b";
setwall "bat_c03",140,56,6,7,0,"batc03wall_c"; setwall "bat_c03",140,56,6,7,0,"batc03wall_c";
setwall "bat_c03",140,57,5,7,0,"batc03wall_d"; setwall "bat_c03",140,57,5,7,0,"batc03wall_d";
disablenpc "VintenarKvM03a"; disablenpc "KVM Officer#KVM03A";
disablenpc "VintenarKvM03b"; disablenpc "KVM Officer#KVM03B";
end; end;
OnGuillaumeJoin: OnGuillaumeJoin:
@ -328,8 +329,8 @@ OnReset:
set $@KvM03BG_Victory, 0; set $@KvM03BG_Victory, 0;
if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; set $@KvM03BG_id1, 0; } if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; set $@KvM03BG_id1, 0; }
if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; set $@KvM03BG_id2, 0; } if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; set $@KvM03BG_id2, 0; }
disablenpc "VintenarKvM03a"; disablenpc "KVM Officer#KVM03A";
disablenpc "VintenarKvM03b"; disablenpc "KVM Officer#KVM03B";
mapwarp "bat_c03","bat_room",154,150; mapwarp "bat_c03","bat_room",154,150;
maprespawnguildid "bat_c03",0,3; // Just in case someone else maprespawnguildid "bat_c03",0,3; // Just in case someone else
bg_updatescore "bat_c03",5,5; bg_updatescore "bat_c03",5,5;