Skip to content

Commit 0869913

Browse files
authored
Merge pull request #1812 from Undercova/master
Content update
2 parents 017587b + 00ba631 commit 0869913

File tree

7 files changed

+828
-764
lines changed

7 files changed

+828
-764
lines changed

serverdata/missions/destroy/destroy_creatures.sdb

Lines changed: 194 additions & 196 deletions
Large diffs are not rendered by default.

serverdata/missions/destroy/destroy_npc_general.sdb

Lines changed: 344 additions & 344 deletions
Large diffs are not rendered by default.

serverdata/missions/destroy/destroy_npc_imperial.sdb

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

serverdata/missions/destroy/destroy_npc_rebel.sdb

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

serverdata/npc/npc_action.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ applause_excited
77
applause_polite
88
backhand_threaten
99
beckon
10+
beg
1011
belly_laugh
1112
bow
1213
bow2
@@ -22,6 +23,7 @@ cough_polite
2223
cover_ears_mocking
2324
cover_eyes
2425
cover_mouth
26+
curtsey
2527
dismiss
2628
dream
2729
eat
@@ -37,11 +39,14 @@ hair_flip
3739
handshake_tandem
3840
heal_other
3941
heal_self
42+
heavy_cough_vomit
4043
helpme
4144
hold_nose
45+
hug_self
4246
implore
4347
kiss_blow_kiss
4448
laugh
49+
laugh_cackle
4550
laugh_titter
4651
listen
4752
manipulate_medium
@@ -52,16 +57,18 @@ nod_head_once
5257
offer_affection
5358
point_accusingly
5459
point_away
60+
point_down
5561
point_forward
5662
point_left
5763
point_right
5864
point_to_self
65+
point_up
5966
poke
6067
pose_proudly
6168
pound_fist_chest
6269
pound_fist_palm
6370
rub_belly
64-
rub_chin_thoughtful
71+
rub_chin_thoughtfully
6572
salute1
6673
salute2
6774
scare
@@ -97,9 +104,11 @@ trick_2
97104
udaman
98105
waft
99106
wave_finger_warning
107+
wave_hail
100108
wave_on_directing
101109
wave_on_dismissing
102110
wave1
111+
wave2
103112
weeping
104113
whisper
105114
wtf

serverdata/npc/npc_mood.txt

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,53 @@
11
Mood
22
TEXT
3+
amazed
4+
amused
35
angry
6+
annoyed
7+
bitter
8+
bloodthirsty
49
bored
10+
brave
11+
callous
512
calm
13+
careful
14+
cocky
15+
cold
16+
condescending
17+
confused
618
conversation
19+
crude
20+
cruel
721
dance_1
822
dance_2
923
default
24+
depressed
25+
disappointed
26+
discreet
27+
disgusted
28+
disoriented
29+
drunk
30+
embarrassed
1031
entertained
32+
enthusiastic
33+
evil
34+
exhausted
35+
fanatical
1136
fishing
37+
guilty
1238
happy
39+
hopeful
40+
hopeless
41+
hungry
42+
hysterical
1343
idle
44+
joyful
45+
loving
46+
lustful
47+
malevolent
48+
mischievous
1449
nervous
50+
none
1551
npc_accusing
1652
npc_angry
1753
npc_consoling
@@ -28,10 +64,20 @@ npc_sitting_table
2864
npc_sitting_table_eating
2965
npc_standing_drinking
3066
npc_use_terminal_high
67+
playful
68+
polite
69+
rude
3170
sad
71+
sarcastic
72+
scornful
73+
shy
74+
stubborn
75+
taunting
3276
themepark_music_1
3377
themepark_music_2
3478
themepark_music_3
3579
themepark_oola
3680
themepark_sy_snootles
37-
threaten
81+
thirsty
82+
threaten
83+
whiny
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
spawn_id terrain building_id spawner_type cell_id x y z heading active npc_name npc_id attackable difficulty min_cl max_cl spawn_category spawn_area amount behaviour loiter_radius patrol_id patrol_formation mood equipment_id conversation_id respawn
22
STRING PRIMARY KEY TEXT TEXT REFERENCES buildings TEXT INTEGER REAL REAL REAL INTEGER INTEGER TEXT TEXT TEXT TEXT INTEGER INTEGER TEXT TEXT INTEGER TEXT INTEGER TEXT TEXT TEXT INTEGER TEXT INTEGER NOT NULL
3-
poi_tatooine_darklighters_estate_1 TATOOINE tat_world AREA 0 -591.1 6.5 -6746.2 0 1 a Rodian hunter humanoid_kashyyyk_rodian_lesser_hunter AGGRESSIVE B 40 45 POI Darklighter's Estate 1 IDLE 0 0 - idle 600
3+
poi_tatooine_darklighters_estate_1 TATOOINE tat_world AREA 0 -704.9 8.0 -6739.0 0 1 a Darklighter guard humanoid_darklighter_guard INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - idle 600
4+
poi_tatooine_darklighters_estate_2 TATOOINE tat_world AREA 0 -691.8 8.0 -6739.2 1 1 a Darklighter guard humanoid_darklighter_guard INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - idle 600
5+
poi_tatooine_darklighters_estate_3 TATOOINE tat_world AREA 0 -647.0 6.4 -6760.2 2 1 a Darklighter guard humanoid_darklighter_guard INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - idle 600
6+
poi_tatooine_darklighters_estate_4 TATOOINE tat_world AREA 0 -704.8 5.8 -6650.3 -146 1 a Darklighter guard humanoid_darklighter_guard INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - bored 600
7+
poi_tatooine_darklighters_estate_5 TATOOINE tat_world AREA 0 -588.7 6.5 -6741.1 23 1 a technician humanoid_technician INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - npc_use_terminal_high 600
8+
poi_tatooine_darklighters_estate_6 TATOOINE tat_world AREA 0 -701.2 8.0 -6720.4 65 1 an entertainer humanoid_entertainer INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - themepark_music_3 2 600
9+
poi_tatooine_darklighters_estate_7 TATOOINE tat_world AREA 0 -699.5 8.0 -6717.4 -152 1 a noble humanoid_noble INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - entertained 600
10+
poi_tatooine_darklighters_estate_8 TATOOINE tat_world AREA 0 -697.9 8.0 -6718.4 -119 1 a noble humanoid_noble INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - entertained 600
11+
poi_tatooine_darklighters_estate_9 TATOOINE tat_mosentha_large_house3 AREA 2 3.5 0.5 -5.4 -90 1 a scientist humanoid_geo_scientist_human_female INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - npc_sitting_chair 600
12+
poi_tatooine_darklighters_estate_10 TATOOINE tat_mosentha_large_house3 AREA 2 -9.0 1.0 9.4 91 1 a gambler humanoid_gambler INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - npc_use_terminal_high 600
13+
poi_tatooine_darklighters_estate_11 TATOOINE tat_world AREA 0 -657.0 11.5 -6834.8 -132 1 an explorer humanoid_explorer INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - conversation 600
14+
poi_tatooine_darklighters_estate_12 TATOOINE tat_world AREA 0 -658.8 11.4 -6836.4 48 1 a farmer humanoid_farmer INVULNERABLE N 100 100 POI Darklighter's Estate 1 IDLE 0 0 - conversation 600

0 commit comments

Comments
 (0)