Release 1.47

Maps/Minecraft dungeons/levels/CP_MINECRAFT_DUNGEONS.tscn

@@ -0,0 +1,64 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://Maps/BaseLevel.gd" type="Script" id=1]
+[ext_resource path="res://Maps/Minecraft dungeons/maps/Minecraft dungeons.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Objects/Misc/spawn_point.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Objects/Game_modes/CheckPoints/checkpoint.tscn" type="PackedScene" id=4]
+
+[node name="CP_MINECRAFT_DUNGEONS" type="Node"]
+
+[node name="Level" type="Node2D" parent="." groups=[
+"Level",
+]]
+script = ExtResource( 1 )
+Level_Name = "Minecraft dungeons"
+
+[node name="BaseMap" parent="Level" instance=ExtResource( 2 )]
+force_update = false
+
+[node name="CP" type="Node" parent="."]
+
+[node name="checkpoint" parent="CP" instance=ExtResource( 4 )]
+position = Vector2( 1598.29, 1545.97 )
+holding_team = -1
+
+[node name="local_spawns" type="Node" parent="CP/checkpoint"]
+
+[node name="spawn_point" parent="CP/checkpoint/local_spawns" instance=ExtResource( 3 )]
+position = Vector2( 1475.53, 1506.16 )
+
+[node name="checkpoint2" parent="CP" instance=ExtResource( 4 )]
+position = Vector2( 589.847, 2349.87 )
+id = 1
+holding_team = -1
+
+[node name="local_spawns" type="Node" parent="CP/checkpoint2"]
+
+[node name="spawn_point" parent="CP/checkpoint2/local_spawns" instance=ExtResource( 3 )]
+position = Vector2( 485.578, 2269.83 )
+
+[node name="checkpoint3" parent="CP" instance=ExtResource( 4 )]
+position = Vector2( 3030.1, 523.251 )
+id = 2
+holding_team = -1
+
+[node name="local_spawns" type="Node" parent="CP/checkpoint3"]
+
+[node name="spawn_point" parent="CP/checkpoint3/local_spawns" instance=ExtResource( 3 )]
+position = Vector2( 3138.47, 574.691 )
+
+[node name="spawns" type="Node" parent="."]
+
+[node name="spawn_point" parent="spawns" instance=ExtResource( 3 )]
+position = Vector2( 594.604, 461.412 )
+
+[node name="spawn_point2" parent="spawns" instance=ExtResource( 3 )]
+position = Vector2( 970.393, 299.68 )
+
+[node name="spawn_point3" parent="spawns" instance=ExtResource( 3 )]
+position = Vector2( 3053.88, 2183.38 )
+team_id = 1
+
+[node name="spawn_point4" parent="spawns" instance=ExtResource( 3 )]
+position = Vector2( 2673.34, 2359.39 )
+team_id = 1

Maps/level_info.gd

@@ -17,6 +17,7 @@ var levels = {
 		debug = false,
 		desc = "",
 		game_modes = [
+						"CheckPoints", "res://Maps/Minecraft dungeons/levels/CP_MINECRAFT_DUNGEONS.tscn",
 						"Elimination", "res://Maps/Minecraft dungeons/levels/ELIM_MINECRAFT.tscn",
 						"TDM", "res://Maps/Minecraft dungeons/levels/TDM_Minecraft dungeons.tscn",
 						"Zombie Mod", "res://Maps/Minecraft dungeons/levels/Zombie_Minecraft dungeons.tscn"
@@ -53,9 +54,9 @@ var levels = {
 		icon = preload("res://Maps/Dust/minimap.png"),
 		game_modes = [
 				"Zombie Mod", "res://Maps/Dust/Zm_Dust.tscn",
+				"CheckPoints", "res://Maps/Dust/CheckPointsDUST.tscn",
 				"Elimination", "res://Maps/Dust/DustComp.tscn",
-				"TDM","res://Maps/Dust/TDM.tscn",
-				"CheckPoints", "res://Maps/Dust/CheckPointsDUST.tscn"
+				"TDM","res://Maps/Dust/TDM.tscn"
 			],
 		desc = "Standard Map Inspired by dust 2.",
 		debug = false

Maps/shadowMaker.gd

@@ -18,6 +18,7 @@ func _ready():
 	var par = get_parent()
 	if par and par.is_in_group("Level"):
 		force_update = false
+		print("No update")
 
 	if Engine.editor_hint or force_update:
 		add_child(timer)

Menus/menuManager.gd

@@ -118,7 +118,7 @@ func setupAds():
 
 	admob = AdMob.new()
 	admob.is_real = true
-	admob.max_ad_content_rate = "MA"
+	admob.max_ad_content_rate = "T"
 	admob.banner_id = banners[randi() % banners.size()]
 	admob.interstitial_id = interstitials[randi() % interstitials.size()]
 	admob.rewarded_id = videos[randi() % videos.size()]
@@ -127,8 +127,6 @@ func setupAds():
 	admob.load_interstitial()
 	#admob.load_rewarded_video()
 	admob.hide_banner()
-	admob.connect("interstitial_closed", self, "on_interstitial_closed")
-	admob.connect("rewarded_video_closed", self, "on_video_closed")
 
 	admob.connect("banner_loaded", self, "on_banner_loaded")
 	admob.connect("interstitial_loaded", self, "on_interstitial_loaded")
@@ -141,12 +139,6 @@ func setupAds():
 	admob.connect("interstitial_requested", self, "on_interstitial_requested")
 
 
-func on_interstitial_closed():
-	admob.load_interstitial()
-
-func on_video_closed():
-	admob.load_rewarded_video()
-
 func on_banner_loaded():
 	_admob_load_fail_count[0] = 0
 

Objects/Game_modes/CheckPoints/CheckPoints.gd

@@ -34,6 +34,10 @@ func _ready():
 		teams.append(_teams[1])
 		teams.append(_teams[0])
 
+
+	for i in $top_panel/points.get_children():
+		i.hide()
+
 	for i in checkpoints:
 		i.connect("team_captured_point", self, "P_on_team_captured_point")
 		i.connect("local_player_entered", self, "P_on_local_player_entered")
@@ -73,12 +77,15 @@ remotesync func P_syncTime(time : int):
 
 func P_on_team_captured_point(point, show_msg = true):
 	var rect = points_node.get_node(String(point.id))
+	rect.show()
 	var team_name = "Terrorists"
 	if point.holding_team == 0:
 		rect.color = Color8(201, 55, 31)
-	else:
+	elif point.holding_team == 1:
 		team_name = "CT"
 		rect.color = Color8(17,64, 194)
+	else:
+		rect.color = Color.white
 
 	if show_msg:
 		label_node.show()

Objects/Game_modes/CheckPoints/checkpoint.gd

@@ -10,6 +10,7 @@ const update_frames = 5
 var value = 0
 var units_in_chkPt = Array()
 var frame = 0
+var local_spawns = Array()
 
 onready var is_server = get_tree().is_network_server()
 
@@ -24,7 +25,17 @@ func _ready():
 	if holding_team != -1:
 		value = max_points - max_points * holding_team
 	on_new_team_captured()
-
+
+	var node = get_node("local_spawns")
+	if node:
+		local_spawns = node.get_children()
+
+	for i in local_spawns:
+		i.team_id = -2
+		if holding_team == 0:
+			i.team_id = 0
+		if holding_team == 1:
+			i.team_id = 1
 
 func _on_checkpoint_body_entered(body):
 	if body.is_in_group("Unit"):
@@ -71,3 +82,6 @@ func on_new_team_captured():
 		$Sprite.modulate = Color8(17,64, 194)
 	else:
 		$Sprite.modulate = Color8(201, 55, 31)
+
+	for i in local_spawns:
+		i.team_id = holding_team

Objects/Global/game_states.gd

@@ -5,7 +5,7 @@ extends Node
 
 #is exporting for android or not
 var is_android : bool = true
-const current_game_version : float = 1.46
+const current_game_version : float = 1.47
 const invalid_position = Vector2(-999,-999)
 var first_run = false
 

admob-lib/admob.gd

@@ -82,10 +82,12 @@ func init() -> bool:
 func load_banner() -> void:
 	if _admob_singleton != null and not _pause_ads:
 		_admob_singleton.loadBanner(banner_id, banner_on_top)
+		print("Loading Banner")
 
 func load_interstitial() -> void:
 	if _admob_singleton != null and not _pause_ads:
 		_admob_singleton.loadInterstitial(interstitial_id)
+		print("Loading Interstitial")
 
 func is_interstitial_loaded() -> bool:
 	if _admob_singleton != null:
@@ -106,6 +108,7 @@ func is_rewarded_video_loaded() -> bool:
 func show_banner() -> void:
 	if _admob_singleton != null and _is_banner_loaded:
 		_admob_singleton.showBanner()
+		print("showing banner")
 
 func hide_banner() -> void:
 	if _admob_singleton != null:
@@ -114,6 +117,7 @@ func hide_banner() -> void:
 func show_interstitial() -> void:
 	if _admob_singleton != null and _is_interstitial_loaded:
 		_admob_singleton.showInterstitial()
+		print("showing Interstitial")
 	else:
 		emit_signal("interstitial_requested")
 
@@ -137,18 +141,22 @@ func get_banner_dimension() -> Vector2:
 
 func _on_admob_ad_loaded() -> void:
 	_is_banner_loaded = true
+	print("banner loaded")
 	emit_signal("banner_loaded")
 
 func _on_admob_banner_failed_to_load(error_code:int) -> void:
 	_is_banner_loaded = false
 	emit_signal("banner_failed_to_load", error_code)
+	print("banner failed to loaded ", error_code)
 
 func _on_interstitial_failed_to_load(error_code:int) -> void:
 	_is_interstitial_loaded = false
+	print("interstitial failed to loaded ", error_code)
 	emit_signal("interstitial_failed_to_load", error_code)
 
 func _on_interstitial_loaded() -> void:
 	_is_interstitial_loaded = true
+	print("Interstitial loadedzz")
 	emit_signal("interstitial_loaded")
 
 func _on_interstitial_close() -> void:

export_presets.cfg

@@ -49,7 +49,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="output/WarZone_2_arm64.apk"
+export_path="output/WarZone_2_armv7.apk"
 patch_list=PoolStringArray(  )
 script_export_mode=1
 script_encryption_key=""
@@ -67,8 +67,8 @@ custom_template/release=""
 custom_template/use_custom_build=true
 plugins/GodotAdMob=true
 command_line/extra_args=""
-version/code=34
-version/name="1.47b_arm64"
+version/code=35
+version/name="1.47_armv7"
 package/unique_name="com.raptor.inc"
 package/name="warzone2"
 package/signed=true
@@ -91,8 +91,8 @@ keystore/release_password="akjjyglc"
 apk_expansion/enable=false
 apk_expansion/SALT=""
 apk_expansion/public_key=""
-architectures/armeabi-v7a=false
-architectures/arm64-v8a=true
+architectures/armeabi-v7a=true
+architectures/arm64-v8a=false
 architectures/x86=false
 architectures/x86_64=false
 permissions/custom_permissions=PoolStringArray(  )