Commit 2b6a58d1 authored by BNS Mark's avatar BNS Mark

Latest changes, added subfaction system (WIP)

parent 6842e355
......@@ -339,6 +339,58 @@ tag_tableau = 24
tag_animation = 25
tags_end = 26
#Belendor
#Human bones
hb_abdomen = 0
hb_thigh_l = 1
hb_calf_l = 2
hb_foot_l = 3
hb_thigh_r = 4
hb_calf_r = 5
hb_foot_r = 6
hb_spine = 7
hb_thorax = 8
hb_head = 9
hb_shoulder_l = 10
hb_upperarm_l = 11
hb_forearm_l = 12
hb_hand_l = 13
hb_item_l = 14
hb_shoulder_r = 15
hb_upperarm_r = 16
hb_forearm_r = 17
hb_hand_r = 18
hb_item_r = 19
#Horse bones
hrsb_pelvis = 0
hrsb_spine_1 = 1
hrsb_spine_2 = 2
hrsb_spine_3 = 3
hrsb_neck_1 = 4
hrsb_neck_2 = 5
hrsb_neck_3 = 6
hrsb_head = 7
hrsb_l_clavicle = 8
hrsb_l_upper_arm = 9
hrsb_l_forearm = 10
hrsb_l_hand = 11
hrsb_l_front_hoof = 12
hrsb_r_clavicle = 13
hrsb_r_upper_arm = 14
hrsb_r_forearm = 15
hrsb_r_hand = 16
hrsb_r_front_hoof = 17
hrsb_l_thigh = 18
hrsb_l_calf = 19
hrsb_l_foot = 20
hrsb_l_back_hoof = 21
hrsb_r_thigh = 22
hrsb_r_calf = 23
hrsb_r_foot = 24
hrsb_r_back_hoof = 25
hrsb_tail_1 = 26
hrsb_tail_2 = 27
opmask_register = tag_register << op_num_value_bits
opmask_variable = tag_variable << op_num_value_bits
......
......@@ -44,8 +44,11 @@ itp_food = 0x0000000000080000
itp_cant_reload_on_horseback = 0x0000000000100000
itp_two_handed = 0x0000000000200000
itp_primary = 0x0000000000400000
itp_replaces_helm = 0x0000000000400000 # for armor, allows body armor items which include helmet
itp_secondary = 0x0000000000800000
itp_replaces_shoes = 0x0000000000800000 # for armor, allows body armor items which include boots
itp_covers_legs = 0x0000000001000000
itp_covers_hands = 0x0000000001000000
itp_doesnt_cover_hair = 0x0000000001000000
itp_can_penetrate_shield = 0x0000000001000000
itp_consumable = 0x0000000002000000
......@@ -307,7 +310,12 @@ itc_guandao = itc_parry_polearm|itcf_overswing_polearm|itcf_thrust_polearm|it
itc_musket_melee = itc_parry_polearm|itcf_overswing_musket|itcf_thrust_musket|itcf_slashright_twohanded|itcf_slashleft_twohanded
itc_greatlance = itcf_thrust_onehanded_lance | itcf_thrust_onehanded_lance_horseback | itcf_thrust_polearm
#Belendor
#sw
itc_lightsaber_onehanded = itc_dagger | itc_parry_onehanded
itc_lightsaber_standard = itc_cut_two_handed | itc_parry_two_handed |itc_dagger
itc_lightsaber_twohanded = itc_cut_two_handed | itcf_thrust_twohanded | itc_parry_two_handed |itcf_thrust_onehanded_lance
#/sw
#EXtra Mesh IDs
ixmesh_inventory = 0x1000000000000000
......
......@@ -7,6 +7,49 @@ from compiler import *
# that it will be easy to change it if you need to.
##############################################################
#Belendor - Subfaction
player_faction_influence_point = 5000
spt_temple = 6000
order_leader = 6001
player_is_member_of_order = 6002
slto_headmaster = 6003
order_temple = 6004
proven_lord = 6005
faction_order = 3000
temple_faction = 3001
faction_temple = 3002
lord_is_an_order_member = 3002
sfs_order = 7000
slot_agent_has_vyrn_AI = 2900
slot_vyrn_AI_chance = 3000
all_troops_begin = "trp_find_item_cheat"
all_troops_end = "trp_relative_of_merchants_end"
#Hierarchy
jedi_rank = 7100
rank_grandmaster = 7102
rank_jedimaster = 7103
rank_jediknight = 7104
rank_padawan = 7105
rank_youngling = 7106
sith_rank = 8100
rank_vizier = 8101
rank_grandmaster = 8102
rank_sithknight = 8103
rank_apprentice = 8104
rank_novice = 8105
player_order = 9100
balance_force = 10000
########################################################
## ITEM SLOTS #############################
########################################################
......@@ -1331,11 +1374,12 @@ secret_signs_end = countersigns_begin
kingdom_titles_male_begin = "str_faction_title_male_player"
kingdom_titles_female_begin = "str_faction_title_female_player"
kingdoms_begin = "fac_player_supporters_faction"
kingdoms_end = "fac_kingdoms_end"
#Belendor - lowering faction amount
kingdoms_begin = "fac_kingdom_1"
kingdoms_end = "fac_kingdom_3"
npc_kingdoms_begin = "fac_kingdom_1"
npc_kingdoms_end = kingdoms_end
npc_kingdoms_end = "fac_kingdom_3"
bandits_begin = "trp_bandit"
bandits_end = "trp_black_khergit_horseman"
......
......@@ -257,6 +257,136 @@ dialogs = [
],
"{!}{s5}", "award_fief_to_vassal",
[]],
#Belendor - subfaction
[anyone, "start",
[
(troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_headmaster),
(faction_get_slot, ":temple", "$g_encountered_party_faction", order_temple),
(str_store_party_name, s2, ":temple"),
],
"Welcome to the {s2}. How can we help you?", "headmaster_main",
[
]],
[anyone|plyr, "headmaster_main",
[(troop_slot_eq, "trp_player", player_order, "$g_encountered_party_faction"),
],
"What does the council require of me?", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[(troop_slot_eq, "trp_player", player_order, "$g_encountered_party_faction"),
],
"How's the war going?", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[
],
"I want to train my skills.", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[
],
"I want to learn.", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[
],
"Is there any mentee available?", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[
],
"I am looking for followers.", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[
],
"I have questions.", "headmaster_main",
[]],
[anyone|plyr, "headmaster_main",
[ (troop_slot_eq, "trp_player", player_is_member_of_order, 1),
],
"I want to leave.", "headmaster_leave",
[]],
[anyone|plyr, "headmaster_main",
[ (troop_slot_eq, "trp_player", player_is_member_of_order, -1),
],
"I want to join.", "headmaster_join",
[
(assign, "$pass_to_join", 0),
#
(try_begin),
(store_character_level, ":level", "trp_player"),
(ge, ":level", 5),
(val_add, "$pass_to_join", 1),
(try_end),
#
(try_begin),
(troop_get_slot, ":renown", "trp_player", slot_troop_renown),
(ge, ":renown", 100),
(val_add, "$pass_to_join", 1),
(try_end),
#
(try_begin),
(troop_slot_eq, "$g_talk_troop", proven_lord, 1),
(val_add, "$pass_to_join", 1),
(try_end),
]],
[anyone|plyr, "headmaster_main",
[],
"(Leave.", "close_window",
[]],
#
[anyone, "headmaster_leave",
[],
"Very well.", "headmaster_main",
[
(troop_set_slot, "trp_player", player_is_member_of_order, -1),
(display_message, "@You left the order"),
]],
#
[anyone, "headmaster_join",
[(lt, "$pass_to_join", 3),],
"You are not good enough.", "headmaster_main",
[]],
[anyone, "headmaster_join",
[(ge, "$pass_to_join", 3),],
"Yea - aight. Welcome bro", "headmaster_main",
[
(troop_set_slot, "trp_player", player_is_member_of_order, 1),
(try_begin),
(eq, "$g_encountered_party_faction", "fac_sith_order"),
(troop_set_slot, "trp_player", jedi_rank, rank_novice),
(troop_set_slot, "trp_player", player_order, "fac_sith_order"),
(else_try),
(eq, "$g_encountered_party_faction", "fac_jedi_order"),
(troop_set_slot, "trp_player", sith_rank, rank_youngling),
(troop_set_slot, "trp_player", player_order, "fac_jedi_order"),
(try_end),
(display_message, "@You joined the order"),
]],
#
[anyone|plyr, "award_fief_to_vassal",
[
......@@ -7793,9 +7923,12 @@ dialogs = [
(troop_set_slot, "$g_talk_troop", slot_troop_temp_decision_seed, ":random"),
]],
[anyone|plyr,"lord_talk",[(eq, "$cheat_mode", 1),
],
"CHEAT -- Let's duel (insult)", "lord_respond_to_insult_challenge_duel",
#Belendor - subfaction
[anyone|plyr,"lord_talk",[
],
"Let's duel, {s5}.", "lord_respond_to_insult_challenge_duel",
[
]],
......@@ -41,9 +41,11 @@ factions = [
("player_faction","Player Faction",0, 0.9, [], []),
("player_supporters_faction","Player's Supporters",0, 0.9, [("player_faction",1.00),("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xFF4433), #changed name so that can tell difference if shows up on map
("kingdom_1", "Kingdom of Swadia", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xEE7744),
("kingdom_2", "Kingdom of Vaegirs", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xCCBB99),
("kingdom_3", "Khergit Khanate", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xCC99FF),
#Belendor
("kingdom_1", "The Republic", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xEE7744),
("kingdom_2", "The Separatists", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xCCBB99),
("kingdom_3", "Khergit Khanate", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xCC99FF),
("kingdom_4", "Kingdom of Nords", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0x33DDDD),
("kingdom_5", "Kingdom of Rhodoks", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0x33DD33),
("kingdom_6", "Sarranid Sultanate", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xDDDD33),
......@@ -72,4 +74,9 @@ factions = [
("slavers","{!}Slavers", 0, 0.1, [], []),
("peasant_rebels","{!}Peasant Rebels", 0, 1.0,[("noble_refugees",-1.0),("player_faction",-0.4)], []),
("noble_refugees","{!}Noble Refugees", 0, 0.5,[], []),
#Belendor
("jedi_order", "The Jedi Order", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xEE7744),
("sith_order", "The Sith Order", 0, 0.9, [("outlaws",-0.05),("peasant_rebels", -0.1),("deserters", -0.02),("mountain_bandits", -0.05),("forest_bandits", -0.05)], [], 0xCCBB99),
]
......@@ -922,7 +922,16 @@ game_menus = [
"Select your character's gender.",
"none",
[],
[
[
("start_god",[],"god",
[
(troop_set_type,"trp_player", 0),
(assign,"$character_gender",tf_male),
(change_screen_map),
]
),
("start_male",[],"Male",
[
(troop_set_type,"trp_player", 0),
......@@ -2683,9 +2692,10 @@ game_menus = [
]
),
#Belendor - Subfaction
("character_report",0,
"{s9}",
"{s9}{s13}",
"none",
[(try_begin),
(gt, "$g_player_reading_book", 0),
......@@ -2804,6 +2814,15 @@ game_menus = [
(try_end),
(try_end),
#Belendor - Subfaction
(try_begin),
(faction_get_slot, ":inf_point", "fac_jedi_order", player_faction_influence_point),
(assign, reg12, ":inf_point"),
(faction_get_slot, ":inf_point", "fac_sith_order", player_faction_influence_point),
(assign, reg13, ":inf_point"),
(str_store_string, s13, "@^^Influences^^Jedi Order: {reg12}^Sith Order: {reg13}"),
(try_end),
],
[
......@@ -14498,8 +14517,47 @@ game_menus = [
]
),
#Belendor - Subfaction
("temple", mnf_disable_all_keys,
"{s1}",
"none",
[(set_background_mesh, "mesh_pic_camp"),
(try_begin),
(str_store_party_name, s2, "$g_encountered_party"),
#
(store_faction_of_party, ":fac", "$g_encountered_party"),
(str_store_faction_name, s5, ":fac"),
#
(faction_get_slot, ":leader", ":fac", order_leader),
(str_store_troop_name, s6, ":leader"),
#
(str_store_string, s1, "@Welcome to the {s2}. This temple belongs to {s5} under the leadership of {s6}."),
(try_end),
],
[
("temple_talk",[],"Talk with leader",
[
(faction_get_slot, ":leader", "$g_encountered_party_faction", order_leader),
(call_script, "script_setup_troop_meeting", ":leader", -1),
]),
("temple_spar",[],"Spar with leader",
[
(set_jump_mission, "mt_duel_force"),
(change_screen_mission),
(jump_to_scene, "scn_random_scene_plain_forest"),
]),
("temple_leave",[],"Leave.",
[
(change_screen_map),
(display_message, "@Guard: Farewell."),
]),
]
),
]
This diff is collapsed.
This diff is collapsed.
......@@ -990,4 +990,577 @@ particle_systems = [
15, #rotation speed
0, #rotation damping
),