Skip to content

Commit eaeec56

Browse files
Jhobeancbnolok
authored andcommitted
Fix spawn group (#54)
1 parent 53c7253 commit eaeec56

38 files changed

+9885
-406
lines changed

_syntax highlighting/editplus/sphere.stx

+64-64
Original file line numberDiff line numberDiff line change
@@ -1586,70 +1586,70 @@ c_lizardman_spear
15861586
c_llama
15871587
c_llama_pack
15881588

1589-
c_m_balron
1590-
c_m_cyclops_king
1591-
c_m_dragon_blackdrake
1592-
c_m_dragon_bluedrake
1593-
c_m_dragon_copperdrake
1594-
c_m_dragon_crystal
1595-
c_m_dragon_crystaldrake
1596-
c_m_dragon_golddrake
1597-
c_m_dragon_greendrake
1598-
c_m_dragon_ice
1599-
c_m_dragon_silverdrake
1600-
c_m_dragon_wyrm
1601-
c_m_efreet
1602-
c_m_elem_blood
1603-
c_m_elem_ice
1604-
c_m_elem_poison
1605-
c_m_elem_snow
1606-
c_m_energy_vortex
1607-
c_m_ettin_lord
1608-
c_m_frost_ettin
1609-
c_m_frost_troll
1610-
c_m_frostooze
1611-
c_m_frostspider
1612-
c_m_gargoyle_stone
1613-
c_m_gazer_elder
1614-
c_m_ghost
1615-
c_m_ghoul
1616-
c_m_goblin
1617-
c_m_goblin_chief
1618-
c_m_goblin_lord
1619-
c_m_goblin_mage
1620-
c_m_goblin_shaman
1621-
c_m_hellcat
1622-
c_m_hellcat_pred
1623-
c_m_hellhound
1624-
c_m_ice_serpent
1625-
c_m_icefiend
1626-
c_m_imp
1627-
c_m_kraken
1628-
c_m_lava_lizard
1629-
c_m_lava_serpent
1630-
c_m_liche_lord
1631-
c_m_mongbat_arboreal
1632-
c_m_mummy
1633-
c_m_nightmare
1634-
c_m_ogre_lord
1635-
c_m_ophidian_archmage
1636-
c_m_ophidian_knight
1637-
c_m_orc_captain
1638-
c_m_orc_mage
1639-
c_m_phoenix
1640-
c_m_scorpion_king
1641-
c_m_scorpion_prince
1642-
c_m_scorpion_queen
1643-
c_m_scorpion_thrall
1644-
c_m_silver_serpent
1645-
c_m_skeleton_knight
1646-
c_m_skeleton_mage
1647-
c_m_skeletonarcher
1648-
c_m_stoneharpy
1649-
c_m_swamp_tentacles
1650-
c_m_terathan_avenger
1651-
c_m_wraith
1652-
c_m_wyvern
1589+
c_balron
1590+
c_cyclops_king
1591+
c_dragon_blackdrake
1592+
c_dragon_bluedrake
1593+
c_dragon_copperdrake
1594+
c_dragon_crystal
1595+
c_dragon_crystaldrake
1596+
c_dragon_golddrake
1597+
c_dragon_greendrake
1598+
c_dragon_ice
1599+
c_dragon_silverdrake
1600+
c_dragon_wyrm
1601+
c_efreet
1602+
c_elem_blood
1603+
c_elem_ice
1604+
c_elem_poison
1605+
c_elem_snow
1606+
c_energy_vortex
1607+
c_ettin_lord
1608+
c_frost_ettin
1609+
c_frost_troll
1610+
c_frostooze
1611+
c_frostspider
1612+
c_gargoyle_stone
1613+
c_gazer_elder
1614+
c_ghost
1615+
c_ghoul
1616+
c_goblin
1617+
c_goblin_chief
1618+
c_goblin_lord
1619+
c_goblin_mage
1620+
c_goblin_shaman
1621+
c_hellcat
1622+
c_hellcat_pred
1623+
c_hellhound
1624+
c_ice_serpent
1625+
c_daemon_ice
1626+
c_imp
1627+
c_kraken
1628+
c_lava_lizard
1629+
c_lava_serpent
1630+
c_liche_lord
1631+
c_mongbat_arboreal
1632+
c_mummy
1633+
c_nightmare
1634+
c_ogre_lord
1635+
c_ophidian_archmage
1636+
c_ophidian_knight
1637+
c_orc_captain
1638+
c_orc_mage
1639+
c_phoenix
1640+
c_scorpion_king
1641+
c_scorpion_prince
1642+
c_scorpion_queen
1643+
c_scorpion_thrall
1644+
c_silver_serpent
1645+
c_skeleton_knight
1646+
c_skeleton_mage
1647+
c_skeletonarcher
1648+
c_stoneharpy
1649+
c_swamp_tentacles
1650+
c_terathan_avenger
1651+
c_wraith
1652+
c_wyvern
16531653

16541654
c_man
16551655
c_man_gm

core/defs_height.scp

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ height_06 2 //DEFNAME=c_bird
1919
height_07 15 //DEFNAME=c_orc_captain
2020
height_08 18 //DEFNAME=c_corpser
2121
height_09 35 //DEFNAME=c_demon_summoned
22-
height_0a 35 //DEFNAME=c_demon
22+
height_0a 35 //DEFNAME=c_daemon
2323
height_0b 10 //DEFNAME=c_spider_dread
2424
height_0c 35 //DEFNAME=c_dragon
2525
height_0d 16 //DEFNAME=c_elemental_air_summoned
@@ -50,10 +50,10 @@ height_024 18 //DEFNAME=c_lizardman_mace
5050
height_025 10 //DEFNAME=c_wolf_unknown
5151
height_026 35 //DEFNAME=c_demon_dark
5252
height_027 10 //DEFNAME=c_mongbat
53-
height_028 35 //DEFNAME=c_demon_balron
53+
height_028 35 //DEFNAME=c_daemon_balron
5454
height_029 15 //DEFNAME=c_orc_w_club
5555
height_02a 18 //DEFNAME=c_ratman
56-
height_02b 35 //DEFNAME=c_demon_ice
56+
height_02b 35 //DEFNAME=c_daemon_ice
5757
height_02c 18 //DEFNAME=c_ratman_w_mace
5858
height_02d 18 //DEFNAME=c_ratman_w_sword
5959
height_02e 45 //DEFNAME=c_wyrm_ancient
@@ -71,7 +71,7 @@ height_038 16 //DEFNAME=c_skeleton_w_axe
7171
height_039 16 //DEFNAME=c_skeleton_w_sword
7272
height_03a 15 //DEFNAME=c_wisp
7373
height_03b 35 //DEFNAME=c_dragon_red
74-
height_03c 30 //DEFNAME=c_drake
74+
height_03c 30 //DEFNAME=c_drake_gray
7575
height_03d 30 //DEFNAME=c_drake_red
7676
height_03e 18 //DEFNAME=c_wyvern
7777
height_03f 8 //DEFNAME=c_cougar
@@ -101,7 +101,7 @@ height_054 28 //DEFNAME=c_ogre_lord_arctic2
101101
height_055 18 //DEFNAME=c_ophidian_shaman
102102
height_056 18 //DEFNAME=c_ophidian_warrior
103103
height_057 18 //DEFNAME=c_ophidian_queen
104-
height_058 8 //DEFNAME=c_goat
104+
height_058 8 //DEFNAME=c_mountain_goat
105105
height_059 6 //DEFNAME=c_serpent_ice
106106
height_05a 6 //DEFNAME=c_serpent_lava
107107
height_05b 6 //DEFNAME=c_serpent_silver
@@ -116,7 +116,7 @@ height_062 8 //DEFNAME=c_hellhound_leader
116116
height_063 8 //DEFNAME=c_wolf_dark
117117
height_064 8 //DEFNAME=c_wolf_silver
118118
height_065 19 //DEFNAME=c_centaur
119-
height_066 35 //DEFNAME=c_demon_exodus
119+
height_066 35 //DEFNAME=c_exodus
120120
height_067 30 //DEFNAME=c_serpentine_dragon
121121
height_068 30 //DEFNAME=c_skeletal_dragon
122122
height_06a 45 //DEFNAME=c_wyrm_shadow
@@ -152,10 +152,10 @@ height_085 7 //DEFNAME=c_alligator_small
152152
height_086 9 //DEFNAME=c_dragon_komodo
153153
height_087 28 //DEFNAME=c_ogre_lord_arctic
154154
height_088 18 //DEFNAME=c_ophidian_unknown
155-
height_089 19 //DEFNAME=c_ophidian_avenger
155+
height_089 19 //DEFNAME=c_ophidian_knight
156156
height_08a 15 //DEFNAME=c_orc_lord
157157
height_08b 15 //DEFNAME=c_orc_unknown
158-
height_08c 15 //DEFNAME=c_orc_mage
158+
height_08c 15 //DEFNAME=c_orc_shaman
159159
height_08d 16 //DEFNAME=c_man_paladin
160160
height_08e 18 //DEFNAME=c_ratman_archer
161161
height_08f 18 //DEFNAME=c_ratman_mage
@@ -223,7 +223,7 @@ height_0ce 8 //DEFNAME=c_lava_lizard
223223
height_0cf 5 //DEFNAME=c_sheep_woolly
224224

225225
height_0d0 3 //DEFNAME=c_chicken
226-
height_0d1 8 //DEFNAME=c_goat_mountain
226+
height_0d1 8 //DEFNAME=c_goat
227227
height_0d2 18 //DEFNAME=c_ostard_desert
228228
height_0d3 9 //DEFNAME=c_bear_black
229229
height_0d4 11 //DEFNAME=c_bear_grizzly
@@ -290,7 +290,7 @@ height_0117 3 //DEFNAME=c_ferret
290290
height_0118 30 //DEFNAME=c_minotaur_captain
291291
height_0119 30 //DEFNAME=c_minotaur_scout
292292
height_011a 4 //DEFNAME=c_parrot
293-
height_011b 3 //DEFNAME=c_black_crow
293+
height_011b 3 //DEFNAME=c_bird_crow
294294
height_011c 16 //DEFNAME=c_armor_steed
295295
height_011d 30 //DEFNAME=c_reaper_redux
296296

@@ -365,7 +365,7 @@ height_0304 18 //DEFNAME=c_meer_eternal
365365
height_0305 16 //DEFNAME=c_meer_captain
366366
height_0306 16 //DEFNAME=c_dawn
367367
height_0307 10 //DEFNAME=c_plague_beast
368-
height_0308 10 //DEFNAME=c_demon_horde_minion
368+
height_0308 10 //DEFNAME=c_daemon_horde_minion
369369
height_0309 16 //DEFNAME=c_doppelganger
370370
height_030a 16 //DEFNAME=c_gazer_larva
371371
height_030b 16 //DEFNAME=c_bogling
@@ -384,7 +384,7 @@ height_0318 30 //DEFNAME=c_chaos_daemon
384384
height_0319 16 //DEFNAME=c_skeletal_mount
385385
height_031a 15 //DEFNAME=c_swamp_dragon
386386
height_031b 18 //DEFNAME=c_demon_horde_medium
387-
height_031c 40 //DEFNAME=c_demon_horde_large
387+
height_031c 40 //DEFNAME=c_daemon_horde_large
388388
height_031d 45 //DEFNAME=c_reptile_lord
389389
height_031e 45 //DEFNAME=c_ancient_wyrm
390390
height_031f 15 //DEFNAME=c_armored_swamp_dragon

core/dialogs/admin/language_csy.scp

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ d_admin_CSY_Save_Skills "Uložit dovednosti"
4545
d_admin_CSY_Tags "Tagy"
4646
d_admin_CSY_Events "Eventy"
4747
d_admin_CSY_Flags "Flagy"
48-
d_admin_CSY_Account_Name "Název účtu:"
4948
d_admin_CSY_Status "Status:"
5049
d_admin_CSY_Online "Online"
5150
d_admin_CSY_Offline "Offline"

core/dialogs/admin/language_eng.scp

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ d_admin_ENG_Save_Skills "Save skills"
4545
d_admin_ENG_Tags "Tags"
4646
d_admin_ENG_Events "Events"
4747
d_admin_ENG_Flags "Flags"
48-
d_admin_ENG_Account_Name "Account name:"
4948
d_admin_ENG_Status "Status:"
5049
d_admin_ENG_Online "Online"
5150
d_admin_ENG_Offline "Offline"

core/dialogs/legacy/menu_legacy_add.scp

+3-3
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ ADD c_ORC
385385
ON=0 Orc (with club)
386386
ADD c_orc_w_club
387387
ON=0 Orcish Mage
388-
ADD c_orc_mage
388+
ADD c_orc_shaman
389389
ON=0 Orc Captian
390390
ADD c_orc_captain
391391
ON=0 Orc Lord
@@ -868,7 +868,7 @@ ADD c_BIRD
868868
ON=0 Tropical Bird
869869
ADD C_BIRD_TROPICAL
870870
ON=0 Crow
871-
ADD C_BIRD_CROW
871+
ADD c_bird_crow
872872
ON=0 Raven
873873
ADD C_BIRD_RAVEN
874874
ON=0 Magpie
@@ -885,7 +885,7 @@ ADD c_elem_ice
885885
ON=0 Snow Elemental
886886
ADD c_elem_ice
887887
ON=0 Ice Fiend
888-
ADD c_ICEFIEND
888+
ADD c_daemon_ice
889889
ON=0 Ice Snake
890890
ADD c_ice_snake
891891
ON=0 Oclock (Desert Ostard)

items/i_deco_dungeons_traps_dead.scp

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2017
2+
// SphereServer by: SphereServer development team and Menasoft.
33
// www.sphereserver.net
4-
// All SPHERE script files and formats are copyright Menasoft & Partners.
5-
// This file may be freely edited for personal use, but may not be distributed
6-
// in whole or in part, in any format without express written permission from
7-
// Menasoft & Partners. All donations and contributions
8-
// become the property of Menasoft & Partners.
94
//****************************************************************************
10-
// FILE LAST UPDATED: Wednesday, Dec 20, 2017
11-
//
12-
VERSION=0.56d
5+
VERSION=X1
136

147

158
[ITEMDEF 0eca]

items/i_provisions_armor.scp

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
//****************************************************************************
2-
// SPHERE by : Menasoft �1997-2018
2+
// SphereServer by: SphereServer development team and Menasoft.
33
// www.sphereserver.net
4-
// All SPHERE script files and formats are copyright Menasoft & Partners.
5-
// This file may be freely edited for personal use, but may not be distributed
6-
// in whole or in part, in any format without express written permission from
7-
// Menasoft & Partners. All donations and contributions
8-
// become the property of Menasoft & Partners.
94
//****************************************************************************
10-
// FILE LAST UPDATED: Wednesday, April 18, 2018
11-
//
12-
VERSION=0.56d
5+
VERSION=X1
136

147

158
//No idea why this is here.
@@ -2629,15 +2622,18 @@ VALUE=40
26292622
WEIGHT=5.1
26302623
RESOURCES=5 i_hides_cut,1 i_thread
26312624
SKILLMAKE=Tailoring 50.0,t_sewing_kit,Armslore 38.0
2625+
26322626
CATEGORY=Provisions - Clothes
26332627
SUBSECTION=Miscellaneous
26342628
DESCRIPTION=Leather Ninja Belt
2629+
26352630
CanUse=can_u_human|can_u_elf
26362631
ReqStr=10
26372632
TEVENTS=ei_equipitem
26382633
TEVENTS=t_ninja_shuriken
26392634
DUPELIST=027db
26402635
Expansion=RDS_SE
2636+
26412637
ON=@Create
26422638
HITPOINTS={36 48}
26432639
RESPOISON=1

items/i_provisions_clothing.scp

+4
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,12 @@ WEIGHT=3.0
173173
RESOURCES=1 i_ingot_gold,1 i_cloth
174174
SKILLMAKE=Tailoring 31.4,t_sewing_kit
175175
DUPELIST=01536
176+
176177
CATEGORY=Provisions - Clothes
177178
SUBSECTION=Miscellaneous
178179
DESCRIPTION=Gold Belt (Unwearable)
179180
//Expansion=RDS_PRET2A
181+
180182
[ITEMDEF 01536]
181183
//gold belt
182184
DUPEITEM=01535
@@ -251,10 +253,12 @@ CanUse=can_u_human|can_u_elf
251253
ReqStr=10
252254
TEVENTS=ei_equipitem
253255
DUPELIST=0153c
256+
254257
CATEGORY=Provisions - Clothes
255258
SUBSECTION=Miscellaneous
256259
DESCRIPTION=Half Apron
257260
//Expansion=RDS_PRET2A
261+
258262
ON=@Create
259263
HITPOINTS={36 48}
260264
RESPHYSICAL=1

0 commit comments

Comments
 (0)