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/quests/seals/god_weapon_creation.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/quests/seals/god_weapon_creation.txt')
-rw-r--r-- | npc/quests/seals/god_weapon_creation.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index 340b9a7f5..a367de1ad 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -14,7 +14,7 @@ //= Added GM management function. //============================================================ -gld_dun01,28,85,0 script Grunburti#1::GodDwarf 826,{ +gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ mes "[Dwarf Grunburti]"; mes "A human?!"; mes "This land is full"; @@ -340,11 +340,11 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 826,{ close; } } -gld_dun02,85,84,0 duplicate(GodDwarf) Grunburti#2 826 -gld_dun03,92,105,0 duplicate(GodDwarf) Grunburti#3 826 -gld_dun04,268,230,0 duplicate(GodDwarf) Grunburti#4 826 +gld_dun02,85,84,0 duplicate(GodDwarf) Grunburti#2 4_M_DWARF +gld_dun03,92,105,0 duplicate(GodDwarf) Grunburti#3 4_M_DWARF +gld_dun04,268,230,0 duplicate(GodDwarf) Grunburti#4 4_M_DWARF -que_god01,215,127,0 script #god_hopewarp1 111,{ +que_god01,215,127,0 script #god_hopewarp1 HIDDEN_NPC,{ end; OnInit: @@ -363,7 +363,7 @@ OnReset: end; } -que_god01,214,128,0 script #que_godnpc1::GodEntrance 111,{ +que_god01,214,128,0 script #que_godnpc1::GodEntrance HIDDEN_NPC,{ mes "[Entrance Notice]"; mes "Only the most"; mes "worthy of humans"; @@ -371,10 +371,10 @@ que_god01,214,128,0 script #que_godnpc1::GodEntrance 111,{ mes "power of the gods."; close; } -que_god01,215,128,0 duplicate(GodEntrance) #que_godnpc2 111 -que_god01,213,128,0 duplicate(GodEntrance) #que_godnpc3 111 +que_god01,215,128,0 duplicate(GodEntrance) #que_godnpc2 HIDDEN_NPC +que_god01,213,128,0 duplicate(GodEntrance) #que_godnpc3 HIDDEN_NPC -que_god01,154,112,4 script Grunburti#god 826,{ +que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){ mes "[Dwarf Grunburti]"; mes "One of the godly"; @@ -822,7 +822,7 @@ que_god01,145,118,0 duplicate(god_failwarp#1) god_failwarp#5 -1,9,9 que_god01,164,118,0 duplicate(god_failwarp#1) god_failwarp#6 -1,9,9 // Original name: "Godly Item Quests Related#god" -que_god01,293,3,0 script Godly Item Quests#god 90,{ +que_god01,293,3,0 script Godly Item Quests#god 4_F_01,{ callfunc "F_GM_NPC"; mes "[Use in case of emergency]"; mes "Please enter password."; |