Merge pull request OpenDungeons#303 from hwoarangmy/development

Allow creatures to spawn with a weapon + "max" hp in level file + fixed regression on creature definition modifications + network fixes
Hillkorn · Nov 10, 2014 · 718529b · 718529b
2 parents 5a52a07 + f876e81
commit 718529b
Show file tree

Hide file tree

Showing 26 changed files with 325 additions and 229 deletions.
diff --git a/config/creatures.cfg b/config/creatures.cfg
@@ -1096,6 +1096,8 @@
     AttackRange	1.0
     AtkRange/Level	0
     AttackWarmupTime	1.3
+    WeaponSpawnL	RustyShield
+    WeaponSpawnR	RustySword
     [/Stats]
     [XP]
     # 2-10
@@ -1240,6 +1242,8 @@
     AttackRange	1.0
     AtkRange/Level	0
     AttackWarmupTime	1.5
+    WeaponSpawnL	RustyShield
+    WeaponSpawnR	RustySword
     [/Stats]
     [XP]
     # 2-10

diff --git a/config/equipments.cfg b/config/equipments.cfg
@@ -13,6 +13,17 @@
 # MagicalDefense   Magical defense
 
 [EquipmentDefinitions]
+[Equipment]
+    Name	RustySword
+    [Stats]
+    MeshName	Longsword.mesh
+    PhysicalDamage	0.2
+    MagicalDamage	0
+    Range	1
+    PhysicalDefense	0
+    MagicalDefense	0
+    [/Stats]
+[/Equipment]
 [Equipment]
     Name	Longsword
     [Stats]
@@ -24,6 +35,17 @@
     MagicalDefense	0
     [/Stats]
 [/Equipment]
+[Equipment]
+    Name	RustyShield
+    [Stats]
+    MeshName	Roundshield.mesh
+    PhysicalDamage	0
+    MagicalDamage	0
+    Range	1
+    PhysicalDefense	0.1
+    MagicalDefense	0
+    [/Stats]
+[/Equipment]
 [Equipment]
     Name	Roundshield
     [Stats]

diff --git a/gui/OpenDungeonsMenuConfigureSeats.layout b/gui/OpenDungeonsMenuConfigureSeats.layout
@@ -45,6 +45,12 @@
                <Property name="FrameEnabled" value="False" />
                <Property name="BackgroundEnabled" value="False" />
             </Window>
+            <Window type="OD/StaticText" name="TextTeamIdTitle" >
+               <Property name="Area" value="{{1,-80},{0,40},{1,-20},{0,70}}" />
+               <Property name="Text" value="Team" />
+               <Property name="FrameEnabled" value="False" />
+               <Property name="BackgroundEnabled" value="False" />
+            </Window>
             <Window type="OD/MainMenuButton" name="BackButton" >
                 <Property name="Area" value="{{0.5,-228},{1,-100},{0.5,-64},{1,-20}}" />
                 <Property name="Text" value="Back" />

diff --git a/levels/multiplayer/TestMultiplayer.level b/levels/multiplayer/TestMultiplayer.level
@@ -13,7 +13,7 @@ FightMusic	The_Dark_Amulet.ogg
 2	2	Choice	Choice	252	211	2	1000
 3	3	Choice	Choice	167	104	3	1000
 4	4	Choice	Choice	266	92	4	1000
-5	5	none	200	200	5	1000
+5	5	Inactive	Keeper	200	200	5	1000
 [/Seats]
 
 [Goals]
@@ -5876,102 +5876,102 @@ ProtectDungeonTemple	NULL
 [Creatures]
 # SeatId	ClassName	Name	Level	CurrentXP	CurrentHP	CurrentAwakeness	CurrentHunger	GoldToDeposit	PosX	PosY	PosZ	LeftWeapon RightWeapon
 [Creature]
-1	ConstructWorker	ConstructWorker1	1	0	125	100	0	0	193	206	0	none	none
+1	ConstructWorker	ConstructWorker1	1	0	max	100	0	0	193	206	0	none	none
 [/Creature]
 [Creature]
-2	Gnome	Gnome2	1	0	125	100	0	0	194	311	0	Roundshield	Longsword
+2	Gnome	Gnome2	1	0	max	100	0	0	194	311	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-3	Goblin	Goblin3	1	0	125	100	0	0	161	201	0	Roundshield	Longsword
+3	Goblin	Goblin3	1	0	max	100	0	0	161	201	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-5	PitDemon	PitDemon5	1	0	125	100	0	0	159	202	0	none	none
+5	PitDemon	PitDemon5	1	0	max	100	0	0	159	202	0	none	none
 [/Creature]
 [Creature]
-2	Wizard	Wizard7	1	0	125	100	0	0	199	311	0	Staff	none
+2	Wizard	Wizard7	1	0	max	100	0	0	199	311	0	Staff	none
 [/Creature]
 [Creature]
-3	Tentacle1	Tentacle18	1	0	125	100	0	0	162	198	0	none	none
+3	Tentacle1	Tentacle18	1	0	max	100	0	0	162	198	0	none	none
 [/Creature]
 [Creature]
-4	Tentacle2	Tentacle29	1	0	125	100	0	0	158	201	0	none	none
+4	Tentacle2	Tentacle29	1	0	max	100	0	0	158	201	0	none	none
 [/Creature]
 [Creature]
-5	Troll	Troll10	1	0	125	100	0	0	186	235	0	none	none
+5	Troll	Troll10	1	0	max	100	0	0	186	235	0	none	none
 [/Creature]
 [Creature]
-2	Knight	Knight_c2	1	0	125	100	0	0	192	311	0	Roundshield	Longsword
+2	Knight	Knight_c2	1	0	max	100	0	0	192	311	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-3	Knight	Knight_c3	1	0	125	100	0	0	192	314	0	Roundshield	Longsword
+3	Knight	Knight_c3	1	0	max	100	0	0	192	314	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-4	Knight	Knight_c4	1	0	125	100	0	0	196	315	0	Roundshield	Longsword
+4	Knight	Knight_c4	1	0	max	100	0	0	196	315	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-5	Knight	Knight_c5	1	0	125	100	0	0	194	315	0	Roundshield	Longsword
+5	Knight	Knight_c5	1	0	max	100	0	0	194	315	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-5	LizardMan	LizardMan_001	1	0	125	100	0	0	185	233	0	Roundshield	Longsword
+5	LizardMan	LizardMan_001	1	0	max	100	0	0	185	233	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-1	Kobold	Kobold	1	0	125	100	0	0	197	205	0	none	none
+1	Kobold	Kobold	1	0	max	100	0	0	197	205	0	none	none
 [/Creature]
 [Creature]
-1	Kobold	Kobold_012	1	0	125	100	0	0	193	205	0	Roundshield	Longsword
+1	Kobold	Kobold_012	1	0	max	100	0	0	193	205	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-1	Kobold	Kobold_007	1	0	125	100	0	0	195	205	0	none	none
+1	Kobold	Kobold_007	1	0	max	100	0	0	195	205	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf1	Dwarf1_001	1	0	145	100	0	0	221	189	0	Roundshield	Sabre
+2	Dwarf1	Dwarf1_001	1	0	max	100	0	0	221	189	0	Roundshield	Sabre
 [/Creature]
 [Creature]
-2	Dwarf2	Dwarf1_002	1	0	145	100	0	0	226	165	0	none	none
+2	Dwarf2	Dwarf1_002	1	0	max	100	0	0	226	165	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf3	Dwarf1_004	1	0	145	100	0	0	213	157	0	none	none
+2	Dwarf3	Dwarf1_004	1	0	max	100	0	0	213	157	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf2	Dwarf1_006	1	0	145	100	0	0	214	141	0	none	none
+2	Dwarf2	Dwarf1_006	1	0	max	100	0	0	214	141	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf3	Dwarf1_007	1	0	145	100	0	0	212	143	0	none	none
+2	Dwarf3	Dwarf1_007	1	0	max	100	0	0	212	143	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf3	Dwarf2_001	1	0	145	100	0	0	264	221	0	none	none
+2	Dwarf3	Dwarf2_001	1	0	max	100	0	0	264	221	0	none	none
 [/Creature]
 [Creature]
-2	Dwarf2	Dwarf2_002	1	0	145	100	0	0	216	185	0	none	Longsword
+2	Dwarf2	Dwarf2_002	1	0	max	100	0	0	216	185	0	none	Longsword
 [/Creature]
 [Creature]
-2	Dwarf1	Dwarf3_001	1	0	145	100	0	0	217	187	0	Roundshield	Longsword
+2	Dwarf1	Dwarf3_001	1	0	max	100	0	0	217	187	0	Roundshield	Longsword
 [/Creature]
 [Creature]
-3	LizardMan	LizardMan_002	1	0	180	100	0	0	229	168	0	none	none
+3	LizardMan	LizardMan_002	1	0	max	100	0	0	229	168	0	none	none
 [/Creature]
 [Creature]
-2	Kreatur	Kre	1	0	180	100	0	0	262	220	0	none	none
+2	Kreatur	Kre	1	0	max	100	0	0	262	220	0	none	none
 [/Creature]
 [Creature]
-2	Orc	Orc_0001	1	0	165	100	0	0	228	166	0	none	Longsword
+2	Orc	Orc_0001	1	0	max	100	0	0	228	166	0	none	Longsword
 [/Creature]
 [Creature]
-2	Orc	Orc_0002	1	0	165	100	0	0	262	222	0	none	Longsword
+2	Orc	Orc_0002	1	0	max	100	0	0	262	222	0	none	Longsword
 [/Creature]
 [Creature]
-3	Kreatur	Kreatur_001	1	0	180	100	0	0	161	113	0	none	none
+3	Kreatur	Kreatur_001	1	0	max	100	0	0	161	113	0	none	none
 [/Creature]
 [Creature]
-3	Kreatur	Kreatur_002	1	0	180	100	0	0	159	101	0	none	none
+3	Kreatur	Kreatur_002	1	0	max	100	0	0	159	101	0	none	none
 [/Creature]
 [Creature]
-3	Kreatur	Kreatur_003	1	0	180	100	0	0	176	98	0	none	none
+3	Kreatur	Kreatur_003	1	0	max	100	0	0	176	98	0	none	none
 [/Creature]
 [Creature]
-3	Kreatur	Kreatur_004	1	0	180	100	0	0	168	99	0	none	none
+3	Kreatur	Kreatur_004	1	0	max	100	0	0	168	99	0	none	none
 [/Creature]
 [Creature]
-3	Kreatur	Kreatur_006	1	0	180	100	0	0	162	100	0	none	none
+3	Kreatur	Kreatur_006	1	0	max	100	0	0	162	100	0	none	none
 [/Creature]
 [/Creatures]
diff --git a/levels/multiplayer/TestMultiplayerSmall1v1.level b/levels/multiplayer/TestMultiplayerSmall1v1.level
@@ -502,6 +502,6 @@ ProtectDungeonTemple	NULL
 [Creatures]
 # SeatId	ClassName	Name	Level	CurrentXP	CurrentHP	CurrentAwakeness	CurrentHunger	GoldToDeposit	PosX	PosY	PosZ	LeftWeapon	RightWeapon
 [Creature]
-1	ConstructWorker	ConstructWorker1	1	0	4	100	0	0	7	7	0	none	none
+1	ConstructWorker	ConstructWorker1	1	0	max	100	0	0	7	7	0	none	none
 [/Creature]
 [/Creatures]
diff --git a/levels/multiplayer/TestMultiplayerSmallAlliance.level b/levels/multiplayer/TestMultiplayerSmallAlliance.level
@@ -752,6 +752,6 @@ ProtectDungeonTemple	NULL
 [Creatures]
 # SeatId	ClassName	Name	Level	CurrentXP	CurrentHP	CurrentAwakeness	CurrentHunger	GoldToDeposit	PosX	PosY	PosZ	LeftWeapon RightWeapon
 [Creature]
-1	ConstructWorker	ConstructWorker1	1	0	125	100	0	0	7	7	0	none	none
+1	ConstructWorker	ConstructWorker1	1	0	max	100	0	0	7	7	0	none	none
 [/Creature]
 [/Creatures]
diff --git a/levels/multiplayer/TestMultiplayerSmallFreeForAll.level b/levels/multiplayer/TestMultiplayerSmallFreeForAll.level
@@ -752,6 +752,6 @@ ProtectDungeonTemple	NULL
 [Creatures]
 # SeatId	ClassName	Name	Level	CurrentXP	CurrentHP	CurrentAwakeness	CurrentHunger	GoldToDeposit	PosX	PosY	PosZ	LeftWeapon RightWeapon
 [Creature]
-1	ConstructWorker	ConstructWorker1	1	0	125	100	0	0	7	7	0	none	none
+1	ConstructWorker	ConstructWorker1	1	0	max	100	0	0	7	7	0	none	none
 [/Creature]
 [/Creatures]
diff --git a/levels/skirmish/Scream in the Dark.level b/levels/skirmish/Scream in the Dark.level
@@ -5249,15 +5249,15 @@ ProtectDungeonTemple	NULL
 [Creatures]
 # SeatId	ClassName	Name	Level	CurrentXP	CurrentHP	CurrentAwakeness	CurrentHunger	GoldToDeposit	PosX	PosY	PosZ	LeftWeapon RightWeapon
 [Creature]
-5	Dragon	Dragon1	10	0	30	100	0	0	13	55	0	none	none
+5	Dragon	Dragon1	10	0	max	100	0	0	13	55	0	none	none
 [/Creature]
 [Creature]
-5	Dragon	Dragon2	10	0	30	100	0	0	13	54	0	none	none
+5	Dragon	Dragon2	10	0	max	100	0	0	13	54	0	none	none
 [/Creature]
 [Creature]
-5	Dragon	Dragon3	10	0	30	100	0	0	87	58	0	none	none
+5	Dragon	Dragon3	10	0	max	100	0	0	87	58	0	none	none
 [/Creature]
 [Creature]
-5	Dragon	Dragon4	10	0	30	100	0	0	87	57	0	none	none
+5	Dragon	Dragon4	10	0	max	100	0	0	87	57	0	none	none
 [/Creature]
 [/Creatures]