Merge branch 'master' into patch-1

frogatto · Apr 13, 2022 · 04d3e84 · 04d3e84
2 parents 8d07b62 + bc53ea5
commit 04d3e84
Show file tree

Hide file tree

Showing 26 changed files with 1,255 additions and 755 deletions.
diff --git a/README.md b/README.md
@@ -13,4 +13,4 @@ The game's source code license can be found in the [LICENSE](/LICENSE) file in t
 ### Engine
 Frogatto is driven by [Anura](https://github.com/anura-engine/anura), a very flexible, high-performance 2d game engine we've developed - it's suitable for almost any 2D videogame, and has a few special features for pixel-art and graphical-effects commonly seen in pixel-art titles.  It has already been used to ship another complete game, called [Cube Trains](https://ddr0.ca/cube%20trains/index), and several others are in the works (e.g. [Argentum Age](https://github.com/davewx7/citadel)).
 
-This repository houses the Frogatto module for the Anura engine, but versions 1.3.1 of Frogatto and prior contain the engine as well and are incompatible with the Anura repository.
+This repository houses the Frogatto module for the Anura engine, but versions 1.3.1 of Frogatto and prior contain the engine as well and are incompatible with the Anura repository.
diff --git a/data/level/Dungeon/killer-bunnies.cfg b/data/level/Dungeon/killer-bunnies.cfg
@@ -698,25 +698,44 @@
 			       [set(child.is_a_boss, true),
 			        set(child.event_handlers.create,
 					     q(if(level.player.get_stored_event('killer_bunnies_faux_boss_fight_won'), remove_object(me))) ),
-					set(child.event_handlers.die,
-					     q([
-			level.player.store_event('killer_bunnies_faux_boss_fight_won',1),
-			set_solid(3400, -1720, 3424, -1096, false),
-			set_solid(4236, -1720, 4240, -1096, false),
-			set(level.lock_screen, null),
-			title('Victory!'),
-			spawn('padlock_key',midpoint_x, midpoint_y-150,{valid_levels: ['killer-bunnies.cfg'], color:'purple'},animation('normal')),
-			lib.audio.play_music(me,'FrogattoTitle.ogg'),
-			lib.audio.play_music(me,'specialitem.ogg', [enum music_once]),
-		]))]),
+					set(child.event_handlers.die,  q([
+						level.player.store_event('killer_bunnies_faux_boss_fight_won',1),
+						set_solid(3818 - screen_w/2 - 32, solid_box_top, 3818 - screen_w/2     , solid_box_bottom, false),
+						set_solid(3818 + screen_w/2     , solid_box_top, 3818 + screen_w/2 + 32, solid_box_bottom, false),
+			
+			
+						set(level.lock_screen, null),
+						title('Victory!'),
+						spawn('padlock_key',midpoint_x, midpoint_y-150,{valid_levels: ['killer-bunnies.cfg'], color:'purple'},animation('normal')),
+						lib.audio.play_music(me,'FrogattoTitle.ogg'),
+						lib.audio.play_music(me,'specialitem.ogg', [enum music_once]),
+					]
+						where screen_w = level.camera_position[2]
+						where screen_h = level.camera_position[3]
+						where solid_box_top = -1720
+						where solid_box_bottom = -1096					
+					)
+				)
+			]
+		),
+
+		set(level.lock_screen, [3818, -1200]),
+		set_solid(3818 - screen_w/2 - 32, solid_box_top, 3818 - screen_w/2     , solid_box_bottom, true),
+		set_solid(3818 + screen_w/2     , solid_box_top, 3818 + screen_w/2 + 32, solid_box_bottom, true),
 
-		set(level.lock_screen, [3832, -1200]),
-		set_solid(3400, -1720, 3424, -1096, true),
-		set_solid(4236, -1720, 4240, -1096, true),
 		lib.audio.play_music(me,'neoBoss.ogg'),
 		transient_speech_dialog(level.player, [~That guy sure doesn't look glad to meet me!~]),
 		die()
-	]",
+		
+	]
+		where screen_w = level.camera_position[2]
+		where screen_h = level.camera_position[3]
+		where solid_box_top = -1720
+		where solid_box_bottom = -1096
+	
+	
+	",
+
 			"property_data": {
 				"_x2_bound": 4448,
 				"_x_bound": 3520,