summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--npc/guild/gldfunc_treasure.txt35
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/status.c20
-rw-r--r--src/map/status.h2
5 files changed, 16 insertions, 44 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4965f1df2..dba0951b5 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -13,6 +13,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
* Speed up array size calculation and deletion. [Lance]
* Player must learn the skill before doing auto-spell [Lance]
* Exploit prevention in clif_parse_NpcStringInput [Lance]
+ * SC_SPEARSQUICKEN -> SC_SPEARQUICKEN normalized enum name [Lupus]
2006/05/20
* grfio_final moved back if any of GRF overriding is enabled so servers
with such configuration will not have different values after reloading. [Lance]
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index f52403c3e..ad4e3bb20 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -43,7 +43,7 @@
//================================================
function script F_GldTreas {
- if(getarg(10) == 1) goto TreasureSpawn;
+ if(getarg(10) == 1) goto L_SPAWN;
SetCastleData getarg(0)+".gat",4,0;
SetCastleData getarg(0)+".gat",5,0;
KillMonster getarg(0)+".gat","Treasure_"+getarg(1)+"::OnDied";
@@ -56,42 +56,13 @@ function script F_GldTreas {
if (getarg(2) <= 0) return;
set getarg(3), getarg(2); //sets the counter variable = to the box number amount
-TreasureSpawn:
-
- set getarg(4), getarg(5); //sets the box id variable = to the box id
- set $@temp, rand(4);
- if ($@temp > 2) set getarg(4), getarg(4) + 1;
- areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
- set getarg(3), getarg(3) - 1;
- if(getarg(3) <= 0) return;
-
- set getarg(4), getarg(5); //sets the box id variable = to the box id
- set $@temp, rand(4);
- if ($@temp > 2) set getarg(4), getarg(4) + 1;
- areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
- set getarg(3), getarg(3) - 1;
- if(getarg(3) <= 0) return;
-
- set getarg(4), getarg(5); //sets the box id variable = to the box id
- set $@temp, rand(4);
- if ($@temp > 2) set getarg(4), getarg(4) + 1;
- areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
- set getarg(3), getarg(3) - 1;
- if(getarg(3) <= 0) return;
-
- set getarg(4), getarg(5); //sets the box id variable = to the box id
- set $@temp, rand(4);
- if ($@temp > 2) set getarg(4), getarg(4) + 1;
- areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
- set getarg(3), getarg(3) - 1;
- if(getarg(3) <= 0) return;
-
+L_SPAWN:
set getarg(4), getarg(5); //sets the box id variable = to the box id
set $@temp, rand(4);
if ($@temp > 2) set getarg(4), getarg(4) + 1;
areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
set getarg(3), getarg(3) - 1;
- if(getarg(3) > 0) goto TreasureSpawn;
+ if(getarg(3) > 0) goto L_SPAWN;
return;
}
diff --git a/src/map/pc.c b/src/map/pc.c
index 6d08da918..db86df518 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3235,7 +3235,7 @@ int pc_checkallowskill(struct map_session_data *sd)
SC_ONEHAND,
SC_AURABLADE,
SC_PARRYING,
- SC_SPEARSQUICKEN,
+ SC_SPEARQUICKEN,
SC_ADRENALINE,
SC_ADRENALINE2,
SC_GATLINGFEVER
diff --git a/src/map/status.c b/src/map/status.c
index 2210ea63c..c5ee70702 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -165,7 +165,7 @@ void initChangeTables(void) {
set_sc(CR_DEVOTION, SC_DEVOTION, SI_DEVOTION);
set_sc(CR_PROVIDENCE, SC_PROVIDENCE, SI_PROVIDENCE);
set_sc(CR_DEFENDER, SC_DEFENDER, SI_DEFENDER);
- set_sc(CR_SPEARQUICKEN, SC_SPEARSQUICKEN, SI_SPEARQUICKEN);
+ set_sc(CR_SPEARQUICKEN, SC_SPEARQUICKEN, SI_SPEARQUICKEN);
set_sc(MO_STEELBODY, SC_STEELBODY, SI_STEELBODY);
set_sc(MO_BLADESTOP, SC_BLADESTOP_WAIT, SI_BLANK);
set_sc(MO_EXPLOSIONSPIRITS, SC_EXPLOSIONSPIRITS, SI_EXPLOSIONSPIRITS);
@@ -2222,8 +2222,8 @@ int status_calc_aspd_rate(struct block_list *bl, int aspd_rate)
aspd_rate -= (sc->data[SC_ADRENALINE2].val2 || !battle_config.party_skill_penalty)?30:20;
else if(sc->data[SC_ADRENALINE].timer!=-1)
aspd_rate -= (sc->data[SC_ADRENALINE].val2 || !battle_config.party_skill_penalty)?30:20;
- else if(sc->data[SC_SPEARSQUICKEN].timer!=-1)
- aspd_rate -= sc->data[SC_SPEARSQUICKEN].val2;
+ else if(sc->data[SC_SPEARQUICKEN].timer!=-1)
+ aspd_rate -= sc->data[SC_SPEARQUICKEN].val2;
else if(sc->data[SC_ASSNCROS].timer!=-1 && (bl->type!=BL_PC || ((struct map_session_data*)bl)->status.weapon != W_BOW))
aspd_rate -= sc->data[SC_ASSNCROS].val2;
}
@@ -3803,7 +3803,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
return 0;
case SC_CONCENTRATE:
case SC_INCREASEAGI:
- case SC_SPEARSQUICKEN:
+ case SC_SPEARQUICKEN:
case SC_TRUESIGHT:
case SC_WINDWALK:
case SC_CARTBOOST:
@@ -3871,8 +3871,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
status_change_end(bl,SC_ADRENALINE,-1);
if(sc->data[SC_ADRENALINE2].timer!=-1 )
status_change_end(bl,SC_ADRENALINE2,-1);
- if(sc->data[SC_SPEARSQUICKEN].timer!=-1 )
- status_change_end(bl,SC_SPEARSQUICKEN,-1);
+ if(sc->data[SC_SPEARQUICKEN].timer!=-1 )
+ status_change_end(bl,SC_SPEARQUICKEN,-1);
if(sc->data[SC_TWOHANDQUICKEN].timer!=-1 )
status_change_end(bl,SC_TWOHANDQUICKEN,-1);
if(sc->data[SC_CARTBOOST].timer!=-1 )
@@ -4143,7 +4143,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
} else val2 = 0;
break;
- case SC_SPEARSQUICKEN: /* スピアクイッケン */
+ case SC_SPEARQUICKEN: /* スピアクイッケン */
calc_flag = 1;
val2 = 20+val1;
break;
@@ -4771,7 +4771,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
break;
//OPT3
case SC_TWOHANDQUICKEN: /* 2HQ */
- case SC_SPEARSQUICKEN: /* スピアクイッケン */
+ case SC_SPEARQUICKEN: /* スピアクイッケン */
case SC_CONCENTRATION: /* コンセントレ?ション */
sc->opt3 |= 1;
opt_flag = 0;
@@ -4982,7 +4982,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
case SC_LOUD: /* ラウドボイス */
case SC_QUAGMIRE: /* クァグマイア */
case SC_PROVIDENCE: /* プロヴィデンス */
- case SC_SPEARSQUICKEN: /* スピアクイッケン */
+ case SC_SPEARQUICKEN: /* スピアクイッケン */
case SC_VOLCANO:
case SC_DELUGE:
case SC_VIOLENTGALE:
@@ -5392,7 +5392,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
//opt3
case SC_TWOHANDQUICKEN: /* 2HQ */
case SC_ONEHAND: /* 1HQ */
- case SC_SPEARSQUICKEN: /* スピアクイッケン */
+ case SC_SPEARQUICKEN: /* スピアクイッケン */
case SC_CONCENTRATION: /* コンセントレ?ション */
sc->opt3 &= ~1;
break;
diff --git a/src/map/status.h b/src/map/status.h
index 5caf42a79..a046b7170 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -88,7 +88,7 @@ enum {
SC_AUTOSPELL,
SC_SIGHTTRASHER,
SC_AUTOBERSERK,
- SC_SPEARSQUICKEN,
+ SC_SPEARQUICKEN,
SC_AUTOCOUNTER,
SC_SIGHT,
SC_SAFETYWALL,
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-26 06:53:31 +0000