diff options
| author | Haru <haru@dotalux.com> | 2019-06-01 16:24:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 16:24:19 +0200 |
| commit | 0c15e816e4facb92b06b13615cf6713eaea490f2 (patch) | |
| tree | 83f2b49d0f0a9b6622b858908cd5ccb205b4c24d | |
| parent | 0e18ff7d7fb86451fd3ac2bb7e18327dce3afaf4 (diff) | |
| parent | 3bfc14f1eb52980e8a8610b4f4533fe81966bb98 (diff) | |
| download | hercules-0c15e816e4facb92b06b13615cf6713eaea490f2.tar.gz hercules-0c15e816e4facb92b06b13615cf6713eaea490f2.tar.bz2 hercules-0c15e816e4facb92b06b13615cf6713eaea490f2.tar.xz hercules-0c15e816e4facb92b06b13615cf6713eaea490f2.zip | |
Merge pull request #2380 from AnnieRuru/59-all_All
Standardize to "all" in script commands
| -rw-r--r-- | doc/script_commands.txt | 2 | ||||
| -rw-r--r-- | npc/custom/events/mushroom_event.txt | 2 | ||||
| -rw-r--r-- | npc/re/instances/ghost_palace.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 10 |
4 files changed, 11 insertions, 5 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 3bf0c7427..9e5045c9c 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6527,7 +6527,7 @@ This command will kill all monsters that were spawned with monster() or areamonster() and have a specified event label attached to them. Commonly used to get rid of remaining quest monsters once the quest is complete. -If the label is given as "All", all monsters which have their respawn +If the label is given as "all", all monsters which have their respawn times set to -1 (like all the monsters summoned with 'monster' or 'areamonster' script command, and all monsters summoned with GM commands, but no other ones - that is, all non-permanent monsters) on the specified diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt index b04b99fff..fc7446814 100644 --- a/npc/custom/events/mushroom_event.txt +++ b/npc/custom/events/mushroom_event.txt @@ -41,7 +41,7 @@ OnMinute10: // Start time (every hour) set .status,1; set .Spawn,rand(1,10); // How many Mushrooms should spawn? set .Map$,.maps$[rand(getarraysize(.maps$))]; - killmonster .Map$,"All"; + killmonster(.Map$, "all"); monster .Map$,0,0,"Please don't kill me!",1084,.Spawn,strnpcinfo(NPC_NAME)+"::OnMobKilled"; announce "Find the Mushroom : Total of "+.Spawn+" Mushrooms have been spawned in "+.Map$+"!",0; sleep 2500; diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 3e708dc57..a291984db 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -601,7 +601,7 @@ OnInstanceInit: OnStart: stopnpctimer instance_npcname("#gp3control"); disablenpc(instance_npcname("#gp3control")); - killmonster(instance_mapname("1@spa"), "All"); + killmonster(instance_mapname("1@spa"), "all"); disablenpc(instance_npcname("#gp3warp")); enablenpc(instance_npcname("Lurid Royal Guard#gp5")); enablenpc(instance_npcname("Tiara Princess#gp5")); diff --git a/src/map/script.c b/src/map/script.c index 60253bff8..d9c3660d0 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11058,10 +11058,16 @@ static BUILDIN(killmonster) int16 m,allflag=0; mapname=script_getstr(st,2); event=script_getstr(st,3); - if(strcmp(event,"All")==0) + + if (strcmpi(event, "all") == 0) { + if (strcmp(event, "all") != 0) { + ShowWarning("buildin_killmonster: \"%s\" deprecated! Please use \"all\" instead.\n", event); + script->reportsrc(st); + } allflag = 1; - else + } else { script->check_event(st, event); + } if( (m=map->mapname2mapid(mapname))<0 ) return true; |