Add Extra Desert Bridges

+fixed typo with Microwave gun +fixed map with missing Ant & zombie error
Inq8 · Apr 13, 2020 · 94621d2 · 94621d2
1 parent 6f81fb2
commit 94621d2
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 27 deletions.
diff --git a/mods/ca/bits/desert/bridgeh1.des b/mods/ca/bits/desert/bridgeh1.des
diff --git a/mods/ca/bits/desert/bridgeh2.des b/mods/ca/bits/desert/bridgeh2.des
diff --git a/mods/ca/bits/desert/bridgeh3.des b/mods/ca/bits/desert/bridgeh3.des
diff --git a/mods/ca/bits/desert/bridgehb1.des b/mods/ca/bits/desert/bridgehb1.des
diff --git a/mods/ca/bits/desert/bridgehb2.des b/mods/ca/bits/desert/bridgehb2.des
diff --git a/mods/ca/bits/desert/bridgehb3.des b/mods/ca/bits/desert/bridgehb3.des
diff --git a/mods/ca/bits/desert/bridgehb4.des b/mods/ca/bits/desert/bridgehb4.des
diff --git a/mods/ca/bits/desert/bridgehb5.des b/mods/ca/bits/desert/bridgehb5.des
diff --git a/mods/ca/bits/desert/bridgehd1.des b/mods/ca/bits/desert/bridgehd1.des
diff --git a/mods/ca/bits/desert/bridgehd2.des b/mods/ca/bits/desert/bridgehd2.des
diff --git a/mods/ca/bits/desert/bridgehd3.des b/mods/ca/bits/desert/bridgehd3.des
diff --git a/mods/ca/bits/desert/bridgev1.des b/mods/ca/bits/desert/bridgev1.des
diff --git a/mods/ca/bits/desert/bridgev2.des b/mods/ca/bits/desert/bridgev2.des
diff --git a/mods/ca/bits/desert/bridgev3.des b/mods/ca/bits/desert/bridgev3.des
diff --git a/mods/ca/bits/desert/bridgevb1.des b/mods/ca/bits/desert/bridgevb1.des
diff --git a/mods/ca/bits/desert/bridgevb2.des b/mods/ca/bits/desert/bridgevb2.des
diff --git a/mods/ca/bits/desert/bridgevb3.des b/mods/ca/bits/desert/bridgevb3.des
diff --git a/mods/ca/bits/desert/bridgevb4.des b/mods/ca/bits/desert/bridgevb4.des
diff --git a/mods/ca/bits/desert/bridgevb5.des b/mods/ca/bits/desert/bridgevb5.des
diff --git a/mods/ca/bits/desert/bridgevd1.des b/mods/ca/bits/desert/bridgevd1.des
diff --git a/mods/ca/bits/desert/bridgevd2.des b/mods/ca/bits/desert/bridgevd2.des
diff --git a/mods/ca/bits/desert/bridgevd3.des b/mods/ca/bits/desert/bridgevd3.des
diff --git a/mods/ca/maps/Sidestep/map.yaml b/mods/ca/maps/Sidestep/map.yaml
@@ -339,7 +339,7 @@ Actors:
 	Actor114: v13
 		Owner: Neutral
 		Location: 8,87
-	Actor264: ant
+	Actor264: einstein
 		Owner: Neutral
 		Location: 9,87
 		Facing: 92
@@ -739,7 +739,7 @@ Actors:
 	Actor263: t02
 		Owner: Neutral
 		Location: 57,86
-	Actor265: zombie
+	Actor265: delphi
 		Owner: Neutral
 		Location: 88,9
 		SubCell: 3

diff --git a/mods/ca/maps/sunstroke.oramap b/mods/ca/maps/sunstroke.oramap
diff --git a/mods/ca/tilesets/desert.yaml b/mods/ca/tilesets/desert.yaml
@@ -3303,7 +3303,7 @@ Templates:
 			4: Road
 	Template@714:
 		Id: 714
-		Images: bridgev1.tem
+		Images: bridgev1.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3321,7 +3321,7 @@ Templates:
 			11: Rock
 	Template@715:
 		Id: 715
-		Images: bridgevd1.tem
+		Images: bridgevd1.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3339,7 +3339,7 @@ Templates:
 			11: Rock
 	Template@716:
 		Id: 716
-		Images: bridgevb1.tem
+		Images: bridgevb1.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3357,7 +3357,7 @@ Templates:
 			11: Rock
 	Template@717:
 		Id: 717
-		Images: bridgev2.tem
+		Images: bridgev2.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3375,7 +3375,7 @@ Templates:
 			11: Clear
 	Template@718:
 		Id: 718
-		Images: bridgevd2.tem
+		Images: bridgevd2.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3393,7 +3393,7 @@ Templates:
 			11: Clear
 	Template@719:
 		Id: 719
-		Images: bridgevb2.tem
+		Images: bridgevb2.des
 		Size: 4,3
 		Categories: Bridge
 		Tiles:
@@ -3411,7 +3411,7 @@ Templates:
 			11: Clear
 	Template@720:
 		Id: 720
-		Images: bridgev3.tem
+		Images: bridgev3.des
 		Size: 4,2
 		Categories: Bridge
 		Tiles:
@@ -3425,7 +3425,7 @@ Templates:
 			7: Rock
 	Template@721:
 		Id: 721
-		Images: bridgevd3.tem
+		Images: bridgevd3.des
 		Size: 4,2
 		Categories: Bridge
 		Tiles:
@@ -3439,7 +3439,7 @@ Templates:
 			7: Rock
 	Template@722:
 		Id: 722
-		Images: bridgevb3.tem
+		Images: bridgevb3.des
 		Size: 4,2
 		Categories: Bridge
 		Tiles:
@@ -3453,7 +3453,7 @@ Templates:
 			7: Rock
 	Template@723:
 		Id: 723
-		Images: bridgevb4.tem
+		Images: bridgevb4.des
 		Size: 4,2
 		Categories: Bridge
 		Tiles:
@@ -3467,7 +3467,7 @@ Templates:
 			7: Water
 	Template@724:
 		Id: 724
-		Images: bridgevb5.tem
+		Images: bridgevb5.des
 		Size: 4,2
 		Categories: Bridge
 		Tiles:
@@ -3481,7 +3481,7 @@ Templates:
 			7: Rock
 	Template@725:
 		Id: 725
-		Images: br3f.tem
+		Images: br3f.des
 		Frames: 0, 1, 0, 0, 0, 5, 6, 7
 		Size: 4,2
 		Categories: Bridge
@@ -3496,7 +3496,7 @@ Templates:
 			7: Water
 	Template@726:
 		Id: 726
-		Images: bridgeh1.tem
+		Images: bridgeh1.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3514,7 +3514,7 @@ Templates:
 			11: Rock
 	Template@727:
 		Id: 727
-		Images: bridgehd1.tem
+		Images: bridgehd1.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3532,7 +3532,7 @@ Templates:
 			11: Rock
 	Template@728:
 		Id: 728
-		Images: bridgehb1.tem
+		Images: bridgehb1.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3550,7 +3550,7 @@ Templates:
 			11: Rock
 	Template@729:
 		Id: 729
-		Images: bridgeh2.tem
+		Images: bridgeh2.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3568,7 +3568,7 @@ Templates:
 			11: Beach
 	Template@730:
 		Id: 730
-		Images: bridgehd2.tem
+		Images: bridgehd2.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3586,7 +3586,7 @@ Templates:
 			11: Beach
 	Template@731:
 		Id: 731
-		Images: bridgehb2.tem
+		Images: bridgehb2.des
 		Size: 3,4
 		Categories: Bridge
 		Tiles:
@@ -3604,7 +3604,7 @@ Templates:
 			11: Beach
 	Template@732:
 		Id: 732
-		Images: bridgeh3.tem
+		Images: bridgeh3.des
 		Size: 2,4
 		Categories: Bridge
 		Tiles:
@@ -3618,7 +3618,7 @@ Templates:
 			7: Rock
 	Template@733:
 		Id: 733
-		Images: bridgehd3.tem
+		Images: bridgehd3.des
 		Size: 2,4
 		Categories: Bridge
 		Tiles:
@@ -3632,7 +3632,7 @@ Templates:
 			7: Rock
 	Template@734:
 		Id: 734
-		Images: bridgehb3.tem
+		Images: bridgehb3.des
 		Size: 2,4
 		Categories: Bridge
 		Tiles:
@@ -3646,7 +3646,7 @@ Templates:
 			7: Rock
 	Template@735:
 		Id: 735
-		Images: bridgehb4.tem
+		Images: bridgehb4.des
 		Size: 2,4
 		Categories: Bridge
 		Tiles:
@@ -3660,7 +3660,7 @@ Templates:
 			7: Water
 	Template@736:
 		Id: 736
-		Images: bridgehb5.tem
+		Images: bridgehb5.des
 		Size: 2,4
 		Categories: Bridge
 		Tiles:
@@ -3674,7 +3674,7 @@ Templates:
 			7: Rock
 	Template@737:
 		Id: 737
-		Images: br3f.tem
+		Images: br3f.des
 		Frames: 0, 1, 0, 0, 0, 5, 6, 7
 		Size: 2,4
 		Categories: Bridge

diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml
@@ -996,7 +996,7 @@ MicrowaveZapSound:
 	Inherits: MicrowaveZap
 	Report: coreup1.aud
 	Projectile: InstantHit
-	Warhead1@Dam: SpreadDamage
+	Warhead@1Dam: SpreadDamage
 		Damage: 1
 		Versus:
 			None: 0