Complete

Feature/005 main menu

Author: xFrednet

icon.png

@@ -23,7 +23,7 @@ const COLLECTION_TEXT = [
 ]
 
 var _items: Array = Array()
-var _slots: int = 20
+var _slots: int = 12
 
 func _ready() -> void:
 	_display_status("Hey from root")
@@ -76,15 +76,16 @@ func add_item(new_item: Item) -> void:
 func remove_item(item: Item) -> void:
 	_items.erase(item)
 
-func _drop_item(item: Item) -> void:
+func _drop_item(item: Item, display_message: bool = true) -> void:
 	if item.get_parent():
 		item.get_parent().remove_child(item)
 
 	item.set_visible(true)
 	item.set_position(get_global_transform().get_origin())
 	GameData.world.add_entity(item)
 
-	_display_status("I dropped a thingy")
+	if (display_message):
+		_display_status("I dropped a thingy")
 
 func update_mood_display() -> void:
 	GameData.ingame_menu.find_node("tool_status_display").find_node("backpack").set_mood(mood)

tools/backpack/backpack.gd

@@ -24,6 +24,7 @@ const DONT_PICKUP_ITEM_MESSAGE = [
 var _since_last_feed: float = 0.0
 var _hungry_state: int = 0
 var _pickup_blacklist: Array = []
+var _mood_modus = 4
 
 func _ready() -> void:
 	pass
@@ -41,7 +42,7 @@ func give_item_by_id(item_id: String):
 		ItemInfo.WATER_BOTTLE_ID:
 			_display_status("It's just water -.-")
 			_change_mood(5.0)
-			_since_last_feed = 0.0
+			_since_last_feed += 5.0
 		ItemInfo.FISH_ID:
 			_display_status("Uhh un fish, thank you, it will keep me fed")
 			_change_mood(15.0)
@@ -62,27 +63,27 @@ func _process(delta: float) -> void:
 	_since_last_feed += delta
 
 	# Food status
-	if _since_last_feed < 30:
+	if _since_last_feed < 10:
 		_hungry_state = 0
 		_change_mood(0.5 * delta)
-	elif _since_last_feed < 60:
+	elif _since_last_feed < 30:
 		if (_hungry_state == 0):
 			_display_hungry_stage_message(1)
 
 		_hungry_state = 1
-		_change_mood(0.0 * delta)
-	elif _since_last_feed < 90:
+		_change_mood(-1.0 * delta)
+	elif _since_last_feed < 45:
 		if (_hungry_state == 1):
 			_display_hungry_stage_message(2)
 
 		_hungry_state = 2
-		_change_mood(-1.0 * delta)
+		_change_mood(-2.0 * delta)
 	else:
 		if (_hungry_state == 2):
 			_display_hungry_stage_message(3)
 
 		_hungry_state = 3
-		_change_mood(-3.0 * delta)
+		_change_mood(-5.0 * delta)
 
 func _display_hungry_stage_message(stage: int) -> void:
 	var messages = HUNGRY_STATE_CHANGE_MESSAGES[stage]
@@ -112,29 +113,35 @@ func _change_mood(change: float):
 	._change_mood(change)
 
 	var mood = get_mood()
-	if (mood > 90.0):
-		if (last_mood < 75.0):
-			_change_slots(20)
-			_pickup_blacklist.clear()
-	elif (mood > 75.0):
-		if (last_mood > 90.0 || last_mood < 50.0):
-			_change_slots(12)
-		
-		if (last_mood < 50.0):
-			_pickup_blacklist = _pickup_blacklist.slice(0, _pickup_blacklist.size(), 2)
-			
-	elif (mood > 50.0):
-		if (last_mood > 75.0 || last_mood < 25.0):
-			_change_slots(6)
+	
+	if (mood < 25.0):
+		if (_mood_modus != 0):
+			_mood_modus = 0
+			_change_slots(3)
 			_drop_random_stack()
 
-		if (last_mood < 25.0):
+	elif (mood < 50.0):
+		if (_mood_modus == 2):
 			_pickup_blacklist = _pickup_blacklist.slice(0, _pickup_blacklist.size(), 3)
-			
-	elif (mood > 25.0):
-		if (last_mood > 50.0):
-			_change_slots(3)
+		
+		if (_mood_modus != 1):
+			_mood_modus = 1
+			_change_slots(4)
 			_drop_random_stack()
+			
+	elif (mood < 75.0):
+		if (_mood_modus == 4):
+			_pickup_blacklist = _pickup_blacklist.slice(0, _pickup_blacklist.size(), 2)
+		
+		if (_mood_modus != 3):
+			_mood_modus = 3
+			_change_slots(6)
+			
+	elif (mood < 90.0):
+		if (_mood_modus != 4):
+			_mood_modus = 4
+			_change_slots(7)
+			_pickup_blacklist.clear()
 
 func _change_slots(new_slot_count: int) -> void:
 	_display_change_slot_count_message(1 if ((_slots - new_slot_count) > 1) else 0)
@@ -144,6 +151,8 @@ func _change_slots(new_slot_count: int) -> void:
 	var drop_count = min(0, _items.size() - _slots)
 	for index in range(drop_count):
 		_drop_random_stack()
+	
+	GameData.ingame_menu.get_node("backpack_ui").gen_slots()
 
 func _display_change_slot_count_message(change_type: int) -> void:
 	var messages = SLOT_COUNT_CHANGE_MESSAGE[change_type]
@@ -158,4 +167,4 @@ func _drop_random_stack() -> void:
 	var item = _items[index]
 
 	.remove_item(item)
-	._drop_item(item)
+	._drop_item(item, true)

tools/backpack/hungry_backpack.gd

@@ -62,13 +62,13 @@ func get_movement(delta: float) -> Vector2:
 		0, 1:
 			return (input_motion * speed) + (drunk_motion * DRUNK_MOTION_SPEED * delta * 0.5)
 		2:
-			var rot = sin(self.delta * 10) * randf() * 0.5
-			return (input_motion.rotated(rot) * speed) + (drunk_motion * DRUNK_MOTION_SPEED * delta * 0.5)
+			var rot = sin(self.delta * 10) * randf() * 1
+			return (input_motion.rotated(rot) * speed) + (drunk_motion * DRUNK_MOTION_SPEED * delta * 0.75)
 		3:
-			var rot = sin(self.delta * 10) * randf() * 1.5
+			var rot = sin(self.delta * 10) * randf() * 2.5
 			return (input_motion.rotated(rot) * speed) + (drunk_motion * DRUNK_MOTION_SPEED * delta)
 		4:
-			var rot = sin(self.delta * 10) * randf() * 2
+			var rot = sin(self.delta * 10) * randf() * 4
 			return (input_motion.rotated(rot) * speed * 0.75) + (drunk_motion * DRUNK_MOTION_SPEED * delta * speed * 0.2)
 
 	return Vector2()
@@ -137,7 +137,7 @@ func _gen_drunk_motion() -> void:
 			var rot = sin(self.delta * 75)
 			drunk_motion = Vector2(10 * rot, 0)
 		2:
-			drunk_motion = Vector2()
+			drunk_motion = Vector2(randf(), randf())
 		3, 4:
 			var b = 0
 			match drunk_level:

tools/boots/dunk_boots.gd

@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://ui/ingame/ingame_ui.gd" type="Script" id=1]
 [ext_resource path="res://ui/ingame/tool_status_display.tscn" type="PackedScene" id=2]
 [ext_resource path="res://ui/ingame/inventory/backpack_ui.tscn" type="PackedScene" id=3]
+[ext_resource path="res://tools/boots/boots.png" type="Texture" id=4]
+[ext_resource path="res://tools/backpack/backpack.png" type="Texture" id=5]
 
 [node name="control" type="Control"]
 anchor_right = 1.0
@@ -77,6 +79,7 @@ anchor_top = 0.0
 anchor_bottom = 0.0
 margin_top = 0.0
 margin_bottom = 64.0
+texture = ExtResource( 4 )
 
 [node name="weapon" parent="tool_status_display" instance=ExtResource( 2 )]
 visible = false
@@ -90,6 +93,7 @@ anchor_top = 0.0
 anchor_bottom = 0.0
 margin_top = 68.0
 margin_bottom = 132.0
+texture = ExtResource( 5 )
 
 [node name="backpack_ui" parent="." instance=ExtResource( 3 )]
 anchor_left = 0.5

ui/ingame/ingame_ui.tscn

@@ -1,6 +1,9 @@
 extends Control
 
+export var texture: Texture = null
+
 func _ready() -> void:
+	$texture.set_texture(texture)
 	set_status("Hello World")
 	set_mood(75)
 	pass

ui/ingame/tool_status_display.gd

@@ -10,8 +10,8 @@ const INTRO_TEXT = [
 	"So let's get to it. You can find a pice of scrap in each cardinal direction, they should be reachable by following the paths.",
 	"",
 	"Wait before you start, we have a slight problem... Most of our equipment got destroyed. You will get our special tools:",
-	"Karl: These boots control your movement, but I have to warn you. He might have a slight alcohol addiction. Just keep him happy and sover enough to walk and you should be finde.",
-	"Frank: The hungry backpack, he is a trusty companian, if you keep him well fed.",
+	"These boots control your movement, but I have to warn you. He might have a slight alcohol addiction. Just keep him happy and sover enough to walk and you should be finde.",
+	"The hungry backpack, he is a trusty companian, if you keep him well fed.",
 	"Now you should start your adventure. Come to me, when you have colleced the four scrab pieces"
 ]
 

ui/intro/info_text.gd

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ui/intro/texti.png" type="Texture" id=1]
 [ext_resource path="res://ui/intro/info_text.gd" type="Script" id=2]
+[ext_resource path="res://ui/main_menu/controlls.png" type="Texture" id=3]
 
 [node name="intro" type="Control"]
 anchor_right = 1.0
@@ -35,6 +36,20 @@ __meta__ = {
 [node name="into_text_timer" type="Timer" parent="info_text"]
 autostart = true
 
+[node name="controls" type="TextureRect" parent="info_text"]
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -288.0
+margin_top = -160.0
+texture = ExtResource( 3 )
+expand = true
+stretch_mode = 5
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="skip_button" type="Button" parent="info_text"]
 anchor_left = 1.0
 anchor_top = 1.0

ui/intro/intro.tscn

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/controlls.png-0f1b0e92761a0d6ed7c45a2b58477058.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ui/main_menu/controlls.png"
+dest_files=[ "res://.import/controlls.png-0f1b0e92761a0d6ed7c45a2b58477058.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

ui/main_menu/background.png

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ui/main_menu/background.png" type="Texture" id=1]
 [ext_resource path="res://ui/main_menu/main_menu.gd" type="Script" id=2]
+[ext_resource path="res://ui/main_menu/name.png" type="Texture" id=3]
 
 [node name="main_menu" type="Control"]
 anchor_right = 1.0
@@ -26,31 +27,80 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -100.0
-margin_top = -50.0
-margin_right = 100.0
-margin_bottom = 50.0
+margin_left = -114.5
+margin_top = -112.5
+margin_right = 114.5
+margin_bottom = 112.5
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="name" type="TextureRect" parent="button_container"]
+margin_right = 229.0
+margin_bottom = 157.0
+texture = ExtResource( 3 )
+
 [node name="start" type="Button" parent="button_container"]
-margin_right = 200.0
-margin_bottom = 30.0
+margin_top = 161.0
+margin_right = 229.0
+margin_bottom = 191.0
 rect_min_size = Vector2( 0, 30 )
 text = "Start"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="exit" type="Button" parent="button_container"]
-margin_top = 34.0
-margin_right = 200.0
-margin_bottom = 64.0
+margin_top = 195.0
+margin_right = 229.0
+margin_bottom = 225.0
 rect_min_size = Vector2( 0, 30 )
 text = "Exit"
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="name_label" type="Label" parent="."]
+margin_right = 106.0
+margin_bottom = 37.0
+rect_min_size = Vector2( 120, 40 )
+text = "Made by
+xFrednet & Leit2"
+
+[node name="backgound" type="ColorRect" parent="name_label"]
+show_behind_parent = true
+anchor_right = 1.0
+anchor_bottom = 1.0
+rect_min_size = Vector2( 120, 40 )
+color = Color( 0.254902, 0.294118, 0.596078, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="github_label" type="Label" parent="."]
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -266.0
+margin_top = -14.0
+text = "https://github.com/xFrednet/moody-tools"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="backgound2" type="ColorRect" parent="github_label"]
+show_behind_parent = true
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -280.0
+margin_top = -20.0
+rect_min_size = Vector2( 280, 20 )
+color = Color( 0.254902, 0.294118, 0.596078, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [connection signal="button_down" from="button_container/start" to="." method="_on_start_button_down"]
 [connection signal="button_down" from="button_container/exit" to="." method="_on_exit_button_down"]