diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/custom/battleground/bg_kvm01.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/custom/battleground/bg_kvm01.txt')
| -rw-r--r-- | npc/custom/battleground/bg_kvm01.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt index 36c758f37..ed8e0ad76 100644 --- a/npc/custom/battleground/bg_kvm01.txt +++ b/npc/custom/battleground/bg_kvm01.txt @@ -5,7 +5,7 @@ // Registration NPC's // ********************************************************************* -bat_room,253,227,4 script Registration::KvM01R_Guillaume 418,{ // KvM Guillaume +bat_room,253,227,4 script Registration::KvM01R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume end; OnInit: @@ -17,7 +17,7 @@ OnEnterBG: end; } -bat_room,253,204,0 script Registration::KvM01R_Croix 414,{ // KvM Croix +bat_room,253,204,0 script Registration::KvM01R_Croix 4_M_CRU_KNT,{ // KvM Croix end; OnInit: @@ -32,7 +32,7 @@ OnEnterBG: // Light Effects // ********************************************************************* -bat_c01,54,123,0 script #bat_c01a 111,{ +bat_c01,54,123,0 script #bat_c01a HIDDEN_NPC,{ end; OnKvM01LightA: misceffect 54; end; @@ -40,11 +40,11 @@ OnKvM01LightB: misceffect 55; end; OnKvM01LightC: misceffect 56; end; } -bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b 111 -bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c 111 -bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d 111 -bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e 111 -bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f 111 +bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b HIDDEN_NPC +bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c HIDDEN_NPC +bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d HIDDEN_NPC +bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e HIDDEN_NPC +bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f HIDDEN_NPC // Battleground Engine // ********************************************************************* @@ -282,7 +282,7 @@ OnTimer60000: // Battleground Therapist // ********************************************************************* -bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{ +bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; @@ -290,7 +290,7 @@ bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{ close; } -bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{ +bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 4_F_SISTER,{ mes "[Therapist in battle]"; mes "Just close your eyes, and take a deep breathe."; mes "You can be free from pain."; @@ -301,7 +301,7 @@ bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{ // Battleground rewards // ********************************************************************* -bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{ +bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{ if( $@KvM01BG_Victory ) { if( $@KvM01BG_Victory == 3 ) @@ -339,7 +339,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{ end; } -bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 415,{ +bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{ if( $@KvM01BG_Victory ) { if( $@KvM01BG_Victory == 3 ) |