diff options
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/npc/028-1/_mobs.txt | 52 | ||||
| -rw-r--r-- | world/map/npc/028-1/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/028-3/_mobs.txt | 19 | ||||
| -rw-r--r-- | world/map/npc/028-3/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/functions/dailyquest.txt | 30 |
6 files changed, 32 insertions, 73 deletions
diff --git a/client-data b/client-data -Subproject a7f2d4b61d31bcf41a2bfea3d1ca905e437a9c8 +Subproject d4950dc4c47a36abf048e1cdfea5543ba132530 diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt index fc1aa291..b0ae65fe 100644 --- a/world/map/npc/028-1/_mobs.txt +++ b/world/map/npc/028-1/_mobs.txt @@ -1,61 +1,9 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // GM Island mobs -028-1,121,75,27,25|monster|SpikyMushroom|1019,18,20000ms,15000ms,Mob028-1::On1019 -028-1,89,72,25,19|monster|Bat|1017,18,100000ms,10000ms,Mob028-1::On1017 -028-1,99,36,48,32|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040 -028-1,99,36,46,34|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042 -028-1,99,36,44,36|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047 -028-1,41,67,38,9|monster|SeaSlime|1033,18,100000ms,25000ms,Mob028-1::On1033 -028-1,51,78,22,10|monster|SeaSlime|1033,15,100000ms,25000ms,Mob028-1::On1033 -028-1,29,104,1,1|monster|Squirrel|1038,1,300000ms,50000ms,Mob028-1::On1038 -028-1,74,98,71,18|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040 -028-1,82,103,93,16|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042 -028-1,110,117,61,14|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047 -028-1,60,45,1,1|monster|Fallen|1045,1,700000ms,300000ms,Mob028-1::On1045 028-1,0,0,0|script|Mob028-1|32767 { end; - -On1017: - set @mobID, 1017; - callfunc "MobPoints"; - end; - -On1019: - set @mobID, 1019; - callfunc "MobPoints"; - end; - -On1033: - set @mobID, 1033; - callfunc "MobPoints"; - end; - -On1038: - set @mobID, 1038; - callfunc "MobPoints"; - end; - -On1040: - set @mobID, 1040; - callfunc "MobPoints"; - end; - -On1042: - set @mobID, 1042; - callfunc "MobPoints"; - end; - -On1045: - set @mobID, 1045; - callfunc "MobPoints"; - end; - -On1047: - set @mobID, 1047; - callfunc "MobPoints"; - end; } diff --git a/world/map/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt index 8f2ffd4a..076a3ef7 100644 --- a/world/map/npc/028-1/_warps.txt +++ b/world/map/npc/028-1/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // GM Island warps -028-1,120,125|warp|To Easter Islan#028-10|-1,-1,028-3,33,77 +028-1,120,125|warp|To GM Island Ca#028-10|-1,-1,028-3,33,77 diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt index fd5fe855..1290a483 100644 --- a/world/map/npc/028-3/_mobs.txt +++ b/world/map/npc/028-3/_mobs.txt @@ -1,28 +1,9 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // GM Island Cave mobs -028-3,51,49,22,15|monster|Silkworm|1035,10,30000ms,3000ms,Mob028-3::On1035 -028-3,43,35,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013 -028-3,27,31,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013 -028-3,50,49,61,60|monster|Bat|1017,10,60000ms,10000ms,Mob028-3::On1017 028-3,0,0,0|script|Mob028-3|32767 { end; - -On1013: - set @mobID, 1013; - callfunc "MobPoints"; - end; - -On1017: - set @mobID, 1017; - callfunc "MobPoints"; - end; - -On1035: - set @mobID, 1035; - callfunc "MobPoints"; - end; } diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt index 393f8340..92429ec3 100644 --- a/world/map/npc/028-3/_warps.txt +++ b/world/map/npc/028-3/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // GM Island Cave warps -028-3,33,78|warp|To Easter Islan#028-30|-1,-1,028-1,120,126 +028-3,33,78|warp|To GM Island#028-30|-1,-1,028-1,120,126 diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 4448feed..4bbe7800 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -68,6 +68,7 @@ function|script|DailyQuest mes "\"If you bring me " + @dq_count + " " + @dq_friendly_name$ + ", I will give you a reward.\""; menu "I have what you want.", L_Trade, + "Take all you need.", L_All, "Ok, I'll get to work.", L_Next, "Nah, I'm not going to help you.", L_Next; @@ -95,6 +96,35 @@ L_Trade: mes "[" + @dq_exp + " experience points]"; goto L_Exit_Good; +L_All: + if (countitem(@dq_name$) < @dq_count) + goto L_Not_Enough; + + set @item_multiple, (countitem(@dq_name$) / @dq_count); + set @dp_multiple, (DailyQuestPoints / @dq_cost); + + if (@dp_multiple > @item_multiple) + set @multipler, @item_multiple; + if (@item_multiple >= @dp_multiple) + set @multipler, @dp_multiple; + + set DailyQuestPoints, DailyQuestPoints - (@dq_cost * @multipler); + + delitem @dq_name$, (@dq_count * @multipler); + + set Zeny, Zeny + (@dq_money * @multipler); + getexp (@dq_exp * @multipler), 0; + + if (@dq_handle_return) + goto L_Exit_Good; + + mes "\"Thank you!\""; + callsub S_SayPhrase; + mes ""; + mes "[" + (@dq_money * @multipler) + " money]"; + mes "[" + (@dq_exp * @multipler) + " experience points]"; + goto L_Exit_Good; + L_Exit_Good: set @dq_return, 4; goto L_Exit; |