Skip to content

Commit 0cb44d1

Browse files
frozenblitfrozenblit
authored
Merge pull request #30 from somnustron/master
fixes for open issue #29 and user experience
2 parents 882b3ff + 89d68cb commit 0cb44d1

9 files changed

Lines changed: 38 additions & 18 deletions

File tree

‎SH/ECompile.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ COMPILE_SCRIPT()
2020
clear
2121
read -p "Path to script to compile: " CMD
2222
$ECOMPILE_PATH "${CMD}"
23+
read -r -p "Press Enter to continue..."
2324
RETURN_TO_MENU
2425
}
2526

@@ -29,13 +30,15 @@ COMPILE_DIRECTORY()
2930
clear
3031
read -p "Path to DIRECTORY: " CMD
3132
$ECOMPILE_PATH -A -b -f "${CMD}"
33+
read -r -p "Press Enter to continue..."
3234
RETURN_TO_MENU
3335
}
3436

3537
#-- COMPILE_ALL_SCRIPTS() FUNCTION
3638
COMPILE_ALL_SCRIPTS()
3739
{
3840
$ECOMPILE_PATH -A -b -f
41+
read -r -p "Press Enter to continue..."
3942
RETURN_TO_MENU
4043
}
4144

@@ -45,6 +48,7 @@ COMPILE_ALL_SCRIPTS_OPTXT()
4548
$ECOMPILE_PATH -A -b -f 2>&1 > ecompile.log
4649
echo ""
4750
echo " Compilation complete."
51+
read -r -p "Press Enter to continue..."
4852
RETURN_TO_MENU
4953
}
5054

‎SH/FastCompile.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ECOMPILE_PATH="scripts\ecompile"
77

88

99
$ECOMPILE_PATH -b -r 2>&1 > ecompile.log
10-
11-
exit 0
10+
read -r -p "Press Enter to continue..."
11+
exit 0

‎SH/POL.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ START()
2424
echo " POL has finished running"
2525
echo "============================="
2626
echo ""
27+
read -r -p "Press Enter to continue..."
2728
}
2829

2930
START

‎SH/RealmGen.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ MULTIS.CFG()
2222
if [ ${BUILD_ALL} == 1 ]
2323
then TILES.CFG
2424
fi
25+
read -r -p "Press Enter to continue..."
2526
RETURN_TO_MENU
2627
}
2728

@@ -33,6 +34,7 @@ TILES.CFG()
3334
if [ ${BUILD_ALL} == 1 ]
3435
then LANDTILES.CFG
3536
fi
37+
read -r -p "Press Enter to continue..."
3638
RETURN_TO_MENU
3739
}
3840

@@ -44,6 +46,7 @@ LANDTILES.CFG()
4446
if [ ${BUILD_ALL} == 1 ]
4547
then BUILD_ALL=0
4648
fi
49+
read -r -p "Press Enter to continue..."
4750
RETURN_TO_MENU
4851
}
4952

@@ -52,6 +55,7 @@ ALLCONFIGS()
5255
{
5356
BUILD_ALL=1
5457
MULTIS.CFG
58+
read -r -p "Press Enter to continue..."
5559
}
5660

5761
#-- REALM_BRITANNIA()
@@ -73,6 +77,7 @@ REALM_BRITANNIA()
7377
if [ ${BUILD_ALL} == 1 ]
7478
then REALM_BRITANNIA_ALT
7579
fi
80+
read -r -p "Press Enter to continue..."
7681
RETURN_TO_MENU
7782
}
7883

@@ -85,6 +90,7 @@ REALM_BRITANNIA_ALT()
8590
if [ ${BUILD_ALL} == 1 ]
8691
then REALM_ILSHENAR
8792
fi
93+
read -r -p "Press Enter to continue..."
8894
RETURN_TO_MENU
8995
}
9096

@@ -97,6 +103,7 @@ REALM_ILSHENAR()
97103
if [ ${BUILD_ALL} == 1 ]
98104
then REALM_MALAS
99105
fi
106+
read -r -p "Press Enter to continue..."
100107
RETURN_TO_MENU
101108
}
102109

@@ -109,6 +116,7 @@ REALM_MALAS()
109116
if [ ${BUILD_ALL} == 1 ]
110117
then REALM_TOKUNO
111118
fi
119+
read -r -p "Press Enter to continue..."
112120
RETURN_TO_MENU
113121
}
114122

@@ -121,6 +129,7 @@ REALM_TOKUNO()
121129
if [ ${BUILD_ALL} == 1 ]
122130
then REALM_TERMUR
123131
fi
132+
read -r -p "Press Enter to continue..."
124133
RETURN_TO_MENU
125134
}
126135

@@ -133,6 +142,7 @@ REALM_TERMUR()
133142
if [ ${BUILD_ALL} == 1 ]
134143
then BUILD_ALL=0
135144
fi
145+
read -r -p "Press Enter to continue..."
136146
RETURN_TO_MENU
137147
}
138148

@@ -159,6 +169,7 @@ COPY_CLIENT_FILES()
159169
cp "${UOPATH}/staidx*" MUL/
160170
cp "${UOPATH}/statics*" MUL/
161171
cp "${UOPATH}/tiledata.mul" MUL/
172+
read -r -p "Press Enter to continue..."
162173
RETURN_TO_MENU
163174
}
164175

‎config/npcdesc.cfg‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4344,7 +4344,7 @@ NpcTemplate ratmanmarksman
43444344
CProp Equipt sarcher
43454345
CProp Karma i-50
43464346
CProp Fame i30
4347-
AttackHitScript :combat:wrestlinghitscript
4347+
AttackHitScript :combat:wrestlingHitScript
43484348
}
43494349

43504350
NpcTemplate harpy
@@ -5239,7 +5239,7 @@ NpcTemplate stonegargoyle
52395239
CProp Equipt sbackpack
52405240
CProp Karma i-75
52415241
CProp Fame i200
5242-
AttackHitScript :combat:wrestlinghitscript
5242+
AttackHitScript :combat:wrestlingHitScript
52435243
}
52445244

52455245
NpcTemplate fierygargoyle
@@ -5350,7 +5350,7 @@ NpcTemplate frostgargoyle
53505350
CProp Equipt sbackpack
53515351
CProp Karma i-75
53525352
CProp Fame i200
5353-
AttackHitScript :combat:wrestlinghitscript
5353+
AttackHitScript :combat:wrestlingHitScript
53545354
}
53555355

53565356
NpcTemplate giantscorp
@@ -5577,7 +5577,7 @@ NpcTemplate flamingspider
55775577
elemental fire
55785578
CProp Karma i-10
55795579
CProp Fame i50
5580-
AttackHitScript :combat:wrestlinghitscript
5580+
AttackHitScript :combat:wrestlingHitScript
55815581
}
55825582

55835583
NpcTemplate headless
@@ -6846,7 +6846,7 @@ NpcTemplate rogueknight
68466846
dstart 10
68476847
CProp Karma i-50
68486848
CProp Fame i100
6849-
AttackHitScript :combat:wrestlinghitscript
6849+
AttackHitScript :combat:wrestlingHitScript
68506850
}
68516851

68526852
NpcTemplate dreadlord
@@ -6883,7 +6883,7 @@ NpcTemplate dreadlord
68836883
deathsound 0x15d
68846884
CProp Karma i-1000
68856885
CProp Fame i1000
6886-
AttackHitScript :combat:wrestlinghitscript
6886+
AttackHitScript :combat:wrestlingHitScript
68876887
}
68886888

68896889
NpcTemplate dreadlordcapt
@@ -6929,7 +6929,7 @@ NpcTemplate dreadlordcapt
69296929
deathsound 0x15d
69306930
CProp Karma i-1000
69316931
CProp Fame i1500
6932-
AttackHitScript :combat:wrestlinghitscript
6932+
AttackHitScript :combat:wrestlingHitScript
69336933
}
69346934

69356935
NpcTemplate Pirate
@@ -6958,7 +6958,7 @@ NpcTemplate Pirate
69586958
CProp Equipt spirate
69596959
dstart 10
69606960
alignment evil
6961-
AttackHitScript :combat:wrestlinghitscript
6961+
AttackHitScript :combat:wrestlingHitScript
69626962
}
69636963

69646964
NpcTemplate airmaster
@@ -7005,7 +7005,7 @@ NpcTemplate airmaster
70057005
saywords 1
70067006
CProp Karma i-100
70077007
CProp Fame i200
7008-
AttackHitScript :combat:wrestlinghitscript
7008+
AttackHitScript :combat:wrestlingHitScript
70097009
}
70107010

70117011
/////////////////////////////////////////////////////////

‎pkg/systems/attributes/config/attributes.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ Attribute DetectingHidden
248248
{
249249
AttributeType Skill
250250
SkillId 14
251-
Script :detecthidden:detecthidden
251+
Script :detecthidden:detectHidden
252252
Delay 10
253253

254254
Title Scout
@@ -718,7 +718,7 @@ Attribute RemoveTrap
718718
{
719719
AttributeType Skill
720720
SkillId 48
721-
Script :removetrap:removetrap
721+
Script :removetrap:removeTrap
722722
Delay 10
723723

724724
Title Trap Remover

‎pkg/systems/attributes/include/skills.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ function GetTrueEffectiveSkill(who, skillid)
293293
var base := GetAttributeBaseValue(who, id);
294294
var mod1 := GetAttributeTemporaryMod(who, id);
295295
var mod2 := GetAttributeIntrinsicMod(who, id);
296-
var true := Cdbl((base + mod1 + mod2)/ 10.0);
297-
if(true < 0.0)
296+
var effective := Cdbl((base + mod1 + mod2)/ 10.0);
297+
if(effective < 0.0)
298298
return 0.0;
299299
else
300-
return true;
300+
return effective;
301301
endif
302302
endfunction
303303

‎pkg/systems/boat/config/itemdesc.cfg‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,11 @@ Item 0x1F01B
254254
graphic 1
255255
}
256256

257-
257+
Item 0x1F01C
258+
{
259+
SaveOnExit 0
260+
Graphic 0x3E96
261+
}
258262

259263
///////////////////
260264
// the ship objtypes

‎pkg/systems/combat/config/itemdesc.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3176,7 +3176,7 @@ Weapon 0x1CAB5
31763176
minrange 2
31773177
maxrange 20
31783178
DamageClass piercing
3179-
3179+
}
31803180

31813181
Weapon 0x1999C
31823182
{

0 commit comments

Comments
 (0)