Permalink
Browse files

Merge pull request #558 from rcythr/about_time

Fixes for several problems
  • Loading branch information...
apathyboy committed Mar 18, 2013
2 parents 4a34a48 + 8bd3418 commit 5a4d1965b4e1006a51d20ada74290eb089c7bbb0
Showing with 534 additions and 540 deletions.
  1. +60 −60 data/scripts/character_create/base_stats.py
  2. +1 −0 data/scripts/character_create/create_starting_character.py
  3. 0 data/scripts/character_create/items.py
  4. +7 −9 data/scripts/character_create/professions.py
  5. +0 −1 data/scripts/character_create/skills_professions.py
  6. +96 −67 data/scripts/character_create/skills_species.py
  7. +219 −153 data/scripts/character_create/starting_items.py
  8. +1 −0 data/scripts/commands/transferItem.py
  9. +1 −0 data/scripts/commands/transferItemArmor.py
  10. +1 −0 data/scripts/commands/transferItemMisc.py
  11. +1 −0 data/scripts/commands/transferItemWeapon.py
  12. +3 −8 src/swganh_core/object/building/building_message_builder.cc
  13. +3 −8 src/swganh_core/object/cell/cell_message_builder.cc
  14. +4 −8 src/swganh_core/object/creature/creature_message_builder.cc
  15. +2 −7 src/swganh_core/object/factory_crate/factory_crate_message_builder.cc
  16. +2 −7 src/swganh_core/object/group/group_message_builder.cc
  17. +2 −2 src/swganh_core/object/guild/guild_message_builder.cc
  18. +3 −8 src/swganh_core/object/harvester_installation/harvester_installation_message_builder.cc
  19. +3 −3 src/swganh_core/object/installation/installation_message_builder.cc
  20. +2 −2 src/swganh_core/object/intangible/intangible_message_builder.cc
  21. +3 −8 src/swganh_core/object/manufacture_schematic/manufacture_schematic_message_builder.cc
  22. +2 −7 src/swganh_core/object/mission/mission_message_builder.cc
  23. +102 −131 src/swganh_core/object/object.cc
  24. +1 −15 src/swganh_core/object/object.h
  25. +4 −10 src/swganh_core/object/player/player_message_builder.cc
  26. +2 −7 src/swganh_core/object/resource_container/resource_container_message_builder.cc
  27. +2 −2 src/swganh_core/object/static/static_message_builder.cc
  28. +3 −8 src/swganh_core/object/tangible/tangible_message_builder.cc
  29. +2 −2 src/swganh_core/object/waypoint/waypoint_message_builder.cc
  30. +2 −7 src/swganh_core/object/weapon/weapon_message_builder.cc
@@ -6,64 +6,64 @@ def __init__(self, health, action, mind):
self.mind = mind
StartStats = {
-'bothan:combat_brawler' : StartingStats((1000,500,400),(1100,650,450 ),(600 ,400,300 )),
-'bothan:combat_marksman' : StartingStats((1000,450,300),(1100,750,400 ),(700 ,400,400 )),
-'bothan:crafting_artisan' : StartingStats((600 ,300,300),(1100,700,400 ),(1000,500,500 )),
-'bothan:outdoors_scout' : StartingStats((800 ,300,350),(1100,700,500 ),(800 ,450,400 )),
-'bothan:science_medic' : StartingStats((600 ,300,300),(1000,600,400 ),(1100,600,500 )),
-'bothan:social_entertainer' : StartingStats((500 ,300,300),(1300,700,500 ),(900 ,500,400 )),
-'human:combat_brawler' : StartingStats((1100,600,500),(900 ,450,450 ),(600 ,400,400 )),
-'human:combat_marksman' : StartingStats((1100,550,400),(900 ,550,400 ),(700 ,400,400 )),
-'human:crafting_artisan' : StartingStats((700 ,400,400),(900 ,500,400 ),(1000,500,600 )),
-'human:outdoors_scout' : StartingStats((900 ,400,450),(900 ,500,500 ),(800 ,450,500 )),
-'human:science_medic' : StartingStats((700 ,400,400),(800 ,400,400 ),(1100,600,600 )),
-'human:social_entertainer' : StartingStats((600 ,400,400),(1100,500,500 ),(900 ,500,500 )),
-'ithorian:combat_brawler' : StartingStats((1000,500,400),(800 ,350,500 ),(800 ,600,450 )),
-'ithorian:combat_marksman' : StartingStats((1000,450,300),(800 ,450,450 ),(900 ,600,450 )),
-'ithorian:crafting_artisan' : StartingStats((600 ,300,300),(800 ,400,450 ),(1200,700,650 )),
-'ithorian:outdoors_scout' : StartingStats((800 ,300,350),(800 ,400,550 ),(1000,650,550 )),
-'ithorian:science_medic' : StartingStats((600 ,300,300),(700 ,300,450 ),(1300,800,550 )),
-'ithorian:social_entertainer' : StartingStats((500 ,300,300),(1000,400,550 ),(1100,700,550 )),
-'moncal:combat_brawler' : StartingStats((1000,500,400),(800 ,350,500 ),(800 ,600,450 )),
-'moncal:combat_marksman' : StartingStats((1000,450,300),(800 ,450,450 ),(900 ,600,450 )),
-'moncal:crafting_artisan' : StartingStats((600 ,300,300),(800 ,400,450 ),(1200,700,650 )),
-'moncal:outdoors_scout' : StartingStats((800 ,300,350),(800 ,400,550 ),(1000,650,550 )),
-'moncal:science_medic' : StartingStats((600 ,300,300),(700 ,300,450 ),(1300,800,650 )),
-'moncal:social_entertainer' : StartingStats((500 ,300,300),(1000,400,550 ),(1100,700,550 )),
-'rodian:combat_brawler' : StartingStats((1000,500,400),(1000,550,800 ),(500 ,300,350 )),
-'rodian:combat_marksman' : StartingStats((1000,450,300),(1000,650,750 ),(600 ,300,350 )),
-'rodian:crafting_artisan' : StartingStats((600 ,300,300),(1000,600,750 ),(900 ,400,550 )),
-'rodian:outdoors_scout' : StartingStats((800 ,300,350),(1000,600,850 ),(700 ,350,450 )),
-'rodian:science_medic' : StartingStats((600 ,300,300),(900 ,500,750 ),(1000,500,550 )),
-'rodian:social_entertainer' : StartingStats((500 ,300,300),(1200,600,850 ),(800 ,400,450 )),
-'sullustan:combat_brawler' : StartingStats((1200,500,400),(1100,350,350 ),(500 ,300,700 )),
-'sullustan:combat_marksman' : StartingStats((1200,450,300),(1100,450,300 ),(600 ,300,700 )),
-'sullustan:crafting_artisan' : StartingStats((800 ,300,300),(1100,400,300 ),(900 ,400,900 )),
-'sullustan:outdoors_scout' : StartingStats((1000,300,350),(1100,400,400 ),(700 ,350,800 )),
-'sullustan:science_medic' : StartingStats((800 ,300,300),(1000,300,300 ),(1000,500,800 )),
-'sullustan:social_entertainer' : StartingStats((700 ,300,300),(1300,400,400 ),(800 ,400,800 )),
-'trandoshan:combat_brawler' : StartingStats((1250,800,800),(800 ,350,350 ),(500 ,300,400 )),
-'trandoshan:combat_marksman' : StartingStats((1250,750,700),(800 ,450,300 ),(600 ,300,400 )),
-'trandoshan:crafting_artisan' : StartingStats((850 ,600,700),(800 ,400,300 ),(900 ,400,600 )),
-'trandoshan:outdoors_scout' : StartingStats((1050,600,750),(800 ,400,400 ),(700 ,350,500 )),
-'trandoshan:science_medic' : StartingStats((850 ,600,700),(700 ,300,300 ),(1000,500,600 )),
-'trandoshan:social_entertainer': StartingStats((750 ,600,700),(1000,400,400 ),(800 ,400,500 )),
-'twilek:combat_brawler' : StartingStats((1000,500,650),(1050,650,350 ),(600 ,300,300 )),
-'twilek:combat_marksman' : StartingStats((1000,450,550),(1050,750,300 ),(700 ,300,300 )),
-'twilek:crafting_artisan' : StartingStats((600 ,300,550),(1050,700,300 ),(1000,400,500 )),
-'twilek:outdoors_scout' : StartingStats((800 ,300,600),(1050,700,400 ),(800 ,350,400 )),
-'twilek:science_medic' : StartingStats((800 ,300,600),(1050,700,400 ),(800 ,350,400 )),
-'twilek:social_entertainer' : StartingStats((500 ,300,550),(1250,700,400 ),(900 ,400,400 )),
-'wookiee:combat_brawler' : StartingStats((1350,850,550),(1000,450,450 ),(600 ,450,400 )),
-'wookiee:combat_marksman' : StartingStats((1350,800,450),(1000,550,400 ),(700 ,450,400 )),
-'wookiee:crafting_artisan' : StartingStats((950 ,650,450),(1000,500,500 ),(1000,550,600 )),
-'wookiee:outdoors_scout' : StartingStats((1150,650,500),(1000,500,500 ),(800 ,500,500 )),
-'wookiee:science_medic' : StartingStats((950 ,650,450),(900 ,400,400 ),(1100,650,600 )),
-'wookiee:social_entertainer' : StartingStats((850 ,650,450),(1200,500,500 ),(900 ,550,500 )),
-'zabrak:combat_brawler' : StartingStats((1200,500,400),(1100,350,350 ),(500 ,300,700 )),
-'zabrak:combat_marksman' : StartingStats((1200,450,300),(1100,450,300 ),(600 ,300,700 )),
-'zabrak:crafting_artisan' : StartingStats((800 ,300,300),(1100,400,300 ),(900 ,400,900 )),
-'zabrak:outdoors_scout' : StartingStats((1000,300,350),(1100,400,400 ),(700 ,350,800 )),
-'zabrak:science_medic' : StartingStats((800 ,300,300),(1000,300,300 ),(1000,500,900 )),
-'zabrak:social_entertainer' : StartingStats((700 ,300,300),(1300,400,400 ),(800 ,400,800 ))
+ 'bothan:combat_brawler' : StartingStats((1000,500,400),(1100,650,450 ),(600 ,400,300 )),
+ 'bothan:combat_marksman' : StartingStats((1000,450,300),(1100,750,400 ),(700 ,400,400 )),
+ 'bothan:crafting_artisan' : StartingStats((600 ,300,300),(1100,700,400 ),(1000,500,500 )),
+ 'bothan:outdoors_scout' : StartingStats((800 ,300,350),(1100,700,500 ),(800 ,450,400 )),
+ 'bothan:science_medic' : StartingStats((600 ,300,300),(1000,600,400 ),(1100,600,500 )),
+ 'bothan:social_entertainer' : StartingStats((500 ,300,300),(1300,700,500 ),(900 ,500,400 )),
+ 'human:combat_brawler' : StartingStats((1100,600,500),(900 ,450,450 ),(600 ,400,400 )),
+ 'human:combat_marksman' : StartingStats((1100,550,400),(900 ,550,400 ),(700 ,400,400 )),
+ 'human:crafting_artisan' : StartingStats((700 ,400,400),(900 ,500,400 ),(1000,500,600 )),
+ 'human:outdoors_scout' : StartingStats((900 ,400,450),(900 ,500,500 ),(800 ,450,500 )),
+ 'human:science_medic' : StartingStats((700 ,400,400),(800 ,400,400 ),(1100,600,600 )),
+ 'human:social_entertainer' : StartingStats((600 ,400,400),(1100,500,500 ),(900 ,500,500 )),
+ 'ithorian:combat_brawler' : StartingStats((1000,500,400),(800 ,350,500 ),(800 ,600,450 )),
+ 'ithorian:combat_marksman' : StartingStats((1000,450,300),(800 ,450,450 ),(900 ,600,450 )),
+ 'ithorian:crafting_artisan' : StartingStats((600 ,300,300),(800 ,400,450 ),(1200,700,650 )),
+ 'ithorian:outdoors_scout' : StartingStats((800 ,300,350),(800 ,400,550 ),(1000,650,550 )),
+ 'ithorian:science_medic' : StartingStats((600 ,300,300),(700 ,300,450 ),(1300,800,550 )),
+ 'ithorian:social_entertainer' : StartingStats((500 ,300,300),(1000,400,550 ),(1100,700,550 )),
+ 'moncal:combat_brawler' : StartingStats((1000,500,400),(800 ,350,500 ),(800 ,600,450 )),
+ 'moncal:combat_marksman' : StartingStats((1000,450,300),(800 ,450,450 ),(900 ,600,450 )),
+ 'moncal:crafting_artisan' : StartingStats((600 ,300,300),(800 ,400,450 ),(1200,700,650 )),
+ 'moncal:outdoors_scout' : StartingStats((800 ,300,350),(800 ,400,550 ),(1000,650,550 )),
+ 'moncal:science_medic' : StartingStats((600 ,300,300),(700 ,300,450 ),(1300,800,650 )),
+ 'moncal:social_entertainer' : StartingStats((500 ,300,300),(1000,400,550 ),(1100,700,550 )),
+ 'rodian:combat_brawler' : StartingStats((1000,500,400),(1000,550,800 ),(500 ,300,350 )),
+ 'rodian:combat_marksman' : StartingStats((1000,450,300),(1000,650,750 ),(600 ,300,350 )),
+ 'rodian:crafting_artisan' : StartingStats((600 ,300,300),(1000,600,750 ),(900 ,400,550 )),
+ 'rodian:outdoors_scout' : StartingStats((800 ,300,350),(1000,600,850 ),(700 ,350,450 )),
+ 'rodian:science_medic' : StartingStats((600 ,300,300),(900 ,500,750 ),(1000,500,550 )),
+ 'rodian:social_entertainer' : StartingStats((500 ,300,300),(1200,600,850 ),(800 ,400,450 )),
+ 'sullustan:combat_brawler' : StartingStats((1200,500,400),(1100,350,350 ),(500 ,300,700 )),
+ 'sullustan:combat_marksman' : StartingStats((1200,450,300),(1100,450,300 ),(600 ,300,700 )),
+ 'sullustan:crafting_artisan' : StartingStats((800 ,300,300),(1100,400,300 ),(900 ,400,900 )),
+ 'sullustan:outdoors_scout' : StartingStats((1000,300,350),(1100,400,400 ),(700 ,350,800 )),
+ 'sullustan:science_medic' : StartingStats((800 ,300,300),(1000,300,300 ),(1000,500,800 )),
+ 'sullustan:social_entertainer' : StartingStats((700 ,300,300),(1300,400,400 ),(800 ,400,800 )),
+ 'trandoshan:combat_brawler' : StartingStats((1250,800,800),(800 ,350,350 ),(500 ,300,400 )),
+ 'trandoshan:combat_marksman' : StartingStats((1250,750,700),(800 ,450,300 ),(600 ,300,400 )),
+ 'trandoshan:crafting_artisan' : StartingStats((850 ,600,700),(800 ,400,300 ),(900 ,400,600 )),
+ 'trandoshan:outdoors_scout' : StartingStats((1050,600,750),(800 ,400,400 ),(700 ,350,500 )),
+ 'trandoshan:science_medic' : StartingStats((850 ,600,700),(700 ,300,300 ),(1000,500,600 )),
+ 'trandoshan:social_entertainer': StartingStats((750 ,600,700),(1000,400,400 ),(800 ,400,500 )),
+ 'twilek:combat_brawler' : StartingStats((1000,500,650),(1050,650,350 ),(600 ,300,300 )),
+ 'twilek:combat_marksman' : StartingStats((1000,450,550),(1050,750,300 ),(700 ,300,300 )),
+ 'twilek:crafting_artisan' : StartingStats((600 ,300,550),(1050,700,300 ),(1000,400,500 )),
+ 'twilek:outdoors_scout' : StartingStats((800 ,300,600),(1050,700,400 ),(800 ,350,400 )),
+ 'twilek:science_medic' : StartingStats((800 ,300,600),(1050,700,400 ),(800 ,350,400 )),
+ 'twilek:social_entertainer' : StartingStats((500 ,300,550),(1250,700,400 ),(900 ,400,400 )),
+ 'wookiee:combat_brawler' : StartingStats((1350,850,550),(1000,450,450 ),(600 ,450,400 )),
+ 'wookiee:combat_marksman' : StartingStats((1350,800,450),(1000,550,400 ),(700 ,450,400 )),
+ 'wookiee:crafting_artisan' : StartingStats((950 ,650,450),(1000,500,500 ),(1000,550,600 )),
+ 'wookiee:outdoors_scout' : StartingStats((1150,650,500),(1000,500,500 ),(800 ,500,500 )),
+ 'wookiee:science_medic' : StartingStats((950 ,650,450),(900 ,400,400 ),(1100,650,600 )),
+ 'wookiee:social_entertainer' : StartingStats((850 ,650,450),(1200,500,500 ),(900 ,550,500 )),
+ 'zabrak:combat_brawler' : StartingStats((1200,500,400),(1100,350,350 ),(500 ,300,700 )),
+ 'zabrak:combat_marksman' : StartingStats((1200,450,300),(1100,450,300 ),(600 ,300,700 )),
+ 'zabrak:crafting_artisan' : StartingStats((800 ,300,300),(1100,400,300 ),(900 ,400,900 )),
+ 'zabrak:outdoors_scout' : StartingStats((1000,300,350),(1100,400,400 ),(700 ,350,800 )),
+ 'zabrak:science_medic' : StartingStats((800 ,300,300),(1000,300,300 ),(1000,500,900 )),
+ 'zabrak:social_entertainer' : StartingStats((700 ,300,300),(1300,400,400 ),(800 ,400,800 ))
}
@@ -67,6 +67,7 @@ def CreateStartingCharacter(kernel, scale, base_model, customization, full_name,
simulation.addObjectToScene(creature, startLoc.name)
return creature
+
def GetSpecies(base_model):
match = re.search('player/(.*)_', base_model)
return match.group(1)
No changes.
@@ -1,11 +1,9 @@
Profession = {
-
-'crafting_artisan',
-'combat_brawler',
-'social_entertainer',
-'combat_marksman',
-'science_medic',
-'outdoors_scout',
-'jedi'
-
+ 'crafting_artisan',
+ 'combat_brawler',
+ 'social_entertainer',
+ 'combat_marksman',
+ 'science_medic',
+ 'outdoors_scout',
+ 'jedi'
}
@@ -1 +0,0 @@
-profession += '_novice'
@@ -1,71 +1,100 @@
baseSpeciesSkills = {
-'human' : 'social_language',
-'human' : 'social_language_basic',
-'human' : 'social_language_basic_speak',
-'human' : 'species_human',
-'rodian' : 'social_language',
-'rodian' : 'social_language_basic',
-'rodian' : 'social_language_basic_speak',
-'rodian' : 'social_language_rodian',
-'rodian' : 'social_language_rodian_speak',
-'rodian' : 'social_language_rodian_comprehend',
-'rodian' : 'species_rodian',
-'trandoshan' : 'social_language',
-'trandoshan' : 'social_language_basic',
-'trandoshan' : 'social_language_basic_speak',
-'trandoshan' : 'social_language_trandoshan',
-'trandoshan' : 'social_language_trandoshan_speak',
-'trandoshan' : 'social_language_trandoshan_comprehend',
-'trandoshan' : 'species_trandoshan',
-'moncal' : 'social_language',
-'moncal' : 'social_language_basic',
-'moncal' : 'social_language_basic_speak',
-'moncal' : 'social_language_moncalamari',
-'moncal' : 'social_language_moncalamari_speak',
-'moncal' : 'social_language_moncalamari_comprehend',
-'moncal' : 'species_moncal',
-'wookiee' : 'social_language',
-'wookiee' : 'social_language_basic',
-'wookiee' : 'social_language_basic_speak',
-'wookiee' : 'social_language_wookiee',
-'wookiee' : 'social_language_wookiee_speak',
-'wookiee' : 'social_language_wookiee_comprehend',
-'wookiee' : 'species_wookiee',
-'bothan' : 'social_language',
-'bothan' : 'social_language_basic',
-'bothan' : 'social_language_basic_speak',
-'bothan' : 'social_language_bothan',
-'bothan' : 'social_language_bothan_speak',
-'bothan' : 'social_language_bothan_comprehend',
-'bothan' : 'species_bothan',
-'twilek' : 'social_language',
-'twilek' : 'social_language_basic',
-'twilek' : 'social_language_basic_speak',
-'twilek' : 'social_language_twilek',
-'twilek' : 'social_language_twilek_speak',
-'twilek' : 'social_language_twilek_comprehend',
-'twilek' : 'species_twilek',
-'zabrak' : 'social_language',
-'zabrak' : 'social_language_basic',
-'zabrak' : 'social_language_basic_speak',
-'zabrak' : 'social_language_zabrak',
-'zabrak' : 'social_language_zabrak_speak',
-'zabrak' : 'social_language_zabrak_comprehend',
-'zabrak' : 'species_zabrak',
-'ithorian' : 'social_language',
-'ithorian' : 'social_language_basic',
-'ithorian' : 'social_language_basic_speak',
-'ithorian' : 'social_language_ithorian',
-'ithorian' : 'social_language_ithorian_speak',
-'ithorian' : 'social_language_ithorian_comprehend',
-'ithorian' : 'species_ithorian',
-'sullustan' : 'social_language',
-'sullustan' : 'social_language_basic',
-'sullustan' : 'social_language_basic_speak',
-'sullustan' : 'social_language_sullustan',
-'sullustan' : 'social_language_sullustan_speak',
-'sullustan' : 'social_language_sullustan_comprehend',
-'sullustan' : 'species_sullustan',
+ 'human' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'species_human'
+ ),
+
+ 'rodian' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_rodian',
+ 'social_language_rodian_speak',
+ 'social_language_rodian_comprehend',
+ 'species_rodian'
+ ),
+
+ 'trandoshan' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_trandoshan',
+ 'social_language_trandoshan_speak',
+ 'social_language_trandoshan_comprehend',
+ 'species_trandoshan'
+ ),
+
+ 'moncal' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_moncalamari',
+ 'social_language_moncalamari_speak',
+ 'social_language_moncalamari_comprehend',
+ 'species_moncal'
+ ),
+
+ 'wookiee' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_wookiee',
+ 'social_language_wookiee_speak',
+ 'social_language_wookiee_comprehend',
+ 'species_wookiee'
+ ),
+
+ 'bothan' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_bothan',
+ 'social_language_bothan_speak',
+ 'social_language_bothan_comprehend',
+ 'species_bothan'
+ ),
+
+ 'twilek' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_twilek',
+ 'social_language_twilek_speak',
+ 'social_language_twilek_comprehend',
+ 'species_twilek'
+ ),
+
+ 'zabrak' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_zabrak',
+ 'social_language_zabrak_speak',
+ 'social_language_zabrak_comprehend',
+ 'species_zabrak',
+ ),
+
+ 'ithorian' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_ithorian',
+ 'social_language_ithorian_speak',
+ 'social_language_ithorian_comprehend',
+ 'species_ithorian'
+ ),
+
+ 'sullustan' : (
+ 'social_language',
+ 'social_language_basic',
+ 'social_language_basic_speak',
+ 'social_language_sullustan',
+ 'social_language_sullustan_speak',
+ 'social_language_sullustan_comprehend',
+ 'species_sullustan'
+ )
}
Oops, something went wrong.

0 comments on commit 5a4d196

Please sign in to comment.