slapin/academy2-game
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented combat; disabled palace for now

Browse Source
This commit is contained in:
Segey Lapin
2021-12-29 01:39:55 +03:00
parent f62e7fa720
commit 2573492f59
21 changed files with 150553 additions and 115055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
autoload/characters.gd
View File

@@ -39,20 +39,20 @@ var roommates = {}
func _ready():
var capsule_male = CapsuleShape.new()
capsule_male.radius = 0.3
capsule_male.height = 1.2
capsule_male.margin = 0.05
capsule_male.radius = 0.4
capsule_male.height = 1.12
capsule_male.margin = 0.08
var capsule_female = CapsuleShape.new()
capsule_female.radius = 0.2
capsule_female.height = 1.1
capsule_female.margin = 0.05
capsule_female.radius = 0.35
capsule_female.height = 0.9
capsule_female.margin = 0.08
CharacterSystemWorld.add_character_scene(female, {}, "female")
CharacterSystemWorld.add_character_scene(male, {}, "male")
for k in modules.keys():
CharacterSystemWorld.add_module(k, modules[k])
CharacterSystemWorld.set_face_ctrl_scene(face_ctrl)
CharacterSystemWorld.add_character_shape(capsule_female, Transform(Basis().rotated(Vector3(1, 0, 0), -PI/2.0), Vector3(0, 0.751, 0)), "female")
CharacterSystemWorld.add_character_shape(capsule_male, Transform(Basis().rotated(Vector3(1, 0, 0), -PI/2.0), Vector3(0, 0.899, 0)), "male")
CharacterSystemWorld.add_character_shape(capsule_female, Transform(Basis().rotated(Vector3(1, 0, 0), -PI/2.0), Vector3(0, 0.805, 0)), "female")
CharacterSystemWorld.add_character_shape(capsule_male, Transform(Basis().rotated(Vector3(1, 0, 0), -PI/2.0), Vector3(0, 0.965, 0)), "male")
set_root_motion_mod(Transform())
var fd = File.new()
fd.open("res://data/names.json", File.READ)

6
autoload/combat.gd Normal file
View File

@@ -0,0 +1,6 @@
extends Node
signal event(ev_name, ev_data)
func _ready():
pass # Replace with function body.

1
autoload/inventory.gd
View File

@@ -40,6 +40,7 @@ func equip(obj, item_name):
print("EQUIP ", item_name, " OK", obj, r)
obj.set_meta("equipped", item_name)
c.set_meta("owner", obj.get_meta("owner"))
c.set_meta("item_name", item_name)
func register_pick_up(m, obj, item_name):
var mdata = {
"method": "pick_up",

1
autoload/orchestration.gd
View File

@@ -60,6 +60,7 @@ class Grabbing:
var cam_to = m.origin + Vector3.UP * 1.4
emit_signal("enable_cinematic_camera", cam_where, cam_to)
func reset_character(b):
assert(b)
b.remove_meta("cmdqueue")
b.remove_meta("cmdq_walk")
b.remove_meta("climb")

4
autoload/streaming.gd
View File

@@ -175,7 +175,7 @@ func setup_first_town(site):
palace_aabb = palace_aabb.grow(48)
print(palace_aabb)
aabbs.push_back(palace_aabb)
stream_obj("palace", Transform(Basis(), center))
# stream_obj("palace", Transform(Basis(), center))
for p in range(radial_points.size()):
var ep = radial_points[p]
@@ -278,7 +278,7 @@ func _ready():
# Traffic.set_deny_physics()
# Traffic.set_physics_distance(Vector3(30, -10, 40))
# Traffic.set_debug(true)
Traffic.set_spawn_cooldown(2, 5)
Traffic.set_spawn_cooldown(10, 15)
Traffic.set_default_speed(8.5)
Traffic.add_traffic_vehicle(car)
var water_mat = load("res://water/Water.material")