diff --git a/Card_Template.blend b/Card_Template.blend1 similarity index 100% rename from Card_Template.blend rename to Card_Template.blend1 diff --git a/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.md5 b/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.md5 index b2c1a95..3343db0 100644 --- a/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.md5 +++ b/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.md5 @@ -1,3 +1,3 @@ -source_md5="eb91e1185ff76b10d7a4f354e17ffb56" -dest_md5="81c0262943d3fdea5b2f7df6385c64fd" +source_md5="477bc93796f16089b049552bd9aab759" +dest_md5="26b57e7ecef6103a8c1aecaba90772c1" diff --git a/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.mesh b/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.mesh index 9830fb0..1469a5f 100644 Binary files a/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.mesh and b/Game_Engine_Swap/School Project Files/.import/gamefield.obj-b58996afc17d34de3c3418adfe116db1.mesh differ diff --git a/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.md5 b/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.md5 new file mode 100644 index 0000000..3343db0 --- /dev/null +++ b/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.md5 @@ -0,0 +1,3 @@ +source_md5="477bc93796f16089b049552bd9aab759" +dest_md5="26b57e7ecef6103a8c1aecaba90772c1" + diff --git a/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh b/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh new file mode 100644 index 0000000..1469a5f Binary files /dev/null and b/Game_Engine_Swap/School Project Files/.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh differ diff --git a/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.mtl b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.mtl new file mode 100644 index 0000000..22ae829 --- /dev/null +++ b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'Card_Template.blend' +# Material Count: 1 + +newmtl Material +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd arena_field.png diff --git a/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.obj b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.obj index d0dd47a..0415c6a 100644 --- a/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.obj +++ b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gamefield.obj @@ -1,46 +1,40 @@ -# Blender 3.4.1 +# Blender v3.4.1 OBJ File: 'Card_Template.blend' # www.blender.org -mtllib gamefield.mtl -o BoardField -v 1.920000 -0.050000 -2.731402 -v 1.920000 0.050000 -2.731402 -v 1.920000 -0.050000 2.708598 -v 1.920000 0.050000 2.708598 -v -1.920000 -0.050000 -2.731402 -v -1.920000 0.050000 -2.731402 -v -1.920000 -0.050000 2.708598 -v -1.920000 0.050000 2.708598 -vn -0.0000 -1.0000 -0.0000 -vn -0.0000 -0.0000 1.0000 -vn -1.0000 -0.0000 -0.0000 -vn -0.0000 1.0000 -0.0000 -vn 1.0000 -0.0000 -0.0000 -vn -0.0000 -0.0000 -1.0000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 0.000000 1.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -s 0 +mtllib Card_Template.mtl +o Cube_Cube.001 +v -1.779980 -0.015007 2.505141 +v -1.779980 0.015007 2.505141 +v -1.779980 -0.015007 -2.505141 +v -1.779980 0.015007 -2.505141 +v 1.779980 -0.015007 2.505141 +v 1.779980 0.015007 2.505141 +v 1.779980 -0.015007 -2.505141 +v 1.779980 0.015007 -2.505141 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 usemtl Material -f 1/1/1 3/7/1 7/17/1 5/14/1 -f 4/10/2 8/20/2 7/17/2 3/8/2 -f 8/19/3 6/15/3 5/13/3 7/18/3 -f 6/16/4 8/20/4 4/11/4 2/4/4 -f 2/5/5 4/12/5 3/9/5 1/2/5 -f 6/16/6 2/6/6 1/3/6 5/14/6 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 diff --git a/Game_Engine_Swap/School Project Files/Assets/MapAssets/gameobject.obj.import b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gameobject.obj.import new file mode 100644 index 0000000..5ba23a8 --- /dev/null +++ b/Game_Engine_Swap/School Project Files/Assets/MapAssets/gameobject.obj.import @@ -0,0 +1,19 @@ +[remap] + +importer="wavefront_obj" +type="Mesh" +path="res://.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh" + +[deps] + +files=[ "res://.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh" ] + +source_file="res://Assets/MapAssets/gameobject.obj" +dest_files=[ "res://.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh", "res://.import/gameobject.obj-8397391060e0f57072917eeb79ff9257.mesh" ] + +[params] + +generate_tangents=true +scale_mesh=Vector3( 1, 1, 1 ) +offset_mesh=Vector3( 0, 0, 0 ) +optimize_mesh=true diff --git a/Game_Engine_Swap/School Project Files/Scenes/arena.tscn b/Game_Engine_Swap/School Project Files/Scenes/arena.tscn index 1d38182..6083ab9 100644 --- a/Game_Engine_Swap/School Project Files/Scenes/arena.tscn +++ b/Game_Engine_Swap/School Project Files/Scenes/arena.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Assets/MapAssets/gamefield.obj" type="ArrayMesh" id=1] +[sub_resource type="Skin" id=1] + [node name="Arena" type="Spatial"] [node name="PlayField" type="Node" parent="."] @@ -59,6 +61,7 @@ material/0 = null [node name="EffectField2" type="MeshInstance" parent="PlayField/Player Side/Effect"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, 6 ) mesh = ExtResource( 1 ) +skin = SubResource( 1 ) material/0 = null [node name="Enemy Side" type="Node" parent="PlayField"] diff --git a/card files/Card_Template.blend b/card files/Card_Template.blend new file mode 100644 index 0000000..a59e989 Binary files /dev/null and b/card files/Card_Template.blend differ diff --git a/Texture Template.png b/card files/Texture Template.png similarity index 100% rename from Texture Template.png rename to card files/Texture Template.png diff --git a/Texture Template.psd b/card files/Texture Template.psd similarity index 100% rename from Texture Template.psd rename to card files/Texture Template.psd diff --git a/card files/arena _field/Card_Template.blend b/card files/arena _field/Card_Template.blend new file mode 100644 index 0000000..ffb47f6 Binary files /dev/null and b/card files/arena _field/Card_Template.blend differ diff --git a/card files/arena _field/Card_Template.blend1 b/card files/arena _field/Card_Template.blend1 new file mode 100644 index 0000000..c01db4f Binary files /dev/null and b/card files/arena _field/Card_Template.blend1 differ diff --git a/card files/arena _field/Card_Template.fbx b/card files/arena _field/Card_Template.fbx new file mode 100644 index 0000000..60462f0 Binary files /dev/null and b/card files/arena _field/Card_Template.fbx differ diff --git a/card files/arena _field/Card_Template.mtl b/card files/arena _field/Card_Template.mtl new file mode 100644 index 0000000..22ae829 --- /dev/null +++ b/card files/arena _field/Card_Template.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'Card_Template.blend' +# Material Count: 1 + +newmtl Material +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd arena_field.png diff --git a/card files/arena _field/Card_Template.obj b/card files/arena _field/Card_Template.obj new file mode 100644 index 0000000..0415c6a --- /dev/null +++ b/card files/arena _field/Card_Template.obj @@ -0,0 +1,40 @@ +# Blender v3.4.1 OBJ File: 'Card_Template.blend' +# www.blender.org +mtllib Card_Template.mtl +o Cube_Cube.001 +v -1.779980 -0.015007 2.505141 +v -1.779980 0.015007 2.505141 +v -1.779980 -0.015007 -2.505141 +v -1.779980 0.015007 -2.505141 +v 1.779980 -0.015007 2.505141 +v 1.779980 0.015007 2.505141 +v 1.779980 -0.015007 -2.505141 +v 1.779980 0.015007 -2.505141 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl Material +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 diff --git a/card files/arena _field/arena_field.png b/card files/arena _field/arena_field.png new file mode 100644 index 0000000..958adc2 Binary files /dev/null and b/card files/arena _field/arena_field.png differ diff --git a/card files/arena _field/arena_vield.psd b/card files/arena _field/arena_vield.psd new file mode 100644 index 0000000..a8c6735 Binary files /dev/null and b/card files/arena _field/arena_vield.psd differ