Skip to content

Commit c161414

Browse files
greatguys1greatguys1
committed
Merge branch 'MSR-Alpha' into MSR-Scripts
2 parents 9e13f4e + ce49d36 commit c161414

File tree

125 files changed

+1531
-4159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1531
-4159
lines changed

‎ms.stx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ $get_by_idx //$get_by_idx(<entity_idx>,<property>,[options])
136136
//-- skill.<skillname>[.substat] - returns skill or substat of skill
137137
//-- numitems - total number of inventory items
138138
//-- curhand - currently active hand (0=Left, 1=Right, left click activates active hand, right click the other)
139+
//-- glowcolor - preferred player's glow color (r,g,b)
139140
//--
140141
//-- [monsters only]
141142
//-- xp/skilllevel - mobs current XP value

‎scripts/a3/!first.script‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎scripts/aleyesu/final_chest.script‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
2-
const TOME_LIST "scroll_fire_wall;scroll_lightning_storm;scroll_acid_xolt;scroll_ice_blast;scroll_volcano;scroll_healing_wave"
3-
const SCROLL_LIST "scroll2_fire_wall;scroll2_lightning_storm;scroll2_acid_xolt;scroll2_ice_blast;scroll2_volcano;scroll2_healing_wave"
2+
const TOME_LIST "scroll_fire_wall;scroll_lightning_storm;scroll_acid_xolt;scroll_ice_blast;scroll_volcano;scroll_healing_wave"
3+
const SCROLL_LIST "scroll2_fire_wall;scroll2_lightning_storm;scroll2_acid_xolt;scroll2_ice_blast;scroll2_volcano;scroll2_healing_wave"
44
}
55

66
{ treasure_spawn
77

8-
setvar STORENAME kelefin
8+
setvar STORENAME kelefin
99

10-
callevent 0.1 mark_gm
10+
callevent 0.1 mark_gm
1111
}
1212

1313
{ mark_gm
14-
if ( $get(GAME_MASTER,scriptvar,GM_CHEST) ) deleteent ent_me
15-
callexternal GAME_MASTER gm_set_chest 1
14+
if ( $get(GAME_MASTER,scriptvar,GM_CHEST) ) deleteent ent_me
15+
callexternal GAME_MASTER gm_set_chest 1
1616
}
1717

1818
#include chests/base_treasurechest_array
1919

2020
{ chest_additems
21-
callevent add_gold 50 800 25//<min_amt> <max_amt> <quant_per_pouch> //add gold pouches to chest
22-
23-
callevent offer_felewyn_symbol 100
24-
25-
addstoreitem STORENAME NEWEST_CHARM 1 0
26-
27-
if ( $rand(1,10) == 1 ) addstoreitem STORENAME armor_paura 1 0
28-
29-
//if ( $rand(1,2) == 1 ) addstoreitem STORENAME key_blue 1 0
30-
local L_LIST $rand(0,1)
31-
if ( L_LIST == 0 ) local L_LIST TOME_LIST
32-
else local L_LIST SCROLL_LIST
33-
34-
local N_SCROLLS $get_token_amt(L_LIST)
35-
subtract N_SCROLLS 1
36-
local RND_PICK $rand(0,L_LIST)
37-
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
38-
addstoreitem STORENAME SCROLL_NAME 1 0
39-
if TC_NPLAYERS >= 2
40-
callevent add_epic_item 100%
41-
local N_SCROLLS $get_token_amt(L_LIST)
42-
subtract N_SCROLLS 1
43-
local RND_PICK $rand(0,L_LIST)
44-
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
45-
addstoreitem STORENAME SCROLL_NAME 1 0
46-
if TC_NPLAYERS >= 4
47-
local N_SCROLLS $get_token_amt(L_LIST)
48-
subtract N_SCROLLS 1
49-
local RND_PICK $rand(0,L_LIST)
50-
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
51-
addstoreitem STORENAME SCROLL_NAME 1 0
52-
53-
callevent add_epic_item 100%
54-
callevent add_epic_item 100%
55-
}
21+
callevent add_gold 50 800 25//<min_amt> <max_amt> <quant_per_pouch> //add gold pouches to chest
22+
23+
callevent offer_felewyn_symbol 100
24+
25+
addstoreitem STORENAME NEWEST_CHARM 1 0
26+
27+
if ( $rand(1,10) == 1 ) addstoreitem STORENAME armor_paura 1 0
28+
29+
//if ( $rand(1,2) == 1 ) addstoreitem STORENAME key_blue 1 0
30+
local L_LIST $rand(0,1)
31+
if ( L_LIST == 0 ) local L_LIST TOME_LIST
32+
else local L_LIST SCROLL_LIST
33+
34+
local N_SCROLLS $get_token_amt(L_LIST)
35+
subtract N_SCROLLS 1
36+
local RND_PICK $rand(0,N_SCROLLS)
37+
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
38+
addstoreitem STORENAME SCROLL_NAME 1 0
39+
if TC_NPLAYERS >= 2
40+
callevent add_epic_item 100%
41+
local N_SCROLLS $get_token_amt(L_LIST)
42+
subtract N_SCROLLS 1
43+
local RND_PICK $rand(0,N_SCROLLS)
44+
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
45+
addstoreitem STORENAME SCROLL_NAME 1 0
46+
if TC_NPLAYERS >= 4
47+
local N_SCROLLS $get_token_amt(L_LIST)
48+
subtract N_SCROLLS 1
49+
local RND_PICK $rand(0,N_SCROLLS)
50+
local SCROLL_NAME $get_token(L_LIST,RND_PICK)
51+
addstoreitem STORENAME SCROLL_NAME 1 0
52+
53+
callevent add_epic_item 100%
54+
callevent add_epic_item 100%
55+
}

‎scripts/beta_date.script‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
const BETA_TIMESTAMP "Tue 10/18/2022"
2+
const BETA_TIMESTAMP "RELEASE: Sun 11/20/2022 20:34:55.24"
33
}

‎scripts/calruin/cavetroll.script‎

Lines changed: 60 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,42 @@
1414
const NPC_BOSS_RESTORATION 1.0
1515

1616
setvard ANIM_DEATH diesimple
17-
const SOUND_STRUCK1 controller/con_pain2.wav
18-
const SOUND_STRUCK2 controller/con_pain3.wav
19-
const SOUND_ATTACK1 zombie/claw_strike1.wav
20-
const SOUND_ATTACK2 zombie/claw_strike2.wav
21-
const SOUND_ATTACK3 zombie/claw_strike3.wav
22-
const SOUND_DEATH garg/gar_die2.wav
23-
const SOUND_SPAWN garg/gar_alert2.wav
24-
const SOUND_FLINCH1 garg/gar_pain3.wav
25-
const SOUND_FLINCH2 garg/gar_pain2.wav
26-
const SOUND_PUSH garg/gar_attack3.wav
27-
const SOUND_FALL weapons/mortarhit.wav
28-
setvar ANIM_RUN walk
17+
const SOUND_STRUCK1 controller/con_pain2.wav
18+
const SOUND_STRUCK2 controller/con_pain3.wav
19+
const SOUND_ATTACK1 zombie/claw_strike1.wav
20+
const SOUND_ATTACK2 zombie/claw_strike2.wav
21+
const SOUND_ATTACK3 zombie/claw_strike3.wav
22+
const SOUND_DEATH garg/gar_die2.wav
23+
const SOUND_SPAWN garg/gar_alert2.wav
24+
const SOUND_FLINCH1 garg/gar_pain3.wav
25+
const SOUND_FLINCH2 garg/gar_pain2.wav
26+
const SOUND_PUSH garg/gar_attack3.wav
27+
const SOUND_FALL weapons/mortarhit.wav
28+
setvar ANIM_RUN walk
2929
const ANIM_FULLRUN run
30-
setvar ANIM_IDLE idle1
31-
setvar ANIM_WALK walk
32-
setvard ANIM_SMASH attack2 //these are reversed in model events! ><
33-
setvard ANIM_SLASH attack1
34-
setvard ANIM_ATTACK ANIM_SLASH
35-
const SLASH_RANGE 150
36-
const SMASH_RANGE 100
37-
const SLASH_HITRANGE 200
38-
const SMASH_HITRANGE 125
30+
setvar ANIM_IDLE idle1
31+
setvar ANIM_WALK walk
32+
setvard ANIM_SMASH attack2 //these are reversed in model events! ><
33+
setvard ANIM_SLASH attack1
34+
setvard ANIM_ATTACK ANIM_SLASH
35+
const SLASH_RANGE 150
36+
const SMASH_RANGE 100
37+
const SLASH_HITRANGE 200
38+
const SMASH_HITRANGE 125
3939
setvard THROW_RANGE 250
40-
setvard ATTACK_RANGE SMASH_RANGE
41-
setvard ATTACK_MOVERANGE 50
42-
setvard ATTACK_HITRANGE SLASH_HITRANGE
43-
setvard THROW_FREQ 10.0 //min seconds between throws
40+
setvard ATTACK_RANGE SMASH_RANGE
41+
setvard ATTACK_MOVERANGE 50
42+
setvard ATTACK_HITRANGE SLASH_HITRANGE
43+
setvard THROW_FREQ 10.0 //min seconds between throws
4444

4545
setvard NPC_MUST_SEE_TARGET 0 //he cant see through himself if yer on his head
4646

4747
const MAIN_MODEL monsters/skeleton_hood.mdl
4848
const ALT_MODEL monsters/skeleton_boss2.mdl
4949
precache ALT_MODEL //uplaod new model
5050

51-
//Precache
52-
precache SOUND_DEATH //handled externally
51+
//Precache
52+
precache SOUND_DEATH //handled externally
5353
}
5454

5555
#include monsters/base_monster_new
@@ -79,51 +79,36 @@
7979
if ( NPC_IS_BOSS ) setvard NPC_GIVE_EXP 2000
8080
if ( !NPC_IS_BOSS ) setvard NPC_GIVE_EXP 1000
8181
}
82-
83-
hp 6000
84-
gold $rand(100,300)
85-
width 40
86-
height 120
87-
race undead
82+
83+
hp 6000
84+
gold $rand(100,300)
85+
width 40
86+
height 120
87+
race undead
8888
setbbox npcsize
8989
setsolid box
9090

91-
roam 0
92-
hearingsensitivity 12
93-
//setmodelbody 0 0
94-
local CURRENT_MAP game.map.name
95-
if ( CURRENT_MAP equals calruin2 ) setmodelbody 0 1
96-
if ( CURRENT_MAP equals calruin2_1 ) setmodelbody 0 1
97-
setidleanim ANIM_IDLE
98-
setmoveanim ANIM_WALK
99-
playanim once ANIM_IDLE
100-
takedmg all 0.6
101-
102-
setvard IMMUN_POISON 1
91+
roam 0
92+
hearingsensitivity 12
93+
//setmodelbody 0 0
94+
local CURRENT_MAP game.map.name
95+
if ( CURRENT_MAP equals calruin2 ) setmodelbody 0 1
96+
if ( CURRENT_MAP equals calruin2_1 ) setmodelbody 0 1
97+
setidleanim ANIM_IDLE
98+
setmoveanim ANIM_WALK
99+
playanim once ANIM_IDLE
100+
takedmg all 0.6
101+
103102
takedmg holy 1.5
104103
//takedmg dark 0.25 //oops
105104
takedmg poison 0.0
106105

107106
setvard THROW_COUNT 0
108107

109-
playsound 0 10 SOUND_SPAWN
108+
playsound 0 10 SOUND_SPAWN
110109

111110
}
112111

113-
{ [server] npc_post_spawn
114-
115-
local L_MAP_NAME $lcase(game.map.name)
116-
117-
if ( L_MAP_NAME equals calruin2 )
118-
{
119-
local VER_NAME $get_by_name(map_verify)
120-
local VER_ID $get(VER_NAME,id)
121-
if !$get(VER_ID,exists)
122-
infomsg all DATED_MAP Please verify your map patched correctly.
123-
deleteent ent_me
124-
}
125-
}
126-
127112
{ npcatk_get_postspawn_properties
128113

129114
if AM_GERIC
@@ -139,32 +124,32 @@
139124

140125
{ [override] attack_1 //called by model anim attack1
141126

142-
if ( $get(NPCATK_TARGET,range) < SLASH_HITRANGE ) callevent npcatk_dodamage NPCATK_TARGET direct $randf(40.0,55.0) 75% $get(ent_me,id) slash
127+
if ( $get(NPCATK_TARGET,range) < SLASH_HITRANGE ) callevent npcatk_dodamage NPCATK_TARGET direct $randf(40.0,55.0) 75% $get(ent_me,id) slash
143128

144129
if $rand(1,10) == 1
145-
setvard ANIM_ATTACK ANIM_SMASH
146-
setvard ATTACK_RANGE SMASH_RANGE
130+
setvard ANIM_ATTACK ANIM_SMASH
131+
setvard ATTACK_RANGE SMASH_RANGE
147132
setvard ATTACK_HITRANGE SMASH_HITRANGE
148133
}
149134

150135
{ [override] attack_2 //called by model anim attack2
151136

152-
if ( $get(NPCATK_TARGET,range) < SMASH_HITRANGE ) callevent npcatk_dodamage NPCATK_TARGET direct $randf(30.0,40.0) 100% $get(ent_me,id) blunt
137+
if ( $get(NPCATK_TARGET,range) < SMASH_HITRANGE ) callevent npcatk_dodamage NPCATK_TARGET direct $randf(30.0,40.0) 100% $get(ent_me,id) blunt
153138
setvard STUN_ATTACK 1
154-
playsound 0 10 SOUND_ATTACK1 SOUND_ATTACK2 SOUND_ATTACK3
155-
setvard ANIM_ATTACK ANIM_SLASH
139+
playsound 0 10 SOUND_ATTACK1 SOUND_ATTACK2 SOUND_ATTACK3
140+
setvard ANIM_ATTACK ANIM_SLASH
156141
setvard ATTACK_RANGE SLASH_RANGE
157142
setvard ATTACK_HITRANGE SLASH_HITRANGE
158143
}
159144

160-
//Hit by someone
145+
//Hit by someone
161146
{ npc_struck
162147

163-
local MY_CURRENT_HP $get(ent_me,hp)
148+
local MY_CURRENT_HP $get(ent_me,hp)
164149

165-
if ( MY_CURRENT_HP < 2000 ) setvard CAN_FLINCH 1
150+
if ( MY_CURRENT_HP < 2000 ) setvard CAN_FLINCH 1
166151

167-
playrandomsound 0 10 SOUND_STRUCK1 SOUND_STRUCK2
152+
playrandomsound 0 10 SOUND_STRUCK1 SOUND_STRUCK2
168153
}
169154

170155
{ npc_flinch
@@ -207,14 +192,14 @@
207192

208193
{ game_dodamage //1: Attack Hit (1/0) 2: Entity Attack hit 3: Start Position 4: End Position
209194

210-
if PARAM1
195+
if PARAM1
211196

212-
if ANIM_ATTACK equals 'attack1'
197+
if ANIM_ATTACK equals 'attack1'
213198

214199
add THROW_COUNT 1
215200

216-
if ( THROW_COUNT > THROW_TIME )
217-
{
201+
if ( THROW_COUNT > THROW_TIME )
202+
{
218203
setvard THROW_COUNT 0
219204
if !DELAY_NEXT_THROW
220205
setvard DELAY_NEXT_THROW 1
@@ -225,7 +210,7 @@
225210
setvard THROW_TARGET PARAM2 //cant pass params via params
226211
callevent npcatk_suspend_ai 2.0
227212
callevent THROW_DELAY throw_chummer
228-
}
213+
}
229214
}
230215

231216
{ reset_throw

‎scripts/calruin/ghoul.script‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎scripts/chests/ara.script‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
const STORENAME ara_chest1
3-
const GM_VERIFY 1
43
}
54

65
#include items/base_treasurechest

‎scripts/chests/barnum_final.script‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
{
2-
const GM_VERIFY 1
3-
}
1+
#include items/base_treasurechest
42

53
{ treasure_spawn
64

75
setvar STORENAME c_temple_final1
86
}
97

10-
#include items/base_treasurechest
11-
128
{ chest_additems
139

1410
gold $math(multiply,50,game.playersnb)

0 commit comments

Comments
 (0)